From 7277eae8c9407264974f18fdbe87179e6ed7f491 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 21 Jun 2014 02:55:50 +0000 Subject: [PATCH] aur updates --- {aur => alarm}/dkms-8192cu/PKGBUILD | 0 .../add_missing_ids_netgear_dlink.patch | 0 .../dkms-8192cu/blacklist-dkms-8192cu.conf | 0 .../dkms-8192cu/dkms-8192cu.install | 0 {aur => alarm}/dkms-8192cu/dkms.conf | 0 {aur => alarm}/dkms-8192cu/fix_310_proc.patch | 0 aur/advancemenu/PKGBUILD | 12 ++-- aur/couchpotato-git/PKGBUILD | 4 +- aur/gmrender-resurrect-git/PKGBUILD | 2 +- aur/knockd/PKGBUILD | 9 ++- aur/knockd/knockd.service | 3 +- aur/monkey/PKGBUILD | 21 +++---- aur/monkey/monkey.install | 2 +- aur/monkey/monkey.service | 13 ---- aur/netatalk/PKGBUILD | 12 ++-- aur/netatalk/avahi-client.patch | 54 ++++++++++++++++ aur/omxplayer-git/PKGBUILD | 2 +- aur/package-query/PKGBUILD | 27 -------- aur/pithos-git/PKGBUILD | 2 +- aur/python-sqlalchemy-0.7.9/PKGBUILD | 63 +++++++++++++++++++ aur/python2-jsonschema/PKGBUILD | 23 ------- aur/python2-sqlalchemy-0.7.9/PKGBUILD | 37 ----------- aur/sickbeard-git/PKGBUILD | 2 +- 23 files changed, 154 insertions(+), 134 deletions(-) rename {aur => alarm}/dkms-8192cu/PKGBUILD (100%) rename {aur => alarm}/dkms-8192cu/add_missing_ids_netgear_dlink.patch (100%) rename {aur => alarm}/dkms-8192cu/blacklist-dkms-8192cu.conf (100%) rename {aur => alarm}/dkms-8192cu/dkms-8192cu.install (100%) rename {aur => alarm}/dkms-8192cu/dkms.conf (100%) rename {aur => alarm}/dkms-8192cu/fix_310_proc.patch (100%) delete mode 100644 aur/monkey/monkey.service create mode 100644 aur/netatalk/avahi-client.patch delete mode 100644 aur/package-query/PKGBUILD create mode 100644 aur/python-sqlalchemy-0.7.9/PKGBUILD delete mode 100644 aur/python2-jsonschema/PKGBUILD delete mode 100644 aur/python2-sqlalchemy-0.7.9/PKGBUILD diff --git a/aur/dkms-8192cu/PKGBUILD b/alarm/dkms-8192cu/PKGBUILD similarity index 100% rename from aur/dkms-8192cu/PKGBUILD rename to alarm/dkms-8192cu/PKGBUILD diff --git a/aur/dkms-8192cu/add_missing_ids_netgear_dlink.patch b/alarm/dkms-8192cu/add_missing_ids_netgear_dlink.patch similarity index 100% rename from aur/dkms-8192cu/add_missing_ids_netgear_dlink.patch rename to alarm/dkms-8192cu/add_missing_ids_netgear_dlink.patch diff --git a/aur/dkms-8192cu/blacklist-dkms-8192cu.conf b/alarm/dkms-8192cu/blacklist-dkms-8192cu.conf similarity index 100% rename from aur/dkms-8192cu/blacklist-dkms-8192cu.conf rename to alarm/dkms-8192cu/blacklist-dkms-8192cu.conf diff --git a/aur/dkms-8192cu/dkms-8192cu.install b/alarm/dkms-8192cu/dkms-8192cu.install similarity index 100% rename from aur/dkms-8192cu/dkms-8192cu.install rename to alarm/dkms-8192cu/dkms-8192cu.install diff --git a/aur/dkms-8192cu/dkms.conf b/alarm/dkms-8192cu/dkms.conf similarity index 100% rename from aur/dkms-8192cu/dkms.conf rename to alarm/dkms-8192cu/dkms.conf diff --git a/aur/dkms-8192cu/fix_310_proc.patch b/alarm/dkms-8192cu/fix_310_proc.patch similarity index 100% rename from aur/dkms-8192cu/fix_310_proc.patch rename to alarm/dkms-8192cu/fix_310_proc.patch diff --git a/aur/advancemenu/PKGBUILD b/aur/advancemenu/PKGBUILD index d4f3baf62..72f10e5c7 100644 --- a/aur/advancemenu/PKGBUILD +++ b/aur/advancemenu/PKGBUILD @@ -1,15 +1,15 @@ # Contributor: Sebastian Wolf pkgname=advancemenu -pkgver=2.6 +pkgver=2.7 pkgrel=1 -pkgdesc="A frontend for AdvanceMAME emulator" +pkgdesc="Emulator frontend with sound and animated previews of your games" arch=('i686' 'x86_64') url="http://advancemame.sourceforge.net" -depends=('advancemame') +optdepends=('advancemame' 'sdlmame' 'sdlmess') license=('GPL') source=(http://downloads.sourceforge.net/sourceforge/advancemame/$pkgname-$pkgver.tar.gz) -md5sums=('7fd97df5e7eb7675edd065a10444585f') +md5sums=('aa2dc9fb1f795420c92af8cc4dd5d938') build() { cd $srcdir/$pkgname-$pkgver @@ -21,6 +21,8 @@ package() { cd $srcdir/$pkgname-$pkgver # Binary install -D -m755 obj/menu/linux/blend/advmenu $pkgdir/usr/bin/advmenu - # Documentation + # Manpage install -D -m644 doc/advmenu.1 $pkgdir/usr/share/man/man1/advmenu.1 + # Documentation + install -D -m644 doc/advmenu.txt $pkgdir/usr/share/doc/advmenu/advmenu.txt } diff --git a/aur/couchpotato-git/PKGBUILD b/aur/couchpotato-git/PKGBUILD index 88f90312e..4da2bfec5 100644 --- a/aur/couchpotato-git/PKGBUILD +++ b/aur/couchpotato-git/PKGBUILD @@ -2,8 +2,8 @@ pkgname=couchpotato-git _gitname=CouchPotatoServer -pkgver=2993.b69f8b7 -pkgrel=2 +pkgver=3533.31daf49 +pkgrel=1 pkgdesc="Automatic Movie Downloading via NZBs & Torrent" arch=('any') url="http://couchpota.to/" diff --git a/aur/gmrender-resurrect-git/PKGBUILD b/aur/gmrender-resurrect-git/PKGBUILD index 31dbccf3f..72063e243 100644 --- a/aur/gmrender-resurrect-git/PKGBUILD +++ b/aur/gmrender-resurrect-git/PKGBUILD @@ -3,7 +3,7 @@ pkgname=gmrender-resurrect-git _gitname=gmrender-resurrect -pkgver=260.6d66c7b +pkgver=275.61f5a8f pkgrel=1 pkgdesc="Application to stream music from a UPnP server using gstreamer." arch=('any') diff --git a/aur/knockd/PKGBUILD b/aur/knockd/PKGBUILD index 8389b61d1..69ca04722 100644 --- a/aur/knockd/PKGBUILD +++ b/aur/knockd/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: judd pkgname=knockd -pkgver=0.6 -pkgrel=2 +pkgver=0.7 +pkgrel=1 pkgdesc="A simple port-knocking daemon" arch=('i686' 'x86_64') url="http://www.zeroflux.org/projects/knock" @@ -16,10 +16,10 @@ backup=('etc/knockd.conf') source=(http://www.zeroflux.org/proj/knock/files/knock-$pkgver.tar.gz knockd knockd.logrotate knockd.service limits.h.patch) -md5sums=('e6e486be75b0d6433bac22a7de0e11f5' +md5sums=('cb6373fd4ccb42eeca3ff406b7fdb8a7' '72302d899887996694586c3d479de245' '56a4113ec89ba2e96f79ab23c914d52a' - '0329ca17267d03f06216d1fe00bd16a9' + 'da806fb9fbdf638df4e0011070ff9ef1' 'e56dc7359f36c3b07da6710c404d671e') build() { @@ -36,4 +36,3 @@ package() { install -D -m755 "$srcdir/knockd.service" "$pkgdir/usr/lib/systemd/system/knockd.service" install -D -m644 "$srcdir/knockd.logrotate" "$pkgdir/etc/logrotate.d/knockd" } - diff --git a/aur/knockd/knockd.service b/aur/knockd/knockd.service index 35f8722e7..8efb05dd3 100644 --- a/aur/knockd/knockd.service +++ b/aur/knockd/knockd.service @@ -3,8 +3,7 @@ Description=Port-Knocking Daemon After=network.target [Service] -ExecStart=/usr/sbin/knockd -d -Type=forking +ExecStart=/usr/sbin/knockd [Install] WantedBy=multi-user.target diff --git a/aur/monkey/PKGBUILD b/aur/monkey/PKGBUILD index fc03f0550..b54c27b7d 100644 --- a/aur/monkey/PKGBUILD +++ b/aur/monkey/PKGBUILD @@ -1,27 +1,24 @@ #Maintainer: Christian Stankowic #Contributor: Gary Wright pkgname=monkey -pkgver=1.4.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="A very small and fast open source web server for Linux" arch=('i686' 'x86_64') url="http://www.monkey-project.com/" -license=('GPL2') +license=('Apache') depends=('gcc-libs') optdepends=('php') -source=("http://www.monkey-project.com/releases/1.4/$pkgname-$pkgver.tar.gz" - monkey - monkey.service) +source=("http://www.monkey-project.com/releases/1.5/$pkgname-$pkgver.tar.gz" + monkey) install=monkey.install -md5sums=('c17e394b985ead873fc7e7cb2a05cef7' - '1527d1fbddddcfd69ad328639dcd0eed' - 'ae1f2da03aa2a515a3bed0fb16ab7130') +md5sums=('2fe04135728f5c3a86c3a412059e0da3' + '1527d1fbddddcfd69ad328639dcd0eed') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --bindir=/usr/bin --sysconfdir=/etc/$pkgname --default-user=http --default-port=80 \ - --datadir=/srv/http --logdir=/var/log/$pkgname \ - --plugdir=/usr/lib/$pkgname + --datadir=/srv/http --logdir=/var/log/$pkgname --plugdir=/usr/lib/$pkgname --enable-shared --systemddir=$pkgdir/lib/systemd/system --pidfile=/var/run/monkey.pid make } @@ -33,6 +30,8 @@ package() { msg2 "Change default pid file location from /var/log to /var/run/monkey" sed -i -e "s/\/var\/log\/monkey\/monkey.pid/\/var\/run\/monkey.pid/" $pkgdir/etc/monkey/monkey.conf + msg2 "Disabling user setting in monkey configuration file" + sed -i -e "s/User http/#User http/g" $pkgdir/etc/monkey/monkey.conf + install -Dm 755 "$srcdir/monkey" "$pkgdir/etc/rc.d/monkey" - install -Dm 644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service" } diff --git a/aur/monkey/monkey.install b/aur/monkey/monkey.install index 419bc9b0b..5154999ef 100644 --- a/aur/monkey/monkey.install +++ b/aur/monkey/monkey.install @@ -12,5 +12,5 @@ post_install() { env echo env echo " # /etc/rc.d/monkey {start|stop|restart}" env echo - env echo " Don't forget to modify /etc/systemd/system/monkey.service (PIDFile) if you're using systemd and want to change the default port (80)" + env echo " Don't forget to modify /lib/systemd/system/monkey.service (PIDFile) if you're using systemd and want to change the default port (80)" } diff --git a/aur/monkey/monkey.service b/aur/monkey/monkey.service deleted file mode 100644 index 418198866..000000000 --- a/aur/monkey/monkey.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Monkey http server deamon -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/monkey -D -ExecStop=/bin/kill $MAINPID -ExecReload=/bin/kill $MAINPID ; /usr/bin/monkey -D -PIDFile=/var/run/monkey.pid.80 - -[Install] -WantedBy=multi-user.target diff --git a/aur/netatalk/PKGBUILD b/aur/netatalk/PKGBUILD index d6eb3a8df..e57717aa6 100644 --- a/aur/netatalk/PKGBUILD +++ b/aur/netatalk/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Farhan Yousaf pkgname=netatalk -pkgver=3.1.1 +pkgver=3.1.2 pkgrel=1 pkgdesc='A kernel-level implementation of AFP services' arch=('i686' 'x86_64') @@ -17,21 +17,25 @@ backup=('etc/afp.conf' 'etc/extmap.conf') install=$pkgname.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 + avahi-client.patch python2.patch) -md5sums=('1d9ed08871655776ec0e946f88749076' +md5sums=('cfdf3dd2278d2900275e11b4423eacc0' + '00379aacb88dcac8c1e0513da1a5f24c' '97bc0467dd8a866d9f0835d6440e3c19') prepare() { cd "$srcdir/$pkgname-$pkgver" patch -p0 < "$srcdir/python2.patch" + patch -p0 < "$srcdir/avahi-client.patch" } build() { cd "$srcdir/$pkgname-$pkgver" CFLAGS="-Wno-unused-result -O2" \ ./configure --prefix=/usr --localstatedir=/var/state --sysconfdir=/etc \ - --sbindir=/usr/bin --with-init-style=systemd \ - --with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-libevent=no + --sbindir=/usr/bin --enable-silent-rules --with-init-style=systemd \ + --with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-libevent=no \ + --enable-zeroconf=/usr/include/avahi-client make } diff --git a/aur/netatalk/avahi-client.patch b/aur/netatalk/avahi-client.patch new file mode 100644 index 000000000..a1eef2b33 --- /dev/null +++ b/aur/netatalk/avahi-client.patch @@ -0,0 +1,54 @@ +--- macros/zeroconf.m4.orig 2014-06-08 21:23:46.000000000 +0400 ++++ macros/zeroconf.m4 2014-06-08 21:36:25.000000000 +0400 +@@ -25,23 +25,7 @@ + zeroconf_dir="$zeroconf" + fi + +- # mDNS support using mDNSResponder +- AC_CHECK_HEADER( +- dns_sd.h, +- AC_CHECK_LIB( +- dns_sd, +- DNSServiceRegister, +- AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration])) +- ) +- +- if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then +- ZEROCONF_LIBS="-ldns_sd" +- AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration]) +- found_zeroconf=yes +- fi +- + # mDNS support using Avahi +- if test x"$found_zeroconf" != x"yes" ; then + AC_CHECK_HEADER( + avahi-client/client.h, + AC_CHECK_LIB( +@@ -62,10 +46,26 @@ + found_zeroconf=yes + ;; + esac ++ ++ # mDNS support using mDNSResponder ++ if test x"$found_zeroconf" != x"yes" ; then ++ AC_CHECK_HEADER( ++ dns_sd.h, ++ AC_CHECK_LIB( ++ dns_sd, ++ DNSServiceRegister, ++ AC_DEFINE(USE_ZEROCONF, 1, [Use DNS-SD registration])) ++ ) ++ ++ if test "$ac_cv_lib_dns_sd_DNSServiceRegister" = yes; then ++ ZEROCONF_LIBS="-ldns_sd" ++ AC_DEFINE(HAVE_MDNS, 1, [Use mDNSRespnder/DNS-SD registration]) ++ found_zeroconf=yes ++ fi ++ fi + CPPFLAGS="$savedcppflags" + LDFLAGS="$savedldflags" + fi +- fi + + netatalk_cv_zeroconf=no + AC_MSG_CHECKING([whether to enable Zerconf support]) diff --git a/aur/omxplayer-git/PKGBUILD b/aur/omxplayer-git/PKGBUILD index 5ba39c9a6..521d01b76 100644 --- a/aur/omxplayer-git/PKGBUILD +++ b/aur/omxplayer-git/PKGBUILD @@ -8,7 +8,7 @@ pkgname=omxplayer-git -pkgver=285.1091db2 +pkgver=340.f322182 pkgrel=1 pkgdesc="omxplayer is a command line media player for the RaspberryPi" arch=('arm' 'armv6h') diff --git a/aur/package-query/PKGBUILD b/aur/package-query/PKGBUILD deleted file mode 100644 index a3e2cd5c1..000000000 --- a/aur/package-query/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Contributor: tuxce -pkgname=package-query -pkgver=1.2 -pkgrel=2 -pkgdesc="Query ALPM and AUR" -arch=('i686' 'x86_64' 'mips64el' 'armv6h' 'armv7h') -url="http://gitweb.archlinux.fr/package-query.git/" -license=('GPL') -depends=('pacman>=4.1' 'pacman<4.2' curl 'yajl>=2.0') -source=(http://mir.archlinux.fr/~tuxce/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('270f1743e8b78a99cb4cc99057aec091') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --localstatedir=/var --prefix=/usr --sysconfdir=/etc --with-aur-url=https://aur.archlinux.org - make -} - -package () -{ - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: - - diff --git a/aur/pithos-git/PKGBUILD b/aur/pithos-git/PKGBUILD index 3efda9ede..91cf62b80 100644 --- a/aur/pithos-git/PKGBUILD +++ b/aur/pithos-git/PKGBUILD @@ -3,7 +3,7 @@ _pkgname=pithos pkgname=$_pkgname-git -pkgver=396 +pkgver=397 pkgrel=1 epoch=1 pkgdesc='Pandora Internet Radio player for GNOME' diff --git a/aur/python-sqlalchemy-0.7.9/PKGBUILD b/aur/python-sqlalchemy-0.7.9/PKGBUILD new file mode 100644 index 000000000..e783749f8 --- /dev/null +++ b/aur/python-sqlalchemy-0.7.9/PKGBUILD @@ -0,0 +1,63 @@ +# Maintainer: willemw +# Based on "community/python-sqlalchemy" package ($Id: PKGBUILD 108809 2014-04-04 10:16:01Z fyan $) + +#pkgbase=python-sqlalchemy-0.7.9 +pkgname=('python-sqlalchemy-0.7.9' 'python2-sqlalchemy-0.7.9') +pkgver=0.7.9 +pkgrel=4 +arch=('i686' 'x86_64') # python2 package contain .so +url="http://www.sqlalchemy.org/" +license=('MIT') +makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools') +checkdepends=('python-pytest' 'python2-pytest' 'python-mock' 'python2-mock') +source=("https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz") +md5sums=('a0b58defc5ad0c7e1baeb932f62d08dd') + +prepare() { + cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver +} + +build() { + cd SQLAlchemy-$pkgver + python setup.py build + + cd ../SQLAlchemy2-$pkgver + python2 setup.py build +} + +check() { + # Tests failing + cd SQLAlchemy-${pkgver} + #python setup.py test + + cd ../SQLAlchemy2-$pkgver + #python2 setup.py test +} + +package_python-sqlalchemy-0.7.9() { + pkgdesc='Python SQL toolkit and Object Relational Mapper' + depends=('python') + optdepends=('python-psycopg2: connect to PostgreSQL database') + conflicts=('python-sqlalchemy') + provides=('python-sqlalchemy') + + cd SQLAlchemy-${pkgver} + python setup.py install --root="${pkgdir}" + install -D -m644 LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python2-sqlalchemy-0.7.9() { + pkgdesc='Python 2 SQL toolkit and Object Relational Mapper' + depends=('python2') + optdepends=('python2-psycopg2: connect to PostgreSQL database') + conflicts=('python2-sqlalchemy') + provides=('python2-sqlalchemy') + + cd SQLAlchemy2-$pkgver + python2 setup.py install --root="$pkgdir" + install -D -m644 LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/aur/python2-jsonschema/PKGBUILD b/aur/python2-jsonschema/PKGBUILD deleted file mode 100644 index 8b96dc126..000000000 --- a/aur/python2-jsonschema/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# Maintainer: Bogdan Szczurek -# This package is almost identical to the package -# python-jsonschema by Ismo Toijala, so all praises -# go to him :): Ismo Toijala - -pkgname=python2-jsonschema -pkgver=2.3.0 -pkgrel=1 -pkgdesc="An implementation of JSON Schema validation for Python" -arch=(any) -url="http://pypi.python.org/pypi/jsonschema" -license=('MIT') -depends=('python2') -source=("http://pypi.python.org/packages/source/j/jsonschema/${pkgname:8}-$pkgver.tar.gz") - -package() { - cd "$srcdir/${pkgname:8}-$pkgver" - python2 setup.py install --root="$pkgdir/" --optimize=1 - - install -D -m644 json/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} - -md5sums=('410075e1969a9ec1838b5a6e1313c32b') diff --git a/aur/python2-sqlalchemy-0.7.9/PKGBUILD b/aur/python2-sqlalchemy-0.7.9/PKGBUILD deleted file mode 100644 index 94f26a0dd..000000000 --- a/aur/python2-sqlalchemy-0.7.9/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 87107 2013-03-27 11:07:21Z jelle $ -# Maintainer: Angel Velasquez -# Contributor: Sébastien Luttringer - -pkgname=python2-sqlalchemy-0.7.9 -pkgver=0.7.9 -pkgrel=3 -arch=('i686' 'x86_64') # python2 package contain .so -url="http://www.sqlalchemy.org/" -license=('custom: MIT') -makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose') -source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz") -md5sums=('c4852d586d95a59fbc9358f4467875d5') -pkgdesc='Python 2 SQL toolkit and Object Relational Mapper' -depends=('python2') -provides=('python2-sqlalchemy') -conflicts=('python2-sqlalchemy') - -build() { - cd ${srcdir}/SQLAlchemy-$pkgver - python2 setup.py build -} - -check() { - cd SQLAlchemy-${pkgver} - python2 setup.py check -} - -package() { - - cd SQLAlchemy-$pkgver - python2 setup.py install --root="$pkgdir" - install -D -m644 LICENSE \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/aur/sickbeard-git/PKGBUILD b/aur/sickbeard-git/PKGBUILD index 287d31edb..e52f2c31a 100644 --- a/aur/sickbeard-git/PKGBUILD +++ b/aur/sickbeard-git/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Augusto Born de Oliveira pkgname=sickbeard-git -pkgver=3756.d4d3698 +pkgver=3814.a3bfb87 pkgrel=1 pkgdesc="A PVR application that downloads and manages your TV shows" arch=('any')