diff options
author | root <root@rshg054.dnsready.net> | 2012-05-06 00:02:44 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-05-06 00:02:44 +0000 |
commit | f37e773fe397778858ea8d51601554863c252536 (patch) | |
tree | 9997e525a9baeb85d09bd8e0c12e750781810755 | |
parent | 5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff) |
Sun May 6 00:02:43 UTC 2012
78 files changed, 998 insertions, 393 deletions
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD index 752adeaf5..04df57b4f 100644 --- a/community/cdfs/PKGBUILD +++ b/community/cdfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69163 2012-04-09 22:08:34Z spupykin $ +# $Id: PKGBUILD 70326 2012-05-04 17:03:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> pkgname=cdfs pkgver=2.6.27 -pkgrel=20 +pkgrel=21 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/community/e4rat/PKGBUILD b/community/e4rat/PKGBUILD index 4055dd567..3bc3a883b 100644 --- a/community/e4rat/PKGBUILD +++ b/community/e4rat/PKGBUILD @@ -1,31 +1,25 @@ -# $Id: PKGBUILD 69434 2012-04-16 10:26:17Z mtorromeo $ +# $Id: PKGBUILD 70306 2012-05-04 08:21:46Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: graysky <graysky AT archlinux DOT us> pkgname=e4rat -pkgver=0.2.2 +pkgver=0.2.3 pkgrel=1 pkgdesc="Toolset to accelerate the boot process and application startups for systems with ext4 root partitions." arch=('i686' 'x86_64') url="http://e4rat.sourceforge.net/" license=('GPL') -depends=('e2fsprogs' 'util-linux') +depends=('e2fsprogs') makedepends=('audit' 'boost' 'cmake') options=(!strip) backup=(etc/e4rat.conf) -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz e4rat-static_core.patch) -md5sums=('dada998e857794dc7f76ffc887e04c19' - '9432ac4a8658812828d90b2676e8519f') -sha256sums=('ec40740ac05fb0470edd682232fb6c7be0bb57420b70f6c39d1df234753f3ec9' - '9381d3cee3c24de8b1df9a4c4d626a2d9d20bad695133e3dcecc9f0a8277880a') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz) build() { cd "$srcdir/$pkgname-$pkgver" - patch -p0 -i "$srcdir/e4rat-static_core.patch" unset LDFLAGS - sed -i '/stdlib.h/a #include <unistd.h>' src/fiemap.cc - cmake -DCMAKE_BUILD_TYPE=Release . + cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_CORE_LIBRARY_STATIC=true . make } @@ -35,3 +29,6 @@ package() { make DESTDIR="$pkgdir" install install -dm755 "$pkgdir/var/lib/$pkgname" } + +md5sums=('e8e7db69018036f11d509b65c32d3ea4') +sha256sums=('f6feda9618eff0f9442baf771b4776b634e5a2f39e678c10e4c7946b2c6a96a0') diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD index 1e1ed1b53..8cd135b78 100644 --- a/community/ecryptfs-utils/PKGBUILD +++ b/community/ecryptfs-utils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66344 2012-02-23 20:45:16Z tredaelli $ +# $Id: PKGBUILD 70347 2012-05-04 23:54:39Z allan $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Richard Murri <admin@richardmurri.com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=ecryptfs-utils pkgver=96 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" url="https://launchpad.net/ecryptfs" @@ -18,7 +18,7 @@ md5sums=('4f92c9f6e8f62ac00ca7e2c4e480f1d7') build() { cd "$srcdir/${pkgname}-${pkgver}" - ./configure --prefix=/usr PYTHON=python2 + ./configure --prefix=/usr --with-pamdir=/usr/lib/security PYTHON=python2 make } diff --git a/community/libtorrent/PKGBUILD b/community/libtorrent/PKGBUILD index a15316f09..216607e42 100644 --- a/community/libtorrent/PKGBUILD +++ b/community/libtorrent/PKGBUILD @@ -1,18 +1,19 @@ -# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: sh__ pkgname=libtorrent -pkgver=0.12.9 +pkgver=0.13.2 pkgrel=1 -pkgdesc='BitTorrent library written in C++' +pkgdesc='BitTorrent library with a focus on high performance and good code' url='http://libtorrent.rakshasa.no/' license=('GPL') arch=('i686' 'x86_64') depends=('libsigc++2.0' 'openssl') options=('!libtool') source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz") -sha1sums=('176a836c6e685e4dad71ac08c0e09caaa5b7757c') +sha1sums=('4f34a744fbe10c54aaf53d34681fabc1a49d7257') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 9d9c06e8c..0178a38c6 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70146 2012-04-30 19:17:20Z tdziedzic $ +# $Id: PKGBUILD 70343 2012-05-04 22:20:32Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -7,7 +7,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.6.16 +pkgver=0.6.17 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('e056d180d1ae50e615aab800b93a95bd') +md5sums=('55641d5d280cdd4e0c030c203107599d') build() { cd node-v${pkgver} diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index b51bf7aab..c01c7e4f1 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 69764 2012-04-23 09:16:01Z ibiru $ +# $Id: PKGBUILD 70349 2012-05-04 23:55:01Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools pkgver=2012.03.13 _pkgsubver=651368 -pkgrel=2 +pkgrel=4 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" arch=('i686' 'x86_64') url="http://open-vm-tools.sourceforge.net/" license=('LGPL') -depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps' 'uriparser' 'libsigc++' 'libxss') +depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps-ng' 'uriparser' 'libsigc++' 'libxss') makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst') optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm') options=('docs' '!libtool') @@ -31,35 +31,35 @@ md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7' '79b0a14d86191fee70a4639da8bd7785' '67cb83a9e5a4dd016c1a1da2863ca36d' 'b55d15e2c4be396aad709aeca91033d3' - '73cc1a2665b0dd62427733d62ead8b9a' + '1b9ae908fce4c623269f100ee9bdfdef' '75a25d83417e683957321f97a00f8465') build() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules + [ -f Makefile ] || CUSTOM_PROCPS_NAME="procps" ./configure --prefix=/usr --without-kernel-modules make } package() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - make install DESTDIR=$pkgdir - install -D -m 755 scripts/common/vmware-xdg-detect-de $pkgdir/usr/bin/vmware-xdg-detect-de - chmod 07755 $pkgdir/usr/bin/vmware-user-suid-wrapper + make install DESTDIR="$pkgdir" + install -D -m 755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de + chmod 07755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper - cd $pkgdir - patch -p1 -i $srcdir/scripts-network.patch etc/vmware-tools/scripts/vmware/network - patch -p1 -i $srcdir/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network + cd "$pkgdir" + patch -p1 -i "$srcdir"/scripts-network.patch etc/vmware-tools/scripts/vmware/network + patch -p1 -i "$srcdir"/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network - install -D -m 755 $srcdir/open-vm-tools.rc.d $pkgdir/etc/rc.d/open-vm-tools - install -D -m 644 $srcdir/open-vm-tools.conf.d $pkgdir/etc/conf.d/open-vm-tools - install -D -m 644 $srcdir/tools.conf $pkgdir/etc/vmware-tools/tools.conf - install -D -m 644 $srcdir/xautostart.conf $pkgdir/etc/vmware-tools/xautostart.conf - install -D -m 644 $srcdir/vmware-guestd $pkgdir/etc/pam.d/vmware-guestd - rm -rf $pkgdir/usr/etc + install -D -m 755 "$srcdir"/open-vm-tools.rc.d "$pkgdir"/etc/rc.d/open-vm-tools + install -D -m 644 "$srcdir"/open-vm-tools.conf.d "$pkgdir"/etc/conf.d/open-vm-tools + install -D -m 644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf + install -D -m 644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf + install -D -m 644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd + rm -rf "$pkgdir"/usr/etc - ln -fs /usr/sbin/mount.vmhgfs $pkgdir/sbin/mount.vmhgfs + ln -fs /usr/sbin/mount.vmhgfs "$pkgdir"/sbin/mount.vmhgfs - cd $pkgdir && find -type f -exec sh -c "file {} | grep ELF >/dev/null && echo {} && chrpath -d {}" \; + cd "$pkgdir" && find -type f -exec sh -c "file {} | grep ELF >/dev/null && echo {} && chrpath -d {}" \; } diff --git a/community/open-vm-tools/vmware-guestd b/community/open-vm-tools/vmware-guestd index ac80c0385..f8ea34fc0 100644 --- a/community/open-vm-tools/vmware-guestd +++ b/community/open-vm-tools/vmware-guestd @@ -1,6 +1,6 @@ #%PAM-1.0 -auth sufficient /lib/security/pam_unix2.so shadow nullok -auth required /lib/security/pam_unix_auth.so shadow nullok -account sufficient /lib/security/pam_unix2.so -account required /lib/security/pam_unix_acct.so +auth sufficient pam_unix2.so shadow nullok +auth required pam_unix_auth.so shadow nullok +account sufficient pam_unix2.so +account required pam_unix_acct.so diff --git a/community/openbsd-netcat/PKGBUILD b/community/openbsd-netcat/PKGBUILD index bcd294ade..afa9b3644 100644 --- a/community/openbsd-netcat/PKGBUILD +++ b/community/openbsd-netcat/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69318 2012-04-13 16:10:15Z spupykin $ +# $Id: PKGBUILD 70324 2012-05-04 10:32:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname="openbsd-netcat" pkgver=1.105 -pkgrel=2 -_patch=4 +pkgrel=3 +_patch=6 pkgdesc="TCP/IP swiss army knife. OpenBSD variant." arch=('i686' 'x86_64') url="http://packages.debian.org/sid/netcat-openbsd" @@ -15,7 +15,7 @@ makedepends=('gcc' 'make') source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}.orig.tar.gz" "http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${_patch}.debian.tar.gz") md5sums=('7e67b22f1ad41a1b7effbb59ff28fca1' - '76b88083b77eb2e6f014cdb3020a96ac') + '1928b269b86d404ffb8ff57d3ead1d2c') build() { cd $srcdir/netcat-openbsd-${pkgver} diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index c3a38cdf8..f0ca5cfa1 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 68034 2012-03-17 05:42:53Z svenstaro $ +# $Id: PKGBUILD 70334 2012-05-04 17:47:24Z svenstaro $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio -_pkgname=OpenImageIO -pkgver=1.0.1 -pkgrel=2 +pkgver=1.0.4 +pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications." arch=(i686 x86_64) url="http://www.openimageio.org/" @@ -14,8 +13,8 @@ depends=('openexr' 'boost-libs' 'jasper' 'glew') makedepends=('cmake' 'qt' 'python2' 'boost') optdepends=('qt: iv image viewer' 'python2: bindings support') -source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}") -md5sums=('5b74d7bda23f4b0e33c5104fd8dbdf79') +source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) +md5sums=('2114f40a6015d2ba4d36fc18620f2edb') build() { cd "$srcdir"/$_pkgname*/src diff --git a/community/pam-krb5/PKGBUILD b/community/pam-krb5/PKGBUILD index 7ad0ed1d4..85c53eff2 100644 --- a/community/pam-krb5/PKGBUILD +++ b/community/pam-krb5/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66533 2012-02-25 23:48:00Z lfleischer $ +# $Id: PKGBUILD 70351 2012-05-04 23:55:05Z allan $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Ryan Corder <ryanc@greengrey.org> pkgname=pam-krb5 pkgver=4.5 -pkgrel=1 +pkgrel=2 pkgdesc='A PAM module providing Kerberos v5 support.' arch=('i686' 'x86_64') url='http://www.eyrie.org/~eagle/software/pam-krb5/' @@ -17,7 +17,8 @@ md5sums=('5736795225cf7f84718af42a15570fe0') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ - --enable-reduced-depends + --enable-reduced-depends \ + --libdir=/usr/lib make } diff --git a/community/pam_mysql/PKGBUILD b/community/pam_mysql/PKGBUILD index ebd070a28..42cefbd84 100644 --- a/community/pam_mysql/PKGBUILD +++ b/community/pam_mysql/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64780 2012-02-18 04:39:54Z svenstaro $ +# $Id: PKGBUILD 70353 2012-05-04 23:55:09Z allan $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arjan Timmerman<arjan@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=pam_mysql pkgver=0.7RC1 -pkgrel=5 +pkgrel=6 pkgdesc="A PAM module to authenticate users against mysql." arch=(i686 x86_64) license=('GPL') @@ -18,7 +18,7 @@ build() { cd $srcdir/$pkgname-$pkgver sed -i 's/pam_mysql_la_LIBADD = /pam_mysql_la_LIBADD = -lpam/g' Makefile.in - ./configure --prefix=/usr + ./configure --prefix=/usr --with-pam-mods-dir=/usr/lib/security make } diff --git a/community/pam_pwcheck/PKGBUILD b/community/pam_pwcheck/PKGBUILD index 7ef36f88c..84fc7be25 100644 --- a/community/pam_pwcheck/PKGBUILD +++ b/community/pam_pwcheck/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61543 2012-01-02 13:40:06Z spupykin $ +# $Id: PKGBUILD 70355 2012-05-04 23:55:13Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pam_pwcheck pkgver=3.9 -pkgrel=3 +pkgrel=4 pkgdesc="A password strength checking module for PAM-aware password changing programs" arch=(i686 x86_64) url="http://www.thkukuk.de/pam/pam_pwcheck/" @@ -14,7 +14,7 @@ md5sums=('27be63338af88d14610d182b6a161cd1') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib make make DESTDIR=$pkgdir install } diff --git a/community/qingy/PKGBUILD b/community/qingy/PKGBUILD index c55dc7dae..c077229c8 100644 --- a/community/qingy/PKGBUILD +++ b/community/qingy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68162 2012-03-18 19:39:54Z ebelanger $ +# $Id: PKGBUILD 70357 2012-05-04 23:55:21Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qingy pkgver=1.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="A DirectFB getty replacement" arch=('i686' 'x86_64') url="http://qingy.sourceforge.net/" @@ -21,6 +21,7 @@ md5sums=('1e0912655e240adfd0ce5ced30bbc685' build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|/lib/security/||' media/pam/default/qingy XFREE=/usr/bin/Xorg XINIT=/usr/bin/xinit \ ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \ --disable-optimizations --enable-pam \ diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index a46b4422d..29b1f109f 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70007 2012-04-28 09:18:17Z spupykin $ +# $Id: PKGBUILD 70310 2012-05-04 09:33:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.4.11 -pkgrel=2 +pkgver=2.4.13 +pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') url="http://redis.io/" @@ -18,8 +18,8 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('ccd193d80196855343840db6110bf58d' - '9d58bcc2bc0e193353206c608e71f5d6' +md5sums=('f8a160f8a6fe7d7e8ebb4c23ff583d71' + '4f2c02b481283d1336508c988e60e8d8' '9e2d75b7a9dc421122d673fe520ef17f') build() { diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD index 76335d7d6..290e46ab1 100644 --- a/community/remmina/PKGBUILD +++ b/community/remmina/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 69472 2012-04-16 15:12:51Z spupykin $ +# $Id: PKGBUILD 70316 2012-05-04 09:53:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=remmina pkgver=1.0.0 -pkgrel=5 +pkgrel=6 pkgdesc="Remmina is a remote desktop client written in GTK+. " arch=(i686 x86_64) url="http://remmina.sourceforge.net/" license=('GPL') -depends=('gtk2' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp' 'libgnome-keyring') +depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp' 'libgnome-keyring') makedepends=('intltool' 'pkgconfig' 'cmake' 'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib') -optdepends=('avahi' - 'libxkbfile' +optdepends=('libxkbfile' 'freerdp' 'telepathy-glib' 'gnome-keyring') replaces=('remmina-plugins') -provides=("grdc" "grdc=$pkgver" 'remmina-plugins') -conflicts=("grdc") +provides=('remmina-plugins') install=remmina.install source=(https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz 'https://github.com/FreeRDP/Remmina/commit/569d9bb702d06c061dfbbf3c590d57ea83a04369.diff' @@ -32,7 +30,7 @@ build() { patch -p1 -i "${srcdir}/569d9bb702d06c061dfbbf3c590d57ea83a04369.diff" patch -p1 -i "${srcdir}/f7d1038ba358a295fb46c681db5c47e4ead97306.diff" export LDFLAGS="-lX11 -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lpthread -lgnutls" - cmake -DWITH_APPINDICATOR=OFF -DCMAKE_INSTALL_PREFIX=/usr . + cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_APPINDICATOR=OFF . make make DESTDIR=${pkgdir} install } diff --git a/community/rtorrent/PKGBUILD b/community/rtorrent/PKGBUILD index 0f387097d..393373fa4 100644 --- a/community/rtorrent/PKGBUILD +++ b/community/rtorrent/PKGBUILD @@ -1,17 +1,18 @@ -# Maintainer: Daenyth <Daenyth [at] gmail [dot] com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Daenyth <Daenyth [at] gmail [dot] com> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: sh__ pkgname=rtorrent -pkgver=0.8.9 -pkgrel=2 +pkgver=0.9.2 +pkgrel=1 pkgdesc='Ncurses BitTorrent client based on libTorrent' url='http://libtorrent.rakshasa.no/' license=('GPL') arch=('i686' 'x86_64') -depends=('libtorrent=0.12.9' 'curl' 'xmlrpc-c') +depends=('libtorrent=0.13.2' 'curl' 'xmlrpc-c') source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz") -sha1sums=('0ac51c185e98b5a386e5f1a07bca9a9963e2d6ce') +sha1sums=('2a642d722745091265037ed8929a23c237a3b99f') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -19,7 +20,7 @@ build() { export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" ./configure \ --prefix=/usr \ - --enable-debug \ + --disable-debug \ --with-xmlrpc-c \ make diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD index e177e74f5..b6e38ec35 100644 --- a/core/acl/PKGBUILD +++ b/core/acl/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $ +# $Id: PKGBUILD 158574 2012-05-05 00:02:35Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> + pkgname=acl pkgver=2.2.51 -pkgrel=1 +pkgrel=2 pkgdesc="Access control list utilities, libraries and headers" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/acl" @@ -12,23 +13,22 @@ replaces=('xfsacl') provides=('xfsacl') conflicts=('xfsacl') options=('!libtool') -source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) -sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225') +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) +sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225' + '10893e2a044905acc88e2d98291e739b7b858b36c836ff66a3532909964067ce') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd "$pkgname-$pkgver" - export INSTALL_USER=root INSTALL_GROUP=root - ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib - make + export INSTALL_USER=root INSTALL_GROUP=root + ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DIST_ROOT="${pkgdir}" install install-lib install-dev + make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev # tidy up - rm -f ${pkgdir}/lib/libacl.a - chmod 0755 ${pkgdir}/lib/libacl.so.*.*.* + rm -f "$pkgdir"/usr/lib/libacl.a + chmod 0755 "$pkgdir"/usr/lib/libacl.so.*.*.* } diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD index 30f3ad81a..5fb0a8ed0 100644 --- a/core/attr/PKGBUILD +++ b/core/attr/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 123916 2011-05-14 10:31:07Z thomas $ +# $Id: PKGBUILD 158576 2012-05-05 00:02:37Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> + pkgname=attr pkgver=2.4.46 -pkgrel=1 +pkgrel=2 pkgdesc="Extended attribute support library for ACL support" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/attr" @@ -13,25 +14,25 @@ replaces=('xfsattr') provides=('xfsattr') conflicts=('xfsattr') options=('!libtool') -source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.src.tar.gz) -sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f') +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) +sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f' + 'a8ee37a0d02c0365049b8a06dc6963e6698a448ff2c0a54ed040f0c60f27bca3') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - + cd "$pkgname-$pkgver" + export INSTALL_USER=root INSTALL_GROUP=root - ./configure --prefix=/usr --libdir=/lib --libexecdir=/usr/lib + ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} - - make DIST_ROOT="${pkgdir}" install install-lib install-dev + make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev # tidy up - rm -f "${pkgdir}"/lib/libattr.a - chmod 0755 "${pkgdir}"/lib/libattr.so.*.*.* + rm -f "$pkgdir"/usrlib/libattr.a + chmod 0755 "$pkgdir"/usr/lib/libattr.so.*.*.* + # remove conflicting manpages - rm -rf "${pkgdir}"/usr/share/man/man2 + rm -rf "$pkgdir"/usr/share/man/man2 } diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index ce6144e17..88ad6cc9a 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150888 2012-02-23 13:53:54Z allan $ +# $Id: PKGBUILD 158615 2012-05-05 03:17:06Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda pkgver=1.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64) url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" @@ -18,7 +18,6 @@ md5sums=('5226f65aebacf94baaf820f8b4e06df4' 'c1f7aff29f15a0364ae6f7905a1d4ae6') build() { - msg "Compiling crda ..." cd "${srcdir}"/${pkgname}-${pkgver} patch -Np1 -i "$srcdir/libnl32.patch" sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py @@ -27,15 +26,12 @@ build() { package() { # Install crda, regdbdump and udev rules - msg "Installing crda ..." cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ install # This rule automatically sets the regulatory domain when cfg80211 is loaded - echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/lib/udev/rules.d/85-regulatory.rules + echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules - msg "Installing license ..." install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE - msg "Installing boot script ..." install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom } diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index 5af91a2ec..5463a65c9 100644 --- a/core/dmraid/PKGBUILD +++ b/core/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129977 2011-06-30 18:03:08Z thomas $ +# $Id: PKGBUILD 158621 2012-05-05 03:20:12Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=2 +pkgrel=4 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -17,23 +17,23 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 dmraid_hook) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - 'bf6c61a11dbbb40d5152835075c9f438' - '2a1ef82fb32f065ee560dceef736475e') + '832ed57a0f7ca6ba72adebcba2b17f87' + 'faec669dc85f87187b45b5d3968efe2c') build() { - cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname + cd "$pkgname/1.0.0.rc16-3/$pkgname" ./configure --enable-led --enable-intel_led make } package() { - cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname - make DESTDIR="$pkgdir" prefix=/ libdir=/lib mandir=/usr/share/man includedir=/usr/include install + cd "$pkgname/1.0.0.rc16-3/$pkgname" + make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install mkdir -p "$pkgdir"/var/lock/dmraid chmod 1777 "$pkgdir"/var/lock/ - install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/lib/initcpio/install/dmraid - install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/lib/initcpio/hooks/dmraid + install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid + install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid # fix permissions - chmod 644 "$pkgdir"/lib/libdmraid.a + chmod 644 "$pkgdir"/usr/lib/libdmraid.a chmod 644 "$pkgdir"/usr/include/dmraid/* } diff --git a/core/dmraid/dmraid_hook b/core/dmraid/dmraid_hook index 6219a718a..37283e83e 100644 --- a/core/dmraid/dmraid_hook +++ b/core/dmraid/dmraid_hook @@ -1,19 +1,14 @@ -# vim: set ft=sh: -run_hook () -{ - /sbin/modprobe -q dm-mod >/dev/null 2>&1 - /sbin/modprobe -q dm-mirror >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - mkdir /dev/mapper - mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi - msg ":: Activating dmraid arrays..." - # prevent any event monitoring calls with -I - if [ "${quiet}" = "y" ]; then - /sbin/dmraid -ay -I -Z >/dev/null - else - /sbin/dmraid -ay -I -Z - fi +#!/usr/bin/ash + +run_hook() { + modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1 + msg ":: Activating dmraid arrays..." + # prevent any event monitoring calls with -I + if [ "$quiet" = "y" ]; then + dmraid -ay -I -Z >/dev/null + else + dmraid -ay -I -Z fi } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/dmraid/dmraid_install b/core/dmraid/dmraid_install index eeb9e0893..c48e6ceaf 100644 --- a/core/dmraid/dmraid_install +++ b/core/dmraid/dmraid_install @@ -1,19 +1,19 @@ -# vim: set ft=sh: +#!/bin/bash -build() -{ +build() { MODULES=" dm-mod dm-mirror " - BINARIES="/sbin/dmraid /sbin/dmsetup" - FILES="" + BINARIES="dmraid dmsetup" SCRIPT="dmraid" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" + + 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" } -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for a dmraid root device. +help() { + cat <<HELPEOF +This hook loads the necessary modules for a dmraid root device. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD index 96482c2ba..99d938bfe 100644 --- a/core/libcap/PKGBUILD +++ b/core/libcap/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 151511 2012-02-27 01:00:35Z allan $ +#$Id: PKGBUILD 158556 2012-05-04 23:56:45Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libcap pkgver=2.22 -pkgrel=2 +pkgrel=3 pkgdesc="POSIX 1003.1e capabilities" arch=('i686' 'x86_64') url="http://sites.google.com/site/fullycapable/" @@ -21,7 +21,11 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} - make prefix=/usr DESTDIR=${pkgdir} LIBDIR=${pkgdir}/lib RAISE_SETFCAP=no install - rm ${pkgdir}/lib/*.a - chmod 755 ${pkgdir}/lib/libcap.so.${pkgver} + make prefix=/usr DESTDIR=${pkgdir} RAISE_SETFCAP=no install + + chmod 755 ${pkgdir}/usr/lib/libcap.so.${pkgver} + rm ${pkgdir}/usr/lib/libcap.a + + install -Dm644 pam_cap/capability.conf \ + $pkgdir/usr/share/doc/$pkgname/capability.conf.example } diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD index e8aaf626f..745bbd929 100644 --- a/core/linux-atm/PKGBUILD +++ b/core/linux-atm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142964 2011-11-19 08:22:13Z tpowa $ +# $Id: PKGBUILD 158611 2012-05-05 03:12:24Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Surain Mallawa Arachchi <mas@crc32.net> pkgname=linux-atm pkgver=2.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Drivers and tools to support ATM networking under Linux." arch=('i686' 'x86_64') depends=('glibc') @@ -19,6 +19,10 @@ md5sums=('d49499368c3cf15f73a05d9bce8824a8' build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i ../man-pages.patch + + # install firmware in /usr/lib + sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in + ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 061fd9f6d..82b034a36 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157942 2012-04-30 07:17:54Z tpowa $ +# $Id: PKGBUILD 158626 2012-05-05 03:23:11Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -19,16 +19,7 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm_hook mdadm_udev_install disable-werror.patch) - -install=mdadm.install replaces=('raidtools') -md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f' - '6df172c8f77b280018cf87eb3d313f29' - '00cbed931db4f15b6ce49e3e7d433966' - '9b01e96b6c3c218fb61628c9281fe688' - 'c8c0713f5c7da51822ee6f3911473a1c' - 'cd258e1bf430c02a25f40b4329df9f57' - '4ad87b74a4bc9a34621280abe0e0c3e4') build() { cd $srcdir/$pkgname-$pkgver @@ -50,4 +41,14 @@ package() { install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev # symlink for backward compatibility ln -sf /usr/lib/initcpio/hooks/mdadm $pkgdir/usr/lib/initcpio/hooks/raid + # move /lib/* to /usr/lib/ + mv $pkgdir/lib/udev $pkgdir/usr/lib/ + rm -rf $pkgdir/lib } +md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f' + '8333d405f550317c2bacd5510bf1cb60' + '00cbed931db4f15b6ce49e3e7d433966' + '9b01e96b6c3c218fb61628c9281fe688' + 'fbb5542d9bdf87441a11dd7e7a0a17f8' + '2318b99701dba9b01a6891c62be7bc1c' + '4ad87b74a4bc9a34621280abe0e0c3e4') diff --git a/core/mdadm/mdadm b/core/mdadm/mdadm index e196f3642..9bf468e98 100755 --- a/core/mdadm/mdadm +++ b/core/mdadm/mdadm @@ -3,28 +3,33 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /sbin/mdadm` -case "$1" in +pidfile=/run/mdadm.pid +if [[ -r $pidfile ]]; then + read -r PID <"$pidfile" + if [[ $PID && ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + +case $1 in start) stat_busy "Starting mdadm RAID Monitor" - if [ -z "$PID" ]; then - /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else + if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then add_daemon mdadm stat_done + else + stat_fail fi ;; stop) stat_busy "Stopping mdadm RAID Monitor" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else + if [[ $PID ]] && kill "$PID" &>/dev/null; then rm_daemon mdadm stat_done + else + stat_fail fi ;; restart) @@ -33,5 +38,5 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook index 7b2dc1ad1..787be5d0c 100755 --- a/core/mdadm/mdadm_hook +++ b/core/mdadm/mdadm_hook @@ -1,44 +1,49 @@ -# vim: set ft=sh: -run_hook () -{ - input="$(cat /proc/cmdline)" - mdconfig="/etc/mdadm.conf" +#!/usr/bin/ash + +run_hook() { + local i= mdconfig=/etc/mdadm.conf + # for partitionable raid, we need to load md_mod first! modprobe md_mod 2>/dev/null - # If md is specified on commandline, create config file from those parameters. - if [ "$(echo $input | grep "md=")" ]; then - #Create initial mdadm.conf - # scan all devices in /proc/partitions - echo DEVICE partitions > $mdconfig - for i in $input; do + + if [ -n "$md" ]; then + echo 'DEVICE partitions' >"$mdconfig" + for i in $(cat /proc/cmdline); do case $i in - # raid + # raid md=[0-9]*,/*) - device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device devices=$array" >> $mdconfig + device=${i%%,*} + device=${device/=/} + array=${i#*,} + echo "ARRAY /dev/$device devices=$array" ;; # partitionable raid md=d[0-9]*,/*) - device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device devices=$array" >> $mdconfig + device=${i%%,*} + device=${device/=/_} + array=${i#*,} + echo "ARRAY /dev/$device devices=$array" ;; - # raid UUID - md=[0-9]*,[0-9,a-z]*) - device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + # raid UUID + md=[0-9]*,[0-9,a-fA-F]*) + device=${i%%,*} + device=${device/=/} + array=${i#*,} + echo "ARRAY /dev/$device UUID=$array" ;; # partitionable raid UUID - md=d[0-9]*,[0-9,a-z]*) - device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + md=d[0-9]*,[0-9,a-fA-F]*) + device=${i%%,*} + device=${device/=/_} + array=${i#*,} + echo "ARRAY /dev/$device UUID=$array" ;; - esac - done + esac + done >>"$mdconfig" fi + # assemble everything - [ -e $mdconfig ] && /sbin/mdassemble + [ -s "$mdconfig" ] && /sbin/mdassemble } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install index 9fc161624..be653fc74 100644 --- a/core/mdadm/mdadm_udev_install +++ b/core/mdadm/mdadm_udev_install @@ -1,23 +1,22 @@ -# vim: set ft=sh: +#!/bin/bash + +build() { + MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-")" -build() -{ - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " - BINARIES="" - FILES="" - SCRIPT="" # check if a custom mdadm.conf exists - if grep -q ^ARRAY /etc/mdadm.conf; then + if grep -qw ^ARRAY "$BASEDIR/etc/mdadm.conf"; then echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi - add_binary "/sbin/mdadm" - add_file "/lib/udev/rules.d/64-md-raid.rules" + + add_binary "mdadm" + add_file "/usr/lib/udev/rules.d/64-md-raid.rules" } -help () -{ -cat<<HELPEOF +help() { + cat <<HELPEOF This hook loads raid arrays with udev. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/mkinitcpio-nfs-utils/PKGBUILD b/core/mkinitcpio-nfs-utils/PKGBUILD index 78d5c4737..0d168a62a 100644 --- a/core/mkinitcpio-nfs-utils/PKGBUILD +++ b/core/mkinitcpio-nfs-utils/PKGBUILD @@ -1,23 +1,21 @@ -# $Id: PKGBUILD 138224 2011-09-19 12:04:53Z pierre $ +# $Id: PKGBUILD 158597 2012-05-05 02:34:37Z dreisner $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-nfs-utils -pkgver=0.2 +pkgver=0.3 pkgrel=2 pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio" arch=('i686' 'x86_64') url="http://www.archlinux.org/" license=('GPL2') depends=('glibc') -source=(ftp://ftp.archlinux.org/other/mkinitcpio/${pkgname}-${pkgver}.tar.gz) -sha256sums=('3f2839f21a420cd732d34e58f84534acdb7fc29f69381dbba3f00e3424201cd3') +source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz") +sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make + make -C "$pkgname-$pkgver" } package() { - cd "$srcdir/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install } diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD index 81e8305f0..71d14e9c5 100644 --- a/core/nilfs-utils/PKGBUILD +++ b/core/nilfs-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 147682 2012-01-26 19:27:33Z ibiru $ +# $Id: PKGBUILD 158619 2012-05-05 03:17:23Z dreisner $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=nilfs-utils pkgver=2.1.1 -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=('caa7d8b7121311bd978120e2f0c45d81') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --libdir=/lib --enable-libmount + ./configure --enable-libmount make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install LDCONFIG=/bin/true } diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index c0f4b4841..f84c6413a 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146453 2012-01-11 15:21:11Z stephane $ +# $Id: PKGBUILD 158558 2012-05-04 23:56:48Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam pkgver=1.1.5 -pkgrel=2 +pkgrel=3 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') @@ -23,20 +23,24 @@ md5sums=('927ee5585bdec5256c75117e9348aa47' build() { cd $srcdir/Linux-PAM-$pkgver - ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib + ./configure --libdir=/usr/lib + make + + cd $srcdir/pam_unix2-2.6 + ./configure --libdir=/usr/lib make } package() { cd $srcdir/Linux-PAM-$pkgver - make INSTALL=/bin/install DESTDIR=$pkgdir install + make DESTDIR=$pkgdir install install -D -m644 ../other $pkgdir/etc/pam.d/other + # build pam_unix2 module # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2 cd $srcdir/pam_unix2-2.6 - ./configure - make make DESTDIR=$pkgdir install + # add the realtime permissions for audio users sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf cat >>$pkgdir/etc/security/limits.conf <<_EOT @@ -46,12 +50,14 @@ package() { @audio - nice -10 @audio - memlock 40000 _EOT + # fix some missing symlinks from old pam for compatibility - cd $pkgdir/lib/security + cd $pkgdir/usr/lib/security ln -s pam_unix.so pam_unix_acct.so ln -s pam_unix.so pam_unix_auth.so ln -s pam_unix.so pam_unix_passwd.so ln -s pam_unix.so pam_unix_session.so + # set unix_chkpwd uid chmod +s $pkgdir/sbin/unix_chkpwd } diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD new file mode 100644 index 000000000..5e45ba2e4 --- /dev/null +++ b/core/procps-ng/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 158584 2012-05-05 00:40:00Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=procps-ng +pkgver=3.3.2 +pkgrel=2 +pkgdesc="Utilities for monitoring your system and processes on your system" +arch=('i686' 'x86_64') +url="http://gitorious.org/procps" +license=('GPL' 'LGPL') +groups=('base') +depends=('ncurses') +conflicts=('procps') +provides=('procps') +replaces=('procps') +backup=('etc/sysctl.conf') +options=('!libtool') +source=(http://gitorious.org/procps/procps/archive-tarball/v${pkgver} sysctl.conf + sysctl_man.patch includes_restrict.patch gnu-kbsd-version.patch + complain_unmounted_proc.patch sig_printf_literal.patch + makefile_watch_ncurses.patch) +sha1sums=('889692f891e790ea035315ec321cce92d00a8db2' + 'ddf0dab2e3612d44903fc02f46316cabbec4651e' + '39d6562b83389ec4893de88ec88222f7169fa732' + 'd588825497fef0b057491377421fd8f68730d181' + '9eb2bb32a13656b5d671f9cffed3094399a26048' + 'bf57f5a1f54a0f4a6d9e99d66b8e447225c3371d' + '25be10b456d56b8bdf6260276c60738a7d76a34d' + '9fc24e48f902c19315e2557e4deea5592bbfad7e') + +build() { + cd "${srcdir}/procps-procps" + ./autogen.sh + patch -p1 < ../sysctl_man.patch + patch -p1 < ../includes_restrict.patch + patch -p1 < ../gnu-kbsd-version.patch + patch -p1 < ../complain_unmounted_proc.patch + patch -p1 < ../sig_printf_literal.patch + patch -p1 < ../makefile_watch_ncurses.patch + ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib + make +} + +package() { + cd "${srcdir}/procps-procps" + make DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf" +} diff --git a/core/procps-ng/complain_unmounted_proc.patch b/core/procps-ng/complain_unmounted_proc.patch new file mode 100644 index 000000000..ed932dbba --- /dev/null +++ b/core/procps-ng/complain_unmounted_proc.patch @@ -0,0 +1,17 @@ +Author: <hesso@hesso.pool.math.tu-berlin.de> +Description: Complain when /proc/version cannot be found instead of +exiting silently. +--- a/proc/version.c ++++ b/proc/version.c +@@ -33,8 +33,10 @@ + char buf[256]; + int version_string_depth; + +- if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */ ++ if ( (fp=fopen("/proc/version","r")) == NULL) { ++ fprintf(stderr, "Cannot find /proc/version - is /proc mounted?\n"); + exit(1); ++ } + if (fgets(buf, 256, fp) == NULL) { + fprintf(stderr, "Cannot read kernel version from /proc/version\n"); + fclose(fp); diff --git a/core/procps-ng/gnu-kbsd-version.patch b/core/procps-ng/gnu-kbsd-version.patch new file mode 100644 index 000000000..f310a4c93 --- /dev/null +++ b/core/procps-ng/gnu-kbsd-version.patch @@ -0,0 +1,38 @@ +Author: <csmall@debian.org> +Description: Rework version parsing so its ok with other OSes +--- a/proc/version.c ++++ b/proc/version.c +@@ -28,20 +28,26 @@ + int linux_version_code; + + void init_Linux_version(void) { +- static struct utsname uts; + int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ ++ FILE *fp; ++ char buf[256]; + int version_string_depth; + +- if (uname(&uts) == -1) /* failure implies impending death */ +- exit(1); +- +- version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z); ++ if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */ ++ exit(1); ++ if (fgets(buf, 256, fp) == NULL) { ++ fprintf(stderr, "Cannot read kernel version from /proc/version\n"); ++ fclose(fp); ++ exit(1); ++ } ++ fclose(fp); ++ version_string_depth = sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z); + + if ((version_string_depth < 2) || /* Non-standard for all known kernels */ + ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */ + fprintf(stderr, /* *very* unlikely to happen by accident */ + "Non-standard uts for running kernel:\n" +- "release %s=%d.%d.%d gives version code %d\n", +- uts.release, x, y, z, LINUX_VERSION(x,y,z)); ++ "%s=%d.%d.%d gives version code %d\n", ++ buf, x, y, z, LINUX_VERSION(x,y,z)); + linux_version_code = LINUX_VERSION(x, y, z); + } diff --git a/core/procps-ng/includes_restrict.patch b/core/procps-ng/includes_restrict.patch new file mode 100644 index 000000000..417e93223 --- /dev/null +++ b/core/procps-ng/includes_restrict.patch @@ -0,0 +1,144 @@ +Author: Craig Small <csmall@debian.org> +Description: Change restrict to __restrict + procps automake defines restrict which means the binaries for procps + binaries compile. However external programs may not of defined + restrict. includes from libc6 use __restrict and if is good enough for + them, its good enough for us. + +--- a/proc/devname.h ++++ b/proc/devname.h +@@ -10,9 +10,9 @@ + #define ABBREV_TTY 2 /* remove tty */ + #define ABBREV_PTS 4 /* remove pts/ */ + +-extern unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags); ++extern unsigned dev_to_tty(char *__restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags); + +-extern int tty_to_dev(const char *restrict const name); ++extern int tty_to_dev(const char *__restrict const name); + + EXTERN_C_END + #endif +--- a/proc/escape.h ++++ b/proc/escape.h +@@ -14,10 +14,10 @@ + #define ESC_BRACKETS 0x2 // if using cmd, put '[' and ']' around it + #define ESC_DEFUNCT 0x4 // mark zombies with " <defunct>" + +-extern int escape_strlist(char *restrict dst, char *restrict const *restrict src, size_t n, int *cells); +-extern int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *maxcells); +-extern int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int *cells, unsigned flags); +-extern int escaped_copy(char *restrict dst, const char *restrict src, int bufsize, int *maxroom); ++extern int escape_strlist(char *__restrict dst, char *__restrict const *__restrict src, size_t n, int *cells); ++extern int escape_str(char *__restrict dst, const char *__restrict src, int bufsize, int *maxcells); ++extern int escape_command(char *__restrict const outbuf, const proc_t *__restrict const pp, int bytes, int *cells, unsigned flags); ++extern int escaped_copy(char *__restrict dst, const char *__restrict src, int bufsize, int *maxroom); + + EXTERN_C_END + #endif +--- a/proc/procps.h ++++ b/proc/procps.h +@@ -103,6 +103,6 @@ + #endif + + +-typedef void (*message_fn)(const char *restrict, ...) __attribute__((format(printf,1,2))); ++typedef void (*message_fn)(const char *__restrict, ...) __attribute__((format(printf,1,2))); + + #endif +--- a/proc/readproc.h ++++ b/proc/readproc.h +@@ -173,10 +173,10 @@ + // char deBug1[64]; + pid_t taskdir_user; // for threads + int did_fake; // used when taskdir is missing +- int(*finder)(struct PROCTAB *restrict const, proc_t *restrict const); +- proc_t*(*reader)(struct PROCTAB *restrict const, proc_t *restrict const); +- int(*taskfinder)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const); +- proc_t*(*taskreader)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const); ++ int(*finder)(struct PROCTAB *__restrict const, proc_t *__restrict const); ++ proc_t*(*reader)(struct PROCTAB *__restrict const, proc_t *__restrict const); ++ int(*taskfinder)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const); ++ proc_t*(*taskreader)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const); + pid_t* pids; // pids of the procs + uid_t* uids; // uids of procs + int nuid; // cannot really sentinel-terminate unsigned short[] +@@ -200,8 +200,8 @@ + int ntask; // * readproctab2 + } proc_data_t; // * when PROC_LOOSE_TASKS set + +-extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *restrict const PT); +-extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *restrict const PT); ++extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT); ++extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT); + + // Convenient wrapper around openproc and readproc to slurp in the whole process + // table subset satisfying the constraints of flags and the optional PID list. +@@ -222,12 +222,12 @@ + // only before first use. Thereafter, the library will manage such + // a passed proc_t, freeing any additional acquired memory associated + // with the previous process or thread. +-extern proc_t* readproc(PROCTAB *restrict const PT, proc_t *restrict p); +-extern proc_t* readtask(PROCTAB *restrict const PT, const proc_t *restrict const p, proc_t *restrict t); +-extern proc_t* readeither(PROCTAB *restrict const PT, proc_t *restrict x); ++extern proc_t* readproc(PROCTAB *__restrict const PT, proc_t *__restrict p); ++extern proc_t* readtask(PROCTAB *__restrict const PT, const proc_t *__restrict const p, proc_t *__restrict t); ++extern proc_t* readeither(PROCTAB *__restrict const PT, proc_t *__restrict x); + + // warning: interface may change +-extern int read_cmdline(char *restrict const dst, unsigned sz, unsigned pid); ++extern int read_cmdline(char *__restrict const dst, unsigned sz, unsigned pid); + + extern void look_up_our_self(proc_t *p); + +--- a/proc/sig.h ++++ b/proc/sig.h +@@ -16,13 +16,13 @@ + EXTERN_C_BEGIN + + /* return -1 on failure */ +-extern int signal_name_to_number(const char *restrict name); ++extern int signal_name_to_number(const char *__restrict name); + + extern const char *signal_number_to_name(int signo); + +-extern int print_given_signals(int argc, const char *restrict const *restrict argv, int max_line); ++extern int print_given_signals(int argc, const char *__restrict const *__restrict argv, int max_line); + +-extern char *strtosig(const char *restrict s); ++extern char *strtosig(const char *__restrict s); + + extern void pretty_print_signals(void); + +--- a/proc/sysinfo.h ++++ b/proc/sysinfo.h +@@ -57,11 +57,11 @@ + + #define BUFFSIZE (64*1024) + typedef unsigned long long jiff; +-extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz, +- unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout, +- unsigned *restrict intr, unsigned *restrict ctxt, +- unsigned int *restrict running, unsigned int *restrict blocked, +- unsigned int *restrict btime, unsigned int *restrict processes); ++extern void getstat(jiff *__restrict cuse, jiff *__restrict cice, jiff *__restrict csys, jiff *__restrict cide, jiff *__restrict ciow, jiff *__restrict cxxx, jiff *__restrict cyyy, jiff *__restrict czzz, ++ unsigned long *__restrict pin, unsigned long *__restrict pout, unsigned long *__restrict s_in, unsigned long *__restrict sout, ++ unsigned *__restrict intr, unsigned *__restrict ctxt, ++ unsigned int *__restrict running, unsigned int *__restrict blocked, ++ unsigned int *__restrict btime, unsigned int *__restrict processes); + + extern void meminfo(void); + +--- a/proc/wchan.h ++++ b/proc/wchan.h +@@ -6,8 +6,8 @@ + EXTERN_C_BEGIN + + extern const char * lookup_wchan(unsigned KLONG address, unsigned pid); +-extern int open_psdb(const char *restrict override); +-extern int open_psdb_message(const char *restrict override, message_fn message); ++extern int open_psdb(const char *__restrict override); ++extern int open_psdb_message(const char *__restrict override, message_fn message); + + EXTERN_C_END + diff --git a/core/procps-ng/makefile_watch_ncurses.patch b/core/procps-ng/makefile_watch_ncurses.patch new file mode 100644 index 000000000..08d70bdc7 --- /dev/null +++ b/core/procps-ng/makefile_watch_ncurses.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -383,7 +383,7 @@ + @WITH_NCURSES_TRUE@slabtop_SOURCES = slabtop.c $(top_srcdir)/lib/strutils.c + @WITH_NCURSES_TRUE@slabtop_LDADD = @NCURSES_LIBS@ + @WITH_NCURSES_TRUE@watch_SOURCES = watch.c $(top_srcdir)/lib/strutils.c +-@WITH_NCURSES_TRUE@watch_LDADD = @NCURSES_LIBS@ ++@WITH_NCURSES_TRUE@watch_LDADD = @WATCH_NCURSES_LIBS@ + kill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c + skill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c + snice_SOURCES = skill.c $(top_srcdir)/lib/strutils.c diff --git a/core/procps-ng/sig_printf_literal.patch b/core/procps-ng/sig_printf_literal.patch new file mode 100644 index 000000000..2140abf0d --- /dev/null +++ b/core/procps-ng/sig_printf_literal.patch @@ -0,0 +1,11 @@ +--- a/proc/sig.c ++++ b/proc/sig.c +@@ -257,7 +257,7 @@ + while(++i <= number_of_signals){ + int n; + n = printf("%2d %s", i, signal_number_to_name(i)); +- if(n>0 && i%7) printf(" \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n); ++ if(n>0 && i%7) printf("%s", " \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n); + else printf("\n"); + } + if((i-1)%7) printf("\n"); diff --git a/core/procps-ng/sysctl.conf b/core/procps-ng/sysctl.conf new file mode 100644 index 000000000..44906a21a --- /dev/null +++ b/core/procps-ng/sysctl.conf @@ -0,0 +1,42 @@ +# /etc/sysctl.conf - Configuration file for setting system variables +# See sysctl.conf (5) for information. + +# you can have the CD-ROM close when you use it, and open +# when you are done. +#dev.cdrom.autoeject = 1 +#dev.cdrom.autoclose = 1 + +# protection from the SYN flood attack +net.ipv4.tcp_syncookies = 1 + +# see the evil packets in your log files +#net.ipv4.conf.all.log_martians = 1 + +# if not functioning as a router, there is no need to accept redirects or source routes +#net.ipv4.conf.all.accept_redirects = 0 +#net.ipv4.conf.all.accept_source_route = 0 +#net.ipv6.conf.all.accept_redirects = 0 +#net.ipv6.conf.all.accept_source_route = 0 + +# Disable packet forwarding +net.ipv4.ip_forward = 0 +net.ipv6.conf.all.forwarding = 0 + +# sets the port range used for outgoing connections +#net.ipv4.ip_local_port_range = 32768 61000 + +# Swapping too much or not enough? Disks spinning up when you'd +# rather they didn't? Tweak these. +#vm.vfs_cache_pressure = 100 +#vm.laptop_mode = 0 +#vm.swappiness = 60 + +#kernel.printk_ratelimit_burst = 10 +#kernel.printk_ratelimit = 5 +#kernel.panic_on_oops = 0 + +# Reboot 600 seconds after a panic +#kernel.panic = 600 + +# Disable SysRq key (note: console security issues) +kernel.sysrq = 0 diff --git a/core/procps-ng/sysctl_man.patch b/core/procps-ng/sysctl_man.patch new file mode 100644 index 000000000..d6023edfb --- /dev/null +++ b/core/procps-ng/sysctl_man.patch @@ -0,0 +1,20 @@ +--- a/sysctl.8 ++++ b/sysctl.8 +@@ -55,7 +55,7 @@ + \fB\-w\fR, \fB\-\-write\fR + Use this option when you want to change a sysctl setting. + .TP +-\fB\-p\fR, \fB\-\-load\fR[=\fIFILE\fR] ++\fB\-p\fR[\fIFILE\fR], \fB\-\-load\fR[=\fIFILE\fR] + Load in sysctl settings from the file specified or /etc/sysctl.conf if none + given. Specifying \- as filename means reading data from standard input. + .TP +@@ -117,7 +117,7 @@ + .br + /sbin/sysctl \-w kernel.domainname="example.com" + .br +-/sbin/sysctl \-p /etc/sysctl.conf ++/sbin/sysctl \-p/etc/sysctl.conf + .br + /sbin/sysctl \-a \-\-pattern forward + .br diff --git a/core/sysfsutils/PKGBUILD b/core/sysfsutils/PKGBUILD index 96b92b9ce..1fa9bc5f0 100644 --- a/core/sysfsutils/PKGBUILD +++ b/core/sysfsutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142543 2011-11-11 21:17:05Z tpowa $ +# $Id: PKGBUILD 158624 2012-05-05 03:20:18Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=sysfsutils pkgver=2.1.0 -pkgrel=7 +pkgrel=8 pkgdesc="System Utilities Based on Sysfs" arch=(i686 x86_64) license=('GPL' 'LGPL') @@ -15,22 +15,18 @@ md5sums=('14e7dcd0436d2f49aa403f67e1ef7ddc') options=(!libtool) build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --mandir=/usr/share/man make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - cd "${pkgdir}" - mkdir -v lib - mv -v usr/lib/libsysfs.so.2* lib/ - ln -svf ../../lib/libsysfs.so.2 usr/lib/libsysfs.so + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + rm "$pkgdir/usr/lib/libsysfs.a" } diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 586aee998..0251c026c 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156062 2012-04-12 15:54:20Z tomegun $ +# $Id: PKGBUILD 158599 2012-05-05 02:34:43Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgname=udev pkgver=182 -pkgrel=1 +pkgrel=2 pkgdesc="The userspace dev tools (udev)" depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl') install=udev.install @@ -52,9 +52,6 @@ package() { # udevd moved, symlink to make life easy for restarting udevd manually ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd - # and for users of the old /lib location (to go away soon) - mkdir -p ${pkgdir}/lib/udev - ln -s ../../usr/lib/udev/udevd ${pkgdir}/lib/udev/udevd # the path to udevadm is hardcoded in some places install -d ${pkgdir}/sbin diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD index a535f8797..0f28ad90d 100644 --- a/core/xfsprogs/PKGBUILD +++ b/core/xfsprogs/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 156218 2012-04-16 08:21:43Z tpowa $ -# Maintainer: Paul Mattal <paul@archlinux.org> +# $Id: PKGBUILD 158617 2012-05-05 03:17:20Z dreisner $ +# pkgname=xfsprogs pkgver=3.1.8 -pkgrel=1 +pkgrel=2 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64') license=('LGPL') url="http://oss.sgi.com/projects/xfs/" groups=('base') -depends=('util-linux-ng>=2.16') +depends=('util-linux') options=('!makeflags' '!libtool') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") @@ -18,6 +18,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" export OPTIMIZER="-march=${CARCH/_/-} -O1" export DEBUG=-DNDEBUG + ./configure --prefix=/usr make } @@ -26,4 +27,7 @@ package() { make DIST_ROOT="${pkgdir}" install install-dev chown -R root $pkgdir chgrp -R root $pkgdir + # add hack as we cannot set rootlibdir + mv "${pkgdir}"/lib/libhandle.so* "${pkgdir}/usr/lib/" + rm -rf "${pkgdir}/lib" } diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD index 615e9911e..e9a9866a7 100644 --- a/core/zlib/PKGBUILD +++ b/core/zlib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 148444 2012-01-31 23:47:55Z pierre $ +# $Id: PKGBUILD 158552 2012-05-04 22:14:53Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zlib -pkgver=1.2.6 +pkgver=1.2.7 pkgrel=1 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ license=('custom') url="http://www.zlib.net/" depends=('glibc') source=("http://zlib.net/current/zlib-${pkgver}.tar.gz") -md5sums=('618e944d7c7cd6521551e30b32322f4a') +md5sums=('60df6a37c56e7c1366cca812414f7b85') build() { cd ${srcdir}/zlib-$pkgver diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 41be55fdd..16d4838bd 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156697 2012-04-23 09:03:20Z ibiru $ +# $Id: PKGBUILD 158550 2012-05-04 21:06:52Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.18 +pkgver=0.6.20 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'libsystemd') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz) -md5sums=('31bc335f7d96b88e0d572a67a9df063d') +md5sums=('0f26a90677e15c5cb38cf28261a3b434') build() { cd $pkgname-$pkgver diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD index ed0a878a6..c03db85c1 100644 --- a/extra/consolekit/PKGBUILD +++ b/extra/consolekit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156074 2012-04-12 21:13:25Z tomegun $ +# $Id: PKGBUILD 158560 2012-05-04 23:57:00Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: onestep_ua <onestep@ukr.net> pkgname=consolekit pkgver=0.4.6 -pkgrel=2 +pkgrel=3 pkgdesc="A framework for defining and tracking users, login sessions, and seats" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/ConsoleKit" @@ -25,6 +25,7 @@ build() { --libexecdir=/usr/lib/ConsoleKit \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --enable-pam-module \ + --with-pam-module-dir=/usr/lib/security \ --enable-docbook-docs \ --enable-udev-acl make diff --git a/extra/fprintd/PKGBUILD b/extra/fprintd/PKGBUILD index bb5c2d2b5..292af2d28 100644 --- a/extra/fprintd/PKGBUILD +++ b/extra/fprintd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142462 2011-11-10 09:32:21Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# $Id: PKGBUILD 158562 2012-05-04 23:57:03Z allan $ +# Maintainer: # Contributor: Nikolay Rysev <mad.f3ka@gmail.com> pkgname=fprintd pkgver=0.4.1 -pkgrel=3 +pkgrel=4 pkgdesc="D-Bus service to access fingerprint readers" arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/fprint/fprintd" @@ -26,5 +26,5 @@ build() { package() { cd "$srcdir/$_snap" - make DESTDIR="$pkgdir" pammoddir="/lib/security" install + make DESTDIR="$pkgdir" pammoddir="/usr/lib/security" install } diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 48cafffe6..9519852c3 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 148728 2012-02-05 11:48:24Z ibiru $ +# $Id: PKGBUILD 158546 2012-05-04 19:12:03Z daniel $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gegl -pkgver=0.1.8 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64') url="http://www.gegl.org/" license=('GPL3' 'LGPL3') depends=('babl' 'gtk2') -makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2') +makedepends=('intltool' 'ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2') optdepends=('openexr: for using the openexr plugin' \ 'ffmpeg: for using the ffmpeg plugin' \ 'librsvg: for using the svg plugin' \ 'jasper: for using the jasper plugin') options=('!libtool') source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('3d4d902580f5c5122b01b5188b6b5da03089ecac') +sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -25,10 +25,10 @@ build() { make } -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# make check -#} +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD index 4d120263d..eb659c9f8 100644 --- a/extra/gimp-devel/PKGBUILD +++ b/extra/gimp-devel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153442 2012-03-14 06:47:26Z eric $ +# $Id: PKGBUILD 158548 2012-05-04 19:12:28Z daniel $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gimp-devel -pkgver=2.7.5 +pkgver=2.8.0 pkgrel=1 pkgdesc="GNU Image Manipulation Program (Development Version)" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ conflicts=('gimp') provides=("gimp=${pkgver}") install=gimp-devel.install source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl) -md5sums=('55c3ce1402890665464d9aad74ea63b6' +md5sums=('28997d14055f15db063eb92e1c8a7ebb' 'bb27bc214261d36484093e857f015f38') build() { @@ -44,12 +44,8 @@ package() { sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl" + rm "${pkgdir}/usr/share/man/man1/gimp-console.1" ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz" - ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5.gz" ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz" - ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz" - - ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp" - ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console" ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool" } diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD index 6522c6c5c..7d7a1f464 100644 --- a/extra/gimp/PKGBUILD +++ b/extra/gimp/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 148734 2012-02-05 11:48:37Z ibiru $ -# Maintainer: tobias <tobias@archlinux.org> +# $Id: PKGBUILD 158544 2012-05-04 19:10:38Z daniel $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gimp -pkgver=2.6.12 +pkgver=2.8.0 pkgrel=1 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64') url="http://www.gimp.org/" license=('GPL' 'LGPL') depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ - 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme') + 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme' 'babl') makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl') optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' 'libwebkit: for the help browser' @@ -21,13 +21,13 @@ conflicts=('gimp-devel') install=gimp.install source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl uri-backend-libcurl.patch) -sha1sums=('82964e3d4eb003239f3443a1bccac53f5d780e15' - '110ce9798173b19a662d086ed7b882b4729f06cf' - 'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4') +md5sums=('28997d14055f15db063eb92e1c8a7ebb' + 'bb27bc214261d36484093e857f015f38' + 'e894f4b2ffa92c71448fdd350e9b78c6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../uri-backend-libcurl.patch + #patch -p1 < ../uri-backend-libcurl.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --enable-mp --enable-gimp-console --enable-gimp-remote \ --enable-python --with-gif-compression=lzw --with-libcurl \ diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 2d5dd9a3b..71d8e4ebd 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 156825 2012-04-23 09:06:58Z ibiru $ +#$Id: PKGBUILD 158564 2012-05-04 23:57:06Z allan $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring pkgver=3.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) license=('GPL' 'LGPL') @@ -21,7 +21,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring \ - --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \ + --with-pam-dir=/usr/lib/security --with-root-certs=/etc/ssl/certs \ --disable-schemas-compile make } diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 4d806833d..d9816ab21 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157397 2012-04-28 09:26:38Z allan $ +# $Id: PKGBUILD 158538 2012-05-04 12:58:08Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell pkgver=3.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" @@ -15,11 +15,14 @@ optdepends=('network-manager-applet: shell integration for networkmanager') options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + recorder.patch) +sha256sums=('6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9' + 'b00589e867c0ae63b47982145cb4ab366afec84a568e66867f51fa8da13027f1') build() { cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/recorder.patch" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ --localstatedir=/var --disable-static \ diff --git a/extra/gnome-shell/recorder.patch b/extra/gnome-shell/recorder.patch new file mode 100644 index 000000000..41134a31a --- /dev/null +++ b/extra/gnome-shell/recorder.patch @@ -0,0 +1,28 @@ +From 915524e1ab7d2c5efb95985f30ee2f7c5ca69554 Mon Sep 17 00:00:00 2001 +From: Rui Matos <tiagomatos@gmail.com> +Date: Wed, 02 May 2012 14:44:40 +0000 +Subject: main: Close the recorder instead of pausing it + +Pausing means that we will continue to use the same output file when +the keybinding is activated again. While useful to record a single +video in chunks, it doesn't seem to be how most users understand the +keybinding. Closing the recorder will close the file and create a new +one the next time the keybinding is pressed. + +https://bugzilla.gnome.org/show_bug.cgi?id=675128 +--- +diff --git a/js/ui/main.js b/js/ui/main.js +index 3b80297..25ad8d8 100644 +--- a/js/ui/main.js ++++ b/js/ui/main.js +@@ -110,7 +110,7 @@ function _initRecorder() { + } + + if (recorder.is_recording()) { +- recorder.pause(); ++ recorder.close(); + Meta.enable_unredirect_for_screen(global.screen); + } else { + // read the parameters from GSettings always in case they have changed +-- +cgit v0.9.0.2 diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index d74dd2ca8..1dc364c17 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149986 2012-02-12 02:54:27Z allan $ +# $Id: PKGBUILD 158594 2012-05-05 02:02:44Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> pkgname=libjpeg-turbo pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" arch=('i686' 'x86_64') url="http://libjpeg-turbo.virtualgl.org/" @@ -46,6 +46,7 @@ package() { # do not distributre libturbojpeg as it is unversioned rm $pkgdir/usr/lib/libturbojpeg.{so,a} rm $pkgdir/usr/include/turbojpeg.h + rm $pkgdir/usr/bin/tjbench install -dm755 $pkgdir/usr/share/licenses/libjpeg-turbo/ ln -s ../../doc/libjpeg-turbo/README \ diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 57fac222e..eea3e9cba 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158285 2012-05-03 15:12:33Z giovanni $ +# $Id: PKGBUILD 158554 2012-05-04 23:23:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.2 +pkgver=2.2.1 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('e52ab7ab35105c768a4cd1658de0e1a5' +md5sums=('0ff7c7f7c50e506d494ff84baa10a77d' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index f2a6773fb..7193c9d8a 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 156228 2012-04-16 12:08:26Z jgc $ +# $Id: PKGBUILD 158536 2012-05-04 10:15:27Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss pkgver=3.13.4 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') _nsprver=4.9 -depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh') +depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip') source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz @@ -47,6 +47,7 @@ build() { export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` export XCFLAGS="${CFLAGS}" diff --git a/extra/nss_ldap/PKGBUILD b/extra/nss_ldap/PKGBUILD index 71c689f86..e702b98e8 100644 --- a/extra/nss_ldap/PKGBUILD +++ b/extra/nss_ldap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151294 2012-02-25 13:12:18Z pierre $ -# Maintainer: Paul Mattal <paul@archlinux.org> +# $Id: PKGBUILD 158628 2012-05-05 03:23:20Z dreisner $ +# Maintainer: # Contributor: Comete <la_comete@tiscali.fr> pkgname=nss_ldap pkgver=265 -pkgrel=3 +pkgrel=4 pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories." arch=('i686' 'x86_64') url="http://www.padl.com/OSS/nss_ldap.html" @@ -17,9 +17,10 @@ md5sums=('c1cb02d1a85538cf16bca6f6a562abe4') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ + --prefix=/usr \ --with-ldap-conf-file=/etc/nss_ldap.conf \ --with-ldap=openldap \ - --libdir=/lib \ + --sysconfdir=/etc \ --mandir=/usr/share/man \ --enable-schema-mapping \ --enable-rfc2307bis \ @@ -30,4 +31,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + # buildsystem is trying to be clever and hardcodes symlinks in /usr$(libdir) + rm -rf "${pkgdir}/usr/usr" } diff --git a/extra/pam_ldap/PKGBUILD b/extra/pam_ldap/PKGBUILD index d59b9fc9f..620ed04e8 100644 --- a/extra/pam_ldap/PKGBUILD +++ b/extra/pam_ldap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151292 2012-02-25 13:09:27Z pierre $ -# Maintainer: Paul Mattal <paul@archlinux.org> +# $Id: PKGBUILD 158605 2012-05-05 02:41:12Z allan $ +# Maintainer: # Contributor: Comete <la_comete@tiscali.fr> pkgname=pam_ldap pkgver=186 -pkgrel=1 +pkgrel=4 pkgdesc="LDAP authentication module for the PAM framework" arch=('i686' 'x86_64') url="http://www.padl.com/OSS/pam_ldap.html" @@ -17,7 +17,7 @@ md5sums=('58c8689921c5c4578363438acd8503c2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --libdir=/lib \ + ./configure --libdir=/usr/lib \ --with-ldap-conf-file=/etc/pam_ldap.conf \ --mandir=/usr/share/man PATH="${PATH}:${srcdir}/${pkgname}-${pkgver}" make diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 2982fae33..43c91f938 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 157263 2012-04-26 20:32:45Z tpowa $ +# $Id: PKGBUILD 158632 2012-05-05 03:24:58Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64) license=('GPL2' 'LGPL2.1') @@ -61,7 +61,7 @@ package() "${pkgdir}/usr/share/man/man1/qemu-kvm.1" # install udev rules install -D -m644 "${srcdir}/65-kvm.rules" \ - "${pkgdir}/lib/udev/rules.d/65-kvm.rules" + "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules" # strip scripts directory find "${pkgdir}/usr/bin" -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -bi "$binary")" in diff --git a/extra/qemu-kvm/qemu-kvm.install b/extra/qemu-kvm/qemu-kvm.install index 84aa773b9..5161df93a 100644 --- a/extra/qemu-kvm/qemu-kvm.install +++ b/extra/qemu-kvm/qemu-kvm.install @@ -3,7 +3,6 @@ post_install() { echo ">>> PLEASE READ FOR KVM USAGE!" echo ">>> Load the correct KVM module, you will need a KVM capable CPU!" echo ">>> Add yourself to the group 'kvm'." - echo ">>> Use 'qemu-kvm -enable-kvm' to use KVM." echo "" } diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index d787fd561..c96870137 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 152196 2012-03-05 08:20:34Z tpowa $ +# $Id: PKGBUILD 158630 2012-05-05 03:24:55Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" makedepends=('iasl' 'git' 'texi2html' 'perl' 'python2') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl' 'libpulse') +depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse') backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz @@ -42,7 +42,7 @@ package() { cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin" install -D -m644 "${srcdir}/65-kvm.rules" \ - "${pkgdir}/lib/udev/rules.d/65-kvm.rules" + "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules" # strip scripts directory find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -bi "$binary")" in diff --git a/extra/qemu/qemu.install b/extra/qemu/qemu.install index e16ac027c..fd92c60eb 100644 --- a/extra/qemu/qemu.install +++ b/extra/qemu/qemu.install @@ -5,7 +5,6 @@ post_install() { echo ">>> PLEASE READ FOR KVM USAGE!" echo ">>> Load the correct KVM module, you will need a KVM capable CPU!" echo ">>> Add yourself to the group 'kvm'." - echo ">>> Use 'qemu -enable-kvm' to use KVM." echo "" if [ "$(vercmp $2 0.11)" -lt 0 ]; then echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module" diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index cb0123245..11db4fc3e 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 157239 2012-04-26 13:06:31Z tpowa $ +# $Id: PKGBUILD 158568 2012-05-04 23:57:16Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=3.6.4 +pkgver=3.6.5 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=3.6.4 -pkgrel=2 +_realver=3.6.5 +pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') @@ -35,7 +35,7 @@ build() { --with-fhs \ --with-pam \ --with-pam_smbpass \ - --with-pammodulesdir=/lib/security \ + --with-pammodulesdir=/usr/lib/security \ --with-dnsupdate \ --with-automount \ --with-quotas \ @@ -114,10 +114,10 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr # fix logrotate sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default # nsswitch libraries - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so - ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2 - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so - ln -s libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so.2 + install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so + ln -s libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so.2 + install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so + ln -s libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so.2 # winbind krb5 locator mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5 install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5 @@ -154,7 +154,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr done install -D -m644 ${srcdir}/smbd.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf } -md5sums=('d8e070e2a3b12f202f347e4427469bc2' +md5sums=('2f0c14547333c1b48fd4728b031e7040' 'dfc6f9018c556b9783c7140de183727f' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD index c09599940..3a62d466d 100644 --- a/extra/systemd/PKGBUILD +++ b/extra/systemd/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 155750 2012-04-06 00:06:04Z tomegun $ +# $Id: PKGBUILD 158570 2012-05-04 23:57:21Z allan $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgbase=systemd pkgname=('systemd' 'libsystemd') pkgver=44 -pkgrel=5 +pkgrel=7 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" -license=('GPL2') +license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') options=('!libtool') @@ -25,10 +25,10 @@ md5sums=('11f44ff74c87850064e4351518bcff17' build() { cd "$pkgname-$pkgver" - # https://bugzilla.redhat.com/show_bug.cgi?id=803358 + # https://bugzilla.redhat.com/show_bug.cgi?id=803358 (upstream 5ebff53375) patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch" - # https://bugs.archlinux.org/task/28386 + # https://bugs.archlinux.org/task/28386 (upstream 75c8e3cffd) patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch" # Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49) @@ -36,10 +36,11 @@ build() { ./configure --sysconfdir=/etc \ --libexecdir=/usr/lib \ - --with-pamlibdir=/lib/security \ + --with-pamlibdir=/usr/lib/security \ --localstatedir=/var \ --with-distro=arch \ - --enable-split-usr + --enable-split-usr \ + --disable-ima make } @@ -75,9 +76,8 @@ package_systemd() { chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf" # symlink to /bin/systemd for compat and sanity - install -dm755 "$pkgdir/bin" "$pkgdir/lib/systemd" + install -dm755 "$pkgdir/bin" ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd" # use python2 for systemd-analyze sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" diff --git a/extra/systemd/systemd.install b/extra/systemd/systemd.install index 822108c0f..0c3e9abee 100644 --- a/extra/systemd/systemd.install +++ b/extra/systemd/systemd.install @@ -29,18 +29,14 @@ post_upgrade() { fi if sd_booted; then - systemctl daemon-reload - systemctl daemon-reexec - fi - - newpkgver=${1%-*} - oldpkgver=${2%-*} - - # catch v31 need for restarting systemd-logind.service - if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then - # but only if systemd is running - if sd_booted; then - systemctl try-restart systemd-logind.service + # we moved the binary in 44-2 to /usr, so a reexec leads to a + # coredump. refuse this reexec and warn the user that they should + # reboot instead. + if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then + echo "warning: refusing to reexec systemd. the system should be rebooted." + else + systemctl daemon-reload + systemctl daemon-reexec fi fi } diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD index 04d7b5b2d..2212b5dec 100644 --- a/extra/thinkfinger/PKGBUILD +++ b/extra/thinkfinger/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 144027 2011-12-02 07:42:30Z andrea $ -# Maintainer: +# $Id: PKGBUILD 158572 2012-05-04 23:57:24Z allan $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: François Charette <francois.archlinux.org> # Contributor: Damir Perisa <damir.archlinux.org> # Contributor: Björn Martensen <bjoern.martensen@gmail.com> pkgname=thinkfinger pkgver=0.3 -pkgrel=5 +pkgrel=6 pkgdesc="A driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads" url="http://thinkfinger.sourceforge.net/" arch=('i686' 'x86_64') @@ -30,7 +30,6 @@ build() { patch -p1 -i "${srcdir}"/gcc46.patch ./configure --prefix=/usr \ - --with-securedir=/lib/security \ --with-birdir=/etc/pam_thinkfinger make } diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 099481254..37f872972 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 156992 2012-04-23 09:10:47Z ibiru $ +# $Id: PKGBUILD 158542 2012-05-04 17:15:31Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.14.0 +pkgver=0.14.1 _tver=${pkgver%.*} -pkgrel=3 +pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" arch=('i686' 'x86_64') license=('GPL') @@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('78e432c5c14b9d186ccca3c382accdcdb4f07c2c6e25989fda48401b4a68f7d4') +sha256sums=('17ac4125d02c5f820eae9a785ac1c90b0e93682730a3950f82fd4a3dff238a43') build() { cd $pkgbase-$pkgver diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD index 1fe072642..f7d7f6d50 100644 --- a/extra/usbmuxd/PKGBUILD +++ b/extra/usbmuxd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134490 2011-08-04 15:41:22Z ibiru $ +# $Id: PKGBUILD 158609 2012-05-05 03:08:45Z allan $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=usbmuxd pkgver=1.0.7 -pkgrel=2 +pkgrel=3 pkgdesc="USB Multiplex Daemon" url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" arch=('i686' 'x86_64') @@ -29,4 +29,8 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install + + # fix udev dir being hardcoded + mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" + rmdir "${pkgdir}/lib" } diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 56ccaee39..62ec3d6c4 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 149800 2012-02-10 23:21:36Z thomas $ +# $Id: PKGBUILD 158613 2012-05-05 03:14:18Z allan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=0.8.6 +pkgver=0.8.8 pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64') @@ -15,8 +15,6 @@ optdepends=('qt') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) -sha256sums=('3a53ac6348363bbdc94ea11ca48dadc0342a579384a910f6c956b6a185f0c20f' - '3c2613c77dd68e94ac9eb2b2e856b94e3d3cea57f5de054b95150cbc905b1f18') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,4 +28,8 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make install PREFIX="/usr" DESTDIR="${pkgdir}/" rm -f "${pkgdir}/usr/bin/ivtv-ctl" + mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" + rm -rf "${pkgdir}/lib" } +md5sums=('40fdda3f4055ed818012d7a7b5ef5be5' + 'cceb1325f35789c95f875b705b3eb373') diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index fcf0ea299..9fb79abff 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 153317 2012-03-12 20:53:04Z andyrtr $ +# $Id: PKGBUILD 158636 2012-05-05 03:31:18Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom pkgver=0.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64') url="http://linuxwacom.sourceforge.net/" @@ -30,6 +30,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/lib/udev/rules.d" - install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/lib/udev/rules.d/" + install -m755 -d "${pkgdir}/usr/lib/udev/rules.d" + install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/usr/lib/udev/rules.d/" } diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD new file mode 100644 index 000000000..7a29ea957 --- /dev/null +++ b/testing/bash/PKGBUILD @@ -0,0 +1,137 @@ +# $Id: PKGBUILD 158578 2012-05-05 00:20:21Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> + +pkgname=bash +_basever=4.2 +_patchlevel=028 #prepare for some patches +pkgver=$_basever.$_patchlevel +pkgrel=1 +pkgdesc="The GNU Bourne Again shell" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnu.org/software/bash/bash.html" +groups=('base') +backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) +depends=('readline>=6.1' 'glibc') +provides=('sh') +install=bash.install +source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} + dot.bashrc + dot.bash_profile + dot.bash_logout + system.bashrc + system.bash_logout) +if [ $_patchlevel -gt 000 ]; then + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) + done +fi + +build() { + 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 + + _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\"\' + -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\' + -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\') + export CFLAGS="${CFLAGS} ${_bashconfig[@]}" + + ./configure --prefix=/usr --with-curses --enable-readline \ + --without-bash-malloc --with-installed-readline \ + --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info + make +} + +check() { + cd ${srcdir}/${pkgname}-$_basever + make check +} + +package() { + cd ${srcdir}/${pkgname}-$_basever + make DESTDIR=${pkgdir} install + + # for now, bash is our default /bin/sh + cd ${pkgdir}/bin + ln -s bash sh + + install -dm755 ${pkgdir}/etc/skel/ + + # system-wide configuration files + install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc + install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout + + # user configuration file skeletons + install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc + install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile + install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout +} + +md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' + '8d37a3f97a48c1e56e1a4ded877ed944' + '027d6bd8f5f6a06b75bb7698cb478089' + '2902e0fee7a9168f3a4fd2ccd60ff047' + '42f4400ed2314bd7519c020d0187edc5' + '3546099a1b2f667adc9794f52e78e35b' + '472f536d7c9e8250dc4568ec4cfaf294' + '1100bc1dda2cdc06ac44d7e5d17864a3' + 'a7184b76eb4a079f10174a0a8f574819' + '30e7948079921d3261efcc6a40722135' + 'c4d45307f7e69fe508ce347c4cec1955' + '9ea06decec43a198f3d7cf29acc602f8' + '74bddae6eeb9227a04a467d42597a34d' + 'fb48f6134d7b013135929476aa0c250c' + '3e6a18226b16c773229246abd07a1f5e' + 'e70e45de33426b38153b390be0dbbcd4' + 'e667dc9348ebc3e0e14bfdd87f4b6ff2' + 'ce4e5c484993705b27daa151eca242c2' + '41cbd8e57589bc081a546a014ddb12f8' + '88d1f96db29461767602e2546803bda7' + 'b8b781520f4c7493a2a1ac3010a44a44' + '24c574bf6d6a581e300823d9c1276af6' + '354a0899a7c4b446454c52546562b55b' + '4c5835f2fbab36c4292bb334977e5b6d' + 'ff4547ca7b508d52101729d61f5b77b6' + '0a51602b535ef661ee707be6c8bdb373' + 'cec7c92a4d8052ea4b29216365d16566' + '58deacf3d57cbd75575444ff6a3b0806' + '9ed2a08e549c3c17745f19e8413cfb31' + '72d5059820015231483bb7415d09e9db' + '45b04b41a4230f469d3e47ab9952c2df' + '608336ebe215984ef126e3c29d2d3409' + '623f63025d155a84977b62531e260ee2' + 'ed19da878e3f630834c62b9d9dcc6fce' + 'eef2dd4a0e4505dc8f8e664b40c6cd66' + '2d07daba0b8ca8f876d2aa052ff594b4' + '0cb823a44e6dc1cde7ac97ae5c8163c9' + '53d246537e1fffd1aaa02ba5c056211c' + '60f983a1dded5f0b28040ff4b3f1e9b5' + '304fd129a58fee2d8a34f8b4704db0aa' + '9df4bf4f46aaadc436f430187741f815' + '6921a0b4228fe89b6537a5c29f027c89' + '4ef0e2a2cbfbdd53346f927000b7e112' + '1195d85447f3d048d2c9bcd075fa765c' + 'b0f3a651ce29a1feee687d93177870f1' + 'b09000bba08da6ac753124593850cdf7' + '204bb5054d1f8bafe2b446d4e5d0d99a' + '09d3f96a16b881334cfaee0cf320b47e' + 'aab415350bcc2bb0c29943b413499d96' + '597bf71a2aac6feb510b7505cdd3d4f7' + 'b0db384bdedecafbdd70c8d22c56af5f' + '3fab459b4e09daea529cacad025b13b3' + 'bab99835ad6198cb1109fac89a085262' + '4ad8d11e72afc6090e701073ff034cf4' + '5658ef10c9d0d804126ec1ce700e4e2c' + 'c7d2493e44490f01dd20bdc8feb0a6a7' + 'e4855dbc4b743618b54d408bd5878637' + '9f19c199dd8d1fa9254eebe738759272' + '600c8e90c2fb13cdbc7aa3f18566df03' + 'a6ed82daf034587aee2f2581ba5fe829' + '821620a0389df723644911c56796ca8c' + 'da9265aa2527fd4a7481baa3e0550287' + '0043f8b75f46f43608a67b863e300fe8') diff --git a/testing/bash/bash.install b/testing/bash/bash.install new file mode 100644 index 000000000..bc75e9b6a --- /dev/null +++ b/testing/bash/bash.install @@ -0,0 +1,20 @@ +info_dir=usr/share/info +info_files=(bash.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/testing/bash/dot.bash_logout b/testing/bash/dot.bash_logout new file mode 100644 index 000000000..0e4e4f184 --- /dev/null +++ b/testing/bash/dot.bash_logout @@ -0,0 +1,3 @@ +# +# ~/.bash_logout +# diff --git a/testing/bash/dot.bash_profile b/testing/bash/dot.bash_profile new file mode 100644 index 000000000..5545f007e --- /dev/null +++ b/testing/bash/dot.bash_profile @@ -0,0 +1,5 @@ +# +# ~/.bash_profile +# + +[[ -f ~/.bashrc ]] && . ~/.bashrc diff --git a/testing/bash/dot.bashrc b/testing/bash/dot.bashrc new file mode 100644 index 000000000..a355b0cd3 --- /dev/null +++ b/testing/bash/dot.bashrc @@ -0,0 +1,9 @@ +# +# ~/.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +alias ls='ls --color=auto' +PS1='[\u@\h \W]\$ ' diff --git a/testing/bash/system.bash_logout b/testing/bash/system.bash_logout new file mode 100644 index 000000000..a76e48e4a --- /dev/null +++ b/testing/bash/system.bash_logout @@ -0,0 +1,3 @@ +# +# /etc/bash.bash_logout +# diff --git a/testing/bash/system.bashrc b/testing/bash/system.bashrc new file mode 100644 index 000000000..a2231e861 --- /dev/null +++ b/testing/bash/system.bashrc @@ -0,0 +1,23 @@ +# +# /etc/bash.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +PS1='[\u@\h \W]\$ ' +PS2='> ' +PS3='> ' +PS4='+ ' + +case ${TERM} in + xterm*|rxvt*|Eterm|aterm|kterm|gnome*) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' + + ;; + screen) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' + ;; +esac + +[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD index 88c791eea..a9346b86b 100644 --- a/testing/glib2/PKGBUILD +++ b/testing/glib2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158079 2012-05-02 16:31:02Z ibiru $ +# $Id: PKGBUILD 158592 2012-05-05 01:35:46Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 pkgver=2.32.2 -pkgrel=1 +pkgrel=2 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) @@ -24,7 +24,7 @@ sha256sums=('b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136' build() { cd glib-$pkgver patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ --with-pcre=system \ --disable-fam diff --git a/testing/isl/PKGBUILD b/testing/isl/PKGBUILD new file mode 100644 index 000000000..dc908de63 --- /dev/null +++ b/testing/isl/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 158590 2012-05-05 00:51:50Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=isl +pkgver=0.09 +pkgrel=2 +pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" +arch=('i686' 'x86_64') +url="http://www.kotnet.org/~skimo/isl/" +license=('LGPL2.1') +options=('!libtool') +source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) +md5sums=('6873f0b3c9f4d1fb8efae4aea53f2ab2') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 DESTDIR="$pkgdir/" install + + install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/ + mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.9.0.0-gdb.py +} |