diff options
| author | root <root@rshg054.dnsready.net> | 2013-06-04 00:27:56 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-06-04 00:27:56 -0700 |
| commit | cc57cb201ddb179d2bb481c13dd4f286ae643b12 (patch) | |
| tree | 7932470d6b8a193c032f1012a7996cc78ea52201 | |
| parent | 1f86bf1b08cb980cea57c1d4d3187e2251f5a63b (diff) | |
Tue Jun 4 00:27:56 PDT 2013
160 files changed, 1861 insertions, 1577 deletions
diff --git a/community/astyle/ChangeLog b/community/astyle/ChangeLog deleted file mode 100644 index 8873d5f0e..000000000 --- a/community/astyle/ChangeLog +++ /dev/null @@ -1,13 +0,0 @@ -2009-02-26 Mateusz Herych <heniekk@gmail.com> - - * Updated to 1.22 - -2008-04-06 Mateusz Herych <heniekk@gmail.com> - - * Changed license to LGPL - * Updated to 1.22 - -2007-09-18 Vinay S Shastry <vinayshastry@gmail.com> - - * PKGBUILD: depend on gcc-libs - diff --git a/community/astyle/PKGBUILD b/community/astyle/PKGBUILD index 85c4597ea..b0aed8acc 100644 --- a/community/astyle/PKGBUILD +++ b/community/astyle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68495 2012-03-26 08:43:21Z lfleischer $ +# $Id: PKGBUILD 92315 2013-06-03 21:55:18Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Thomas Mader <thezema@gmail.com> @@ -6,7 +6,7 @@ # Contributor: tardo <tardo@nagi-fanboi.net> pkgname=astyle -pkgver=2.02.1 +pkgver=2.03 pkgrel=1 pkgdesc='A free, fast and small automatic formatter for C, C++, C#, and Java source code.' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url='http://sourceforge.net/projects/astyle/' license=('LGPL') depends=('gcc-libs') source=("http://downloads.sourceforge.net/sourceforge/astyle/${pkgname}_${pkgver}_linux.tar.gz") -md5sums=('3e3ef8024c175ef4e1720b7aa4c75202') +md5sums=('ba84eaa8564155babd4ba1458d4eaa11') build() { cd "$srcdir/$pkgname/build/gcc" diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD index 6af77b344..2d1f99a9a 100644 --- a/community/atop/PKGBUILD +++ b/community/atop/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 90647 2013-05-13 14:18:25Z spupykin $ +# $Id: PKGBUILD 92271 2013-06-03 13:35:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: John Gerritse <john.gerritse@gmail.com> pkgname=atop -pkgver=2.0_1 -pkgrel=2 +pkgver=2.0.2 +pkgrel=1 pkgdesc="A system and process level monitor." arch=(i686 x86_64) url="http://www.atoptool.nl/" license=('GPL') depends=('ncurses' 'sh' 'zlib') -source=(http://www.atoptool.nl/download/atop-${pkgver/_/-}.tar.gz) -md5sums=('6867ea2211edaf8140b94130470d646b') +source=(http://www.atoptool.nl/download/atop-${pkgver}.tar.gz) +md5sums=('f1dd1984584f9635712cb7196e25620c') build() { cd $srcdir/$pkgname-${pkgver/_/-} diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index 29fbd6653..a9b396fd7 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90885 2013-05-15 08:03:41Z bpiotrowski $ +# $Id: PKGBUILD 92244 2013-06-03 11:15:10Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> @@ -6,7 +6,7 @@ pkgname=autofs pkgver=5.0.7 -pkgrel=2 +pkgrel=3 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64') url='http://freshmeat.net/projects/autofs' @@ -14,19 +14,15 @@ license=('GPL2') depends=('libxml2') makedepends=('libldap' 'krb5' 'kmod') optdepends=('krb5: for LDAP support') -backup=('etc/autofs/auto.master' - 'etc/autofs/auto.misc' - 'etc/conf.d/autofs') +backup=('etc/default/autofs' + 'etc/autofs/auto.master' + 'etc/autofs/auto.misc') options=(!makeflags) install='autofs.install' source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" - 'autofs' - 'autofs.conf.d' 'auto.master' 'auto.misc') md5sums=('bc46838dece83c02d800ff144ed9f431' - 'e307bf6d2638e46eeb916cf42fe029b2' - '47f597c870410055e0fdb66103daf928' 'a6cefb591e77b31b79dbb7243646c96b' 'd8a15ec9186c5c0b36e5cea1e2739e8a') @@ -36,7 +32,8 @@ build() { sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \ Makefile.rules - ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \ + ./configure --prefix=/usr --sysconfdir=/etc/autofs --sbindir=/usr/bin \ + --with-mapdir=/etc/autofs --without-hesiod \ --enable-ignore-busy --with-systemd make } @@ -48,8 +45,8 @@ package() { install -Dm0644 "${srcdir}/auto.master" "${pkgdir}/etc/autofs/auto.master" install -Dm0644 "${srcdir}/auto.misc" "${pkgdir}/etc/autofs/auto.misc" - install -Dm0755 "${srcdir}/autofs" "${pkgdir}/etc/rc.d/autofs" - install -Dm0644 "${srcdir}/autofs.conf.d" "${pkgdir}/etc/conf.d/autofs" install -Dm0644 "samples/autofs.service" "${pkgdir}/usr/lib/systemd/system/autofs.service" } + +# vim:set ts=2 sw=2 et: diff --git a/community/autofs/autofs b/community/autofs/autofs deleted file mode 100644 index 08bd3e133..000000000 --- a/community/autofs/autofs +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -daemon_name=autofs - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs - -if [ ! -z "$TIMEOUT" ]; then - daemonoptions="--timeout=$TIMEOUT $daemonoptions" -fi - -PID=`cat /var/run/autofs-running 2> /dev/null` -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $daemon_name - stat_done - fi - ;; - stop) - stat_busy "Stopping $daemon_name daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $daemon_name - stat_done - fi - ;; - restart) - stat_busy "Restarting $daemon_name daemon" - $0 stop - sleep 1 - $0 start - ;; - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - *) - echo "usage: $0 {start|stop|restart|status}" -esac -exit 0 diff --git a/community/autofs/autofs.conf.d b/community/autofs/autofs.conf.d deleted file mode 100644 index bc82491e7..000000000 --- a/community/autofs/autofs.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -#localoptions='rsize=8192,wsize=8192' - -# e.g. --timeout=60 -daemonoptions='' diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index 77fdab78e..f3b4b8502 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 87403 2013-03-31 19:18:05Z stephane $ +# $Id: PKGBUILD 92237 2013-06-03 06:54:08Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.8.1 -pkgrel=2 +pkgver=0.8.2 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.bitcoin.org/" makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc') license=('MIT') source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz) -sha256sums=('6d7f023a9df1a436c51de83f7cd751f162be9b4fb1c06da05545f9fba7cb2a98') +sha256sums=('e15d3134f4efd8d60e243c7177edba06ac471619674ca07a42a1dced5f498728') build() { cd "$srcdir/$pkgbase-$pkgver-linux/src" @@ -34,8 +34,8 @@ package_bitcoin-qt() { install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt install -Dm644 contrib/debian/bitcoin-qt.desktop \ "$pkgdir"/usr/share/applications/bitcoin.desktop - install -Dm644 share/pixmaps/bitcoin80.xpm \ - "$pkgdir"/usr/share/pixmaps/bitcoin80.xpm + install -Dm644 share/pixmaps/bitcoin128.png \ + "$pkgdir"/usr/share/pixmaps/bitcoin128.png install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index c68f4eb78..70c7430c1 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87405 2013-03-31 19:18:08Z stephane $ +# $Id: PKGBUILD 92313 2013-06-03 21:39:22Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive -pkgver=0.7.12 -pkgrel=2 +pkgver=0.7.13 +pkgrel=1 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64') url='http://cclive.sourceforge.net/' @@ -13,7 +13,7 @@ license=('GPL3') depends=('boost-libs' 'pcre' 'curl' 'libquvi') makedepends=('boost') source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz") -md5sums=('f35a6fb3a9a08d59da7170c1330a24ce') +md5sums=('654892be303c2738dd078dbe6c78595d') build() { cd $pkgname-$pkgver diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index defb3c128..66ec01064 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90367 2013-05-12 04:56:34Z thestinger $ +# $Id: PKGBUILD 92287 2013-06-03 14:08:59Z thestinger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> @@ -9,11 +9,11 @@ pkgname=chrony pkgver=1.27 -pkgrel=3 +pkgrel=4 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64') url="http://chrony.tuxfamily.org/" -options=('strip') +options=(strip !emptydirs) license=('GPL') depends=('readline' 'libcap') backup=('etc/chrony.conf') diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 5868dbd20..27b69d8da 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91822 2013-05-28 13:42:16Z spupykin $ +# $Id: PKGBUILD 92273 2013-06-03 13:36:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,13 +6,13 @@ pkgname=darktable pkgver=1.2.1 _pkgver=1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ license=('GPL3') depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' - 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite' 'libxslt' + 'curl' 'libgnome-keyring' 'libgphoto2' 'openexr' 'sqlite' 'libxslt' 'libsoup' 'gtk-engines') makedepends=('intltool>=0.40' 'cmake' 'librsvg') optdepends=('librsvg') diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 9dc722249..f193f2ea9 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 91488 2013-05-23 10:12:27Z spupykin $ +# $Id: PKGBUILD 92241 2013-06-03 10:26:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail -pkgver=3.0.2 -pkgrel=11 +pkgver=3.0.3pre +pkgrel=1 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime24' 'libzdb' 'mhash' 'libevent') makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1' - 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve') + 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' + 'git') optdepends=('libldap: for LDAP authentication' 'libsieve: for dbmail-sieve') url="http://www.dbmail.org" @@ -19,7 +20,8 @@ backup=(etc/xinetd.d/dbmail-imapd etc/xinetd.d/dbmail-pop3d etc/xinetd.d/dbmail-lmtpd etc/xinetd.d/dbmail-timsieved) -source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz +#source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz +source=("$pkgname-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_0" dbmail.tmpfiles dbmail-imapd.service dbmail-lmtpd.service @@ -29,7 +31,7 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail-lmtpd.xinetd dbmail-pop3d.xinetd dbmail-timsieved.xinetd) -md5sums=('eb32235abffdf967253ee9d004e0e4a9' +md5sums=('SKIP' 'c4b5793c5422b62a675d4c66ff7e9300' '5a6297cb03c8d0b424f978ea1d7402de' '070db88538af9833f003f4cb516d337b' diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD index bf53aa08d..0b03164dc 100644 --- a/community/ecryptfs-utils/PKGBUILD +++ b/community/ecryptfs-utils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85885 2013-03-08 11:10:34Z tredaelli $ +# $Id: PKGBUILD 92248 2013-06-03 11:15:14Z allan $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Richard Murri <admin@richardmurri.com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=ecryptfs-utils pkgver=103 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" url="https://launchpad.net/ecryptfs" @@ -27,6 +27,6 @@ build() { package() { cd "$srcdir/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir/" install - chmod +s "$pkgdir"/sbin/mount.ecryptfs_private + make DESTDIR="$pkgdir/" rootsbindir='/usr/bin' install + chmod +s "$pkgdir/usr/bin/mount.ecryptfs_private" } diff --git a/community/esmtp/PKGBUILD b/community/esmtp/PKGBUILD index b275244ff..a234ff615 100644 --- a/community/esmtp/PKGBUILD +++ b/community/esmtp/PKGBUILD @@ -5,7 +5,7 @@ pkgname=esmtp pkgver=1.2 -pkgrel=4 +pkgrel=5 pkgdesc="An easy SMTP forwarder." arch=('i686' 'x86_64') url='http://esmtp.sourceforge.net' @@ -20,7 +20,7 @@ md5sums=('79a9c1f9023d53f35bb82bf446150a72') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index fd090db52..f2bacb9de 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90949 2013-05-16 06:57:01Z bpiotrowski $ +# $Id: PKGBUILD 92250 2013-06-03 11:15:19Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=exim pkgver=4.80.1 -pkgrel=3 +pkgrel=5 pkgdesc="Message Transfer Agent" arch=('x86_64' 'i686') url='http://www.exim.org/' @@ -65,11 +65,9 @@ package() { cp "$srcdir/aliases" "$pkgdir/etc/mail" - install -d "$pkgdir/usr/sbin" cd "$pkgdir/usr/bin" - for i in mailq rmail rsmtp runq sendmail; do + for i in mailq newaliases rmail rsmtp runq sendmail; do ln -s exim "$i" - ln -s ../bin/exim ../sbin/"$i" done # fhs compliancy diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index 9c53249d6..bcb2fb7c5 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92113 2013-05-31 16:29:44Z spupykin $ +# $Id: PKGBUILD 92260 2013-06-03 11:49:45Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be @@ -7,7 +7,7 @@ pkgname=glusterfs pkgver=3.3.1 _basever=`echo $pkgver | cut -f1-2 -d.` -pkgrel=4 +pkgrel=5 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64) url='http://www.gluster.org/' @@ -28,6 +28,7 @@ build() { ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ + --with-mountutildir=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/share/man \ @@ -45,10 +46,7 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - mkdir -p $pkgdir/usr/sbin make DESTDIR=$pkgdir install - mv $pkgdir/sbin/* $pkgdir/usr/sbin - rmdir $pkgdir/sbin install -D -m 644 \ $srcdir/$pkgname-$pkgver/{README,INSTALL,COPYING*} \ diff --git a/community/hdapsd/PKGBUILD b/community/hdapsd/PKGBUILD index 7381649b5..1fd252d76 100644 --- a/community/hdapsd/PKGBUILD +++ b/community/hdapsd/PKGBUILD @@ -4,7 +4,7 @@ pkgname=hdapsd pkgver=20090401 -pkgrel=7 +pkgrel=8 pkgdesc='HDAPS userspace hard drive protection daemon' arch=('i686' 'x86_64') url='http://sourceforge.net/projects/hdaps/' @@ -13,7 +13,7 @@ depends=('glibc' 'bash') source=("http://downloads.sourceforge.net/hdaps/hdapsd-${pkgver}.tar.gz" 'hdapsd.systemd') md5sums=('897cee8b0192febd127470f3e9506aeb' - '61ac40d4d77e57863da68d9fd94c58e7') + 'f514cca78059477c4f33faf97d4aaa06') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/hdapsd/hdapsd.systemd b/community/hdapsd/hdapsd.systemd index d3927d61e..0f35250a7 100644 --- a/community/hdapsd/hdapsd.systemd +++ b/community/hdapsd/hdapsd.systemd @@ -5,7 +5,7 @@ After=syslog.target [Service] Type=forking PIDFile=/var/run/hdapsd.pid -ExecStart=/usr/bin/hdapsd-wrapper +ExecStart=/usr/bin/hdapsd -bp ExecReload=/bin/kill -HUP ${MAINPID} [Install] diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 55b9133eb..caa8bd5b5 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,40 +1,46 @@ -# $Id: PKGBUILD 90047 2013-05-06 19:37:52Z foutrelis $ +# $Id: PKGBUILD 92299 2013-06-03 16:15:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars -pkgver=0.9.18 -pkgrel=8 +pkgver=0.9.19 +pkgrel=1 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64') url="http://hedgewars.org" license=('GPL' 'custom') -depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51') +depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'ffmpeg' 'glut') makedepends=('fpc' 'cmake' # haskell specific - 'ghc=7.6.3-1' - 'haskell-network=2.4.1.2-1' - 'haskell-bytestring-show=0.3.5.4-4' - 'haskell-utf8-string=0.3.7-5' - 'haskell-dataenc=0.14.0.5-2' - 'haskell-hslogger=1.2.1-4' - 'haskell-vector=0.10.0.1-4') -source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver-3.tar.bz2 + 'ghc' + 'haskell-network' + 'haskell-bytestring-show' + 'haskell-utf8-string' + 'haskell-dataenc' + 'haskell-hslogger' + 'haskell-vector' + 'haskell-random') +source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop - hedgewars.png) -md5sums=('02465736fdcf48feea1cacaa0aa5960e' + hedgewars.png + build-fix.patch) +md5sums=('51d84ad6ea00e9894e6119b118b4a523' '48c66a3204d4fa0a69e9aa46f7c31e0c' - 'eeb14d50df39063549ac5eca9dbc65d1') + 'eeb14d50df39063549ac5eca9dbc65d1' + 'a9d7b0ba72cbeb7fc74fce459db9dd90') + +prepare() { + cd $pkgname-src-$pkgver + patch -Rp1 <$srcdir/build-fix.patch +} build() { cd $pkgname-src-$pkgver - sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs -# sed -i 's|lua51 lua5.1 lua-5.1|lua lua51 lua5.1 lua-5.1|g' cmake_modules/FindLua.cmake cmake \ + -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATA_INSTALL_DIR=/usr/share \ - -DQT_QMAKE_EXECUTABLE=/usr/lib/qt4/bin/qmake \ - -DQT_MOC_EXECUTABLE=/usr/lib/qt4/bin/moc \ - -DWITH_SERVER=1 . + -DDATA_INSTALL_DIR=/usr/share/hedgewars \ + -DWITH_SERVER=1 \ + -DSYSTEM_PHYSFS=OFF . make } diff --git a/community/hedgewars/build-fix.patch b/community/hedgewars/build-fix.patch new file mode 100644 index 000000000..90a4365f2 --- /dev/null +++ b/community/hedgewars/build-fix.patch @@ -0,0 +1,11 @@ +diff -wbBur /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas +--- /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-06-03 20:01:14.212121255 +0400 ++++ hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-05-31 00:07:33.000000000 +0400 +@@ -9,7 +9,6 @@ + {$IFNDEF WIN32} + {$linklib physfs} + {$linklib physlayer} +- {$linklib gcc_s} + + {statically linking physfs brings IOKit dependency on OSX} + {divdi3 is found in stdc++ on linux x86 and in gcc_s.1 on osx ppc32} diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index d267f726e..591b8b8e6 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92095 2013-05-31 13:59:18Z spupykin $ +# $Id: PKGBUILD 92275 2013-06-03 13:36:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=1.0.5 -pkgrel=7 +pkgrel=8 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -13,7 +13,7 @@ depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' 'iproute2' 'libnl' 'libx11' 'audit') -makedepends=('pkgconfig' 'lvm2' 'linux-api-headers') +makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' 'kvm' @@ -55,9 +55,7 @@ build() { --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ --with-init-script=systemd --with-audit \ --with-qemu-user=nobody --with-qemu-group=nobody \ - --without-netcf --with-interface \ - --with-dnsmasq-path=/usr/bin/dnsmasq \ - --with-iptables-path=/usr/bin/iptables + --without-netcf --with-interface make sed -i 's|/etc/sysconfig/|/etc/conf.d/|' daemon/libvirtd.service tools/libvirt-guests.service diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD index d4e752e51..fe1c0a16e 100755 --- a/community/lightdm-gtk2-greeter/PKGBUILD +++ b/community/lightdm-gtk2-greeter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91482 2013-05-23 08:41:25Z alucryd $ +# $Id: PKGBUILD 92267 2013-06-03 13:05:16Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk2-greeter -pkgver=1.5.2 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 epoch=1 pkgdesc="GTK+ greeter for LightDM" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ provides=("${pkgname/2/}") conflicts=("${pkgname/2/3}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz") -sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc') +sha256sums=('69df6199a7e62b07a1865b0319a7c031abc2b06dc3eb193b8b7b453f536283ac') build() { cd "${srcdir}"/${pkgname/2/}-${pkgver} diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD index 9eaefdb98..6455f5383 100755 --- a/community/lightdm-gtk3-greeter/PKGBUILD +++ b/community/lightdm-gtk3-greeter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91480 2013-05-23 08:39:59Z alucryd $ +# $Id: PKGBUILD 92265 2013-06-03 12:53:06Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk3-greeter -pkgver=1.5.2 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 epoch=1 pkgdesc="GTK+ greeter for LightDM" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ provides=("${pkgname/3/}") conflicts=("${pkgname/3/2}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz") -sha256sums=('0de611783a9306130b0f0865c533fcaf2d21fcda9f85e7ee81b58cfa5bd781cc') +sha256sums=('69df6199a7e62b07a1865b0319a7c031abc2b06dc3eb193b8b7b453f536283ac') build() { cd "${srcdir}"/${pkgname/3/}-${pkgver} diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD index 2657bc573..497e28d5a 100644 --- a/community/luajit/PKGBUILD +++ b/community/luajit/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 85940 2013-03-09 14:50:34Z bpiotrowski $ +# $Id: PKGBUILD 92307 2013-06-03 20:18:47Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Chris Brannon <chris@the-brannons.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Anders Bergh <anders1@gmail.com> pkgname=luajit -pkgver=2.0.1 -pkgrel=2 +pkgver=2.0.2 +pkgrel=1 pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1' arch=('i686' 'x86_64') url='http://luajit.org/' license=('MIT') depends=('gcc-libs') -source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz - http://luajit.org/download/v2.0.1_hotfix1.patch) -sha256sums=('2371cceb53453d8a7b36451e6a0ccdb66236924545d6042ddd4c34e9668990c0' - '143898de3fe84455684fddb92947d36c1a51c6a6e3884813fe5e025bd4652368') +source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz) +sha256sums=('c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38') build() { cd $srcdir/LuaJIT-$pkgver - patch -Np1 -i $srcdir//v2.0.1_hotfix1.patch make amalg PREFIX=/usr } diff --git a/community/minetest/PKGBUILD b/community/minetest/PKGBUILD index 2fb9f0c74..f4c634946 100644 --- a/community/minetest/PKGBUILD +++ b/community/minetest/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92174 2013-06-02 12:00:30Z lcarlier $ +# $Id: PKGBUILD 92225 2013-06-03 00:36:30Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Konsta Kokkinen <kray@tsundere.fi> @@ -10,7 +10,7 @@ arch=('i686' 'x86_64') url='http://minetest.net/' license=('GPL') depends=('sqlite' 'libgl' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'hicolor-icon-theme') -makedepends=('cmake' 'irrlicht' 'mesa' 'libpng' 'zlib') +makedepends=('cmake' 'irrlicht' 'mesa') install=minetest.install source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver} ${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver} diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index e71ebadf1..337e08c62 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89988 2013-05-06 18:29:21Z ttoepper $ +# $Id: PKGBUILD 92251 2013-06-03 11:15:23Z allan $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh pkgver=R46 -pkgrel=2 +pkgrel=3 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' license=('custom') @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/$pkgname" - install -D -m 755 mksh "$pkgdir/bin/mksh" + install -D -m 755 mksh "$pkgdir/usr/bin/mksh" install -D -m 644 mksh.1 "$pkgdir/usr/share/man/man1/mksh.1" install -D -m 644 dot.mkshrc "$pkgdir/etc/skel/.mkshrc" install -D -m 644 "$srcdir/TaC-mksh.txt" "$pkgdir/usr/share/licenses/mksh/TaC-mksh.txt" diff --git a/community/mksh/mksh.install b/community/mksh/mksh.install index 3e5f2a924..f096a2b66 100644 --- a/community/mksh/mksh.install +++ b/community/mksh/mksh.install @@ -2,10 +2,6 @@ post_install() { grep -x /bin/mksh /etc/shells >/dev/null || echo /bin/mksh >>/etc/shells } -post_upgrade() { - post_install $1 -} - post_remove() { sed -i "/^\/bin\/mksh$/d" /etc/shells } diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD index 1a4426a69..5e588c010 100644 --- a/community/opensmtpd/PKGBUILD +++ b/community/opensmtpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91076 2013-05-18 18:46:51Z bpiotrowski $ +# $Id: PKGBUILD 92253 2013-06-03 11:15:25Z allan $ # Maintainer: Sébastien Luttringer pkgname=opensmtpd pkgver=5.3.2p1 -pkgrel=1 +pkgrel=2 pkgdesc='Free implementation of the server-side SMTP protocol' arch=('i686' 'x86_64') url='http://www.opensmtpd.org/' @@ -57,13 +57,7 @@ package() { install -Dm640 /dev/null "$pkgdir/etc/secrets" # fake sendmail binary (used to be smtp-forwarder) # use hardlink as upstream does... - cd "$pkgdir/usr/bin" - ln smtpctl "$pkgdir/usr/bin/sendmail" - # symlink binary from usr/bin to usr/sbin (waiting /usr merge) - install -dm755 "$pkgdir/usr/sbin" - for _p in *; do - ln -s "../bin/$_p" "$pkgdir/usr/sbin/$_p" - done + ln "$pkgdir/usr/bin/smtpctl" "$pkgdir/usr/bin/sendmail" } # vim:set ts=2 sw=2 et: diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index e50a44366..b90a4c5eb 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86302 2013-03-14 21:30:53Z kkeen $ +# $Id: PKGBUILD 92254 2013-06-03 11:15:27Z allan $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> @@ -8,113 +8,114 @@ pkgbase=oss pkgname=oss true && pkgname=(oss libflashsupport-oss) pkgver=4.2_2007 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url="http://developer.opensound.com/" license=('GPL2') makedepends=('gtk2') source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" - "rm-init-scripts.patch" - "rc-script" - "soundon.patch" - "remove-hal.patch" - "linux-3.8.patch" - "oss.service" - ) + "rm-init-scripts.patch" + "soundon.patch" + "remove-hal.patch" + "linux-3.8.patch" + "oss.service" +) md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7' 'b9a380a0ac8896390d71ac13676f27e1' - 'cbcbce5c03b127df5eafa8faa091492c' '65f07fe241bfbf912f76d8b6d8f276b5' 'cd7f1dc6166bba8c94d96f3a28e948a5' 'effecefb774f1d08ef9f0af0ad205c34' - '8db0255b380dc6672993e627d1cd8ca6') + '39c46b10a6bc56fc146d669a61bd3028') _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl build() { - cd "${srcdir}/${_dir}" - - # Avoid these flags conflicting with OSS build system. - unset CFLAGS - unset LDFLAGS - unset OSFLAGS - unset LIBRARIES - export NO_WARNING_CHECKS=yes - - # Compile libflashsupport.so only in packaging time, so we avoid - # conflicts with other packages and ease package management. - msg "Building libflashsupport.so." - cd oss/lib - gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so - - msg "Preparing the build environment." - cd "${srcdir}" - - # Create build directory and configure - rm -rf build - mkdir build && cd build - "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm - - # ossvermagic hardcodes /lib/modules *grumble* - sed -i 's|/lib/modules|/usr&|' \ - os_cmd/Linux/ossvermagic/ossvermagic.c - - pushd "$srcdir/$_dir" - patch -p0 -i "${srcdir}/linux-3.8.patch" - popd - - msg "Building OSS." - make build - - msg "Patching init scripts." - cd "${srcdir}/build/prototype" - rm usr/lib/oss/etc/S89oss - patch -p0 -i "${srcdir}/rm-init-scripts.patch" - patch -p0 -i "${srcdir}/soundon.patch" - # remove hal dependency - patch -p0 -i "${srcdir}/remove-hal.patch" - rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi - - # fix kernel module directories - sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon - sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh - sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh - sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh - sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \ - usr/lib/oss/build/install.sh \ - usr/lib/oss/scripts/restore_drv.sh \ - usr/lib/oss/scripts/setup-alsa.sh \ - usr/lib/oss/scripts/remove_drv.sh \ - usr/lib/oss/build/Makefile.tmpl \ - usr/lib/oss/build/Makefile.osscore \ - usr/lib/oss/cuckoo/Makefile + cd "${srcdir}/${_dir}" + + # Avoid these flags conflicting with OSS build system. + unset CFLAGS + unset LDFLAGS + unset OSFLAGS + unset LIBRARIES + export NO_WARNING_CHECKS=yes + + # Compile libflashsupport.so only in packaging time, so we avoid + # conflicts with other packages and ease package management. + msg "Building libflashsupport.so." + cd oss/lib + gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so + + msg "Preparing the build environment." + cd "${srcdir}" + + # Create build directory and configure + rm -rf build + mkdir build && cd build + "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm + + # ossvermagic hardcodes /lib/modules *grumble* + sed -i 's|/lib/modules|/usr&|' \ + os_cmd/Linux/ossvermagic/ossvermagic.c + + pushd "$srcdir/$_dir" + patch -p0 -i "${srcdir}/linux-3.8.patch" + popd + + msg "Building OSS." + make build + + msg "Patching init scripts." + cd "${srcdir}/build/prototype" + rm usr/lib/oss/etc/S89oss + patch -p0 -i "${srcdir}/rm-init-scripts.patch" + patch -p0 -i "${srcdir}/soundon.patch" + # remove hal dependency + patch -p0 -i "${srcdir}/remove-hal.patch" + rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi + + # fix kernel module directories + sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon + sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh + sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh + sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh + sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \ + usr/lib/oss/build/install.sh \ + usr/lib/oss/scripts/restore_drv.sh \ + usr/lib/oss/scripts/setup-alsa.sh \ + usr/lib/oss/scripts/remove_drv.sh \ + usr/lib/oss/build/Makefile.tmpl \ + usr/lib/oss/build/Makefile.osscore \ + usr/lib/oss/cuckoo/Makefile } package_oss() { - pkgdesc="Open Sound System UNIX audio architecture" - depends=('gcc' 'make' 'linux-headers' 'libtool' 'sed') - optdepends=('gtk2: for graphical mixer (ossxmix)' - 'libflashsupport-oss: Adobe flash plugin support') - conflicts=('oss-linux' 'oss-linux-free' 'oss-testing') - backup=('usr/lib/oss/soundon.user') - install=oss.install - - cd "${srcdir}/build/prototype" - cp -a * "${pkgdir}" - - chmod -R a+r "${pkgdir}" # All files can have read permission (FS#13815) - find "${pkgdir}" -type d -exec chmod a+x '{}' \; # Make namcap happy - install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss" - install -Dm644 "$srcdir/oss.service" "$pkgdir/usr/lib/systemd/system/oss.service" + pkgdesc="Open Sound System UNIX audio architecture" + depends=('gcc' 'make' 'linux-headers' 'libtool' 'sed') + optdepends=('gtk2: for graphical mixer (ossxmix)' + 'libflashsupport-oss: Adobe flash plugin support') + conflicts=('oss-linux' 'oss-linux-free' 'oss-testing') + backup=('usr/lib/oss/soundon.user') + install=oss.install + + cd "${srcdir}/build/prototype" + cp -a * "${pkgdir}" + + cd "$pkgdir" + mv usr/sbin/* usr/bin + rmdir usr/sbin + chmod -R a+r . # All files can have read permission (FS#13815) + find . -type d -exec chmod a+x '{}' \; # Make namcap happy + install -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service } package_libflashsupport-oss() { - pkgdesc="Adobe flash plugin support lib (OSSv4)" - conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss') - depends=('oss') + pkgdesc="Adobe flash plugin support lib (OSSv4)" + conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss') + depends=('oss') - cd "${srcdir}/${_dir}" + cd "${srcdir}/${_dir}" - install -dm755 "$pkgdir/usr/lib" - ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so" + install -dm755 "$pkgdir/usr/lib" + ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so" } +# vim:set ts=2 sw=2 et: diff --git a/community/oss/oss.service b/community/oss/oss.service index 107c9bf3f..0200d2477 100644 --- a/community/oss/oss.service +++ b/community/oss/oss.service @@ -5,8 +5,8 @@ Before=sound.target [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/sbin/soundon -ExecStop=/usr/sbin/soundoff +ExecStart=/usr/bin/soundon +ExecStop=/usr/bin/soundoff [Install] WantedBy=multi-user.target diff --git a/community/oss/rc-script b/community/oss/rc-script deleted file mode 100644 index 5c930107c..000000000 --- a/community/oss/rc-script +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy 'Starting Open Sound System' - if /usr/sbin/soundon; then - add_daemon oss - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy 'Stopping Open Sound System' - if /usr/sbin/soundoff; then - rm_daemon oss - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" -esac diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD index a6347c110..365b70e67 100644 --- a/community/pd/PKGBUILD +++ b/community/pd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92207 2013-06-02 18:54:01Z bpiotrowski $ +# $Id: PKGBUILD 92233 2013-06-03 06:13:55Z bpiotrowski $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: TDY <tdy@gmx.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> @@ -6,7 +6,7 @@ pkgname=pd pkgver=0.44.3 _ver=${pkgver%.*}-${pkgver##*.} -pkgrel=1 +pkgrel=2 pkgdesc="The Pure Data real-time music and multimedia environment" arch=('i686' 'x86_64') url="http://crca.ucsd.edu/~msp/software.html" @@ -22,7 +22,8 @@ build() { ./configure --prefix=/usr \ --enable-alsa \ --enable-jack \ - --enable-fftw + --enable-fftw \ + --disable-portaudio make } diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 1ded6d451..8ca516d98 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91963 2013-05-30 10:15:36Z spupykin $ +# $Id: PKGBUILD 92285 2013-06-03 13:57:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> @@ -6,11 +6,11 @@ pkgname=qcad pkgver=3.0.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') url="http://www.ribbonsoft.com/qcad.html" -license=('GPL2') +license=('GPL3') depends=('qtwebkit') makedepends=('glu') options=(libtool) diff --git a/community/redshift/165_164.diff b/community/redshift/165_164.diff new file mode 100644 index 000000000..663b5663b --- /dev/null +++ b/community/redshift/165_164.diff @@ -0,0 +1,55 @@ +=== modified file 'src/location-geoclue.c' +--- src/location-geoclue.c 2011-03-27 22:14:58 +0000 ++++ src/location-geoclue.c 2011-07-12 20:30:30 +0000 +@@ -50,14 +50,20 @@ + int + location_geoclue_start(location_geoclue_state_t *state) + { +- GeoclueMaster *master = NULL; +- GeoclueMasterClient *client = NULL; +- GError *error = NULL; +- gchar *name = NULL; ++ if (state->provider && state->provider_path) { ++ state->position = geoclue_position_new(state->provider, ++ state->provider_path); ++ } else { ++ GeoclueMaster *master = geoclue_master_get_default(); ++ GeoclueMasterClient *client = geoclue_master_create_client(master, ++ NULL, NULL); ++ GError *error = NULL; + +- if (!(state->provider && state->provider_path)) { +- master = geoclue_master_get_default(); +- client = geoclue_master_create_client(master, NULL, NULL); ++ if (client == NULL) { ++ g_printerr(_("Unable to obtain master client.\n")); ++ g_object_unref(master); ++ return -1; ++ } + + if (!geoclue_master_client_set_requirements(client, + GEOCLUE_ACCURACY_LEVEL_REGION, +@@ -68,15 +74,18 @@ + error->message); + g_error_free(error); + g_object_unref(client); ++ g_object_unref(master); + + return -1; + } + + state->position = geoclue_master_client_create_position(client, NULL); +- } else { +- state->position = geoclue_position_new(state->provider, +- state->provider_path); +- } ++ ++ g_object_unref(client); ++ g_object_unref(master); ++ } ++ ++ gchar *name = NULL; + + if (geoclue_provider_get_provider_info(GEOCLUE_PROVIDER(state->position), + &name, NULL, NULL)) { + diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD index 8212eb57a..b03f4e1dd 100644 --- a/community/redshift/PKGBUILD +++ b/community/redshift/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80160 2012-11-17 01:18:35Z lfleischer $ +# $Id: PKGBUILD 92311 2013-06-03 21:26:54Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Geoffrey Teale <tealeg@stop-squark> # Contributor: Mark, Huo Mian <markhuomian[at]gmail[dot]com> @@ -6,7 +6,7 @@ pkgname=redshift pkgver=1.7 -pkgrel=5 +pkgrel=6 pkgdesc='Adjusts the color temperature of your screen according to your surroundings.' arch=('i686' 'x86_64') url='http://jonls.dk/redshift/' @@ -17,14 +17,23 @@ optdepends=('pygtk: for gtk-redshift' 'librsvg: for gtk-redshift') makedepends=('python2') install='redshift.install' -source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c56512afa292b5a94b715ed4a1841d4c') +source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2" + '165_164.diff') +md5sums=('c56512afa292b5a94b715ed4a1841d4c' + 'eaafcdc62a47d725c256cd5473f4efa1') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's/python/python2/' src/gtk-redshift/gtk-redshift + # fix GTK UI segmentation fault (fixes FS#33412) + patch -p0 -i ../165_164.diff +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr make } diff --git a/community/shfs-utils/PKGBUILD b/community/shfs-utils/PKGBUILD index b939c8f7c..f5e7e4045 100644 --- a/community/shfs-utils/PKGBUILD +++ b/community/shfs-utils/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 68044 2012-03-17 11:53:37Z giovanni $ +# $Id: PKGBUILD 92255 2013-06-03 11:15:28Z allan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Sébastien Luttringer # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> pkgname=shfs-utils pkgver=0.35 -pkgrel=4 -pkgdesc="SHell FileSystem Linux utils" -url="http://shfs.sourceforge.net/" +pkgrel=5 +pkgdesc='SHell FileSystem Linux utils' +url='http://shfs.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64') depends=('glibc' 'openssh') @@ -16,15 +17,18 @@ source=("http://downloads.sourceforge.net/sourceforge/shfs/shfs-$pkgver.tar.gz" md5sums=('016f49d71bc32eee2b5d11fc1600cfbe' '49fb94b139bc69927815127f0bf85159') -build() { - cd "${srcdir}/shfs-${pkgver}" +prepare() { + patch -Np0 -d shfs-$pkgver < $pkgname-make.patch +} - patch -Np0 -i "${srcdir}/$pkgname-make.patch" +build() { + cd shfs-$pkgver make -j1 utils } package() { - cd "${srcdir}/shfs-${pkgver}" - - make -j1 ROOT="${pkgdir}" utils-install + cd shfs-$pkgver + make -j1 ROOT="$pkgdir" utils-install + # remove sbin symlinks + rm -r "$pkgdir/sbin" } diff --git a/community/tcsh/PKGBUILD b/community/tcsh/PKGBUILD index 2c7edb257..386245467 100644 --- a/community/tcsh/PKGBUILD +++ b/community/tcsh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66330 2012-02-23 15:37:07Z lfleischer $ +# $Id: PKGBUILD 92256 2013-06-03 11:15:29Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tcsh pkgver=6.18.01 -pkgrel=1 +pkgrel=2 pkgdesc='Enhanced version of the Berkeley C shell.' arch=('i686' 'x86_64') url='http://www.tcsh.org/Welcome' @@ -24,19 +24,20 @@ md5sums=('6eed09dbd4223ab5b6955378450d228a' build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --bindir=/bin + ./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/bin make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -dm0755 "${pkgdir}/bin/" - make DESTDIR="${pkgdir}" mandir=/usr/share/man install install.man install -Dm0644 "${srcdir}/csh.cshrc" "${pkgdir}/etc/csh.cshrc" install -Dm0644 "${srcdir}/csh.login" "${pkgdir}/etc/csh.login" install -Dm0644 Copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - ln -s tcsh "${pkgdir}/bin/csh" + ln -s tcsh "${pkgdir}/usr/bin/csh" + ln -s tcsh.1 "${pkgdir}/usr/share/man/man1/csh.1" } + +# vim:set ts=2 sw=2 et: diff --git a/community/tcsh/tcsh.install b/community/tcsh/tcsh.install index 023ddd115..00911470f 100644 --- a/community/tcsh/tcsh.install +++ b/community/tcsh/tcsh.install @@ -1,25 +1,23 @@ post_install() { - if [ ! "`grep /bin/tcsh etc/shells`" ]; then - echo "updating /etc/shells... done." - sed -i "s|/bin/bash|/bin/bash\n/bin/tcsh\n/bin/csh|" etc/shells - else - sed -i "s|/usr/bin/tcsh|/bin/tcsh|" etc/shells - sed -i "s|/usr/bin/csh|/bin/csh|" etc/shells - - echo "" - echo ">> WARNING: /usr/bin/tcsh has moved to /bin/tcsh," - echo ">> WARNING: /usr/bin/csh has moved to /bin/csh," - echo ">> please update your user accounts as needed" - echo "" + if ! grep -q /bin/tcsh etc/shells; then + echo /bin/tcsh >> etc/shells + echo /bin/csh >> etc/shells + echo 'Added to /etc/shells.' fi } post_upgrade() { - post_install $1 + if grep -q /usr/bin/tcsh etc/shells; then + sed -i 's|/usr/bin/tcsh|/bin/tcsh|' etc/shells + sed -i 's|/usr/bin/csh|/bin/csh|' etc/shells + echo 'Fixed path in /etc/shells.' + fi } pre_remove() { - echo "updating /etc/shells... done." - sed -i "\|/bin/tcsh|d" etc/shells - sed -i "\|/bin/csh|d" etc/shells + sed -i '\|/bin/tcsh|d' etc/shells + sed -i '\|/bin/csh|d' etc/shells + echo 'Removed from /etc/shells.' } + +# vim:set ts=2 sw=2 et: diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 36023adbd..5a40fc5fd 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91865 2013-05-28 17:38:11Z spupykin $ +# $Id: PKGBUILD 92284 2013-06-03 13:56:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.10 -pkgrel=4 +pkgrel=5 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64') url="http://unrealircd.com" @@ -26,7 +26,7 @@ build() { patch -p1 <$srcdir/arch-fixes.patch - ./configure --with-showlistmodes \ + ac_cv_ip6=yes ./configure --with-showlistmodes \ --enable-hub --enable-prefixaq --with-listen=5 \ --with-dpath=/etc/unrealircd \ --with-spath=/usr/bin \ @@ -36,7 +36,7 @@ build() { --enable-dynamic-linking \ --enable-ziplinks \ --enable-ssl \ - --enable-ipv6 \ + --enable-inet6 \ --enable-libcurl=/usr \ --with-system-cares diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD index 02488b789..eb5b48e7f 100644 --- a/community/wvstreams/PKGBUILD +++ b/community/wvstreams/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75083 2012-08-13 16:55:40Z bluewind $ +# $Id: PKGBUILD 92257 2013-06-03 11:15:30Z allan $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=wvstreams pkgver=4.6.1 -pkgrel=5 +pkgrel=6 pkgdesc="A network programming library written in C++" arch=('i686' 'x86_64') url="http://alumnit.ca/wiki/?page=WvStreams" @@ -19,14 +19,19 @@ md5sums=('2760dac31a43d452a19a3147bfde571c' 'df423c68134a09439b3961c34635e0b4') options=('!makeflags') -build() { - cd ${srcdir}/${pkgname}-${pkgver} +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch" patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch" patch -p1 -i "$srcdir/openssl-buildfix.patch" +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ + --sbin=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --without-dbus \ @@ -38,12 +43,12 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install # FS#15974 # --without-dbus still installs the pkg-config file - rm ${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc + rm "${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc" # --without-qt still installs the pkg-config file - rm ${pkgdir}/usr/lib/pkgconfig/libwvqt.pc + rm "${pkgdir}/usr/lib/pkgconfig/libwvqt.pc" } diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD index d35adfd72..b6b2cc3e9 100644 --- a/community/xdebug/PKGBUILD +++ b/community/xdebug/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 88795 2013-04-22 10:32:02Z spupykin $ +# $Id: PKGBUILD 92281 2013-06-03 13:37:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: Jonathan Wiersma <arch aur at jonw dot org> # Contributor: sracker <smb.sac@gmail.com> pkgname=xdebug -pkgver=2.2.2 -pkgrel=2 +pkgver=2.2.3 +pkgrel=1 pkgdesc="PHP debugging extension" arch=('i686' 'x86_64') url="http://www.xdebug.org" @@ -17,7 +17,7 @@ backup=('etc/php/conf.d/xdebug.ini') source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz xdebug-5.2.ini xdebug.ini) -md5sums=('5687bca6270b9668721090d780c7c966' +md5sums=('e49cec9861b45dc0b36eae33bf8a14fa' '6b7fdbbe0bf381bda40e77e29981f439' '68de800943369d4c76bdf7eb35c8463b') diff --git a/community/yacpi/ChangeLog b/community/yacpi/ChangeLog deleted file mode 100644 index 811f87d4f..000000000 --- a/community/yacpi/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-06-28 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community/yacpi/PKGBUILD b/community/yacpi/PKGBUILD deleted file mode 100644 index 81721db51..000000000 --- a/community/yacpi/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 65275 2012-02-20 12:45:31Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sebastian A. Liem <sebastian@liem.se> - -pkgname=yacpi -pkgver=3.0.1 -pkgrel=3 -pkgdesc="ncurses-based acpi monitor." -arch=('i686' 'x86_64') -url="http://www.ngolde.de/yacpi.html" -license=('GPL') -depends=(ncurses libacpi) -source=(http://www.ngolde.de/download/$pkgname-$pkgver.tar.gz) -md5sums=('1b03394ee3b916f686cdc3e2c05ddb7a') - -build() { - cd $srcdir/$pkgname-$pkgver - make - install -d $pkgdir/usr/bin - install -D -m 755 $pkgname $pkgdir/usr/bin/ -} diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index cf53e9650..e8642e15b 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180066 2013-03-15 22:55:31Z allan $ +# $Id: PKGBUILD 187018 2013-06-03 11:14:54Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -6,7 +6,7 @@ pkgname=bash _basever=4.2 _patchlevel=045 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=1 +pkgrel=4 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64') license=('GPL') @@ -28,15 +28,20 @@ if [ $_patchlevel -gt 000 ]; then done fi -build() { +prepare() { cd ${srcdir}/${pkgname}-$_basever + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) done +} + +build() { + cd ${srcdir}/${pkgname}-$_basever - _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\' - -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\' + _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/bin\"\' + -DSTANDARD_UTILS_PATH=\'\"/usr/bin\"\' -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\' -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\') export CFLAGS="${CFLAGS} ${_bashconfig[@]}" @@ -55,10 +60,7 @@ package() { cd ${srcdir}/${pkgname}-$_basever make DESTDIR=${pkgdir} install - # put needed symlinks in /bin - install -dm755 ${pkgdir}/bin - ln -s ../usr/bin/bash ${pkgdir}/bin/bash - ln -s ../usr/bin/bash ${pkgdir}/bin/sh + ln -s bash ${pkgdir}/usr/bin/sh install -dm755 ${pkgdir}/etc/skel/ @@ -73,99 +75,99 @@ package() { } md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' - '8d37a3f97a48c1e56e1a4ded877ed944' + 'SKIP' '027d6bd8f5f6a06b75bb7698cb478089' '2902e0fee7a9168f3a4fd2ccd60ff047' '42f4400ed2314bd7519c020d0187edc5' '3546099a1b2f667adc9794f52e78e35b' '472f536d7c9e8250dc4568ec4cfaf294' '1100bc1dda2cdc06ac44d7e5d17864a3' - 'a7184b76eb4a079f10174a0a8f574819' + 'SKIP' '30e7948079921d3261efcc6a40722135' - 'c4d45307f7e69fe508ce347c4cec1955' + 'SKIP' '9ea06decec43a198f3d7cf29acc602f8' - '74bddae6eeb9227a04a467d42597a34d' + 'SKIP' 'fb48f6134d7b013135929476aa0c250c' - '3e6a18226b16c773229246abd07a1f5e' + 'SKIP' 'e70e45de33426b38153b390be0dbbcd4' - 'e667dc9348ebc3e0e14bfdd87f4b6ff2' + 'SKIP' 'ce4e5c484993705b27daa151eca242c2' - '41cbd8e57589bc081a546a014ddb12f8' + 'SKIP' '88d1f96db29461767602e2546803bda7' - 'b8b781520f4c7493a2a1ac3010a44a44' + 'SKIP' '24c574bf6d6a581e300823d9c1276af6' - '354a0899a7c4b446454c52546562b55b' + 'SKIP' '4c5835f2fbab36c4292bb334977e5b6d' - 'ff4547ca7b508d52101729d61f5b77b6' + 'SKIP' '0a51602b535ef661ee707be6c8bdb373' - 'cec7c92a4d8052ea4b29216365d16566' + 'SKIP' '58deacf3d57cbd75575444ff6a3b0806' - '9ed2a08e549c3c17745f19e8413cfb31' + 'SKIP' '72d5059820015231483bb7415d09e9db' - '45b04b41a4230f469d3e47ab9952c2df' + 'SKIP' '608336ebe215984ef126e3c29d2d3409' - '623f63025d155a84977b62531e260ee2' + 'SKIP' 'ed19da878e3f630834c62b9d9dcc6fce' - 'eef2dd4a0e4505dc8f8e664b40c6cd66' + 'SKIP' '2d07daba0b8ca8f876d2aa052ff594b4' - '0cb823a44e6dc1cde7ac97ae5c8163c9' + 'SKIP' '53d246537e1fffd1aaa02ba5c056211c' - '60f983a1dded5f0b28040ff4b3f1e9b5' + 'SKIP' '304fd129a58fee2d8a34f8b4704db0aa' - '9df4bf4f46aaadc436f430187741f815' + 'SKIP' '6921a0b4228fe89b6537a5c29f027c89' - '4ef0e2a2cbfbdd53346f927000b7e112' + 'SKIP' '1195d85447f3d048d2c9bcd075fa765c' - 'b0f3a651ce29a1feee687d93177870f1' + 'SKIP' 'b09000bba08da6ac753124593850cdf7' - '204bb5054d1f8bafe2b446d4e5d0d99a' + 'SKIP' '09d3f96a16b881334cfaee0cf320b47e' - 'aab415350bcc2bb0c29943b413499d96' + 'SKIP' '597bf71a2aac6feb510b7505cdd3d4f7' - 'b0db384bdedecafbdd70c8d22c56af5f' + 'SKIP' '3fab459b4e09daea529cacad025b13b3' - 'bab99835ad6198cb1109fac89a085262' + 'SKIP' '4ad8d11e72afc6090e701073ff034cf4' - '5658ef10c9d0d804126ec1ce700e4e2c' + 'SKIP' 'c7d2493e44490f01dd20bdc8feb0a6a7' - 'e4855dbc4b743618b54d408bd5878637' + 'SKIP' '9f19c199dd8d1fa9254eebe738759272' - '600c8e90c2fb13cdbc7aa3f18566df03' + 'SKIP' 'a6ed82daf034587aee2f2581ba5fe829' - '821620a0389df723644911c56796ca8c' + 'SKIP' 'da9265aa2527fd4a7481baa3e0550287' - '0043f8b75f46f43608a67b863e300fe8' + 'SKIP' 'ec444d229e8899fbaaf6fc7de2d82ae6' - 'b632fca3a4943825bfaf3bd29df6b27d' + 'SKIP' 'b4bc1c4dc1b508ff9cdfc44f1a5039b5' - '2ffa9a802bbd57540021715f84cc76f4' + 'SKIP' '89390ff6a3c2ef7e09dd4b8b097a8e56' - '3e9b529ef3726b75d125d678de76977f' + 'SKIP' 'eee08003395c417f677d1a4bf8c548ee' - 'f670f7672b11d0df8c31885dbf15f390' + 'SKIP' '2fe070dd6d75d8ff16f269184a16e9c4' - '5018b6b7737808141043b57cf4eb842d' + 'SKIP' '4e610506c1711bf3483b965800ac3d5d' - 'cb65e541f9b60a8cb1fe58404f264b73' + 'SKIP' '7cd9bfdf7cbfd45274d07620ee94c8d9' - 'a7d2eace0da5fd236c93dbfd93458838' + 'SKIP' '9c3142956064d175a880bcb186e51ef9' - 'a1a87649853f20fe99572ddc02b0c67f' + 'SKIP' 'c10692f447d4966c879f8fb8d7c8ebc9' - '1bf5e34ad46566bc2d0eb7560ff8968e' + 'SKIP' '9ef3c308cde413e95866c1266cfb4e98' - 'afbb94e04dab29bd4ce92199892f2b5e' + 'SKIP' 'cd48f57a404498d4e5c73a3501c4b1a5' - 'd2693a2728b5a0448947d23ce47cb4b3' + 'SKIP' '00a2371b6c05acbfce6bc850c6d982f8' - '72744ac844a1dfd15dddbba7f73ec45c' + 'SKIP' '7bc4942a66ca4024ee964db7ede07896' - '7e97f02d9dd1436eed278f2732542ecf' + 'SKIP' '1cf7701017ebfc8e129de92c8f8b798c' - '4ef8b5af440bf7b939b7955ce68b4dc7' + 'SKIP' '9e61168fca692d8d1a733c389a63712e' - '665861582049ba270cc726b7a6e0324d' + 'SKIP' 'b4b11d64b45ea9ec50dcc74c6c3861f6' - '233031ccf9cbb1265be30753e0fa41f4' + 'SKIP' '1661bcc83c4715f54368877452ff2247' - '302c5516e469171b5187118024fca2a7') + 'SKIP') diff --git a/core/bridge-utils/PKGBUILD b/core/bridge-utils/PKGBUILD index fb452354e..07742e381 100644 --- a/core/bridge-utils/PKGBUILD +++ b/core/bridge-utils/PKGBUILD @@ -1,33 +1,35 @@ -# $Id: PKGBUILD 140510 2011-10-16 05:39:52Z eric $ +# $Id: PKGBUILD 187019 2013-06-03 11:14:55Z allan $ # Maintainer: # Contributor: Judd Vinet <judd@archlinux.org> pkgname=bridge-utils pkgver=1.5 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for configuring the Linux ethernet bridge" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge" license=('GPL') depends=('glibc') -backup=('etc/conf.d/bridges') source=(http://downloads.sourceforge.net/bridge/bridge-utils-$pkgver.tar.gz - bridges.conf.d) -md5sums=('ec7b381160b340648dede58c31bb2238' - 'f5d691282653580dd5fd4a1092ef365b') + bridge-utils-1.5-linux_3.8.x.patch) + +prepare () { + # fix compiling with newer kernel headers + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../bridge-utils-1.5-linux_3.8.x.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" aclocal autoconf - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - # install config file - install -Dm644 ../bridges.conf.d "${pkgdir}/etc/conf.d/bridges" } +md5sums=('ec7b381160b340648dede58c31bb2238' + 'fba700dcb2a3225d72b3bae64c7f49ca') diff --git a/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch b/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch new file mode 100644 index 000000000..0455a9085 --- /dev/null +++ b/core/bridge-utils/bridge-utils-1.5-linux_3.8.x.patch @@ -0,0 +1,30 @@ +commit 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d +Author: Russell Senior <russell@personaltelco.net> +Date: Wed Mar 6 12:49:42 2013 -0800 + + bridge-utils: Fix compile against linux-3.8.x + + Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a + struct in6_addr but doesn't define it. The trivial seeming fix of + including the header that does define it causes more problems. The + problem was discussed on mailing lists in January 2013. The final + suggestion I found was here: + + http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html + + This is intended to implement that suggestion. + + Signed-off-by: Russell Senior <russell@personaltelco.net> + +diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h +index 39964f2..dd14bae 100644 +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -20,6 +20,7 @@ + #define _LIBBRIDGE_H + + #include <sys/socket.h> ++#include <netinet/in.h> + #include <linux/if.h> + #include <linux/if_bridge.h> + diff --git a/core/bridge-utils/bridges.conf.d b/core/bridge-utils/bridges.conf.d deleted file mode 100644 index 2609cf51f..000000000 --- a/core/bridge-utils/bridges.conf.d +++ /dev/null @@ -1,27 +0,0 @@ -# -# Settings for layer-2 bridges -# -# For each bridge interface declared in INTERFACES (in rc.conf), declare -# a bridge_${IF} variable that contains the real ethernet interfaces that -# should be bridged togeether. -# -# Then list the bridge interface name in the BRIDGE_INTERFACES array. -# - -# example: -# -# in /etc/rc.conf: -# eth0="eth0 up" -# eth1="eth1 up" -# br0="br0 192.168.0.2 netmask 255.255.255.0 up" -# INTERFACES=(lo eth0 eth1 br0) -# -# in /etc/conf.d/bridges -# bridge_br0="eth0 eth1" -# BRIDGE_INTERFACES=(br0) -# - - -#bridge_br0="eth0 eth1" -#BRIDGE_INTERFACES=(br0) - diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 73cc73f86..f5a11ec40 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178157 2013-02-17 10:37:53Z allan $ +# $Id: PKGBUILD 187020 2013-06-03 11:14:56Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils pkgver=8.21 -pkgrel=1 +pkgrel=2 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') license=('GPL3') @@ -14,11 +14,10 @@ depends=('glibc' 'pam' 'acl' 'gmp' 'libcap') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) md5sums=('065ba41828644eca5dd8163446de5d64' - '5d68aee0cfb701c13ec624ad8df142a9') + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-no-install-program=groups,hostname,kill,uptime make @@ -32,15 +31,4 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - - cd ${pkgdir}/usr/bin - install -dm755 ${pkgdir}/bin - - # binaries required by FHS - _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false' - 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'sync' - 'true' 'uname') - for i in ${_fhs[@]}; do - ln -s ../usr/bin/$i ${pkgdir}/bin/$i - done } diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index fbc39ee53..1d011b651 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184226 2013-05-04 14:17:39Z thomas $ +# $Id: PKGBUILD 187021 2013-06-03 11:14:58Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup pkgver=1.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -31,4 +31,8 @@ package() { # install hook install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt + + # usrmove + cd "$pkgdir"/usr + mv sbin bin } diff --git a/core/dash/PKGBUILD b/core/dash/PKGBUILD index 6e2d4a66a..eb288f561 100644 --- a/core/dash/PKGBUILD +++ b/core/dash/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175814 2013-01-22 03:43:27Z dan $ +# $Id: PKGBUILD 187022 2013-06-03 11:14:59Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=dash pkgver=0.5.7 -pkgrel=3 +pkgrel=4 pkgdesc="A POSIX compliant shell that aims to be as small as possible" arch=('i686' 'x86_64') url="http://gondor.apana.org.au/~herbert/dash/" @@ -15,7 +15,7 @@ sha1sums=('a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --exec-prefix="" + ./configure --prefix=/usr --bindir=/usr/bin --mandir=/usr/share/man --exec-prefix="" make } diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index 58b63ab65..7e64410c1 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184223 2013-05-04 10:58:11Z foutrelis $ +# $Id: PKGBUILD 187023 2013-06-03 11:15:01Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd pkgver=5.6.8 -pkgrel=1 +pkgrel=3 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64') @@ -13,12 +13,11 @@ license=('BSD') groups=('base') depends=('glibc' 'sh') provides=('dhcp-client') -backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') +backup=('etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d' 'dhcpcd_.service' 'dhcpcd.service') + 'dhcpcd_.service' 'dhcpcd.service') sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0' '6245b8db7e6f39a0305571726bb693a53901c400' 'e49e01041f831281a1cd0c97ca21204e0aa07fda') @@ -37,13 +36,6 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - # Create Binary Symlink - install -d ${pkgdir}/usr/sbin - ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd - - # Install Configuration File used in /etc/rc.d/network - install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname - # Install License install -d $pkgdir/usr/share/licenses/$pkgname awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \ @@ -55,4 +47,8 @@ package() { # install systemd files install -Dm644 ${srcdir}/dhcpcd_.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd.service # FS#31543 + + # usrmove + cd "$pkgdir" + mv sbin usr/bin } diff --git a/core/dhcpcd/dhcpcd.conf.d b/core/dhcpcd/dhcpcd.conf.d deleted file mode 100644 index 83c6f14ad..000000000 --- a/core/dhcpcd/dhcpcd.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP client daemon -# - -DHCPCD_ARGS="-q" - diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index af79b247e..2f2a5b09c 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178092 2013-02-16 07:50:44Z ronald $ +# $Id: PKGBUILD 187024 2013-06-03 11:15:03Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs pkgver=1.42.7 -pkgrel=1 +pkgrel=2 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'MIT') @@ -45,4 +45,11 @@ package() { # install MIT license install -Dm644 "${srcdir}/MIT-LICENSE" \ "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" + + # usrmove + cd "$pkgdir" + mv sbin/* usr/bin/ + rmdir sbin + mv usr/sbin/* usr/bin/ + rmdir usr/sbin } diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index c3785934d..c5397f236 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184200 2013-05-03 13:44:53Z dreisner $ +# $Id: PKGBUILD 187025 2013-06-03 11:15:04Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=ed pkgver=1.8 -pkgrel=1 +pkgrel=2 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') license=('GPL') @@ -20,6 +20,7 @@ build() { cd "$pkgname-$pkgver" ./configure --prefix=/ \ + --bindir=/usr/bin \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ "CFLAGS=$CFLAGS" \ diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index b003f22f8..73d6ef280 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 184258 2013-05-05 07:09:51Z allan $ +# $Id: PKGBUILD 186997 2013-06-03 02:50:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.8.0 -pkgrel=4 -_snapshot=4.8-20130502 +pkgver=4.8.1 +pkgrel=1 +#_snapshot=4.8-20130502 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -15,9 +15,9 @@ url="http://gcc.gnu.org" makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen') checkdepends=('dejagnu' 'inetutils') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2) - #ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 -md5sums=('672a1ad73f8391c5a6b3c4429eb0d798') +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +md5sums=('3b2386c114cd74185aa3754b58a79304') if [ -n "${_snapshot}" ]; then diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index e89e1aedc..0eafa46ff 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182400 2013-04-10 06:04:12Z allan $ +# $Id: PKGBUILD 187027 2013-06-03 11:15:09Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.17 -pkgrel=5 +pkgrel=6 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -61,6 +61,8 @@ build() { fi echo "slibdir=/usr/lib" >> configparms + echo "sbindir=/usr/bin" >> configparms + echo "rootsbindir=/usr/bin" >> configparms # remove hardening options for building libraries CFLAGS=${CFLAGS/-fstack-protector/} @@ -88,7 +90,7 @@ build() { make # remove harding in preparation to run test-suite - sed -i '2,4d' configparms + sed -i '4,6d' configparms } check() { @@ -119,9 +121,6 @@ package() { install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin - # temporary symlink - ln -s ../../sbin/ldconfig ${pkgdir}/usr/bin/ldconfig - # create /etc/locale.gen install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ @@ -135,11 +134,10 @@ package() { # libthread_db-1.0.so cd $pkgdir - strip $STRIP_BINARIES sbin/{ldconfig,sln} \ - usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \ - usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \ - usr/lib/getconf/* \ - usr/sbin/{iconvconfig,nscd} + strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \ + usr/bin/{ldconfig,locale,localedef,nscd,makedb} \ + usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \ + usr/lib/getconf/* [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 strip $STRIP_STATIC usr/lib/*.a diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD index a25f1a53b..7e6a80563 100644 --- a/core/inetutils/PKGBUILD +++ b/core/inetutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185637 2013-05-16 17:56:59Z eric $ +# $Id: PKGBUILD 187028 2013-06-03 11:15:10Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=inetutils pkgver=1.9.1 -pkgrel=5 +pkgrel=6 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/inetutils/" @@ -60,9 +60,6 @@ package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/bin" - ln -s ../usr/bin/hostname "${pkgdir}/bin/hostname" - ln -s ../usr/bin/dnsdomainname "${pkgdir}/bin/dnsdomainname" install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/usr/bin/dnsdomainname" echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1" install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet" diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index a42ee69c7..f0e3302d8 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184614 2013-05-07 16:15:47Z foutrelis $ +# $Id: PKGBUILD 187029 2013-06-03 11:15:12Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 pkgver=3.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') @@ -46,12 +46,11 @@ package() { make DESTDIR="$pkgdir" install - # allow loopback to be started before /usr is mounted, this may not be supported in the future - mkdir -p "$pkgdir/sbin" - mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip" - ln -s /sbin/ip "$pkgdir/usr/sbin/ip" - # libnetlink isn't installed, install it FS#19385 install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h" install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a" + + # usrmove + cd "$pkgdir" + mv usr/sbin usr/bin } diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 17c057d0a..0d6cf7e3f 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 186735 2013-05-30 21:29:53Z andrea $ +# $Id: PKGBUILD 187030 2013-06-03 11:15:14Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.18 -pkgrel=2 +pkgver=1.4.19.1 +pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') url='http://www.netfilter.org/projects/iptables/index.html' depends=('glibc' 'bash') -makedepends=('linux-api-headers' 'chrpath') +makedepends=('linux-api-headers') +backup=('etc/xtables/connlabel.conf') options=('!libtool') -source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2" +source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2{,.sig} empty.rules simple_firewall.rules empty-filter.rules @@ -24,7 +25,8 @@ source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.t iptables.service ip6tables.service iptables-flush) -sha1sums=('34bf627c8755a61caf3635a998d2a5279f664f9e' +sha1sums=('566ba23b73403b0e4b4511d35c40124717bba97b' + 'SKIP' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' 'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec' 'd9f9f06b46b4187648e860afa0552335aafe3ce4' @@ -58,10 +60,6 @@ package() { make DESTDIR="${pkgdir}" install - # Remove RPATH from iptables libraries - # http://www.spinics.net/lists/netfilter-devel/msg24969.html - chrpath --delete "${pkgdir}"/usr/lib/iptables/*.so - cd "${srcdir}" install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules @@ -73,6 +71,6 @@ package() { # install systemd files install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service install -Dm644 ${srcdir}/ip6tables.service ${pkgdir}/usr/lib/systemd/system/ip6tables.service - install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush + install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush } diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index e18bb22cd..ddd497948 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185217 2013-05-12 09:08:11Z thomas $ +# $Id: PKGBUILD 187031 2013-06-03 11:15:15Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=iw pkgver=3.10 -pkgrel=1 +pkgrel=2 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64") url="http://wireless.kernel.org/en/users/Documentation/iw" @@ -20,5 +20,5 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" SBINDIR="/usr/bin" install } diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 6bf5076f3..4ea0575c4 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182754 2013-04-14 16:44:17Z dreisner $ +# $Id: PKGBUILD 187032 2013-06-03 11:15:16Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod pkgver=13 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' @@ -11,7 +11,7 @@ license=('GPL2') depends=('glibc' 'zlib') makedepends=('gtk-doc') options=('!libtool') -provides=('module-init-tools=3.16') +provides=('module-init-tools=3.16' 'libkmod.so') conflicts=('module-init-tools') replaces=('module-init-tools') source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" @@ -38,13 +38,9 @@ package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install # extra directories - install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin" + install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d - # add symlinks to kmod - ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" - ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod" - - for tool in {ins,ls,rm}mod modinfo; do + for tool in {ins,ls,rm,dep}mod mod{probe,info}; do ln -s kmod "$pkgdir/usr/bin/$tool" done diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index b99f0afd4..df0e24d52 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186318 2013-05-24 17:00:55Z jgc $ +# $Id: PKGBUILD 187033 2013-06-03 11:15:22Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,7 +8,7 @@ #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl pkgver=2.1.26 -pkgrel=3 +pkgrel=4 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/" @@ -25,7 +25,6 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.service saslauthd.conf.d - saslauthd tmpfiles.conf) md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' @@ -37,7 +36,6 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '8e7106f32e495e9ade69014fd1b3352a' '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' - '75542f613185d5a90520ad0d7d926a20' '45bb0192d2f188066240b9a66ee6365f') build() { @@ -74,6 +72,7 @@ build() { popd ./configure --prefix=/usr \ + --sbin=/usr/bin \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-static \ @@ -131,7 +130,6 @@ package_cyrus-sasl() { cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" make DESTDIR="${pkgdir}" install - install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf" diff --git a/core/libsasl/saslauthd b/core/libsasl/saslauthd deleted file mode 100644 index 6afafae0b..000000000 --- a/core/libsasl/saslauthd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="saslauthd" -SASLAUTHD_BIN=/usr/sbin/saslauthd -SASLAUTHD_RUN=/var/run/saslauthd -SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid - -case "$1" in - start) - stat_busy "Starting $DAEMON_NAME" - [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd - if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then - add_daemon $DAEMON_NAME - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $DAEMON_NAME" - [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm_daemon $DAEMON_NAME - stat_done - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ts=2 sw=2 et ft=sh diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index c530b2d6a..46cd0264a 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181169 2013-04-02 06:48:59Z allan $ +# $Id: PKGBUILD 186998 2013-06-03 02:50:09Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=('libtool' 'libltdl') pkgver=2.4.2 -pkgrel=8 +pkgrel=9 pkgdesc="A generic library support script" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libtool" @@ -28,7 +28,7 @@ check() { } package_libtool() { - depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.8.0') + depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.8.1') groups=('base-devel') install=libtool.install diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index f34523f4d..fe6c368a2 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 177953 2013-02-12 12:13:50Z thomas $ +# $Id: PKGBUILD 187034 2013-06-03 11:15:24Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.98 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') +makedepends=('systemd') groups=('base') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm2_install @@ -21,24 +22,24 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvmetad.service lvmetad.socket) sha1sums=('077425115b164c335a9930df745943e9ea666a8a' - '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8' - '8008547b133af89f79461a6df5412539ed3f26b7' + 'SKIP' + '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f' 'ff0fdf0a3005a41acd4b36865056109effc3474b' 'f6a554eea9557c3c236df2943bb6e7e723945c41' 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4' - 'cbc64f377fbb1c1a9ff53bc6ca85c324075499b7' + '01782ce8e10718c1513e3906b126f30f682f5cab' '1d56f47a81350ae37ffbf61ee036fe31f4c5d504' - 'ae945cae2d71b286439a9945876acb78dc9eeaf7' - '460b094e8689298ed59842d1abcee5d4e706e1d7' + 'adf26f5e5636de9c055b2ac3b179641a543a8937' + 'f857a4a63fcc604a981e56875edda91767d4f1bf' 'fcfc265e3b10294cc4b10949a342e9db4310b186') build() { cd "${srcdir}/LVM2.${pkgver}" unset LDFLAGS - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-udev-prefix=/usr \ - --with-systemdsystemunitdir=/usr/lib/systemd/system --with-default-pid-dir=/run \ - --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ + --with-udev-prefix=/usr --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-default-pid-dir=/run --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \ --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ --enable-udev_sync --enable-udev_rules --with-default-locking-dir=/run/lock/lvm \ --enable-lvmetad @@ -48,7 +49,7 @@ build() { package_device-mapper() { pkgdesc="Device mapper userspace library and tools" url="http://sourceware.org/dm/" - depends=('glibc' 'udev') + depends=('glibc' 'systemd') cd "${srcdir}/LVM2.${pkgver}" make DESTDIR="${pkgdir}" install_device-mapper @@ -63,7 +64,7 @@ package_device-mapper() { package_lvm2() { pkgdesc="Logical Volume Manager 2 utilities" - depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') + depends=('bash' "device-mapper>=${pkgver}" 'systemd' 'readline') conflicts=('lvm' 'mkinitcpio<0.7') backup=('etc/lvm/lvm.conf') options=('!makeflags') diff --git a/core/lvm2/dmeventd.service b/core/lvm2/dmeventd.service index 15ca21c0b..e0b1b33d0 100644 --- a/core/lvm2/dmeventd.service +++ b/core/lvm2/dmeventd.service @@ -7,8 +7,8 @@ DefaultDependencies=no [Service] Type=forking -ExecStart=/usr/sbin/dmeventd -ExecReload=/usr/sbin/dmeventd -R +ExecStart=/usr/bin/dmeventd +ExecReload=/usr/bin/dmeventd -R Environment=SD_ACTIVATION=1 PIDFile=/run/dmeventd.pid OOMScoreAdjust=-1000 diff --git a/core/lvm2/lvm-monitoring.service b/core/lvm2/lvm-monitoring.service index 8f5247b00..138e91a08 100644 --- a/core/lvm2/lvm-monitoring.service +++ b/core/lvm2/lvm-monitoring.service @@ -10,8 +10,8 @@ Conflicts=shutdown.target [Service] Type=oneshot Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1 -ExecStart=/usr/sbin/lvm vgchange --monitor y -ExecStop=/usr/sbin/lvm vgchange --monitor n +ExecStart=/usr/bin/lvm vgchange --monitor y +ExecStop=/usr/bin/lvm vgchange --monitor n RemainAfterExit=yes [Install] diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install index be27614bd..6f3c1cb41 100644 --- a/core/lvm2/lvm2_install +++ b/core/lvm2/lvm2_install @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash build() { local mod @@ -6,9 +6,9 @@ build() { add_module "$mod" done - add_binary "/usr/sbin/lvm" - add_binary "/usr/sbin/lvmetad" - add_binary "/usr/sbin/dmsetup" + add_binary "/usr/bin/lvm" + add_binary "/usr/bin/lvmetad" + add_binary "/usr/bin/dmsetup" add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" diff --git a/core/lvm2/lvmetad.service b/core/lvm2/lvmetad.service index 64168f465..4be520a3b 100644 --- a/core/lvm2/lvmetad.service +++ b/core/lvm2/lvmetad.service @@ -9,8 +9,8 @@ Conflicts=shutdown.target [Service] Type=forking NonBlocking=true -ExecStart=/usr/sbin/lvmetad -ExecReload=/usr/sbin/lvmetad -R +ExecStart=/usr/bin/lvmetad +ExecReload=/usr/bin/lvmetad -R Environment=SD_ACTIVATION=1 Restart=on-abort PIDFile=/run/lvmetad.pid diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD index 3bd848408..dc1a16197 100644 --- a/core/net-tools/PKGBUILD +++ b/core/net-tools/PKGBUILD @@ -1,39 +1,40 @@ -# $Id: PKGBUILD 165285 2012-08-14 20:44:40Z ronald $ +# $Id: PKGBUILD 187035 2013-06-03 11:15:26Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=net-tools -pkgver=1.60.20120804git -pkgrel=2 +pkgver=1.60.20130531git +pkgrel=1 pkgdesc="Configuration tools for Linux networking" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL2') url="http://net-tools.sourceforge.net/" depends=('glibc') - -# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 -# use git checkout instead -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz - Makefile.patch) +makedepends=('git') +# use git snapshot currently prefered over release +source=("net-tools::git://git.code.sf.net/p/net-tools/code#commit=6a14c03f") options=(!makeflags) -install=net-tools.install -sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82' - '4191ca56dc01d6aebe26c36c7cc060c638d5ebca') +sha1sums=('SKIP') + +prepare() { + sed -i "s#/sbin#/bin#" ${srcdir}/${pkgname}/Makefile + sed -i "s#/usr##" ${srcdir}/${pkgname}/man/Makefile +} + build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i ${srcdir}/Makefile.patch + cd ${srcdir}/${pkgname} yes "" | make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make BASEDIR=${pkgdir} update + cd ${srcdir}/${pkgname} + make DESTDIR=${pkgdir}/usr update # the following is provided by yp-tools - rm "${pkgdir}"/bin/{nis,yp}domainname + rm "${pkgdir}"/usr/bin/{nis,yp}domainname rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1 # hostname is provided by inetutils - rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname} + rm "${pkgdir}"/usr/bin/{hostname,dnsdomainname,domainname} rm -rf "${pkgdir}"/usr/share/man/man1 } diff --git a/core/net-tools/net-tools.install b/core/net-tools/net-tools.install deleted file mode 100644 index 9eee9e51b..000000000 --- a/core/net-tools/net-tools.install +++ /dev/null @@ -1,12 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then - echo "hostname and {,yp,nis}domainname has moved:" - echo "----------" - echo "hostname is now in coreutils" - echo "domainname is now in yp-tools" - echo "their functionality might have changed slightly" - echo "" - echo "dnsdomainname remains in net-tools" - echo "----------" - fi -} diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD index e962cb42a..75614121d 100644 --- a/core/nilfs-utils/PKGBUILD +++ b/core/nilfs-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185727 2013-05-17 18:43:30Z dan $ +# $Id: PKGBUILD 187036 2013-06-03 11:15:27Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=nilfs-utils pkgver=2.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" arch=('i686' 'x86_64') url="http://www.nilfs.org/" @@ -17,11 +17,11 @@ md5sums=('f072cc53c288492061b3199d63e32177') build() { cd $pkgname-$pkgver - ./configure --enable-libmount + ./configure --sbindir=/usr/bin --enable-libmount make } package() { cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install LDCONFIG=/bin/true + make DESTDIR="$pkgdir" sbindir=/usr/bin install LDCONFIG=/bin/true } diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD index 3b79a7ab8..7c63db027 100644 --- a/core/openvpn/PKGBUILD +++ b/core/openvpn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184228 2013-05-04 14:17:41Z thomas $ +# $Id: PKGBUILD 187038 2013-06-03 11:15:29Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=openvpn pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" arch=(i686 x86_64) url="http://openvpn.net/index.php/open-source.html" @@ -22,7 +22,7 @@ md5sums=('57a3b64597fc37b7842a3fde354d8bbe' 'SKIP' 'fbf818b6e1f212e77b9ce0e6d92584a1' 'SKIP' - '0846aa59d0b123d61030890f9a4135ae' + '57ef7353ba2c28c04dfc387c3ca77a4f' 'e1bd1523e38745e948c710db1a330bb1') options=(!libtool) @@ -32,6 +32,7 @@ build() { # Build openvpn CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --enable-password-save \ --mandir=/usr/share/man \ --enable-iproute2 \ diff --git a/core/openvpn/openvpn-tapdev.conf b/core/openvpn/openvpn-tapdev.conf deleted file mode 100644 index afa5586dd..000000000 --- a/core/openvpn/openvpn-tapdev.conf +++ /dev/null @@ -1,12 +0,0 @@ -# -# /etc/conf.d/openvpn-tapdev -# -# Place openvpn-tapdev before network into your DAEMONS array -# This will create permanent tap devices which you can use for bridging -# -# Example: -# TAPDEVS="work home" -# Will create two tap devices "work" and "home" -# - -TAPDEVS="" diff --git a/core/openvpn/openvpn-tapdev.rc b/core/openvpn/openvpn-tapdev.rc deleted file mode 100755 index 2c51f8248..000000000 --- a/core/openvpn/openvpn-tapdev.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -. /etc/conf.d/openvpn-tapdev - -case "$1" in - start) - stat_busy "Creating tap devices for OpenVPN ... " - success=0 - for tapdev in ${TAPDEVS}; do - stat_append "${tapdev} " - /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? - done - if [ $success -eq 0 ]; then - add_daemon openvpn-tapdev - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Destroying tap devices for OpenVPN ..." - for tapdev in ${TAPDEVS}; do - stat_append "${tapdev} " - /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$? - done - rm_daemon openvpn-tapdev - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/openvpn/openvpn.rc b/core/openvpn/openvpn.rc deleted file mode 100755 index 96c28b641..000000000 --- a/core/openvpn/openvpn.rc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -CFGDIR="/etc/openvpn" -STATEDIR="/var/run/openvpn" - -case "$1" in - start) - stat_busy "Starting OpenVPN ... " - success=0 - mkdir -p "${STATEDIR}" - for cfg in "${CFGDIR}"/*.conf; do - stat_append "$(basename "${cfg}" .conf) " - /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$? - done - if [ $success -eq 0 ]; then - add_daemon openvpn - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping OpenVPN ..." - for pidfile in "${STATEDIR}"/*.pid; do - stat_append "$(basename "${pidfile}" .pid) " - kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null - rm -f "${pidfile}" - done - rm_daemon openvpn - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/openvpn/openvpn@.service b/core/openvpn/openvpn@.service index 0b7232899..63fdf0e36 100644 --- a/core/openvpn/openvpn@.service +++ b/core/openvpn/openvpn@.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i +ExecStart=/usr/bin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i [Install] WantedBy=multi-user.target diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD index 9b392bb2e..0489a38bf 100644 --- a/core/ppp/PKGBUILD +++ b/core/ppp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169337 2012-10-19 21:33:57Z thomas $ +# $Id: PKGBUILD 187039 2013-06-03 11:15:31Z allan $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=5 +pkgrel=6 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64) url="http://www.samba.org/ppp/" @@ -91,4 +91,9 @@ package() { install -d -m755 "${pkgdir}/etc/ppp/peers" chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service + + # usrmove + cd "$pkgdir"/usr + mv sbin/* bin/ + rmdir sbin } diff --git a/core/pptpclient/PKGBUILD b/core/pptpclient/PKGBUILD index b27c7d5bc..d4e2d3e0e 100644 --- a/core/pptpclient/PKGBUILD +++ b/core/pptpclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142906 2011-11-18 07:42:07Z pierre $ +# $Id: PKGBUILD 187040 2013-06-03 11:15:32Z allan $ # Maintainer: Daniel Isenmann <daniel @ archlinux.org> # Contributor: Mark Nikkel <mnikkel@gmail.com> pkgname=pptpclient pkgver=1.7.2 -pkgrel=4 +pkgrel=5 pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP." arch=('i686' 'x86_64') url="http://pptpclient.sourceforge.net/" @@ -14,7 +14,7 @@ backup=('etc/ppp/options.pptp') source=("http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-$pkgver.tar.gz") md5sums=('4c3d19286a37459a632c7128c92a9857') -build() { +prepare() { cd $srcdir/pptp-$pkgver # use our CFLAGS and LDFLAGS @@ -22,8 +22,14 @@ build() { sed -i -e "/LDFLAGS =/ c\LDFLAGS = ${LDFLAGS}" Makefile # adjust ip path - sed -i 's#/bin/ip#/usr/sbin/ip#' routing.c + sed -i 's#/bin/ip#/usr/bin/ip#' routing.c + + # put binaries in /usr/bin + sed -i "/BINDIR/s#/sbin#/bin#" Makefile +} +build() { + cd $srcdir/pptp-$pkgver make } diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD index 05d520bf4..1fa6ca913 100644 --- a/core/sed/PKGBUILD +++ b/core/sed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176248 2013-01-28 00:29:26Z allan $ +# $Id: PKGBUILD 187041 2013-06-03 11:15:34Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=sed pkgver=4.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="GNU stream editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/sed" @@ -31,8 +31,4 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - - mkdir $pkgdir/bin - ln -s ../usr/bin/sed $pkgdir/bin - } diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index 743c179a9..2080f59c3 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180325 2013-03-20 12:45:26Z dreisner $ +# $Id: PKGBUILD 187042 2013-06-03 11:15:35Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow pkgver=4.1.5.1 -pkgrel=5 +pkgrel=6 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64') url='http://pkg-shadow.alioth.debian.org/' @@ -32,15 +32,15 @@ source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{ shadow-strncpy-usage.patch lastlog.tmpfiles) sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30' - '126570e2939bf3b57f28df5197ab9309747a6b5c' + 'SKIP' '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' '12427b1ca92a9b85ca8202239f0d9f50198b818f' '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' - '6fac49a4826e2b821c8d41ed5911bc8d04735986' + 'e92045fb75e0c21a3f294a00de0bd2cd252e9463' '12427b1ca92a9b85ca8202239f0d9f50198b818f' '611be25d91c3f8f307c7fe2485d5f781e5dee75f' - '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' + '98f4919014b1a9eb9f01ca7731e04b1d973cedd5' '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' '6010fffeed1fc6673ad9875492e1193b1a847b53' '21e12966a6befb25ec123b403cd9b5c492fe5b16' @@ -64,6 +64,8 @@ build() { ./configure \ --prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/bin \ --libdir=/lib \ --mandir=/usr/share/man \ --sysconfdir=/etc \ @@ -112,8 +114,7 @@ package() { # Remove utilities provided by util-linux rm \ - "$pkgdir"/usr/bin/{chsh,chfn,sg} \ - "$pkgdir"/bin/{login,su} \ + "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg} \ "$pkgdir"/usr/sbin/{vipw,vigr} # but we keep newgrp, as sg is really an alias to it @@ -133,4 +134,8 @@ package() { rmdir \ "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \ "$pkgdir"/usr/share/man/{fi,ko/man8} + + # move everything else to /usr/bin, because this isn't handled by ./configure + mv "$pkgdir"/usr/sbin/* "$pkgdir"/usr/bin + rmdir "$pkgdir/usr/sbin" } diff --git a/core/shadow/login.defs b/core/shadow/login.defs index 5dabf78df..591367100 100644 --- a/core/shadow/login.defs +++ b/core/shadow/login.defs @@ -81,8 +81,8 @@ HUSHLOGIN_FILE .hushlogin # *REQUIRED* The default PATH settings, for superuser and normal users. # # (they are minimal, add the rest in the shell startup files) -ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin -ENV_PATH PATH=/bin:/usr/bin +ENV_SUPATH PATH=/usr/bin +ENV_PATH PATH=/usr/bin # # Terminal permissions diff --git a/core/shadow/shadow.cron.daily b/core/shadow/shadow.cron.daily index 1931a793e..1373ecde9 100755 --- a/core/shadow/shadow.cron.daily +++ b/core/shadow/shadow.cron.daily @@ -1,6 +1,6 @@ #!/bin/sh # Verify integrity of password and group files -/usr/sbin/pwck -r -/usr/sbin/grpck -r +/usr/bin/pwck -r +/usr/bin/grpck -r diff --git a/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch b/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch new file mode 100644 index 000000000..372ecebff --- /dev/null +++ b/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch @@ -0,0 +1,87 @@ +From 23ad4dd8844c582929115a11ed2830a1371568d6 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Tue, 28 May 2013 20:45:34 +0200 +Subject: [PATCH] journald: DO recalculate the ACL mask, but only if it doesn't + exist + +Since 11ec7ce, journald isn't setting the ACLs properly anymore if +the files had no ACLs to begin with: acl_set_fd fails with EINVAL. + +An ACL with ACL_USER or ACL_GROUP entries but no ACL_MASK entry is +invalid, so make sure a mask exists before trying to set the ACL. +--- + src/journal/journald-server.c | 6 ++++-- + src/shared/acl-util.c | 28 ++++++++++++++++++++++++++++ + src/shared/acl-util.h | 1 + + 3 files changed, 33 insertions(+), 2 deletions(-) + +diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c +index b717b92..da5b725 100644 +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -227,9 +227,11 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) { + } + } + +- /* We do not recalculate the mask here, so that the fchmod() mask above stays intact. */ ++ /* We do not recalculate the mask unconditionally here, ++ * so that the fchmod() mask above stays intact. */ + if (acl_get_permset(entry, &permset) < 0 || +- acl_add_perm(permset, ACL_READ) < 0) { ++ acl_add_perm(permset, ACL_READ) < 0 || ++ calc_acl_mask_if_needed(&acl) < 0) { + log_warning("Failed to patch ACL on %s, ignoring: %m", f->path); + goto finish; + } +diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c +index 48bb12f..fb04e49 100644 +--- a/src/shared/acl-util.c ++++ b/src/shared/acl-util.c +@@ -69,6 +69,34 @@ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) { + return 0; + } + ++int calc_acl_mask_if_needed(acl_t *acl_p) { ++ acl_entry_t i; ++ int found; ++ ++ assert(acl_p); ++ ++ for (found = acl_get_entry(*acl_p, ACL_FIRST_ENTRY, &i); ++ found > 0; ++ found = acl_get_entry(*acl_p, ACL_NEXT_ENTRY, &i)) { ++ ++ acl_tag_t tag; ++ ++ if (acl_get_tag_type(i, &tag) < 0) ++ return -errno; ++ ++ if (tag == ACL_MASK) ++ return 0; ++ } ++ ++ if (found < 0) ++ return -errno; ++ ++ if (acl_calc_mask(acl_p) < 0) ++ return -errno; ++ ++ return 0; ++} ++ + int search_acl_groups(char*** dst, const char* path, bool* belong) { + acl_t acl; + +diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h +index 23090d9..36ef490 100644 +--- a/src/shared/acl-util.h ++++ b/src/shared/acl-util.h +@@ -24,4 +24,5 @@ + #include <stdbool.h> + + int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry); ++int calc_acl_mask_if_needed(acl_t *acl_p); + int search_acl_groups(char*** dst, const char* path, bool* belong); +-- +1.8.3 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 3a71fe769..9b17e6d8f 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=204 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -14,24 +14,24 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch + 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch 'initcpio-hook-udev' 'initcpio-install-udev' - 'initcpio-install-timestamp' - 'use-split-usr-path.patch') + 'initcpio-install-timestamp') md5sums=('a07619bb19f48164fbf0761d12fd39a8' '7f39f9fde1ff7b48293ed1e3d0a6c213' + '66e3162856ded8eb7dc7383405c6e0d6' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' - 'df69615503ad293c9ddf9d8b7755282d' - '76bf83fe34c5b40533abc5dc940576a6') + 'df69615503ad293c9ddf9d8b7755282d') prepare() { cd "$pkgname-$pkgver" - # hang onto this until we do the /{,s}bin merge - patch -Np1 <"$srcdir/use-split-usr-path.patch" - patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch" + + patch -Np1 <"$srcdir/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch" + autoreconf } @@ -101,10 +101,6 @@ package_systemd() { # get rid of RPM macros rm -r "$pkgdir/etc/rpm" - # the path to udevadm is hardcoded in some places - install -d "$pkgdir/sbin" - ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" - # add back tmpfiles.d/legacy.conf install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" @@ -133,12 +129,12 @@ package_systemd-sysvcompat() { mv "$srcdir/_sysvcompat"/* "$pkgdir" - install -dm755 "$pkgdir/sbin" + install -dm755 "$pkgdir/usr/bin" for tool in runlevel reboot shutdown poweroff halt telinit; do - ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" + ln -s 'systemctl' "$pkgdir/usr/bin/$tool" done - ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" + ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init" } # vim: ft=sh syn=sh et diff --git a/core/systemd/use-split-usr-path.patch b/core/systemd/use-split-usr-path.patch deleted file mode 100644 index 40dd62f90..000000000 --- a/core/systemd/use-split-usr-path.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/core/main.c 2012-09-20 23:02:54.000000000 -0400 -+++ b/src/core/main.c 2012-09-20 23:03:13.000000000 -0400 -@@ -1487,11 +1487,7 @@ int main(int argc, char *argv[]) { - - /* Set up PATH unless it is already set */ - setenv("PATH", --#ifdef HAVE_SPLIT_USR - "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", --#else -- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", --#endif - arg_running_as == SYSTEMD_SYSTEM); - - if (arg_running_as == SYSTEMD_SYSTEM) { diff --git a/core/sysvinit-tools/PKGBUILD b/core/sysvinit-tools/PKGBUILD index e0c3c0358..b8938d02f 100644 --- a/core/sysvinit-tools/PKGBUILD +++ b/core/sysvinit-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185338 2013-05-13 13:18:59Z tomegun $ +# $Id: PKGBUILD 187044 2013-06-03 11:15:38Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=sysvinit-tools pkgver=2.88 -pkgrel=10 +pkgrel=11 arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') @@ -32,8 +32,8 @@ package() { cd "${srcdir}/sysvinit-${pkgver}dsf" make ROOT="${pkgdir}" install - ### drop the stuff provided by systemd-sysvcompat and util-linux cd "${pkgdir}" + ### drop the stuff provided by systemd-sysvcompat and util-linux rm -r usr/share/man/man5 rm -r usr/include rm bin/mountpoint @@ -41,4 +41,9 @@ package() { rm usr/bin/{mesg,utmpdump,wall} rm usr/share/man/man1/{mountpoint,mesg,utmpdump,wall}.1 rm usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}.8 + ### usrmerge + mv sbin/* usr/bin/ + rm -r sbin + mv bin/* usr/bin/ + rm -r bin } diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD index 472bf0d44..03a867fcf 100644 --- a/core/tar/PKGBUILD +++ b/core/tar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183049 2013-04-17 02:02:04Z allan $ +# $Id: PKGBUILD 187045 2013-06-03 11:15:39Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=tar pkgver=1.26 -pkgrel=3 +pkgrel=4 pkgdesc="Utility used to store, backup, and transport files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/tar/tar.html" @@ -41,9 +41,5 @@ package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install - # probably needed for compatibility - install -dm755 ${pkgdir}/bin - ln -s ../usr/bin/tar ${pkgdir}/bin/tar - install -Dm644 ${srcdir}/tar.1 ${pkgdir}/usr/share/man/man1/tar.1 } diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 78e90224d..91d7e9cfb 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186677 2013-05-30 12:45:22Z tomegun $ +# $Id: PKGBUILD 187046 2013-06-03 11:15:40Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.23.1 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -39,7 +39,7 @@ build() { ./configure --prefix=/usr \ --libdir=/usr/lib \ --localstatedir=/run \ - --enable-fs-paths-extra=/usr/bin:/usr/sbin \ + --enable-fs-paths-extra=/usr/bin \ --enable-raw \ --enable-vipw \ --enable-newgrp \ @@ -78,4 +78,10 @@ package() { # include tmpfiles fragment for uuidd # TODO(dreisner): offer this upstream? install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf" + + # usrmove + cd "$pkgdir" + mv {,usr/}sbin/* usr/bin + mv bin/* usr/bin + rmdir bin sbin usr/sbin } diff --git a/core/wpa_actiond/PKGBUILD b/core/wpa_actiond/PKGBUILD index 4fe9e1e79..f233fd586 100644 --- a/core/wpa_actiond/PKGBUILD +++ b/core/wpa_actiond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184227 2013-05-04 14:17:40Z thomas $ +# $Id: PKGBUILD 187047 2013-06-03 11:15:41Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_actiond pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events" arch=('i686' 'x86_64') url="http://projects.archlinux.org/wpa_actiond.git/" @@ -22,6 +22,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -D -m755 wpa_actiond "${pkgdir}/usr/sbin/wpa_actiond" + install -D -m755 wpa_actiond "${pkgdir}/usr/bin/wpa_actiond" } # vim:set ts=2 sw=2 et: diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD index 8e44259c6..e99d67561 100644 --- a/core/wpa_supplicant/PKGBUILD +++ b/core/wpa_supplicant/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179639 2013-03-08 23:40:42Z foutrelis $ +# $Id: PKGBUILD 187048 2013-06-03 11:15:42Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant pkgver=2.0 -pkgrel=3 +pkgrel=4 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') @@ -47,4 +47,8 @@ package() { install -d -m755 "${pkgdir}/usr/lib/systemd/system" install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/" + + # usrmove + cd "$pkgdir"/usr + mv sbin bin } diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index abc33e580..d66921dba 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 180169 2013-03-18 14:04:21Z jgc $ +# $Id: PKGBUILD 187049 2013-06-03 11:16:09Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache pkgver=2.2.24 -pkgrel=1 +pkgrel=3 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') options=('!libtool') url='http://www.apache.org/dist/httpd' license=('APACHE') -backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf +backup=(etc/httpd/conf/httpd.conf etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf @@ -36,11 +36,10 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 apache.conf.d apache.tmpfiles.conf httpd.logrotate - httpd httpd.service arch.layout) md5sums=('91bd1484aca13a7095d6432be37fc7ae' - 'f8f0d879b5fda028aad7ac9f329e057b' + 'SKIP' 'f1d9d41360908ceb2374da55ae99197a' 'cdfa04985a0efa850976aef01c2a0c40' '0930d2d0612eb0a53a0d00aea7e8687f' @@ -54,10 +53,9 @@ md5sums=('91bd1484aca13a7095d6432be37fc7ae' '4ac64df6e019edbe137017cba1ff2f51' '08b3c875f6260644f2f52b4056d656b0' '82068753dab92fe86312b1010a2904d7' - '6382331e9700ed9e8cc78ea51887b537' - 'c7e300a287ef7e2e066ac7639536f87e' - 'ed219c8228d4d5ae9b7a55107cf79706' - '3d659d41276ba3bfcb20c231eb254e0c') + '13dbaaf949c5bc36cfcf5718b95cb020' + 'a823bb355c136fd0e2b3fb820e2d903c' + '6b7122245a67597230a3b3f317eaf34e') build() { cd "${srcdir}/httpd-${pkgver}" @@ -71,31 +69,41 @@ build() { cat "${srcdir}/arch.layout" >> config.layout + cd .. + cp -r httpd-${pkgver} httpd-itk-${pkgver} + + cd httpd-itk-${pkgver} + + # Fix patch to apply with latest Apache version + sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch" + + mkdir -p server/mpm/experimental/itk + cp -r server/mpm/prefork/* server/mpm/experimental/itk/ + mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c + + patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch" + patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch" + patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch" + patch -Np1 -i "${srcdir}/05-add-copyright.patch" + patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch" + patch -Np1 -i "${srcdir}/07-base-functionality.patch" + patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" + patch -Np1 -i "${srcdir}/09-capabilities.patch" + patch -Np1 -i "${srcdir}/10-nice.patch" + patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch" + + autoconf + cd .. for mpm in prefork worker itk; do if [ "${mpm}" = "itk" ]; then - # Fix patch to apply with latest Apache version - sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' "${srcdir}/03-add-mpm-to-build-system.patch" - - mkdir -p server/mpm/experimental/itk - cp -r server/mpm/prefork/* server/mpm/experimental/itk/ - mv server/mpm/experimental/itk/prefork.c server/mpm/experimental/itk/itk.c - - patch -Np1 -i "${srcdir}/02-rename-prefork-to-itk.patch" - patch -Np1 -i "${srcdir}/03-add-mpm-to-build-system.patch" - patch -Np1 -i "${srcdir}/04-correct-output-makefile-location.patch" - patch -Np1 -i "${srcdir}/05-add-copyright.patch" - patch -Np1 -i "${srcdir}/06-hook-just-after-merging-perdir-config.patch" - patch -Np1 -i "${srcdir}/07-base-functionality.patch" - patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" - patch -Np1 -i "${srcdir}/09-capabilities.patch" - patch -Np1 -i "${srcdir}/10-nice.patch" - patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch" - - autoconf + CONFIGURE=../httpd-itk-${pkgver}/configure + else + CONFIGURE=../httpd-${pkgver}/configure fi + mkdir build-${mpm} pushd build-${mpm} - ../configure --enable-layout=Arch \ + $CONFIGURE --enable-layout=Arch \ --enable-modules=all \ --enable-mods-shared=all \ --enable-so \ @@ -103,7 +111,7 @@ build() { --with-suexec-caller=http \ --with-suexec-docroot=/srv/http \ --with-suexec-logfile=/var/log/httpd/suexec.log \ - --with-suexec-bin=/usr/sbin/suexec \ + --with-suexec-bin=/usr/bin/suexec \ --with-suexec-uidmin=99 --with-suexec-gidmin=99 \ --enable-ldap --enable-authnz-ldap \ --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \ @@ -117,15 +125,19 @@ build() { --with-pcre=/usr \ --with-mpm=${mpm} make - if [ "${mpm}" = "prefork" ]; then - make DESTDIR="${pkgdir}" install - else - install -m755 httpd "${pkgdir}/usr/sbin/httpd.${mpm}" - fi popd done +} + +package() { + cd "${srcdir}" + cd build-prefork + make DESTDIR="${pkgdir}" install + cd .. + + install -m755 build-worker/httpd "${pkgdir}/usr/bin/httpd.worker" + install -m755 build-itk/httpd "${pkgdir}/usr/bin/httpd.itk" - install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd" install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" install -D -m644 "${srcdir}/apache.conf.d" "${pkgdir}/etc/conf.d/apache" install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf" @@ -149,9 +161,7 @@ build() { rm -rf "${pkgdir}/usr/share/httpd/manual" rm -rf "${pkgdir}/etc/httpd/conf/original" rm -rf "${pkgdir}/srv/" - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/var/run" - + rm -rf "${pkgdir}/run" install -m755 -d "${pkgdir}/usr/lib/systemd/system" install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/" diff --git a/extra/apache/arch.layout b/extra/apache/arch.layout index ab59db84b..d5d2e8a08 100644 --- a/extra/apache/arch.layout +++ b/extra/apache/arch.layout @@ -2,7 +2,7 @@ prefix: /etc/httpd exec_prefix: /usr bindir: /usr/bin - sbindir: /usr/sbin + sbindir: /usr/bin libdir: /usr/lib/httpd libexecdir: /usr/lib/httpd/modules mandir: /usr/share/man @@ -16,7 +16,7 @@ cgidir: /srv/http/cgi-bin includedir: /usr/include/httpd localstatedir: /var - runtimedir: /var/run/httpd + runtimedir: /run/httpd logfiledir: /var/log/httpd proxycachedir: /var/cache/httpd </Layout>
\ No newline at end of file diff --git a/extra/apache/httpd b/extra/apache/httpd deleted file mode 100755 index 6fa9c3cc7..000000000 --- a/extra/apache/httpd +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -daemon_name=httpd - -. /etc/rc.conf -. /etc/rc.d/functions - -APACHECTL=/usr/sbin/apachectl - -case "$1" in - start) - stat_busy "Starting Apache Web Server" - [ ! -d /var/run/httpd ] && install -d /var/run/httpd - if $APACHECTL start >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Apache Web Server" - if $APACHECTL stop >/dev/null ; then - rm_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - reload) - stat_busy "Reloading Apache Web Server" - if $APACHECTL graceful >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - restart) - stat_busy "Restarting Apache Web Server" - if $APACHECTL restart >/dev/null ; then - add_daemon $daemon_name - stat_done - else - stat_fail - exit 1 - fi - ;; - - status) - stat_busy "Checking Apache Web Server status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|reload|restart|status}" -esac - -exit 0 diff --git a/extra/apache/httpd.logrotate b/extra/apache/httpd.logrotate index a723d20d2..c9755de14 100644 --- a/extra/apache/httpd.logrotate +++ b/extra/apache/httpd.logrotate @@ -1,6 +1,6 @@ /var/log/httpd/*log { missingok postrotate - /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true endscript } diff --git a/extra/apache/httpd.service b/extra/apache/httpd.service index bb02b5992..247e28fba 100644 --- a/extra/apache/httpd.service +++ b/extra/apache/httpd.service @@ -5,9 +5,9 @@ After=network.target remote-fs.target nss-lookup.target [Service] Type=forking PIDFile=/run/httpd/httpd.pid -ExecStart=/usr/sbin/apachectl start -ExecStop=/usr/sbin/apachectl graceful-stop -ExecReload=/usr/sbin/apachectl graceful +ExecStart=/usr/bin/apachectl start +ExecStop=/usr/bin/apachectl graceful-stop +ExecReload=/usr/bin/apachectl graceful PrivateTmp=true LimitNOFILE=infinity diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD index bbd3a3814..5570600dd 100644 --- a/extra/asymptote/PKGBUILD +++ b/extra/asymptote/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169579 2012-10-23 20:01:18Z remy $ +# $Id: PKGBUILD 187088 2013-06-03 15:58:10Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: Firmicus <francois.archlinux.org> # Contributor: bender02 at gmx dot com pkgname=asymptote -pkgver=2.21 +pkgver=2.23 pkgrel=1 pkgdesc="A vector graphics language (like metapost)" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ optdepends=('python2: for the xasy GUI' 'tix: for the xasy GUI') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) install=texlive.install -sha1sums=('946269c63b7aa3a7d2875f5faa8a0b8d3d36628c') +sha1sums=('c24de9766ae7195c1cda947f9d2ae07497a0af8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,7 +27,8 @@ build() { ./configure --enable-gc=/usr \ --prefix=/usr \ --with-latex=/usr/share/texmf/tex/latex \ - --with-context=/usr/share/texmf/tex/context + --with-context=/usr/share/texmf/tex/context \ + --enable-offscreen make all } diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD index 21bcaa93b..2e586a131 100644 --- a/extra/bluez-hcidump/PKGBUILD +++ b/extra/bluez-hcidump/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 157961 2012-04-30 07:30:22Z andrea $ -# Maintainer: +# $Id: PKGBUILD 187051 2013-06-03 11:16:12Z allan $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy carrier <geoffroy@archlinux.org> pkgname=bluez-hcidump pkgver=2.4 -pkgrel=1 +pkgrel=2 pkgdesc="Bluetooth HCI package analyzer" url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -23,4 +23,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + mv "${pkgdir}"/usr/sbin "${pkgdir}"/usr/bin } diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index f6270a7ad..2e1cfe46a 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162308 2012-06-24 20:46:50Z tomegun $ +# $Id: PKGBUILD 187050 2013-06-03 11:16:11Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez pkgver=4.101 -pkgrel=1 +pkgrel=2 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ depends=('dbus-core' 'python2' 'systemd-tools') makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx') optdepends=("gstreamer0.10-base: bluetooth GStreamer support" "alsa-lib: Audio bluetooth devices support" - "dbus-python: to run bluez-simple-agent" - "pygobject: to run bluez-simple-agent" + "python2-dbus: to run bluez-simple-agent" + "python2-gobject: to run bluez-simple-agent" "libusb-compat: USB adapters support" "cups: CUPS backend") conflicts=('bluez-libs' 'bluez-utils') @@ -77,6 +77,11 @@ package() { "${pkgdir}"/usr/bin/bluez-simple-agent \ "${pkgdir}"/usr/bin/bluez-test-device \ "${pkgdir}"/usr/bin/bluez-test-input + + # usrmove + cd "$pkgdir" + mv usr/sbin/* usr/bin + rmdir usr/sbin } md5sums=('902b390af95c6c5d6d1a17d94c8344ab' '7412982b440f29fa7f76a41a87fef985' diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 9364a1f45..318b69b28 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186227 2013-05-22 10:21:47Z andrea $ +# $Id: PKGBUILD 187084 2013-06-03 11:23:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake pkgver=2.8.11 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') url="http://www.cmake.org/" @@ -13,8 +13,15 @@ depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt4' 'emacs') optdepends=('qt4: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('be6008f2299613d23fe82ab53ef7472e') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" + 'imagemagick.patch') +md5sums=('be6008f2299613d23fe82ab53ef7472e' + '19c4cf0e6e9c9a890f3698c9df8062f1') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/imagemagick.patch +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/cmake/imagemagick.patch b/extra/cmake/imagemagick.patch new file mode 100644 index 000000000..8e5279030 --- /dev/null +++ b/extra/cmake/imagemagick.patch @@ -0,0 +1,27 @@ +From 3de9bb48a5d7976d5f22e3c7c0f95cfda102ed8a Mon Sep 17 00:00:00 2001 +From: Funda Wang <fundawang@gmail.com> +Date: Tue, 28 May 2013 06:17:49 +0000 +Subject: [PATCH] FindImageMagick: Find v6 include dir (#14174) + +The header files of ImageMagick are now located at +<prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick. +--- + Modules/FindImageMagick.cmake | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake +index cd97b38..02a5777 100644 +--- a/Modules/FindImageMagick.cmake ++++ b/Modules/FindImageMagick.cmake +@@ -81,7 +81,7 @@ function(FIND_IMAGEMAGICK_API component header) + ${ImageMagick_INCLUDE_DIRS} + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" + PATH_SUFFIXES +- ImageMagick ++ ImageMagick ImageMagick-6 + DOC "Path to the ImageMagick include dir." + ) + find_library(ImageMagick_${component}_LIBRARY +-- +1.7.0 + diff --git a/extra/cmake/qt4.patch b/extra/cmake/qt4.patch deleted file mode 100644 index 0518681f0..000000000 --- a/extra/cmake/qt4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake-2.8.10.2/Modules/FindQt4.cmake~ 2013-03-07 16:50:35.388399689 +0000 -+++ cmake-2.8.10.2/Modules/FindQt4.cmake 2013-03-07 16:51:35.017991029 +0000 -@@ -497,7 +497,7 @@ - # check for qmake - # Debian uses qmake-qt4 - # macports' Qt uses qmake-mac --find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac -+find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac - PATHS - ENV QTDIR - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index a6dff7a79..49976813d 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186312 2013-05-24 16:21:18Z jgc $ +# $Id: PKGBUILD 187053 2013-06-03 11:16:18Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl pkgver=2.1.26 -pkgrel=3 +pkgrel=4 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/" @@ -25,7 +25,6 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.service saslauthd.conf.d - saslauthd tmpfiles.conf) md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' @@ -37,7 +36,6 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '8e7106f32e495e9ade69014fd1b3352a' '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' - '75542f613185d5a90520ad0d7d926a20' '45bb0192d2f188066240b9a66ee6365f') build() { @@ -74,6 +72,7 @@ build() { popd ./configure --prefix=/usr \ + --sbin=/usr/bin \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-static \ @@ -131,7 +130,6 @@ package_cyrus-sasl() { cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" make DESTDIR="${pkgdir}" install - install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" install -Dm644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/saslauthd.conf" diff --git a/extra/cyrus-sasl/saslauthd b/extra/cyrus-sasl/saslauthd deleted file mode 100644 index 6afafae0b..000000000 --- a/extra/cyrus-sasl/saslauthd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="saslauthd" -SASLAUTHD_BIN=/usr/sbin/saslauthd -SASLAUTHD_RUN=/var/run/saslauthd -SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid - -case "$1" in - start) - stat_busy "Starting $DAEMON_NAME" - [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd - if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then - add_daemon $DAEMON_NAME - stat_done - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $DAEMON_NAME" - [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm_daemon $DAEMON_NAME - stat_done - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD index a682bf185..1b2807981 100644 --- a/extra/davfs2/PKGBUILD +++ b/extra/davfs2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165783 2012-08-29 23:04:18Z thomas $ +# $Id: PKGBUILD 187054 2013-06-03 11:16:20Z allan $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=davfs2 pkgver=1.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="File system driver that allows you to mount a WebDAV folder" arch=(i686 x86_64) url="http://savannah.nongnu.org/projects/davfs2" @@ -14,19 +14,14 @@ sha256sums=('50c0ee2a12e8d09fc6a852d32bdfebb1f784939433a85f05254bc7ef28cff044') build() { cd "${srcdir}/${pkgname}-${pkgver}" - dav_user=nobody dav_group=network ./configure --prefix=/usr --sysconfdir=/etc --disable-debug + dav_user=nobody dav_group=network ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --disable-debug make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - # Create some dirs - install -d -m755 "${pkgdir}/sbin" make DESTDIR="${pkgdir}" install - rm -f ${pkgdir}/sbin/{u,}mount.davfs - ln -sf /usr/sbin/mount.davfs "${pkgdir}/sbin/mount.davfs" - ln -sf /usr/sbin/umount.davfs "${pkgdir}/sbin/umount.davfs" - + rm -rf ${pkgdir}/sbin rm -f ${pkgdir}/usr/share/davfs2/{BUGS,COPYING,FAQ,NEWS,TODO,ChangeLog,GPL,README,THANKS} } diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD index 70f7eadf8..10a547001 100644 --- a/extra/dhcp/PKGBUILD +++ b/extra/dhcp/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 180410 2013-03-21 12:04:16Z jgc $ +# $Id: PKGBUILD 187056 2013-06-03 11:16:27Z allan $ # Maintainer: Daniel Isenmann <daniel @archlinux.org> pkgbase=dhcp pkgname=('dhcp' 'dhclient') # separate patch levels with a period to maintain proper versioning. -pkgver=4.2.5 -_pkgver=4.2.5 -pkgrel=1 +pkgver=4.2.5.p1 +_pkgver=4.2.5-P1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom:isc-dhcp') url="https://www.isc.org/software/dhcp" makedepends=('bash' 'iproute2') source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc} - dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service + dhcpd4.service + dhcpd6.service dhcp-4.2.5-client_script-1.patch dhcp-4.2.5-missing_ipv6-1.patch) -md5sums=('6489e919ac093d17249270ee9be1020e' - '022bc7038b3061cfb31da4736e7ab8a8' - 'c49b1497837ba56c54e401a66e1bab9b' - '12c2f3ae47ed23eb698eb7f1bfd80f20' - '8f357e46e1efcbb746f38737a3f977a2' +md5sums=('f68e3c1f00a9af5742bc5e71d567cf93' + 'SKIP' '439ee2f145a1e86dd644cb94a854f8e7' '588aa85b6fe228c45623185a58d11992' '9e4dcf90beec15bfcb6631809cdcc780' 'da655f02f1cf4d95b4708e84e69edbc8') -build() { + +prepare() { cd "${srcdir}/${pkgbase}-${_pkgver}" # Define _GNU_SOURCE to fix IPV6. @@ -36,8 +35,11 @@ build() { patch -Np1 -i ../dhcp-4.2.5-missing_ipv6-1.patch # Make dhcp client script suck less. patch -Np1 -i ../dhcp-4.2.5-client_script-1.patch +} - ./configure --prefix=/usr --sysconfdir=/etc \ +build() { + cd "${srcdir}/${pkgbase}-${_pkgver}" + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \ @@ -48,15 +50,12 @@ build() { package_dhcp(){ pkgdesc="A DHCP server, client, and relay agent" - backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp') + backup=('etc/dhcpd.conf') install=dhcp.install - + cd "${srcdir}/${pkgbase}-${_pkgver}" make DESTDIR="${pkgdir}" install - install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4" - install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6" - install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}" install -d "${pkgdir}/var/lib/dhcp" install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service" @@ -67,7 +66,7 @@ package_dhcp(){ # Remove dhclient make -C client DESTDIR="${pkgdir}" uninstall - + # install license install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhcp/LICENSE" } @@ -82,11 +81,11 @@ package_dhclient(){ install -m755 -d "${pkgdir}/usr/share/dhclient" mv "${pkgdir}/etc/dhclient.conf.example" "${pkgdir}/usr/share/dhclient/" - + install -d "${pkgdir}/var/lib/dhclient" # install dhclient linux script - install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script" + install -m755 client/scripts/linux "${pkgdir}/usr/bin/dhclient-script" # install license install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE" diff --git a/extra/dhcp/dhcp b/extra/dhcp/dhcp deleted file mode 100644 index d4f228d9c..000000000 --- a/extra/dhcp/dhcp +++ /dev/null @@ -1,10 +0,0 @@ -# -# Arguments to be passed to the DHCP server daemon -# - -# ipv4 runtime parameters -DHCP4_ARGS="-q" - -# ipv6 runtime parameters -DHCP6_ARGS="-q" - diff --git a/extra/dhcp/dhcp.conf.d b/extra/dhcp/dhcp.conf.d deleted file mode 100644 index 99ba6d13d..000000000 --- a/extra/dhcp/dhcp.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP server daemon -# - -DHCP_ARGS="-q" - diff --git a/extra/dhcp/dhcp4 b/extra/dhcp/dhcp4 deleted file mode 100644 index 8e1277a37..000000000 --- a/extra/dhcp/dhcp4 +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dhcp - -PIDFILE="/var/run/dhcpd.pid" - -if [[ -f $PIDFILE ]]; then - read -r PID < "$PIDFILE" - - # prevent stale pidfiles from hanging around - if [[ ! -d /proc/$PID ]]; then - echo 'pid not found. deleteing stale pidfile' - unset PID - rm -f "$PIDFILE" - fi -fi - -case "$1" in - start) - stat_busy "Starting DHCPv4 Server" - if [[ $PID ]]; then - stat_fail - exit 1 - fi - if /usr/sbin/dhcpd -4 -pf "$PIDFILE" $DHCP4_ARGS; then - add_daemon dhcp4 - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping DHCPv4 Server" - if [[ ! $PID ]]; then - stat_fail - exit 1 - fi - if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then - rm_daemon dhcp4 - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - diff --git a/extra/dhcp/dhcp6 b/extra/dhcp/dhcp6 deleted file mode 100644 index 6b4b4d359..000000000 --- a/extra/dhcp/dhcp6 +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dhcp - -PIDFILE="/var/run/dhcp6.pid" - -if [[ -f $PIDFILE ]]; then - read -r PID < "$PIDFILE" - - # prevent stale pidfiles from hanging around - if [[ ! -d /proc/$PID ]]; then - echo 'pid not found. deleteing stale pidfile' - unset PID - rm -f "$PIDFILE" - fi -fi - -case "$1" in - start) - stat_busy "Starting DHCPv6 Server" - if [[ $PID ]]; then - stat_fail - exit 1 - fi - if /usr/sbin/dhcpd -6 -pf "$PIDFILE" $DHCP6_ARGS; then - add_daemon dhcp6 - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping DHCPv6 Server" - if [[ ! $PID ]]; then - stat_fail - exit 1 - fi - if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then - rm_daemon dhcp6 - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - diff --git a/extra/dhcp/dhcpd b/extra/dhcp/dhcpd deleted file mode 100755 index 1fbb31e7c..000000000 --- a/extra/dhcp/dhcpd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/dhcp - -PIDFILE="/var/run/dhcpd.pid" -PID=`cat $PIDFILE 2>/dev/null` -case "$1" in - start) - stat_busy "Starting DHCP Server" - if [ "$PID" = "" ]; then - /usr/sbin/dhcpd $DHCP_ARGS - fi - if [ "$PID" != "" -o $? -gt 0 ]; then - stat_fail - else - add_daemon dhcpd - stat_done - fi - ;; - stop) - stat_busy "Stopping DHCP Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - rm -f $PIDFILE - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dhcpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 527e359df..d0ebfd507 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 184369 2013-05-06 19:36:56Z foutrelis $ +# $Id: PKGBUILD 187093 2013-06-03 17:45:39Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=3.1.0 -pkgrel=4 +pkgver=3.2.0 +pkgrel=2 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') license=('GPL') url="http://www.digikam.org/" makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' - 'cmake' 'automoc4' 'doxygen' 'lensfun') + 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - "digikam-3.1.0-htmlexport.patch" "digikam-3.1.0-fixed-pngs.tar.gz") noextract=("digikam-3.1.0-fixed-pngs.tar.gz") -sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd' - 'ef3ee0b6e56e692eb7c10cda5cd581d20c3c46bb' +sha1sums=('666f1d937dc033ddb880aed8a32e7943113d973f' 'b0a1991e0df9b72c79562c719bc9d944a3b8bc78') prepare() { @@ -27,9 +25,6 @@ prepare() { cd ${pkgname}-${pkgver} - # https://bugs.kde.org/show_bug.cgi?id=316620 - patch -Np1 -i "${srcdir}/digikam-3.1.0-htmlexport.patch" - # Fix invalid PNG images to work with libpng 1.6 # https://bugs.kde.org/show_bug.cgi?id=319350 tar xf "${srcdir}/digikam-3.1.0-fixed-pngs.tar.gz" --strip-components=1 @@ -50,7 +45,7 @@ package_digikam() { pkgdesc="Digital photo management application for KDE" depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr' 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap' 'lensfun') - optdepends=('kipi-plugins: for more extras and plugins') + optdepends=('kipi-plugins: more tools and plugins') install=digikam.install cd build/core @@ -60,7 +55,7 @@ package_digikam() { cd ../../build/po make DESTDIR="${pkgdir}" install - # Fix conflicts with kde-l10n-* + # Fix conflicts with kde-l10n-* (FS#33762) rm "${pkgdir}"/usr/share/locale/*/LC_MESSAGES/libkipi.mo } @@ -98,12 +93,14 @@ package_libmediawiki() { package_kipi-plugins() { pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" - depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' - 'opencv' 'libkvkontakte' 'libkexiv2') - optdepends=('libkgeomap' - 'libmediawiki' - 'libgpod' - 'hugin') + depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2') + optdepends=('libkgeomap: Geolocalize tool' + 'libmediawiki: MediaWiki Export plugin' + 'libkvkontakte: VKontakte.ru Exporter plugin' + 'libgpod: iPodExport plugin' + 'opencv: Remove Red Eyes plugin' + 'imagemagick: Video SlideShow plugin' + 'qt-gstreamer: Video SlideShow plugin') install=kipi-plugins.install cd build/extra/kipi-plugins diff --git a/extra/digikam/digikam-3.1.0-htmlexport.patch b/extra/digikam/digikam-3.1.0-htmlexport.patch deleted file mode 100644 index c9e2ff365..000000000 --- a/extra/digikam/digikam-3.1.0-htmlexport.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-11 10:24:11.000000000 +0200 -+++ digikam-3.1.0/extra/kipi-plugins/CMakeLists.txt 2013-03-13 00:15:05.539275132 +0200 -@@ -468,9 +468,9 @@ - # Currently the cmake module distributed w/ cmake uses a different variable - # name LIBXLST_EXSLT_LIBRARIES for libxeslt than the cmake modeule - # distributed w/ kdelibs LIBEXSLT_LIBRARIES. -- if (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) -- set(LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_LIBRARIES}) -- endif (NOT LIBXSLT_EXSLT_LIBRARIES AND NOT LIBXSLT_LIBRARIES) -+ if (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) -+ set(LIBXSLT_EXSLT_LIBRARIES ${LIBEXSLT_LIBRARIES}) -+ endif (NOT LIBXSLT_EXSLT_LIBRARIES AND LIBEXSLT_LIBRARIES) - IF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) - ADD_SUBDIRECTORY(htmlexport) - ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND AND LIBXSLT_EXSLT_LIBRARIES) diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD index c538a4a96..5b7f43f8c 100755 --- a/extra/efibootmgr/PKGBUILD +++ b/extra/efibootmgr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185838 2013-05-19 14:37:47Z tpowa $ +# $Id: PKGBUILD 187100 2013-06-03 19:31:59Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor : Murtuza Akhtari <inxsible at gmail dot com> # Contributor: Keshav P R <skodabenz at rocketmail dot com> pkgname=efibootmgr pkgver=0.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables." arch=('i686' 'x86_64') url="http://linux.dell.com/efibootmgr/" @@ -15,7 +15,9 @@ makedepends=() provides=() options=(strip purge docs zipman !emptydirs) -source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz") +source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz" + "efibootmgr-tilt_slashes-func.patch" +) build () { rm -rf ${srcdir}/efibootmgr-${pkgver}_build/ || true @@ -23,7 +25,7 @@ build () { cp -r ${srcdir}/efibootmgr-${pkgver} ${srcdir}/efibootmgr-${pkgver}_build cd ${srcdir}/efibootmgr-${pkgver}_build/ - + patch -Np1 -i ${srcdir}/efibootmgr-tilt_slashes-func.patch echo CFLAGS= make @@ -43,4 +45,5 @@ package() { install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8 } -md5sums=('9e9a31d79e579644de83a14139b66d10') +md5sums=('9e9a31d79e579644de83a14139b66d10' + '3622c0e978cf859cae60803a6b6a0c5e') diff --git a/extra/efibootmgr/efibootmgr-tilt_slashes-func.patch b/extra/efibootmgr/efibootmgr-tilt_slashes-func.patch new file mode 100644 index 000000000..ce857bb3c --- /dev/null +++ b/extra/efibootmgr/efibootmgr-tilt_slashes-func.patch @@ -0,0 +1,61 @@ +diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c +index 236365a..9883961 100644 +--- a/src/efibootmgr/efibootmgr.c ++++ b/src/efibootmgr/efibootmgr.c +@@ -803,6 +803,7 @@ usage() + printf("\t-V | --version return version and exit\n"); + printf("\t-w | --write-signature write unique sig to MBR if needed\n"); + printf("\t-@ | --append-binary-args file append extra args from file (use \"-\" for stdin)\n"); ++ printf("\t | --help show help/usage\n"); + } + + static void +@@ -863,6 +864,7 @@ parse_opts(int argc, char **argv) + {"version", no_argument, 0, 'V'}, + {"write-signature", no_argument, 0, 'w'}, + {"append-binary-args", required_argument, 0, '@'}, ++ {"help", no_argument, 0, 2}, + {0, 0, 0, 0} + }; + +@@ -1014,6 +1016,10 @@ parse_opts(int argc, char **argv) + opts.write_signature = 1; + break; + ++ case 2: ++ usage(); ++ exit(1); ++ + default: + usage(); + exit(1); +diff --git a/src/lib/efi.c b/src/lib/efi.c +index a4ce5cf..8ef8be8 100644 +--- a/src/lib/efi.c ++++ b/src/lib/efi.c +@@ -70,6 +70,16 @@ efi_guid_unparse(efi_guid_t *guid, char *out) + return out; + } + ++char * ++tilt_slashes(char *s) ++{ ++ char *p; ++ for (p = s; *p; p++) ++ if (*p == '/') ++ *p = '\\'; ++ return s; ++} ++ + void + set_fs_kernel_calls() + { +@@ -535,7 +545,7 @@ char *make_disk_load_option(char *p, char *disk) + signature, + mbr_type, signature_type); + +- efichar_from_char(os_loader_path, opts.loader, sizeof(os_loader_path)); ++ efichar_from_char(os_loader_path, tilt_slashes(opts.loader), sizeof(os_loader_path)); + p += make_file_path_device_path (p, os_loader_path); + p += make_end_device_path (p); + diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index 6b1505a4f..c3086e6c2 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 171437 2012-11-17 15:03:45Z ronald $ +# $Id: PKGBUILD 187057 2013-06-03 11:16:31Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse pkgver=2.9.2 -pkgrel=1 +pkgrel=3 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64') url="http://fuse.sourceforge.net/" @@ -19,14 +19,18 @@ options=(!libtool) sha1sums=('fcfc005b1edcd5e8b325729a1b325ff0e8b2a5ab' '3b42e37a741d4651099225987dc40e7f02a716ad') -build() { +prepare() { cd "$pkgname-$pkgver" - # fix building with glibc-2.14 - sed -i '1i#define _GNU_SOURCE' util/fusermount.c + sed -i '1i#define _GNU_SOURCE' util/fusermount.c + + sed -i "/MOUNT_FUSE_PATH=/s#/sbin#/usr/bin#" configure +} - ./configure --prefix=/usr --libdir=/usr/lib --enable-lib \ - --enable-util --bindir=/bin +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --libdir=/usr/lib \ + --enable-lib --enable-util make } @@ -38,7 +42,6 @@ package() { # Remove init script in wrong path # Don't add our own for now, as fusectl fs oopses on 2.6.18 rm -rf ${pkgdir}/etc/init.d - #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse # install sample config file install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD index dfd2e82fd..f26385c19 100644 --- a/extra/gconf/PKGBUILD +++ b/extra/gconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179963 2013-03-13 14:27:34Z jgc $ +# $Id: PKGBUILD 187058 2013-06-03 11:16:33Z allan $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gconf pkgver=3.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="A configuration database system" arch=(i686 x86_64) license=('LGPL') @@ -23,7 +23,7 @@ sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' 'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8') -build() { +prepare() { cd "GConf-$pkgver" # Patch from fedora - reloads gconf after installing schemas @@ -33,6 +33,10 @@ build() { # Python2 fix sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert +} + +build() { + cd "GConf-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/GConf \ @@ -48,5 +52,5 @@ package() { install -m755 -d "$pkgdir/etc/gconf/gconf.xml.system" install -m755 "$srcdir/gconf-merge-schema" "$pkgdir/usr/bin/" - install -Dm755 "$srcdir/gconfpkg" "$pkgdir/usr/sbin/gconfpkg" + install -m755 "$srcdir/gconfpkg" "$pkgdir/usr/bin/gconfpkg" } diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 79c74ba78..aaae65137 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183315 2013-04-21 22:06:33Z heftig $ +# $Id: PKGBUILD 187059 2013-06-03 11:16:35Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gdm pkgname=(gdm libgdm) pkgver=3.8.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome Display Manager" arch=(i686 x86_64) license=(GPL) @@ -25,6 +25,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --libexecdir=/usr/lib/gdm \ --localstatedir=/var \ diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index 5b3920e4d..a183c7805 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185106 2013-05-11 07:24:47Z bpiotrowski $ +# $Id: PKGBUILD 187002 2013-06-03 07:04:28Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> @@ -6,7 +6,7 @@ pkgname=giflib pkgver=4.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64') @@ -17,12 +17,15 @@ provides=("libungif=${pkgver}") conflicts=('libungif') replaces=('libungif') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2) -md5sums=('bbd3324af24156d5d7e66ab1cee8508d') +source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2 + giflib-4.2.1-quantize.patch) +md5sums=('bbd3324af24156d5d7e66ab1cee8508d' + '67e46b344340ac10f4f597d772679f23') prepare() { cd ${pkgname}-${pkgver} sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac + patch -Np1 -i "$srcdir"/giflib-4.2.1-quantize.patch autoreconf -fi } diff --git a/extra/giflib/giflib-4.2.1-quantize.patch b/extra/giflib/giflib-4.2.1-quantize.patch new file mode 100644 index 000000000..197f88b77 --- /dev/null +++ b/extra/giflib/giflib-4.2.1-quantize.patch @@ -0,0 +1,404 @@ +diff -up giflib-4.2.1/lib/Makefile.in.quantize giflib-4.2.1/lib/Makefile.in +--- giflib-4.2.1/lib/Makefile.in.quantize 2012-10-09 00:37:59.000000000 -0300 ++++ giflib-4.2.1/lib/Makefile.in 2012-11-17 12:16:04.485736553 -0200 +@@ -77,7 +77,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" + LTLIBRARIES = $(lib_LTLIBRARIES) + libgif_la_DEPENDENCIES = + am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \ +- gifalloc.lo gif_err.lo ++ gifalloc.lo gif_err.lo quantize.lo + libgif_la_OBJECTS = $(am_libgif_la_OBJECTS) + libgif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +@@ -234,6 +234,7 @@ libgif_la_SOURCES = dgif_lib.c \ + gif_hash.h \ + gifalloc.c \ + gif_err.c \ ++ quantize.c \ + gif_lib_private.h + + libgif_la_LDFLAGS = -version-info @SHLIBVERSION@ +@@ -319,6 +320,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h +--- giflib-4.2.1/lib/gif_lib.h.quantize 2012-10-09 00:36:32.000000000 -0300 ++++ giflib-4.2.1/lib/gif_lib.h 2012-11-17 12:16:04.488735917 -0200 +@@ -180,6 +180,15 @@ int DGifCloseFile(GifFileType * GifFile) + #define D_GIF_ERR_IMAGE_DEFECT 112 + #define D_GIF_ERR_EOF_TOO_SOON 113 + ++/****************************************************************************** ++ * O.K., here are the routines from GIF_LIB file QUANTIZE.C. ++******************************************************************************/ ++int QuantizeBuffer(unsigned int Width, unsigned int Height, ++ int *ColorMapSize, GifByteType * RedInput, ++ GifByteType * GreenInput, GifByteType * BlueInput, ++ GifByteType * OutputBuffer, ++ GifColorType * OutputColorMap); ++ + /* These are legacy. You probably do not want to call them directly */ + int DGifGetScreenDesc(GifFileType * GifFile); + int DGifGetRecordType(GifFileType * GifFile, GifRecordType * GifType); +diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c +--- giflib-4.2.1/lib/quantize.c.quantize 2012-11-17 12:17:44.741435334 -0200 ++++ giflib-4.2.1/lib/quantize.c 2012-11-17 12:16:04.491735283 -0200 +@@ -0,0 +1,332 @@ ++/***************************************************************************** ++ * "Gif-Lib" - Yet another gif library. ++ * ++ * Written by: Gershon Elber IBM PC Ver 0.1, Jun. 1989 ++ ****************************************************************************** ++ * Module to quatize high resolution image into lower one. You may want to ++ * peek into the following article this code is based on: ++ * "Color Image Quantization for frame buffer Display", by Paul Heckbert ++ * SIGGRAPH 1982 page 297-307. ++ ****************************************************************************** ++ * History: ++ * 5 Jan 90 - Version 1.0 by Gershon Elber. ++ *****************************************************************************/ ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ ++#ifdef __MSDOS__ ++#include <dos.h> ++#include <alloc.h> ++#include <graphics.h> ++#endif /* __MSDOS__ */ ++ ++#include <stdlib.h> ++#include <stdio.h> ++#include "gif_lib.h" ++#include "gif_lib_private.h" ++ ++#define ABS(x) ((x) > 0 ? (x) : (-(x))) ++ ++#define PROGRAM_NAME "giflib" ++ ++/* The colors are stripped to 5 bits per primary color if non MSDOS system ++ * or to 4 (not enough memory...) if MSDOS as first step. ++ */ ++#ifdef __MSDOS__ ++#define COLOR_ARRAY_SIZE 4096 ++#define BITS_PER_PRIM_COLOR 4 ++#define MAX_PRIM_COLOR 0x0f ++#else ++#define COLOR_ARRAY_SIZE 32768 ++#define BITS_PER_PRIM_COLOR 5 ++#define MAX_PRIM_COLOR 0x1f ++#endif /* __MSDOS__ */ ++ ++static int SortRGBAxis; ++ ++typedef struct QuantizedColorType { ++ GifByteType RGB[3]; ++ GifByteType NewColorIndex; ++ long Count; ++ struct QuantizedColorType *Pnext; ++} QuantizedColorType; ++ ++typedef struct NewColorMapType { ++ GifByteType RGBMin[3], RGBWidth[3]; ++ unsigned int NumEntries; /* # of QuantizedColorType in linked list below */ ++ unsigned long Count; /* Total number of pixels in all the entries */ ++ QuantizedColorType *QuantizedColors; ++} NewColorMapType; ++ ++static int SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize); ++static int SortCmpRtn(const VoidPtr Entry1, const VoidPtr Entry2); ++ ++/****************************************************************************** ++ * Quantize high resolution image into lower one. Input image consists of a ++ * 2D array for each of the RGB colors with size Width by Height. There is no ++ * Color map for the input. Output is a quantized image with 2D array of ++ * indexes into the output color map. ++ * Note input image can be 24 bits at the most (8 for red/green/blue) and ++ * the output has 256 colors at the most (256 entries in the color map.). ++ * ColorMapSize specifies size of color map up to 256 and will be updated to ++ * real size before returning. ++ * Also non of the parameter are allocated by this routine. ++ * This function returns GIF_OK if succesfull, GIF_ERROR otherwise. ++ ******************************************************************************/ ++int ++QuantizeBuffer(unsigned int Width, ++ unsigned int Height, ++ int *ColorMapSize, ++ GifByteType * RedInput, ++ GifByteType * GreenInput, ++ GifByteType * BlueInput, ++ GifByteType * OutputBuffer, ++ GifColorType * OutputColorMap) { ++ ++ unsigned int Index, NumOfEntries; ++ int i, j, MaxRGBError[3]; ++ unsigned int NewColorMapSize; ++ long Red, Green, Blue; ++ NewColorMapType NewColorSubdiv[256]; ++ QuantizedColorType *ColorArrayEntries, *QuantizedColor; ++ ++ ColorArrayEntries = (QuantizedColorType *)malloc( ++ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE); ++ if (ColorArrayEntries == NULL) { ++ _GifError = E_GIF_ERR_NOT_ENOUGH_MEM; ++ return GIF_ERROR; ++ } ++ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) { ++ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR); ++ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) & ++ MAX_PRIM_COLOR; ++ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR; ++ ColorArrayEntries[i].Count = 0; ++ } ++ ++ /* Sample the colors and their distribution: */ ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ ColorArrayEntries[Index].Count++; ++ } ++ ++ /* Put all the colors in the first entry of the color map, and call the ++ * recursive subdivision process. */ ++ for (i = 0; i < 256; i++) { ++ NewColorSubdiv[i].QuantizedColors = NULL; ++ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[i].RGBMin[j] = 0; ++ NewColorSubdiv[i].RGBWidth[j] = 255; ++ } ++ } ++ ++ /* Find the non empty entries in the color table and chain them: */ ++ for (i = 0; i < COLOR_ARRAY_SIZE; i++) ++ if (ColorArrayEntries[i].Count > 0) ++ break; ++ QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i]; ++ NumOfEntries = 1; ++ while (++i < COLOR_ARRAY_SIZE) ++ if (ColorArrayEntries[i].Count > 0) { ++ QuantizedColor->Pnext = &ColorArrayEntries[i]; ++ QuantizedColor = &ColorArrayEntries[i]; ++ NumOfEntries++; ++ } ++ QuantizedColor->Pnext = NULL; ++ ++ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */ ++ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */ ++ NewColorMapSize = 1; ++ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) != ++ GIF_OK) { ++ free((char *)ColorArrayEntries); ++ return GIF_ERROR; ++ } ++ if (NewColorMapSize < *ColorMapSize) { ++ /* And clear rest of color map: */ ++ for (i = NewColorMapSize; i < *ColorMapSize; i++) ++ OutputColorMap[i].Red = OutputColorMap[i].Green = ++ OutputColorMap[i].Blue = 0; ++ } ++ ++ /* Average the colors in each entry to be the color to be used in the ++ * output color map, and plug it into the output color map itself. */ ++ for (i = 0; i < NewColorMapSize; i++) { ++ if ((j = NewColorSubdiv[i].NumEntries) > 0) { ++ QuantizedColor = NewColorSubdiv[i].QuantizedColors; ++ Red = Green = Blue = 0; ++ while (QuantizedColor) { ++ QuantizedColor->NewColorIndex = i; ++ Red += QuantizedColor->RGB[0]; ++ Green += QuantizedColor->RGB[1]; ++ Blue += QuantizedColor->RGB[2]; ++ QuantizedColor = QuantizedColor->Pnext; ++ } ++ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j; ++ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j; ++ } else ++ fprintf(stderr, ++ "\n%s: Null entry in quantized color map - that's weird.\n", ++ PROGRAM_NAME); ++ } ++ ++ /* Finally scan the input buffer again and put the mapped index in the ++ * output buffer. */ ++ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0; ++ for (i = 0; i < (int)(Width * Height); i++) { ++ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ (2 * BITS_PER_PRIM_COLOR)) + ++ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << ++ BITS_PER_PRIM_COLOR) + ++ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); ++ Index = ColorArrayEntries[Index].NewColorIndex; ++ OutputBuffer[i] = Index; ++ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i])) ++ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]); ++ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i])) ++ MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]); ++ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i])) ++ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]); ++ } ++ ++#ifdef DEBUG ++ fprintf(stderr, ++ "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n", ++ MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]); ++#endif /* DEBUG */ ++ ++ free((char *)ColorArrayEntries); ++ ++ *ColorMapSize = NewColorMapSize; ++ ++ return GIF_OK; ++} ++ ++/****************************************************************************** ++ * Routine to subdivide the RGB space recursively using median cut in each ++ * axes alternatingly until ColorMapSize different cubes exists. ++ * The biggest cube in one dimension is subdivide unless it has only one entry. ++ * Returns GIF_ERROR if failed, otherwise GIF_OK. ++ ******************************************************************************/ ++static int ++SubdivColorMap(NewColorMapType * NewColorSubdiv, ++ unsigned int ColorMapSize, ++ unsigned int *NewColorMapSize) { ++ ++ int MaxSize; ++ unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor; ++ long Sum, Count; ++ QuantizedColorType *QuantizedColor, **SortArray; ++ ++ while (ColorMapSize > *NewColorMapSize) { ++ /* Find candidate for subdivision: */ ++ MaxSize = -1; ++ for (i = 0; i < *NewColorMapSize; i++) { ++ for (j = 0; j < 3; j++) { ++ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) && ++ (NewColorSubdiv[i].NumEntries > 1)) { ++ MaxSize = NewColorSubdiv[i].RGBWidth[j]; ++ Index = i; ++ SortRGBAxis = j; ++ } ++ } ++ } ++ ++ if (MaxSize == -1) ++ return GIF_OK; ++ ++ /* Split the entry Index into two along the axis SortRGBAxis: */ ++ ++ /* Sort all elements in that entry along the given axis and split at ++ * the median. */ ++ SortArray = (QuantizedColorType **)malloc( ++ sizeof(QuantizedColorType *) * ++ NewColorSubdiv[Index].NumEntries); ++ if (SortArray == NULL) ++ return GIF_ERROR; ++ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors; ++ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL; ++ j++, QuantizedColor = QuantizedColor->Pnext) ++ SortArray[j] = QuantizedColor; ++ ++ qsort(SortArray, NewColorSubdiv[Index].NumEntries, ++ sizeof(QuantizedColorType *), SortCmpRtn); ++ ++ /* Relink the sorted list into one: */ ++ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) ++ SortArray[j]->Pnext = SortArray[j + 1]; ++ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL; ++ NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0]; ++ free((char *)SortArray); ++ ++ /* Now simply add the Counts until we have half of the Count: */ ++ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count; ++ NumEntries = 1; ++ Count = QuantizedColor->Count; ++ while ((Sum -= QuantizedColor->Pnext->Count) >= 0 && ++ QuantizedColor->Pnext != NULL && ++ QuantizedColor->Pnext->Pnext != NULL) { ++ QuantizedColor = QuantizedColor->Pnext; ++ NumEntries++; ++ Count += QuantizedColor->Count; ++ } ++ /* Save the values of the last color of the first half, and first ++ * of the second half so we can update the Bounding Boxes later. ++ * Also as the colors are quantized and the BBoxes are full 0..255, ++ * they need to be rescaled. ++ */ ++ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */ ++ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */ ++ MaxColor <<= (8 - BITS_PER_PRIM_COLOR); ++ MinColor <<= (8 - BITS_PER_PRIM_COLOR); ++ ++ /* Partition right here: */ ++ NewColorSubdiv[*NewColorMapSize].QuantizedColors = ++ QuantizedColor->Pnext; ++ QuantizedColor->Pnext = NULL; ++ NewColorSubdiv[*NewColorMapSize].Count = Count; ++ NewColorSubdiv[Index].Count -= Count; ++ NewColorSubdiv[*NewColorMapSize].NumEntries = ++ NewColorSubdiv[Index].NumEntries - NumEntries; ++ NewColorSubdiv[Index].NumEntries = NumEntries; ++ for (j = 0; j < 3; j++) { ++ NewColorSubdiv[*NewColorMapSize].RGBMin[j] = ++ NewColorSubdiv[Index].RGBMin[j]; ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] = ++ NewColorSubdiv[Index].RGBWidth[j]; ++ } ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] = ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] + ++ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor; ++ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor; ++ ++ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] = ++ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis]; ++ ++ (*NewColorMapSize)++; ++ } ++ ++ return GIF_OK; ++} ++ ++/**************************************************************************** ++ * Routine called by qsort to compare to entries. ++ ****************************************************************************/ ++static int ++SortCmpRtn(const VoidPtr Entry1, ++ const VoidPtr Entry2) { ++ ++ return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] - ++ (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis]; ++} +diff -up giflib-4.2.1/util/rgb2gif.c.quantize giflib-4.2.1/util/rgb2gif.c +--- giflib-4.2.1/util/rgb2gif.c.quantize 2012-10-09 00:28:12.000000000 -0300 ++++ giflib-4.2.1/util/rgb2gif.c 2012-11-17 12:16:04.490735495 -0200 +@@ -129,7 +129,7 @@ static int SortCmpRtn(const void *Entry1 + * This function returns GIF_OK if succesfull, GIF_ERROR otherwise. + ******************************************************************************/ + static int +-QuantizeBuffer(unsigned int Width, ++GifQuantizeBuffer(unsigned int Width, + unsigned int Height, + int *ColorMapSize, + GifByteType * RedInput, +@@ -428,7 +428,7 @@ int main(int argc, char **argv) + sizeof(GifByteType))) == NULL) + GIF_EXIT("Failed to allocate memory required, aborted."); + +- if (QuantizeBuffer(Width, Height, &ColorMapSize, ++ if (GifQuantizeBuffer(Width, Height, &ColorMapSize, + RedBuffer, GreenBuffer, BlueBuffer, + OutputBuffer, OutputColorMap->Colors) == GIF_ERROR) + QuitGifError(NULL); diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD index 86075450f..871afe0b1 100644 --- a/extra/iptraf-ng/PKGBUILD +++ b/extra/iptraf-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160611 2012-06-02 21:10:00Z ibiru $ +# $Id: PKGBUILD 187060 2013-06-03 11:16:37Z allan $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: sh0 <mee@sh0.org> pkgname=iptraf-ng pkgver=1.1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)" url="https://fedorahosted.org/iptraf-ng/" arch=('i686' 'x86_64') @@ -12,13 +12,20 @@ depends=('ncurses') license=('GPL2') replaces=('iptraf') options=('!libtool') -source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('1a2c02944b0b012d6a3de96207610fa2') +source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz + iptraf-ng-linux-3.5-compat.patch) +md5sums=('1a2c02944b0b012d6a3de96207610fa2' + 'd2ddee5f9ff485155235f7cb4671d8fb') + +prepare() { + cd "$pkgname-$pkgver" + patch -p1 -i ${srcdir}/iptraf-ng-linux-3.5-compat.patch +} build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --sbindir=/usr/sbin + --localstatedir=/var --sbindir=/usr/bin make CFLAGS="$CFLAGS -std=gnu99" } diff --git a/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch b/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch new file mode 100644 index 000000000..85fd791df --- /dev/null +++ b/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch @@ -0,0 +1,127 @@ +From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001 +From: Nikola Pajkovsky <npajkovs@redhat.com> +Date: Wed, 23 May 2012 16:32:27 +0200 +Subject: [PATCH 01/91] token-ring: kernel v3.5 kill off token-ring support + +Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com> +--- + src/hostmon.c | 10 ---------- + src/iptraf-ng-compat.h | 1 - + src/othptab.c | 6 ------ + src/packet.c | 27 --------------------------- + src/tcptable.c | 4 ---- + 5 files changed, 48 deletions(-) + +diff --git a/src/hostmon.c b/src/hostmon.c +index 40a2b95..72b91f8 100644 +--- a/src/hostmon.c ++++ b/src/hostmon.c +@@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr, + FDDI_K_ALEN); + list = flist; + break; } +- case ARPHRD_IEEE802: +- case ARPHRD_IEEE802_TR: { +- struct trh_hdr *hdr_trh = +- (struct trh_hdr *)pkt.pkt_buf; +- memcpy(scratch_saddr, hdr_trh->saddr, +- TR_ALEN); +- memcpy(scratch_daddr, hdr_trh->daddr, +- TR_ALEN); +- list = flist; +- break; } + default: + /* unknown link protocol */ + continue; +diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h +index d5aee4a..2d9da96 100644 +--- a/src/iptraf-ng-compat.h ++++ b/src/iptraf-ng-compat.h +@@ -39,7 +39,6 @@ + #include <linux/if_ether.h> + #include <linux/if_packet.h> + #include <linux/if_fddi.h> +-#include <linux/if_tr.h> + #include <linux/types.h> + #include <linux/isdn.h> + +diff --git a/src/othptab.c b/src/othptab.c +index d12cdfd..1181eb1 100644 +--- a/src/othptab.c ++++ b/src/othptab.c +@@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt, + saddr), new_entry->smacaddr); + convmacaddr((char *) (((struct fddihdr *) packet)-> + daddr), new_entry->dmacaddr); +- } else if ((pkt->pkt_hatype == ARPHRD_IEEE802) +- || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) { +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- saddr), new_entry->smacaddr); +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- daddr), new_entry->dmacaddr); + } + } + +diff --git a/src/packet.c b/src/packet.c +index a43a27a..f3e4304 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len) + return (u_short) (~sum); + } + +-static unsigned int get_tr_ip_offset(char *pkt) +-{ +- struct trh_hdr *trh; +- unsigned int riflen = 0; +- +- trh = (struct trh_hdr *) pkt; +- +- /* +- * Check if this packet has TR routing information and get +- * its length. +- */ +- if (trh->saddr[0] & TR_RII) +- riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8; +- +- return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen + +- sizeof(struct trllc); +-} +- + static int packet_adjust(struct pkt_hdr *pkt) + { + int retval = 0; +@@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt) + pkt->pkt_payload += sizeof(struct fddihdr); + pkt->pkt_len -= sizeof(struct fddihdr); + break; +- case ARPHRD_IEEE802_TR: +- case ARPHRD_IEEE802: +- pkt->pkt_payload = pkt->pkt_buf; +- /* Token Ring patch supplied by Tomas Dvorak */ +- /* Get the start of the IP packet from the Token Ring frame. */ +- unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload); +- pkt->pkt_payload += dataoffset; +- pkt->pkt_len -= dataoffset; +- break; + default: + /* return a NULL packet to signal an unrecognized link */ + /* protocol to the caller. Hopefully, this switch statement */ +diff --git a/src/tcptable.c b/src/tcptable.c +index 56c4780..b0e5ccc 100644 +--- a/src/tcptable.c ++++ b/src/tcptable.c +@@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry, + } else if (linkproto == ARPHRD_FDDI) { + convmacaddr((char *) (((struct fddihdr *) packet)-> + saddr), newmacaddr); +- } else if ((linkproto == ARPHRD_IEEE802) +- || (linkproto == ARPHRD_IEEE802_TR)) { +- convmacaddr((char *) (((struct trh_hdr *) packet)-> +- saddr), newmacaddr); + } + + if (tableentry->smacaddr[0] != '\0') { +-- +1.8.3 + diff --git a/extra/libatasmart/PKGBUILD b/extra/libatasmart/PKGBUILD index 81a787709..f46ee6a8b 100644 --- a/extra/libatasmart/PKGBUILD +++ b/extra/libatasmart/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165610 2012-08-27 09:02:59Z jgc $ +# $Id: PKGBUILD 187061 2013-06-03 11:16:38Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libatasmart pkgver=0.19 -pkgrel=1 +pkgrel=2 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library" arch=('i686' 'x86_64') license=('LGPL') @@ -18,6 +18,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --disable-static make } diff --git a/extra/libbonobo/PKGBUILD b/extra/libbonobo/PKGBUILD index de2d527e5..cf6c7cbde 100644 --- a/extra/libbonobo/PKGBUILD +++ b/extra/libbonobo/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 177011 2013-02-04 08:29:28Z jgc $ +# $Id: PKGBUILD 187062 2013-06-03 11:16:40Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libbonobo pkgver=2.32.1 -pkgrel=3 +pkgrel=4 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components" arch=(i686 x86_64) license=('GPL' 'LGPL') -depends=('orbit2' 'libxml2' 'glib2') +depends=('orbit2' 'libxml2' 'glib2' 'popt') makedepends=('intltool' 'pkgconfig') options=('!libtool') backup=('etc/bonobo-activation/bonobo-activation-config.xml') @@ -18,9 +18,14 @@ install=libbonobo.install sha256sums=('9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b' '081de245c42de10ebeea3cbcd819c5ce5d0a15b9bdde9c2098302b1e14965af2') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s#-DG_DISABLE_DEPRECATED##" activation-server/Makefile.in +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/bonobo make diff --git a/extra/libsmbios/PKGBUILD b/extra/libsmbios/PKGBUILD index 37f66af52..c82f0757b 100644 --- a/extra/libsmbios/PKGBUILD +++ b/extra/libsmbios/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 144413 2011-12-05 15:46:35Z jgc $ +# $Id: PKGBUILD 187063 2013-06-03 11:16:41Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: daniel g. siegel <dgsiegel@gmail.com> pkgname=libsmbios pkgver=2.2.28 -pkgrel=1 +pkgrel=2 pkgdesc="A library for providing access to as much BIOS information as possible" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://linux.dell.com/libsmbios/main/index.html" license=('GPL' 'custom') depends=('gcc-libs') @@ -21,7 +21,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" mkdir build cd build - PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc --disable-static + PYTHON=python2 ../configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --disable-static mkdir -p out/libsmbios_c mkdir -p out/libsmbios_c++ make @@ -31,7 +31,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install - chrpath -d "${pkgdir}/usr/sbin/smbios-sys-info-lite" + chrpath -d "${pkgdir}/usr/bin/smbios-sys-info-lite" cp -a ../src/include/* "${pkgdir}/usr/include/" cp -a out/public-include/* "${pkgdir}/usr/include/" @@ -40,7 +40,7 @@ package() { rm -rf "${pkgdir}/usr/lib/yum-plugins" sed -e 's|#!/usr/bin/python|#!/usr/bin/python2|g' \ - -i "${pkgdir}"/usr/sbin/smbios-{{wakeup,token,wireless}-ctl,lcd-brightness,rbu-bios-update,passwd,sys-info} + -i "${pkgdir}"/usr/bin/smbios-{{wakeup,token,wireless}-ctl,lcd-brightness,rbu-bios-update,passwd,sys-info} install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 ../COPYING-OSL "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD index a50746dc0..4cfc24fef 100644 --- a/extra/lsof/PKGBUILD +++ b/extra/lsof/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179524 2013-03-06 00:34:51Z tomegun $ +# $Id: PKGBUILD 187064 2013-06-03 11:16:43Z allan $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -7,7 +7,7 @@ pkgname=lsof pkgver=4.87 -pkgrel=1 +pkgrel=2 pkgdesc="Lists open files for running Unix processes" arch=('i686' 'x86_64') url="http://people.freebsd.org/~abe/" @@ -34,7 +34,7 @@ package() { $pkgdir/usr/share/doc/$pkgname/$file done - install -Dm0755 -o root -g root lsof ${pkgdir}/usr/sbin/lsof + install -Dm0755 -o root -g root lsof ${pkgdir}/usr/bin/lsof install -Dm0644 -o root -g root lsof.8 ${pkgdir}/usr/share/man/man8/lsof.8 install -D -m0644 -o root -g root ${srcdir}/license.txt \ diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index 95c48d2c7..493f63cbf 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 183639 2013-04-25 18:36:08Z heftig $ +# $Id: PKGBUILD 187065 2013-06-03 11:16:44Z allan $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=modemmanager _realname=ModemManager pkgver=0.7.990 -pkgrel=4 +pkgrel=5 pkgdesc="Mobile broadband modem management service" arch=(i686 x86_64) url="http://cgit.freedesktop.org/ModemManager/ModemManager/" license=(GPL2) -depends=(udev ppp libqmi polkit hicolor-icon-theme) +depends=(udev ppp libqmi libmbim polkit hicolor-icon-theme) makedepends=(intltool git gtk-doc) optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') options=('!libtool') install=modemmanager.install #source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz) -source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=135bec6") +source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=67d3ed1") sha256sums=('SKIP') build() { @@ -24,6 +24,7 @@ build() { ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --with-udev-base-dir=/usr/lib/udev \ --disable-static \ --with-polkit diff --git a/extra/modemmanager/modemmanager.install b/extra/modemmanager/modemmanager.install index be187f2b4..d0e87bc18 100644 --- a/extra/modemmanager/modemmanager.install +++ b/extra/modemmanager/modemmanager.install @@ -1,6 +1,7 @@ post_install() { - type -P gtk-update-icon-cache &>/dev/null && + if type -P gtk-update-icon-cache &>/dev/null; then gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + fi } post_upgrade() { diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 95b103c05..134fab5cd 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185614 2013-05-16 03:14:17Z eric $ +# $Id: PKGBUILD 187066 2013-06-03 11:16:46Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=msmtp pkgname=('msmtp' 'msmtp-mta') pkgver=1.4.31 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL3') url="http://msmtp.sourceforge.net" @@ -48,7 +48,6 @@ package_msmtp-mta() { provides=('smtp-forwarder') conflicts=('smtp-forwarder') - install -d "${pkgdir}"/usr/{s,}bin + install -d "${pkgdir}"/usr/bin ln -s msmtp "${pkgdir}/usr/bin/sendmail" - ln -s ../bin/msmtp "${pkgdir}/usr/sbin/sendmail" } diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 01f43b2ba..5fc37eb52 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183447 2013-04-21 22:11:49Z heftig $ +# $Id: PKGBUILD 187067 2013-06-03 11:16:48Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -9,7 +9,7 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.8.0 -pkgrel=3 +pkgrel=4 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') @@ -27,31 +27,31 @@ options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz - NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) + NetworkManager.conf disable_set_hostname.patch) sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' - '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') -build() { +prepare() { cd $_pkgname-$pkgver - patch -Np1 -i ../disable_set_hostname.patch - patch -Np1 -i ../dnsmasq-path.patch - #AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi +} +build() { + cd $_pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/networkmanager \ + --sbindir=/usr/bin \ --with-crypto=nss \ - --with-dhclient=/usr/sbin/dhclient \ - --with-dhcpcd=/usr/sbin/dhcpcd \ - --with-iptables=/usr/sbin/iptables \ + --with-dhclient=/usr/bin/dhclient \ + --with-dhcpcd=/usr/bin/dhcpcd \ + --with-iptables=/usr/bin/iptables \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-udev-dir=/usr/lib/udev \ - --with-resolvconf=/usr/sbin/resolvconf \ + --with-resolvconf=/usr/bin/resolvconf \ --with-session-tracking=systemd \ --with-modem-manager-1 \ --disable-static \ diff --git a/extra/networkmanager/dnsmasq-path.patch b/extra/networkmanager/dnsmasq-path.patch deleted file mode 100644 index c0e713266..000000000 --- a/extra/networkmanager/dnsmasq-path.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c ---- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200 -+++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100 -@@ -52,8 +52,11 @@ - find_dnsmasq (void) - { - static const char *paths[] = { -+ "/usr/local/bin/dnsmasq", - "/usr/local/sbin/dnsmasq", -+ "/usr/bin/dnsmasq", - "/usr/sbin/dnsmasq", -+ "/bin/dnsmasq", - "/sbin/dnsmasq", - NULL - }; -diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c ---- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200 -+++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100 -@@ -170,8 +170,11 @@ - nm_find_dnsmasq (void) - { - static const char *dnsmasq_binary_paths[] = { -+ "/usr/local/bin/dnsmasq", - "/usr/local/sbin/dnsmasq", -+ "/usr/bin/dnsmasq", - "/usr/sbin/dnsmasq", -+ "/bin/dnsmasq", - "/sbin/dnsmasq", - NULL - }; diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index 48aa64667..c290417cc 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186962 2013-06-01 15:32:06Z eric $ +# $Id: PKGBUILD 187105 2013-06-03 20:13:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,12 +6,12 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=6 +pkgrel=7 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64') url="http://wiki.muiline.com/obex-data-server" license=('GPL') -depends=('dbus-glib' 'openobex' 'imagemagick') +depends=('dbus-glib' 'openobex' 'imagemagick' 'libusb-compat') source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz" "obex-data-server-openobex17.patch") md5sums=('961ca5db6fe9c97024e133cc6203cc4d' diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 0565c319a..9e2abe7d4 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,37 +1,31 @@ -# $Id: PKGBUILD 186421 2013-05-26 09:25:51Z bluewind $ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 187097 2013-06-03 18:17:55Z eric $ +# Maintainer: pkgname=perl-yaml-syck -_realname=YAML-Syck -pkgver=1.25 -pkgrel=2 +pkgver=1.27 +pkgrel=1 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64') -license=('custom') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/YAML-Syck/" +license=('BSD' 'custom') depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) -md5sums=('847f315cbd074b42c44f360383ac13e9') +source=(http://www.cpan.org/authors/id/T/TO/TODDR/YAML-Syck-$pkgver.tar.gz) +md5sums=('8920091e68a078cfa9c42041e5759162') build() { - cd "${srcdir}/${_realname}-$pkgver" - - # install module in vendor directories. + cd YAML-Syck-$pkgver perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-$pkgver" + cd YAML-Syck-$pkgver make test } package() { - cd "${srcdir}/${_realname}-$pkgver" + cd YAML-Syck-$pkgver make install DESTDIR="${pkgdir}" - - # license. install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/pm-utils/PKGBUILD b/extra/pm-utils/PKGBUILD index 9f861a506..d6e079c5c 100644 --- a/extra/pm-utils/PKGBUILD +++ b/extra/pm-utils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159434 2012-05-24 09:48:16Z bluewind $ +# $Id: PKGBUILD 187068 2013-06-03 11:16:50Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=pm-utils pkgver=1.4.1 -pkgrel=5 +pkgrel=6 pkgdesc="Utilities and scripts for suspend and hibernate power management" arch=('i686' 'x86_64') url="http://pm-utils.freedesktop.org" @@ -31,6 +31,7 @@ build() { patch -Np1 -i "${srcdir}/14-disable-sata-alpm.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --localstatedir=/var make } diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index ac465b8a6..9dad6a619 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185572 2013-05-15 08:05:31Z bpiotrowski $ +# $Id: PKGBUILD 187069 2013-06-03 11:16:51Z allan $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix pkgver=2.10.0 -pkgrel=5 +pkgrel=6 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -15,12 +15,10 @@ depends=('pcre' 'libsasl' 'libldap' 'db' backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} 'aliases.patch' - 'service' - 'rc.d') + 'service') sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' 'SKIP' '5fc3de6c7df1e5851a0a379e825148868808318b' - '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6' - '40c6be2eb55e6437a402f43775cdb3d22ea87a66') + '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6') provides=('smtp-server' 'smtp-forwarder') conflicts=('smtp-server' 'smtp-forwarder') @@ -38,10 +36,12 @@ build() { -DHAS_PGSQL -I/usr/include/postgresql \ -DHAS_SQLITE \ -DHAS_CDB \ - -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ + -DDEF_COMMAND_DIR=\"/usr/bin\" \ -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \ - -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \ + -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\" \ -DDEF_README_DIR=\"/usr/share/doc/postfix\" \ + -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \ + -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ ' AUXLIBS=' \ -lsasl2 \ -lldap -llber \ @@ -60,7 +60,6 @@ package() { sh postfix-install -non-interactive install_root="${pkgdir}" - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" diff --git a/extra/postfix/rc.d b/extra/postfix/rc.d deleted file mode 100755 index fa314bb84..000000000 --- a/extra/postfix/rc.d +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=postfix - -case "$1" in -start) - stat_busy "Starting $name daemon" - /usr/sbin/postfix start &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - /usr/sbin/postfix stop &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - /usr/sbin/postfix reload &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD index 274020c5c..087b35c41 100644 --- a/extra/rtmpdump/PKGBUILD +++ b/extra/rtmpdump/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172942 2012-12-07 18:25:31Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 187070 2013-06-03 11:16:53Z allan $ +# Maintainer: # Contributor: xduugu # Contributor: Elis Hughes <elishughes@googlemail.com> pkgname=rtmpdump pkgver=20121203 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to download rtmp streams" arch=('i686' 'x86_64') url="http://rtmpdump.mplayerhq.hu/" @@ -22,4 +22,8 @@ build() { package() { make -C "$pkgname-$pkgver" prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install + # usrmove + cd "$pkgdir" + mv usr/sbin/* usr/bin + rmdir usr/sbin } diff --git a/extra/sane/1.0.23-hp2400c.patch b/extra/sane/1.0.23-hp2400c.patch new file mode 100644 index 000000000..8bfd29b66 --- /dev/null +++ b/extra/sane/1.0.23-hp2400c.patch @@ -0,0 +1,81 @@ +From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr> +Date: Mon, 3 Jun 2013 06:33:08 +0200 +Subject: [PATCH] bug 314293 fix + +- don't use non-existent end of records +--- + ChangeLog | 3 +++ + backend/genesys_gl646.c | 14 +++++++------- + 2 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c +index c6a5af5..2d5cddc 100644 +--- a/backend/genesys_gl646.c ++++ b/backend/genesys_gl646.c +@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color) + i = 0; + dpi = 9600; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* computes distance and keep mode if it is closer than previous */ + if (sensor == sensor_master[i].sensor +@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color) + dpi = 0; + dist = 9600; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* exit on perfect match */ + if (sensor == sensor_master[i].sensor +@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color) + + i = 0; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* exit on perfect match */ + if (sensor == sensor_master[i].sensor +@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color) + + i = 0; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + /* exit on perfect match */ + if (sensor == sensor_master[i].sensor +@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev, + * sensor mode setting */ + i = 0; + nb = sizeof (sensor_master) / sizeof (Sensor_Master); +- while (sensor_master[i].sensor != -1 && i < nb) ++ while (i < nb) + { + if (dev->model->ccd_type == sensor_master[i].sensor + && sensor_master[i].dpi == xresolution +@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev, + * motor mode setting */ + i = 0; + nb = sizeof (motor_master) / sizeof (Motor_Master); +- while (motor_master[i].motor != -1 && i < nb) ++ while (i < nb) + { + if (dev->model->motor_type == motor_master[i].motor + && motor_master[i].dpi == resolution +@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev, + /* now we can search for the specific sensor settings */ + i = 0; + nb = sizeof (sensor_settings) / sizeof (Sensor_Settings); +- while (sensor_settings[i].sensor != -1 && i < nb) ++ while (i < nb) + { + if (sensor->sensor == sensor_settings[i].sensor + && sensor->cksel == sensor_settings[i].cksel) +-- +1.7.2.5 + diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index e43ede0ad..966dccd0c 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186914 2013-05-31 19:37:31Z tpowa $ +# $Id: PKGBUILD 187017 2013-06-03 10:25:11Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.23 -pkgrel=6 +pkgrel=7 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') @@ -19,12 +19,14 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'saned.socket' 'saned.service' 'kodakaio.c.patch' - 'network.patch') + 'network.patch' + '1.0.23-hp2400c.patch') options=(!libtool) prepare() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - + # fix FS#35549 + patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch # fix FS#33657 patch -Np0 -i ${srcdir}/kodakaio.c.patch # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186 @@ -74,4 +76,5 @@ md5sums=('e226a89c54173efea80e91e9a5eb6573' 'e57e9e15528f47f5f1b3f1411135ed5d' '3f9fe36b0c4ff0b01b53b1cffa5d9700' 'e65dbefb7c3d69955fb6eb3ace14aa12' - '44e77692c52db15b0f530a1d9a8e1296') + '44e77692c52db15b0f530a1d9a8e1296' + '0c8bfabcaa499c4a2583aa2fe53d1686') diff --git a/extra/ssmtp/PKGBUILD b/extra/ssmtp/PKGBUILD index 755a1c863..44f914776 100644 --- a/extra/ssmtp/PKGBUILD +++ b/extra/ssmtp/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 151206 2012-02-25 07:42:28Z pierre $ -# Maintainer: Hugo Doria <hugo@archlinux.org> +# $Id: PKGBUILD 187071 2013-06-03 11:16:54Z allan $ +# Maintainer: pkgname=ssmtp pkgver=2.64 -pkgrel=3 +pkgrel=4 pkgdesc="Extremely simple MTA to get mail off the system to a mailhub" arch=('i686' 'x86_64') license=('GPL') url="http://packages.debian.org/stable/mail/ssmtp" -depends=('openssl') +depends=('openssl' 'inetutils') conflicts=('exim') provides=('smtp-forwarder') backup=('etc/ssmtp/ssmtp.conf' 'etc/ssmtp/revaliases') @@ -40,4 +40,7 @@ package() { ln -s ssmtp "${pkgdir}/usr/sbin/sendmail" ln -s ssmtp "${pkgdir}/usr/sbin/newaliases" ln -s ssmtp "${pkgdir}/usr/sbin/mailq" + # usrmove + cd "$pkgdir" + mv usr/sbin usr/bin } diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD index a31369dd9..fe22ae96f 100644 --- a/extra/strigi/PKGBUILD +++ b/extra/strigi/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 178998 2013-03-01 10:25:57Z andrea $ +# $Id: PKGBUILD 187012 2013-06-03 08:51:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=strigi pkgver=0.7.8 -pkgrel=2 +pkgrel=3 pkgdesc="Fast crawling desktop search engine with Qt GUI" arch=('i686' 'x86_64') url='http://strigi.sourceforge.net/' license=('GPL2') -depends=('exiv2' 'libxml2' 'boost-libs' 'qt4') +depends=('dbus' 'exiv2' 'libxml2' 'boost-libs') makedepends=('cmake' 'pkg-config' 'boost') optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') -source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('d69443234f4286d71997db9de543331a') +source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'gcc48.patch') +md5sums=('d69443234f4286d71997db9de543331a' + 'd48d65014650644ba61821813101c2f4') -build() { - . /etc/profile.d/qt4.sh +prepare() { + cd ${pkgname}-${pkgver}/libstreams + patch -p1 -i "${srcdir}"/gcc48.patch +} +build() { mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -31,24 +36,12 @@ build() { -DENABLE_FAM=OFF \ -DENABLE_CLUCENE=OFF \ -DENABLE_CLUCENE_NG=OFF \ - -DENABLE_FFMPEG=OFF + -DENABLE_FFMPEG=OFF \ + -DENABLE_QT4=OFF make } package() { - pushd build/libstreams - make DESTDIR="${pkgdir}" install - popd - - pushd build/libstreamanalyzer - make DESTDIR="${pkgdir}" install - popd - - pushd build/strigiclient/lib/searchclient/qtdbus - make DESTDIR="${pkgdir}" install - popd - - pushd build/strigiutils + cd build make DESTDIR="${pkgdir}" install - popd } diff --git a/extra/strigi/gcc48.patch b/extra/strigi/gcc48.patch new file mode 100644 index 000000000..ed60e4fbb --- /dev/null +++ b/extra/strigi/gcc48.patch @@ -0,0 +1,12 @@ +--- a/include/strigi/bufferedstream.h ++++ b/include/strigi/bufferedstream.h +@@ -34,7 +34,7 @@ + * BufferedStream will do the rest. + */ + template <class T> +-class BufferedStream : public StreamBase<T> { ++class STREAMS_EXPORT BufferedStream : public StreamBase<T> { + private: + StreamBuffer<T> buffer; + bool finishedWritingToBuffer; + diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD index a882cbfb3..bbbe9040d 100644 --- a/extra/texmacs/PKGBUILD +++ b/extra/texmacs/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 179001 2013-03-01 10:26:20Z andrea $ +# $Id: PKGBUILD 187009 2013-06-03 08:16:28Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: Christopher Reimer <c.reimer1993@gmail.com> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Christopher Reimer <c.reimer1993@gmail.com> pkgname=texmacs -pkgver=1.0.7.16 -pkgrel=2 +pkgver=1.0.7.19 +pkgrel=1 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one." arch=('i686' 'x86_64') url="http://www.texmacs.org/" @@ -19,7 +18,7 @@ optdepends=('transfig: convert images using fig2ps' source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz) install=texmacs.install options=('!emptydirs') -sha1sums=('bd73a8ff1c5361161cc65c57dfe8e706a1859231') +sha1sums=('855b8252f561b69deb45a3b80f4531a9055ea465') build() { cd ${srcdir}/TeXmacs-${pkgver}-src @@ -33,7 +32,10 @@ build() { sed -i '/update-mime-database/d' Makefile.in sed -i '/gtk-update-icon-cache/d' Makefile.in sed -i '\/icons\/gnome 2>\/dev\/null/d' Makefile.in - + + export QMAKE=qmake-qt4 + export MOC=moc-qt4 + export UIC=uic-qt4 ./configure --prefix=/usr \ --mandir=/usr/share/man \ --libexecdir=/usr/lib diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index 9ae7f37fd..1f33526b9 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186142 2013-05-21 09:11:21Z tpowa $ +# $Id: PKGBUILD 187072 2013-06-03 11:16:56Z allan $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=udisks2 pkgver=2.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Disk Management Service, version 2" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -19,6 +19,7 @@ sha256sums=('310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8') build() { cd "udisks-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ + --sbindir=/usr/bin \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --localstatedir=/var --disable-static make diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD index 4666b7cef..beb49de32 100644 --- a/extra/usbmuxd/PKGBUILD +++ b/extra/usbmuxd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164371 2012-07-31 19:43:35Z eric $ +# $Id: PKGBUILD 187073 2013-06-03 11:16:58Z allan $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=usbmuxd pkgver=1.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="USB Multiplex Daemon" url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" arch=('i686' 'x86_64') @@ -32,10 +32,13 @@ package() { # fix udev dir being hardcoded mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" rmdir "${pkgdir}/lib" + # usrmove + mv "${pkgdir}/usr/sbin/"* "${pkgdir}/usr/bin/" + rmdir "${pkgdir}/usr/sbin" # install systemd service file install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service # use udev rule that works with systemd - install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ + install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ } md5sums=('87fd27773a84e97ac6e2dc28b08d682e' 'dae0660f972510a6483992b5b81e1b5a' diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 7dc7aaa02..94ad1cf44 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184233 2013-05-04 14:56:27Z thomas $ +# $Id: PKGBUILD 187074 2013-06-03 11:16:59Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64') url="http://freshmeat.net/projects/libv4l" @@ -23,7 +23,7 @@ options=(!libtool) build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD index 13cc2eb7d..96304c84d 100644 --- a/extra/v86d/PKGBUILD +++ b/extra/v86d/PKGBUILD @@ -1,36 +1,41 @@ -# $Id: PKGBUILD 159626 2012-05-25 23:57:39Z dreisner $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> +# $Id: PKGBUILD 187075 2013-06-03 11:17:01Z allan $ +# Maintainer: pkgname=v86d pkgver=0.1.10 -pkgrel=4 +pkgrel=5 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" arch=('i686' 'x86_64') -url="http://dev.gentoo.org/~spock/projects/uvesafb/" +url="https://github.com/mjanusz/v86d" license=('GPL2') depends=('glibc') +makedepends=('git') options=('!makeflags') -source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2 - v86d +source=("git://github.com/mjanusz/v86d.git#tag=$pkgname-$pkgver" + v86d_install v86d_hook modprobe.uvesafb) -md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' +md5sums=(SKIP '66ab32602ab29cc5635eaac7f3e42283' '5f75b8bc4a7ddf595014591e5db263cb' '2d7cc8dc6a41916a13869212d0191147') build() { - cd "$srcdir/v86d-$pkgver" + cd "$pkgname" ./configure --with-x86emu # we only need /usr/include/video/uvesafb.h make KDIR=/usr } package() { - cd "$srcdir/v86d-$pkgver" + cd "$pkgname" make DESTDIR="$pkgdir" install - install -D -m644 "$srcdir/v86d" "$pkgdir/usr/lib/initcpio/install/v86d" + install -D -m644 "$srcdir/v86d_install" "$pkgdir/usr/lib/initcpio/install/v86d" install -D -m644 "$srcdir/v86d_hook" "$pkgdir/usr/lib/initcpio/hooks/v86d" install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/usr/lib/modprobe.d/uvesafb.conf" + + # usrmove + cd "$pkgdir" + mv sbin usr/bin } diff --git a/extra/v86d/v86d b/extra/v86d/v86d_install index 840b34eec..840b34eec 100644 --- a/extra/v86d/v86d +++ b/extra/v86d/v86d_install diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD index df19144f9..802d06d87 100644 --- a/extra/watchdog/PKGBUILD +++ b/extra/watchdog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178840 2013-02-27 15:05:46Z thomas $ +# $Id: PKGBUILD 187076 2013-06-03 11:17:02Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=watchdog pkgver=5.13 -pkgrel=1 +pkgrel=2 pkgdesc="Watchdog daemon" arch=(i686 x86_64) url="http://sourceforge.net/projects/watchdog" @@ -15,14 +15,18 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz watchdog.systemd) md5sums=('153455f008f1cf8f65f6ad9586a21ff1' 'c90c2686975b5254f82b3de683f1f442' - 'a835ae5cbdbb21c19a468dedb5d734e4') + '06677f094ec76b7fbb7b0db141209dec') +prepare() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch +} build() { cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/watchdog-5.12-fix-oom-in-wd_keepalive.patch ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --mandir=/usr/share/man \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/watchdog/watchdog.systemd b/extra/watchdog/watchdog.systemd index 57c73fb45..4bd08f95c 100644 --- a/extra/watchdog/watchdog.systemd +++ b/extra/watchdog/watchdog.systemd @@ -4,7 +4,7 @@ Description=Watchdog Daemon [Service] Type=forking PIDFile=/run/watchdog.pid -ExecStart=/usr/sbin/watchdog +ExecStart=/usr/bin/watchdog [Install] WantedBy=multi-user.target diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD index 7beeec21f..c90e36cc5 100644 --- a/extra/wpa_supplicant_gui/PKGBUILD +++ b/extra/wpa_supplicant_gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179006 2013-03-01 10:27:04Z andrea $ +# $Id: PKGBUILD 187078 2013-06-03 11:17:10Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant_gui pkgver=2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A Qt frontend to wpa_supplicant" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') @@ -13,16 +13,15 @@ source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz") sha256sums=('2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09') build() { - . /etc/profile.d/qt4.sh cd wpa_supplicant-${pkgver} cd wpa_supplicant/wpa_gui-qt4 - qmake QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" + qmake-qt4 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" make } package() { cd "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4" - install -Dm755 wpa_gui "${pkgdir}/usr/sbin/wpa_gui" + install -Dm755 wpa_gui "${pkgdir}/usr/bin/wpa_gui" install -Dm644 icons/wpa_gui.svg "${pkgdir}/usr/share/pixmaps/wpa_gui.svg" install -Dm644 wpa_gui.desktop "${pkgdir}/usr/share/applications/wpa_gui.desktop" install -Dm644 "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/doc/docbook/wpa_gui.8" \ diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD index 4fd34a023..2b2edf481 100644 --- a/extra/yp-tools/PKGBUILD +++ b/extra/yp-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184213 2013-05-03 22:54:47Z tomegun $ +# $Id: PKGBUILD 187079 2013-06-03 11:17:12Z allan $ # Mantainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -6,7 +6,7 @@ pkgname=yp-tools pkgver=2.14 -pkgrel=2 +pkgrel=3 pkgdesc='Linux NIS Tools' arch=('i686' 'x86_64') url='http://www.linux-nis.org/nis/yp-tools/' @@ -29,6 +29,10 @@ package() { make DESTDIR="$pkgdir" install install -D -m644 ../domainname.conf "${pkgdir}/etc/nisdomainname" install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service" + # usrmove + cd "$pkgdir" + mv usr/sbin/* usr/bin + rmdir usr/sbin } md5sums=('ba1f121c17e3ad65368be173b977cd13' '5a78cd2218936241133e5f61383a2dc8' diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index 2ec03a9e5..a922500b2 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173826 2012-12-24 15:21:31Z pierre $ +# $Id: PKGBUILD 187080 2013-06-03 11:17:13Z allan $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh pkgver=5.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64') url='http://www.zsh.org/' @@ -11,7 +11,7 @@ license=('custom') depends=('pcre' 'libcap' 'gdbm') backup=('etc/zsh/zprofile') install=zsh.install -source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'zprofile') md5sums=('b8f2ad691acf58b3252225746480dcad' '24a9335edf77252a7b5f52e079f7aef7') @@ -19,12 +19,6 @@ md5sums=('b8f2ad691acf58b3252225746480dcad' build() { cd "${srcdir}/${pkgname}-${pkgver}" - # FS#16360 - sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \ - Doc/zsh.texi \ - Completion/Unix/Type/_services \ - Completion/Unix/Command/_init_d - # Set correct keymap path sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys @@ -34,7 +28,6 @@ build() { rm -f Completion/Unix/Command/_osc ./configure --prefix=/usr \ - --bindir=/bin \ --enable-etcdir=/etc/zsh \ --enable-zshenv=/etc/zsh/zshenv \ --enable-zlogin=/etc/zsh/zlogin \ @@ -51,7 +44,7 @@ build() { --enable-pcre \ --enable-cap \ --enable-zsh-secure-free - make all info + make } check() { @@ -61,7 +54,7 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/" install install.info + make DESTDIR="${pkgdir}/" install install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile" install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/zsh/zsh.install b/extra/zsh/zsh.install index 8e54d92ee..a2aafa252 100644 --- a/extra/zsh/zsh.install +++ b/extra/zsh/zsh.install @@ -1,12 +1,5 @@ -infodir=usr/share/info -filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6) - post_install() { - grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done + grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells } post_upgrade() { @@ -14,9 +7,5 @@ post_upgrade() { } pre_remove() { - sed -i '/^\/bin\/zsh/d' etc/shells - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done + sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells } diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD index b46b4321c..5c0a18f2c 100644 --- a/extra/zvbi/PKGBUILD +++ b/extra/zvbi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184458 2013-05-06 19:40:33Z foutrelis $ +# $Id: PKGBUILD 187081 2013-06-03 11:17:17Z allan $ # Maintainer: # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=zvbi pkgver=0.2.33 -pkgrel=5 +pkgrel=6 pkgdesc="VBI capture and decoding library" url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome" arch=('i686' 'x86_64') @@ -35,4 +35,9 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + # usrmove + cd "$pkgdir" + mv usr/sbin/* usr/bin/ + rmdir usr/sbin } diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index eac7300d4..60fa5924b 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=filesystem -pkgver=2013.03 +pkgver=2013.05 pkgrel=2 pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') @@ -21,26 +21,6 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt' 'locale.sh') -md5sums=('7b8e40f8f793e60f471511641bb1c9f2' - '6be47d893fd49b2e4a8c0e811b350861' - '9e4533df61f0c82d6b2e2371f7376282' - '4c4540eeb748bf1f71d631b8c1dcf0b3' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '1cfd310dff0804a7d21958487c32a3b1' - '2ef2429c2c98d0883906aa6f5363be80' - '693c97f2c9a519bb97a17008e92c2b74' - '1745349eb24ed21b4cfaa6f423bddb76' - '7bc65f234dfb6abf24e7c3b03e86f4ff' - 'd41d8cd98f00b204e9800998ecf8427e' - '0e145e18fea8fd190b30d45764f5707c' - '6f48288b6fcaf0065fcb7b0e525413e0' - '22518e922891f9359f971f4f5b4e793c' - 'f45389e116ab0b9e9968287617d27c7d' - 'f3b6ae7db8adffaaa4bffc6099dcbd50' - 'a8a962370cd0128465d514e6a1f74130' - 'd5732ffdb3488e1383d4ea199343e767' - '3807d07215d9116331fe1cf8feeaa0f8') build() { cd ${srcdir} @@ -90,7 +70,7 @@ package() { # # setup /usr hierarchy # - for d in bin include lib sbin share/misc src; do + for d in bin include lib share/misc src; do install -d -m755 usr/${d} done for d in $(seq 8); do @@ -112,6 +92,13 @@ package() { ) # + # add bin symlinks + # + ln -s usr/bin ${pkgdir}/bin + ln -s usr/bin ${pkgdir}/sbin + ln -s bin ${pkgdir}/usr/sbin + + # # install parabola(7) manpage # install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7 @@ -124,3 +111,23 @@ package() { done ln -s ../man usr/local/share/man } +md5sums=('7b8e40f8f793e60f471511641bb1c9f2' + '6be47d893fd49b2e4a8c0e811b350861' + '9e4533df61f0c82d6b2e2371f7376282' + '4c4540eeb748bf1f71d631b8c1dcf0b3' + 'f28150d4c0b22a017be51b9f7f9977ed' + '6e488ffecc8ba142c0cf7e2d7aeb832e' + '1cfd310dff0804a7d21958487c32a3b1' + '2ef2429c2c98d0883906aa6f5363be80' + '693c97f2c9a519bb97a17008e92c2b74' + '1745349eb24ed21b4cfaa6f423bddb76' + '7bc65f234dfb6abf24e7c3b03e86f4ff' + 'd41d8cd98f00b204e9800998ecf8427e' + '0e145e18fea8fd190b30d45764f5707c' + '6f48288b6fcaf0065fcb7b0e525413e0' + '22518e922891f9359f971f4f5b4e793c' + 'f45389e116ab0b9e9968287617d27c7d' + '0b6f835598c7640184e476057b3c7722' + 'a8a962370cd0128465d514e6a1f74130' + 'd5732ffdb3488e1383d4ea199343e767' + '3807d07215d9116331fe1cf8feeaa0f8') diff --git a/libre/filesystem/profile b/libre/filesystem/profile index 3bc22db9f..59d0abc83 100644 --- a/libre/filesystem/profile +++ b/libre/filesystem/profile @@ -4,7 +4,7 @@ umask 022 # Set our default path -PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin" +PATH="/usr/local/sbin:/usr/local/bin:/usr/bin" export PATH # Load profiles from /etc/profile.d diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD index 6c2afd3a8..dd7940c2c 100644 --- a/libre/grub-legacy/PKGBUILD +++ b/libre/grub-legacy/PKGBUILD @@ -7,7 +7,7 @@ pkgname=grub-legacy _srcname=grub pkgver=0.97 -pkgrel=24 +pkgrel=25 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)" arch=('i686' 'x86_64') license=('GPL') @@ -80,10 +80,10 @@ build() { patch -Np1 -i ../040_all_grub-0.96-nxstack.patch # patch from frugalware to make it boot when more than 2GB ram installed patch -Np1 -i ../05-grub-0.97-initrdaddr.diff - CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ + CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \ --mandir=/usr/share/man --infodir=/usr/share/info else - CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \ + CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \ --mandir=/usr/share/man --infodir=/usr/share/info fi } @@ -94,6 +94,6 @@ package() { CFLAGS= make make DESTDIR=${pkgdir} install install -D -m644 ../menu.lst ${pkgdir}/boot/grub/menu.lst - install -D -m755 ../install-grub ${pkgdir}/sbin/install-grub + install -D -m755 ../install-grub ${pkgdir}/usr/bin/install-grub } diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD index 652e75691..2f765ad13 100644 --- a/pcr/mosquitto/PKGBUILD +++ b/pcr/mosquitto/PKGBUILD @@ -4,22 +4,27 @@ pkgname=mosquitto pkgver=1.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="An Open Source MQTT v3.1 Broker" arch=('i686' 'x86_64' 'arm' 'armv6h' 'mips64el') url="http://mosquitto.org/" makedepends=('python') optdepends=('python: python support') license=('BSD') -source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" ) +source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" + "binmerge.patch") md5sums=('fd0cae17221d778b0a002c31e6c3de9e' 'SKIP' - 'b7cdd7a65d9a7ac5a8c2456f4b1f2d8f') + '58af79ed48be928f91e5435cda82bb8b' + '27e24b672d63b797f0e026ab85c64c4b') + +prepare() { + cd "$srcdir/$pkgname-$pkgver/src" + patch -N -i ${srcdir}/binmerge.patch +} build() { cd "$srcdir/$pkgname-$pkgver" - #Remove hardcoded prefix - find -name Makefile -exec sed '/prefix=/d' -i {} \; make prefix=/usr } diff --git a/pcr/mosquitto/binmerge.patch b/pcr/mosquitto/binmerge.patch new file mode 100644 index 000000000..d6d79041d --- /dev/null +++ b/pcr/mosquitto/binmerge.patch @@ -0,0 +1,21 @@ +--- src/Makefile.orig 2013-06-03 12:23:15.288586121 -0300 ++++ src/Makefile 2013-06-03 12:23:29.455571403 -0300 +@@ -90,15 +90,15 @@ + ${CC} $(CFLAGS) ${CPPFLAGS} -c $< -o $@ + + install : all +- $(INSTALL) -d ${DESTDIR}$(prefix)/sbin +- $(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto ++ $(INSTALL) -d ${DESTDIR}$(prefix)/bin ++ $(INSTALL) -s mosquitto ${DESTDIR}${prefix}/bin/mosquitto + $(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h + ifeq ($(WITH_TLS),yes) + $(INSTALL) -s mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd + endif + + uninstall : +- -rm -f ${DESTDIR}${prefix}/sbin/mosquitto ++ -rm -f ${DESTDIR}${prefix}/bin/mosquitto + -rm -f ${DESTDIR}${prefix}/include/mosquitto_plugin.h + -rm -f ${DESTDIR}${prefix}/bin/mosquitto_passwd + diff --git a/pcr/mosquitto/mosquitto.service b/pcr/mosquitto/mosquitto.service index 7e9ef7cc8..9626cbc45 100644 --- a/pcr/mosquitto/mosquitto.service +++ b/pcr/mosquitto/mosquitto.service @@ -12,9 +12,9 @@ Requires=network.target [Service] Type=forking -ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf -d -ExecStartPre=/bin/rm -f /var/run/mosquitto.pid -PIDFile=/var/run/mosquitto.pid +ExecStart=/usr/bin/mosquitto -c /etc/mosquitto/mosquitto.conf -d +ExecStartPre=/usr/bin/rm -f /run/mosquitto.pid +PIDFile=/run/mosquitto.pid Restart=on-abort [Install] |