From c40883520f917311c212dc4a22e86be30cef658f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 23 Aug 2012 00:03:08 +0000 Subject: Thu Aug 23 00:03:08 UTC 2012 --- .../drbd/01-remove-old-sanity-check.diff | 24 ++++++++ community-testing/drbd/PKGBUILD | 67 ++++++++++++++++++++++ community-testing/drbd/drbd.rc | 58 +++++++++++++++++++ community-testing/drbd/drbd.service | 19 ++++++ community/chrony/PKGBUILD | 10 ++-- community/chrony/service | 1 + community/gputils/PKGBUILD | 6 +- community/keepalived/PKGBUILD | 6 +- community/mariadb/PKGBUILD | 6 +- community/mariadb/mariadb.install | 5 ++ community/mpdscribble/PKGBUILD | 6 +- community/oath-toolkit/PKGBUILD | 6 +- community/openntpd/PKGBUILD | 8 +-- community/projectm/PKGBUILD | 44 +++++++------- community/python-pyzmq/PKGBUILD | 9 ++- community/python2-pyzmq/PKGBUILD | 6 +- community/schroot/PKGBUILD | 13 +++-- community/schroot/fix-bash-completion.patch | 11 ++++ core/inetutils/PKGBUILD | 9 ++- core/inetutils/ftpd.service | 9 +++ extra/git/PKGBUILD | 41 ++++++++----- extra/git/git-daemon.socket | 9 +++ extra/git/git-daemon@.service | 10 ++++ extra/git/git.install | 21 +++++++ extra/kradio/PKGBUILD | 8 +-- extra/ntp/PKGBUILD | 8 +-- extra/timidity++/PKGBUILD | 10 ++-- extra/timidity++/timidity.service | 9 +++ extra/varnish/PKGBUILD | 13 +++-- extra/varnish/varnish-vcl-reload | 1 - 30 files changed, 362 insertions(+), 91 deletions(-) create mode 100644 community-testing/drbd/01-remove-old-sanity-check.diff create mode 100644 community-testing/drbd/PKGBUILD create mode 100644 community-testing/drbd/drbd.rc create mode 100644 community-testing/drbd/drbd.service create mode 100644 community/schroot/fix-bash-completion.patch create mode 100644 core/inetutils/ftpd.service create mode 100644 extra/git/git-daemon.socket create mode 100644 extra/git/git-daemon@.service create mode 100644 extra/git/git.install create mode 100644 extra/timidity++/timidity.service diff --git a/community-testing/drbd/01-remove-old-sanity-check.diff b/community-testing/drbd/01-remove-old-sanity-check.diff new file mode 100644 index 000000000..04edb7571 --- /dev/null +++ b/community-testing/drbd/01-remove-old-sanity-check.diff @@ -0,0 +1,24 @@ +From: Lars Ellenberg +Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100) +Subject: build: remove old sanity check to allow build against linux 3.1 +X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf + +build: remove old sanity check to allow build against linux 3.1 +--- + +diff --git a/drbd/Makefile b/drbd/Makefile +index 0985340..7a09603 100644 +--- a/drbd/Makefile ++++ b/drbd/Makefile +@@ -90,11 +90,6 @@ else + endif + endif + +- KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3) +- ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),) +- $(error "won't compile with this kernel version") +- endif +- + .PHONY: drbd.o default all greeting clean kbuild install dep tags + + drbd.o: greeting kbuild diff --git a/community-testing/drbd/PKGBUILD b/community-testing/drbd/PKGBUILD new file mode 100644 index 000000000..5afc6db41 --- /dev/null +++ b/community-testing/drbd/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 75398 2012-08-21 20:52:40Z seblu $ +# Maintainer: Sébastien Luttringer + +pkgname=drbd +pkgver=8.3.13 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Userland tools for Distributed Replicated Block Device' +url='http://www.drbd.org' +license=('GPL2') +depends=('perl' 'bash') +source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz" + "$pkgname.rc" + "$pkgname.service") +backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') +md5sums=('760a25459ef6b7262a2a3572c1561c5b' + '8902a2f7aca6245c27e9566a1509312c' + 'afbb345094db49b0a474c0b4e51c0acd') + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --with-distro=generic \ + --with-utils \ + --with-bashcompletion \ + --with-udev \ + --without-km \ + --without-rgmanager \ + --without-pacemaker \ + --without-heartbeat \ + --without-xen \ + --with-initdir=/etc/rc.d + #--with-legacy_utils \ + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # move forced /sbin binaries + cd "$pkgdir" + mv sbin/* usr/sbin + rmdir sbin + # fix hardcoded path in udev rules + sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules + # move udev files + mv etc/udev usr/lib + # move bash completion + install -dm 755 usr/share/bash-completion + mv etc/bash_completion.d usr/share/bash-completion/completions + # remove /var/lock + rmdir var/lock + # autoload module + install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf + echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf + # setup initscript (replace) + cd "$srcdir" + install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + # install systemd stuff + install -Dm 644 $pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/drbd/drbd.rc b/community-testing/drbd/drbd.rc new file mode 100644 index 000000000..b8b196e4b --- /dev/null +++ b/community-testing/drbd/drbd.rc @@ -0,0 +1,58 @@ +#!/bin/bash +# Written by Sébastien Luttringer + +. /etc/rc.conf +. /etc/rc.d/functions + +DRBDADM='/usr/sbin/drbdadm' +PROC_DRBD='/proc/drbd' + +check_config() { + # check if module is loaded + if [[ ! -e $PROC_DRBD ]]; then + echo "Missing $PROC_DRBD. Try to load drbd module!" + stat_fail + exit 1 + fi + # check if config is correct + if ! $DRBDADM dump &>/dev/null; then + echo 'Invalid configuration' + stat_fail + exit 1 + fi +} + +case "$1" in + start) + stat_busy 'Starting DRBD resources' + # check module and config + check_config + # load config + $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; } + # user interruptible version of wait-connect all + $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; } + # become primary if configured + $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; } + add_daemon drbd + stat_done + ;; + stop) + stat_busy 'Stopping DRBD resources' + # check module and config + check_config + # disconnect and detach all resources + $DRBDADM down all 2>/dev/null || { stat_fail; exit 1; } + rm_daemon drbd + stat_done + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac + +exit 0 + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/drbd/drbd.service b/community-testing/drbd/drbd.service new file mode 100644 index 000000000..ddd6c62b7 --- /dev/null +++ b/community-testing/drbd/drbd.service @@ -0,0 +1,19 @@ +[Unit] +Description=Distributed Replicated Block Device +After=systemd-modules-load.service network.target + +[Service] +Type=oneshot +RemainAfterExit=yes + +# load config +ExecStart=/usr/sbin/drbdadm adjust all +# user interruptible version of wait-connect all +ExecStart=/usr/sbin/drbdadm wait-con-int +# become primary if configured +ExecStart=/usr/sbin/drbdadm sh-b-pri all +# disconnect and detach all resources +ExecStop=/usr/sbin/drbdadm down all + +[Install] +WantedBy=multi-user.target diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index cb9bdbfc9..49ce93a61 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75347 2012-08-20 19:15:16Z dreisner $ +# $Id: PKGBUILD 75385 2012-08-21 18:13:22Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Patrick Leslie Polzer @@ -8,7 +8,7 @@ pkgname=chrony pkgver=1.26 -pkgrel=5 +pkgrel=7 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64') url="http://chrony.tuxfamily.org/" @@ -21,7 +21,7 @@ source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz service) md5sums=('ad6dd619ff1986e4ff780363c64e2246' 'd8b653c8bcc76cef00aa10fbd3eeb4f7' - 'd78e6189c6f51a2af30a65bdedcdb2eb') + '778d85a6b42ccfab6460ec257b39ca4d') build() { cd $srcdir/$pkgname-$pkgver @@ -37,6 +37,6 @@ package() { install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/chrony install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service - install -dm755 "$pkgdir/usr/lib/ntp-units.d" - echo "$pkgname.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list" + install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d" + echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list" } diff --git a/community/chrony/service b/community/chrony/service index 8bc8da9d2..b04196f77 100644 --- a/community/chrony/service +++ b/community/chrony/service @@ -1,5 +1,6 @@ [Unit] Description=Chrony Network Time Daemon +After=network.target [Service] Type=forking diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD index 4b0695154..0ca635b09 100644 --- a/community/gputils/PKGBUILD +++ b/community/gputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61926 2012-01-11 02:52:12Z ebelanger $ +# $Id: PKGBUILD 75360 2012-08-21 09:13:35Z ebelanger $ # Contributor: Johannes Martin # Contributor: JJDaNiMoTh # Contributor: Stefan Husmann # Maintainer: Daniel J Griffiths pkgname=gputils -pkgver=0.14.1 +pkgver=0.14.2 pkgrel=1 pkgdesc="PIC Programming Utilities" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://gputils.sourceforge.net/" license=('GPL') depends=('glibc') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('d896de172a10afb77156a4fb8f393942') +md5sums=('90fa2803e77723de32b482f6a57d9c5a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index 123c4a0df..1d2778c8d 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75108 2012-08-14 06:07:46Z seblu $ +# $Id: PKGBUILD 75353 2012-08-21 06:05:32Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Andrea Zucchelli pkgname=keepalived -pkgver=1.2.5 +pkgver=1.2.6 pkgrel=1 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.rc' 'keepalived.service' 'keepalived.conf') -md5sums=('fce2b998cb3c81a4eb8eb960b1d8413f' +md5sums=('299f8c7eae521753c3e1f2689974982a' '0d7ea6296bce403a5d24be305a0a9d73' '7a327df915700dcd45a049d099c9c42b' '9c8142da8730ad27a345587dea83ced7') diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD index 5016dbbd4..83e17e7ec 100644 --- a/community/mariadb/PKGBUILD +++ b/community/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74962 2012-08-10 10:08:18Z bpiotrowski $ +# $Id: PKGBUILD 75383 2012-08-21 18:02:55Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') pkgver=5.5.25 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('GPL') url="http://mariadb.org/" @@ -117,7 +117,7 @@ package_mariadb() { install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/mysqld - install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysql.service + install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysqld.service install -Dm644 "${srcdir}"/tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysql.conf # provided by libmariadbclient diff --git a/community/mariadb/mariadb.install b/community/mariadb/mariadb.install index c9cc75b47..921147428 100644 --- a/community/mariadb/mariadb.install +++ b/community/mariadb/mariadb.install @@ -21,6 +21,11 @@ post_upgrade(){ done rm -rf /data fi + + if [ "$(vercmp $2 5.5.25-5)" -lt 0 ]; then + echo ">>> mysql.service has been renamed to mysqld.service to keep" + echo " consistency with MySQL package." + fi } post_remove(){ diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD index a6f4aa032..75a653a32 100644 --- a/community/mpdscribble/PKGBUILD +++ b/community/mpdscribble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74713 2012-08-02 09:37:39Z bpiotrowski $ +# $Id: PKGBUILD 75389 2012-08-21 18:46:41Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: evr @@ -6,7 +6,7 @@ pkgname=mpdscribble pkgver=0.22 -pkgrel=4 +pkgrel=5 pkgdesc='An mpd client which submits track info to last.fm' url='http://mpd.wikia.com/wiki/Client:Mpdscribble' arch=('i686' 'x86_64') @@ -38,7 +38,7 @@ package() { install -D "${srcdir}"/rc.d \ "${pkgdir}"/etc/rc.d/mpdscribble - install -D "${srcdir}"/service \ + install -Dm644 "${srcdir}"/service \ "${pkgdir}"/usr/lib/systemd/system/mpdscribble.service # default config is really an example diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index 7fc2b5931..060801249 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72623 2012-06-17 17:18:54Z seblu $ +# $Id: PKGBUILD 75356 2012-08-21 06:18:32Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Christian Hesse # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit -pkgver=1.12.4 +pkgver=1.12.5 pkgrel=1 pkgdesc='OATH one-time password toolkit' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL3') depends=('pam') options=('!libtool') source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('b8c267bb007a634c0f3514697060cb2d') +md5sums=('74b8a8616be0c7f94e92eab9703c730a') build() { cd $pkgname-$pkgver diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD index 899ae7e15..a02bd13c1 100644 --- a/community/openntpd/PKGBUILD +++ b/community/openntpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75345 2012-08-20 19:14:50Z dreisner $ +# $Id: PKGBUILD 75378 2012-08-21 16:04:24Z dreisner $ # Maintainer: Vesa Kaihlavirta # Contributor: Mark Rosenstand # Contributor: Giorgio Lando (adjtimex patch) @@ -6,7 +6,7 @@ pkgname=openntpd pkgver=3.9p1 -pkgrel=18 +pkgrel=19 pkgdesc="Free, easy to use implementation of the Network Time Protocol." url="http://www.openntpd.org/" arch=('x86_64' 'i686') @@ -53,8 +53,8 @@ package() { # avoid conflict with filesystem>=2012.06 rm -r "$pkgdir/run" - install -dm755 "$pkgdir/usr/lib/ntp-units.d" - echo "$pkgname.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list" + install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d" + echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list" } # vim:set ts=2 sw=2 et: diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index cd9d13003..7f17289f9 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,34 +1,38 @@ -# $Id: PKGBUILD 74623 2012-07-31 19:56:37Z ebelanger $ +# $Id: PKGBUILD 75395 2012-08-21 20:06:54Z ebelanger $ # Maintainer: Lukas Fleischer # Contributor: Alexander Baldeck -pkgname=projectm -pkgver=2.0.1 -pkgrel=6 -pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' +pkgbase=projectm +pkgname=('projectm' 'libvisual-projectm') +pkgver=2.1.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://projectm.sourceforge.net/' license=('LGPL') -depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext') -makedepends=('pkg-config' 'cmake') -source=("http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz" - 'libprojectM-2.0.1-pkg-config.patch' - 'libprojectM-2.0.1-fix-linking.patch') -md5sums=('f8bf795878cdbbef54784cf2390b4c89' - '4f258f4e7c2ab612931936bfd7f1f0fb' - '5c178cadf1e00ee4baf32cd9ccbc818c') +makedepends=('cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext') +source=("http://downloads.sourceforge.net/${pkgname}/projectM-complete-${pkgver}-Source.tar.gz") +md5sums=('debf30f7ce94ff0102f06fbb0cc4e92b') build() { - cd "${srcdir}/projectM-${pkgver}-Source" + cd "${srcdir}/projectM-complete-${pkgver}-Source/src" + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DINCLUDE-PROJECTM-QT=OFF \ + -DINCLUDE-PROJECTM-PULSEAUDIO=OFF -DINCLUDE-PROJECTM-TEST=OFF + make +} - patch -Np1 -i "${srcdir}/libprojectM-2.0.1-pkg-config.patch" - patch -Np1 -i "${srcdir}/libprojectM-2.0.1-fix-linking.patch" +package_projectm() { + pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' + depends=('ftgl' 'glew' 'gtkglext') - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release - make + cd "${srcdir}/projectM-complete-${pkgver}-Source/src/libprojectM" + make DESTDIR="${pkgdir}" install + install -m644 fonts/Vera.ttf "${pkgdir}/usr/share/projectM/fonts/Vera.ttf" } -package() { - cd "${srcdir}/projectM-${pkgver}-Source" +package_libvisual-projectm() { + pkgdesc='ProjectM XMMS plugin.' + depends=("projectm>=$pkgver" 'libvisual' 'sdl') + + cd "${srcdir}/projectM-complete-${pkgver}-Source/src/projectM-libvisual" make DESTDIR="${pkgdir}" install } diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD index 78ff87669..8307aa178 100644 --- a/community/python-pyzmq/PKGBUILD +++ b/community/python-pyzmq/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 71478 2012-05-27 09:02:29Z kkeen $ +# $Id: PKGBUILD 75372 2012-08-21 15:10:09Z kkeen $ # Maintainer: Kyle Keen pkgname=python-pyzmq -pkgver=2.2.0 +pkgver=2.2.0.1 pkgrel=1 pkgdesc="Python3 bindings for zeromq, written in Cython" arch=(i686 x86_64) @@ -9,9 +9,12 @@ url="http://www.zeromq.org/bindings:python" license=('LGPL') depends=(zeromq python) source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) -md5sums=('100b73973d6fb235b8da6adea403566e') +md5sums=('f2f80709e84c8ac72d6671eee645d804') build() { cd "$srcdir/pyzmq-$pkgver" + # py3 errors added in 2.2.0.1 + sed -i 's|except socket.error, e:|except socket.error as e:|' zmq/eventloop/ioloop.py + sed -i 's|except gevent.Timeout, t:|except gevent.Timeout as t:|' zmq/green/core.py python3 setup.py install --root="$pkgdir" --optimize=0 } diff --git a/community/python2-pyzmq/PKGBUILD b/community/python2-pyzmq/PKGBUILD index 32fd23136..3863778a3 100644 --- a/community/python2-pyzmq/PKGBUILD +++ b/community/python2-pyzmq/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 71479 2012-05-27 09:07:00Z kkeen $ +# $Id: PKGBUILD 75374 2012-08-21 15:13:14Z kkeen $ # Maintainer: Kyle Keen pkgname=python2-pyzmq -pkgver=2.2.0 +pkgver=2.2.0.1 pkgrel=1 pkgdesc="Python2 bindings for zeromq, written in Cython" arch=(i686 x86_64) @@ -9,7 +9,7 @@ url="http://www.zeromq.org/bindings:python" license=('LGPL') depends=(zeromq python2) source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) -md5sums=('100b73973d6fb235b8da6adea403566e') +md5sums=('f2f80709e84c8ac72d6671eee645d804') build() { cd "$srcdir/pyzmq-$pkgver" diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 35cc5a020..e62abfb7e 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74009 2012-07-18 01:08:49Z ibiru $ +# $Id: PKGBUILD 75387 2012-08-21 18:40:56Z bpiotrowski $ # Maintainer: Sergej Pupykin # Contributor: Andreas Wagner pkgname=schroot -pkgver=1.6.0 +pkgver=1.6.3 pkgrel=1 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" @@ -26,17 +26,20 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}. 'arch32-config' 'arch32-copyfiles' 'arch32-mount' - 'arch32-nssdatabases') -md5sums=('9b0a12077dbb0e3e384b4c9af0dc3195' + 'arch32-nssdatabases' + 'fix-bash-completion.patch') +md5sums=('f6b1badef213ce8e9ef37bb3fc213390' 'a8d77cac806a0a9adef3f93cdbeb280a' '1e34db5387c4e5de911e15d8a9208bdb' '5a3f7b839c7e0b8933748da7c5b6385b' '06db41d42f9fce5449a28feb76ded556' 'f0d5d5b5e34a860f6f90b5628c680f46' - 'af1da6edd8c8c0dafeeb2c2c4e0c840b') + 'af1da6edd8c8c0dafeeb2c2c4e0c840b' + '5ba775d4f401e2c167414caa548b71e5') build() { cd ${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/fix-bash-completion.patch export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" ./configure \ --prefix=/usr \ diff --git a/community/schroot/fix-bash-completion.patch b/community/schroot/fix-bash-completion.patch new file mode 100644 index 000000000..fb22fd92d --- /dev/null +++ b/community/schroot/fix-bash-completion.patch @@ -0,0 +1,11 @@ +--- a/etc/bash_completion/schroot ++++ b/etc/bash_completion/schroot +@@ -15,7 +15,7 @@ + # along with this program. If not, see + # . + +-have schroot && ++_have schroot && + _schroot() + { + local cur prev options diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD index a4bf827ca..c8908f544 100644 --- a/core/inetutils/PKGBUILD +++ b/core/inetutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157926 2012-04-30 06:14:42Z eric $ +# $Id: PKGBUILD 165512 2012-08-21 19:57:33Z eric $ # Maintainer: Eric Bélanger pkgname=inetutils pkgver=1.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/inetutils/" @@ -16,7 +16,7 @@ options=('!emptydirs') install=inetutils.install source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \ ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \ - dnsdomainname) + ftpd.service dnsdomainname) sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' 'ff0aad9946a38915580b094dadf67e790e8a2f87' '84dc802b5e57b5e04c847572225a3b9612017155' @@ -25,10 +25,12 @@ sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90' '27d99b910eec0fc26bd79ccc2c1de26608330298' '81f10b3b688e3952f793b35bcef63b5bf257a92b' '81f4a8da823cf0bb14284fc71ee6108849691eda' + '1c5ff1b6166c7401ef0956ce6eab30450ff95eaf' 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \ --without-wrap --with-pam \ @@ -66,4 +68,5 @@ package() { install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk" install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin" install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh" + install -D -m644 "${srcdir}/ftpd.service" "${pkgdir}/usr/lib/systemd/system/ftpd.service" } diff --git a/core/inetutils/ftpd.service b/core/inetutils/ftpd.service new file mode 100644 index 000000000..985eb9756 --- /dev/null +++ b/core/inetutils/ftpd.service @@ -0,0 +1,9 @@ +[Unit] +Description=FTPD Daemon + +[Service] +ExecStart=/usr/sbin/ftpd -D +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index b12951682..738fdd14b 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165345 2012-08-16 02:47:11Z dan $ +# $Id: PKGBUILD 165509 2012-08-21 14:11:50Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.11.5 +pkgver=1.7.12 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -22,11 +22,13 @@ optdepends=('tk: gitk and git gui' replaces=('git-core') provides=('git-core') backup=('etc/conf.d/git-daemon.conf') +install=git.install source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" git-daemon - git-daemon.conf) -changelog=ChangeLog + git-daemon.conf + git-daemon@.service + git-daemon.socket) build() { export PYTHON_PATH='/usr/bin/python2' @@ -46,6 +48,10 @@ check() { cd "$srcdir/$pkgname-$pkgver" local jobs jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') + mkdir -p /dev/shm/git-test + # We used to use this, but silly git regressions: + #GIT_TEST_OPTS="--root=/dev/shm/" \ + # http://comments.gmane.org/gmane.comp.version-control.git/202020 make prefix=/usr gitexecdir=/usr/lib/git-core \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ @@ -53,7 +59,7 @@ check() { NO_SVN_TESTS=y \ DEFAULT_TEST_TARGET=prove \ GIT_PROVE_OPTS="$jobs -Q" \ - GIT_TEST_OPTS="--root=/dev/shm/" \ + GIT_TEST_OPTS="--root=/dev/shm/git-test" \ test } @@ -67,14 +73,13 @@ package() { INSTALLDIRS=vendor DESTDIR="$pkgdir" install # bash completion - # until this is fixed, no point in loading it dynamically: - # http://git.661346.n2.nabble.com/bash-completion-now-loads-completions-dynamically-so-git-ps1-is-not-defined-when-you-open-a-shell-td7415323.html - #mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ - #install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git - mkdir -p "$pkgdir"/etc/bash_completion.d/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git + mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git + # fancy git prompt + mkdir -p "$pkgdir"/usr/share/git/ + install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh # more contrib stuff - cp -a ./contrib $pkgdir/usr/share/git/ + cp -a ./contrib/* $pkgdir/usr/share/git/ # scripts are for python 2.x sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ $(find "$pkgdir" -name '*.py') \ @@ -98,9 +103,15 @@ package() { # git daemon script install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf + + # systemd stuff + install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service + install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('9985d35c11531d546426ebefb327c847' - 'f08a5a60e57f00399bbd384cfd7791f3' +md5sums=('ceb1a6b17a3e33bbc70eadf8fce5876c' + '0070ad185cfc29da545abe35ba8862e7' '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78') + '2e42bf97779a1c6411d89043334c9e78' + '042524f942785772d7bd52a1f02fe5ae' + 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/git/git-daemon.socket b/extra/git/git-daemon.socket new file mode 100644 index 000000000..58ed2f154 --- /dev/null +++ b/extra/git/git-daemon.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Git Daemon Socket + +[Socket] +ListenStream=9418 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/extra/git/git-daemon@.service b/extra/git/git-daemon@.service new file mode 100644 index 000000000..55ca7141b --- /dev/null +++ b/extra/git/git-daemon@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Git Daemon Instance + +[Service] +User=git +# The '-' is to ignore non-zero exit statuses +ExecStart=-/usr/lib/git-core/git-daemon --inetd --export-all --base-path=/srv/git +StandardInput=socket +StandardOutput=inherit +StandardError=journal diff --git a/extra/git/git.install b/extra/git/git.install new file mode 100644 index 000000000..c0578dc1d --- /dev/null +++ b/extra/git/git.install @@ -0,0 +1,21 @@ +post_install() { + if ! getent group git >/dev/null; then + groupadd --system git + fi + if ! getent passwd git >/dev/null; then + useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + if getent passwd git >/dev/null; then + userdel git + fi + if getent group git >/dev/null; then + groupdel git + fi +} diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD index 2acd824e7..d9b7b3375 100644 --- a/extra/kradio/PKGBUILD +++ b/extra/kradio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164981 2012-08-07 18:56:07Z eric $ +# $Id: PKGBUILD 165496 2012-08-21 08:58:19Z eric $ # Maintainer: # Contributor: Tobias Powalowski pkgname=kradio -pkgver=4.0.5 +pkgver=4.0.6 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -13,8 +13,8 @@ depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') makedepends=('automoc4' 'cmake' 'boost') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc}) -md5sums=('d2ce6b9c12e66c8cdb300013aa0cb26a' - '3faef5c46547b14804839f367fd09d29') +md5sums=('ee9214156465e0416bb369f78b4a5eae' + 'f43706e63d24788f2278bada7b10cc6f') build() { cd "$srcdir" diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 2ad69005a..959a9f7bb 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165490 2012-08-20 19:14:16Z dreisner $ +# $Id: PKGBUILD 165511 2012-08-21 15:29:07Z dreisner $ # Maintainer: Gaetan Bisson # Contributor: kevin pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=10 +pkgrel=11 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -62,6 +62,6 @@ package() { mv man/man* "${pkgdir}"/usr/share/man mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd - install -dm755 "$pkgdir/usr/lib/ntp-units.d" - echo "ntpd.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list" + install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d" + echo "ntpd.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list" } diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD index 253bd1146..37f707e9e 100644 --- a/extra/timidity++/PKGBUILD +++ b/extra/timidity++/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163107 2012-07-07 06:45:30Z eric $ +# $Id: PKGBUILD 165513 2012-08-21 19:57:50Z eric $ # Maintainer: Eric Bélanger pkgname=timidity++ pkgver=2.14.0 -pkgrel=1 +pkgrel=3 pkgdesc="A MIDI to WAVE converter and player" arch=('i686' 'x86_64') url="http://timidity.sourceforge.net" @@ -14,10 +14,11 @@ optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface 'xaw3d: for using the Xaw interface') backup=('etc/timidity++/timidity.cfg') source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \ - timidity.cfg timidity++.sh) + timidity.cfg timidity++.sh timidity.service) sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b' '660b3afbb720d26e8f008034cee66dd8da082d6e' - '9f3e732a7ca1e97119a76df62ecf154df04d4f77') + '9f3e732a7ca1e97119a76df62ecf154df04d4f77' + 'f0351b9eb8928d3d82c380107654a7dbe7cd2d54') build() { cd "${srcdir}/TiMidity++-${pkgver}" @@ -33,4 +34,5 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg" install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++" + install -D -m644 ../timidity.service "${pkgdir}/usr/lib/systemd/system/timidity.service" } diff --git a/extra/timidity++/timidity.service b/extra/timidity++/timidity.service new file mode 100644 index 000000000..4d6ceea6a --- /dev/null +++ b/extra/timidity++/timidity.service @@ -0,0 +1,9 @@ +[Unit] +Description=TiMidity++ Daemon +After=sound.target + +[Service] +ExecStart=/usr/bin/timidity -iA + +[Install] +WantedBy=multi-user.target diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 89e9a668e..126dbd27b 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 165295 2012-08-15 00:30:47Z dreisner $ +# $Id: PKGBUILD 165515 2012-08-21 21:58:47Z dreisner $ # Maintainer: Dave Reisner # Contributor: Jaroslav Lichtblau # Contributor: Douglas Soares de Andrade # Contributor: Roberto Alsina pkgname=varnish -pkgver=3.0.2 -pkgrel=6 +pkgver=3.0.3 +pkgrel=1 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64') url="http://www.varnish-cache.org/" @@ -21,15 +21,18 @@ source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" "rc.$pkgname" varnish-vcl-reload varnish.service) -md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a' +md5sums=('714310c83fdbd2061d897dacd3f63d8b' 'edd1237d097d72173d9772754335890c' '40b4c83b3ad225ed2f4bd7e677fe41a2' - '56be884f43b8b4c900a073d9282f124a' + '03196dee7fc68e75069393d52c370762' '45cc1fd57aa2ffc22d6af62f9eedc842') build() { cd "$pkgname-$pkgver" + # disable JIT compilation for now, as it's crashy on VCL reload + sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/varnish/varnish-vcl-reload b/extra/varnish/varnish-vcl-reload index aaac385c4..7e84a258b 100644 --- a/extra/varnish/varnish-vcl-reload +++ b/extra/varnish/varnish-vcl-reload @@ -1,7 +1,6 @@ #!/bin/sh cfg=${1:-/etc/varnish/default.vcl} - if [ ! -e "$cfg" ]; then printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2 exit 1 -- cgit v1.2.3-54-g00ecf