diff options
| author | root <root@rshg054.dnsready.net> | 2012-10-01 00:42:10 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-10-01 00:42:10 -0700 |
| commit | 9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (patch) | |
| tree | 72ca5c2f4a99c399cee5fe08d77d5fc33ab94e56 | |
| parent | 75826a796a4589c1999f1b3b86eb8c122ef44edd (diff) | |
Mon Oct 1 00:42:09 PDT 2012
36 files changed, 826 insertions, 108 deletions
diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD index dccd9cef9..fee341d22 100644 --- a/community/kphotoalbum/PKGBUILD +++ b/community/kphotoalbum/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74835 2012-08-06 23:08:56Z andrea $ +# $Id: PKGBUILD 76830 2012-09-30 21:12:00Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com> @@ -6,8 +6,8 @@ # Contributor: chfoxli <lg ][ romandie ? com> pkgname=kphotoalbum -pkgver=4.2 -pkgrel=4 +pkgver=4.3 +pkgrel=1 pkgdesc="KDE Photo Album, picture collection manager" url="http://www.kphotoalbum.org/" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ optdepends=('kdeedu-marble: integration with Marble' 'kdemultimedia-mplayerthumbs: video thumbnails') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7cb484089477f3633657b67ce59b85f2') +md5sums=('09b5ba7d44ee7426802b233454927b8f') build() { cd ${srcdir} diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 3dccf2057..7871f776a 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 76398 2012-09-17 09:39:27Z svenstaro $ +# $Id: PKGBUILD 76840 2012-10-01 01:55:21Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=ldc -pkgver=20120917 +pkgver=20121001 pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index 9237d05ef..a5d361ee0 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75938 2012-09-05 20:32:43Z seblu $ +# $Id: PKGBUILD 76842 2012-10-01 03:29:15Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=linux-tools pkgname=('perf' 'cpupower' 'x86_energy_perf_policy' 'usbip') -pkgver=3.5 -pkgrel=5 +pkgver=3.6 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -28,9 +28,9 @@ source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz" 'usbipd.conf' 'usbipd.rc' 'usbipd.service') -md5sums=('24153eaaa81dedc9481ada8cd9c3b83d' - '857ccdd0598511e3bf4b63522754dc48' - '1d9214637968b91706b6e616a100d44b' +md5sums=('1a1760420eac802c541a20ab51a093d1' + '56883c159381ba89e50ab8ea65efec77' + '5fc1fcda4cef93f16e752b1931db23e3' 'c0d17b5295fe964623c772a2dd981771' '2450e8ff41b30eb58d43b5fffbfde1f4' 'e8fac9c45a628015644b4150b139278a' @@ -96,6 +96,7 @@ package_cpupower() { backup=('etc/conf.d/cpupower') depends=('bash' 'pciutils') conflicts=('cpufrequtils') + replaces=('cpufrequtils') pushd linux-$pkgver/tools/power/cpupower make \ @@ -137,4 +138,4 @@ package_usbip() { install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/linux-tools/cpupower.conf b/community/linux-tools/cpupower.conf index ee8602953..b5c522ea1 100644 --- a/community/linux-tools/cpupower.conf +++ b/community/linux-tools/cpupower.conf @@ -8,7 +8,8 @@ #max_freq="3GHz" # Specific frequency to be set. -# Requires userspace governor to be available and loaded. +# Requires userspace governor to be available. +# Do not set governor field if you use this one. #freq= # Utilizes cores in one processor package/socket first before processes are diff --git a/community/linux-tools/cpupower.rc b/community/linux-tools/cpupower.rc index 2c4441c4e..88edaf791 100644 --- a/community/linux-tools/cpupower.rc +++ b/community/linux-tools/cpupower.rc @@ -2,7 +2,6 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/${0##*/} case "$1" in start|restart) diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD index 6486c74aa..e22deeef1 100644 --- a/community/lockdev/PKGBUILD +++ b/community/lockdev/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 57817 2011-11-03 10:01:23Z lfleischer $ +# $Id: PKGBUILD 76820 2012-09-30 13:49:03Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <a.wagner@stud.uni-frankfurt.de> pkgname=lockdev -pkgver=1.0.3_1.2 +pkgver=1.0.3_1.5 _pkgver=1.0.3 -pkgrel=3 +pkgrel=1 pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.' url='http://packages.qa.debian.org/l/lockdev.html' license=("GPL") @@ -14,7 +14,7 @@ arch=('i686' 'x86_64') source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz" "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz") md5sums=('64b9c1b87b125fc348e892e24625524a' - 'afe2995ad3fc6551e107364d66a8e938') + 'c4e8a5a2e46b76b48339c232b358f579') build() { cd "${pkgname}-${_pkgver}" @@ -22,8 +22,8 @@ build() { patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff" sed -i "s|CFLAGS = -g|CFLAGS = -g -fPIC|" Makefile - make shared - make static + make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\"" + make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\"" } package() { diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD index e60cbfdfb..a78465650 100644 --- a/community/ocaml-findlib/PKGBUILD +++ b/community/ocaml-findlib/PKGBUILD @@ -6,7 +6,7 @@ pkgname=ocaml-findlib pkgver=1.3.3 -pkgrel=1 +pkgrel=2 license=('MIT') arch=('i686' 'x86_64') pkgdesc='Objective Caml (OCaml) package manager' diff --git a/community/pkgfile/PKGBUILD b/community/pkgfile/PKGBUILD index b43c3719a..eaa0fdb88 100644 --- a/community/pkgfile/PKGBUILD +++ b/community/pkgfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76000 2012-09-08 16:02:52Z dreisner $ +# $Id: PKGBUILD 76836 2012-10-01 01:25:40Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pkgfile -pkgver=5 -pkgrel=2 +pkgver=6 +pkgrel=1 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64') url="http://github.com/falconindy/pkgfile" @@ -13,8 +13,8 @@ conflicts=('pkgtools<24-2') makedepends=('perl') source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) install=pkgfile.install -md5sums=('87e75949ca4ed9d60cc2dfdca9dd1a04' - '14d174d2fe0b8e0a43392c2b4ec48a7a') +md5sums=('75139dd8441d60ee7682d900b610e189' + '75cca8e3c0198fa98e32b54fd5e936e6') build() { cd "$pkgname-$pkgver" diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 645f6555f..45255c407 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9561 +pkgver=9660 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64') @@ -38,4 +38,4 @@ package() { mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox } -md5sums=('d8b900ae4a7d70c692003a412241e94f') +md5sums=('06f88f737158a1d7912b20010b75d1b1') diff --git a/community/start-stop-daemon/PKGBUILD b/community/start-stop-daemon/PKGBUILD index a9ba3f285..3f62b8668 100644 --- a/community/start-stop-daemon/PKGBUILD +++ b/community/start-stop-daemon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64840 2012-02-18 17:37:14Z seblu $ +# $Id: PKGBUILD 76825 2012-09-30 15:07:25Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Soup <soup a.t soultrap d.o.t n.e.t> # Contributor: Vladimir Koshelenko <koshelenko@rndavia.ru> pkgname=start-stop-daemon -pkgver=1.15.8.12 +pkgver=1.15.8.13 pkgrel=1 pkgdesc='Start and stop system daemon programs' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL2') url='http://packages.qa.debian.org/d/dpkg.html' depends=('glibc') source=("http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_$pkgver.tar.bz2") -md5sums=('0cd6f20a574d0df31298e70fc3b26173') +md5sums=('7f6ea19838311a66fdacce17991eba85') build() { cd dpkg-$pkgver @@ -27,4 +27,4 @@ package() { install -D -m 644 man/start-stop-daemon.8 "$pkgdir/usr/share/man/man8/start-stop-daemon.8" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/stk/PKGBUILD b/community/stk/PKGBUILD index 498763465..2a97d360c 100644 --- a/community/stk/PKGBUILD +++ b/community/stk/PKGBUILD @@ -1,51 +1,38 @@ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Ray Rashif <schiv@archlinux.org> +# Contributor: Mateusz Herych <heniekk@gmail.com> pkgname=stk -pkgver=4.4.2 -pkgrel=6 -pkgdesc="The Synthesis ToolKit in C++" +pkgver=4.4.4 +pkgrel=1 +pkgdesc='The Synthesis ToolKit in C++' arch=('i686' 'x86_64') -url="http://ccrma.stanford.edu/software/stk/" +url='http://ccrma.stanford.edu/software/stk/' license=('MIT') depends=('gcc-libs' 'jack') makedepends=('pkg-config') -optdepends=('oss: use OSSv4 output/API' - 'tk: run provided demos/samples') -source=(http://ccrma.stanford.edu/software/stk/release/$pkgname-$pkgver.tar.gz - $pkgname.license - cxxflags.patch +optdepends=('tk: run provided demos/samples') +source=("http://ccrma.stanford.edu/software/stk/release/$pkgname-$pkgver.tar.gz" + "$pkgname.license" runtime.patch) -md5sums=('0b7bd1f913ca01fb8b2201ebcf853358' +md5sums=('66646cb1117eee2d767c4571cc51a8c3' 'a0163d75a5f516b6c93f4fc948acff73' - '1b09d29321d575ad670f6371651015c6' '36551c348340307c765fde85d4336e73') build() { cd "$srcdir/$pkgname-$pkgver" - # fails with --as-needed - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - - # optimise for our target architecture(s) - patch -Np1 -i ../cxxflags.patch - autoreconf + # add missing linker flag + export LIBS="$LIBS -lpthread" # enable shared library - sed -i \ - "s:cd src && \$(MAKE)$:& lib$pkgname.so.$pkgver:" \ - Makefile.in + sed -i 's/all : $(STATICLIB)/all : $(SHAREDLIB)/' src/Makefile.in # fix demo rawwaves path - sed -i 's:\.\./\.\.:/usr/lib/stk:' \ - projects/demo/demo.cpp + sed -i 's:\.\./\.\.:/usr/lib/stk:' projects/demo/demo.cpp # run actual build - ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ \ - --prefix=/usr \ - --with-alsa \ - --with-jack \ - --with-oss + ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ --prefix=/usr --with-alsa --with-jack make # fix executable scripts @@ -62,27 +49,18 @@ package() { # install headers install -m644 include/* "$pkgdir/usr/include/stk/" - rm "$pkgdir"/usr/include/stk/*~ # install runtime files - cp -a rawwaves projects/demo/{demo,tcl} \ - projects/effects/{effects,tcl} \ - projects/ragamatic/{ragamat,tcl,rawwaves} \ - "$pkgdir/usr/lib/stk/" + cp -a rawwaves projects/demo/{demo,tcl} projects/effects/{effects,tcl} \ + projects/ragamatic/{ragamat,tcl,rawwaves} "$pkgdir/usr/lib/stk/" # install executables - install -m755 projects/{demo/StkDemo,effects/StkEffects} \ - "$pkgdir/usr/bin/" - - install -m755 projects/ragamatic/Raga \ - "$pkgdir/usr/bin/StkRagamatic" + install -m755 projects/{demo/StkDemo,effects/StkEffects} "$pkgdir/usr/bin/" + install -m755 projects/ragamatic/Raga "$pkgdir/usr/bin/StkRagamatic" # install license - install -Dm644 ../$pkgname.license \ - "$pkgdir/usr/share/licenses/stk/LICENSE" + install -Dm644 "../$pkgname.license" "$pkgdir/usr/share/licenses/stk/LICENSE" # remove .DS_Store directory: https://bugs.archlinux.org/task/25255 - rm -rf ${pkgdir}/usr/lib/stk/rawwaves/.DS_Store + rm -rf "${pkgdir}/usr/lib/stk/rawwaves/.DS_Store" } - -# vim:set ts=2 sw=2 et: diff --git a/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch new file mode 100644 index 000000000..9be6ef28f --- /dev/null +++ b/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch @@ -0,0 +1,30 @@ +From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Thu, 27 Sep 2012 20:48:13 -0400 +Subject: [PATCH] tmpfiles: restore previous behavior for F/f + +d4e9eb91ea changed the behavior for the F and f actions, wrongly sending +them to glob_item(). Restore the old behavior and shortcut straight to +write_one_file(). +--- + src/tmpfiles/tmpfiles.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index f10f908..bf900fa 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -673,6 +673,10 @@ static int create_item(Item *i) { + + case CREATE_FILE: + case TRUNCATE_FILE: ++ r = write_one_file(i, i->path); ++ if (r < 0) ++ return r; ++ break; + case WRITE_FILE: + r = glob_item(i, write_one_file); + if (r < 0) +-- +1.7.12.1 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 5e0421849..8dc086a4a 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=192 +pkgver=193 pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -18,12 +18,14 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' + '0001-tmpfiles-restore-previous-behavior-for-F-f.patch' 'use-split-usr-path.patch') -md5sums=('e8692055923e87f7f9cb634d44314edb' +md5sums=('732a9de2b1d2a15cab639c987ff9e90e' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' + '1f435290db227c3a4f4396f86819227e' 'fd5b5f04ab0a847373d357555129d4c0') build() { @@ -35,6 +37,9 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" + # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0 + patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch" + ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index dd4088bde..feaf46def 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166873 2012-09-20 13:16:25Z dan $ +# $Id: PKGBUILD 167293 2012-09-30 15:45:48Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.12.1 +pkgver=1.7.12.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -109,8 +109,8 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('1c16e94ca43c2811806567ed6e73d704' - 'efaef000a05938971606fad472a1b9f0' +md5sums=('5aa5d146825f74fee889ca5408e4e00b' + '51db657f9e8fa70f43ae56cb6bcb631b' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index 01465195c..55eed0040 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164344 2012-07-31 02:24:37Z bisson $ +# $Id: PKGBUILD 167322 2012-10-01 01:53:47Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=uim -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 pkgdesc='Multilingual input method library' url='http://code.google.com/p/uim/' @@ -17,7 +17,7 @@ optdepends=('qt: immodule and helper applications' 'gnome-panel: gnome applet indicator') options=('!libtool') source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('705c785a626ac0b498547aef5b8ff9b57f08259e') +sha1sums=('4f63836935051d52b9194572afb904892fe89595') install=install diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD index 88575e8c4..3a08d73e6 100644 --- a/extra/usermin/PKGBUILD +++ b/extra/usermin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 140170 2011-10-08 10:02:07Z tpowa $ +# $Id: PKGBUILD 167307 2012-09-30 20:46:00Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=usermin -pkgver=1.490 +pkgver=1.520 pkgrel=1 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding" arch=(i686 x86_64) @@ -124,6 +124,6 @@ build() { #install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE } -md5sums=('a6d87aad595ea8abbe6639ce2c08efc1' +md5sums=('5819ba87796d9373a92116e90d1a35d4' 'cfef4490cd1ef9517c0b39a7bd75c968' 'ec37a79f948f778224550930d2a7ca07') diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD index 9c29be985..add24654f 100644 --- a/extra/webmin/PKGBUILD +++ b/extra/webmin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164995 2012-08-08 06:41:05Z tpowa $ +# $Id: PKGBUILD 167305 2012-09-30 19:42:57Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.590 -pkgrel=2 +pkgver=1.600 +pkgrel=1 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64) license=('custom:webmin') @@ -214,7 +214,7 @@ build() { # install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE } -md5sums=('815005ed7f208dcfbda5308b446779c2' +md5sums=('8a9124bdd180aeec13fc16fa75fb1419' '43a77243acd519c4efe9577090b59912' 'bfebb75bb94029b48c46b7f1ba1aa811' 'c77dfcd621b417a7826d25f56a1e60ae' diff --git a/gnome-unstable/gdl/PKGBUILD b/gnome-unstable/gdl/PKGBUILD new file mode 100644 index 000000000..5a7581c18 --- /dev/null +++ b/gnome-unstable/gdl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 167319 2012-09-30 23:30:44Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gdl +pkgver=3.6.0 +pkgrel=1 +pkgdesc="GNOME Docking Library" +arch=(i686 x86_64) +license=('GPL') +url="http://www.gnome.org/" +depends=('gtk3') +makedepends=('gtk-doc' 'intltool' 'gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('32a04fc96667e2f7ca1e3c853b996da3e62f4811b2a90d62cb2081f68aeecac3') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/glibmm/PKGBUILD b/gnome-unstable/glibmm/PKGBUILD index e02b188e0..b8e265ad3 100644 --- a/gnome-unstable/glibmm/PKGBUILD +++ b/gnome-unstable/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165758 2012-08-29 13:01:56Z jgc $ +# $Id: PKGBUILD 167318 2012-09-30 23:29:44Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.33.3 +pkgver=2.33.13 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') url="http://www.gtkmm.org/" -sha256sums=('8dea072b06f62a61a435845ad0cfb1f5856c7be90d3f5b4880fc21c194ff1d80') +sha256sums=('f66f62ddd63a1c10561ce73c5883c1c71499efafb363574dac94ac699804d699') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/grilo-plugins/PKGBUILD b/gnome-unstable/grilo-plugins/PKGBUILD new file mode 100644 index 000000000..2c518a867 --- /dev/null +++ b/gnome-unstable/grilo-plugins/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 167313 2012-09-30 23:18:47Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=grilo-plugins +pkgver=0.2.0 +pkgrel=1 +pkgdesc="Plugins for Grilo" +url="http://www.gnome.org" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('grilo') +makedepends=(gupnp-av libgdata libquvi sqlite gmime libgcrypt rest libtracker-sparql + totem-plparser gnome-common) +optdepends=('gupnp-av: uPnP plugin' + 'libgdata: Youtube plugin' + 'libquvi: Youtube plugin' + 'sqlite: Podcasts plugin' + 'gmime: Podcasts plugin' + 'sqlite: Bookmarks plugin' + 'sqlite: Metadata store plugin' + 'libgcrypt: Vimeo plugin' + 'rest: Blip.tv plugin' + 'libtracker-sparql: Tracker plugin' + 'totem-plparser: Optical media plugin') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('86ecabe5b34a15e9c00285b599461e7eb590e2fff0a8b284157b789b192db4f7') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ + --enable-shoutcast + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/grilo/PKGBUILD b/gnome-unstable/grilo/PKGBUILD new file mode 100644 index 000000000..63828fe1d --- /dev/null +++ b/gnome-unstable/grilo/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 167311 2012-09-30 23:10:51Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=grilo +pkgver=0.2.0 +pkgrel=1 +pkgdesc="Framework that provides access to various sources of multimedia content" +url="http://www.gnome.org" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gtk3' 'libxml2' 'libsoup') +makedepends=('gobject-introspection' 'gtk-doc' 'vala') +optdepends=('grilo-plugins: Plugins for grilo') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('daab3104684dd1a347aa3f3bc8e5a435f57829f594d951890692b9035c993d1f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --disable-static --disable-debug + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/libgdata/PKGBUILD b/gnome-unstable/libgdata/PKGBUILD index 2d4a27c97..d5884c060 100644 --- a/gnome-unstable/libgdata/PKGBUILD +++ b/gnome-unstable/libgdata/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166823 2012-09-19 16:18:37Z jgc $ +# $Id: PKGBUILD 167310 2012-09-30 23:09:54Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgdata -pkgver=0.13.1 +pkgver=0.13.2 pkgrel=1 pkgdesc="GLib-based library for accessing online service APIs using the GData protocol" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('intltool' 'gobject-introspection') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('270777da04776537c9f168447c90a5d0672f0faca6bc307dd27204eacc594b6c') +sha256sums=('3dc4e3529b4bf13d4ae4ef7cc4d74c3b5c90bd96e7d9fa83db2066a2b9a36330') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/pango/PKGBUILD b/gnome-unstable/pango/PKGBUILD index 0826ef16b..6e085f97d 100644 --- a/gnome-unstable/pango/PKGBUILD +++ b/gnome-unstable/pango/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166307 2012-09-05 21:16:30Z jgc $ +# $Id: PKGBUILD 167315 2012-09-30 23:21:49Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango -pkgver=1.31.1 +pkgver=1.32.1 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ options=('!libtool') install=pango.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('b87ecdde5bf6f9a407162155edbba452923e79f86bcf8a09d6ca1916222c9f81') +sha256sums=('484babf7e1ac4bf959a0babe8168f180acb516932d70e2985de5f6e2961fcd82') build() { cd ${pkgname}-${pkgver} diff --git a/multilib/lib32-libphobos-ldc/PKGBUILD b/multilib/lib32-libphobos-ldc/PKGBUILD index 7405a48ae..4e2383460 100644 --- a/multilib/lib32-libphobos-ldc/PKGBUILD +++ b/multilib/lib32-libphobos-ldc/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 72029 2012-06-06 11:58:40Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=lib32-libphobos-ldc -pkgver=20120624 +pkgver=20121001 pkgrel=1 pkgdesc="libphobos for ldc (32-bit)" arch=('x86_64') @@ -14,7 +14,7 @@ md5sums=() _gitroot=git://github.com/ldc-developers/ldc.git _gitname=ldc -_gitbranch=llvm-3.1 +_gitbranch=master build() { cd "$srcdir" diff --git a/staging/sip/PKGBUILD b/staging/sip/PKGBUILD new file mode 100644 index 000000000..b03e62351 --- /dev/null +++ b/staging/sip/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 167297 2012-09-30 16:56:26Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> + +pkgbase=sip +pkgname=('sip' 'python-sip' 'python2-sip') +pkgver=4.14 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.riverbankcomputing.com/software/sip/" +license=('custom:"sip"') +makedepends=('python' 'python2') +source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") +md5sums=('9a48ad975e04ac824188840ea498ac32') + +build() { + cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} + + cd ${pkgbase}-${pkgver} + python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" + make + + ### Python2 version ### + cd ../python2-${pkgbase}-${pkgver} + python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" + make +} + +package_sip() { + pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries" + depends=('glibc') + + cd ${pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install -C sipgen + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_python-sip() { + pkgdesc="Python 3.x SIP bindings for C and C++ libraries" + depends=('sip' 'python') + + cd ${pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install -C siplib + + install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py + install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_python2-sip() { + pkgdesc="Python 2.x SIP bindings for C and C++ libraries" + depends=('sip' 'python2') + + cd python2-${pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install -C siplib + + install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py + install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch b/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch new file mode 100644 index 000000000..766dcb87f --- /dev/null +++ b/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch @@ -0,0 +1,124 @@ +From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Fri, 25 May 2012 19:43:24 -0400 +Subject: [PATCH] Reinstate TIMEOUT= handling + +This is mostly to deal with ipw2?00 drivers which have yet to be fixed +in the kernel. +--- + src/libudev/libudev-device.c | 19 +++++++++++++++++++ + src/libudev/libudev-private.h | 1 + + src/udev/udevd.c | 13 ++++++++++--- + 3 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index a8277d1..5966189 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -68,6 +68,7 @@ struct udev_device { + struct udev_list tags_list; + unsigned long long int seqnum; + unsigned long long int usec_initialized; ++ int timeout; + int devlink_priority; + int refcount; + dev_t devnum; +@@ -89,6 +90,21 @@ struct udev_device { + bool db_persist; + }; + ++int udev_device_get_timeout(struct udev_device *udev_device) ++{ ++ return udev_device->timeout; ++} ++ ++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) ++{ ++ char num[32]; ++ ++ udev_device->timeout = timeout; ++ snprintf(num, sizeof(num), "%u", timeout); ++ udev_device_add_property(udev_device, "TIMEOUT", num); ++ return 0; ++} ++ + /** + * udev_device_get_seqnum: + * @udev_device: udev device +@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, + + util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL); + udev_device_set_syspath(udev_device, path); ++ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { ++ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); + } else if (startswith(property, "SUBSYSTEM=")) { + udev_device_set_subsystem(udev_device, &property[10]); + } else if (startswith(property, "DEVTYPE=")) { +@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev) + udev_list_init(udev, &udev_device->sysattr_value_list, true); + udev_list_init(udev, &udev_device->sysattr_list, false); + udev_list_init(udev, &udev_device->tags_list, true); ++ udev_device->timeout = -1; + udev_device->watch_handle = -1; + /* copy global properties */ + udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) +diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h +index 4eb4a59..99aefeb 100644 +--- a/src/libudev/libudev-private.h ++++ b/src/libudev/libudev-private.h +@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); + void udev_device_set_is_initialized(struct udev_device *udev_device); + int udev_device_add_tag(struct udev_device *udev_device, const char *tag); + void udev_device_cleanup_tags_list(struct udev_device *udev_device); ++int udev_device_get_timeout(struct udev_device *udev_device); + unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); + void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); + int udev_device_get_devlink_priority(struct udev_device *udev_device); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 0d85960..cd24462 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -384,7 +384,7 @@ out: + } + } + +-static void event_run(struct event *event) ++static void event_run(struct event *event, bool force) + { + struct udev_list_node *loop; + +@@ -410,7 +410,7 @@ static void event_run(struct event *event) + return; + } + +- if (children >= children_max) { ++ if (!force && children >= children_max) { + if (children_max > 1) + log_debug("maximum number (%i) of children reached\n", children); + return; +@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev) + + event->state = EVENT_QUEUED; + udev_list_node_append(&event->node, &event_list); ++ ++ /* run all events with a timeout set immediately */ ++ if (udev_device_get_timeout(dev) > 0) { ++ event_run(event, true); ++ return 0; ++ } ++ + return 0; + } + +@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev) + if (is_devpath_busy(event)) + continue; + +- event_run(event); ++ event_run(event, false); + } + } + +-- +1.7.10.2 + diff --git a/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch new file mode 100644 index 000000000..9be6ef28f --- /dev/null +++ b/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch @@ -0,0 +1,30 @@ +From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Thu, 27 Sep 2012 20:48:13 -0400 +Subject: [PATCH] tmpfiles: restore previous behavior for F/f + +d4e9eb91ea changed the behavior for the F and f actions, wrongly sending +them to glob_item(). Restore the old behavior and shortcut straight to +write_one_file(). +--- + src/tmpfiles/tmpfiles.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index f10f908..bf900fa 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -673,6 +673,10 @@ static int create_item(Item *i) { + + case CREATE_FILE: + case TRUNCATE_FILE: ++ r = write_one_file(i, i->path); ++ if (r < 0) ++ return r; ++ break; + case WRITE_FILE: + r = glob_item(i, write_one_file); + if (r < 0) +-- +1.7.12.1 + diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD new file mode 100644 index 000000000..d29f4d172 --- /dev/null +++ b/staging/systemd/PKGBUILD @@ -0,0 +1,161 @@ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> + +pkgbase=systemd +pkgname=('systemd' 'systemd-sysvcompat') +pkgver=193 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/systemd" +license=('GPL2' 'LGPL2.1' 'MIT') +makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' + 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' + 'pam' 'python' 'quota-tools' 'xz') +options=('!libtool') +source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + 'initcpio-hook-udev' + 'initcpio-install-udev' + 'initcpio-install-timestamp' + '0001-Reinstate-TIMEOUT-handling.patch' + '0001-tmpfiles-restore-previous-behavior-for-F-f.patch' + 'use-split-usr-path.patch') +md5sums=('732a9de2b1d2a15cab639c987ff9e90e' + 'e99e9189aa2f6084ac28b8ddf605aeb8' + '59e91c4d7a69b7bf12c86a9982e37ced' + 'df69615503ad293c9ddf9d8b7755282d' + '5543be25f205f853a21fa5ee68e03f0d' + '1f435290db227c3a4f4396f86819227e' + 'fd5b5f04ab0a847373d357555129d4c0') + +build() { + cd "$pkgname-$pkgver" + + # still waiting on ipw2x00, et al to get fixed... + patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" + + # hang onto this until we do the /{,s}bin merge + patch -Np1 <"$srcdir/use-split-usr-path.patch" + + # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0 + patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch" + + ./configure \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --enable-introspection \ + --enable-gtk-doc \ + --disable-audit \ + --disable-ima \ + --with-distro=arch \ + --with-usb-ids-path=/usr/share/hwdata/usb.ids \ + --with-pci-ids-path=/usr/share/hwdata/pci.ids + + make +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package_systemd() { + pkgdesc="system and service manager" + depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' + 'pam' 'util-linux' 'xz') + provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver") + replaces=('libsystemd' 'systemd-tools' 'udev') + conflicts=('libsystemd' 'systemd-tools' 'udev') + optdepends=('initscripts: legacy support for /etc/rc.conf' + 'python2-cairo: systemd-analyze' + 'python2-dbus: systemd-analyze' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'cryptsetup: required for encrypted block devices' + 'quota-tools: kernel-level quota management') + backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + etc/dbus-1/system.d/org.freedesktop.hostname1.conf + etc/dbus-1/system.d/org.freedesktop.login1.conf + etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/logind.conf + etc/systemd/journald.conf + etc/udev/udev.conf) + install="systemd.install" + + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" + + install -dm755 "$pkgdir/bin" + ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" + + # move bash-completion and symlink for loginctl + install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ + "$pkgdir/usr/share/bash-completion/completions/systemctl" + ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" + rm -rf "$pkgdir/etc/bash_completion.d" + + # don't write units to /etc by default -- we'll enable this on post_install + # as a sane default + rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" + rmdir "$pkgdir/etc/systemd/system/getty.target.wants" + + # get rid of RPM macros + rm -r "$pkgdir/etc/rpm" + + # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work. + # https://pokersource.info/show_bug.cgi?id=50989 + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + + # the path to udevadm is hardcoded in some places + install -d "$pkgdir/sbin" + ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" + + # udevd is no longer udevd because systemd. why isn't udevadm now udevctl? + ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd" + + # add back tmpfiles.d/legacy.conf + install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" + + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group + sed -i 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules + + # add mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" + install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" + install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" + + # XXX: kill off coredump rule until the journal can recover coredumps + rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" + + ### split out manpages for sysvcompat + rm -rf "$srcdir/_sysvcompat" + install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ + mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + "$srcdir"/_sysvcompat/usr/share/man/man8 +} + +package_systemd-sysvcompat() { + pkgdesc="sysvinit compat for systemd" + conflicts=('sysvinit' 'initscripts') + depends=('sysvinit-tools') + + # the initscripts conflict here isn't actually needed, but in order to make + # this package remove both sysvinit and initscripts, the initscripts conflict + # is needed. There's no case in which you would ever want initscripts installed + # without sysvinit, and vice versa, as in both cases, they are unusable. + + mv "$srcdir/_sysvcompat"/* "$pkgdir" + + install -dm755 "$pkgdir/sbin" + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" + done + + ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" +} + +# vim: ft=sh syn=sh et diff --git a/staging/systemd/initcpio-hook-udev b/staging/systemd/initcpio-hook-udev new file mode 100644 index 000000000..75da7e4a8 --- /dev/null +++ b/staging/systemd/initcpio-hook-udev @@ -0,0 +1,20 @@ +#!/usr/bin/ash + +run_earlyhook() { + udevd --daemon --resolve-names=never + udevd_running=1 +} + +run_hook() { + msg ":: Triggering uevents..." + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices + udevadm settle +} + +run_cleanuphook() { + udevadm control --exit + udevadm info --cleanup-db +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/systemd/initcpio-install-timestamp b/staging/systemd/initcpio-install-timestamp new file mode 100644 index 000000000..259cc705b --- /dev/null +++ b/staging/systemd/initcpio-install-timestamp @@ -0,0 +1,14 @@ +#!/bin/bash + +build() { + add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp +} + +help() { + cat <<HELPEOF +Provides support for RD_TIMESTAMP in early userspace, which can be read by a +program such as systemd-analyze to determine boot time. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/systemd/initcpio-install-udev b/staging/systemd/initcpio-install-udev new file mode 100644 index 000000000..762429983 --- /dev/null +++ b/staging/systemd/initcpio-install-udev @@ -0,0 +1,28 @@ +#!/bin/bash + +build() { + local rules tool + + add_file "/etc/udev/udev.conf" + add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd + add_binary /usr/bin/udevadm + + for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + + add_runscript +} + +help() { + cat <<HELPEOF +This hook will use udev to create your root device node and detect the needed +modules for your root device. It is also required for firmware loading in +initramfs. It is recommended to use this hook. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/systemd/systemd.install b/staging/systemd/systemd.install new file mode 100644 index 000000000..784926e17 --- /dev/null +++ b/staging/systemd/systemd.install @@ -0,0 +1,29 @@ +#!/bin/sh + +sd_booted() { + [ -e sys/fs/cgroup/systemd ] +} + +post_install() { + # enable getty@tty1 by default, but don't track the file + systemctl enable getty@.service + + systemd-machine-id-setup + + echo ":: Append 'init=/bin/systemd' to your kernel command line in your" + echo " bootloader to replace sysvinit with systemd" +} + +post_upgrade() { + systemd-machine-id-setup + + # getty@tty1.service is no longer enabled by default, but we don't want to break + # existing setups. + if [ "$(vercmp 183 "$2")" -eq 1 ]; then + # systemctl seems to be whiny on sysvinit. this will succeed unless something + # horrific happens, so just mask the error. + systemctl -q enable getty@.service || true + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/systemd/use-split-usr-path.patch b/staging/systemd/use-split-usr-path.patch new file mode 100644 index 000000000..2fd32998d --- /dev/null +++ b/staging/systemd/use-split-usr-path.patch @@ -0,0 +1,14 @@ +--- a/src/core/main.c 2012-09-20 23:02:54.000000000 -0400 ++++ b/src/core/main.c 2012-09-20 23:03:13.000000000 -0400 +@@ -1455,11 +1455,7 @@ + + /* Set up PATH unless it is already set */ + setenv("PATH", +-#ifdef HAVE_SPLIT_USR + "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", +-#else +- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", +-#endif + arg_running_as == SYSTEMD_SYSTEM); + + if (arg_running_as == SYSTEMD_SYSTEM) { diff --git a/testing/hdparm/PKGBUILD b/testing/hdparm/PKGBUILD new file mode 100644 index 000000000..062bd6008 --- /dev/null +++ b/testing/hdparm/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 167301 2012-09-30 19:26:10Z tpowa $ +# Maintainer: Paul Mattal <paul@archlinux.org> + +pkgname=hdparm +pkgver=9.42 +pkgrel=1 +pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" +arch=(i686 x86_64) +depends=('glibc') +optdepends=('sh: required by idectl and ultrabayd') +source=(http://downloads.sourceforge.net/sourceforge/hdparm/${pkgname}-${pkgver}.tar.gz + wiper.sh.2_6.max-ranges.patch) +license=('BSD') +url="http://sourceforge.net/projects/hdparm/" +optdepends=('bash: for wiper.sh script') +options=('emptydirs') +md5sums=('0af5a38b212fe08f5afbe5e37f34b40b' + '74e368f384166a7710b447573cda120a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # Fix Range input/output error when wiping Intel G2 and OCZ drives + patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch + + # build + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + # install + mkdir -p ${pkgdir}/{usr,sbin} + make DESTDIR=${pkgdir} install + install -m755 contrib/idectl ${pkgdir}/sbin + install -m755 contrib/ultrabayd ${pkgdir}/sbin + + install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt + install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh + + #install license file + install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT +} diff --git a/testing/hdparm/wiper.sh.2_6.max-ranges.patch b/testing/hdparm/wiper.sh.2_6.max-ranges.patch new file mode 100644 index 000000000..c55f7b149 --- /dev/null +++ b/testing/hdparm/wiper.sh.2_6.max-ranges.patch @@ -0,0 +1,84 @@ +--- hdparm-9.28/wiper/wiper.sh.orig 2010-03-09 06:17:37.000000000 -0800 +--- hdparm-9.28/wiper/wiper.sh 2010-05-15 03:08:02.182856971 -0700 +@@ -29,7 +29,7 @@ + function usage_error(){ + echo >&2 + echo "Linux tune-up (TRIM) utility for SATA SSDs" +- echo "Usage: $0 [--verbose] [--commit] <mount_point|block_device>" >&2 ++ echo "Usage: $0 [--max-ranges <num>] [--verbose] [--commit] <mount_point|block_device>" >&2 + echo " Eg: $0 /dev/sda1" >&2 + echo >&2 + exit 1 +@@ -44,6 +44,7 @@ + + export verbose=0 + commit="" ++max_ranges=-1 + destroy_me="" + argc=$# + arg="" +@@ -51,6 +52,10 @@ + commit=yes + elif [ "$1" = "--verbose" ]; then + verbose=$((verbose + 1)) ++ elif [ "$1" = "--max-ranges" -a $argc -gt 1 ]; then ++ max_ranges=$2 ++ argc=$((argc - 1)) ++ shift + elif [ "$1" = "" ]; then + usage_error + else +@@ -499,6 +550,18 @@ + fi + fi + ++## Different SSD's have a different maximum number of ranges they'll accept ++## in a single TRIM command. ++if [ $max_ranges -le 0 ] ; then ++ model=`$HDPARM -I $rawdev | $GAWK '/Model Number/ { print $NF }'` ++ case "$model" in ++ SSDSA[12]*) max_ranges=512 ;; # Intel X18-M/X25-M ++ OCZ-VERTEX2) max_ranges=64 ;; # OCZ Vertex2 ++ *) max_ranges=65535 ++ esac ++fi ++[ $verbose -gt 0 ] && echo "max-ranges = $max_ranges" ++ + ## All ready. Now let the user know exactly what we intend to do: + ## + mountstatus="$fstype non-mounted" +@@ -608,7 +671,7 @@ + nsectors += count; + while (count > 0) { + this_count = (count > 65535) ? 65535 : count +- printf "%u:%u ", lba, this_count ++ printf "%u:%u \n", lba, this_count + if (verbose > 1) + printf "%u:%u ", lba, this_count > "/dev/stderr" + lba += this_count +@@ -695,6 +758,22 @@ + -v verbose="$verbose" \ + -v xfs_blksects="$xfs_blksects" \ + -v xfs_agoffsets="$xfs_agoffsets" \ +- "$GAWKPROG" | $TRIM ++ "$GAWKPROG" | ( ++ i=0 ++ while read range ; do ++ ranges=$ranges" "$range ++ ((i++)) ++ if [ $i -ge $max_ranges ] ; then ++ [ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n" ++ echo $ranges | $TRIM ++ ranges="" ++ i=0 ++ fi ++ done ++ if [ $i -gt 0 ] ; then ++ [ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n" ++ echo $ranges | $TRIM ++ fi ++ ) + + do_cleanup $? + + diff --git a/testing/libusbx/PKGBUILD b/testing/libusbx/PKGBUILD index 3ebee8465..dd36b151c 100644 --- a/testing/libusbx/PKGBUILD +++ b/testing/libusbx/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162718 2012-06-28 20:58:52Z tpowa $ +# $Id: PKGBUILD 167303 2012-09-30 19:31:57Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libusbx -pkgver=1.0.12 -pkgrel=2 +pkgver=1.0.14 +pkgrel=1 depends=('glibc') pkgdesc="Library that provides generic access to USB device" arch=(i686 x86_64) @@ -13,7 +13,7 @@ options=(!libtool) replaces=('libusb1' 'libusb') provides=("libusb=$pkgver") conflicts=("libusb") -md5sums=('c41352ac755c7992edfcbb2ea4ad1349') +md5sums=('0a6a75edb4b4eae7dc82c1dd71ddc470') build() { cd "${srcdir}/${pkgname}-${pkgver}" |