Merge branch '3.0' into 3.1

This commit is contained in:
Danny Rawlins 2014-05-23 12:47:37 +10:00
commit 256d37cb06
29 changed files with 75 additions and 97 deletions

View File

@ -1,6 +1,7 @@
# Description: tool like grep, aimed at programmers with large trees of heterogeneous source code
# URL: http://betterthangrep.com/
# Maintainer: Bartlomiej Palmowski, rotwang at crux dot org dot pl
# Description: tool like grep, aimed at programmers with large trees of heterogeneous source code
# URL: http://beyondgrep.com/
# Maintainer: Thomas Penteker, tek at serverop dot de
# Packager: Bartlomiej Palmowski, rotwang at crux dot org dot pl
name=ack
version=2.12

View File

@ -1 +1 @@
5d079e12f5925845cc7e38ce2f4a1e20 clementine-1.2.1.tar.gz
725b92ad4699de1b2ffdf48fe01ed092 1.2.3.tar.gz

View File

@ -5,12 +5,12 @@
# Depends on: boost glew gst-plugins-bad gst-plugins-good gst-plugins-ugly protobuf qca-ossl qjson glu
name=clementine
version=1.2.1
version=1.2.3
release=1
source=(http://clementine-player.googlecode.com/files/$name-$version.tar.gz)
source=(https://github.com/clementine-player/Clementine/archive/$version.tar.gz)
build() {
cd $name-$version
cd Clementine-$version
cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=OFF
make
make DESTDIR=$PKG install

View File

@ -2,9 +2,7 @@ drwxr-xr-x root/root var/
drwxr-xr-x root/root var/www/
drwxr-xr-x root/root var/www/htdocs/
drwxr-xr-x root/root var/www/htdocs/dokuwiki/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/.editorconfig
-rw-r--r-- root/root var/www/htdocs/dokuwiki/.htaccess.dist
-rw-r--r-- root/root var/www/htdocs/dokuwiki/.travis.yml
drwxr-xr-x root/root var/www/htdocs/dokuwiki/bin/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/bin/.htaccess
-rwxr-xr-x root/root var/www/htdocs/dokuwiki/bin/dwpage.php
@ -813,46 +811,6 @@ drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/config/settings/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/config/settings/extra.class.php
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/config/style.css
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/extension.test.php
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/either1/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/either1/script.js (EMPTY)
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/eithersub2/
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/eithersub2/either2/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/eithersub2/either2/script.js (EMPTY)
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plgfoo5/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plgfoo5/plugin.info.txt
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plgsub3/
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plgsub3/plugin3/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plgsub3/plugin3/syntax.php (EMPTY)
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plgsub4/
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plgsub4/plugin4/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plgsub4/plugin4/plugin.info.txt
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plgsub6/
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plgsub6/plgfoo6/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plgsub6/plgfoo6/plugin.info.txt
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plugin1/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plugin1/syntax.php (EMPTY)
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plugin2/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/plugin2/plugin.info.txt
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/template1/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/template1/main.php (EMPTY)
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/template1/style.ini (EMPTY)
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/template2/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/template2/template.info.txt
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplfoo5/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplfoo5/template.info.txt
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplsub3/
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplsub3/template3/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplsub3/template3/main.php (EMPTY)
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplsub3/template3/style.ini (EMPTY)
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplsub4/
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplsub4/template4/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplsub4/template4/template.info.txt
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplsub6/
drwxr-xr-x root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplsub6/tplfoo6/
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/_test/testdata/tplsub6/tplfoo6/template.info.txt
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/action.php
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/admin.php
-rw-r--r-- root/root var/www/htdocs/dokuwiki/lib/plugins/extension/all.less

View File

@ -1 +1 @@
9bc798f823f1907664d769f3d1f588b7 dokuwiki-2014-05-05.tgz
52d484e1b62a0314511348c7d3ea4346 dokuwiki-2014-05-05.tgz

View File

@ -6,11 +6,11 @@
name=dokuwiki
version=2014-05-05
release=1
release=2
source=(http://download.dokuwiki.org/src/dokuwiki/dokuwiki-$version.tgz)
build() {
cd $name-2014-05-06
cd $name-2014-05-05
touch data/changes.log

View File

@ -50,6 +50,7 @@ drwxr-xr-x root/root usr/share/filezilla/resources/16x16/
-rw-r--r-- root/root usr/share/filezilla/resources/16x16/speedlimits.png
-rw-r--r-- root/root usr/share/filezilla/resources/16x16/symlink.png
-rw-r--r-- root/root usr/share/filezilla/resources/16x16/synchronize.png
-rw-r--r-- root/root usr/share/filezilla/resources/16x16/throbber.gif
-rw-r--r-- root/root usr/share/filezilla/resources/16x16/unknown.png
-rw-r--r-- root/root usr/share/filezilla/resources/16x16/upload.png
-rw-r--r-- root/root usr/share/filezilla/resources/16x16/uploadadd.png
@ -529,6 +530,7 @@ drwxr-xr-x root/root usr/share/filezilla/resources/tango/48x48/
-rw-r--r-- root/root usr/share/filezilla/resources/theme.xml
-rw-r--r-- root/root usr/share/filezilla/resources/toolbar.xrc
-rw-r--r-- root/root usr/share/filezilla/resources/up.png
-rw-r--r-- root/root usr/share/filezilla/resources/update.xrc
drwxr-xr-x root/root usr/share/icons/
drwxr-xr-x root/root usr/share/icons/hicolor/
drwxr-xr-x root/root usr/share/icons/hicolor/16x16/

View File

@ -1 +1 @@
df7828739a852ac3adbc1c010303115d FileZilla_3.7.3_src.tar.bz2
63e584aa478e358105e45972ee718a19 FileZilla_3.8.0_src.tar.bz2

View File

@ -1,10 +1,11 @@
# Description: ftp client
# URL: http://filezilla-project.org
# Maintainer: Bartlomiej Palmowski, rotwang at crux dot org dot pl
# Maintainer: Thomas Penteker, tek at serverop dot de
# Packager: Bartlomiej Palmowski, rotwang at crux dot org dot pl
# Depends on: wxgtk libidn gnutls xdg-utils tinyxml
name=filezilla
version=3.7.3
version=3.8.0
release=1
source=(http://downloads.sourceforge.net/project/$name/FileZilla_Client/$version/FileZilla_${version}_src.tar.bz2)
@ -19,7 +20,7 @@ build() {
--disable-static \
--disable-dependency-tracking \
--without-dbus
time make
make
make DESTDIR=$PKG install
rm -rf $PKG/usr/share/locale
}

View File

@ -2,7 +2,7 @@
# URL: http://gstreamer.freedesktop.org/modules/gst-plugins-bad.html
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
# Packager: Matt Housh, jaeger at morpheus dot net
# Depends on: curl faad2 gst-plugins-base libdca libdvdnav libmms libmpcdec libmusicbrainz librsvg libsndfile mjpegtools openldap
# Depends on: curl faad2 gst-plugins-base libdca libdvdnav libmms libmpcdec libmusicbrainz librsvg libsndfile mjpegtools openldap ladspa
name=gst-plugins-bad
version=0.10.23

View File

@ -0,0 +1,22 @@
# Description: Cairo based GTK engine.
# URL: https://launchpad.net/murrine
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
# Packager: Bartlomiej Palmowski, rotwang at crux dot org dot pl
# Depends on: gtk intltool
name=gtk-engine-murrine
version=0.98.2
release=1
source=(http://ftp.gnome.org/pub/GNOME/sources/murrine/${version::4}/murrine-$version.tar.xz)
build() {
cd murrine-$version
./configure \
--prefix=/usr \
--enable-animation \
--enable-animationrtl
make
make DESTDIR=$PKG install
}

View File

@ -1,2 +1,2 @@
66e41053f6fc0781b683b5b688442de6 iw-3.14.tar.xz
3b77ad7ec44a865a3bb2ab6c1c463bba iw-3.15.tar.xz
464b185fbf9a8592ac357a23f09d0825 version.sh

View File

@ -1,10 +1,11 @@
# Description: nl80211 based CLI configuration utility for wireless devices
# URL: http://wireless.kernel.org/en/users/Documentation/iw
# Maintainer: Bartlomiej Palmowski, rotwang at crux dot org dot pl
# Maintainer: Thomas Penteker, tek at serverop dot de
# Packager: Bartlomiej Palmowski, rotwang at crux dot org dot pl
# Depends on: libnl
name=iw
version=3.14
version=3.15
release=1
source=(https://www.kernel.org/pub/software/network/$name/$name-$version.tar.xz
version.sh)

View File

@ -1,7 +1,7 @@
# Description: high-performance event loop/event model with lots of features
# URL: http://software.schmorp.de/pkg/libev
# Maintainer: Bartlomiej Palmowski, rotwang at crux dot org dot pl
# Packager: Younes Hafri <ycrux@club-internet.fr>
# URL: http://software.schmorp.de/pkg/libev
# Maintainer: Thomas Penteker, tek at serverop dot de
# Packager: Younes Hafri <ycrux@club-internet.fr>
name=libev
version=4.15

View File

@ -1,18 +0,0 @@
# Description: gtk+ engine.
# URL: https://launchpad.net/murrine
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
# Packager: Bartlomiej Palmowski, rotwang at crux dot org dot pl
# Depends on: gtk intltool
name=murrine
version=0.98.2
release=1
source=(http://ftp.acc.umu.se/pub/GNOME/sources/$name/${version%.*}/$name-$version.tar.xz)
build() {
cd $name-$version
./configure --prefix=/usr --enable-animation --disable-nls
make
make DESTDIR=$PKG install
}

View File

@ -6,7 +6,6 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/ovs-appctl
-rwxr-xr-x root/root usr/bin/ovs-benchmark
-rwxr-xr-x root/root usr/bin/ovs-controller
-rwxr-xr-x root/root usr/bin/ovs-dpctl
-rwxr-xr-x root/root usr/bin/ovs-dpctl-top
-rwxr-xr-x root/root usr/bin/ovs-l3ping
@ -20,6 +19,16 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/ovs-vsctl
-rwxr-xr-x root/root usr/bin/ovsdb-client
-rwxr-xr-x root/root usr/bin/ovsdb-tool
-rwxr-xr-x root/root usr/bin/vtep-ctl
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libofproto.a
-rwxr-xr-x root/root usr/lib/libofproto.la
-rw-r--r-- root/root usr/lib/libopenvswitch.a
-rwxr-xr-x root/root usr/lib/libopenvswitch.la
-rw-r--r-- root/root usr/lib/libovsdb.a
-rwxr-xr-x root/root usr/lib/libovsdb.la
-rw-r--r-- root/root usr/lib/libsflow.a
-rwxr-xr-x root/root usr/lib/libsflow.la
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/ovs-benchmark.1.gz
@ -30,10 +39,10 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/ovsdb-tool.1.gz
drwxr-xr-x root/root usr/man/man5/
-rw-r--r-- root/root usr/man/man5/ovs-vswitchd.conf.db.5.gz
-rw-r--r-- root/root usr/man/man5/vtep.5.gz
drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/ovs-appctl.8.gz
-rw-r--r-- root/root usr/man/man8/ovs-bugtool.8.gz
-rw-r--r-- root/root usr/man/man8/ovs-controller.8.gz
-rw-r--r-- root/root usr/man/man8/ovs-ctl.8.gz
-rw-r--r-- root/root usr/man/man8/ovs-dpctl-top.8.gz
-rw-r--r-- root/root usr/man/man8/ovs-dpctl.8.gz
@ -46,13 +55,13 @@ drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/ovs-vlan-test.8.gz
-rw-r--r-- root/root usr/man/man8/ovs-vsctl.8.gz
-rw-r--r-- root/root usr/man/man8/ovs-vswitchd.8.gz
-rw-r--r-- root/root usr/man/man8/vtep-ctl.8.gz
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/ovs-bugtool
-rwxr-xr-x root/root usr/sbin/ovs-vlan-bug-workaround
-rwxr-xr-x root/root usr/sbin/ovs-vswitchd
-rwxr-xr-x root/root usr/sbin/ovsdb-server
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
drwxr-xr-x root/root usr/share/openvswitch/
drwxr-xr-x root/root usr/share/openvswitch/bugtool-plugins/
drwxr-xr-x root/root usr/share/openvswitch/bugtool-plugins/kernel-info/
@ -122,8 +131,9 @@ drwxr-xr-x root/root usr/share/openvswitch/scripts/
-rwxr-xr-x root/root usr/share/openvswitch/scripts/ovs-ctl
-rw-r--r-- root/root usr/share/openvswitch/scripts/ovs-lib
-rwxr-xr-x root/root usr/share/openvswitch/scripts/ovs-save
-rwxr-xr-x root/root usr/share/openvswitch/scripts/ovs-vtep
-rw-r--r-- root/root usr/share/openvswitch/vswitch.ovsschema
drwxr-xr-x root/root usr/share/ovsdbmonitor/
-rw-r--r-- root/root usr/share/openvswitch/vtep.ovsschema
drwxr-xr-x root/root var/
drwxr-xr-x root/root var/lib/
drwxr-xr-x root/root var/lib/openvswitch/

View File

@ -1,2 +1,2 @@
7d7a58350e634e515e0fe43c64d64f44 openvswitch-2.0.0.tar.gz
430ff6d1e1fc81e9c5ebc2e641cfc953 openvswitch-2.1.2.tar.gz
a39713e450024fc67ce14e51dda1e6ea ovsd

View File

@ -4,7 +4,7 @@
# Depends on:
name=openvswitch
version=2.0.0
version=2.1.2
release=1
source=(http://openvswitch.org/releases/openvswitch-$version.tar.gz ovsd)

View File

@ -1 +1 @@
1a07d6220d9e57d8d098905b7ca6844a p0f-3.06b.tgz
8b5882dee192c93d76750eb2ad54a634 p0f-3.07b.tgz

View File

@ -5,7 +5,7 @@
# Depends on: libpcap
name=p0f
version=3.06b
version=3.07b
release=1
source=(http://lcamtuf.coredump.cx/p0f3/releases/p0f-$version.tgz)

View File

@ -1,7 +1,7 @@
# Description: Simple password manager using gpg and ordinary unix directories.
# URL: http://zx2c4.com/projects/password-store/
# Maintainer: Fredrik Rinnestam, fredrik at rinnestam dot se
# Depends on: gnupg, git, pwgen, xclip, xsel
# Depends on: gnupg, git, pwgen, xclip, xsel, tree
name=password-store
version=1.4.2

View File

@ -42,6 +42,7 @@ drwxr-xr-x root/root usr/share/rdesktop/keymaps/
-rw-r--r-- root/root usr/share/rdesktop/keymaps/pt
-rw-r--r-- root/root usr/share/rdesktop/keymaps/pt-br
-rw-r--r-- root/root usr/share/rdesktop/keymaps/ru
-rw-r--r-- root/root usr/share/rdesktop/keymaps/sk
-rw-r--r-- root/root usr/share/rdesktop/keymaps/sl
-rw-r--r-- root/root usr/share/rdesktop/keymaps/sv
-rw-r--r-- root/root usr/share/rdesktop/keymaps/th

View File

@ -1 +1 @@
f5382c5c85b0d2cc88b9b1aa9bbf1356 rdesktop-1.8.1.tar.gz
d05ee35b33cc909c9a48368ae5fc8d16 rdesktop-1.8.2.tar.gz

View File

@ -5,7 +5,7 @@
# Depends on: xorg-libx11
name=rdesktop
version=1.8.1
version=1.8.2
release=1
source=(http://download.sourceforge.net/rdesktop/$name-$version.tar.gz)
build(){

View File

@ -1 +1 @@
1b7a781fb4cf8938842279bd3e8ee852 squashfs4.2.tar.gz
d92ab59aabf5173f2a59089531e30dbf squashfs4.3.tar.gz

View File

@ -4,8 +4,8 @@
# Depends on: xz
name=squashfs-tools
version=4.2
release=2
version=4.3
release=1
source=(http://download.sourceforge.net/squashfs/squashfs${version}.tar.gz)
build() {

View File

@ -1,7 +1,7 @@
# Description: simple, small, C++ XML parser
# URL: http://www.grinninglizard.com/tinyxml/
# Maintainer: Bartlomiej Palmowski, rotwang at crux dot org dot pl
# Depends on:
# Maintainer: Thomas Penteker, tek at serverop dot de
# Packager: Bartlomiej Palmowski, rotwang at crux dot org dot pl
name=tinyxml
version=2.6.2