From 50a1eb604b2d5503a06d56b76347faa581160245 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 16 Jul 2012 00:01:23 +0000 Subject: Mon Jul 16 00:01:23 UTC 2012 --- artistic/blender-spacenav-libre/PKGBUILD | 23 +- artistic/blender-spacenav-libre/boost-1.50.patch | 42 ++ community-staging/fatrat/PKGBUILD | 35 ++ community/calf/PKGBUILD | 35 ++ community/calf/include_fix.patch | 33 ++ community/cdfs/PKGBUILD | 10 +- community/cdfs/cdfs.install | 12 +- community/gambas3/PKGBUILD | 17 +- community/gammu/PKGBUILD | 9 +- community/keepalived/PKGBUILD | 17 +- community/keepalived/keepalived.rc | 43 +-- community/luabitop/PKGBUILD | 26 ++ community/luaposix/PKGBUILD | 6 +- community/oss/PKGBUILD | 24 +- community/pinot/PKGBUILD | 30 +- community/pinot/pinot.changelog | 3 + community/r8168-lts/PKGBUILD | 24 +- community/rsyslog/PKGBUILD | 10 +- community/vhba-module/PKGBUILD | 11 +- community/vhba-module/vhba-module.install | 2 +- core/binutils/PKGBUILD | 5 +- core/glibc/PKGBUILD | 16 +- core/kmod/PKGBUILD | 13 +- core/kmod/kmod.install | 9 + core/systemd/PKGBUILD | 26 +- core/util-linux/PKGBUILD | 10 +- core/util-linux/util-linux.install | 10 + extra/bitlbee/PKGBUILD | 41 +- extra/bitlbee/bitlbee.install | 15 + extra/bitlbee/bitlbee.tmpfiles | 1 + extra/bitlbee/rc.d | 75 ++-- extra/gparted/PKGBUILD | 6 +- extra/kdebase-workspace/PKGBUILD | 15 +- extra/kdebase-workspace/kdm.service | 9 + extra/live-media/PKGBUILD | 6 +- extra/phonon-gstreamer/PKGBUILD | 6 +- extra/xorg-xdm/PKGBUILD | 11 +- kde-unstable/kdepim/PKGBUILD | 6 +- libre-testing/luxrender-libre/PKGBUILD | 54 +++ libre-testing/luxrender-libre/boost_1.50_fix.diff | 131 +++++++ libre/blender-libre/PKGBUILD | 23 +- libre/blender-libre/boost-1.50.patch | 42 ++ multilib/lib32-glibc/PKGBUILD | 10 +- multilib/zsnes/PKGBUILD | 48 ++- multilib/zsnes/zsnes.patch | 12 + multilib/zsnes/zsnes.png | Bin 0 -> 7301 bytes ...each-symlink-to-relative-name-in-properly.patch | 135 +++++++ testing/coreutils/PKGBUILD | 69 ++++ testing/coreutils/coreutils-pam.patch | 428 +++++++++++++++++++++ testing/coreutils/coreutils.install | 21 + testing/coreutils/su.pam | 9 + testing/wpa_actiond/PKGBUILD | 25 ++ 52 files changed, 1433 insertions(+), 266 deletions(-) create mode 100644 artistic/blender-spacenav-libre/boost-1.50.patch create mode 100644 community-staging/fatrat/PKGBUILD create mode 100644 community/calf/PKGBUILD create mode 100644 community/calf/include_fix.patch create mode 100644 community/luabitop/PKGBUILD create mode 100644 core/kmod/kmod.install create mode 100644 core/util-linux/util-linux.install create mode 100644 extra/bitlbee/bitlbee.install create mode 100644 extra/bitlbee/bitlbee.tmpfiles create mode 100644 extra/kdebase-workspace/kdm.service create mode 100644 libre-testing/luxrender-libre/PKGBUILD create mode 100644 libre-testing/luxrender-libre/boost_1.50_fix.diff create mode 100644 libre/blender-libre/boost-1.50.patch create mode 100644 multilib/zsnes/zsnes.png create mode 100644 testing/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch create mode 100644 testing/coreutils/PKGBUILD create mode 100644 testing/coreutils/coreutils-pam.patch create mode 100644 testing/coreutils/coreutils.install create mode 100644 testing/coreutils/su.pam create mode 100644 testing/wpa_actiond/PKGBUILD diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD index 2c11b4d30..f8fc7fd46 100644 --- a/artistic/blender-spacenav-libre/PKGBUILD +++ b/artistic/blender-spacenav-libre/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=blender pkgname=blender-spacenav-libre pkgver=2.63a -pkgrel=2.1 +pkgrel=3 epoch=4 pkgdesc="A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)" arch=('i686' 'x86_64' 'mips64el') @@ -18,15 +18,19 @@ makedepends=('cmake' 'boost') replaces=("${_pkgname}") conflicts=("${_pkgname}" "${_pkgname}-libre") provides=("${_pkgname}=${pkgver}" "${_pkgname}-libre=${pkgver}") -options=(!strip) install=${_pkgname}.install -source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz ffmpeg-0.11.patch) -md5sums=('31a60b3ce5466d965cb7e2648995e092' '9e5649403e51654615d30b10bc460217') +source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz + ffmpeg-0.11.patch + boost-1.50.patch) +md5sums=('31a60b3ce5466d965cb7e2648995e092' + '9e5649403e51654615d30b10bc460217' + '0bab80da07d980c47b8ce3cb998edaef') build() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch + patch -Np1 < "${srcdir}"/boost-1.50.patch sed -i "//d" intern/ffmpeg/ffmpeg_compat.h sed -i "//d" source/blender/blenkernel/intern/writeffmpeg.c @@ -60,10 +64,6 @@ build() { make $MAKEFLAGS -# cp -rf "${srcdir}/${_pkgname}-${pkgver}"/release/plugins/* \ -# "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/ -# cd "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi -# chmod 755 bmake make } @@ -71,11 +71,4 @@ package() { cd "${srcdir}/${_pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install python -m compileall "${pkgdir}/usr/share/blender" - -# install plugins -# install -d -m755 "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} -# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/sequence/*.so \ -# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ -# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/texture/*.so \ -# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ } diff --git a/artistic/blender-spacenav-libre/boost-1.50.patch b/artistic/blender-spacenav-libre/boost-1.50.patch new file mode 100644 index 000000000..fa698a3a6 --- /dev/null +++ b/artistic/blender-spacenav-libre/boost-1.50.patch @@ -0,0 +1,42 @@ +diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp +--- a/intern/cycles/util/util_cache.cpp 2012-05-10 11:44:09.000000000 -0300 ++++ b/intern/cycles/util/util_cache.cpp 2012-07-15 14:19:34.893238929 -0300 +@@ -26,8 +26,6 @@ + #include "util_path.h" + #include "util_types.h" + +-#define BOOST_FILESYSTEM_VERSION 2 +- + #include + #include + +@@ -117,7 +115,7 @@ + boost::filesystem::directory_iterator it(dir), it_end; + + for(; it != it_end; it++) { +- string filename = it->path().filename(); ++ string filename = it->path().filename().string(); + + if(boost::starts_with(filename, name)) + if(except.find(filename) == except.end()) +diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp +--- a/intern/cycles/util/util_path.cpp 2012-05-10 11:44:09.000000000 -0300 ++++ b/intern/cycles/util/util_path.cpp 2012-07-15 14:19:14.126293394 -0300 +@@ -26,8 +26,6 @@ + + #include + +-#define BOOST_FILESYSTEM_VERSION 2 +- + #include + #include + +@@ -60,7 +58,7 @@ + + string path_filename(const string& path) + { +- return boost::filesystem::path(path).filename(); ++ return boost::filesystem::path(path).filename().string(); + } + + string path_dirname(const string& path) diff --git a/community-staging/fatrat/PKGBUILD b/community-staging/fatrat/PKGBUILD new file mode 100644 index 000000000..195e8644a --- /dev/null +++ b/community-staging/fatrat/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 73722 2012-07-14 15:53:10Z stativ $ +# Maintainer: Lukas Jirkovsky +pkgname=fatrat +pkgver=1.2.0_beta2 +pkgrel=1 +pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" +arch=('i686' 'x86_64') +url="http://fatrat.dolezel.info/" +license=('GPL') +depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit') +optdepends=('geoip: GeoIP support') +makedepends=('boost' 'cmake' 'java-environment') +source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz) +md5sums=('ad823d2a81f0583316ece815b928c71b') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + . /etc/profile.d/jre.sh + . /etc/profile.d/jdk.sh + + cmake \ + -DWITH_EVERYTHING=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + . + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/calf/PKGBUILD b/community/calf/PKGBUILD new file mode 100644 index 000000000..078681e5a --- /dev/null +++ b/community/calf/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Ray Rashif + +pkgname=calf +pkgver=0.0.18.6 +pkgrel=1 +pkgdesc="LV2/DSSI/LADSPA plug-ins suite and standalone JACK host" +arch=('i686' 'x86_64') +url="http://calf.sf.net/" +license=('LGPL') +depends=('libglade' 'lash') +makedepends=('lv2core' 'ladspa' 'dssi') +source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'include_fix.patch') +md5sums=('780854561dad1cb873041d7a0b98cbcd' + '5aab4d057fb3646c43e6dfcad4c7128f') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/include_fix.patch" + + ./configure --prefix=/usr \ + --enable-experimental + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install + + rm "$pkgdir/usr/share/icons/hicolor/icon-theme.cache" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/calf/include_fix.patch b/community/calf/include_fix.patch new file mode 100644 index 000000000..243bd86ab --- /dev/null +++ b/community/calf/include_fix.patch @@ -0,0 +1,33 @@ +diff -aur calf-0.0.18.6.orig/src/benchmark.cpp calf-0.0.18.6/src/benchmark.cpp +--- calf-0.0.18.6.orig/src/benchmark.cpp 2012-07-08 21:57:55.246042862 +0800 ++++ calf-0.0.18.6/src/benchmark.cpp 2012-07-08 21:58:20.015908672 +0800 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + + #ifdef BENCHMARK_PLUGINS +diff -aur calf-0.0.18.6.orig/src/osctlnet.cpp calf-0.0.18.6/src/osctlnet.cpp +--- calf-0.0.18.6.orig/src/osctlnet.cpp 2012-07-08 21:57:55.246042862 +0800 ++++ calf-0.0.18.6/src/osctlnet.cpp 2012-07-08 21:58:19.002580827 +0800 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + using namespace osctl; + using namespace std; + +diff -aur calf-0.0.18.6.orig/src/preset.cpp calf-0.0.18.6/src/preset.cpp +--- calf-0.0.18.6.orig/src/preset.cpp 2012-07-08 21:57:55.246042862 +0800 ++++ calf-0.0.18.6/src/preset.cpp 2012-07-08 21:58:18.989247567 +0800 +@@ -20,6 +20,7 @@ + */ + + #include ++#include + #include + #include + #include diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD index 551f1447f..40fe732f8 100644 --- a/community/cdfs/PKGBUILD +++ b/community/cdfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72481 2012-06-15 13:19:51Z spupykin $ +# $Id: PKGBUILD 73696 2012-07-14 13:06:31Z allan $ # Maintainer: Sergej Pupykin # Contributor: J. Santiago Hirschfeld pkgname=cdfs pkgver=2.6.27 -pkgrel=22 +pkgrel=23 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" @@ -23,13 +23,13 @@ md5sums=('ac64c014a90e3c488394832ea29605b3' build() { _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`") - _kernverfull=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version` + _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-ARCH/version` cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/cdfs-3.0.patch patch -p1 <$srcdir/cdfs-3.2.patch patch -p1 <$srcdir/cdfs-3.4.patch - make KDIR=/lib/modules/${_kernverfull}/build - install -Dm0644 cdfs.ko $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko + make KDIR=/usr/lib/modules/${_kernverfull}/build + install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/cdfs.install } diff --git a/community/cdfs/cdfs.install b/community/cdfs/cdfs.install index d24929157..6be46f6d5 100644 --- a/community/cdfs/cdfs.install +++ b/community/cdfs/cdfs.install @@ -1,14 +1,14 @@ post_install() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + EXTRAMODULES='extramodules-3.4-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + EXTRAMODULES='extramodules-3.4-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + EXTRAMODULES='extramodules-3.4-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index fc6dd243a..7ac87fa4b 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73513 2012-07-08 23:03:50Z lcarlier $ +# $Id: PKGBUILD 73734 2012-07-14 22:35:52Z lcarlier $ # Maintainer: Laurent Carlier # Contributor : sebikul @@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -1161,7 +1161,7 @@ package_gambas3-gb-xml-html() { } package_gambas3-gb-xml-rpc() { - depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') + depends=('gambas3-gb-xml' 'gambas3-gb-net-curl') pkgdesc="XML-RPC component" ## workaround for splitting @@ -1173,8 +1173,11 @@ package_gambas3-gb-xml-rpc() { make XDG_UTILS='' DESTDIR="${pkgdir}" install ## + + # BUG: rpc component need the xml gambas3 component to be built/installed before! cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml make XDG_UTILS='' DESTDIR="${pkgdir}" install + make XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.net @@ -1183,8 +1186,12 @@ package_gambas3-gb-xml-rpc() { make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/main make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*} + # BUG: rpc component need the xml gambas3 component to be built/installed before! + rm ${pkgdir}/usr/lib/gambas3/gb.xml.[c-l]* + rm ${pkgdir}/usr/lib/gambas3/gb.xml.[s-x]* + rm ${pkgdir}/usr/share/gambas3/info/gb.xml.[h-l]* + rm ${pkgdir}/usr/share/gambas3/info/gb.xml.xslt.* + # BUG ## } diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD index bb3f8b660..a876ba89c 100644 --- a/community/gammu/PKGBUILD +++ b/community/gammu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69642 2012-04-20 22:20:38Z tdziedzic $ +# $Id: PKGBUILD 73714 2012-07-14 13:31:58Z schiv $ # Maintainer: Ray Rashif # Contributor: Corrado Primier # Contributor: Aurelien Foret pkgname=gammu -pkgver=1.31.0 -pkgrel=2 +pkgver=1.32.0 +pkgrel=1 pkgdesc="GNU All Mobile Management Utilities" arch=('i686' 'x86_64') url="http://wammu.eu/" @@ -14,9 +14,8 @@ depends=('bluez' 'curl' 'libmysqlclient' 'postgresql-libs' 'python2' 'libusb') makedepends=('cmake' 'doxygen' 'mysql') optdepends=('dialog: support for the gammu-config script') -#options=('!makeflags') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('9b1ff5d84730f025802b961ab9f26717') +md5sums=('8ea16c6b3cc48097a8e62311fe0e25b9') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index 0652947d2..d02b20888 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69505 2012-04-17 12:51:53Z seblu $ +# $Id: PKGBUILD 73694 2012-07-14 12:56:44Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Andrea Zucchelli pkgname=keepalived -pkgver=1.2.2 -pkgrel=4 +pkgver=1.2.3 +pkgrel=1 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64') url='http://www.keepalived.org/' @@ -14,17 +14,14 @@ depends=('openssl' 'popt' 'libnl1') source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.rc' 'keepalived.service' - 'keepalived.conf' - 'ip_vs_moved.patch') -md5sums=('f68327ca142616a8463d2d105db122cd' - 'baeb62a682c2b59d732cea84bf52cc87' + 'keepalived.conf') +md5sums=('1516a2fa0793184ff5c7ad77bac79460' + '0d7ea6296bce403a5d24be305a0a9d73' '7a327df915700dcd45a049d099c9c42b' - '9c8142da8730ad27a345587dea83ced7' - '87ee19c85adaedd3eb11bea8a5865d47') + '9c8142da8730ad27a345587dea83ced7') build() { cd $pkgname-$pkgver - patch -p1 -i ../ip_vs_moved.patch ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/community/keepalived/keepalived.rc b/community/keepalived/keepalived.rc index 88bb90724..0ecfc7ded 100644 --- a/community/keepalived/keepalived.rc +++ b/community/keepalived/keepalived.rc @@ -4,36 +4,35 @@ . /etc/rc.d/functions . /etc/conf.d/${0##*/} -NAME=keepalived DAEMON=/usr/sbin/keepalived PID=$(pidof -o %PPID $DAEMON) case "$1" in - start) - stat_busy "Starting $NAME daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0 - stat_fail - ;; + start) + stat_busy "Starting ${0##*/} daemon" + [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; stop) - stat_busy "Stopping $NAME daemon" - [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0 - stat_fail - ;; + stat_busy "Stopping ${0##*/} daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; restart) - $0 stop - $0 start - exit 0 - ;; + $0 stop + $0 start + exit 0 + ;; reload) - stat_busy "Reloading $NAME daemon" - [[ $PID ]] && kill -HUP $PID &> /dev/null && stat_done && exit 0 - stat_fail - ;; - *) - echo "usage: ${0##*/} {start|stop|restart|reload}" >&2 - ;; + stat_busy "Reloading ${0##*/} daemon" + [[ $PID ]] && kill -HUP $PID &> /dev/null && stat_done && exit 0 + stat_fail + ;; + *) + echo "usage: ${0##*/} {start|stop|restart|reload}" >&2 + ;; esac exit 1 -# vim:set ts=2 sw=2 ft=sh noet: +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/luabitop/PKGBUILD b/community/luabitop/PKGBUILD new file mode 100644 index 000000000..9e8a83683 --- /dev/null +++ b/community/luabitop/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 73728 2012-07-14 17:39:06Z seblu $ +# Maintainer: Sébastien Luttringer +# Contributor: Lucas Hermann Negri + +pkgname=luabitop +pkgver=1.0.2 +pkgrel=1 +pkgdesc='C extension adding bitwise operations on numbers' +arch=(i686 x86_64) +url='http://bitop.luajit.org/index.html' +depends=('lua') +source=("http://bitop.luajit.org/download/LuaBitOp-$pkgver.tar.gz") +md5sums=('d0c1080fe0c844e8477279668e2d0d06') +license=('MIT') + +build() { + cd LuaBitOp-$pkgver + make +} + +package() { + cd LuaBitOp-$pkgver + install -Dm 644 bit.so "$pkgdir/usr/lib/lua/5.1/bit.so" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD index 872138c99..e023ccddd 100644 --- a/community/luaposix/PKGBUILD +++ b/community/luaposix/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73453 2012-07-07 23:53:09Z seblu $ +# $Id: PKGBUILD 73729 2012-07-14 18:16:59Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: SpepS # Contributor: Laszlo Papp @@ -6,12 +6,12 @@ pkgname=luaposix pkgver=5.1.20 -pkgrel=1 +pkgrel=2 pkgdesc='A POSIX library for Lua programming language' arch=('i686' 'x86_64') url='http://luaforge.net/projects/luaposix/' license=('GPL' 'LGPL') -depends=('lua') +depends=('lua' 'luabitop') #checkdepends=('lunit') options=('!libtool') source=("https://github.com/downloads/rrthomas/$pkgname/$pkgname-$pkgver.tar.gz") diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index 48ccac808..3a56ba7df 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72792 2012-06-22 12:51:25Z dreisner $ +# $Id: PKGBUILD 73700 2012-07-14 13:07:06Z allan $ # Maintainer: Florian Pritz # Contributor: Paulo Matias # Contributor: Daniel J Griffiths @@ -6,7 +6,7 @@ pkgbase=oss pkgname=(oss libflashsupport-oss) pkgver=4.2_2006 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://developer.opensound.com/" license=('GPL2') @@ -50,6 +50,10 @@ build() { mkdir build && cd build "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm + # ossvermagic hardcodes /lib/modules *grumble* + sed -i 's|/lib/modules|/usr&|' \ + os_cmd/Linux/ossvermagic/ossvermagic.c + msg "Building OSS." make build @@ -62,9 +66,19 @@ build() { patch -p0 -i "${srcdir}/remove-hal.patch" rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi - sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon - sed -i 's#/lib/modules/$UNAME/kernel/#/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh - sed -i 's#mkdir /lib/modules#mkdir -p /lib/modules#' usr/lib/oss/build/install.sh + # fix kernel module directories + sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon + sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh + sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh + sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh + sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \ + usr/lib/oss/build/install.sh \ + usr/lib/oss/scripts/restore_drv.sh \ + usr/lib/oss/scripts/setup-alsa.sh \ + usr/lib/oss/scripts/remove_drv.sh \ + usr/lib/oss/build/Makefile.tmpl \ + usr/lib/oss/build/Makefile.osscore \ + usr/lib/oss/cuckoo/Makefile } package_oss() { diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD index 0e6c7e42e..44a999465 100644 --- a/community/pinot/PKGBUILD +++ b/community/pinot/PKGBUILD @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 62141 2012-01-16 19:53:05Z dreisner $ +# $Id: PKGBUILD 73687 2012-07-14 05:57:24Z jlichtblau $ # Maintainer: Jaroslav Lichtblau # Contributor: Alexander Fehr # Contributor: William Rea # Contributor: Daniel J Griffiths pkgname=pinot -pkgver=0.98 -pkgrel=2 +pkgver=1.0 +pkgrel=1 pkgdesc='Personal search and metasearch tool' arch=('i686' 'x86_64') -url='http://pinot.berlios.de/' +url='http://code.google.com/p/pinot-search/' license=('GPL') -depends=('gtkmm' 'xapian-core' 'libtextcat' 'sqlite3' 'libxml++' 'curl' - 'gmime' 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' - 'hicolor-icon-theme' 'cairo' 'exiv2') +depends=('gtkmm3' 'xapian-core' 'libtextcat' 'sqlite' 'libxml++' 'curl' 'gmime' 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' 'hicolor-icon-theme' 'cairo' 'exiv2') makedepends=('boost' 'desktop-file-utils') optdepends=('unzip: ZIP files extraction' 'poppler: PDF to text conversion' @@ -21,22 +19,25 @@ optdepends=('unzip: ZIP files extraction' 'djvulibre: DjVu text extraction' 'unrtf: RTF to HTML conversion' 'antiword: MS Word to text conversion' - 'catdoc: XLS and PPT to text conversion' - 'deskbar-applet: Pinot Deskbar-Applet module') + 'catdoc: XLS and PPT to text conversion') options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog -source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('8a89a73a48344074aa8f4534ce68fd18e3d84553645cef864c137ab21d8d341c') +source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz) +sha256sums=('d1f5ac17022014c5a29ba1e6d95fc39bcf254338a4e0bfe84bf16558d219e2e2') build() { cd ${srcdir}/$pkgname-$pkgver sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt + sed -i 's|/LM/russian.lm|/LM/russian-windows1251.lm|' textcat_conf.txt + sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat3_conf.txt + sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat31_conf.txt + sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat32_conf.txt sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm russian-iso8859_5\n\ /usr/share/libtextcat/LM/russian-koi8_r.lm russian-koi8_r\n\ -/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat_conf.txt +/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --enable-gtkmm3=yes make } @@ -44,7 +45,4 @@ package() { cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install - - # Remove Deskbar-Applet handler - rm -rf ${pkgdir}/usr/lib/deskbar-applet/handlers } diff --git a/community/pinot/pinot.changelog b/community/pinot/pinot.changelog index 7d899cdb0..406c94f58 100644 --- a/community/pinot/pinot.changelog +++ b/community/pinot/pinot.changelog @@ -1,2 +1,5 @@ +2012-07-14 Jaroslav Lichtblau + * pinot 1.0-1 + 2011-12-18 Jaroslav Lichtblau * pinot 0.98-1 diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD index 867bc44b1..df0540070 100644 --- a/community/r8168-lts/PKGBUILD +++ b/community/r8168-lts/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71856 2012-06-02 12:20:04Z mtorromeo $ +# $Id: PKGBUILD 73702 2012-07-14 13:07:16Z allan $ # Maintainer: Massimiliano Torromeo pkgname=r8168-lts _pkgname=r8168 pkgver=8.031.00 -pkgrel=1 +pkgrel=2 pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" url="http://www.realtek.com.tw" license=("GPL") @@ -13,20 +13,22 @@ depends=('glibc' "linux-lts>=3.0" "linux-lts<3.1") makedepends=("linux-lts-headers>=3.0" "linux-lts-headers<3.1") source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) install=$pkgname.install +md5sums=('ec1654f02e2dad930bbeb0210ddab7e5') +sha256sums=('5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779') _extramodules=extramodules-3.0-lts -_kernver="$(cat /lib/modules/$_extramodules/version || true)" +_kernver="$(cat /usr/lib/modules/$_extramodules/version || true)" build() { - cd "$srcdir/$_pkgname-$pkgver" - make -C /lib/modules/$_kernver/build SUBDIRS="$srcdir/$_pkgname-$pkgver/src" EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" modules + cd "$_pkgname-$pkgver" + make -C /usr/lib/modules/$_kernver/build \ + SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \ + EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ + modules } package() { - cd "$srcdir/$_pkgname-$pkgver/src" - install -D -m644 $_pkgname.ko "$pkgdir/lib/modules/$_extramodules/$_pkgname.ko" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; + cd "$_pkgname-$pkgver" + install -Dm644 src/$_pkgname.ko "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + } - -md5sums=('ec1654f02e2dad930bbeb0210ddab7e5') -sha256sums=('5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779') diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index dbd439de8..eb52e98f4 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72439 2012-06-14 15:09:58Z spupykin $ +# $Id: PKGBUILD 73703 2012-07-14 13:07:25Z allan $ # Maintainer: Sergej Pupykin pkgname=rsyslog pkgver=6.2.2 -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') @@ -51,6 +51,8 @@ package() { 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" + # fix location of systemctl and remove start precondition + sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \ + -e 's@/bin/systemctl@/usr&@' \ + -e '/^ExecStartPre/d' } diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index 5df6ebe38..9ffa315b8 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73199 2012-07-03 19:16:32Z dreisner $ +# $Id: PKGBUILD 73706 2012-07-14 13:07:56Z allan $ # Maintainer: Ray Rashif # Contributor: Mateusz Herych # Contributor: Charles Lindsay @@ -6,13 +6,14 @@ pkgname=vhba-module pkgver=20120422 _extramodules=extramodules-3.4-ARCH -pkgrel=2 +pkgrel=3 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" license=('GPL') depends=('linux>=3.4' 'linux<3.5') makedepends=('linux-headers>=3.4') +options=(!makeflags) install=$pkgname.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" '60-vhba.rules') @@ -22,15 +23,15 @@ md5sums=('d97372da1d270d1605742b2995fb6678' build() { cd "$srcdir/$pkgname-$pkgver" - _kernver="$(cat /lib/modules/$_extramodules/version)" + _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - make -j1 KDIR=/usr/src/linux-$_kernver + make KDIR=/usr/lib/modules/$_kernver/build } package() { cd "$srcdir/$pkgname-$pkgver" - install -D vhba.ko "$pkgdir/lib/modules/$_extramodules/vhba.ko" + install -D vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \ "$startdir/vhba-module.install" diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install index d9264d853..8458b2ae7 100644 --- a/community/vhba-module/vhba-module.install +++ b/community/vhba-module/vhba-module.install @@ -2,7 +2,7 @@ post_upgrade() { ! grep -q 'cdemu' /etc/group && groupadd cdemu echo " > Updating module dependencies..." EXTRAMODULES='extramodules-3.4-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index fb7a999a6..fefc12476 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163009 2012-07-05 13:48:25Z allan $ +# $Id: PKGBUILD 163511 2012-07-14 13:06:56Z allan $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.22 -pkgrel=8 +pkgrel=9 _date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') @@ -36,6 +36,7 @@ build() { [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" ${srcdir}/binutils/configure --prefix=/usr \ + --with-lib-path=/usr/lib:/usr/local/lib \ --enable-ld=default --enable-gold \ --enable-plugins --enable-threads \ --enable-shared $CONFIGFLAG diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 7de5a9bf2..93a075106 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163008 2012-07-05 13:48:19Z allan $ +# $Id: PKGBUILD 163512 2012-07-14 13:07:15Z allan $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -96,6 +96,8 @@ check() { package() { cd ${srcdir}/glibc-build + ln -s usr/lib ${pkgdir}/lib + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -123,7 +125,7 @@ package() { if [[ ${CARCH} = "x86_64" ]]; then # fix paths and compliance with binary blobs... sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd - ln -s /lib ${pkgdir}/lib64 + ln -s usr/lib ${pkgdir}/lib64 fi # Do not strip the following files for improved debugging support @@ -143,9 +145,9 @@ package() { strip $STRIP_STATIC usr/lib/*.a - strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \ - lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ - lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \ - lib/{libmemusage,libpcprofile,libSegFault}.so \ + strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \ + usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ + usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \ + usr/lib/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib/{pt_chown,{audit,gconv}/*.so} } diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 3f835206a..18c3ee0bd 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162219 2012-06-23 18:29:15Z dreisner $ +# $Id: PKGBUILD 163513 2012-07-14 13:07:23Z allan $ # Maintainer: Dave Reisner pkgname=kmod pkgver=9 -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' @@ -13,18 +13,15 @@ options=('!libtool') provides=('module-init-tools=3.16') conflicts=('module-init-tools') replaces=('module-init-tools') +install=kmod.install source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" - "depmod-search.conf" - "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch") + "depmod-search.conf") md5sums=('c8ae2d2694fbca2b28e238b30543a0cd' - 'dd62cbf62bd8f212f51ef8c43bec9a77' - 'b099be8997331dcb549617188cabc6af') + 'dd62cbf62bd8f212f51ef8c43bec9a77') build() { cd "$pkgname-$pkgver" - patch -Np1 <"$srcdir"/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch - ./configure \ --sysconfdir=/etc \ --with-zlib \ diff --git a/core/kmod/kmod.install b/core/kmod/kmod.install new file mode 100644 index 000000000..0a2e88dc5 --- /dev/null +++ b/core/kmod/kmod.install @@ -0,0 +1,9 @@ +#!/bin/sh + +post_upgrade() { + if [ "$(vercmp 9-2 "$2")" -eq 1 ]; then + echo "==> Kernel modules are now only read from /usr/lib/modules, all custom" + echo " built kernels and modules must be moved there before rebooting." + fi +} + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 2ddf56cb0..338fd8f94 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') -pkgver=185 -pkgrel=4 +pkgver=186 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -16,16 +16,12 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - '0001-vconsole-setup-enable-utf-8-mode-explicitly.patch' - '0001-udev-systemd-udev-settle.service-fix-After.patch' 'locale.sh') -md5sums=('a7dbbf05986eb0d2c164ec8e570eb78f' +md5sums=('17eff1d31e6e49bf82e129fe57efd59b' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - '83f51149ff9c4d75ea946e2b3cc61e53' - 'b3e41e90beaff35c66ba1b4bc223430a' 'f15956945052bb911e5df81cf5e7e5dc') build() { @@ -34,12 +30,6 @@ build() { # still waiting on ipw2x00 to get fixed... patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" - # upstream commit d305a67b46644d6360ef557109384c831ee8e018 - patch -Np1 <"$srcdir/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch" - - # upstream commit 8e8eb8fbafcaa841fa5393e396acde27b26edf2f - patch -Np1 <"$srcdir/0001-udev-systemd-udev-settle.service-fix-After.patch" - ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -62,10 +52,10 @@ package_systemd() { pkgdesc="system and service manager" depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' "systemd-tools=$pkgver" 'util-linux' 'xz') - optdepends=('python2-dbus: systemd-analyze' + optdepends=('python-dbus: systemd-analyze' 'initscripts: legacy support for hostname and vconsole setup' 'initscripts-systemd: legacy generator for initialization scripts' - 'python2-cairo: systemd-analyze' + 'python-cairo: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' 'systemd-sysvcompat: symlink package to provide sysvinit binaries') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf @@ -86,9 +76,6 @@ package_systemd() { install -dm755 "$pkgdir/bin" ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - # fix systemd-analyze for python2 - sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - # 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" @@ -197,6 +184,9 @@ package_systemd-tools() { # 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; diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 4b7332d61..1a2d85d4a 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162992 2012-07-04 21:44:53Z dreisner $ +# $Id: PKGBUILD 163535 2012-07-15 00:25:36Z tomegun $ # Maintainer: Tom Gundersen # Contributor: judd pkgname=util-linux pkgver=2.21.2 -pkgrel=3 +pkgrel=5 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -18,13 +18,11 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgve pam-login pam-common) backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login) +install=util-linux.install build() { cd "${srcdir}/${pkgname}-${pkgver}" - # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h - ./configure --prefix=/usr \ --libdir=/usr/lib \ --enable-fs-paths-extra=/usr/bin:/usr/sbin \ @@ -48,8 +46,6 @@ package() { cd "${pkgdir}" - install -dm755 var/lib/hwclock - # broken tool, going away in next major release, so just remove it now rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1} diff --git a/core/util-linux/util-linux.install b/core/util-linux/util-linux.install new file mode 100644 index 000000000..90ce5bd73 --- /dev/null +++ b/core/util-linux/util-linux.install @@ -0,0 +1,10 @@ +post_upgrade() { + if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then + if [ -f /var/lib/hwclock/adjtime ]; then + mv /var/lib/hwclock/adjtime /etc/adjtime + fi + if [ -d /var/lib/hwclock ]; then + rmdir /var/lib/hwclock + fi + fi +} diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 7cb36e082..56a5b1627 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 155885 2012-04-08 22:21:02Z bisson $ +# $Id: PKGBUILD 163519 2012-07-14 13:10:00Z allan $ # Contributor: FUBAR # Contributor: simo # Contributor: Jeff 'codemac' Mickey # Contributor: Daniel J Griffiths -# Maintainer: Gaetan Bisson +# Contributor: Gaetan Bisson +# Maintainer: Dave Reisner pkgname=bitlbee pkgver=3.0.5 -pkgrel=3 +pkgrel=4 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') @@ -21,42 +22,42 @@ optdepends=('skype4py: to use skyped' source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'sbindir.patch' 'xinetd' - 'rc.d') + 'rc.d' + 'bitlbee.tmpfiles') sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6' '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' - 'be09d29af3853825778331df451f16ca9e452d03') - -backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' 'etc/xinetd.d/bitlbee') -install=install + '02423c500ac64f673ba26a3395c7c7036c17343e' + '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') +backup=('etc/bitlbee/bitlbee.conf' + 'etc/bitlbee/motd.txt' + 'etc/xinetd.d/bitlbee') +install=bitlbee.install build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" patch -p1 -i ../sbindir.patch ./configure \ --prefix=/usr \ --etcdir=/etc/bitlbee \ - --pidfile=/var/run/bitlbee/bitlbee.pid \ - --ipcsocket=/var/run/bitlbee/bitlbee.sock \ + --pidfile=/run/bitlbee/bitlbee.pid \ + --ipcsocket=/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/usr/lib/systemd/system \ --ssl=openssl \ --strip=0 \ --otr=plugin \ - --skype=plugin \ + --skype=plugin make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -o65 -g65 -dm770 "${pkgdir}"/var/lib/bitlbee - install -Dm644 "${srcdir}"/xinetd "${pkgdir}"/etc/xinetd.d/bitlbee - install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/bitlbee + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev} - make DESTDIR="${pkgdir}" install - make DESTDIR="${pkgdir}" install-etc - make DESTDIR="${pkgdir}" install-dev + install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee" + install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee" + install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee" + install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" } diff --git a/extra/bitlbee/bitlbee.install b/extra/bitlbee/bitlbee.install new file mode 100644 index 000000000..aa5a81a70 --- /dev/null +++ b/extra/bitlbee/bitlbee.install @@ -0,0 +1,15 @@ +post_install() { + getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null + getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null + systemd-tmpfiles --create bitlbee.conf +} + +post_upgrade() { + post_install +} + +post_remove() { + getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null + getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null + true +} diff --git a/extra/bitlbee/bitlbee.tmpfiles b/extra/bitlbee/bitlbee.tmpfiles new file mode 100644 index 000000000..da72a0a79 --- /dev/null +++ b/extra/bitlbee/bitlbee.tmpfiles @@ -0,0 +1 @@ +d /run/bitlbee 0755 bitlbee bitlbee - - diff --git a/extra/bitlbee/rc.d b/extra/bitlbee/rc.d index bd9248173..ade85221a 100644 --- a/extra/bitlbee/rc.d +++ b/extra/bitlbee/rc.d @@ -3,38 +3,47 @@ . /etc/rc.conf . /etc/rc.d/functions -name=bitlbee -PID=$(pidof -o %PPID /usr/sbin/bitlbee) -install -o bitlbee -g bitlbee -d -m 755 /var/run/bitlbee +pidfile=/run/bitlbee/bitlbee.pid +if [[ -r $pidfile ]]; then + read -r PID < "$pidfile" + if [[ ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && { - rm -f /var/run/bitlbee/bitlbee.pid - su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee - } && { - add_daemon $name - stat_done - } || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && { - kill $PID &>/dev/null - } && { - rm -f /var/run/bitlbee/bitlbee.pid - rm_daemon $name - stat_done - } || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 3 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart}" - exit 1 - ;; +case $1 in + start) + stat_busy "Starting bitlbee daemon" + if [[ $PID ]] || ! su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee; then + stat_fail + exit 1 + else + add_daemon bitlbee + stat_done + fi + ;; + stop) + stat_busy "Stopping bitlbee daemon" + if [[ -z $PID ]] || ! kill $PID &>/dev/null; then + stat_fail + exit 1 + else + rm -f "$pidfile" + rm_daemon bitlbee + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + exit 1 + ;; esac + +# vim: set ft=sh et ts=2 sw=2: diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index 22490edde..3de683b40 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155954 2012-04-09 22:55:13Z giovanni $ +# $Id: PKGBUILD 163532 2012-07-14 18:17:58Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Andrew Simmons # Contributor: György Balló pkgname=gparted -pkgver=0.12.1 +pkgver=0.13.0 pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions' install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'org.archlinux.pkexec.gparted.policy') -md5sums=('8e07e7d8cf3add3d1facc68993122cf0' +md5sums=('6977d89ade1c81ccb8310dae0a0d3509' '27c264cfad8fa413d75954dda7a2dd50') build() { diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index ae02c190b..1c08f0df9 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 161113 2012-06-08 06:35:06Z andrea $ +# $Id: PKGBUILD 163530 2012-07-14 17:18:19Z dreisner $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.8.4 -pkgrel=1 +pkgrel=3 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -28,13 +28,14 @@ backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kscreensaver') options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' + 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') sha1sums=('a732ceacf34dfb79c8ab243f17cd5a70b9183212' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '712a90999bd429883dcef5dcaf288aace332ced8' 'b321b5e613b60231330e606fdf1e124646148388' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514') @@ -65,13 +66,17 @@ package() { cd "${srcdir}"/build make DESTDIR="${pkgdir}" install - install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver + install -d -m755 "${pkgdir}"/usr/share/xsessions/ - ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/ + ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \ + "${pkgdir}"/usr/share/xsessions/ install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown} install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm + install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm + install -Dm644 "${srcdir}"/kdm.service \ + "${pkgdir}"/usr/lib/systemd/system/kdm.service } diff --git a/extra/kdebase-workspace/kdm.service b/extra/kdebase-workspace/kdm.service new file mode 100644 index 000000000..c57aba920 --- /dev/null +++ b/extra/kdebase-workspace/kdm.service @@ -0,0 +1,9 @@ +[Unit] +Description=K Display Manager +After=systemd-user-sessions.service + +[Service] +ExecStart=/usr/bin/kdm -nodaemon + +[Install] +Alias=display-manager.service diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 539fcd30b..ad8015a92 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163171 2012-07-08 10:16:42Z giovanni $ +# $Id: PKGBUILD 163534 2012-07-14 19:08:48Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2012.07.06 +pkgver=2012.07.14 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=('7b483136bf58203b4371178da1e530a7') +md5sums=('9496fd1cf093be9a95f47ef0184bef03') build() { cd ${srcdir}/live diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD index c86f0503e..ec5ee7dfd 100644 --- a/extra/phonon-gstreamer/PKGBUILD +++ b/extra/phonon-gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 150265 2012-02-16 07:51:52Z andrea $ +# $Id: PKGBUILD 163506 2012-07-14 10:11:44Z andrea $ # Maintainer: Andrea Scarpino pkgname=phonon-gstreamer -pkgver=4.6.0 +pkgver=4.6.1 pkgrel=1 arch=('i686' 'x86_64') url='http://phonon.kde.org/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4' 'phonon' 'mesa') provides=('phonon-backend') install="${pkgname}.install" source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.xz") -md5sums=('cc380c7612aaaa87294185ded702f88a') +md5sums=('c0c8a1064e32c83dd6976187dcc491a3') build() { cd "${srcdir}" diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD index 4ca16b66e..240f47178 100644 --- a/extra/xorg-xdm/PKGBUILD +++ b/extra/xorg-xdm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161610 2012-06-12 11:02:41Z jgc $ +# $Id: PKGBUILD 163529 2012-07-14 17:17:56Z dreisner $ # Maintainer: Alexander Baldeck # Contributor: Jan de Groot pkgname=xorg-xdm pkgver=1.1.11 -pkgrel=2 +pkgrel=3 pkgdesc="X Display Manager" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -46,6 +46,10 @@ build() { --with-xdmscriptdir=/etc/X11/xdm \ --with-pixmapdir=/usr/share/xdm/pixmaps make +} + +package() { + cd "${srcdir}/xdm-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/var/lib/xdm" install -m755 -d "${pkgdir}/etc/pam.d" @@ -54,4 +58,7 @@ build() { install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/* + + sed -i 's|^Alias=.*|Alias=display-manager.service|' \ + "$pkgdir/usr/lib/systemd/system/xdm.service" } diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD index b0ff65f79..9fe9c9e66 100644 --- a/kde-unstable/kdepim/PKGBUILD +++ b/kde-unstable/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163432 2012-07-11 22:51:03Z andrea $ +# $Id: PKGBUILD 163528 2012-07-14 14:11:27Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim') pkgver=4.8.97 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -144,7 +144,7 @@ package_kdepim-kmail() { replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins') for i in kmail doc/kmail kmailcvt ksendemail libksieve \ - mailfilteragent ontologies kontact/plugins/kmail; do + mailfilteragent mailimporter ontologies kontact/plugins/kmail; do cd "${srcdir}"/build/${i} make DESTDIR="${pkgdir}" install done diff --git a/libre-testing/luxrender-libre/PKGBUILD b/libre-testing/luxrender-libre/PKGBUILD new file mode 100644 index 000000000..44df6f3c2 --- /dev/null +++ b/libre-testing/luxrender-libre/PKGBUILD @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Lukas Jirkovsky +# Initial contributor: flixie <69one@gmx.net> +# Contributor: Imanol Celaya +# Maintainer (Parabola): Márcio Silva +pkgname=luxrender-libre +pkgver=1.0rc2 +_pkgver=008805644181 +pkgrel=2 +pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.luxrender.net/" +license=('GPL') +depends=('boost-libs' 'freeimage' 'openexr') +optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ + 'python: Python interface (pylux)') +makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python') +replaces=('luxrender') +conflicts=('luxrender') +provides=("luxrender=$pkgver") +source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \ + boost_1.50_fix.diff) +md5sums=('1922ccce6f70e7d707b340e2415875cd' + '8c7774bb0c97aadd77d9e665d8fa4aab') + +build() { + cd "$srcdir"/luxrender-lux-$_pkgver + + # fix for boost 1.50 + # the boost::TIME_UTC has been renamed due to the conflict with C++11 + patch -Np1 < "$srcdir"/boost_1.50_fix.diff || true + + export CXXFLAGS="$CXXFLAGS -lpthread" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUXRAYS_DISABLE_OPENCL=ON \ + -DPYTHON_CUSTOM=ON \ + -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \ + . + make +} + +package() { + cd "$srcdir"/luxrender-lux-$_pkgver + make DESTDIR="$pkgdir" install + + # fix library path on x86_64 + [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib + + #install pylux + install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so +} + +# vim:set ts=2 sw=2 et: diff --git a/libre-testing/luxrender-libre/boost_1.50_fix.diff b/libre-testing/luxrender-libre/boost_1.50_fix.diff new file mode 100644 index 000000000..c1aa0a8e2 --- /dev/null +++ b/libre-testing/luxrender-libre/boost_1.50_fix.diff @@ -0,0 +1,131 @@ +diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp +--- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200 +@@ -618,7 +618,7 @@ Film::Film(u_int xres, u_int yres, Filte + int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth); + samplePerPass = xRealWidth * yRealHeight; + +- boost::xtime_get(&creationTime, boost::TIME_UTC); ++ boost::xtime_get(&creationTime, boost::TIME_UTC_); + + //Queryable parameters + AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution); +@@ -855,7 +855,7 @@ void Film::AddSampleCount(float count) { + if (haltTime > 0) { + // Check if we have met the enough rendering time condition + boost::xtime t; +- boost::xtime_get(&t, boost::TIME_UTC); ++ boost::xtime_get(&t, boost::TIME_UTC_); + if (t.sec - creationTime.sec > haltTime) + enoughSamplesPerPixel = true; + } +diff -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp +--- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200 +@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen + + boost::xtime photonShootingStartTime; + boost::xtime lastUpdateTime; +- boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC); +- boost::xtime_get(&lastUpdateTime, boost::TIME_UTC); ++ boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_); ++ boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_); + u_int nshot = 0; + while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) { + // Dade - print some progress information + boost::xtime currentTime; +- boost::xtime_get(¤tTime, boost::TIME_UTC); ++ boost::xtime_get(¤tTime, boost::TIME_UTC_); + if (currentTime.sec - lastUpdateTime.sec > 5) { + ss.str(""); + ss << "Photon shooting progress: Direct[" << directPhotons.size(); +@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen + return; + + boost::xtime photonShootingEndTime; +- boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC); ++ boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_); + LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)"; + + if (computeRadianceMap) { +@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen + for (u_int i = 0; i < radiancePhotons.size(); ++i) { + // Dade - print some progress info + boost::xtime currentTime; +- boost::xtime_get(¤tTime, boost::TIME_UTC); ++ boost::xtime_get(¤tTime, boost::TIME_UTC_); + if (currentTime.sec - lastUpdateTime.sec > 5) { + LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)"; + +@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen + + + boost::xtime radianceComputeEndTime; +- boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC); ++ boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_); + LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)"; + } + +diff -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp +--- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200 +@@ -100,7 +100,7 @@ void FilmUpdaterThread::updateFilm(FilmU + // Dade - thread to update the film with data from servers + + boost::xtime reft; +- boost::xtime_get(&reft, boost::TIME_UTC); ++ boost::xtime_get(&reft, boost::TIME_UTC_); + + while (filmUpdaterThread->signal == SIG_NONE) { + // Dade - check signal every 1 sec +@@ -108,7 +108,7 @@ void FilmUpdaterThread::updateFilm(FilmU + for(;;) { + // Dade - sleep for 1 sec + boost::xtime xt; +- boost::xtime_get(&xt, boost::TIME_UTC); ++ boost::xtime_get(&xt, boost::TIME_UTC_); + xt.sec += 1; + boost::thread::sleep(xt); + +diff -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp +--- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200 +@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres, + m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != ""; + + // init timer +- boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC); ++ boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_); + lastWriteFLMTime = lastWriteImageTime; + } + +@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter + { + // Check write output interval + boost::xtime currentTime; +- boost::xtime_get(¤tTime, boost::TIME_UTC); ++ boost::xtime_get(¤tTime, boost::TIME_UTC_); + bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval); + bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval); + +@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter + // WriteImage can take a very long time to be executed (i.e. by saving + // the film. It is better to refresh timestamps after the + // execution of WriteImage instead than before. +- boost::xtime_get(¤tTime, boost::TIME_UTC); ++ boost::xtime_get(¤tTime, boost::TIME_UTC_); + + if (timeToWriteImage) + lastWriteImageTime = currentTime; +diff -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h +--- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200 ++++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200 +@@ -126,7 +126,7 @@ public: + { + while (state == PAUSE && !boost::this_thread::interruption_requested()) { + boost::xtime xt; +- boost::xtime_get(&xt, boost::TIME_UTC); ++ boost::xtime_get(&xt, boost::TIME_UTC_); + xt.sec += 1; + boost::thread::sleep(xt); + } diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index 5dd14405d..b4ba9f827 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=blender pkgname=blender-libre pkgver=2.63a -pkgrel=2.1 +pkgrel=3 epoch=4 pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)" arch=('i686' 'x86_64' 'mips64el') @@ -18,15 +18,19 @@ makedepends=('cmake' 'boost') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") -options=(!strip) install=${_pkgname}.install -source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz ffmpeg-0.11.patch) -md5sums=('31a60b3ce5466d965cb7e2648995e092' '9e5649403e51654615d30b10bc460217') +source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz + ffmpeg-0.11.patch + boost-1.50.patch) +md5sums=('31a60b3ce5466d965cb7e2648995e092' + '9e5649403e51654615d30b10bc460217' + '0bab80da07d980c47b8ce3cb998edaef') build() { cd "${srcdir}/${_pkgname}-${pkgver}" patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch + patch -Np1 < "${srcdir}"/boost-1.50.patch sed -i "//d" intern/ffmpeg/ffmpeg_compat.h sed -i "//d" source/blender/blenkernel/intern/writeffmpeg.c @@ -60,10 +64,6 @@ build() { make $MAKEFLAGS -# cp -rf "${srcdir}/${_pkgname}-${pkgver}"/release/plugins/* \ -# "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/ -# cd "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi -# chmod 755 bmake make } @@ -71,11 +71,4 @@ package() { cd "${srcdir}/${_pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install python -m compileall "${pkgdir}/usr/share/blender" - -# install plugins -# install -d -m755 "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} -# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/sequence/*.so \ -# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ -# cp "${srcdir}/${_pkgname}-${pkgver}"/source/blender/blenpluginapi/texture/*.so \ -# "${pkgdir}"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ } diff --git a/libre/blender-libre/boost-1.50.patch b/libre/blender-libre/boost-1.50.patch new file mode 100644 index 000000000..fa698a3a6 --- /dev/null +++ b/libre/blender-libre/boost-1.50.patch @@ -0,0 +1,42 @@ +diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp +--- a/intern/cycles/util/util_cache.cpp 2012-05-10 11:44:09.000000000 -0300 ++++ b/intern/cycles/util/util_cache.cpp 2012-07-15 14:19:34.893238929 -0300 +@@ -26,8 +26,6 @@ + #include "util_path.h" + #include "util_types.h" + +-#define BOOST_FILESYSTEM_VERSION 2 +- + #include + #include + +@@ -117,7 +115,7 @@ + boost::filesystem::directory_iterator it(dir), it_end; + + for(; it != it_end; it++) { +- string filename = it->path().filename(); ++ string filename = it->path().filename().string(); + + if(boost::starts_with(filename, name)) + if(except.find(filename) == except.end()) +diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp +--- a/intern/cycles/util/util_path.cpp 2012-05-10 11:44:09.000000000 -0300 ++++ b/intern/cycles/util/util_path.cpp 2012-07-15 14:19:14.126293394 -0300 +@@ -26,8 +26,6 @@ + + #include + +-#define BOOST_FILESYSTEM_VERSION 2 +- + #include + #include + +@@ -60,7 +58,7 @@ + + string path_filename(const string& path) + { +- return boost::filesystem::path(path).filename(); ++ return boost::filesystem::path(path).filename().string(); + } + + string path_dirname(const string& path) diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index 4dc4444f4..d741bae12 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73283 2012-07-05 13:48:49Z allan $ +# $Id: PKGBUILD 73695 2012-07-14 13:05:07Z allan $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Allan McRae @@ -9,12 +9,11 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library for multilib" arch=('x86_64') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') -depends=("glibc>=$pkgver") makedepends=('gcc-multilib>=4.7') options=('!strip' '!emptydirs') source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig} @@ -48,6 +47,7 @@ build() { export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" export CC="gcc -m32" + export CXX="g++ -m32" echo "slibdir=/usr/lib32" >> configparms # remove hardening options from CFLAGS for building libraries @@ -111,8 +111,8 @@ package() { usr/lib32/{pt_chown,{audit,gconv}/*.so} # Dynamic linker - mkdir ${pkgdir}/lib - ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/ + mkdir ${pkgdir}/usr/lib + ln -s ../lib32/ld-linux.so.2 ${pkgdir}/usr/lib/ # Add lib32 paths to the default library search path install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" diff --git a/multilib/zsnes/PKGBUILD b/multilib/zsnes/PKGBUILD index e2c5d0da9..bb6efb9cc 100644 --- a/multilib/zsnes/PKGBUILD +++ b/multilib/zsnes/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63494 2012-02-05 11:45:54Z ibiru $ +# $Id: PKGBUILD 73720 2012-07-14 14:32:44Z heftig $ # Maintainer: Sven-Hendrik Haase # Contributor: Frank Tetzel # Contributor: Hugo Doria @@ -6,7 +6,7 @@ pkgname=zsnes pkgver=1.51 -pkgrel=11 +pkgrel=13 pkgdesc="Super Nintendo emulator" url="http://www.zsnes.com/" arch=('i686' 'x86_64') @@ -14,47 +14,57 @@ license=('GPL') options=(!buildflags) if [[ $CARCH == "x86_64" ]]; then - depends=('gcc-libs-multilib' 'lib32-sdl' 'lib32-libpng>=1.5.0' 'lib32-libgl' 'lib32-ncurses' 'lib32-mesa') - makedepends=('nasm' 'gcc-multilib') + depends=('lib32-gcc-libs' 'lib32-sdl' 'lib32-libpng>=1.5.0' 'lib32-libgl' 'lib32-ncurses' 'lib32-mesa') + makedepends=('nasm' 'gcc-multilib' 'gendesk') else - depends=('gcc-libs' 'sdl' 'libpng>=1.5.0' 'libgl' 'ncurses' 'mesa') - makedepends=('nasm' 'gcc') + depends=('gcc-libs' 'sdl' 'libpng>=1.5.0' 'libgl' 'ncurses' 'mesa') + makedepends=('nasm' 'gcc' 'gendesk') fi source=(http://downloads.sourceforge.net/${pkgname}/zsnes151src.tar.bz2 - zsnes.patch - zsnes-1.51-libpng15.patch - zsnes.desktop - zsnes_icon.png) + zsnes.patch + zsnes-1.51-libpng15.patch + zsnes.png) md5sums=('7071186bf80632ae88a153239498d8c9' - 'aa250af3ef8dbf8a44e095d4cd132db2' + 'fd13769c13de49601a234b46fb802a75' 'ea82b4dbf31c87dbcc6c67d02ddfb299' - 'b100b2aa342c551167d7c5dcdcde9dd4' 'b5260c02adfc3b7ff725041214b00bfd') build() { - cd ${srcdir}/${pkgname}_1_51/ + cd "$srcdir/${pkgname}_1_51" + patch -p1 -i ../zsnes.patch patch -p0 -i ../zsnes-1.51-libpng15.patch - cd ${srcdir}/${pkgname}_1_51/src -if [ $CARCH == "x86_64" ]; then - export CC="gcc -m32" - export CXX="g++ -m32" -fi + cd src + if [ $CARCH == "x86_64" ]; then + export CC="gcc -m32" + export CXX="g++ -m32" + fi ./autogen.sh --prefix=/usr \ x_libraries=/usr/lib \ force_arch=i686 \ --enable-release make +} + +package() { + cd "$srcdir" + + gendesk + + cd "${pkgname}_1_51/src" + make DESTDIR=${pkgdir} install # adding --mandir= to autoconf line fails install -dm755 ${pkgdir}/usr/share install -Dm644 ${srcdir}/zsnes.desktop ${pkgdir}/usr/share/applications/zsnes.desktop - install -Dm644 ${srcdir}/zsnes_icon.png ${pkgdir}/usr/share/pixmaps/zsnes_icon.png + install -Dm644 ${srcdir}/zsnes.png ${pkgdir}/usr/share/pixmaps/zsnes.png mv ${pkgdir}/usr/man ${pkgdir}/usr/share } + +# vim:set ts=2 sw=2 et: diff --git a/multilib/zsnes/zsnes.patch b/multilib/zsnes/zsnes.patch index 1be5d96ea..d5d681ae6 100644 --- a/multilib/zsnes/zsnes.patch +++ b/multilib/zsnes/zsnes.patch @@ -66,3 +66,15 @@ diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h /* This is part of a toolkit used to assist in ZSNES development */ +diff -u -r zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-fix/src/tools/depbuild.cpp +--- zsnes_1_51/src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100 ++++ zsnes_1_51-fix/src/tools/depbuild.cpp 2012-07-14 16:20:17.759886250 +0200 +@@ -26,6 +26,8 @@ + #include + using namespace std; + ++#include ++ + #include "fileutil.h" + #include "strutil.h" + diff --git a/multilib/zsnes/zsnes.png b/multilib/zsnes/zsnes.png new file mode 100644 index 000000000..31608ba06 Binary files /dev/null and b/multilib/zsnes/zsnes.png differ diff --git a/testing/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch b/testing/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch new file mode 100644 index 000000000..087b87cdb --- /dev/null +++ b/testing/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch @@ -0,0 +1,135 @@ +From 6124a3842dfa8484b52e067a8ab8105c3875a4f7 Mon Sep 17 00:00:00 2001 +From: Jim Meyering +Date: Thu, 10 May 2012 19:43:00 +0200 +Subject: [PATCH] ls: color each symlink-to-relative-name in / properly + +In order for ls --color to color each symlink, it must form the name +of each referent and then stat it to see if the link is dangling, to +a directory, to a file, etc. When the symlink is to a relative name, +ls must concatenate the starting directory name and that relative name. +When, in addition, the starting directory was "/" or "/some-name", +the result was ill-formed, and the subsequent stat would usually fail, +making the caller color it as a dangling symlink. +* src/ls.c (make_link_name): Don't botch the case in which +dir_name(NAME) == "/" and LINKNAME is relative. +* tests/ls/root-rel-symlink-color: New file. Test for the above. +* tests/Makefile.am (TESTS): Add it. +* NEWS (Bug fixes): Mention it. +Reported by Mike Frysinger in http://bugs.gnu.org/11453 +Bug introduced by commit v8.16-23-gbcb9078. +--- + NEWS | 5 ++++ + src/ls.c | 9 +++++++- + tests/Makefile.am | 1 + + tests/ls/root-rel-symlink-color | 51 +++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 65 insertions(+), 1 deletion(-) + create mode 100755 tests/ls/root-rel-symlink-color + +diff --git a/NEWS b/NEWS +index 6c620b3..f9e9c70 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,11 @@ GNU coreutils NEWS -*- outline -*- + + * Noteworthy changes in release ?.? (????-??-??) [?] + ++** Bug fixes ++ ++ ls --color would mis-color relative-named symlinks in / ++ [bug introduced in coreutils-8.17] ++ + + * Noteworthy changes in release 8.17 (2012-05-10) [stable] + +diff --git a/src/ls.c b/src/ls.c +index 397e4ea..9494ae9 100644 +--- a/src/ls.c ++++ b/src/ls.c +@@ -3213,7 +3213,14 @@ make_link_name (char const *name, char const *linkname) + return xstrdup (linkname); + + char *p = xmalloc (prefix_len + 1 + strlen (linkname) + 1); +- stpcpy (stpncpy (p, name, prefix_len + 1), linkname); ++ ++ /* PREFIX_LEN usually specifies a string not ending in slash. ++ In that case, extend it by one, since the next byte *is* a slash. ++ Otherwise, the prefix is "/", so leave the length unchanged. */ ++ if ( ! ISSLASH (name[prefix_len - 1])) ++ ++prefix_len; ++ ++ stpcpy (stpncpy (p, name, prefix_len), linkname); + return p; + } + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index a4370a6..0bafc5f 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -449,6 +449,7 @@ TESTS = \ + ls/proc-selinux-segfault \ + ls/readdir-mountpoint-inode \ + ls/recursive \ ++ ls/root-rel-symlink-color \ + ls/rt-1 \ + ls/slink-acl \ + ls/stat-dtype \ +diff --git a/tests/ls/root-rel-symlink-color b/tests/ls/root-rel-symlink-color +new file mode 100755 +index 0000000..d795432 +--- /dev/null ++++ b/tests/ls/root-rel-symlink-color +@@ -0,0 +1,51 @@ ++#!/bin/sh ++# Exercise the 8.17 ls bug with coloring relative-named symlinks in "/". ++ ++# Copyright (C) 2012 Free Software Foundation, Inc. ++ ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++. "${srcdir=.}/init.sh"; path_prepend_ ../src ++print_ver_ ls ++ ++symlink_to_rel= ++for i in /*; do ++ # Skip non-symlinks: ++ env test -h "$i" || continue ++ ++ # Skip dangling symlinks: ++ env test -e "$i" || continue ++ ++ # Skip any symlink-to-absolute-name: ++ case $(readlink "$i") in /*) continue ;; esac ++ ++ symlink_to_rel=$i ++ break ++done ++ ++test -z "$symlink_to_rel" \ ++ && skip_ no relative symlink in / ++ ++e='\33' ++color_code='01;36' ++c_pre="$e[0m$e[${color_code}m" ++c_post="$e[0m" ++printf "$c_pre$symlink_to_rel$c_post\n" > exp || framework_failure_ ++ ++env TERM=xterm LS_COLORS="ln=$color_code:or=1;31;42" \ ++ ls -d --color=always "$symlink_to_rel" > out || fail=1 ++ ++compare exp out || fail=1 ++ ++Exit $fail +-- +1.7.11.2 + diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD new file mode 100644 index 000000000..ebc8c820a --- /dev/null +++ b/testing/coreutils/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 163537 2012-07-15 01:13:11Z dreisner $ +# Maintainer: Allan McRae +# Contributor: judd + +pkgname=coreutils +pkgver=8.17 +pkgrel=2 +pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/coreutils" +groups=('base') +depends=('glibc' 'pam' 'acl' 'gmp' 'libcap') +replaces=('mktemp') +backup=('etc/pam.d/su') +install=${pkgname}.install +options=('!emptydirs') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} + coreutils-pam.patch + 0001-ls-color-each-symlink-to-relative-name-in-properly.patch + su.pam) +md5sums=('bbda656ce8ca2c6903948f9faa204ba3' + 'ebecd29b095aa21b0b2f833f1ec20d70' + 'aad79a2aa6d566c375d7bdd1b0767278' + 'd7c691898a695a6284a927e6a9426fe4' + 'fa85e5cce5d723275b14365ba71a8aad') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # added su wheel group pam patch (from fedora git) + patch -Np1 -i ${srcdir}/coreutils-pam.patch + + # fix coloring for symlinks in / + # upstream commit 6124a3842dfa8484b52e067a8ab8105c3875a4f7 + patch -Np1 -i $srcdir/0001-ls-color-each-symlink-to-relative-name-in-properly.patch + + autoreconf -v + ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \ + --enable-install-program=su \ + --enable-no-install-program=groups,hostname,kill,uptime \ + --enable-pam + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make RUN_EXPENSIVE_TESTS=yes check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + cd ${pkgdir}/usr/bin + install -dm755 ${pkgdir}/{bin,usr/sbin} + + # binaries required by FHS + _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false' + 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'su' 'sync' + 'true' 'uname') + mv ${_fhs[@]} ${pkgdir}/bin + + # makepkg uses the full path to this... + ln -s /usr/bin/du ${pkgdir}/bin/du + + mv chroot ${pkgdir}/usr/sbin + install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su +} diff --git a/testing/coreutils/coreutils-pam.patch b/testing/coreutils/coreutils-pam.patch new file mode 100644 index 000000000..e61908f3f --- /dev/null +++ b/testing/coreutils/coreutils-pam.patch @@ -0,0 +1,428 @@ +diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac +--- coreutils-8.4-orig/configure.ac 2010-01-11 18:20:42.000000000 +0100 ++++ coreutils-8.4/configure.ac 2010-02-12 10:17:46.000000000 +0100 +@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then + AC_SUBST([GNULIB_WARN_CFLAGS]) + fi + ++dnl Give the chance to enable PAM ++AC_ARG_ENABLE(pam, dnl ++[ --enable-pam Enable use of the PAM libraries], ++[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM]) ++LIB_PAM="-ldl -lpam -lpam_misc" ++AC_SUBST(LIB_PAM)]) ++ + AC_FUNC_FORK + + optional_bin_progs= +diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi +--- coreutils-8.4-orig/doc/coreutils.texi 2010-01-03 18:06:20.000000000 +0100 ++++ coreutils-8.4/doc/coreutils.texi 2010-02-12 10:17:46.000000000 +0100 +@@ -15081,8 +15081,11 @@ to certain shells, etc.). + @findex syslog + @command{su} can optionally be compiled to use @code{syslog} to report + failed, and optionally successful, @command{su} attempts. (If the system +-supports @code{syslog}.) However, GNU @command{su} does not check if the +-user is a member of the @code{wheel} group; see below. ++supports @code{syslog}.) ++ ++This version of @command{su} has support for using PAM for ++authentication. You can edit @file{/etc/pam.d/su} to customize its ++behaviour. + + The program accepts the following options. Also see @ref{Common options}. + +@@ -15124,6 +15127,8 @@ environment variables except @env{TERM}, + @env{PATH} to a compiled-in default value. Change to @var{user}'s home + directory. Prepend @samp{-} to the shell's name, intended to make it + read its login startup file(s). ++Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables ++are preserved as well for PAM functionality. + + @item -m + @itemx -p +@@ -15163,33 +15168,6 @@ Exit status: + the exit status of the subshell otherwise + @end display + +-@cindex wheel group, not supported +-@cindex group wheel, not supported +-@cindex fascism +-@subsection Why GNU @command{su} does not support the @samp{wheel} group +- +-(This section is by Richard Stallman.) +- +-@cindex Twenex +-@cindex MIT AI lab +-Sometimes a few of the users try to hold total power over all the +-rest. For example, in 1984, a few users at the MIT AI lab decided to +-seize power by changing the operator password on the Twenex system and +-keeping it secret from everyone else. (I was able to thwart this coup +-and give power back to the users by patching the kernel, but I +-wouldn't know how to do that in Unix.) +- +-However, occasionally the rulers do tell someone. Under the usual +-@command{su} mechanism, once someone learns the root password who +-sympathizes with the ordinary users, he or she can tell the rest. The +-``wheel group'' feature would make this impossible, and thus cement the +-power of the rulers. +- +-I'm on the side of the masses, not that of the rulers. If you are +-used to supporting the bosses and sysadmins in whatever they do, you +-might find this idea strange at first. +- +- + @node timeout invocation + @section @command{timeout}: Run a command with a time limit + +diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am +--- coreutils-8.4-orig/src/Makefile.am 2010-01-03 18:06:20.000000000 +0100 ++++ coreutils-8.4/src/Makefile.am 2010-02-12 10:17:46.000000000 +0100 +@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP) + uptime_LDADD += $(GETLOADAVG_LIBS) + + # for crypt +-su_LDADD += $(LIB_CRYPT) ++su_LDADD += $(LIB_CRYPT) @LIB_PAM@ + + # for various ACL functions + copy_LDADD += $(LIB_ACL) +diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c +--- coreutils-8.4-orig/src/su.c 2010-02-12 10:15:15.000000000 +0100 ++++ coreutils-8.4/src/su.c 2010-02-12 10:24:29.000000000 +0100 +@@ -37,6 +37,16 @@ + restricts who can su to UID 0 accounts. RMS considers that to + be fascist. + ++#ifdef USE_PAM ++ ++ Actually, with PAM, su has nothing to do with whether or not a ++ wheel group is enforced by su. RMS tries to restrict your access ++ to a su which implements the wheel group, but PAM considers that ++ to be fascist, and gives the user/sysadmin the opportunity to ++ enforce a wheel group by proper editing of /etc/pam.conf ++ ++#endif ++ + Compile-time options: + -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. + -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. +@@ -53,6 +63,15 @@ + #include + #include + ++#ifdef USE_PAM ++# include ++# include ++# include ++# include ++# include ++# include ++#endif /* USE_PAM */ ++ + #include "system.h" + #include "getpass.h" + +@@ -120,10 +139,17 @@ + /* The user to become if none is specified. */ + #define DEFAULT_USER "root" + ++#ifndef USE_PAM + char *crypt (char const *key, char const *salt); ++#endif + +-static void run_shell (char const *, char const *, char **, size_t) ++static void run_shell (char const *, char const *, char **, size_t, ++ const struct passwd *) ++#ifdef USE_PAM ++ ; ++#else + ATTRIBUTE_NORETURN; ++#endif + + /* If true, pass the `-f' option to the subshell. */ + static bool fast_startup; +@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su + } + #endif + ++#ifdef USE_PAM ++static pam_handle_t *pamh = NULL; ++static int retval; ++static struct pam_conv conv = { ++ misc_conv, ++ NULL ++}; ++ ++#define PAM_BAIL_P if (retval) { \ ++ pam_end(pamh, PAM_SUCCESS); \ ++ return 0; \ ++} ++#define PAM_BAIL_P_VOID if (retval) { \ ++ pam_end(pamh, PAM_SUCCESS); \ ++return; \ ++} ++#endif ++ + /* Ask the user for a password. ++ If PAM is in use, let PAM ask for the password if necessary. + Return true if the user gives the correct password for entry PW, + false if not. Return true without asking for a password if run by UID 0 + or if PW has an empty password. */ +@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su + static bool + correct_password (const struct passwd *pw) + { ++#ifdef USE_PAM ++ struct passwd *caller; ++ char *tty_name, *ttyn; ++ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh); ++ PAM_BAIL_P; ++ ++ if (getuid() != 0 && !isatty(0)) { ++ fprintf(stderr, "standard in must be a tty\n"); ++ exit(1); ++ } ++ ++ caller = getpwuid(getuid()); ++ if(caller != NULL && caller->pw_name != NULL) { ++ retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name); ++ PAM_BAIL_P; ++ } ++ ++ ttyn = ttyname(0); ++ if (ttyn) { ++ if (strncmp(ttyn, "/dev/", 5) == 0) ++ tty_name = ttyn+5; ++ else ++ tty_name = ttyn; ++ retval = pam_set_item(pamh, PAM_TTY, tty_name); ++ PAM_BAIL_P; ++ } ++ retval = pam_authenticate(pamh, 0); ++ PAM_BAIL_P; ++ retval = pam_acct_mgmt(pamh, 0); ++ if (retval == PAM_NEW_AUTHTOK_REQD) { ++ /* password has expired. Offer option to change it. */ ++ retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); ++ PAM_BAIL_P; ++ } ++ PAM_BAIL_P; ++ /* must be authenticated if this point was reached */ ++ return 1; ++#else /* !USE_PAM */ + char *unencrypted, *encrypted, *correct; + #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP + /* Shadow passwd stuff for SVR3 and maybe other systems. */ +@@ -241,6 +324,7 @@ correct_password (const struct passwd *p + encrypted = crypt (unencrypted, correct); + memset (unencrypted, 0, strlen (unencrypted)); + return STREQ (encrypted, correct); ++#endif /* !USE_PAM */ + } + + /* Update `environ' for the new shell based on PW, with SHELL being +@@ -254,12 +338,18 @@ modify_environment (const struct passwd + /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH. + Unset all other environment variables. */ + char const *term = getenv ("TERM"); ++ char const *display = getenv ("DISPLAY"); ++ char const *xauthority = getenv ("XAUTHORITY"); + if (term) + term = xstrdup (term); + environ = xmalloc ((6 + !!term) * sizeof (char *)); + environ[0] = NULL; + if (term) + xsetenv ("TERM", term); ++ if (display) ++ xsetenv ("DISPLAY", display); ++ if (xauthority) ++ xsetenv ("XAUTHORITY", xauthority); + xsetenv ("HOME", pw->pw_dir); + xsetenv ("SHELL", shell); + xsetenv ("USER", pw->pw_name); +@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw + { + #ifdef HAVE_INITGROUPS + errno = 0; +- if (initgroups (pw->pw_name, pw->pw_gid) == -1) ++ if (initgroups (pw->pw_name, pw->pw_gid) == -1) { ++#ifdef USE_PAM ++ pam_close_session(pamh, 0); ++ pam_end(pamh, PAM_ABORT); ++#endif + error (EXIT_CANCELED, errno, _("cannot set groups")); ++ } + endgrent (); + #endif + if (setgid (pw->pw_gid)) +@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw + error (EXIT_CANCELED, errno, _("cannot set user id")); + } + ++#ifdef USE_PAM ++static int caught=0; ++/* Signal handler for parent process later */ ++static void su_catch_sig(int sig) ++{ ++ ++caught; ++} ++ ++int ++pam_copyenv (pam_handle_t *pamh) ++{ ++ char **env; ++ ++ env = pam_getenvlist(pamh); ++ if(env) { ++ while(*env) { ++ if (putenv (*env)) ++ xalloc_die (); ++ env++; ++ } ++ } ++ return(0); ++} ++#endif ++ + /* Run SHELL, or DEFAULT_SHELL if SHELL is empty. + If COMMAND is nonzero, pass it to the shell with the -c option. + Pass ADDITIONAL_ARGS to the shell as more arguments; there +@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw + + static void + run_shell (char const *shell, char const *command, char **additional_args, +- size_t n_additional_args) ++ size_t n_additional_args, const struct passwd *pw) + { + size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1; + char const **args = xnmalloc (n_args, sizeof *args); + size_t argno = 1; ++#ifdef USE_PAM ++ int child; ++ sigset_t ourset; ++ int status; ++ ++ retval = pam_open_session(pamh,0); ++ if (retval != PAM_SUCCESS) { ++ fprintf (stderr, "could not open session\n"); ++ exit (1); ++ } ++ ++/* do this at the last possible moment, because environment variables may ++ be passed even in the session phase ++*/ ++ if(pam_copyenv(pamh) != PAM_SUCCESS) ++ fprintf (stderr, "error copying PAM environment\n"); ++ ++ /* Credentials should be set in the parent */ ++ if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) { ++ pam_close_session(pamh, 0); ++ fprintf(stderr, "could not set PAM credentials\n"); ++ exit(1); ++ } ++ ++ child = fork(); ++ if (child == 0) { /* child shell */ ++ change_identity (pw); ++ pam_end(pamh, 0); ++#endif + + if (simulate_login) + { + char *arg0; + char *shell_basename; + ++ if(chdir(pw->pw_dir)) ++ error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); ++ + shell_basename = last_component (shell); + arg0 = xmalloc (strlen (shell_basename) + 2); + arg0[0] = '-'; +@@ -344,6 +496,67 @@ run_shell (char const *shell, char const + error (0, errno, "%s", shell); + exit (exit_status); + } ++#ifdef USE_PAM ++ } else if (child == -1) { ++ fprintf(stderr, "can not fork user shell: %s", strerror(errno)); ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); ++ pam_close_session(pamh, 0); ++ pam_end(pamh, PAM_ABORT); ++ exit(1); ++ } ++ /* parent only */ ++ sigfillset(&ourset); ++ if (sigprocmask(SIG_BLOCK, &ourset, NULL)) { ++ fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME); ++ caught = 1; ++ } ++ if (!caught) { ++ struct sigaction action; ++ action.sa_handler = su_catch_sig; ++ sigemptyset(&action.sa_mask); ++ action.sa_flags = 0; ++ sigemptyset(&ourset); ++ if (sigaddset(&ourset, SIGTERM) ++ || sigaddset(&ourset, SIGALRM) ++ || sigaction(SIGTERM, &action, NULL) ++ || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) { ++ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME); ++ caught = 1; ++ } ++ } ++ if (!caught) { ++ do { ++ int pid; ++ ++ pid = waitpid(-1, &status, WUNTRACED); ++ ++ if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) { ++ kill(getpid(), WSTOPSIG(status)); ++ /* once we get here, we must have resumed */ ++ kill(pid, SIGCONT); ++ } ++ } while (0 != WIFSTOPPED(status)); ++ } ++ ++ if (caught) { ++ fprintf(stderr, "\nSession terminated, killing shell..."); ++ kill (child, SIGTERM); ++ } ++ /* Not checking retval on this because we need to call close session */ ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); ++ retval = pam_close_session(pamh, 0); ++ PAM_BAIL_P_VOID; ++ retval = pam_end(pamh, PAM_SUCCESS); ++ PAM_BAIL_P_VOID; ++ if (caught) { ++ sleep(2); ++ kill(child, SIGKILL); ++ fprintf(stderr, " ...killed.\n"); ++ exit(-1); ++ } ++ exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status) ++ : WTERMSIG (status) + 128); ++#endif /* USE_PAM */ + } + + /* Return true if SHELL is a restricted shell (one not returned by +@@ -511,9 +724,9 @@ main (int argc, char **argv) + shell = xstrdup (shell ? shell : pw->pw_shell); + modify_environment (pw, shell); + ++#ifndef USE_PAM + change_identity (pw); +- if (simulate_login && chdir (pw->pw_dir) != 0) +- error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); ++#endif + + /* error() flushes stderr, but does not check for write failure. + Normally, we would catch this via our atexit() hook of +@@ -523,5 +736,5 @@ main (int argc, char **argv) + if (ferror (stderr)) + exit (EXIT_CANCELED); + +- run_shell (shell, command, argv + optind, MAX (0, argc - optind)); ++ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw); + } diff --git a/testing/coreutils/coreutils.install b/testing/coreutils/coreutils.install new file mode 100644 index 000000000..8caae6686 --- /dev/null +++ b/testing/coreutils/coreutils.install @@ -0,0 +1,21 @@ +infodir=usr/share/info +filelist=(coreutils.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + diff --git a/testing/coreutils/su.pam b/testing/coreutils/su.pam new file mode 100644 index 000000000..cf15f40f1 --- /dev/null +++ b/testing/coreutils/su.pam @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +# Uncomment the following line to implicitly trust users in the "wheel" group. +#auth sufficient pam_wheel.so trust use_uid +# Uncomment the following line to require a user to be in the "wheel" group. +#auth required pam_wheel.so use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/testing/wpa_actiond/PKGBUILD b/testing/wpa_actiond/PKGBUILD new file mode 100644 index 000000000..3e3642442 --- /dev/null +++ b/testing/wpa_actiond/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 163526 2012-07-14 13:40:29Z thomas $ +# Maintainer: Thomas Bächler +pkgname=wpa_actiond +pkgver=1.3 +pkgrel=1 +pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events" +arch=('i686' 'x86_64') +url="http://projects.archlinux.org/wpa_actiond.git/" +license=('GPL') +depends=('glibc' 'wpa_supplicant') +source=(ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz) +sha256sums=('4523b76980198666ac93f3a3772a10554ef608e6a18ab9eb1346303ee3a6f4b1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -D -m755 wpa_actiond "${pkgdir}/usr/sbin/wpa_actiond" +} +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf