diff options
111 files changed, 2241 insertions, 287 deletions
diff --git a/community-staging/cython/PKGBUILD b/community-staging/cython/PKGBUILD new file mode 100644 index 000000000..3966cdda6 --- /dev/null +++ b/community-staging/cython/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 77132 2012-10-05 11:24:38Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Igor Scabini <furester @ gmail.com> + +pkgname=('cython' 'cython2') +pkgbase=cython +pkgver=0.17 +pkgrel=2 +pkgdesc="C-Extensions for Python " +arch=(i686 x86_64) +url="http://www.cython.org" +license=('APACHE') +makedepends=('python-distribute' 'python2-distribute') +source=("http://cython.org/release/Cython-$pkgver.tar.gz") +md5sums=('d6b669956b25babf7dd86db0a98539e4') + +build() { + true +} + +package_cython() { + depends=('python') + + cd $srcdir/Cython-$pkgver + python setup.py install --root=$pkgdir + + sed -i 's|#!.*python|#!/usr/bin/python3|' $pkgdir/usr/bin/* +} + +package_cython2() { + depends=('python2') + + cd $srcdir/Cython-$pkgver + python2 setup.py install --root=$pkgdir + + mv $pkgdir/usr/bin/cygdb $pkgdir/usr/bin/cygdb2 + mv $pkgdir/usr/bin/cython $pkgdir/usr/bin/cython2 +} diff --git a/community-staging/python-pyzmq/PKGBUILD b/community-staging/python-pyzmq/PKGBUILD new file mode 100644 index 000000000..e771c2ad5 --- /dev/null +++ b/community-staging/python-pyzmq/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 77143 2012-10-05 13:37:01Z kkeen $ +# Maintainer: Kyle Keen <keenerd at gmail dot com> +pkgname=python-pyzmq +pkgver=2.2.0.1 +pkgrel=2 +pkgdesc="Python3 bindings for zeromq, written in Cython" +arch=(i686 x86_64) +url="http://www.zeromq.org/bindings:python" +license=('LGPL') +depends=(zeromq python) +source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) +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/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 82c044c67..390e6f6f5 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72451 2012-06-14 19:06:58Z spupykin $ +# $Id: PKGBUILD 77106 2012-10-05 10:14:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime24' 'libzdb' 'mhash' 'libevent') @@ -23,10 +23,18 @@ conflicts=('dbmail') provides=('dbmail') source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail.conf.d - dbmail.rc.d) + dbmail.rc.d + dbmail-imapd.service + dbmail-lmtpd.service + dbmail-pop3d.service + dbmail-timsieved.service) md5sums=('eb32235abffdf967253ee9d004e0e4a9' 'e7f72bc360decdb2475266391ad12329' - '30774513fb016b9da08e9cf6f2a0b8e7') + '30774513fb016b9da08e9cf6f2a0b8e7' + '845b8bfe40864c366f7ab69768d1faa2' + '81a59222a43ae89f59299fe798b8e072' + '2e9a9a56ae56218142a115bff3f9a272' + 'd1fb94edb272d2a717af1944ecfd7fce') build() { cd $srcdir/dbmail-${pkgver/_/-}/ @@ -47,4 +55,9 @@ package() { mkdir $pkgdir/usr/share/dbmail cp -r sql/* $pkgdir/usr/share/dbmail/ cp dbmail.schema $pkgdir/usr/share/dbmail/ + + install -Dm0644 $srcdir/dbmail-imapd.service $pkgdir/usr/lib/systemd/system/dbmail-imapd.service + install -Dm0644 $srcdir/dbmail-lmtpd.service $pkgdir/usr/lib/systemd/system/dbmail-lmtpd.service + install -Dm0644 $srcdir/dbmail-pop3d.service $pkgdir/usr/lib/systemd/system/dbmail-pop3d.service + install -Dm0644 $srcdir/dbmail-timsieved.service $pkgdir/usr/lib/systemd/system/dbmail-timsieved.service } diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service new file mode 100644 index 000000000..110bbbdc4 --- /dev/null +++ b/community/dbmail/dbmail-imapd.service @@ -0,0 +1,10 @@ +[Unit] +Description=DBMail Imap Server +After=syslog.target network.target mysqld.service postgresql.service + +[Service] +Type=forking +ExecStart=/usr/sbin/dbmail-imapd + +[Install] +WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service new file mode 100644 index 000000000..e531b2e3e --- /dev/null +++ b/community/dbmail/dbmail-lmtpd.service @@ -0,0 +1,10 @@ +[Unit] +Description=DBMail LMTP Server +After=syslog.target network.target mysqld.service postgresql.service + +[Service] +Type=forking +ExecStart=/usr/sbin/dbmail-lmtpd + +[Install] +WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service new file mode 100644 index 000000000..eacef4459 --- /dev/null +++ b/community/dbmail/dbmail-pop3d.service @@ -0,0 +1,10 @@ +[Unit] +Description=DBMail pop3 Server +After=syslog.target network.target mysqld.service postgresql.service + +[Service] +Type=forking +ExecStart=/usr/sbin/dbmail-pop3d + +[Install] +WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service new file mode 100644 index 000000000..847b69580 --- /dev/null +++ b/community/dbmail/dbmail-timsieved.service @@ -0,0 +1,10 @@ +[Unit] +Description=DBMail Sieve Server +After=syslog.target network.target mysqld.service postgresql.service + +[Service] +Type=forking +ExecStart=/usr/sbin/dbmail-timsieved + +[Install] +WantedBy=multi-user.target diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD index 041e99d5f..45d949f41 100644 --- a/community/dictd/PKGBUILD +++ b/community/dictd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65118 2012-02-20 04:52:24Z spupykin $ +# $Id: PKGBUILD 77122 2012-10-05 10:53:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> pkgname=dictd pkgver=1.12.0 -pkgrel=4 +pkgrel=5 pkgdesc="Online dictionary client and server" url="http://sourceforge.net/projects/dict/" license=('GPL') @@ -24,6 +24,7 @@ source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz" dict.conf dictd.conf dictd.confd + dictd.service site.info dictd.xinetd colorit.conf) @@ -32,6 +33,7 @@ md5sums=('71aaf3a697ea2e9409643f11ea85b53a' 'fb72f7d8c55f84b1b37bbc8d33a8e55a' '64cd6ffdb40fb3367224f91ac44926ac' '838887fee38ae4cebd652d399b1f2266' + '574e316d1f08885882d7b3075e1ea522' 'b8cabf913876e544d919c7f20ff8db9e' 'b7dbc9529df13ff895dae2b4abd080d6' '978c9c079a0fc8d7d42a4cd4000190e7') @@ -52,4 +54,5 @@ package() { install -D -m 0644 $srcdir/site.info $pkgdir/etc/dict/site.info install -D -m 0644 $srcdir/dictd.confd $pkgdir/etc/conf.d/dictd install -D -m 0644 $srcdir/colorit.conf $pkgdir/etc/dict/colorit.conf + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/dictd/dictd.service b/community/dictd/dictd.service new file mode 100644 index 000000000..fa219f72a --- /dev/null +++ b/community/dictd/dictd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Dictd Dictionary Server Daemon +After=network.target + +[Service] +Type=forking +EnvironmentFile=-/etc/conf.d/dictd +ExecStart=/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS + +[Install] +WantedBy=multi-user.target diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD index cb14285f2..5baa8c294 100644 --- a/community/dspam/PKGBUILD +++ b/community/dspam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70948 2012-05-20 12:51:03Z spupykin $ +# $Id: PKGBUILD 77118 2012-10-05 10:37:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=dspam pkgver=3.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="A scalable, open-source statistical anti-spam filter" arch=('i686' 'x86_64') url="http://dspam.nuclearelephant.com/" @@ -22,10 +22,14 @@ options=('zipman' 'docs' '!libtool') install=$pkgname.install source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz dspam.logrotated - dspam) + dspam + dspam.service + dspam.tmpfiles) md5sums=('0e0e405d3284485b2a43f47eaf6b09bb' '2163ca41de383f09f4d754e2d35cb158' - 'bb2300eff5b2a6eb987750c71a2c2169') + 'bb2300eff5b2a6eb987750c71a2c2169' + '1581a94598cec370b66f37b118970676' + '933643f2204ccbd7e451a439f83db1ea') build() { OPTS="--with-dspam-owner=dspam --with-dspam-group=dspam --enable-daemon --enable-virtual-users \ @@ -37,6 +41,7 @@ build() { [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc/dspam --localstatedir=/var ${OPTS} make } + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install @@ -66,4 +71,7 @@ package() { find -type l -exec ln -sf libdspam.3 {} \; chmod 0755 $pkgdir/usr/bin/* + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/dspam/dspam.service b/community/dspam/dspam.service new file mode 100644 index 000000000..1a5b1e710 --- /dev/null +++ b/community/dspam/dspam.service @@ -0,0 +1,11 @@ +[Unit] +Description=A highly accurate statistical spam filter that uses minimal resources + +[Service] +Type=forking +User=dspam +ExecStart=/usr/bin/dspam --daemon 2>/dev/null +PrivateTmp=true + +[Install] +WantedBy=multi-user.target
\ No newline at end of file diff --git a/community/dspam/dspam.tmpfiles b/community/dspam/dspam.tmpfiles new file mode 100644 index 000000000..9f5910969 --- /dev/null +++ b/community/dspam/dspam.tmpfiles @@ -0,0 +1 @@ +d /var/run/dspam 0770 dspam mail - diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index e18d678d8..327af4f3d 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73545 2012-07-09 12:52:21Z spupykin $ +# $Id: PKGBUILD 77108 2012-10-05 10:15:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.11 -pkgrel=3 +pkgrel=4 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686') url="http://www.ejabberd.im/" @@ -14,11 +14,13 @@ depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2') backup=(etc/ejabberd/ejabberd.cfg etc/logrotate.d/ejabberd) install=$pkgname.install source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz" - "$pkgname.logrotate" - "$pkgname") + "$pkgname.logrotate" + "$pkgname" + "ejabberd.service") md5sums=('a70b040c4e7602f47718c8afe8780d50' 'f97c8a96160f30e0aecc9526c12e6606' - '2338a6230ce5f9f60be6dddcfa39bc7e') + '2338a6230ce5f9f60be6dddcfa39bc7e' + 'bc4552b833e1927fce52acdbc6d76fb2') build() { cd "$srcdir/$pkgname-$pkgver/src" @@ -35,6 +37,7 @@ package() { install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" chmod ug+r "$pkgdir/etc/$pkgname/"* rm -rf "$pkgdir/var/lock" + install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service } # vim:set ts=2 sw=2 et: diff --git a/community/ejabberd/ejabberd.service b/community/ejabberd/ejabberd.service new file mode 100644 index 000000000..47e5f2e27 --- /dev/null +++ b/community/ejabberd/ejabberd.service @@ -0,0 +1,20 @@ +[Unit] +Description=A distributed, fault-tolerant Jabber/XMPP server +After=network.target + +[Service] +Type=oneshot +User=ejabberd +Group=jabber +LimitNOFILE=16000 +RestartSec=5 +ExecStart=/usr/sbin/ejabberdctl \ + --config /etc/ejabberd/ejabberd.cfg \ + --ctl-config /etc/ejabberd/ejabberdctl.cfg \ + --logs "/var/log/ejabberd" \ + --spool "/var/lib/ejabberd" start +ExecStop=/usr/sbin/ejabberdctl stop +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index a79adcaed..43586cdaf 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76509 2012-09-20 10:48:44Z spupykin $ +# $Id: PKGBUILD 77120 2012-10-05 10:52:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" @@ -17,11 +17,13 @@ install=$pkgname.install source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig} radiusd freeradius.tmpfiles + freeradius.service krb5-build-fix.patch) md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119' '5dd57af81ba075102581fec45316ba7b' 'f1a6530b1b69d2fa793aa45b2de379bb' 'f959e89812bedfc9f8308076f78cd74e' + '39eba6d34f8249781e9e917646465632' 'c6a61de7576933f59154a53bfc12a2d2') build() { @@ -44,5 +46,7 @@ package() { chmod o+r $pkgdir/etc/raddb/* mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default rm -rf $pkgdir/var/run - install -Dm0644 $srcdir/freeradius.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/freeradius/freeradius.service b/community/freeradius/freeradius.service new file mode 100644 index 000000000..635b6d6f8 --- /dev/null +++ b/community/freeradius/freeradius.service @@ -0,0 +1,15 @@ +[Unit] +Description=FreeRADIUS high performance RADIUS server. +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/radiusd/radiusd.pid +ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd +ExecStartPre=/usr/sbin/radiusd -C +ExecStart=/usr/sbin/radiusd -d /etc/raddb +ExecReload=/usr/sbin/radiusd -C +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index b276646ef..67e672807 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65574 2012-02-21 09:02:39Z spupykin $ +# $Id: PKGBUILD 77124 2012-10-05 11:03:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Allan Henriksen <allan.henriksen@gmail.com> pkgname=ipsec-tools pkgver=0.8.0 -pkgrel=3 +pkgrel=4 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64') url="http://ipsec-tools.sourceforge.net/" @@ -14,10 +14,12 @@ license=('GPL') options=('!makeflags' '!libtool') source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 racoon.rc - ipsec.rc) + ipsec.rc + racoon.service) md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619' '416b8e362d86987b8c55f7153cdafbeb' - '90d0810267cbd847383ae3101699b192') + '90d0810267cbd847383ae3101699b192' + '1632fce55ba5592dea1f8bf661106e7d') build() { cd $srcdir/$pkgname-$pkgver @@ -33,4 +35,5 @@ package() { make DESTDIR=$pkgdir install install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec + install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service } diff --git a/community/ipsec-tools/racoon.service b/community/ipsec-tools/racoon.service new file mode 100644 index 000000000..792cfd395 --- /dev/null +++ b/community/ipsec-tools/racoon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Racoon IKEv1 key management daemon for IPSEC +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/racoon + +[Install] +WantedBy=multi-user.target diff --git a/community/kleansweep/PKGBUILD b/community/kleansweep/PKGBUILD index 9c6a32689..c6783590d 100644 --- a/community/kleansweep/PKGBUILD +++ b/community/kleansweep/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 65612 2012-02-21 09:38:19Z spupykin $ +# $Id: PKGBUILD 77134 2012-10-05 11:29:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Guillermo A. Amaral <me@guillermoamaral.com> pkgname=kleansweep pkgver=0.2.9 -pkgrel=5 +pkgrel=6 pkgdesc="Allows you to reclaim disk space by finding unneeded files" license=("GPL") url="http://linux.bydg.org/~yogin/" arch=(i686 x86_64) -depends=('kdelibs3' 'python') +depends=('kdelibs3') makedepends=('scons') options=('libtool') #source=(http://linux-projects.net/d/kleansweep-$pkgver.tar.gz diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index dae948032..53837f7eb 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57954 2011-11-04 21:05:32Z lcarlier $ +# $Id: PKGBUILD 77126 2012-10-05 11:04:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> # Maintainer: Thomas Mudrunka <harvie@@email..cz> pkgname=mcelog pkgver=1.0pre3 -pkgrel=3 +pkgrel=4 pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" license=("GPL") @@ -13,23 +13,24 @@ arch=('i686' 'x86_64') options=('docs') #source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz" source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "${pkgname}.rc") + "${pkgname}.rc" + "mcelog.service") md5sums=('b42f2214de6f4feb992556149edc67fa' - 'f039a77d7bde3518d3d695b144816e8a') + 'f039a77d7bde3518d3d695b144816e8a' + '4e563f1124c09b3368532d37f9f4bba3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - mkdir -p $pkgdir/usr/share/doc/mcelog make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron" install -Dm0755 "${srcdir}/mcelog.rc" "${pkgdir}/etc/rc.d/mcelog" install -Dm0644 mcelog.logrotate "${pkgdir}/etc/logrotate.d/mcelog.logrotate" install -Dm0644 README "${pkgdir}/usr/share/doc/mcelog/README" + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service new file mode 100644 index 000000000..62d8cbed0 --- /dev/null +++ b/community/mcelog/mcelog.service @@ -0,0 +1,17 @@ +[Unit] +Description=Machine Check Exception Logging Daemon +After=syslog.target + +# FIXME - due to upstream kernel bug always start the mcelog process +# twice using the following ExecStartPre hack. This needs fixing. +# There is a bug filed against systemd for the ExecStartPre bit +# since it is not possible to specify that the ExecStarPre bit +# is allowed and expected to fail without aborting the daemon. + +[Service] +ExecStartPre=/etc/mcelog/mcelog.setup +ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground +StandardOutput=syslog + +[Install] +WantedBy=multi-user.target diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index dc4274b07..70ca80682 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74031 2012-07-18 09:43:20Z jconder $ +# $Id: PKGBUILD 77158 2012-10-05 23:55:11Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -13,7 +13,7 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweather' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') -pkgver=0.25.2 +pkgver=0.26.0 pkgrel=1 epoch=1 arch=('i686' 'x86_64') @@ -23,19 +23,16 @@ makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif' 'libvorbis' 'mplayer' 'mythtv' 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' - 'python2-oauth' 'python-imaging' 'python-pycurl' 'taglib' 'zlib') + 'python2-oauth' 'python-imaging' 'python2-pycurl' 'taglib' 'zlib') source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" - 'php54.patch' 'mtd.rc') -md5sums=('80466458a82759d213fe69af63d6dc80' - '7a114c1b5a84ab5ee190e63cc9514086' +md5sums=('15bd7b2f4173488966f3d761e0eacffa' '476c12ba074794ad7f4ae092bdf949d6') build() { cd "$srcdir/$pkgbase-$pkgver" find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - patch -d 'mythweb' -Np0 -i "$srcdir/php54.patch" sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php' sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp' diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 12f45c209..9bb22db0a 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75832 2012-09-02 02:47:28Z jconder $ +# $Id: PKGBUILD 77156 2012-10-05 23:37:53Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=0.25.2 -pkgrel=2 +pkgver=0.26.0 +pkgrel=1 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -32,7 +32,7 @@ source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'mythbackend.rc' 'mythbackend.conf' 'mythbackend.service') -md5sums=('2bf8c0aa75e88d39747e59c27aa6072e' +md5sums=('f57066bf75e6f14824c494d41639f4f9' 'c8f935d42fb8617e9279bd539811ca5f' 'ab962d83614cbd0ac11ce3fcc929829d' 'e4d572dcc307d6d8ae26bee5aebf9f3a') diff --git a/community/mythtv/mythtv.install b/community/mythtv/mythtv.install index eed25b868..90ad79d28 100644 --- a/community/mythtv/mythtv.install +++ b/community/mythtv/mythtv.install @@ -3,6 +3,8 @@ post_upgrade() { getent group mythtv &>/dev/null || groupadd -r mythtv >/dev/null useradd -rmd /var/lib/mythtv -g mythtv -G video,audio,optical -s /bin/bash mythtv >/dev/null fi + + echo -e "You may need to load time zone tables in MySQL.\nSee http://www.mythtv.org/wiki/MySQL_Time_Zone_Tables" } post_install() { diff --git a/community/python2-imaging/PKGBUILD b/community/python2-imaging/PKGBUILD new file mode 100644 index 000000000..d9f5b18f5 --- /dev/null +++ b/community/python2-imaging/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 77148 2012-10-05 14:37:44Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: simo <simo@archlinux.org> + +pkgname=python2-imaging +pkgver=1.1.7 +pkgrel=5 +pkgdesc="PIL. Provides image processing capabilities for python" +arch=('i686' 'x86_64') +url="http://www.pythonware.com/products/pil/index.htm" +license=('custom:"pil"') +depends=('python2' 'libjpeg' 'freetype2' 'lcms') +makedepends=('tk' 'sane') +optdepends=('tk: for the ImageTK module' + 'sane: for the ImageSane module') +provides=("pil=${pkgver}" "python-imaging=${pkgver}") +conflicts=('pil' 'python-imaging') +replaces=('pil' 'python-imaging') +source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz) +md5sums=('fc14a54e1ce02a0225be8854bfba478e') + +build() { + cd "${srcdir}/Imaging-${pkgver}" + python2 setup.py build_ext + cd Sane + python2 setup.py build_ext +} + +package() { + cd "${srcdir}/Imaging-${pkgver}" + python2 setup.py install --root="${pkgdir}" --optimize=1 + + pushd Sane + python2 setup.py install --root="${pkgdir}" --optimize=1 + popd + + install -dm755 "${pkgdir}/usr/include/python2.7/" + install -m644 -t "${pkgdir}/usr/include/python2.7/" libImaging/*.h + + # do not have files ending in .py in /usr/bin + for f in pildriver pilprint pilconvert pilfile pilfont; do + mv "${pkgdir}"/usr/bin/${f}{.py,} + done + + # Install license + install -Dm644 "${srcdir}/Imaging-${pkgver}/README" \ + "${pkgdir}/usr/share/licenses/${pkgname}/README" +} diff --git a/community/rng-tools/PKGBUILD b/community/rng-tools/PKGBUILD new file mode 100644 index 000000000..8e886488a --- /dev/null +++ b/community/rng-tools/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Alasdair Haswell <ali at arhaswell dot co dot uk> + +pkgname=rng-tools +pkgver=4 +pkgrel=1 +pkgdesc="Random number generator related utilities" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/gkernel/" +license=('GPL') +backup=(etc/conf.d/rngd) +source=(http://downloads.sourceforge.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz + rngd + rngd.conf + rngd.service) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm0644 "$srcdir/rngd.service" "$pkgdir/usr/lib/systemd/system/rngd.service" + install -Dm0755 "$srcdir/rngd" "$pkgdir/etc/rc.d/rngd" + install -Dm0644 "$srcdir/rngd.conf" "$pkgdir/etc/conf.d/rngd" +} + +sha256sums=('b71bdfd4222c05e8316001556be90e1606f2a1bac3efde60153bd84e873cc195' + '45084eff83306c74e707a72b44b5b20d8b94777377af414e1c43f738c7a720ed' + 'a4a19dbe5403b9dcb2bc6b3699dcaba7a47ff3e3ccf58aa3bdbfe14eb1d16003' + 'abf163089fc466e45955fd0da98a20a966b3b0b4c714c27b470d03fedfc04ca3') diff --git a/community/rng-tools/rngd b/community/rng-tools/rngd new file mode 100755 index 000000000..bd6b8d62f --- /dev/null +++ b/community/rng-tools/rngd @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +rnd_device=/dev/random +rng_device=/dev/hw_random +timeout=0 + +[ -f /etc/conf.d/rngd ] && . /etc/conf.d/rngd +PID=$(pidof -o %PPID /usr/sbin/rngd) +case "$1" in + start) + stat_busy "Starting RNG" + [ -z "$PID" ] && /usr/sbin/rngd $RNGD_OPTS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon rngd + stat_done + fi + ;; + stop) + stat_busy "Stopping RNG" + [ ! -z "$PID" ] && kill -s SIGALRM $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon rngd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/rng-tools/rngd.conf b/community/rng-tools/rngd.conf new file mode 100644 index 000000000..8ff9a639e --- /dev/null +++ b/community/rng-tools/rngd.conf @@ -0,0 +1 @@ +RNGD_OPTS="-o /dev/random -r /dev/urandom" diff --git a/community/rng-tools/rngd.service b/community/rng-tools/rngd.service new file mode 100644 index 000000000..87185bc32 --- /dev/null +++ b/community/rng-tools/rngd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Hardware RNG Entropy Gatherer Daemon + +[Service] +EnvironmentFile=/etc/conf.d/rngd +ExecStart=/usr/sbin/rngd -f $RNGD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/community/ser2net/PKGBUILD b/community/ser2net/PKGBUILD index e9c4b0f5d..50cf15ded 100644 --- a/community/ser2net/PKGBUILD +++ b/community/ser2net/PKGBUILD @@ -1,26 +1,33 @@ -# $Id: PKGBUILD 65435 2012-02-21 05:45:30Z spupykin $ +# $Id: PKGBUILD 77110 2012-10-05 10:16:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=ser2net -pkgver=2.7 -pkgrel=2 +pkgver=2.8rc3 +pkgrel=1 pkgdesc="A proxy that allows telnet/tcp connections to be made to serial ports" arch=(i686 x86_64) url="http://sourceforge.net/projects/ser2net" license=('GPL') depends=('glibc') backup=(etc/ser2net.conf) -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - ser2net.init) -md5sums=('22977477789868923a5de09a85e847dd' - '6db420d54ce8f78464e885efe935dd18') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz + ser2net.init + ser2net.service) +md5sums=('bbe95fb557781c314d321356897a50b9' + '6db420d54ce8f78464e885efe935dd18' + '7f9d879325b9ed6ddc313dcbc3f83e56') build() { - cd $srcdir/${pkgname}-${pkgver} + cd $srcdir/${pkgname}-${pkgver/rc/-rc} ./configure --prefix=/usr make +} + +package() { + cd $srcdir/${pkgname}-${pkgver/rc/-rc} make DESTDIR=$pkgdir install - install -D -m 0644 ser2net.conf $pkgdir/etc/ser2net.conf - install -D -m 0755 ../ser2net.init $pkgdir/etc/rc.d/ser2net + install -Dm0644 ser2net.conf $pkgdir/etc/ser2net.conf + install -Dm0755 $srcdir/ser2net.init $pkgdir/etc/rc.d/ser2net + install -Dm0644 $srcdir/ser2net.service $pkgdir/usr/lib/systemd/system/ser2net.service } diff --git a/community/ser2net/ser2net.service b/community/ser2net/ser2net.service new file mode 100644 index 000000000..fcf054e22 --- /dev/null +++ b/community/ser2net/ser2net.service @@ -0,0 +1,11 @@ +[Unit] +Description=Proxy that allows tcp connections to serial ports +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/ser2net + +[Install] +WantedBy=multi-user.target + diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index ca5c3f465..df0d7aa23 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74566 2012-07-30 14:16:23Z spupykin $ +# $Id: PKGBUILD 77129 2012-10-05 11:05:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat pkgver=10.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64') url="http://pagesperso-orange.fr/sebastien.godard/" @@ -16,9 +16,11 @@ options=(zipman) backup=('etc/conf.d/sysstat' 'etc/conf.d/sysstat.ioconf') source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz - sysstat) + sysstat + sysstat.service) md5sums=('8250cdcbc4a959c8a05e4186fbd13d84' - '3ce41ebf7330aba01e70b38658afed1f') + '3ce41ebf7330aba01e70b38658afed1f' + 'f447a8081a07a73407b4b04afc027ebc') build() { cd $srcdir/$pkgname-$pkgver @@ -37,4 +39,5 @@ package() { install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat chown -R root:root $pkgdir + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/sysstat/sysstat.service b/community/sysstat/sysstat.service new file mode 100644 index 000000000..267374d3e --- /dev/null +++ b/community/sysstat/sysstat.service @@ -0,0 +1,12 @@ +[Unit] +Description= Resets System Activity Logs +After=syslog.target + +[Service] +Type=oneshot +ExecStart=@LIBDIR@/sa/sa1 --boot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target + diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index e6936d7ea..0eaa673bb 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65258 2012-02-20 12:39:15Z spupykin $ +# $Id: PKGBUILD 77112 2012-10-05 10:17:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hengfu <rhfcaesar@gmail.com> pkgname=xl2tpd pkgver=1.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64') url="http://www.xelerance.com/services/software/xl2tpd/" @@ -18,12 +18,16 @@ source=(http://arch.p5n.pp.ru/~sergej/dl/2012/xl2tpd-$pkgver.tar.gz xl2tpd.conf.client-example xl2tpd.conf.server-example options.l2tpd + xl2tpd.service + xl2tpd.tmpfiles ipparam.patch) md5sums=('28264284552c442b24cf421755a2bb48' '1439d13084fc09c2a19c97b24a834345' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' 'ed57eb67335cdf246251285dad502cc7' + '5ba9ddaf66c9827fe4a2caef67cf61c2' + '2e95e4fc03e1521ab20fd7e249efab5a' '4d258a58cc109d5c4d96af8f81d481cf') build() { @@ -38,4 +42,7 @@ build() { install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example install -D -m0644 $srcdir/options.l2tpd $pkgdir/etc/ppp/options.l2tpd + + install -Dm0644 $srcdir/xl2tpd.service $pkgdir/usr/lib/systemd/system/xl2tpd.service + install -Dm0644 $srcdir/xl2tpd.tmpfiles $pkgdir/usr/lib/tmpfiles.d/xl2tpd.conf } diff --git a/community/xl2tpd/xl2tpd.service b/community/xl2tpd/xl2tpd.service new file mode 100644 index 000000000..b47cadf02 --- /dev/null +++ b/community/xl2tpd/xl2tpd.service @@ -0,0 +1,15 @@ +[Unit] +Description=Level 2 Tunnel Protocol Daemon (L2TP) +After=syslog.target network.target +After=ipsec.service +# Some ISPs in Russia use l2tp without IPsec, so don't insist anymore +#Wants=ipsec.service + +[Service] +Type=simple +PIDFile=/var/run/xl2tpd/xl2tpd.pid +ExecStart=/usr/sbin/xl2tpd -D +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/community/xl2tpd/xl2tpd.tmpfiles b/community/xl2tpd/xl2tpd.tmpfiles new file mode 100644 index 000000000..139680eb2 --- /dev/null +++ b/community/xl2tpd/xl2tpd.tmpfiles @@ -0,0 +1 @@ +d /var/run/xl2tpd 0755 root root - diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 2c5b6f907..5e690e728 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 164224 2012-07-27 20:04:40Z dreisner $ +# $Id: PKGBUILD 168061 2012-10-05 15:07:13Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> + pkgname=btrfs-progs -pkgver=0.19.20120328 -pkgrel=4 +pkgver=0.19.20120904 +pkgrel=7 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64) depends=('glibc' 'e2fsprogs') @@ -13,17 +14,22 @@ conflicts=('btrfs-progs-unstable') provides=('btrfs-progs-unstable') license=('GPL2') source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz - 70-btrfs.rules - initcpio-install-btrfs - initcpio-hook-btrfs) -md5sums=('f4504e73cf9254779b78d5b2318ac570' - '345c62c8b267082361729ca5b647518f' - 'e5186ec3fe8a809b7473470128d1c4ab' - '9fb35142755b477a96cb7292f3d64839') + initcpio-install-btrfs + initcpio-hook-btrfs + 70-btrfs.rules) +#install=btrfs-progs.install build() { cd $srcdir/$pkgname-$pkgver make CFLAGS="$CFLAGS" + + # install mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-btrfs" \ + "$pkgdir/usr/lib/initcpio/install/btrfs" + install -Dm644 "$srcdir/initcpio-hook-btrfs" \ + "$pkgdir/usr/lib/initcpio/hooks/btrfs" + install -Dm644 "$srcdir/70-btrfs.rules" \ + "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules" } package() { @@ -34,13 +40,8 @@ package() { mv $pkgdir/usr/man $pkgdir/usr/share/man mkdir -p ${pkgdir}/sbin ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs - - # add udev rule - install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules" - - # install mkinitcpio hooks - install -Dm644 "$srcdir/initcpio-install-btrfs" \ - "$pkgdir/usr/lib/initcpio/install/btrfs" - install -Dm644 "$srcdir/initcpio-hook-btrfs" \ - "$pkgdir/usr/lib/initcpio/hooks/btrfs" } +md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2' + 'e5186ec3fe8a809b7473470128d1c4ab' + '9fb35142755b477a96cb7292f3d64839' + '345c62c8b267082361729ca5b647518f') diff --git a/core/btrfs-progs/btrfs-progs.install b/core/btrfs-progs/btrfs-progs.install new file mode 100644 index 000000000..077d7529a --- /dev/null +++ b/core/btrfs-progs/btrfs-progs.install @@ -0,0 +1,9 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then + echo "btrfs multi-device support now relies on linux 3.6 or later" + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 8dc086a4a..f895939ef 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,29 +3,26 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=193 +pkgver=194 pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' - 'pam' 'quota-tools' 'xz') -checkdepends=('python') + 'pam' 'python' 'quota-tools' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - '0001-tmpfiles-restore-previous-behavior-for-F-f.patch' 'use-split-usr-path.patch') -md5sums=('732a9de2b1d2a15cab639c987ff9e90e' +md5sums=('0ebb73aea444693b9b86f7a76f5df23c' 'e99e9189aa2f6084ac28b8ddf605aeb8' - '59e91c4d7a69b7bf12c86a9982e37ced' + 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - '1f435290db227c3a4f4396f86819227e' 'fd5b5f04ab0a847373d357555129d4c0') build() { @@ -37,9 +34,6 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0 - patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch" - ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -141,14 +135,9 @@ package_systemd() { package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" - conflicts=('sysvinit' 'initscripts') + conflicts=('sysvinit') depends=('sysvinit-tools') - # the initscripts conflict here isn't actually needed, but in order to make - # this package remove both sysvinit and initscripts, the initscripts conflict - # is needed. There's no case in which you would ever want initscripts installed - # without sysvinit, and vice versa, as in both cases, they are unusable. - mv "$srcdir/_sysvcompat"/* "$pkgdir" install -dm755 "$pkgdir/sbin" diff --git a/core/systemd/initcpio-install-udev b/core/systemd/initcpio-install-udev index 762429983..15124b8f7 100644 --- a/core/systemd/initcpio-install-udev +++ b/core/systemd/initcpio-install-udev @@ -7,7 +7,7 @@ build() { add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd add_binary /usr/bin/udevadm - for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do add_file "/usr/lib/udev/rules.d/$rules" done for tool in ata_id scsi_id; do diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index ae7784fe6..deba92866 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166963 2012-09-23 12:22:32Z tomegun $ +# $Id: PKGBUILD 168016 2012-10-05 10:13:37Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.22 -pkgrel=6 +pkgrel=7 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') diff --git a/core/util-linux/util-linux.install b/core/util-linux/util-linux.install index 35f80e2a2..969a4aecf 100644 --- a/core/util-linux/util-linux.install +++ b/core/util-linux/util-linux.install @@ -1,13 +1,4 @@ post_install() { - # create user for uuidd - if ! getent group uuidd >/dev/null; then - groupadd -r uuidd - fi - - if ! getent passwd uuidd >/dev/null; then - useradd -r -s /sbin/nologin -d / -g uuidd uuidd - fi - # we don't want use systemd-tmpfiles here because # the package dependency would create a circular dep. if [ ! -d run/uuidd ]; then @@ -27,13 +18,3 @@ post_upgrade() { post_install } - -post_remove() { - if getent passwd uuidd >/dev/null; then - userdel uuidd - fi - - if getent group uuidd >/dev/null; then - userdel uuidd - fi -} diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD index a1124e1d6..d85caecac 100644 --- a/extra/avogadro/PKGBUILD +++ b/extra/avogadro/PKGBUILD @@ -1,34 +1,22 @@ -# $Id: PKGBUILD 163702 2012-07-18 01:05:05Z ibiru $ +# $Id: PKGBUILD 168030 2012-10-05 13:24:09Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=avogadro -pkgver=1.0.3 -pkgrel=6 +pkgver=1.1.0 +pkgrel=1 pkgdesc="An advanced molecular editor based on Qt" arch=('i686' 'x86_64') url="http://avogadro.openmolecules.net/wiki/Main_Page" license=('GPL2') depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') -makedepends=('cmake' 'boost') +makedepends=('cmake' 'boost' 'doxygen') install=avogadro.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'replace-qt4_automoc-with-qt4_wrap_cpp.patch' - 'fix-boost.patch' - 'fix-opengl-headers.patch') -md5sums=('92c2702c1980f70fb6d87a1a58147911' - 'aec516daab066c15326a9681f8f15abc' - '46282e4709429447e44a0a54d51ad2ec' - 'f420bfd22e3d5d8fcddc625cf5e711f6') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('f4fbef5ffc69cc312b2316426c36a78d') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch - patch -p1 -i "${srcdir}"/fix-boost.patch - patch -p1 -i "${srcdir}"/fix-opengl-headers.patch - - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -40,6 +28,6 @@ build() { } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/geeqie/PKGBUILD b/extra/geeqie/PKGBUILD index 056678ba0..5c65d5f78 100644 --- a/extra/geeqie/PKGBUILD +++ b/extra/geeqie/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165236 2012-08-14 01:43:09Z eric $ +# $Id: PKGBUILD 168110 2012-10-06 01:00:22Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=geeqie pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight image browser and viewer" arch=('i686' 'x86_64') url="http://geeqie.sourceforge.net/" @@ -13,11 +13,14 @@ depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils') makedepends=('intltool' 'doxygen' 'gnome-doc-utils') optdepends=('librsvg: SVG rendering') install=geeqie.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('77167479e91e03d9512535a146c5d2d77941257f') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + geeqie-fix-fullscreen.patch) +sha1sums=('77167479e91e03d9512535a146c5d2d77941257f' + '57c8b058e6ec1fc2f691650b212acc5dafcd5891') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i"${srcdir}/geeqie-fix-fullscreen.patch" CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr make } diff --git a/extra/geeqie/geeqie-fix-fullscreen.patch b/extra/geeqie/geeqie-fix-fullscreen.patch new file mode 100644 index 000000000..0547395a3 --- /dev/null +++ b/extra/geeqie/geeqie-fix-fullscreen.patch @@ -0,0 +1,143 @@ +Description: Make fullscreen modes actually use the full screen. + The default fullscreen mode now leaves everything up to the window manager, + which usually produces the best result. Custom fullscreen modes now use + override-redirect to ensure docks and panels never obscure the image. +Author: Daniel van Vugt <vanvugt@gmail.com> +Bug: http://sourceforge.net/support/tracker.php?aid=2925034 +Bug-Ubuntu: https://launchpad.net/bugs/788321 +Forwarded: yes + +=== modified file 'src/fullscreen.c' +--- old/src/fullscreen.c 2010-02-26 10:41:38 +0000 ++++ new/src/fullscreen.c 2011-08-16 03:55:04 +0000 +@@ -218,75 +218,65 @@ + void (*stop_func)(FullScreenData *, gpointer), gpointer stop_data) + { + FullScreenData *fs; +- GdkScreen *screen; +- gboolean same; +- gint x, y; +- gint w, h; +- GdkGeometry geometry; + + if (!window || !imd) return NULL; + ++ DEBUG_1("full screen requests screen %d", options->fullscreen.screen); ++ + fs = g_new0(FullScreenData, 1); +- + fs->cursor_state = FULLSCREEN_CURSOR_HIDDEN; +- + fs->normal_window = window; + fs->normal_imd = imd; +- + fs->stop_func = stop_func; + fs->stop_data = stop_data; +- +- DEBUG_1("full screen requests screen %d", options->fullscreen.screen); +- fullscreen_prefs_get_geometry(options->fullscreen.screen, window, &x, &y, &w, &h, +- &screen, &same); +- +- fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL, _("Full screen")); +- +- /* this requests no decorations, if you still have them complain to the window manager author(s) */ +- gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE); ++ fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL, ++ _("Full screen")); + + if (options->fullscreen.screen < 0) +- { +- /* If we want control of the window size and position this is not what we want. +- * Geeqie needs control of which monitor(s) to use for full screen. +- */ ++ { /* Fullscreen as determined by the window manager... */ + gtk_window_fullscreen(GTK_WINDOW(fs->window)); + } +- else if (options->fullscreen.above) +- { +- /* request to be above other windows */ +- gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE); ++ else ++ { /* Custom fullscreen modes. Done by hand, the hard way... */ ++ GdkScreen *screen; ++ gint x, y, w, h; ++ GdkGeometry geometry; ++ GtkWindow *gtkwin = GTK_WINDOW(fs->window); ++ GdkWindow *gdkwin; ++ ++ fullscreen_prefs_get_geometry(options->fullscreen.screen, ++ window, &x, &y, &w, &h, &screen, NULL); ++ ++ if (options->fullscreen.above) ++ gtk_window_set_keep_above(gtkwin, TRUE); ++ ++ gtk_window_set_screen(gtkwin, screen); ++ gtk_window_set_decorated(gtkwin, FALSE); ++ gtk_window_set_resizable(gtkwin, FALSE); ++ gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0); ++ ++ geometry.min_width = w; ++ geometry.min_height = h; ++ geometry.max_width = w; ++ geometry.max_height = h; ++ geometry.base_width = w; ++ geometry.base_height = h; ++ gtk_window_set_geometry_hints(gtkwin, fs->window, &geometry, ++ GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | ++ GDK_HINT_BASE_SIZE); ++ ++ gtk_window_set_default_size(gtkwin, w, h); ++ gtk_window_move(gtkwin, x, y); ++ ++ gtk_widget_realize(fs->window); ++ gdkwin = gtk_widget_get_window(fs->window); ++ if (gdkwin != NULL) ++ gdk_window_set_override_redirect(gdkwin, TRUE); + } + +- gtk_window_set_resizable(GTK_WINDOW(fs->window), FALSE); +- +- gtk_window_set_screen(GTK_WINDOW(fs->window), screen); +- gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0); + g_signal_connect(G_OBJECT(fs->window), "delete_event", + G_CALLBACK(fullscreen_delete_cb), fs); + +- geometry.min_width = w; +- geometry.min_height = h; +- geometry.max_width = w; +- geometry.max_height = h; +- geometry.base_width = w; +- geometry.base_height = h; +- geometry.win_gravity = GDK_GRAVITY_STATIC; +- /* By setting USER_POS and USER_SIZE, most window managers will +- * not request positioning of the full screen window (for example twm). +- * +- * In addition, setting gravity to STATIC will result in the +- * decorations of twm to not effect the requested window position, +- * the decorations will simply be off screen, except in multi monitor setups :-/ +- */ +- gtk_window_set_geometry_hints(GTK_WINDOW(fs->window), fs->window, &geometry, +- GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | GDK_HINT_BASE_SIZE | +- GDK_HINT_WIN_GRAVITY | +- GDK_HINT_USER_POS); +- +- gtk_window_set_default_size(GTK_WINDOW(fs->window), w, h); +- gtk_window_move(GTK_WINDOW(fs->window), x, y); +- + fs->imd = image_new(FALSE); + + gtk_container_add(GTK_CONTAINER(fs->window), fs->imd->widget); +@@ -393,7 +383,11 @@ + else + { + gdk_screen_get_monitor_geometry(screen, j, &rect); +- subname = g_strdup_printf("%s %d", _("Monitor"), j + 1); ++ subname = gdk_screen_get_monitor_plug_name(screen, j); ++ if (subname == NULL) ++ { ++ subname = g_strdup_printf("%s %d", _("Monitor"), j + 1); ++ } + } + + sd = g_new0(ScreenData, 1); + diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 8875fd2a5..98788202c 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167778 2012-10-03 14:40:26Z andrea $ +# $Id: PKGBUILD 168020 2012-10-05 10:53:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -29,7 +29,8 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'logind-support.patch') sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '712a90999bd429883dcef5dcaf288aace332ced8' @@ -38,15 +39,20 @@ sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488' 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f') build() { - cd "${srcdir}"/${_pkgname}-${pkgver} + cd ${_pkgname}-${pkgver} patch -p1 -i "${srcdir}"/kdm-xinitrd.patch patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch - cd "${srcdir}" + # KDEBUG 307412 + patch -p1 -i "${srcdir}"/logind-support.patch + + cd ../ + mkdir build cd build cmake ../${_pkgname}-${pkgver} \ @@ -61,7 +67,7 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde diff --git a/extra/kdebase-workspace/logind-support.patch b/extra/kdebase-workspace/logind-support.patch new file mode 100644 index 000000000..9de205400 --- /dev/null +++ b/extra/kdebase-workspace/logind-support.patch @@ -0,0 +1,66 @@ +From: Lukas Tinkl <lukas@kde.org> +Date: Fri, 05 Oct 2012 09:57:13 +0000 +Subject: store the filedescriptor in a member variable +X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1 +--- +store the filedescriptor in a member variable + +make systemd-inhibit work as intended, PowerDevil now handles +power/sleep/lid buttons as intended + +BUG: 307412 +--- + + +--- a/powerdevil/daemon/powerdevilpolicyagent.cpp ++++ b/powerdevil/daemon/powerdevilpolicyagent.cpp +@@ -29,7 +29,6 @@ + #include <QtDBus/QDBusPendingReply> + #include <QtDBus/QDBusConnectionInterface> + #include <QtDBus/QDBusServiceWatcher> +-#include <QtDBus/QDBusUnixFileDescriptor> + + #include <KGlobal> + #include <KDebug> +@@ -225,6 +224,9 @@ + onActiveSessionChanged(m_activeSessionPath); + + // inhibit systemd handling of power/sleep/lid buttons ++ // http://www.freedesktop.org/wiki/Software/systemd/inhibit ++ kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing); ++ + QVariantList args; + args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what + args << "PowerDevil"; // who +@@ -232,8 +234,9 @@ + args << "block"; // mode + QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args); + desc.waitForFinished(); +- if (desc.isValid() && desc.value().isValid()) { +- kDebug() << "systemd powersave events handling inhibited"; ++ if (desc.isValid()) { ++ m_systemdInhibitFd = desc.value(); ++ kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor(); + } + else + kWarning() << "failed to inhibit systemd powersave handling"; + +--- a/powerdevil/daemon/powerdevilpolicyagent.h ++++ b/powerdevil/daemon/powerdevilpolicyagent.h +@@ -27,6 +27,7 @@ + #include <QtCore/QWeakPointer> + + #include <QtDBus/QDBusContext> ++#include <QtDBus/QDBusUnixFileDescriptor> + + #include <kdemacros.h> + +@@ -108,6 +109,7 @@ + QString m_activeSessionPath; + QWeakPointer< QDBusInterface > m_sdSessionInterface; + QWeakPointer< QDBusInterface > m_sdSeatInterface; ++ QDBusUnixFileDescriptor m_systemdInhibitFd; + + // ConsoleKit support + bool m_ckAvailable; + diff --git a/extra/libshout/PKGBUILD b/extra/libshout/PKGBUILD index c99afeaeb..d2f0f675d 100644 --- a/extra/libshout/PKGBUILD +++ b/extra/libshout/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149753 2012-02-10 04:20:16Z eric $ +# $Id: PKGBUILD 168008 2012-10-05 06:33:28Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor: Jason Chu <jchu@xentac.net> pkgname=libshout -pkgver=2.3.0 +pkgver=2.3.1 pkgrel=1 epoch=1 pkgdesc="Library for accessing a shoutcast/icecast server" @@ -14,12 +14,12 @@ url="http://www.icecast.org/" options=('!libtool' '!emptydirs') license=('LGPL') source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('976a5979505f3de4026ae7fffb10754b') +md5sums=('11765b2592e7ea623ccd93d3f8df172c') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make LDFLAGS+=-lspeex + make } package() { diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index ce20f2421..1ec0f7a33 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166807 2012-09-19 13:11:09Z bisson $ +# $Id: PKGBUILD 168060 2012-10-05 14:07:35Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.17.1 -pkgrel=3 +pkgver=0.17.2 +pkgrel=1 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' license=('GPL') @@ -18,7 +18,7 @@ makedepends=('doxygen') source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" 'tmpfiles.d' 'rc.d') -sha1sums=('11da36217d57d08010f309977a4a77cce6240f77' +sha1sums=('5e7ccf39f44e51240f181c2e1d9af5a7dafb1f02' 'f4d5922abb69abb739542d8e93f4dfd748acdad7' '3470d489565f0ed479f1665dd2876f66acb5a585') diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index f6f047060..1ca35ae21 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 166020 2012-09-04 10:20:48Z andyrtr $ +# $Id: PKGBUILD 168022 2012-10-05 11:18:25Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') -_amalgamationver=3071400 -_amalgamationver2=${_amalgamationver/00/} -_docver=${_amalgamationver} #3070700 -#pkgver=${_amalgamationver2//0/.} -pkgver=3.7.14 +_amalgamationver=3071401 +#_docver=${_amalgamationver} +_docver=3071400 +pkgver=3.7.14.1 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') @@ -17,11 +16,10 @@ url="http://www.sqlite.org/" makedepends=('tcl' 'readline') source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz - #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip http://www.sqlite.org/sqlite-doc-${_docver}.zip license.txt) options=('!libtool' '!emptydirs') -md5sums=('6464d429b1396a8db35864e791673b65' +md5sums=('4cf3fd434bbb6e50777019ff3507bfa5' '5eaeaa2d0aef3b2c980aa784846fd562' 'c1cdbc5544034d9012e421e75a5e4890') diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index 0303bff14..e4a65496a 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165719 2012-08-29 10:19:06Z andrea $ +# $Id: PKGBUILD 168034 2012-10-05 13:59:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-accounts-kcm _pkgname=ktp-accounts-kcm -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6642b6c3ae266bba47a38e3022410afa4ca98dce') +sha1sums=('899072b0311d4a2cf2d8b6108ad3a08f7499f750') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index 5ce3c43a6..32eef8deb 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165695 2012-08-29 10:05:06Z andrea $ +# $Id: PKGBUILD 168036 2012-10-05 14:00:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-approver _pkgname=ktp-approver -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('483a1d66caca8db7143087ab917f61cda4233a02') +sha1sums=('27d637ffe5b17b8a376b3f0d2efb8195d7eb6686') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index 065079002..db0b81c89 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165697 2012-08-29 10:05:43Z andrea $ +# $Id: PKGBUILD 168038 2012-10-05 14:00:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('3934aa0ba72ccedb4b283d8997e09e7633089d26') +sha1sums=('a378a0204f7c650ca0738e64e625870aff6977d3') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-call-ui/PKGBUILD b/extra/telepathy-kde-call-ui/PKGBUILD index 0027f4f14..54a225ade 100644 --- a/extra/telepathy-kde-call-ui/PKGBUILD +++ b/extra/telepathy-kde-call-ui/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 165699 2012-08-29 10:06:19Z andrea $ +# $Id: PKGBUILD 168040 2012-10-05 14:01:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-call-ui _pkgname=ktp-call-ui -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Voice/Video Call UI for Telepathy" arch=('i686' 'x86_64') url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('telepathy-kde-common-internals' 'qt-gstreamer') +depends=('telepathy-kde-common-internals' 'qt-gstreamer' 'kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('22c556e21a914a5f68a829bf6354012887cfae57') +sha1sums=('69509f0a8852bf1af6f553dcdf0776effcad0bf6') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index 70a1c9ce0..fa60f530e 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165714 2012-08-29 10:12:07Z andrea $ +# $Id: PKGBUILD 168042 2012-10-05 14:02:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-common-internals _pkgname=ktp-common-internals -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Common components for KDE-Telepathy" arch=('i686' 'x86_64') @@ -11,10 +11,9 @@ url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control') makedepends=('cmake' 'automoc4') -groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('34bac58049ede6df4fce1215fbc3b4ffc9671cba') +sha1sums=('b9cae0b78b40217acf77648cb42844a63b08f306') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-contact-applet/PKGBUILD b/extra/telepathy-kde-contact-applet/PKGBUILD index 7da167f2d..25a4fd945 100644 --- a/extra/telepathy-kde-contact-applet/PKGBUILD +++ b/extra/telepathy-kde-contact-applet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165701 2012-08-29 10:07:02Z andrea $ +# $Id: PKGBUILD 168044 2012-10-05 14:02:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-applet _pkgname=ktp-contact-applet -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="The KDE-Telepathy contact plasmoid" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'kdebase-workspace') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('fadd97b3e9c7ebb9e0e8ea86f275c56d027584a9') +sha1sums=('2550fa3f9e8d777a5f7858adb0f7c57f25e47ea4') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index 65c43bc8a..7a6dd9150 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165721 2012-08-29 10:20:00Z andrea $ +# $Id: PKGBUILD 168046 2012-10-05 14:03:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-contact-list _pkgname=ktp-contact-list -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('68bc915463285e0b14b46d618a63d949e1794ade') +sha1sums=('fafa444cb4a796517e5bd7a1b51dbd7cc8dfe362') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index e30a31211..151a7a196 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165703 2012-08-29 10:07:39Z andrea $ +# $Id: PKGBUILD 168048 2012-10-05 14:03:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-runner _pkgname=ktp-contact-runner -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="KRunner plugin for KDE Telepathy" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('ebc529387dc061ef6eba73b203100298c6aa03ba') +sha1sums=('b6f97e53ba132f1dc09d3688652451319945de7d') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index 557d428f6..9f11841ef 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165705 2012-08-29 10:08:16Z andrea $ +# $Id: PKGBUILD 168050 2012-10-05 14:04:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-filetransfer-handler _pkgname=ktp-filetransfer-handler -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('fa4048f50c0a9c0ff138ef4ae8c5d47e0bdeac87') +sha1sums=('cebd47ff33add2096633aad6d53316e6d20faf58') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 8fb0e32e4..d233d063e 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165707 2012-08-29 10:08:53Z andrea $ +# $Id: PKGBUILD 168052 2012-10-05 14:05:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-integration-module _pkgname=ktp-kded-integration-module -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6b20ba9f836a1c2d7ef19504ee31fedf10c400bc') +sha1sums=('f40e105072f0457ee71d6149ea48307a82a27465') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-presence-applet/PKGBUILD b/extra/telepathy-kde-presence-applet/PKGBUILD index 272229a96..3f1e00e4a 100644 --- a/extra/telepathy-kde-presence-applet/PKGBUILD +++ b/extra/telepathy-kde-presence-applet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165709 2012-08-29 10:09:30Z andrea $ +# $Id: PKGBUILD 168054 2012-10-05 14:05:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-presence-applet _pkgname=ktp-presence-applet -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Plasma applet for managing your Telepathy account presence" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('f4736784443ea37dc2490acb5be3a2036ca179f5') +sha1sums=('18d49c0ffaf126ab0f8aacfaa50b3fcc94bf0794') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 24ec13dbe..73f4b62fe 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165711 2012-08-29 10:10:06Z andrea $ +# $Id: PKGBUILD 168056 2012-10-05 14:06:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-send-file _pkgname=ktp-send-file -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('127a5e77cbb1580d49f2c005f9849cd01d665fb8') +sha1sums=('787813410e81fb2dfebaeed1eae3426a70405122') build() { cd "${srcdir}" diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index e00e772bf..c0f7b3189 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165713 2012-08-29 10:10:43Z andrea $ +# $Id: PKGBUILD 168059 2012-10-05 14:07:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-text-ui _pkgname=ktp-text-ui -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('a12e8b996a0cdb5db5a3cd34fb5bfa87dd4f5e41') +sha1sums=('c239446f43badfdb39fcc139aa6fe05917d86d2e') build() { cd "${srcdir}" diff --git a/extra/telepathy-logger-qt/PKGBUILD b/extra/telepathy-logger-qt/PKGBUILD index b9a2014e7..75b725779 100644 --- a/extra/telepathy-logger-qt/PKGBUILD +++ b/extra/telepathy-logger-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165715 2012-08-29 10:12:42Z andrea $ +# $Id: PKGBUILD 168032 2012-10-05 13:33:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: George Brooke <george+arch.aur@george-brooke.co.uk> pkgname=telepathy-logger-qt -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="Qt bindings for telepathy logger" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer' 'boost-libs') makedepends=('automoc4' 'cmake' 'python2' 'boost' 'doxygen') source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('09d949e60c5b140b20c61ec1d52830e7b98cd50e') +sha1sums=('d3362b146ef5c92b3a72f7f077c38ce0d641b85e') build() { cd "$srcdir" diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD index 6ce4fcba5..af7659559 100644 --- a/extra/wxpython/PKGBUILD +++ b/extra/wxpython/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 144998 2011-12-13 22:53:53Z eric $ +# $Id: PKGBUILD 168112 2012-10-06 03:24:39Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxpython pkgver=2.8.12.1 -pkgrel=3 +pkgrel=4 pkgdesc="A wxWidgets GUI toolkit for Python" arch=('i686' 'x86_64') license=('custom:wxWindows') url="http://www.wxpython.org" depends=('wxgtk' 'python2') makedepends=('mesa') -source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxpython-cairo.patch) +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 + wxpython-cairo.patch wxpython-fpb_default_style.patch) sha1sums=('05688dc03d61631750f5904273122bb40a2115f5' - '420700b0a216b853352ffafd054f406a82a30bb3') + '420700b0a216b853352ffafd054f406a82a30bb3' + 'b832d628b8ff38ea598f404d133899f40d687a22') build() { cd "${srcdir}/wxPython-src-${pkgver}" @@ -24,6 +26,7 @@ build() { --disable-precomp-headers cd "${srcdir}/wxPython-src-${pkgver}/wxPython" patch -p2 -i "${srcdir}/wxpython-cairo.patch" + patch -p1 -i "${srcdir}/wxpython-fpb_default_style.patch" python2 setup.py WXPORT=gtk2 UNICODE=1 build } diff --git a/extra/wxpython/wxpython-fpb_default_style.patch b/extra/wxpython/wxpython-fpb_default_style.patch new file mode 100644 index 000000000..906d3444d --- /dev/null +++ b/extra/wxpython/wxpython-fpb_default_style.patch @@ -0,0 +1,17 @@ +--- wxPython/wx/tools/XRCed/plugins/xh_wxlib.py (revision 50185) ++++ wxPython/wx/tools/XRCed/plugins/xh_wxlib.py (revision 69431) +@@ -18,5 +18,4 @@ + self.AddWindowStyles() + # Custom styles +- self.AddStyle('FPB_DEFAULT_STYLE', fpb.FPB_DEFAULT_STYLE) + self.AddStyle('FPB_SINGLE_FOLD', fpb.FPB_SINGLE_FOLD) + self.AddStyle('FPB_COLLAPSE_TO_BOTTOM', fpb.FPB_COLLAPSE_TO_BOTTOM) +--- wxPython/wx/tools/XRCed/plugins/wxlib.py (revision 57250) ++++ wxPython/wx/tools/XRCed/plugins/wxlib.py (revision 69431) +@@ -20,5 +20,5 @@ + implicit_attributes=['label', 'collapsed'], + implicit_params={'collapsed': params.ParamBool}) +-c.addStyles('FPB_DEFAULT_STYLE', 'FPB_SINGLE_FOLD', 'FPB_COLLAPSE_TO_BOTTOM', ++c.addStyles('FPB_SINGLE_FOLD', 'FPB_COLLAPSE_TO_BOTTOM', + 'FPB_EXCLUSIVE_FOLD', 'FPB_HORIZONTAL', 'FPB_VERTICAL') + component.Manager.register(c) diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD index a60e8283e..694c43665 100644 --- a/extra/ypserv/PKGBUILD +++ b/extra/ypserv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165551 2012-08-23 17:48:09Z tomegun $ +# $Id: PKGBUILD 168108 2012-10-06 00:49:54Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,12 +6,12 @@ pkgname=ypserv pkgver=2.28 -pkgrel=1 +pkgrel=2 pkgdesc='Linux NIS Server' arch=('i686' 'x86_64') url='http://www.linux-nis.org/nis/ypserv/' license=('GPL2') -depends=('gdbm' 'openslp' 'inetutils') +depends=('gdbm' 'openslp' 'inetutils' 'yp-tools') optdepends=('gawk: for printcap support') backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 49e837e02..32be5dd3c 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165634 2012-08-27 20:15:48Z tomegun $ +# $Id: PKGBUILD 167924 2012-10-03 20:35:33Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=filesystem -pkgver=2012.8 -pkgrel=1.2 +pkgver=2012.10 +pkgrel=1 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -90,13 +90,13 @@ package() { done ln -s ../man usr/local/share/man } -md5sums=('45940618da782cc391c59f88ab3333c3' +md5sums=('004013ac940ef3d3cdd8c596e7accfe1' '6be47d893fd49b2e4a8c0e811b350861' '13753e4e0964f3652b0cc60a28528bdf' '4c4540eeb748bf1f71d631b8c1dcf0b3' 'f28150d4c0b22a017be51b9f7f9977ed' '6e488ffecc8ba142c0cf7e2d7aeb832e' - '8a9042a2cedf6b6b47eb8973f14289cb' + '455b78cada80f40b6f6968f5cbd97a2e' 'b8355d9d2782f424f4cedcf682651be0' 'ca716f853860199c1286e7939b2f2666' '1745349eb24ed21b4cfaa6f423bddb76' @@ -105,7 +105,7 @@ md5sums=('45940618da782cc391c59f88ab3333c3' '0e145e18fea8fd190b30d45764f5707c' '6f48288b6fcaf0065fcb7b0e525413e0' '22518e922891f9359f971f4f5b4e793c' - 'f95416882cef800edef08382a1176b7d' + '677523dbe94b79299aa91b35ed8203b6' 'f3b6ae7db8adffaaa4bffc6099dcbd50' 'a8a962370cd0128465d514e6a1f74130' '3674fcb22044d2946934e7826aa0c632' diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index c8717f01b..34fcc0dee 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -41,8 +41,10 @@ post_upgrade() { _addgroup scanner -g 96 _addgroup rfkill -g 24 _addgroup lock -g 54 + _addgroup uuidd -g 68 + _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin - # sync gshadow to group (fixes FS#19869 + # sync gshadow to group (fixes FS#19869) if ! grep -q '^lock:' etc/gshadow; then grpconv >/dev/null fi diff --git a/libre/filesystem/group b/libre/filesystem/group index 6e8e773d8..cfee1f23e 100644 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -20,6 +20,7 @@ smmsp:x:25: http:x:33: games:x:50: lock:x:54: +uuidd:x:68: network:x:90: video:x:91: audio:x:92: diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow index c5c76354e..c5ac18581 100644 --- a/libre/filesystem/gshadow +++ b/libre/filesystem/gshadow @@ -20,6 +20,7 @@ smmsp::: http::: games::: lock::: +uuidd:!:: network:x:: video:x:: audio::: diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd index a4a24e34f..cb9fec7ff 100644 --- a/libre/filesystem/passwd +++ b/libre/filesystem/passwd @@ -4,4 +4,5 @@ daemon:x:2:2:daemon:/sbin:/bin/false mail:x:8:12:mail:/var/spool/mail:/bin/false ftp:x:14:11:ftp:/srv/ftp:/bin/false http:x:33:33:http:/srv/http:/bin/false +uuidd:x:68:68:uuidd:/:/sbin/nologin nobody:x:99:99:nobody:/:/bin/false diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index cde66e1db..1f68a6356 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164178 2012-07-26 23:40:45Z tomegun $ +# $Id: PKGBUILD 167943 2012-10-03 23:12:35Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> pkgname=initscripts -pkgver=2012.09.1 +pkgver=2012.10.5 pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') @@ -16,21 +16,22 @@ provides=('initscripts-systemd') conflicts=('initscripts-systemd') replaces=('initscripts-systemd') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown) -depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit') +depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit-tools') optdepends=('dhcpcd: DHCP network configuration' 'bridge-utils: Legacy network bridging support' 'net-tools: Legacy network support' - 'wireless_tools: Legacy wireless networking') + 'wireless_tools: Legacy wireless networking' + 'sysvinit: Legacy init support') makedepends=(asciidoc) install=initscripts.install source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig}) package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - # moved to filesystem - rm -rf ${pkgdir}/etc/profile.d + make DESTDIR=${pkgdir} install } md5sums=('16039aeb4c996194d9466a8c66a06f5a' '522804c7981c32c3c779964844d64377') +md5sums=('3be94446496bda58051141e0d3863a7b' + '3f03d3a5c7d8b7e1ddebb13334441440') diff --git a/libre/initscripts/split-hwclock-calls.diff b/libre/initscripts/split-hwclock-calls.diff new file mode 100644 index 000000000..c0a6a4fd6 --- /dev/null +++ b/libre/initscripts/split-hwclock-calls.diff @@ -0,0 +1,21 @@ +diff --git a/rc.sysinit b/rc.sysinit +index eb49e2b..8f9727b 100755 +--- a/rc.sysinit ++++ b/rc.sysinit +@@ -34,7 +34,6 @@ bootlogd -p /run/bootlogd.pid + + run_hook sysinit_start + +-HWCLOCK_PARAMS="--systz" + case $HARDWARECLOCK in + "") ;; + UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";; +@@ -54,7 +53,7 @@ if [[ $HWCLOCK_PARAMS ]]; then + + [[ $TIMEZONE ]] && export TZ=$TIMEZONE + +- hwclock $HWCLOCK_PARAMS && stat_done || stat_fail ++ { hwclock $HWCLOCK_PARAMS && hwclock --systz; } && stat_done || stat_fail + + unset TZ + fi diff --git a/multilib-staging/lib32-libxcb/PKGBUILD b/multilib-staging/lib32-libxcb/PKGBUILD new file mode 100644 index 000000000..faa36ab66 --- /dev/null +++ b/multilib-staging/lib32-libxcb/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 77154 2012-10-05 21:31:37Z bluewind $ +# Maintainer: Alexander Baldeck <alexander@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> + +_pkgbasename=libxcb +pkgname=lib32-$_pkgbasename +pkgver=1.9 +pkgrel=1 +pkgdesc="X11 client-side library (32-bit)" +arch=(x86_64) +url="http://xcb.freedesktop.org/" +depends=('lib32-libxdmcp' 'lib32-libxau' $_pkgbasename) +makedepends=('pkgconfig' 'libxslt' 'python2' 'gcc-multilib' + 'autoconf') +options=('!libtool') +license=('custom') +source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2 + libxcb-1.1-no-pthread-stubs.patch) +sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061' + 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch" + + export CC="gcc -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + PYTHON=/usr/bin/python2 ./autogen.sh \ + --prefix=/usr \ + --enable-xinput \ + --libdir=/usr/lib32 \ + --disable-static + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/{include,share} + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/multilib-staging/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib-staging/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch new file mode 100644 index 000000000..8e8162f0a --- /dev/null +++ b/multilib-staging/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch @@ -0,0 +1,11 @@ +--- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100 ++++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100 +@@ -35,7 +35,7 @@ + + # Checks for pkg-config packages + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7) +-NEEDED="pthread-stubs xau >= 0.99.2" ++NEEDED="xau >= 0.99.2" + PKG_CHECK_MODULES(NEEDED, $NEEDED) + + have_xdmcp="no" diff --git a/social/netatalk/PKGBUILD b/social/netatalk/PKGBUILD index 98e64982d..7e2fe14aa 100644 --- a/social/netatalk/PKGBUILD +++ b/social/netatalk/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: Farhan Yousaf <farhany at xaviya dot com> pkgname=netatalk -pkgver=3.0 -pkgrel=4 +pkgver=3.0.1 +pkgrel=1 pkgdesc='Open Source AFP fileserver' arch=('i686' 'x86_64') url='http://netatalk.sourceforge.net' @@ -54,3 +54,5 @@ package() { msg2 'Copying initscripts...' install -D -m755 "$srcdir"/netatalk.rc "$pkgdir"/etc/rc.d/netatalk } +md5sums=('5e92015b0d9ac77af4b598cca6cb435c' + 'b4f5c932b2ca99f5292bd6b6d69b3ebc') diff --git a/staging/libxcb/PKGBUILD b/staging/libxcb/PKGBUILD new file mode 100644 index 000000000..2ca76afe7 --- /dev/null +++ b/staging/libxcb/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 168070 2012-10-05 16:55:34Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=libxcb +pkgver=1.9 +pkgrel=1 +pkgdesc="X11 client-side library" +arch=(i686 x86_64) +url="http://xcb.freedesktop.org/" +depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau') +makedepends=('pkgconfig' 'libxslt' 'python2') +options=('!libtool') +license=('custom') +source=($url/dist/$pkgname-$pkgver.tar.bz2 + libxcb-1.1-no-pthread-stubs.patch) +sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061' + 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch" + PYTHON=/usr/bin/python2 + ./autogen.sh --prefix=/usr \ + --enable-xinput \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" + install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch b/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch new file mode 100644 index 000000000..8e8162f0a --- /dev/null +++ b/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch @@ -0,0 +1,11 @@ +--- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100 ++++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100 +@@ -35,7 +35,7 @@ + + # Checks for pkg-config packages + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7) +-NEEDED="pthread-stubs xau >= 0.99.2" ++NEEDED="xau >= 0.99.2" + PKG_CHECK_MODULES(NEEDED, $NEEDED) + + have_xdmcp="no" diff --git a/staging/mesa/PKGBUILD b/staging/mesa/PKGBUILD index 2b8d95b63..92e1705b6 100644 --- a/staging/mesa/PKGBUILD +++ b/staging/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 167550 2012-10-02 17:40:28Z andyrtr $ +# $Id: PKGBUILD 168066 2012-10-05 15:41:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=mesa pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri') _git=true -_gitdate=20121002 +_gitdate=20121005 #_git=false if [ "${_git}" = "true" ]; then @@ -22,26 +22,25 @@ url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') source=(LICENSE - mesa-radeon-parallel-make.diff) + pthread_fix.diff) if [ "${_git}" = "true" ]; then # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0 #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz') - source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-604cd6b966d060334fdaa11ae8444797d54d3142.tar.gz") + source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz") else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2" ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '5dca6edbe6b636c59c2e64f77271f12a' - '71af5320af6873920384d245f103b892') + '03956ac54a44467678120f485b626633' + '52760839a596df5058fcbb63a2bb10da') build() { cd ${srcdir}/?esa-* - # fix parallel build - http://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/radeon/Makefile?id=cebbdd4ac23725963207bf6f8fc7101150e6065f - # and the next commit - http://cgit.freedesktop.org/mesa/mesa/commit/?id=2baaa5c7eb21517f0197bfd91154e9b4886fbb1b - patch -Np1 -i ${srcdir}/mesa-radeon-parallel-make.diff + # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b + patch -Np1 -i ${srcdir}/pthread_fix.diff COMMONOPTS="--prefix=/usr \ --sysconfdir=/etc \ @@ -119,7 +118,8 @@ package_libgl() { } package_mesa() { - depends=('libgl' 'libx11>=1.5.0' 'libxt>=1.1.3' 'gcc-libs>=4.7.1-6') # check pkg/mesa/usr/lib/pkgconfig/gl.pc + # check also gl.pc + depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 'libxcb' 'libxxf86vm') optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3-D graphics libraries and include files" @@ -136,12 +136,18 @@ package_mesa() { } package_osmesa() { - depends=('gcc-libs') + depends=('libglapi' 'gcc-libs') optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3D off-screen rendering library" - + + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall + install -m755 -d "${pkgdir}/usr/share/licenses/osmesa" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/" } @@ -180,7 +186,8 @@ package_libgles() { } package_libegl() { - depends=('libxext' 'libxfixes' 'libgbm' 'khrplatform-devel') + # check also egl.pc + depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel') pkgdesc="Mesa EGL libraries and headers" make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install diff --git a/staging/mesa/pthread_fix.diff b/staging/mesa/pthread_fix.diff new file mode 100644 index 000000000..bdfe2d865 --- /dev/null +++ b/staging/mesa/pthread_fix.diff @@ -0,0 +1,23 @@ +From dd4fde8f674f5e3efa19e929f97de4ecfd82391b Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Thu, 27 Sep 2012 22:49:52 +0000 +Subject: build: Set PTHREAD_LIBS for pkgconfig files if empty + +--- +diff --git a/configure.ac b/configure.ac +index 770df2f..dc2720d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -509,6 +509,10 @@ AC_CHECK_DECLS([signbit],[], + + dnl Check for pthreads + AX_PTHREAD ++dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS ++dnl to -pthread, which causes problems if we need -lpthread to appear in ++dnl pkgconfig files. ++test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread" + + dnl SELinux awareness. + AC_ARG_ENABLE([selinux], +-- +cgit v0.9.0.2-2-gbebe diff --git a/staging/xf86-input-acecad/PKGBUILD b/staging/xf86-input-acecad/PKGBUILD new file mode 100644 index 000000000..0a20be8da --- /dev/null +++ b/staging/xf86-input-acecad/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 168078 2012-10-05 17:56:18Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-input-acecad +pkgver=1.5.0 +pkgrel=5 +pkgdesc="X.Org acecad tablet input driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('sysfsutils') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + assign-local-private-after-allocating.patch) +sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1' + '9301020b0ef3c6f2081e957481a88d2e187a7973') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-input-acecad/assign-local-private-after-allocating.patch b/staging/xf86-input-acecad/assign-local-private-after-allocating.patch new file mode 100644 index 000000000..e3e635a6f --- /dev/null +++ b/staging/xf86-input-acecad/assign-local-private-after-allocating.patch @@ -0,0 +1,24 @@ +From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 27 Jun 2011 03:13:54 +0000 +Subject: Assign local->private after allocating. + +It is detrimental to the user experience when the driver tries to derefernce +null pointers. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- +diff --git a/src/acecad.c b/src/acecad.c +index ad6d793..604fe91 100644 +--- a/src/acecad.c ++++ b/src/acecad.c +@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) + return BadAlloc; + + memset(priv, 0, sizeof(AceCadPrivateRec)); ++ local->private = priv; + + local->device_control = DeviceControl; + +-- +cgit v0.8.3-6-g21f6 diff --git a/staging/xf86-input-aiptek/PKGBUILD b/staging/xf86-input-aiptek/PKGBUILD new file mode 100644 index 000000000..b0c5ad004 --- /dev/null +++ b/staging/xf86-input-aiptek/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 168080 2012-10-05 18:00:48Z andyrtr $ +#Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-input-aiptek +pkgver=1.4.1 +pkgrel=5 +pkgdesc="X.Org Aiptek USB Digital Tablet input driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-input-elographics/PKGBUILD b/staging/xf86-input-elographics/PKGBUILD new file mode 100644 index 000000000..ee6ad8451 --- /dev/null +++ b/staging/xf86-input-elographics/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 88566 2010-08-24 08:47:16Z jgc $ +#Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-input-elographics +pkgver=1.4.1 +pkgrel=2 +pkgdesc="X.org Elographics TouchScreen input driver" +arch=(i686 x86_64) +license=('custom') +url="http://xorg.freedesktop.org/" +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-input-evdev/PKGBUILD b/staging/xf86-input-evdev/PKGBUILD new file mode 100644 index 000000000..b5ad96195 --- /dev/null +++ b/staging/xf86-input-evdev/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 168082 2012-10-05 18:10:25Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <Alexander@archlinux.org + +pkgname=xf86-input-evdev +pkgver=2.7.3 +pkgrel=2 +pkgdesc="X.org evdev input driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc' 'systemd-tools' 'mtdev') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +options=('!libtool' '!makeflags') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-input-joystick/50-joystick.conf b/staging/xf86-input-joystick/50-joystick.conf new file mode 100644 index 000000000..95a295ab0 --- /dev/null +++ b/staging/xf86-input-joystick/50-joystick.conf @@ -0,0 +1,6 @@ +Section "InputClass" + Identifier "joystick catchall" + MatchIsJoystick "on" + MatchDevicePath "/dev/input/event*" + Driver "joystick" +EndSection diff --git a/staging/xf86-input-joystick/PKGBUILD b/staging/xf86-input-joystick/PKGBUILD new file mode 100644 index 000000000..77a304012 --- /dev/null +++ b/staging/xf86-input-joystick/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 168084 2012-10-05 18:31:52Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-input-joystick +pkgver=1.6.1 +pkgrel=2 +pkgdesc="X.Org Joystick input driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + #git-fixes.patch + 50-joystick.conf) +sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580' + 'e1ff3699a0470c6bb78a53f718df9d8521621e11') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + #patch -Np1 -i "${srcdir}/git-fixes.patch" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" + install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/" + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-input-joystick/git-fixes.patch b/staging/xf86-input-joystick/git-fixes.patch new file mode 100644 index 000000000..b3afa06cc --- /dev/null +++ b/staging/xf86-input-joystick/git-fixes.patch @@ -0,0 +1,399 @@ +From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001 +From: Terry Lambert <tlambert@chromium.org> +Date: Sat, 16 Jul 2011 00:23:22 +0000 +Subject: Return proper default for unknown values in pInfo->device_control. + +Signed-off-by: Terry Lambert <tlambert@chromium.org> +Reviewed-by: Stephane Marchesin <marcheu@chromium.org> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- +diff --git a/src/jstk.c b/src/jstk.c +index ec6b79a..6db0e7c 100644 +--- a/src/jstk.c ++++ b/src/jstk.c +@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + + default: + ErrorF("unsupported mode=%d\n", what); +- return !Success; +- break; ++ return BadValue; + } /* switch (what) */ + return Success; + } +diff --git a/src/jstk_key.c b/src/jstk_key.c +index 3c471ce..d699dcd 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr dev, + DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n")); + dev->public.on = FALSE; + break; ++ default: ++ return BadValue; + } + + return Success; +-- +cgit v0.9.0.2-2-gbebe +From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001 +From: Devin J. Pohly <djpohly+xorg@gmail.com> +Date: Sat, 03 Sep 2011 23:00:07 +0000 +Subject: unify capitalization of joystick properties + +the axis keys high/low properties were inconsistently capitalized, +leading to potential confusion as to why one works but not the other. + +Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- +diff --git a/include/joystick-properties.h b/include/joystick-properties.h +index 49ef800..36f4082 100644 +--- a/include/joystick-properties.h ++++ b/include/joystick-properties.h +@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING { + + /** Scancodes for axis in high position */ + /* 8 bit, 4 per axis */ +-#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)" ++#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)" + + /** Set the mapping of each button to + none, x, y, zx, zy, button, key, speed_multiply, +-- +cgit v0.9.0.2-2-gbebe +From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001 +From: Sascha Hlusiak <saschahlusiak@arcor.de> +Date: Sat, 15 Oct 2011 22:47:52 +0000 +Subject: label buttons and axes + +Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping. +Mapping can be changed while running so the labels will be constant. + +Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator +data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X" +and "Rel Y", representing the aggregated post-calculation data from all axes. + +Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de> +--- +diff --git a/man/joystick.man b/man/joystick.man +index da92ceb..b401de5 100644 +--- a/man/joystick.man ++++ b/man/joystick.man +@@ -140,7 +140,11 @@ Neither + .B mode + nor + .B axis +-needs to be set to generate extra valuator events. ++needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with ++.I 1 ++, i.e. ++.I \*qAxis 1\*q ++for the first axis (being the 3rd valuator). + Default: not set. + .TP 7 + .BI "\*qaxis="[<factor>]<axis> \*q +@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys + The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis. + The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings. + ++.SH "XI2 Events" ++If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons: ++ ++.nf ++.BI " Option \*qMapAxis1\*q \*q" "mode=none valuator" \*q ++.BI " Option \*qMapAxis2\*q \*q" "mode=none valuator" \*q ++.BI " Option \*qMapAxis3\*q \*q" "mode=none valuator" \*q ++.BI " Option \*qMapAxis4\*q \*q" "mode=none valuator" \*q ++\ \ ... ++.BI " Option \*qMapButton1\*q \*q" "button=1" \*q ++.BI " Option \*qMapButton2\*q \*q" "button=2" \*q ++.BI " Option \*qMapButton3\*q \*q" "button=3" \*q ++.BI " Option \*qMapButton4\*q \*q" "button=4" \*q ++.BI " Option \*qMapButton5\*q \*q" "button=5" \*q ++\ \ ... ++.fi ++ ++You might also want to set the device "floating" to stop it from reporting core events: ++.nf ++.BI " Option \*qFloating\*q \*q" "true" \*q ++.fi ++ + .SH "NOTES" + Configuration through + .I InputClass +diff --git a/src/jstk.c b/src/jstk.c +index 6db0e7c..772683f 100644 +--- a/src/jstk.c ++++ b/src/jstk.c +@@ -1,5 +1,5 @@ + /* +- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> ++ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> + * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org> + * + * Permission to use, copy, modify, distribute, and sell this software and its +@@ -21,7 +21,6 @@ + * PERFORMANCE OF THIS SOFTWARE. + */ + +- + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + switch (what) { + case DEVICE_INIT: { + int m; ++ char str[32]; + CARD8 buttonmap[BUTTONMAP_SIZE+1]; + DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n")); + /* Probe device and return if error */ +@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + } + + for (m=0; m<=BUTTONMAP_SIZE; m++) { ++ sprintf(str, "Button %d", m); ++ + buttonmap[m] = m; +- } ++ btn_labels[m] = MakeAtom(str, strlen(str), TRUE); ++ } ++ ++ + +- +- + if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, + btn_labels, + buttonmap) == FALSE) { +@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + if (priv->axis[i].valuator != -1) + { + DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m)); ++ sprintf(str, "Axis %d", i + 1); + priv->axis[i].valuator = m++; ++ axes_labels[i] = MakeAtom(str, strlen(str), TRUE); + } + + if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels, +@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec = + /* a tool */ + }; + +- + /* + *************************************************************************** + * +@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = { + jstkDriverPlug, + jstkDriverUnplug + }; ++ ++/* vim: set filetype=c.doxygen ts=4 et: */ ++ +-- +cgit v0.9.0.2-2-gbebe +From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 31 Oct 2011 04:27:22 +0000 +Subject: Fix option type for option duplication + +xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption +list. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> +--- +diff --git a/src/jstk_key.c b/src/jstk_key.c +index d699dcd..e842941 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + int rc; + char name[512] = {0}; + InputAttributes *attrs = NULL; +- InputOption *options; + InputOption *iopts = NULL, *tmp; + DeviceIntPtr dev; ++ XF86OptionPtr opts; + + /* duplicate option list, append to name */ +- options = xf86OptionListDuplicate(pInfo->options); ++ opts = xf86OptionListDuplicate(pInfo->options); + strcpy(name, pInfo->name); + strcat(name, " (keys)"); +- options = xf86ReplaceStrOption(options, "Name", name); +- options = xf86ReplaceStrOption(options, "_source", "_driver/joystick"); ++ opts = xf86ReplaceStrOption(opts, "Name", name); ++ opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); + +- while(options) ++ while(opts) + { + tmp = calloc(1, sizeof(InputOption)); + +- tmp->key = xf86OptionName(options); +- tmp->value = xf86OptionValue(options); ++ tmp->key = xf86OptionName(opts); ++ tmp->value = xf86OptionValue(opts); + tmp->next = iopts; + iopts = tmp; +- options = xf86NextOption(options); ++ opts = xf86NextOption(opts); + } + + /* duplicate attribute list */ +-- +cgit v0.9.0.2-2-gbebe +From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 31 Oct 2011 04:33:08 +0000 +Subject: Deal with opaque input option types. + +ABI 14 made the InputOption type opaque, move the existing code to ifdefs +and use the new function calls otherwise. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> +Reviewed-by: Chase Douglas <chase.douglas@canonical.com> +--- +diff --git a/src/jstk_key.c b/src/jstk_key.c +index e842941..a71275a 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) + return Success; + } + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14 ++static InputOption* ++input_option_new(InputOption* list, char *key, char *value) ++{ ++ InputOption *tmp; ++ ++ tmp = calloc(1, sizeof(*tmp)); ++ tmp->key = key; ++ tmp->value = value; ++ tmp->next = list; ++ ++ return tmp; ++} ++ ++static void ++input_option_free_list(InputOption **list) ++{ ++ InputOption *iopts = *list; ++ ++ while(iopts) ++ { ++ InputOption *tmp = iopts->next; ++ free(iopts->key); ++ free(iopts->value); ++ free(iopts); ++ iopts = tmp; ++ } ++ ++ *list = NULL; ++} ++ ++#endif ++ + InputInfoPtr + jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + { + int rc; + char name[512] = {0}; + InputAttributes *attrs = NULL; +- InputOption *iopts = NULL, *tmp; ++ InputOption *iopts = NULL; + DeviceIntPtr dev; + XF86OptionPtr opts; + +@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + + while(opts) + { +- tmp = calloc(1, sizeof(InputOption)); +- +- tmp->key = xf86OptionName(opts); +- tmp->value = xf86OptionValue(opts); +- tmp->next = iopts; +- iopts = tmp; ++ iopts = input_option_new(iopts, ++ xf86OptionName(opts), ++ xf86OptionValue(opts)); + opts = xf86NextOption(opts); + } + +@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + + rc = NewInputDeviceRequest(iopts, attrs, &dev); + +- while(iopts) +- { +- tmp = iopts->next; +- free(iopts->key); +- free(iopts->value); +- free(iopts); +- iopts = tmp; +- } ++ input_option_free_list(&iopts); + + FreeInputAttributes(attrs); + +-- +cgit v0.9.0.2-2-gbebe +From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001 +From: Sascha Hlusiak <saschahlusiak@arcor.de> +Date: Sun, 13 Nov 2011 17:04:25 +0000 +Subject: man: valuators are not added automatically + +--- +diff --git a/man/joystick.man b/man/joystick.man +index b401de5..9f38ceb 100644 +--- a/man/joystick.man ++++ b/man/joystick.man +@@ -129,9 +129,6 @@ can be one of: + + .B none, relative, accelerated, absolute + +-Every axis which's mode is not +-.B none +-will be reported as an additional valuator. + .TP 7 + .B \*qvaluator\*q + Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always +-- +cgit v0.9.0.2-2-gbebe +From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001 +From: Sascha Hlusiak <saschahlusiak@arcor.de> +Date: Sun, 13 Nov 2011 19:36:07 +0000 +Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device + +udev does copy the Driver line to the list of options, but when manually +specifying the driver in xorg.conf, the option "Driver" is unset. Because we +do hotplug a sub-device from within the core device, we need the "Driver" +option to be present in the list. + +This should fix archlinux bug #23577: + https://bugs.archlinux.org/task/23577 + +Thanks to Malek for coming up with a fix. + +Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de> +--- +diff --git a/src/jstk_key.c b/src/jstk_key.c +index a71275a..241b15d 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + strcat(name, " (keys)"); + opts = xf86ReplaceStrOption(opts, "Name", name); + opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); ++ opts = xf86AddNewOption(opts, "Driver", pInfo->driver); + + while(opts) + { +-- +cgit v0.9.0.2-2-gbebe diff --git a/staging/xf86-input-keyboard/PKGBUILD b/staging/xf86-input-keyboard/PKGBUILD new file mode 100644 index 000000000..478060eef --- /dev/null +++ b/staging/xf86-input-keyboard/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 168086 2012-10-05 18:41:11Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-input-keyboard +pkgver=1.6.2 +pkgrel=2 +pkgdesc="X.Org keyboard input driver" +arch=(i686 x86_64) +license=('custom') +url="http://xorg.freedesktop.org/" +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-input-mouse/PKGBUILD b/staging/xf86-input-mouse/PKGBUILD new file mode 100644 index 000000000..0c075179b --- /dev/null +++ b/staging/xf86-input-mouse/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 168088 2012-10-05 18:46:31Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-input-mouse +pkgver=1.8.1 +pkgrel=2 +pkgdesc="X.org mouse input driver" +arch=(i686 x86_64) +license=('custom') +url="http://xorg.freedesktop.org/" +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-input-synaptics/10-synaptics.conf b/staging/xf86-input-synaptics/10-synaptics.conf new file mode 100644 index 000000000..81a90fb81 --- /dev/null +++ b/staging/xf86-input-synaptics/10-synaptics.conf @@ -0,0 +1,9 @@ +Section "InputClass" + Identifier "touchpad catchall" + Driver "synaptics" + MatchIsTouchpad "on" + MatchDevicePath "/dev/input/event*" + Option "TapButton1" "1" + Option "TapButton2" "2" + Option "TapButton3" "3" +EndSection diff --git a/staging/xf86-input-synaptics/PKGBUILD b/staging/xf86-input-synaptics/PKGBUILD new file mode 100644 index 000000000..24a48dcb1 --- /dev/null +++ b/staging/xf86-input-synaptics/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 168090 2012-10-05 18:57:54Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Thomas Bächler <thomas@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=xf86-input-synaptics +pkgver=1.6.2 +pkgrel=2 +pkgdesc="Synaptics driver for notebook touchpads" +arch=('i686' 'x86_64') +license=('custom') +url="http://xorg.freedesktop.org/" +depends=('libxtst' 'mtdev') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +replaces=('synaptics') +provides=('synaptics') +conflicts=('synaptics') +groups=('xorg-drivers' 'xorg') +options=(!libtool) +backup=('etc/X11/xorg.conf.d/10-synaptics.conf') +source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + 10-synaptics.conf) +sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920' + 'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" + install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + + rm -rf "${pkgdir}/usr/share/X11" +} diff --git a/staging/xf86-input-vmmouse/PKGBUILD b/staging/xf86-input-vmmouse/PKGBUILD new file mode 100644 index 000000000..214429614 --- /dev/null +++ b/staging/xf86-input-vmmouse/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 168092 2012-10-05 19:03:25Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-input-vmmouse +pkgver=12.9.0 +pkgrel=2 +pkgdesc="X.org VMWare Mouse input driver" +arch=(i686 x86_64) +license=('custom') +url="http://xorg.freedesktop.org/" +depends=('glibc' 'sh') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +groups=('xorg-drivers' 'xorg') +backup=('etc/X11/xorg.conf.d/50-vmmouse.conf') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('83500beddba2da390389705d482131872fe9be8b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --with-xorg-conf-dir=/etc/X11/xorg.conf.d \ + --with-udev-rules-dir=/usr/lib/udev/rules.d + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + rm -rfv ${pkgdir}/usr/{lib,share}/hal +} diff --git a/staging/xf86-input-void/PKGBUILD b/staging/xf86-input-void/PKGBUILD new file mode 100644 index 000000000..0831ca3a0 --- /dev/null +++ b/staging/xf86-input-void/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 168094 2012-10-05 19:07:17Z andyrtr $ +#Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-input-void +pkgver=1.4.0 +pkgrel=4 +pkgdesc="X.org void input driver" +arch=(i686 x86_64) +license=('custom') +url="http://xorg.freedesktop.org/" +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-input-wacom/70-wacom.rules b/staging/xf86-input-wacom/70-wacom.rules new file mode 100644 index 000000000..f6aa20835 --- /dev/null +++ b/staging/xf86-input-wacom/70-wacom.rules @@ -0,0 +1,12 @@ +ACTION!="add|change", GOTO="wacom_end" + +# Match all serial wacom tablets with a serial ID starting with WACf +# Notes: We assign NAME though we shouldn't, but currently the server requires it +# We assign the lot to subsystem pnp too because server reads NAME from +# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" +# will do and the ENV{NAME} can be removed. +SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" +SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" + +LABEL="wacom_end" + diff --git a/staging/xf86-input-wacom/PKGBUILD b/staging/xf86-input-wacom/PKGBUILD new file mode 100644 index 000000000..3e3a2acd4 --- /dev/null +++ b/staging/xf86-input-wacom/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 168096 2012-10-05 19:11:14Z andyrtr $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: M Rawash <mrawash@gmail.com> + +pkgname=xf86-input-wacom +pkgver=0.17.0 +pkgrel=2 +pkgdesc="X.Org Wacom tablet driver" +arch=('i686' 'x86_64') +url="http://linuxwacom.sourceforge.net/" +license=('GPL') +backup=('etc/X11/xorg.conf.d/50-wacom.conf') +depends=('libxi' 'libxrandr' 'libxinerama') +makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19') +options=(!libtool) +source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2 + 70-wacom.rules) +md5sums=('92dffefc3bc30523463f2fa4bc753448' + '10db4f8272286690255c1bcc18bfdd92') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -Dm644 ../70-wacom.rules "$pkgdir/usr/lib/udev/rules.d/70-wacom.rules" +} diff --git a/staging/xf86-video-apm/PKGBUILD b/staging/xf86-video-apm/PKGBUILD new file mode 100644 index 000000000..6dc7c8dfa --- /dev/null +++ b/staging/xf86-video-apm/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 168102 2012-10-05 20:15:38Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-apm +pkgver=1.2.5 +pkgrel=2 +pkgdesc="X.org Alliance ProMotion video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-video-ark/PKGBUILD b/staging/xf86-video-ark/PKGBUILD new file mode 100644 index 000000000..e4ab12bfe --- /dev/null +++ b/staging/xf86-video-ark/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 168104 2012-10-05 20:26:50Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-ark +pkgver=0.7.5 +pkgrel=2 +pkgdesc="X.org ark video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xf86-video-ast/PKGBUILD b/staging/xf86-video-ast/PKGBUILD new file mode 100644 index 000000000..448aa5d54 --- /dev/null +++ b/staging/xf86-video-ast/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 168106 2012-10-05 20:30:31Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-ast +pkgver=0.97.0 +pkgrel=2 +pkgdesc="X.org ASPEED AST Graphics video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/staging/xorg-server/PKGBUILD b/staging/xorg-server/PKGBUILD index 3563f0ba9..03700888d 100644 --- a/staging/xorg-server/PKGBUILD +++ b/staging/xorg-server/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167552 2012-10-02 18:14:21Z andyrtr $ +# $Id: PKGBUILD 168024 2012-10-05 12:03:57Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') pkgver=1.13.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -174,7 +174,12 @@ package_xorg-server-xdmx() { package_xorg-server-devel() { pkgdesc="Development files for the X.Org X server" - depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) + depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc + xproto randrproto renderproto xextproto inputproto kbproto + fontsproto pixman videoproto xf86driproto glproto + mesa dri2proto xineramaproto libpciaccess + # not technically required but almost every Xorg pkg needs it to build + xorg-util-macros) cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/testing/at/PKGBUILD b/testing/at/PKGBUILD new file mode 100644 index 000000000..cae92b487 --- /dev/null +++ b/testing/at/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 168098 2012-10-05 19:23:53Z eric $ +# Maintainer: Judd Vinet <jvinet@zeroflux.org> +# Contributor: Todd Musall <tmusall@comcast.net> + +pkgname=at +pkgver=3.1.13 +pkgrel=2 +pkgdesc="AT and batch delayed command scheduling utility and daemon" +arch=('i686' 'x86_64') +url="http://packages.qa.debian.org/a/at.html" +license=('GPL') +depends=('pam') +makedepends=('ssmtp') +backup=('etc/at.deny') +options=('!makeflags') +source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz + atd atd.service) +md5sums=('1da61af6c29e323abaaf13ee1a8dad79' + '35574e34829e7df07a3269d4ab646a29' + '33976a813f4fe7f5659354601044c6f8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --with-jobdir=/var/spool/atd \ + --with-atspool=/var/spool/atd + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make IROOT="${pkgdir}" docdir=/usr/share/doc install + install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd" + install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service" +} diff --git a/testing/at/atd b/testing/at/atd new file mode 100644 index 000000000..d10a46a3b --- /dev/null +++ b/testing/at/atd @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/atd` +case "$1" in + start) + stat_busy "Starting ATD Daemon" + [ -z "$PID" ] && /usr/sbin/atd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon atd + stat_done + fi + ;; + stop) + stat_busy "Stopping ATD Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon atd + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/at/atd.service b/testing/at/atd.service new file mode 100644 index 000000000..ba359878c --- /dev/null +++ b/testing/at/atd.service @@ -0,0 +1,9 @@ +[Unit] +Description=ATD daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/atd + +[Install] +WantedBy=multi-user.target diff --git a/testing/cabal-install/PKGBUILD b/testing/cabal-install/PKGBUILD index 30bffb560..5ce042013 100644 --- a/testing/cabal-install/PKGBUILD +++ b/testing/cabal-install/PKGBUILD @@ -3,34 +3,41 @@ # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=cabal-install -pkgver=0.14.0 -pkgrel=2 +pkgver=1.16.0 +pkgrel=1 pkgdesc="The command-line interface for Cabal and Hackage." url="http://hackage.haskell.org/package/cabal-install" license=('custom:BSD3') arch=('i686' 'x86_64') -makedepends=('haskell-http=4000.2.3-1' 'haskell-zlib=0.5.3.3-4' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1' 'haskell-random=1.0.1.1-2') +makedepends=('haskell-http=4000.2.4-1' 'haskell-zlib=0.5.3.3-5' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1' 'haskell-random=1.0.1.1-3') depends=('ghc' 'gmp' 'zlib') -source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz) -md5sums=('638514bd1a5792d75866481852148ae5') +source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz") +md5sums=('da046116eee7664158411fa9e2cf6b14') build() { - cd cabal-install-${pkgver} - runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr - runhaskell Setup build + cd cabal-install-${pkgver} + + runhaskell Setup configure \ + --enable-shared \ + --enable-split-objs \ + --enable-executable-stripping \ + --prefix=/usr + + runhaskell Setup build } package() { - cd cabal-install-${pkgver} - runhaskell Setup copy --destdir=$pkgdir + cd cabal-install-${pkgver} + + runhaskell Setup copy --destdir=$pkgdir - # rm license installed to wrong location - rm -rf ${pkgdir}/usr/share/doc + # rm license installed to wrong location + rm -rf ${pkgdir}/usr/share/doc - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - # add bash completion - install -d ${pkgdir}/usr/share/bash-completion/completions - install -m644 bash-completion/cabal \ - ${pkgdir}/usr/share/bash-completion/completions + # add bash completion + install -d ${pkgdir}/usr/share/bash-completion/completions + install -m644 bash-completion/cabal \ + ${pkgdir}/usr/share/bash-completion/completions } diff --git a/testing/cairo/PKGBUILD b/testing/cairo/PKGBUILD index 9c9921212..7084b14b5 100644 --- a/testing/cairo/PKGBUILD +++ b/testing/cairo/PKGBUILD @@ -1,42 +1,29 @@ -# $Id: PKGBUILD 161277 2012-06-08 17:28:49Z foutrelis $ +# $Id: PKGBUILD 168100 2012-10-05 19:56:38Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo -#_gitdate=20120426 -#_gitver=957a9cc619965178a8927d114fe852034fc2385c -pkgver=1.12.2 -pkgrel=2 +pkgver=1.12.4 +pkgrel=1 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') url="http://cairographics.org/" -depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh') +depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman' 'glib2' 'sh') makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc') # 'libdrm') optdepends=('xcb-util: for XCB backend') # really needed? provides=('cairo-xcb') replaces=('cairo-xcb') options=('!libtool') source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz - #$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz - cairo-1.10.0-buggy_gradients.patch - cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch - #git_fixes.patch -) -md5sums=('87649eb75789739d517c743e94879e51' - '9b323790dab003e228c6955633cb888e' - '75ec73746cfaefcbed0e9b2a9f76bf00') - + cairo-1.10.0-buggy_gradients.patch) +md5sums=('a64bb8774a1e476e5cdd69e635794dfb' + '9b323790dab003e228c6955633cb888e') build() { cd "$srcdir/$pkgname-$pkgver" - #cd ${srcdir}/${pkgname}-${_gitver} patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch - # https://bugs.freedesktop.org/show_bug.cgi?id=50852 - patch -Np1 -i ${srcdir}/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch - # status is 2012-04-26 last commit: image: Fix typo in _blit_spans() - #patch -Np1 -i ${srcdir}/git_fixes.patch - autoreconf -vfi - #./autogen.sh --prefix=/usr \ + +# autoreconf -vfi ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -49,13 +36,11 @@ build() { } #check() { -# #cd "$srcdir/$pkgname-$pkgver" -# cd $srcdir/$pkgname-${_gitver} -# make -k check || /bin/true # 165 Passed, 316 Failed [3 crashed, 10 expected], 23 Skipped +# cd "$srcdir/$pkgname-$pkgver" +# make -k check || /bin/true # 134 Passed, 355 Failed [5 crashed, 11 expected], 26 Skipped #} package() { cd "$srcdir/$pkgname-$pkgver" - #cd $srcdir/$pkgname-${_gitver} make DESTDIR="$pkgdir" install } diff --git a/testing/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD new file mode 100644 index 000000000..3bcad6c09 --- /dev/null +++ b/testing/net-snmp/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 168010 2012-10-05 06:54:12Z eric $ +# Maintainer: +# Contributor: Dale Blount <dale@archlinux.org> + +pkgname=net-snmp +pkgver=5.7.1 +pkgrel=4 +pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" +arch=('i686' 'x86_64') +url="http://www.net-snmp.org/" +license=('BSD') +depends=('openssl' 'libnl' 'pciutils') +makedepends=('python2-distribute') +optdepends=('perl-term-readkey: for snmpcheck application' + 'perl-tk: for snmpcheck and tkmib applications' + 'python2: for the python modules') +provides=('ucd-snmp') +backup=('etc/conf.d/snmpd') +options=('!libtool' '!makeflags' '!emptydirs') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} + snmpd.confd snmpd.rc snmpd.service libnl32.patch) +sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' + '2bdc2839ce09d7daa608cd54687fa8beb47ed907' + 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' + '90600c0141eed10d6e3ca3ccc97ad8dda15c2112' + 'f59ddc049c1c689f04e68c3c7cd8b8e301df3158' + '74a9848b95f63378eb1753fc309d2b74de5afb0f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694 + patch -Np1 -i "$srcdir/libnl32.patch" + autoreconf -f -i + + sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in + PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --enable-ucd-snmp-compatibility \ + --enable-ipv6 \ + --with-python-modules \ + --with-default-snmp-version="3" \ + --with-sys-contact="root@localhost" \ + --with-sys-location="Unknown" \ + --with-logfile="/var/log/snmpd.log" \ + --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ + --with-persistent-directory="/var/net-snmp" \ + --disable-static + make NETSNMP_DONT_CHECK_VERSION=1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install + install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" + install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd" + install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/net-snmp/libnl32.patch b/testing/net-snmp/libnl32.patch new file mode 100644 index 000000000..d93d7ef67 --- /dev/null +++ b/testing/net-snmp/libnl32.patch @@ -0,0 +1,80 @@ +diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c +--- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28 06:53:47.000000000 +0200 ++++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09 20:02:49.136022132 +0100 +@@ -566,8 +566,9 @@ + static int + tcpTable_load_netlink(void) + { ++ int err; + /* TODO: perhaps use permanent nl handle? */ +- struct nl_handle *nl = nl_handle_alloc(); ++ struct nl_sock *nl = nl_socket_alloc(); + + if (nl == NULL) { + DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); +@@ -575,10 +576,10 @@ + return -1; + } + +- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + +@@ -590,10 +591,10 @@ + struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); + nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); + +- if (nl_send_auto_complete(nl, nm) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ if ((err = nl_send_auto_complete(nl, nm)) < 0) { ++ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); ++ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); ++ nl_socket_free(nl); + return -1; + } + nlmsg_free(nm); +@@ -604,9 +605,9 @@ + + while (running) { + if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); +- nl_handle_destroy(nl); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); ++ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); ++ nl_socket_free(nl); + return -1; + } + +@@ -655,7 +656,7 @@ + free(buf); + } + +- nl_handle_destroy(nl); ++ nl_socket_free(nl); + + if (tcp_head) { + DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); +diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 +--- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000 +0200 ++++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09 20:10:44.282165275 +0100 +@@ -224,8 +224,9 @@ + if test "x$with_nl" != "xno"; then + case $target_os in + linux*) # Check for libnl (linux) ++ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)" + NETSNMP_SEARCH_LIBS( +- nl_connect, nl, ++ nl_connect, nl-3, + [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS) + ;; + esac diff --git a/testing/net-snmp/snmpd.confd b/testing/net-snmp/snmpd.confd new file mode 100644 index 000000000..926b09bbf --- /dev/null +++ b/testing/net-snmp/snmpd.confd @@ -0,0 +1,5 @@ +# +# Parameters to be passed to snmpd +# +SNMPD_ARGS="" + diff --git a/testing/net-snmp/snmpd.rc b/testing/net-snmp/snmpd.rc new file mode 100644 index 000000000..b00c09f4f --- /dev/null +++ b/testing/net-snmp/snmpd.rc @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/snmpd + +PID=`pidof -o %PPID /usr/sbin/snmpd` +case "$1" in + start) + stat_busy "Starting Net-SNMP" + [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/snmpd.pid + add_daemon snmpd + stat_done + fi + ;; + stop) + stat_busy "Stopping Net-SNMP" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm /var/run/snmpd.pid + rm_daemon snmpd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/net-snmp/snmpd.service b/testing/net-snmp/snmpd.service new file mode 100644 index 000000000..111a8d6a9 --- /dev/null +++ b/testing/net-snmp/snmpd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Simple Network Management Protocol (SNMP) Daemon +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/snmpd +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target |