diff options
65 files changed, 1448 insertions, 210 deletions
diff --git a/community-staging/dwdiff/PKGBUILD b/community-staging/dwdiff/PKGBUILD new file mode 100644 index 000000000..96d5085a3 --- /dev/null +++ b/community-staging/dwdiff/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 68914 2012-04-05 16:04:54Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=dwdiff +pkgver=2.0 +pkgrel=2 +pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" +arch=('i686' 'x86_64') +url="http://os.ghalkes.nl/dwdiff.html" +depends=('diffutils' 'icu') +license=('GPL') +source=("http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz") +md5sums=('98dd16b58a1f136a2cd49f7dd88c5313') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir"/usr install +} diff --git a/community-staging/mapnik/PKGBUILD b/community-staging/mapnik/PKGBUILD new file mode 100644 index 000000000..0ebd2aea7 --- /dev/null +++ b/community-staging/mapnik/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 68916 2012-04-05 16:13:23Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: David Dent <thewinch@gmail.com> +# Contributor: orbisvicis <orbisvicis@gmail.com> + +pkgname=mapnik +pkgver=0.7.1 +pkgrel=16 +pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" +arch=('i686' 'x86_64') +url="http://mapnik.org/" +license=('LGPL') +depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' + 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' + 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool') + # already in core ('zlib' 'sqlite3') +optdepends=('libxslt: Web Map Service' + 'python2-lxml: Web Map Service' + 'python-imaging: Web Map Service' + 'python-nose: Web Map Service' + 'apache: Web Map Service' + 'mod_fastcgi: Web Map Service - or:' + 'mod_fcgid: Web Map Service - or:' + 'mod_wsgi: Web Map Service' + ) +makedepends=('scons' 'boost') # already in core ('pkg-config') +install="mapnik.install" +source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'gcc47.patch') +md5sums=('8f65fda2a792518d6f6be8a85f62fc73' + 'ce7933dc20de7e07427a6a6b5d4fd002') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "${srcdir}"/gcc47.patch + + #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64 + sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct + sed -i 's|png_ptr->io_ptr|png_get_io_ptr(png_ptr)|g' src/png_reader.cpp + sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct + + scons configure \ + PREFIX="/usr" \ + INPUT_PLUGINS=all \ + DESTDIR="$pkgdir" + scons +} + +package(){ + cd "$srcdir/$pkgname-$pkgver" + scons install + # fix permissions on SCons-autogenerated files + chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py" +} diff --git a/community-staging/mapnik/gcc47.patch b/community-staging/mapnik/gcc47.patch new file mode 100644 index 000000000..0532e0c21 --- /dev/null +++ b/community-staging/mapnik/gcc47.patch @@ -0,0 +1,11 @@ +--- mapnik-0.7.1/include/mapnik/factory.hpp~ 2010-03-22 16:40:04.000000000 +0000 ++++ mapnik-0.7.1/include/mapnik/factory.hpp 2012-04-05 15:55:13.460191219 +0000 +@@ -84,7 +84,7 @@ + { + return (pos->second)(file); + } +- return on_unknown_type(key); ++ return this->on_unknown_type(key); + } + }; + } diff --git a/community-staging/mapnik/mapnik.install b/community-staging/mapnik/mapnik.install new file mode 100644 index 000000000..46f265d5b --- /dev/null +++ b/community-staging/mapnik/mapnik.install @@ -0,0 +1,11 @@ +post_install() { + /sbin/ldconfig +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/open-vm-tools/PKGBUILD b/community-staging/open-vm-tools/PKGBUILD new file mode 100644 index 000000000..f7415a255 --- /dev/null +++ b/community-staging/open-vm-tools/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 68912 2012-04-05 15:58:59Z andrea $ +# 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 +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') +makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst') +optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm') +options=('docs' '!libtool') +install=$pkgname.install +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz + scripts-network.patch + scripts-network-FS19541.patch + open-vm-tools-X11Bool.patch + open-vm-tools.conf.d + open-vm-tools.rc.d + tools.conf + vmware-guestd + xautostart.conf) +md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7' + 'b8f68fef3d388489e40dba581b6da18a' + '199508b0d3fe6fa9b726d09170bf51f1' + '8c333a979578bdc0c3134c1dd6bb7353' + '79b0a14d86191fee70a4639da8bd7785' + '67cb83a9e5a4dd016c1a1da2863ca36d' + 'b55d15e2c4be396aad709aeca91033d3' + '73cc1a2665b0dd62427733d62ead8b9a' + '75a25d83417e683957321f97a00f8465') + +build() { + cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" + + [ -f Makefile ] || ./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 + + 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 + + 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 {}" \; +} diff --git a/community-staging/open-vm-tools/open-vm-tools-X11Bool.patch b/community-staging/open-vm-tools/open-vm-tools-X11Bool.patch new file mode 100644 index 000000000..f12581807 --- /dev/null +++ b/community-staging/open-vm-tools/open-vm-tools-X11Bool.patch @@ -0,0 +1,15 @@ +diff -wbBur open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h +--- open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h 2010-08-24 19:59:22.000000000 +0000 ++++ open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h 2010-08-30 09:38:48.000000000 +0000 +@@ -83,8 +83,11 @@ + + /* STRICT ANSI means the Xserver build and X defines Bool differently. */ + #if !defined(__STRICT_ANSI__) || defined(__FreeBSD__) || defined(__MINGW32__) ++# ifndef _XTYPEDEF_BOOL ++# define _XTYPEDEF_BOOL + typedef char Bool; + #endif ++#endif + + #ifndef FALSE + #define FALSE 0 diff --git a/community-staging/open-vm-tools/open-vm-tools.conf.d b/community-staging/open-vm-tools/open-vm-tools.conf.d new file mode 100644 index 000000000..83f7864e8 --- /dev/null +++ b/community-staging/open-vm-tools/open-vm-tools.conf.d @@ -0,0 +1,6 @@ +# Enable support for Drag'n'Drop +VM_DRAG_AND_DROP="yes" + +# vmware-guestd settings +GUESTD_BIN="/usr/sbin/vmware-guestd" +PIDFILE="/var/run/vmware-guestd.pid" diff --git a/community-staging/open-vm-tools/open-vm-tools.install b/community-staging/open-vm-tools/open-vm-tools.install new file mode 100644 index 000000000..88d9b88e6 --- /dev/null +++ b/community-staging/open-vm-tools/open-vm-tools.install @@ -0,0 +1,10 @@ +post_install() { + [ ! -d "/mnt/hgfs" ] && mkdir /mnt/hgfs + echo ">>>" + echo ">>> You can mount VMware Shared Folders via:" + echo ">>> mount -t vmhgfs .host:/ /mnt/hgfs" + echo ">>>" + echo ">>> or by adding this line to /etc/fstab:" + echo ">>> .host:/ /mnt/hgfs vmhgfs defaults 0 0" + echo ">>>" +} diff --git a/community-staging/open-vm-tools/open-vm-tools.rc.d b/community-staging/open-vm-tools/open-vm-tools.rc.d new file mode 100644 index 000000000..0c9221489 --- /dev/null +++ b/community-staging/open-vm-tools/open-vm-tools.rc.d @@ -0,0 +1,101 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/open-vm-tools ] && . /etc/conf.d/open-vm-tools + +PID=`pidof -o %PPID /usr/bin/vmtoolsd` +case "$1" in + start) + stat_busy "Starting Open Virtual Machine Tools" + + if [ "$VM_DRAG_AND_DROP" == "yes" ]; then + VMBLOCK=`grep -w vmblock /proc/modules` + [ -z "$VMBLOCK" ] && modprobe vmblock + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + + DND_TMPDIR="/tmp/VMwareDnD" + if [ ! -d "$DND_TMPDIR" ]; then + mkdir $DND_TMPDIR + chmod 1777 $DND_TMPDIR + fi + + mount -t vmblock none /proc/fs/vmblock/mountPoint + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + fi + + + for m in vmhgfs vmsync; do + VMMOD=`grep -w $m /proc/modules` + [ -z "$VMMOD" ] && \ + { modprobe $m + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi; } + done + + + [ -z "$PID" ] && /usr/bin/vmtoolsd --background $PIDFILE + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon open-vm-tools + stat_done + fi + ;; + stop) + stat_busy "Stopping Open Virtual Machine Tools" + [ ! -z "$PID" ] && kill $PID &>/dev/null +# if [ $? -gt 0 ]; then +# stat_fail +# exit 1 +# fi + + for m in vmhgfs vmsync vmci; do + VMMOD=`grep -w $m /proc/modules` + [ ! -z "$VMMOD" ] && rmmod $m + if [ $? -gt 0 ]; then + stat_fail + exit 4 + fi + done + + if [ "$VM_DRAG_AND_DROP" == "yes" ]; then + MOUNTPOINT=`grep -w "none /proc/fs/vmblock/mountPoint vmblock" /proc/modules` + [ -z "$MOUNTPOINT" ] && umount /proc/fs/vmblock/mountPoint + if [ $? -gt 0 ]; then + stat_fail + exit 5 + fi + + DND_TMPDIR="/tmp/VMwareDnD" + rm -r $DND_TMPDIR + + VMBLOCK=`grep -w vmblock /proc/modules` + [ ! -z "$VMBLOCK" ] && rmmod vmblock + if [ $? -gt 0 ]; then + stat_fail + exit 6 + fi + fi + + rm_daemon open-vm-tools + stat_done + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/open-vm-tools/scripts-network-FS19541.patch b/community-staging/open-vm-tools/scripts-network-FS19541.patch new file mode 100644 index 000000000..5fcb33ba8 --- /dev/null +++ b/community-staging/open-vm-tools/scripts-network-FS19541.patch @@ -0,0 +1,38 @@ +--- network.orig 2011-11-09 18:42:28.000000000 +0400 ++++ network 2011-11-09 18:46:22.000000000 +0400 +@@ -76,7 +76,7 @@ + else + echo `date` "[rescue_nic] activating $nic ..." + +- ifup $nic ++ ifconfig $nic up + exitCode=`expr $exitCode \| $?` + fi + done < $activeList +@@ -105,7 +105,7 @@ + # `which' may be a bit noisy, so we'll shush it. + dbusSend=`which dbus-send 2>/dev/null` + rc=$? +- if [ $rc = 0 ]; then ++ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then + # NetworkManager 0.8.0 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ +@@ -154,7 +154,7 @@ + # `which' may be a bit noisy, so we'll shush it. + dbusSend=`which dbus-send 2>/dev/null` + rc=$? +- if [ $rc = 0 ]; then ++ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then + # NetworkManager 0.8.0 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ +@@ -203,7 +203,7 @@ + + # XXX Are these really necessary? If so, we should have seen customer + # complaints by now. +- which ifup >/dev/null 2>&1 || Panic "ifup not in search path." ++# which ifup >/dev/null 2>&1 || Panic "ifup not in search path." + which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." + + case "$1" in diff --git a/community-staging/open-vm-tools/scripts-network.patch b/community-staging/open-vm-tools/scripts-network.patch new file mode 100644 index 000000000..44c7e6dcb --- /dev/null +++ b/community-staging/open-vm-tools/scripts-network.patch @@ -0,0 +1,73 @@ +--- network.org 2012-03-17 22:20:11.000000000 +0400 ++++ network 2012-03-17 22:18:47.000000000 +0400 +@@ -34,51 +34,6 @@ + + + # +-# find_networking_script -- +-# +-# Searches common Linux distro init/rc paths to find a singular network +-# services script. +-# +-# Result: +-# Returns a valid networking script path on success or "error" on failure. +-# +-# Side effects: +-# None. +-# +- +-find_networking_script() { +- local script="error" +- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do +- if [ -d "$dir/rc0.d" ] && +- [ -d "$dir/rc1.d" ] && +- [ -d "$dir/rc2.d" ] && +- [ -d "$dir/rc3.d" ] && +- [ -d "$dir/rc4.d" ] && +- [ -d "$dir/rc5.d" ] && +- [ -d "$dir/rc6.d" ]; then +- +- # Now find the appropriate networking script. +- if [ -d "$dir/init.d" ]; then +- if [ -x "$dir/init.d/network" ]; then +- script="$dir/init.d/network" +- elif [ -x "$dir/init.d/networking" ]; then +- script="$dir/init.d/networking" +- fi +- else +- if [ -x "$dir/network" ]; then +- script="$dir/network" +- elif [ -x "$dir/networking" ]; then +- script="$dir/networking" +- fi +- fi +- fi +- done +- +- echo "$script" +-} +- +- +-# + # run_network_script -- + # + # Finds out how to run the system's script used to control networking, and +@@ -87,17 +42,7 @@ + # + run_network_script() + { +- script=`find_networking_script` +- [ "$script" != "error" ] || Panic "Cannot find system networking script." +- +- # Using SysV "service" if it exists, otherwise fall back to run the script directly +- service=`which service 2>/dev/null` +- if [ $? = 0 -a -n "$service" ]; then +- serviceName=`basename "$script"` +- "$service" "$serviceName" "$1" +- else +- "$script" "$1" +- fi ++ /etc/rc.d/network "$1" + } + + diff --git a/community-staging/open-vm-tools/tools.conf b/community-staging/open-vm-tools/tools.conf new file mode 100644 index 000000000..0bb2681b1 --- /dev/null +++ b/community-staging/open-vm-tools/tools.conf @@ -0,0 +1 @@ +bindir = "/usr/bin" diff --git a/community-staging/open-vm-tools/vmware-guestd b/community-staging/open-vm-tools/vmware-guestd new file mode 100644 index 000000000..ac80c0385 --- /dev/null +++ b/community-staging/open-vm-tools/vmware-guestd @@ -0,0 +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 diff --git a/community-staging/open-vm-tools/xautostart.conf b/community-staging/open-vm-tools/xautostart.conf new file mode 100644 index 000000000..829f379ce --- /dev/null +++ b/community-staging/open-vm-tools/xautostart.conf @@ -0,0 +1,6 @@ +gnome-panel +ksmserver +startkde +kwrapper +panel +xfce4-panel diff --git a/community-staging/parrot/PKGBUILD b/community-staging/parrot/PKGBUILD new file mode 100644 index 000000000..257e5b8e3 --- /dev/null +++ b/community-staging/parrot/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 68910 2012-04-05 15:46:23Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: mpie <michael.kyne-phillips1@ntlworld.com> + +pkgname=parrot +pkgver=4.2.0 +#_rel=stable +_rel=devel +pkgrel=1 +pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" +arch=('x86_64' 'i686') +url="http://www.parrotcode.org/" +license=('GPL') +depends=('icu' 'openssl' 'libffi') +makedepends=('perl-json') +optdepends=('freeglut') +options=(!makeflags) +source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('69ee93d9f81babcff67b747cc614358958a32f274e407b65771ca5a056d4c3d4') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's#auto::sha1##' lib/Parrot/Configure/Step/List.pm + sed -i 's#auto::git_describe##' lib/Parrot/Configure/Step/List.pm + + perl Configure.pl --prefix=/usr \ + --parrot_is_shared \ + --disable-rpath + + find -type f -name Makefile | while read F; do + grep "$srcdir" $F && sed -i \ + "s#-Wl,-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F + grep "$srcdir" $F && sed -i \ + "s#-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F + done + + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib" + make all parrot_utils docs html +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install-dev + + sed -i "s#$srcdir#/usr/src#" \ + $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm +} diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD new file mode 100644 index 000000000..2885e3ca4 --- /dev/null +++ b/community/cdrtools/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 68902 2012-04-05 11:43:49Z stativ $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +pkgname=cdrtools +pkgver=3.01a07 +pkgrel=2 +pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning" +arch=('i686' 'x86_64') +url="http://cdrecord.berlios.de/private/cdrecord.html" +license=('CDDL') +depends=('acl') +conflicts=('cdrkit') +provides=('cdrkit') +options=(!makeflags) +backup=('etc/default/cdrecord' 'etc/default/rscsi') +install=cdrtools.install +source=(ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.gz) +md5sums=('b690d11ee6c9464b89d8684172807b51') + +build() { + cd "$srcdir"/cdrtools-${pkgver%%a*} + sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux + sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux + + export GMAKE_NOWARN=true + make INS_BASE=/usr INS_RBASE=/ +} + +package() { + cd "$srcdir"/cdrtools-${pkgver%%a*} + export GMAKE_NOWARN=true + + make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install + rm -rf "$pkgdir"/usr/include + rm -rf "$pkgdir"/usr/lib/{*.a,profiled} + find "$pkgdir" -type d -perm 775 -exec chmod 755 '{}' ';' + find "$pkgdir" -type f -perm 4711 -exec chmod 755 '{}' ';' +} + +# vim:set ts=2 sw=2 et: diff --git a/community/cdrtools/cdrtools.install b/community/cdrtools/cdrtools.install new file mode 100644 index 000000000..af3800716 --- /dev/null +++ b/community/cdrtools/cdrtools.install @@ -0,0 +1,10 @@ + +post_install() { + echo "To allow other users than root execute rscsi add an entry" + echo "to /etc/default/rscsi or use an \"rscsi\" user" + echo "" + echo "If you get folowing error while executing \"cdrecord --scanbus\":" + echo " No such file or directory. Cannot open '/dev/pg*'. Cannot open or use SCSI driver." + echo "you may need to load the sg module manually using \"modprobe sg\"." +} + diff --git a/community/lomoco/PKGBUILD b/community/lomoco/PKGBUILD index a5916c2f0..fc8ca5598 100644 --- a/community/lomoco/PKGBUILD +++ b/community/lomoco/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67826 2012-03-14 16:31:38Z spupykin $ +# $Id: PKGBUILD 68931 2012-04-06 00:04:27Z dreisner $ # Maintainer: Jeff Mickey <j@codemac.net> # Contributor: Shadowhand <woody.gilk@gmail.com> pkgname=lomoco pkgver=1.0 -pkgrel=7 +pkgrel=8 url="http://www.lomoco.org/" pkgdesc="Logitech USB mouse configuration program" license=('GPL') @@ -34,7 +34,7 @@ build() { sed -i 's|/etc/sysconfig/logitech_mouse|/etc/udev/lomoco_mouse.conf|g' udev/udev.lomoco sed -i 's|RUN="lomoco"|RUN+="lomoco.sh"|g' udev/lomoco.rules sed -i 's|SYSFS|ATTR|' udev/lomoco.rules - install -D -m 644 udev/lomoco.rules ${pkgdir}/etc/udev/rules.d/80-lomoco.rules - install -D -m 755 ../lomoco.sh ${pkgdir}/lib/udev/lomoco.sh - install -D -m 644 ../lomoco_mouse.conf ${pkgdir}/etc/udev/ + install -D -m 644 udev/lomoco.rules ${pkgdir}/usr/lib/udev/rules.d/80-lomoco.rules + install -D -m 755 ../lomoco.sh ${pkgdir}/usr/lib/udev/lomoco.sh + install -D -m 644 ../lomoco_mouse.conf ${pkgdir}/etc/udev/lomoco_mouse.conf } diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD index bf4c18da8..7d9c38e2d 100644 --- a/community/multipath-tools/PKGBUILD +++ b/community/multipath-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64893 2012-02-18 19:44:21Z bpiotrowski $ +# $Id: PKGBUILD 68933 2012-04-06 00:04:44Z dreisner $ # Maintainer: # Contributor: Thomas S Hatch <thatch45 ar gmail dot com> # Contributor: Michael P <ptchinster@archlinux.us> @@ -6,42 +6,39 @@ pkgname=multipath-tools pkgver=0.4.9 -pkgrel=5 +pkgrel=6 pkgdesc="Multipath Tools For Linux" arch=('i686' 'x86_64') url="http://christophe.varoqui.free.fr/" license=('GPL') depends=('libaio' 'device-mapper') -backup=('etc/multipath.conf' 'etc/multipath.conf.annotated' 'etc/rc.d/multipathd' ) +backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') install=multipath-tools.install +options=('!emptydirs') source=("http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2" - "multipath.conf" - "multipath.conf.annotated" - "multipathd.rc" - 'fix-build.patch') + "multipath.conf" "multipath.conf.annotated" "multipathd.rc" 'fix-build.patch') md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' - 'd0fb11398cc628c7997111efdc5d52e5' - '5a93f993ec05fc99094d5139aabd3925' - '1c2dcf43a6b5ae84ec1fae0fee071336' + '9324ff0ba8330dcb21b2fcf64988026f' + 'be11462922eeeb9fcd2ba5f3f137b7d9' + '7c04ef96441363b0d43a2ebb13a87659' '2576fc535d7fa767837b1c7827013e52') build() { - #Needs to be fixed upstream. Refer to - # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 - cd "$srcdir" - - patch -p1 -i "${srcdir}"/fix-build.patch + patch -p1 -i fix-build.patch - env LDFLAGS=${LDFLAGS//-Wl,--as-needed}\ - make + sed -i 's|etc/udev|usr/lib/udev|g' multipath/Makefile kpartx/Makefile + sed -i 's|/sbin/|/usr/bin/|g' kpartx/kpartx.rules + + # Needs to be fixed upstream. Refer to + # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 + export LDFLAGS=${LDFLAGS/-Wl,--as-needed} + + make } package() { - cd "$srcdir" - - make LIB="lib" DESTDIR="$pkgdir" install - - install -D -m 644 "$srcdir"/multipath.conf "$pkgdir"/etc/multipath.conf - install -D -m 644 "$srcdir"/multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated - install -D -m 755 "$srcdir"/multipathd.rc "$pkgdir"/etc/rc.d/multipathd + make LIB="usr/lib" DESTDIR="$pkgdir" bindir="/usr/bin" libudevdir="/usr/lib/udev" install + install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf + install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated + install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd } diff --git a/community/multipath-tools/multipath.conf b/community/multipath-tools/multipath.conf index ba9f788ae..6dacf093d 100644 --- a/community/multipath-tools/multipath.conf +++ b/community/multipath-tools/multipath.conf @@ -3,6 +3,6 @@ # defaults { - getuid_callout"/lib/udev/scsi_id -g -u -d /dev/%n" + getuid_callout "/usr/lib/udev/scsi_id -g -u -d /dev/%n" } diff --git a/community/multipath-tools/multipath.conf.annotated b/community/multipath-tools/multipath.conf.annotated index e6cfe9a1a..b79488413 100644 --- a/community/multipath-tools/multipath.conf.annotated +++ b/community/multipath-tools/multipath.conf.annotated @@ -47,9 +47,9 @@ # # scope : multipath # # desc : the default program and args to callout to obtain a unique # # path identifier. Absolute path required -# # default : /lib/udev/scsi_id -g -u -s +# # default : /usr/lib/udev/scsi_id -g -u -s # # -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" # # # # # name : prio_callout @@ -291,9 +291,9 @@ # # scope : multipath # # desc : the program and args to callout to obtain a unique # # path identifier. Absolute path required -# # default : /lib/udev/scsi_id -g -u -s +# # default : /usr/lib/udev/scsi_id -g -u -s # # -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" # # # # # name : prio_callout diff --git a/community/multipath-tools/multipathd.rc b/community/multipath-tools/multipathd.rc index 21ffcaa5a..7f5ef5d6a 100644 --- a/community/multipath-tools/multipathd.rc +++ b/community/multipath-tools/multipathd.rc @@ -6,7 +6,7 @@ case "$1" in start) stat_busy "Starting multipathd" - /sbin/multipathd + /usr/bin/multipathd if [ $? -gt 0 ]; then stat_fail else diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index cb30236db..296fe740b 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 63728 2012-02-05 12:09:41Z ibiru $ +# $Id: PKGBUILD 68906 2012-04-05 13:36:30Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com> # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com> # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz> # Contributor: Archie <mymaud@gmail.com> pkgname=rawtherapee -pkgver=4.0.7 +pkgver=4.0.8 pkgrel=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64') @@ -14,41 +14,19 @@ license=('GPL3') depends=('gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('mercurial' 'cmake') install=rawtherapee.install -source=() -md5sums=() - -_root="https://rawtherapee.googlecode.com/hg/" -_repo="rawtherapee" +source=("http://rawtherapee.googlecode.com/files/rawtherapee-source-$pkgver.tar.xz") +md5sums=('27b988200c5ff3f2863e1d83200657b2') build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [ -d $_repo ] ; then - cd $_repo - hg pull - hg up "$pkgver" - msg "The local files are updated." - else - hg clone -u "$pkgver" $_root $_repo - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting make..." - - if [ -e "$srcdir/$_repo-build" ]; then - rm -rf "$srcdir/$_repo-build" - fi - mkdir "$srcdir/$_repo-build" - cd "$srcdir/$_repo-build" + cd "$srcdir/$pkgname-$pkgver" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - ../$_repo + . make } package() { - cd "$srcdir/$_repo-build" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index f91a9e5d5..7e6523384 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62742 2012-01-25 15:39:27Z spupykin $ +# $Id: PKGBUILD 68925 2012-04-06 00:04:01Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog pkgver=6.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') @@ -39,7 +39,7 @@ build() { --enable-snmp \ --enable-gnutls \ --enable-inet \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system make } package() { @@ -50,4 +50,7 @@ package() { install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} + + # fix location of systemctl + sed -i 's@/bin/systemctl@/usr&@' "$pkgdir/usr/lib/systemd/system/rsyslog.service" } diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD index 3bf09ecd3..aa7f8115a 100644 --- a/community/task/PKGBUILD +++ b/community/task/PKGBUILD @@ -6,14 +6,14 @@ pkgname=task pkgver=2.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="A command-line todo list manager" arch=('i686' 'x86_64') url="http://taskwarrior.org/projects/show/taskwarrior/" license=('MIT') -depends=() +depends=('lua') makedepends=('cmake' 'lua') -optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon' 'lua: for luaexport addon') +optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon') source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz) sha256sums=('78971e366c2395de1cc4b0c4fc41dd950c309d3bc2f6e9594b4c5821ad6775bd') diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD index 4581b2c20..43fab3af7 100644 --- a/community/tinc/PKGBUILD +++ b/community/tinc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67628 2012-03-13 14:39:35Z tredaelli $ +# $Id: PKGBUILD 68908 2012-04-05 15:23:32Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: helios # Contributor: Lothar Gesslein pkgname=tinc -pkgver=1.0.17 +pkgver=1.0.18 pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ backup=(etc/conf.d/tincd.conf) install=tinc.install source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig} tincd.rc tincd.conf) -md5sums=('cd9e94e472584f9fe96cd86b42345afe' - 'dc30876057f888cb40b9e442ec54247b' +md5sums=('9352d53e892df4127e839f54a0e8af2a' + '1c219383bff7cc57024a9a25cd7fca5d' '64bb53748d9051255f243003f0d511f5' '7c0276d4812cc5d3cc18142562a3aa82') diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index bc38aa87d..e71648846 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62881 2012-01-28 14:42:08Z spupykin $ +# $Id: PKGBUILD 68929 2012-04-06 00:04:17Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch pkgver=1.2.2 -pkgrel=1 +pkgrel=2 _pkgdata=20120120 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64') @@ -28,15 +28,12 @@ build() { package() { cd $srcdir/usb-modeswitch-$pkgver/ - mkdir -p $pkgdir/lib/udev/usb_modeswitch + mkdir -p $pkgdir/usr/lib/udev mkdir -p $pkgdir/etc mkdir -p $pkgdir/usr/share/man/man1 - make DESTDIR=${pkgdir} install - - mv ${pkgdir}/lib/udev/usb_modeswitch/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch.sh - rmdir ${pkgdir}/lib/udev/usb_modeswitch - mv ${pkgdir}/lib/udev/usb_modeswitch.sh ${pkgdir}/lib/udev/usb_modeswitch + make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev install + cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup cd $srcdir/usb-modeswitch-data-${_pkgdata} diff --git a/community/xonotic/PKGBUILD b/community/xonotic/PKGBUILD index 9a01eb7c3..1aa1927d9 100644 --- a/community/xonotic/PKGBUILD +++ b/community/xonotic/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Alexander Suhoverhov <cy at ngs dot ru> pkgname=xonotic pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="A free, fast-paced crossplatform first-person shooter" arch=('i686' 'x86_64') url="http://xonotic.org" @@ -29,6 +29,10 @@ build() { make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 cl-release make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 sdl-release make -C Xonotic/source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" DP_FS_BASEDIR=/usr/share/xonotic/ DP_LINK_TO_LIBJPEG=1 sv-release + + cd $srcdir/Xonotic/source/d0_blind_id + ./configure --prefix=/usr --disable-rijndael + make } package() { @@ -43,6 +47,10 @@ package() { mkdir -p $pkgdir/usr/share/applications install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications install -Dm644 $srcdir/Xonotic/misc/logos/icons_png/xonotic_512.png $pkgdir/usr/share/pixmaps/xonotic.png + + # crypto stuff + cd $srcdir/Xonotic/source/d0_blind_id + make DESTDIR=$pkgdir install } # vim: ts=2:sw=2 et: diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index bf8da587f..ce8ac114e 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 154510 2012-03-29 17:58:41Z ronald $ +# $Id: PKGBUILD 155703 2012-04-05 10:02:36Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.5.5 +pkgver=5.5.6 pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/dhcpcd/" @@ -16,16 +16,12 @@ backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ 'dhcpcd.conf.d') -sha1sums=('1856ad1535f2c7551cefcb492af24d345c6a1b50' +sha1sums=('7f9ca207bce051252c0acb6a6cae3de22babcb20' 'b67b9ce6a2faaca75fea356966a16be2283b7db0') build() { cd ${srcdir}/${pkgname}-${pkgver} - # remove net-tools dep (upstream now) -# patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch -# patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch - # configure variables ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \ --rundir=/run diff --git a/core/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch b/core/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch new file mode 100644 index 000000000..bf2c3501f --- /dev/null +++ b/core/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch @@ -0,0 +1,50 @@ +From 666ba68a0635048aea0db70cd9ec61aea9b61ed2 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sat, 3 Mar 2012 12:37:06 +0100 +Subject: [PATCH 1/2] split usr: read configs from /lib/{depmod.d,modprobe.d} + +This allows rootprefix to be set to /usr, even if not all other packages +have been fixed to read from this dir. +--- + libkmod/libkmod.c | 5 +++-- + tools/kmod-depmod.c | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c +index 36ca629..12c1112 100644 +--- a/libkmod/libkmod.c ++++ b/libkmod/libkmod.c +@@ -62,6 +62,7 @@ static const char *default_config_paths[] = { + SYSCONFDIR "/modprobe.d", + "/run/modprobe.d", + ROOTPREFIX "/lib/modprobe.d", ++ "/lib/modprobe.d", + NULL + }; + +@@ -223,8 +224,8 @@ static char *get_kernel_release(const char *dirname) + * @config_paths: ordered array of paths (directories or files) where + * to load from user-defined configuration parameters such as + * alias, blacklists, commands (install, remove). If +- * NULL defaults to /run/modprobe.d, /etc/modprobe.d and +- * $rootprefix/lib/modprobe.d. Give an empty vector if ++ * NULL defaults to /run/modprobe.d, /etc/modprobe.d, ++ * $rootprefix/lib/modprobe.d and /lib/modprobe.d. Give an empty vector if + * configuration should not be read. This array must be null + * terminated. + * +diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c +index 1871e18..7bb1c5d 100644 +--- a/tools/kmod-depmod.c ++++ b/tools/kmod-depmod.c +@@ -58,6 +58,7 @@ static const char *default_cfg_paths[] = { + "/run/depmod.d", + SYSCONFDIR "/depmod.d", + ROOTPREFIX "/lib/depmod.d", ++ "/lib/depmod.d", + NULL + }; + +-- +1.7.9.5 + diff --git a/core/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch b/core/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch new file mode 100644 index 000000000..f39f36ace --- /dev/null +++ b/core/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch @@ -0,0 +1,93 @@ +From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sat, 31 Mar 2012 12:17:39 +0200 +Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules + +This means that we can move the configuration paths from /lib +to /usr/lib without having to touch the kernel and related +packages. + +That can be dealt with separately at a later location, in which case +all we have to do is revert this patch. + +Signed-off-by: Tom Gundersen <teg@jklm.no> +--- + libkmod/libkmod.c | 2 +- + tools/kmod-depmod.c | 2 +- + tools/kmod-modinfo.c | 4 ++-- + tools/kmod-modprobe.c | 4 ++-- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c +index 12c1112..11edfa0 100644 +--- a/libkmod/libkmod.c ++++ b/libkmod/libkmod.c +@@ -196,7 +196,7 @@ static int log_priority(const char *priority) + return 0; + } + +-static const char *dirname_default_prefix = ROOTPREFIX "/lib/modules"; ++static const char *dirname_default_prefix = "/lib/modules"; + + static char *get_kernel_release(const char *dirname) + { +diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c +index 7bb1c5d..454d538 100644 +--- a/tools/kmod-depmod.c ++++ b/tools/kmod-depmod.c +@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[]) + } + + cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX, +- "%s" ROOTPREFIX "/lib/modules/%s", ++ "%s/lib/modules/%s", + root == NULL ? "" : root, cfg.kversion); + + if (optind == argc) +diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c +index aa5223f..b13cd4b 100644 +--- a/tools/kmod-modinfo.c ++++ b/tools/kmod-modinfo.c +@@ -339,7 +339,7 @@ static void help(const char *progname) + "\t-0, --null Use \\0 instead of \\n\n" + "\t-F, --field=FIELD Print only provided FIELD\n" + "\t-k, --set-version=VERSION Use VERSION instead of `uname -r`\n" +- "\t-b, --basedir=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n" ++ "\t-b, --basedir=DIR Use DIR as filesystem root for /lib/modules\n" + "\t-V, --version Show version\n" + "\t-h, --help Show this help\n", + progname); +@@ -439,7 +439,7 @@ static int do_modinfo(int argc, char *argv[]) + } + kversion = u.release; + } +- snprintf(dirname_buf, sizeof(dirname_buf), "%s" ROOTPREFIX "/lib/modules/%s", ++ snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s", + root, kversion); + dirname = dirname_buf; + } +diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c +index 4760682..ccb41d8 100644 +--- a/tools/kmod-modprobe.c ++++ b/tools/kmod-modprobe.c +@@ -128,7 +128,7 @@ static void help(const char *progname) + "\t-n, --show Same as --dry-run\n" + + "\t-C, --config=FILE Use FILE instead of default search paths\n" +- "\t-d, --dirname=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n" ++ "\t-d, --dirname=DIR Use DIR as filesystem root for /lib/modules\n" + "\t-S, --set-version=VERSION Use VERSION instead of `uname -r`\n" + + "\t-s, --syslog print to syslog, not stderr\n" +@@ -973,7 +973,7 @@ static int do_modprobe(int argc, char **orig_argv) + kversion = u.release; + } + snprintf(dirname_buf, sizeof(dirname_buf), +- "%s" ROOTPREFIX "/lib/modules/%s", root, ++ "%s/lib/modules/%s", root, + kversion); + dirname = dirname_buf; + } +-- +1.7.9.5 + diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 3f933fae3..88ad2f13d 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154256 2012-03-25 02:41:50Z dreisner $ +# $Id: PKGBUILD 155732 2012-04-06 00:04:08Z tomegun $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod pkgver=7 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' @@ -14,16 +14,24 @@ provides=('module-init-tools=3.16') conflicts=('module-init-tools') replaces=('module-init-tools') source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" - "depmod-search.conf") + "depmod-search.conf" + "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch" + "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch") md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb' - '09d8af2ba37c5902d904275cb27f1b09') + 'dd62cbf62bd8f212f51ef8c43bec9a77' + 'ba73b9e98db1abbf41274f922fcfbd55' + 'c9af56636c5667cf4ce3a31ea56e03d9') build() { cd "$pkgname-$pkgver" + patch -p1 -i ../0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch + patch -p1 -i ../0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch + ./configure \ --sysconfdir=/etc \ - --with-zlib + --with-zlib \ + --with-rootprefix=/usr make } @@ -36,7 +44,7 @@ package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install # extra directories - install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d "$pkgdir/sbin" + install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin" # add symlinks to kmod ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" @@ -47,7 +55,7 @@ package() { done # install depmod.d file for search/ dir - install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/lib/depmod.d/search.conf" + install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/usr/lib/depmod.d/search.conf" } # vim: ft=sh syn=sh et diff --git a/core/kmod/depmod-search.conf b/core/kmod/depmod-search.conf index 240606a88..36f2cf7db 100644 --- a/core/kmod/depmod-search.conf +++ b/core/kmod/depmod-search.conf @@ -1,5 +1,5 @@ # -# /lib/depmod.d/search.conf +# /usr/lib/depmod.d/search.conf # search updates extramodules built-in diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD index 59959a831..fcc599665 100644 --- a/core/pcmciautils/PKGBUILD +++ b/core/pcmciautils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153635 2012-03-16 22:34:37Z tomegun $ +# $Id: PKGBUILD 155725 2012-04-06 00:03:55Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=pcmciautils pkgver=018 -pkgrel=2 +pkgrel=4 pkgdesc="Utilities for inserting and removing PCMCIA cards" arch=(i686 x86_64) url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" @@ -13,17 +13,23 @@ groups=('base') depends=('udev' 'sysfsutils') conflicts=('pcmcia-cs') # source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz + initcpio-install-pcmcia) options=(!makeflags) build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's,/usr/bin/install,/bin/install,g' Makefile + sed -i -e 's,/usr/bin/install,install,g; + s,/lib/udev,/usr/lib/udev,g' Makefile make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + # install the mkinitpcio hook + install -D -m644 ../initcpio-install-pcmcia ${pkgdir}/usr/lib/initcpio/install/pcmcia } -md5sums=('964c802994677a71b38ec56554aa229f') +md5sums=('964c802994677a71b38ec56554aa229f' + '2659576a4637c58c4e79a96f8e43e316') diff --git a/core/pcmciautils/initcpio-install-pcmcia b/core/pcmciautils/initcpio-install-pcmcia new file mode 100644 index 000000000..71052d6b2 --- /dev/null +++ b/core/pcmciautils/initcpio-install-pcmcia @@ -0,0 +1,22 @@ +#!/bin/bash + +build() { + FILES="/etc/pcmcia/config.opts" + MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')" + + [[ $MODULES ]] && MODULES+=" sd_mod?" + + add_binary "/usr/lib/udev/pcmcia-socket-startup" + add_binary "/usr/lib/udev/pcmcia-check-broken-cis" + add_file "/usr/lib/udev/rules.d/60-pcmcia.rules" +} + +help() { + cat <<HELPEOF +This hook loads the necessary modules for a pcmcia root device. Detection will +take place at runtime. To minimize the modules in the image, add the autodetect +hook too. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch b/core/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch new file mode 100644 index 000000000..d4d162167 --- /dev/null +++ b/core/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch @@ -0,0 +1,80 @@ +From f2bdace5bb68d4f3162f886b27210762d8b115b8 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sat, 3 Mar 2012 12:28:15 +0100 +Subject: [PATCH 1/2] split /usr: always read config files from /lib/udev + +This means we don't need a flagday in order to move udev to use +/usr/lib/udev/rules.d +--- + src/libudev.c | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +diff --git a/src/libudev.c b/src/libudev.c +index be24329..754d713 100644 +--- a/src/libudev.c ++++ b/src/libudev.c +@@ -43,8 +43,8 @@ struct udev { + void *userdata; + char *sys_path; + char *dev_path; +- char *rules_path[4]; +- unsigned long long rules_path_ts[4]; ++ char *rules_path[5]; ++ unsigned long long rules_path_ts[5]; + int rules_path_count; + char *run_path; + struct udev_list properties_list; +@@ -255,21 +255,26 @@ UDEV_EXPORT struct udev *udev_new(void) + goto err; + + if (udev->rules_path[0] == NULL) { +- /* /usr/lib/udev -- system rules */ +- udev->rules_path[0] = strdup(PKGLIBEXECDIR "/rules.d"); ++ /* /lib/udev -- compat for system rules */ ++ udev->rules_path[0] = strdup("/lib/udev/rules.d"); + if (!udev->rules_path[0]) ++ goto err; ++ ++ /* /usr/lib/udev -- system rules */ ++ udev->rules_path[1] = strdup(PKGLIBEXECDIR "/rules.d"); ++ if (!udev->rules_path[1]) + goto err; + + /* /etc/udev -- local administration rules */ +- udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d"); +- if (!udev->rules_path[1]) ++ udev->rules_path[2] = strdup(SYSCONFDIR "/udev/rules.d"); ++ if (!udev->rules_path[2]) + goto err; + + /* /run/udev -- runtime rules */ +- if (asprintf(&udev->rules_path[2], "%s/rules.d", udev->run_path) < 0) ++ if (asprintf(&udev->rules_path[3], "%s/rules.d", udev->run_path) < 0) + goto err; + +- udev->rules_path_count = 3; ++ udev->rules_path_count = 4; + } + + dbg(udev, "context %p created\n", udev); +@@ -278,7 +283,8 @@ UDEV_EXPORT struct udev *udev_new(void) + dbg(udev, "dev_path='%s'\n", udev->dev_path); + dbg(udev, "sys_path='%s'\n", udev->sys_path); + dbg(udev, "run_path='%s'\n", udev->run_path); +- dbg(udev, "rules_path='%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], udev->rules_path[2]); ++ dbg(udev, "rules_path='%s':'%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], ++ udev->rules_path[2], udev->rules_path[3]); + free(config_file); + return udev; + err: +@@ -325,6 +331,7 @@ UDEV_EXPORT void udev_unref(struct udev *udev) + free(udev->rules_path[0]); + free(udev->rules_path[1]); + free(udev->rules_path[2]); ++ free(udev->rules_path[3]); + free(udev->run_path); + dbg(udev, "context %p released\n", udev); + free(udev); +-- +1.7.9.5 + diff --git a/core/udev/0002-reinstate-TIMEOUT-handling.patch b/core/udev/0002-reinstate-TIMEOUT-handling.patch new file mode 100644 index 000000000..9d1d36fb6 --- /dev/null +++ b/core/udev/0002-reinstate-TIMEOUT-handling.patch @@ -0,0 +1,146 @@ +From 0a581062ee3e31e0c2aedc5eb64c60f52868b17f Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Thu, 15 Mar 2012 02:12:43 +0100 +Subject: [PATCH 2/2] reinstate TIMEOUT= handling + +Without treating events with timeouts specially some drivers would cause a +30 seconds stall on boot: . + +I also received reports of some drivers not working at all, even after the +timeout. + +We will remove this patch when more drivers have been fixed in the kernel (3.4?). + +This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and +57c6f8ae5f52a6e8ffc66a54966346f733dded39. +--- + TODO | 2 ++ + src/libudev-device.c | 19 +++++++++++++++++++ + src/libudev-private.h | 1 + + src/udevd.c | 13 ++++++++++--- + 4 files changed, 32 insertions(+), 3 deletions(-) + +diff --git a/TODO b/TODO +index 36e8440..c2e59b6 100644 +--- a/TODO ++++ b/TODO +@@ -1,6 +1,8 @@ + - find a way to tell udev to not cancel firmware + requests in initramfs + ++ - remove TIMEOUT= handling ++ + - move /lib/udev/devices/ to tmpfiles + + - trigger --subsystem-match=usb/usb_device +diff --git a/src/libudev-device.c b/src/libudev-device.c +index 10f28b8..639c367 100644 +--- a/src/libudev-device.c ++++ b/src/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; +@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum) + return 0; + } + ++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; ++} ++ + const char *udev_device_get_devpath_old(struct udev_device *udev_device) + { + return udev_device->devpath_old; +@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, + udev_device_set_devpath_old(udev_device, &property[12]); + } else if (strncmp(property, "SEQNUM=", 7) == 0) { + udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10)); ++ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { ++ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); + } else if (strncmp(property, "IFINDEX=", 8) == 0) { + udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10)); + } else if (strncmp(property, "DEVMODE=", 8) == 0) { +@@ -599,6 +617,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-private.h b/src/libudev-private.h +index 5f5c64a..ec63b67 100644 +--- a/src/libudev-private.h ++++ b/src/libudev-private.h +@@ -87,6 +87,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/udevd.c b/src/udevd.c +index 1702217..88e9272 100644 +--- a/src/udevd.c ++++ b/src/udevd.c +@@ -401,7 +401,7 @@ out: + } + } + +-static void event_run(struct event *event) ++static void event_run(struct event *event, bool force) + { + struct udev_list_node *loop; + +@@ -427,7 +427,7 @@ static void event_run(struct event *event) + return; + } + +- if (children >= children_max) { ++ if (!force && children >= children_max) { + if (children_max > 1) + info(event->udev, "maximum number (%i) of children reached\n", children); + return; +@@ -461,6 +461,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; + } + +@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev) + continue; + } + +- event_run(event); ++ event_run(event, false); + } + } + +-- +1.7.9.5 + diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 114f524b9..082ed6213 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153633 2012-03-16 22:34:33Z tomegun $ +# $Id: PKGBUILD 155730 2012-04-06 00:04:05Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,15 +6,16 @@ pkgname=udev pkgver=181 -pkgrel=5 +pkgrel=9 pkgdesc="The userspace dev tools (udev)" -depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'acl') +depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl') install=udev.install arch=(i686 x86_64) license=('GPL') -makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') +makedepends=('gobject-introspection' 'gperf' 'libxslt') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz - 0001-reinstate-TIMEOUT-handling.patch + 0001-split-usr-always-read-config-files-from-lib-udev.patch + 0002-reinstate-TIMEOUT-handling.patch initcpio-hooks-udev initcpio-install-udev) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" @@ -25,19 +26,23 @@ options=(!makeflags !libtool) build() { cd $srcdir/$pkgname-$pkgver - patch -p1 -i ../0001-reinstate-TIMEOUT-handling.patch + patch -p1 -i ../0001-split-usr-always-read-config-files-from-lib-udev.patch + patch -p1 -i ../0002-reinstate-TIMEOUT-handling.patch ./configure --prefix=/usr \ - --with-rootprefix= \ --sysconfdir=/etc \ - --libdir=/usr/lib \ - --libexecdir=/lib \ - --with-systemdsystemunitdir=/lib/systemd/system \ + --libexecdir=/usr/lib \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \ --enable-udev_acl make } - + +check() { + make -C "$pkgname-$pkgver" check +} + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install @@ -47,20 +52,24 @@ package() { install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev # udevd moved, symlink to make life easy for restarting udevd manually - ln -s ../../lib/udev/udevd ${pkgdir}/usr/bin/udevd + 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 ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - for i in $pkgdir/lib/udev/rules.d/*.rules; do + for i in $pkgdir/usr/lib/udev/rules.d/*.rules; do sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; s#GROUP="tape"#GROUP="storage"#g; s#GROUP="cdrom"#GROUP="optical"#g' $i done } md5sums=('0d7af750702620a871b9f9b98d8ad859' - 'f758b3e62ab77a1a6b7be12bb900cb2d' + '02a0dbbdcba6c1eae3ef65b6b06bde1f' + 'a9fae85491a08d7759388c605389a8c5' 'a4dd853050bf2e0ae6b2e3d2c75499c2' - 'ee0bfe91a20fff12cc25ab1d1e024853') + 'd2b16edc6d806b5dafdbbad43ae5a3de') diff --git a/core/udev/initcpio-install-udev b/core/udev/initcpio-install-udev index e7e2c0f60..6bc9cfb28 100644 --- a/core/udev/initcpio-install-udev +++ b/core/udev/initcpio-install-udev @@ -4,14 +4,14 @@ build() { FILES="/etc/udev/udev.conf" SCRIPT="udev" - add_binary /lib/udev/udevd + add_binary /usr/lib/udev/udevd add_binary /usr/bin/udevadm for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do - add_file "/lib/udev/rules.d/$rules" + add_file "/usr/lib/udev/rules.d/$rules" done for tool in ata_id scsi_id; do - add_file "/lib/udev/$tool" + add_file "/usr/lib/udev/$tool" done } diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 69bc92981..6760067ad 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153637 2012-03-16 22:34:40Z tomegun $ +# $Id: PKGBUILD 155728 2012-04-06 00:04:01Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.21 -pkgrel=6 +pkgver=2.21.1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -14,8 +14,7 @@ conflicts=('util-linux-ng') provides=("util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.xz - stable-fixes-2.21.patch) +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz) optdepends=('perl: for chkdupexe support') build() { @@ -24,10 +23,9 @@ build() { # hardware clock sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h - patch -p1 -i ../stable-fixes-2.21.patch - ./configure --prefix=/usr \ --libdir=/usr/lib \ + --enable-fs-paths-extra=/usr/bin:/usr/sbin \ --enable-write \ --enable-raw \ --disable-wall \ @@ -36,6 +34,10 @@ build() { make } +check() { + make -C "$pkgname-$pkgver" check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -48,5 +50,4 @@ package() { # delete stray empty dir, fixed upstream rm -r usr/share/man/ru } -md5sums=('208aa058f4117759d2939d1be7d662fc' - '415b850a4efa9174cd9c34022949f177') +md5sums=('ad602dcd528f340b1329cfa6200d8f80') diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index e86a685f8..e63cd2c66 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 152640 2012-03-07 16:41:27Z tomegun $ +# $Id: PKGBUILD 155739 2012-04-06 00:05:49Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez pkgver=4.99 -pkgrel=1 +pkgrel=2 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -77,7 +77,7 @@ package() { "${pkgdir}"/usr/bin/bluez-test-input # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html - rm "${pkgdir}"/lib/udev/rules.d/97-bluetooth.rules + rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules } md5sums=('2387053eb5a7b02f37df4871df022a02' '7412982b440f29fa7f76a41a87fef985' diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 48e4c6768..5c0882c7a 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152120 2012-03-04 22:38:13Z bisson $ +# $Id: PKGBUILD 155697 2012-04-05 08:34:14Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=2.7.5 +pkgver=2.7.6.1 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4.patch') -sha1sums=('5b480965985616beb972d8fc32f90cc173c72264' +sha1sums=('02319cceb5ed56d22193de0bf1f59bab9e4ab3ab' '1c6cdcaa218615e53869bb9d67d7f9d2141e86fe') install=install diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index bf665d310..9d0e5dc2e 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150180 2012-02-14 08:19:26Z andrea $ +# $Id: PKGBUILD 155741 2012-04-06 00:05:51Z tomegun $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=gpsd pkgver=3.4 -pkgrel=1 +pkgrel=2 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64') url="http://catb.org/gpsd/" @@ -16,7 +16,7 @@ optdepends=('php: generate a PHP status page for your GPS' 'php-gd: image support for the PHP status page' 'pygtk: GUI frontends') makedepends=('scons' 'docbook-xsl' 'chrpath') -backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules') +backup=('etc/conf.d/gpsd') options=('!libtool') install="${pkgname}.install" source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} @@ -54,10 +54,10 @@ package() { install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd" - install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules" + install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules" sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug - install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug" + install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug" # GPSD needs RPATH chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0 diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD index e8e5ccdb1..df3615600 100644 --- a/extra/kexec-tools/PKGBUILD +++ b/extra/kexec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136323 2011-08-26 10:46:24Z tpowa $ +# $Id: PKGBUILD 155721 2012-04-05 13:08:48Z dreisner $ # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kexec-tools pkgver=2.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Load another kernel from the currently executing Linux kernel" arch=('i686' 'x86_64') url="http://kernel.org/pub/linux/utils/kernel/kexec/" @@ -12,8 +12,7 @@ source=("http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.ta 'kexec-tools-2.0.0-purgatory-makefile.patch' 'kexec' 'kexec.conf.d') -depends=('gawk') -makedepends=('zlib' 'xz') +depends=('gawk' 'zlib' 'xz') backup=('etc/conf.d/kexec') license=('GPL2') md5sums=('35d05fed1c97008ac34c5bfb929295eb' @@ -23,7 +22,6 @@ md5sums=('35d05fed1c97008ac34c5bfb929295eb' build() { cd $srcdir/$pkgname-$pkgver - export LDFLAGS+=" -static" patch -Np1 -i ../kexec-tools-2.0.0-purgatory-makefile.patch ./configure --prefix=/usr make diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD index d37438633..6096bee43 100644 --- a/extra/libgpod/PKGBUILD +++ b/extra/libgpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148826 2012-02-05 11:51:56Z ibiru $ +# $Id: PKGBUILD 155743 2012-04-06 00:05:54Z tomegun $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libgpod pkgver=0.8.2 -pkgrel=3 +pkgrel=4 pkgdesc="A shared library to access the contents of an iPod" arch=(i686 x86_64) license=('LGPL') @@ -18,7 +18,7 @@ md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ + ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \ --enable-udev --with-python=/usr/bin/python2 make PREFIX=/usr } diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index 5631f21e2..e7d7fb122 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153576 2012-03-16 05:45:45Z eric $ +# $Id: PKGBUILD 155745 2012-04-06 00:05:58Z tomegun $ # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Library implementation of the Media Transfer Protocol" arch=("i686" "x86_64") url="http://libmtp.sourceforge.net" @@ -16,7 +16,7 @@ md5sums=('6dc708757e3fd3ccce7445b4f2171263') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --with-udev=/usr/lib/udev make } diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index d9e496b3d..7563f5316 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 150693 2012-02-20 11:05:39Z ibiru $ +# $Id: PKGBUILD 155695 2012-04-05 07:31:28Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.5.9 -_apngver=1.5.9 +pkgver=1.5.10 +_apngver=1.5.10 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64') @@ -16,11 +16,11 @@ depends=('zlib' 'sh') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") -md5sums=('05d9ab3705c34954c0032b71318b678a' - '268f7db97b292d5f14a24ea7940f6f1c') +md5sums=('9c2ac3c3a31de2ab867875718f8de18e' + '88517ab0e9c0be2590800116e2b50c8d') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" # Add animated PNG (apng) support # see http://sourceforge.net/projects/libpng-apng/ @@ -31,7 +31,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install cd contrib/pngminus diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index fe279d92c..090556f7b 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154061 2012-03-22 12:43:43Z giovanni $ +# $Id: PKGBUILD 155693 2012-04-05 06:04:51Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.03.22 +pkgver=2012.04.04 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('95d757a15026eb1c91556b80a18193ee') +md5sums=('25ad098a6e4a2e329ca6295a9ba27074') build() { cd ${srcdir}/live diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 3603e4b81..e2463836e 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153558 2012-03-16 01:14:35Z eric $ +# $Id: PKGBUILD 155754 2012-04-06 00:24:13Z dreisner $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors pkgver=3.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') url="http://www.lm-sensors.org/" @@ -32,6 +32,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \ -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service} + sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect patch -p1 < ../daemonarg.patch patch -p0 < ../linux_3.0.patch make PREFIX=/usr @@ -41,7 +42,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \ PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install - install -D -m644 prog/init/lm_sensors.service "${pkgdir}/lib/systemd/system/lm_sensors.service" + install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service" install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors" install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 438e17816..a34978cfa 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 154448 2012-03-28 18:31:41Z andrea $ +# $Id: PKGBUILD 155747 2012-04-06 00:06:00Z tomegun $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') pkgver=1.3.9 -pkgrel=1 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64') @@ -33,7 +33,7 @@ build() { package_system-config-printer-common() { pkgdesc='Pygtk CUPS Configuration' - depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl') + depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl' 'libusb-compat') optdepends=('system-config-printer-gnome: for the GTK frontend' 'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings') replaces=('system-config-printer') @@ -64,11 +64,11 @@ package_system-config-printer-common() { install -d "${pkgdir}"/etc/cupshelpers/ install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/ - install -d "${pkgdir}"/lib/udev/rules.d + install -d "${pkgdir}"/usr/lib/udev/rules.d install -m755 udev/{udev-add-printer,udev-configure-printer} \ - "${pkgdir}"/lib/udev/ + "${pkgdir}"/usr/lib/udev/ install -m644 udev/70-printers.rules \ - "${pkgdir}"/lib/udev/rules.d + "${pkgdir}"/usr/lib/udev/rules.d for file in build/lib/cupshelpers/*.py; do install -Dm644 $file \ diff --git a/extra/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch b/extra/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch new file mode 100644 index 000000000..f8f6d1fa5 --- /dev/null +++ b/extra/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch @@ -0,0 +1,28 @@ +From 7e5d190ccce8dc064d5756225e306e65fa534ae9 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Mon, 2 Apr 2012 08:20:34 -0400 +Subject: [PATCH] check for proper return from dirent_ensure_type + +Fixes 'systemctl list-unit-files', which previously returned only: + + Failed to issue method call: No such file or directory +--- + src/install.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/install.c b/src/install.c +index 174d79b..9256116 100644 +--- a/src/install.c ++++ b/src/install.c +@@ -1853,7 +1853,7 @@ int unit_file_get_list( + + r = dirent_ensure_type(d, de); + if (r < 0) { +- if (errno == ENOENT) ++ if (r == -ENOENT) + continue; + + goto finish; +-- +1.7.9.5 + diff --git a/extra/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch b/extra/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch new file mode 100644 index 000000000..fa133ca3c --- /dev/null +++ b/extra/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch @@ -0,0 +1,156 @@ +From 75c8e3cffd7da8eede614cf61384957af2c82a29 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Thu, 22 Mar 2012 02:06:40 +0100 +Subject: [PATCH] logind: close FIFO before ending sessions cleanly + +For clean session endings ask logind explicitly to get rid of the FIFO +before closing it so that the FIFO logic doesn't result in su/sudo to be +terminated immediately. +--- + src/login/logind-dbus.c | 30 ++++++++++++++++++++ + src/login/pam-module.c | 71 +++++++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 98 insertions(+), 3 deletions(-) + +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index d8f4d89..ea6b89f 100644 +--- a/src/login/logind-dbus.c ++++ b/src/login/logind-dbus.c +@@ -80,6 +80,9 @@ + " <arg name=\"seat\" type=\"s\" direction=\"out\"/>\n" \ + " <arg name=\"vtnr\" type=\"u\" direction=\"out\"/>\n" \ + " </method>\n" \ ++ " <method name=\"ReleaseSession\">\n" \ ++ " <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \ ++ " </method>\n" \ + " <method name=\"ActivateSession\">\n" \ + " <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \ + " </method>\n" \ +@@ -1075,6 +1078,33 @@ static DBusHandlerResult manager_message_handler( + if (r < 0) + return bus_send_error_reply(connection, message, &error, r); + ++ } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ReleaseSession")) { ++ const char *name; ++ Session *session; ++ ++ if (!dbus_message_get_args( ++ message, ++ &error, ++ DBUS_TYPE_STRING, &name, ++ DBUS_TYPE_INVALID)) ++ return bus_send_error_reply(connection, message, &error, -EINVAL); ++ ++ session = hashmap_get(m->sessions, name); ++ if (!session) ++ return bus_send_error_reply(connection, message, &error, -ENOENT); ++ ++ /* We use the FIFO to detect stray sessions where the ++ process invoking PAM dies abnormally. We need to make ++ sure that that process is not killed if at the clean ++ end of the session it closes the FIFO. Hence, with ++ this call explicitly turn off the FIFO logic, so that ++ the PAM code can finish clean up on its own */ ++ session_remove_fifo(session); ++ ++ reply = dbus_message_new_method_return(message); ++ if (!reply) ++ goto oom; ++ + } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ActivateSession")) { + const char *name; + Session *session; +diff --git a/src/login/pam-module.c b/src/login/pam-module.c +index 8544413..4106d2b 100644 +--- a/src/login/pam-module.c ++++ b/src/login/pam-module.c +@@ -414,7 +414,6 @@ _public_ PAM_EXTERN int pam_sm_open_session( + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + "CreateSession"); +- + if (!m) { + pam_syslog(handle, LOG_ERR, "Could not allocate create session message."); + r = PAM_BUF_ERR; +@@ -620,11 +619,77 @@ _public_ PAM_EXTERN int pam_sm_close_session( + int argc, const char **argv) { + + const void *p = NULL; ++ const char *id; ++ DBusConnection *bus = NULL; ++ DBusMessage *m = NULL, *reply = NULL; ++ DBusError error; ++ int r; + +- pam_get_data(handle, "systemd.session-fd", &p); ++ assert(handle); ++ ++ dbus_error_init(&error); ++ ++ id = pam_getenv(handle, "XDG_SESSION_ID"); ++ if (id) { ++ ++ /* Before we go and close the FIFO we need to tell ++ * logind that this is a clean session shutdown, so ++ * that it doesn't just go and slaughter us ++ * immediately after closing the fd */ ++ ++ bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); ++ if (!bus) { ++ pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error)); ++ r = PAM_SESSION_ERR; ++ goto finish; ++ } ++ ++ m = dbus_message_new_method_call( ++ "org.freedesktop.login1", ++ "/org/freedesktop/login1", ++ "org.freedesktop.login1.Manager", ++ "ReleaseSession"); ++ if (!m) { ++ pam_syslog(handle, LOG_ERR, "Could not allocate release session message."); ++ r = PAM_BUF_ERR; ++ goto finish; ++ } ++ ++ if (!dbus_message_append_args(m, ++ DBUS_TYPE_STRING, &id, ++ DBUS_TYPE_INVALID)) { ++ pam_syslog(handle, LOG_ERR, "Could not attach parameters to message."); ++ r = PAM_BUF_ERR; ++ goto finish; ++ } + ++ reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); ++ if (!reply) { ++ pam_syslog(handle, LOG_ERR, "Failed to release session: %s", bus_error_message(&error)); ++ r = PAM_SESSION_ERR; ++ goto finish; ++ } ++ } ++ ++ r = PAM_SUCCESS; ++ ++finish: ++ pam_get_data(handle, "systemd.session-fd", &p); + if (p) + close_nointr(PTR_TO_INT(p) - 1); + +- return PAM_SUCCESS; ++ dbus_error_free(&error); ++ ++ if (bus) { ++ dbus_connection_close(bus); ++ dbus_connection_unref(bus); ++ } ++ ++ if (m) ++ dbus_message_unref(m); ++ ++ if (reply) ++ dbus_message_unref(reply); ++ ++ return r; + } +-- +1.7.9.5 + diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD index d1f60b49c..c09599940 100644 --- a/extra/systemd/PKGBUILD +++ b/extra/systemd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153641 2012-03-17 02:44:42Z dreisner $ +# $Id: PKGBUILD 155750 2012-04-06 00:06:04Z tomegun $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgbase=systemd pkgname=('systemd' 'libsystemd') pkgver=44 -pkgrel=1 +pkgrel=5 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') @@ -13,10 +13,14 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" "os-release" - 0001-util-never-follow-symlinks-in-rm_rf_children.patch) + 0001-util-never-follow-symlinks-in-rm_rf_children.patch + 0001-logind-close-FIFO-before-ending-sessions-cleanly.patch + 0001-check-for-proper-return-from-dirent_ensure_type.patch) md5sums=('11f44ff74c87850064e4351518bcff17' '752636def0db3c03f121f8b4f44a63cd' - 'b5863d6d4b47e2b5bda8eb57bde0d327') + 'b5863d6d4b47e2b5bda8eb57bde0d327' + 'd37833358ef6c23fad622ea4a0941d1f' + '11f930fd0a3966abc794bf9127a7dde0') build() { cd "$pkgname-$pkgver" @@ -24,20 +28,25 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=803358 patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch" + # https://bugs.archlinux.org/task/28386 + patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch" + + # Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49) + patch -Np1 <"$srcdir/0001-check-for-proper-return-from-dirent_ensure_type.patch" + ./configure --sysconfdir=/etc \ --libexecdir=/usr/lib \ - --libdir=/usr/lib \ --with-pamlibdir=/lib/security \ --localstatedir=/var \ - --with-rootprefix= \ - --with-distro=arch + --with-distro=arch \ + --enable-split-usr make } package_systemd() { - pkgdesc="systemd and service manager" - depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz') + pkgdesc="system and service manager" + depends=('acl' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz') optdepends=('cryptsetup: required for encrypted block devices' 'dbus-python: systemd-analyze' 'initscripts: legacy support for hostname and vconsole setup' @@ -66,7 +75,9 @@ package_systemd() { chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf" # symlink to /bin/systemd for compat and sanity - ln -s ../lib/systemd/systemd "$pkgdir/bin/systemd" + install -dm755 "$pkgdir/bin" "$pkgdir/lib/systemd" + 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" @@ -87,6 +98,16 @@ package_systemd() { mv "$manpage" "$section/systemd.$page" done + # 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" + + # fix systemctl where + find "$pkgdir" -type f -name '*.service' -exec \ + sed -i 's@\([=-]\)/bin/systemctl@\1/usr/bin/systemctl@g' {} + + ### split off libsystemd (libs, includes, pkgconfig, man3) install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig} diff --git a/extra/systemd/systemd.install b/extra/systemd/systemd.install index f31642e13..822108c0f 100644 --- a/extra/systemd/systemd.install +++ b/extra/systemd/systemd.install @@ -7,7 +7,7 @@ checkgroups() { } sd_booted() { - [ -e sys/fs/cgroups/systemd ] + [ -e sys/fs/cgroup/systemd ] } post_install() { @@ -29,7 +29,8 @@ post_upgrade() { fi if sd_booted; then - systemctl daemon-reexec >/dev/null + systemctl daemon-reload + systemctl daemon-reexec fi newpkgver=${1%-*} diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index abf99a578..74eef1d57 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151862 2012-03-03 14:29:19Z giovanni $ +# $Id: PKGBUILD 155737 2012-04-06 00:05:45Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=udisks pkgver=1.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="Disk Management Service" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -27,4 +27,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + # move udev helpers and rules to /usr/lib + mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ + rm -r "${pkgdir}"/lib } diff --git a/multilib/lib32-libpng/PKGBUILD b/multilib/lib32-libpng/PKGBUILD index 4d3a66edb..49adf8805 100644 --- a/multilib/lib32-libpng/PKGBUILD +++ b/multilib/lib32-libpng/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66920 2012-03-01 16:29:40Z ibiru $ +# $Id: PKGBUILD 68898 2012-04-05 07:36:47Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> @@ -6,8 +6,8 @@ _pkgbasename=libpng pkgname=lib32-$_pkgbasename -pkgver=1.5.9 -_apngver=1.5.9 +pkgver=1.5.10 +_apngver=1.5.10 _libversion=15 pkgrel=2 pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)" @@ -19,8 +19,8 @@ makedepends=(gcc-multilib) options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz" "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz") -md5sums=('05d9ab3705c34954c0032b71318b678a' - '268f7db97b292d5f14a24ea7940f6f1c') +md5sums=('9c2ac3c3a31de2ab867875718f8de18e' + '88517ab0e9c0be2590800116e2b50c8d') build() { export CC="gcc -m32" diff --git a/testing/baobab/PKGBUILD b/testing/baobab/PKGBUILD index 3b1f589fd..7e39d9653 100644 --- a/testing/baobab/PKGBUILD +++ b/testing/baobab/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 155017 2012-04-01 11:30:45Z heftig $ +# $Id: PKGBUILD 155719 2012-04-05 13:06:09Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=baobab -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="A graphical directory tree analyzer" arch=(i686 x86_64) @@ -12,7 +12,7 @@ makedepends=('intltool' 'itstool') groups=('gnome-extra') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0936bb2e1bb9a9a7518eaa2a29cffd0bd9b99ae9c33e4e99b5d11c6d150a08bd') +sha256sums=('0c9743caf8cdc6dd69d694453cd57816c1ca0514cf51111022846088021949f7') build() { cd "$pkgname-$pkgver" diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD index f66f56a28..7849b272f 100644 --- a/testing/empathy/PKGBUILD +++ b/testing/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155040 2012-04-01 11:31:16Z heftig $ +# $Id: PKGBUILD 155711 2012-04-05 10:52:56Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.4.0 +pkgver=3.4.0.1 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64') @@ -13,13 +13,13 @@ makedepends=('intltool' 'itstool') optdepends=('telepathy-gabble: XMPP/Jabber support' 'telepathy-idle: IRC support' 'telepathy-salut: Link-local XMPP support' - 'telepathy-sofiasip: SIP support' + 'telepathy-rakia: SIP support' 'telepathy-haze: libpurple support') options=('!libtool') groups=('gnome-extra') install=empathy.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('dd04344638a5496fd108c4d299a6f6d2272dc521dc353de85f13995f399f8f1a') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('d9ea2729bf75cc210c6fa91a6b6cff9118314e0e988c9d166a823ebf96c742e5') build() { cd "$pkgname-$pkgver" diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD new file mode 100644 index 000000000..ff55ae1f3 --- /dev/null +++ b/testing/libevent/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155753 2012-04-06 00:24:02Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Judd <jvinet@zeroflux.org> + +pkgname=libevent +pkgver=2.0.18 +pkgrel=1 +pkgdesc="An event notification library" +arch=('i686' 'x86_64') +url="http://www.monkey.org/~provos/libevent/" +license=('GPL2') +depends=('openssl') +optdepends=('python2: to use event_rpcgen.py') +options=('!libtool') +source=(https://github.com/downloads/libevent/libevent/libevent-$pkgver-stable.tar.gz{,.asc}) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + sed -i 's#python#python2#' event_rpcgen.py + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + make DESTDIR="${pkgdir}" install +} +md5sums=('aa1ce9bc0dee7b8084f6855765f2c86a' + '225bb6c417cfb31298e1e96d0eddca4a') diff --git a/testing/libgdata/PKGBUILD b/testing/libgdata/PKGBUILD index a36a72fef..8fc66c49d 100644 --- a/testing/libgdata/PKGBUILD +++ b/testing/libgdata/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155188 2012-04-01 11:35:10Z heftig $ +# $Id: PKGBUILD 155715 2012-04-05 11:09:33Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgdata -pkgver=0.11.0 +pkgver=0.12.0 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=('819a077fab77cca9408409bf86da5b028699972c2c9bbf96e41755f801acea6b') +sha256sums=('e5acd1ca88433306e740fc4cb3836f9710358d0acd48d4ddee1876dd77d2aca3') build() { cd "$pkgname-$pkgver" diff --git a/testing/libssh2/PKGBUILD b/testing/libssh2/PKGBUILD new file mode 100644 index 000000000..985bc4809 --- /dev/null +++ b/testing/libssh2/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 155717 2012-04-05 12:16:28Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: ice-man <icemanf@gmail.com> + +pkgname=libssh2 +pkgver=1.4.1 +pkgrel=1 +pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" +url="http://www.libssh2.org/" +arch=('i686' 'x86_64') +license=('BSD') +depends=('openssl') +makedepends=('zlib') +provides=('libssh2.so') +options=('!libtool') +source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) +md5sums=('b94106e046af37fdc0734e487842fe66' + 'd120a091e9f594c6608815d72b07c7a3') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/testing/telepathy-farstream/PKGBUILD b/testing/telepathy-farstream/PKGBUILD index 7e4b13e18..bb53eeff1 100644 --- a/testing/telepathy-farstream/PKGBUILD +++ b/testing/telepathy-farstream/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155262 2012-04-01 11:37:07Z heftig $ +# $Id: PKGBUILD 155707 2012-04-05 10:29:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=telepathy-farstream -pkgver=0.2.3 +pkgver=0.4.0 pkgrel=1 pkgdesc="A telepathy-backend to use stream engine." arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('telepathy-farsight') replaces=('telepathy-farsight') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('9a5de84f1f4bb4505cc982b4a7fea539') +md5sums=('52d110f8a9f27bce0a6c2c07e18aee56') build() { cd "$pkgname-$pkgver" diff --git a/testing/telepathy-haze/PKGBUILD b/testing/telepathy-haze/PKGBUILD index 8c78a8b84..168dc0d21 100644 --- a/testing/telepathy-haze/PKGBUILD +++ b/testing/telepathy-haze/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 155268 2012-04-01 11:37:15Z heftig $ +# $Id: PKGBUILD 155705 2012-04-05 10:24:53Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> pkgname=telepathy-haze -pkgver=0.5.0 -pkgrel=2 +pkgver=0.6.0 +pkgrel=1 pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols." arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" license=('GPL') depends=('telepathy-glib' 'libpurple') -makedepends=('libxslt') +makedepends=('libxslt' 'python2') replaces=('telepathy-butterfly') install=telepathy-haze.install groups=('telepathy') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('4378726d61e1e5df789a05760a94d172') +md5sums=('622e0b2f7ff4050a29f907f2ef0f039c') build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy make } diff --git a/testing/telepathy-salut/PKGBUILD b/testing/telepathy-salut/PKGBUILD new file mode 100644 index 000000000..eca5466ec --- /dev/null +++ b/testing/telepathy-salut/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155709 2012-04-05 10:39:18Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Daniel Balieiro <daniel@balieiro.com> + +pkgname=telepathy-salut +pkgver=0.8.0 +pkgrel=1 +pkgdesc="A link-local XMPP connection manager for Telepathy" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +groups=('telepathy') +license=('LGPL') +depends=('telepathy-glib' 'avahi' 'libsoup' 'sqlite3') +makedepends=('libxslt' 'python2' 'xmldiff') +install=telepathy-salut.install +options=(!libtool) +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('43639c23de33e8466540de02816d23bf') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy \ + --disable-plugins --disable-Werror \ + --with-tls=openssl \ + --enable-avahi-tests=no \ + --enable-static=no + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/telepathy-salut/telepathy-salut.install b/testing/telepathy-salut/telepathy-salut.install new file mode 100644 index 000000000..87d7838b8 --- /dev/null +++ b/testing/telepathy-salut/telepathy-salut.install @@ -0,0 +1,13 @@ +post_install() { + killall -HUP dbus-daemon 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: |