diff options
106 files changed, 3115 insertions, 530 deletions
diff --git a/community-testing/cronie/PKGBUILD b/community-testing/cronie/PKGBUILD new file mode 100644 index 000000000..15b7e1dd0 --- /dev/null +++ b/community-testing/cronie/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 45295 2011-04-19 04:31:20Z kchen $ +# Maintainer: Kaiting Chen <kaiting.chen@kiwilight.com> + +pkgname=cronie +pkgver=1.4.7 +pkgrel=1 +pkgdesc='Fedora fork of vixie-cron with PAM support' +arch=('i686' 'x86_64') +url='https://fedorahosted.org/cronie/' +license=('custom:ISC') +backup=( + 'etc/crontab' 'etc/anacrontab' 'etc/pam.d/crond') +provides=('cron' 'dcron') +depends=('pam') +source=("https://fedorahosted.org/releases/c/r/$pkgname/$pkgname-$pkgver.tar.gz" + 'crontab' 'anacrontab' 'crond.pam.d' 'crond.rc.d' 'run-cron') +md5sums=('dfc26c47756d0c40ee27ae3c7ee98e0d' + '213994f8404ad2d2da18a9e0ce878a16' + 'b87041532eb123a3194b95dbe7fb284c' + 'd688904def891b8037dc3a06ab047f03' + '9b415c8a1faa44aa0538dcea88b432ec' + '00ede56aadf073c839e600033fbd6cb4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-anacron \ + --without-audit \ + --without-selinux \ + --with-pam --with-inotify + make; make DESTDIR=$pkgdir install + + # Must set suid bit on file manually + chmod u+s $pkgdir/usr/bin/crontab + + # Install `run-cron` script + install -Dm755 $srcdir/run-cron $pkgdir/usr/bin/run-cron + + # Install system crontab and anacrontab and directories + install -Dm644 $srcdir/crontab $pkgdir/etc/crontab + install -Dm644 $srcdir/anacrontab $pkgdir/etc/anacrontab + install -d $pkgdir/etc/cron.d + install -d $pkgdir/etc/cron.{hour,dai,week,month}ly + + # Replaced Fedora PAM configuration + install -Dm644 $srcdir/crond.pam.d $pkgdir/etc/pam.d/crond + + # Install crond initscript + install -Dm755 $srcdir/crond.rc.d $pkgdir/etc/rc.d/crond + + # Install custom:ISC license + install -Dm644 COPYING $pkgdir/usr/share/licenses/cronie/COPYING +} diff --git a/community-testing/cronie/anacrontab b/community-testing/cronie/anacrontab new file mode 100644 index 000000000..e9985b053 --- /dev/null +++ b/community-testing/cronie/anacrontab @@ -0,0 +1,15 @@ +### /etc/anacrontab: Main configuration for `anacron` +# See anacron(8) and anacrontab(5) for details + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +SHELL=/bin/bash +HOME=/var/empty +RANDOM_DELAY=45 +START_HOURS_RANGE=3-22 + +# Format: Period(day) Delay(minute) Name Command +30 15 cron.monthly run-cron /etc/cron.monthly + 1 5 cron.daily run-cron /etc/cron.daily + 7 10 cron.weekly run-cron /etc/cron.weekly + +### /etc/anacrontab: Main configuration for `anacron` diff --git a/community-testing/cronie/crond.pam.d b/community-testing/cronie/crond.pam.d new file mode 100644 index 000000000..4863ba834 --- /dev/null +++ b/community-testing/cronie/crond.pam.d @@ -0,0 +1,11 @@ +### /etc/pam.d/crond: PAM configuration for `crond` + +account required pam_access.so +account required pam_time.so +account required pam_unix.so + +session required pam_limits.so +session required pam_env.so +session required pam_unix.so + +### /etc/pam.d/crond: PAM configuration for `crond` diff --git a/community-testing/cronie/crond.rc.d b/community-testing/cronie/crond.rc.d new file mode 100755 index 000000000..8b05e65d7 --- /dev/null +++ b/community-testing/cronie/crond.rc.d @@ -0,0 +1,38 @@ +#!/bin/bash + +### /etc/rc.d/crond: Initscript for Cron Daemon + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/crond` +case "$1" in + start) + stat_busy "Starting Cron Daemon" + [ -z "$PID" ] && \ + /usr/sbin/crond &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else stat_done; add_daemon crond + echo $PID > /var/run/crond.pid + fi ;; + stop) + stat_busy "Stopping Cron Daemon" + [ ! -z "$PID" ] \ + && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done; rm_daemon crond + fi ;; + restart) + $0 stop + sleep 1 + $0 start ;; + *) + echo "usage: $0 {start|stop|restart}" +esac + +exit 0 + +### /etc/rc.d/crond: Initscript for Cron Daemon diff --git a/community-testing/cronie/crontab b/community-testing/cronie/crontab new file mode 100644 index 000000000..4e8b66397 --- /dev/null +++ b/community-testing/cronie/crontab @@ -0,0 +1,13 @@ +### /etc/crontab: Master crontab for system `crond` + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +SHELL=/bin/bash +HOME=/var/empty + +# Format: Minute Hour Date Month Wday User Command + +01 * * * * root run-cron /etc/cron.hourly +@reboot root anacron -s +04 4 * * * root anacron -s + +### /etc/crontab: Master crontab for system `crond` diff --git a/community-testing/cronie/run-cron b/community-testing/cronie/run-cron new file mode 100755 index 000000000..5c62e3377 --- /dev/null +++ b/community-testing/cronie/run-cron @@ -0,0 +1,38 @@ +#!/bin/bash + +# run-parts - concept taken from Debian + +# keep going when something fails +set +e + +if [ $# -lt 1 ]; then + echo "Usage: run-parts <dir>" + exit 1 +fi + +if [ ! -d $1 ]; then + echo "Not a directory: $1" + exit 1 +fi + +# Ignore *~ and *, scripts +for i in $1/*[^~,] ; do + [ -d $i ] && continue + # Don't run *.{pacsave,pacorig,pacnew,swp} scripts + [ "${i%.pacsave}" != "${i}" ] && continue + [ "${i%.pacorig}" != "${i}" ] && continue + [ "${i%.pacnew}" != "${i}" ] && continue + [ "${i%.swp}" != "${i}" ] && continue + [ "${i%,v}" != "${i}" ] && continue + + if [ -x $i ]; then + $i 2>&1 | awk -v "progname=$i" \ + 'progname { + print progname ":\n" + progname=""; + } + { print; }' + fi +done + +exit 0 diff --git a/community-testing/gnustep-back/PKGBUILD b/community-testing/gnustep-back/PKGBUILD index 0d1e3d4e6..80dbecc6d 100644 --- a/community-testing/gnustep-back/PKGBUILD +++ b/community-testing/gnustep-back/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44425 2011-04-07 13:07:37Z spupykin $ +# $Id: PKGBUILD 45208 2011-04-18 12:44:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-back -pkgver=20110407 +pkgver=0.20.0 pkgrel=1 pkgdesc="The GNUstep GUI Backend" arch=('i686' 'x86_64' 'mips64el') @@ -14,13 +14,13 @@ depends=(libgl libxmu gcc-libs freetype2 libart-lgpl) makedepends=('gnustep-gui' 'libffi' 'gcc-objc') conflicts=('gnustep-back-svn') groups=('gnustep-core') -#source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -source=(http://arch.p5n.pp.ru/~sergej/dl/gnustep/$pkgname-$pkgver.tar.xz) -md5sums=('1fd61a518b610342503239aa6cbf2d25') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) +md5sums=('a28ba696419eeab17f14c2a75b21c3a7') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/opt/GNUstep + . /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep make make DESTDIR=$pkgdir install } diff --git a/community-testing/gnustep-base/PKGBUILD b/community-testing/gnustep-base/PKGBUILD index 8b3f19095..7839af753 100644 --- a/community-testing/gnustep-base/PKGBUILD +++ b/community-testing/gnustep-base/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44429 2011-04-07 13:08:22Z spupykin $ +# $Id: PKGBUILD 45211 2011-04-18 12:45:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-base -pkgver=20110407 +pkgver=1.22.0 pkgrel=1 pkgdesc="The GNUstep base package" arch=('i686' 'x86_64' 'mips64el') @@ -15,16 +15,13 @@ makedepends=(gcc-objc) conflicts=('gnustep-base-svn') groups=('gnustep-core') options=('!emptydirs' '!makeflags') -#source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -source=(http://arch.p5n.pp.ru/~sergej/dl/gnustep/$pkgname-$pkgver.tar.xz) -md5sums=('16e4012a0ac0967157ded1b803be21dc') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) +md5sums=('7faab4891ae6c1e7a6c806d6da368410') build() { cd $srcdir/$pkgname-$pkgver source /etc/profile.d/GNUstep.sh - # need this stupid hack - mkdir -p $pkgdir/opt/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones - ./configure --prefix=/opt/GNUstep --with-ffi-include=/usr/lib/libffi-3.0.9/include/ + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep --with-ffi-include=/usr/lib/libffi-3.0.9/include/ # fix file ownership sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble make VERBOSE=1 diff --git a/community-testing/gnustep-gui/PKGBUILD b/community-testing/gnustep-gui/PKGBUILD index 3b7d0b55b..677f7fd80 100644 --- a/community-testing/gnustep-gui/PKGBUILD +++ b/community-testing/gnustep-gui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44431 2011-04-07 13:09:19Z spupykin $ +# $Id: PKGBUILD 45216 2011-04-18 12:46:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-gui -pkgver=20110407 +pkgver=0.20.0 pkgrel=1 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64' 'mips64el') @@ -15,13 +15,13 @@ makedepends=(gcc-objc) conflicts=('gnustep-gui-svn') groups=('gnustep-core') options=('!makeflags') -#source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -source=(http://arch.p5n.pp.ru/~sergej/dl/gnustep/$pkgname-$pkgver.tar.xz) -md5sums=('f4ca11690dc2fb1f47c769108a39b74e') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) +md5sums=('0d3765aa97db1dd20bdbd0690f4aca6b') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/opt/GNUstep --disable-gsnd + . /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep make make DESTDIR=$pkgdir install } diff --git a/community-testing/gnustep-make/ChangeLog b/community-testing/gnustep-make/ChangeLog new file mode 100644 index 000000000..15622ab88 --- /dev/null +++ b/community-testing/gnustep-make/ChangeLog @@ -0,0 +1,2 @@ +2007-06-27 tardo <tardo@nagi-fanboi.net> +* version upgrade diff --git a/community-testing/gnustep-make/PKGBUILD b/community-testing/gnustep-make/PKGBUILD new file mode 100644 index 000000000..e7edf7dff --- /dev/null +++ b/community-testing/gnustep-make/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 45214 2011-04-18 12:46:00Z spupykin $ +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Sebastian Sareyko <public@nooms.de> + +pkgname=gnustep-make +pkgver=2.6.0 +pkgrel=1 +pkgdesc="The GNUstep make package" +arch=(i686 x86_64) +url="http://www.gnustep.org/" +license=('GPL') +depends=('glibc') +conflicts=('gnustep-make-svn') +groups=('gnustep-core') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) +md5sums=('71a6c6d9a0b341495e67c915fe6722c1') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + make + make DESTDIR=$pkgdir install + install -D -m755 \ + $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh \ + $pkgdir/etc/profile.d/GNUstep.sh +} diff --git a/community-testing/gpsdrive/PKGBUILD b/community-testing/gpsdrive/PKGBUILD new file mode 100644 index 000000000..e95ef92be --- /dev/null +++ b/community-testing/gpsdrive/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 45236 2011-04-18 13:25:52Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Maintainer: damir <damir@archlinux.org> + +pkgname=gpsdrive +pkgver=2.11 +pkgrel=7 +pkgdesc="A car (bike, ship, plane) navigation system" +arch=("i686" "x86_64") +url="http://www.gpsdrive.de/" +license=('GPL2') +depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn' + 'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri' + 'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer' + ) # already in core ('sqlite3') +makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') +install="gpsdrive.install" +source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz" + "gpsd-2.96.patch") +md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c' + '5769e12c6d8932fb721212434c64f505') + +build() { + cd "$srcdir" + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done + + rm -rf build + mkdir build + cd build + + # fix the mapnik default values + sed -i 's|"/usr/lib/mapnik/0.7/input/"|"/usr/lib/mapnik/input/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" + sed -i 's|"/usr/share/fonts/truetype/ttf-dejavu/"|"/usr/share/fonts/TTF/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" + + export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + # see DefineOptions.cmake for a list of common options and defaults + # cmake -L for a more in-depth listing + cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \ + -DWITH_SCRIPTS=ON \ + -DWITH_MAPNIK=ON \ + -DWITH_POSTGIS=ON \ + -DWITH_GDAL=ON \ + -DWITH_BASEMAPS=ON \ + -DWITH_FRIENDSD=ON \ + -DWITH_KISMET=ON \ + -DWITH_NAVIGATION=ON \ + -DWITH_SPEECH=OFF \ + -DWITH_DBUS=OFF \ + -DLIBGPS_OLD=OFF \ + "$srcdir/gpsdrive-$pkgver" + (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch) + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/gpsdrive/gpsd-2.96.patch b/community-testing/gpsdrive/gpsd-2.96.patch new file mode 100644 index 000000000..bc6c7475f --- /dev/null +++ b/community-testing/gpsdrive/gpsd-2.96.patch @@ -0,0 +1,44 @@ +diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c +--- gpsdrive-2.11/src/gps_handler.c 2010-06-24 19:53:32.000000000 +0000 ++++ gpsdrive-2.11.my/src/gps_handler.c 2011-04-18 13:21:33.000000000 +0000 +@@ -264,7 +264,8 @@ + #define GPS_TIMER 500 + + static gint gps_timeout_source = 0; +-static struct gps_data_t *gpsdata; ++static struct gps_data_t __gd; ++static struct gps_data_t *gpsdata = &__gd; + + /* SYMBOLS USED IN LIBGPS: + * +@@ -410,9 +411,10 @@ + */ + gps_query (gpsdata, "oys\n"); + #else +- if (gps_waiting(gpsdata)) ++ if (gps_waiting(gpsdata, 1000000)) + { +- gps_poll (gpsdata); ++ gps_read (gpsdata); ++ gps_hook_cb(gpsdata, NULL); + } + #endif + +@@ -447,7 +449,7 @@ + } + + /* try to open connection */ +- gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port); ++ gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd; + if (!gpsdata) + { + g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n", +@@ -466,7 +468,7 @@ + gps_sats = g_new (gps_satellite_struct, MAXCHANNELS); + + /* set hook function to handle gps data */ +- gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); ++// gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); + + #ifndef LIBGPS_OLD + /* enable watch mode to get data stream from gpsd */ diff --git a/community-testing/gpsdrive/gpsdrive.install b/community-testing/gpsdrive/gpsdrive.install new file mode 100644 index 000000000..8ea63912e --- /dev/null +++ b/community-testing/gpsdrive/gpsdrive.install @@ -0,0 +1,4 @@ +post_install() { + echo "Don't forget to generate geoinfo.db with geoinfo.pl script" + echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive" +} diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD index 3af998067..40e6e4c9f 100644 --- a/community-testing/shotwell/PKGBUILD +++ b/community-testing/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 44941 2011-04-13 08:58:03Z spupykin $ +# $Id: PKGBUILD 45192 2011-04-18 09:06:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" diff --git a/community-testing/shotwell/shotwell.install b/community-testing/shotwell/shotwell.install index ceac19051..83c95a70f 100644 --- a/community-testing/shotwell/shotwell.install +++ b/community-testing/shotwell/shotwell.install @@ -7,7 +7,7 @@ post_install() { } pre_upgrade() { - pre_remove $1 + usr/sbin/gconfpkg --uninstall ${pkgname} } post_upgrade() { @@ -16,9 +16,9 @@ post_upgrade() { pre_remove() { usr/sbin/gconfpkg --uninstall ${pkgname} - update-desktop-database -q } post_remove() { + update-desktop-database -q gtk-update-icon-cache -fq -t usr/share/icons/hicolor } diff --git a/community-testing/uzbl/PKGBUILD b/community-testing/uzbl/PKGBUILD index 06994f0cf..11e8a3b63 100644 --- a/community-testing/uzbl/PKGBUILD +++ b/community-testing/uzbl/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 44541 2011-04-08 10:25:36Z lcarlier $ +# $Id: PKGBUILD 45245 2011-04-18 20:59:54Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Dieter Plaetinck <dieter@plaetinck.be> pkgbase=uzbl pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed') -pkgver=2011.03.17 +pkgver=2011.04.12 pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.uzbl.org" license=('GPL3') makedepends=('git' 'pkgconfig' 'libwebkit>=1.3.13') source=(uzbl-$pkgver.tar.gz::http://github.com/Dieterbe/uzbl/tarball/$pkgver) -md5sums=('fffd69136e0c4a9dce8875e776f7e97e') +md5sums=('27e82c838b8136dafb0683fa52ffc701') build() { cd "$srcdir"/Dieterbe-uzbl-* @@ -30,7 +30,7 @@ build() { package_uzbl-core() { pkgdesc="Webpage interface component meant for integration with other tools and scripts" - depends=('libwebkit') + depends=('libwebkit>=1.3.13') optdepends=('socat: to interface with the socket' 'dmenu: to run some of the example scripts' 'zenity: to run some of the example scripts' 'python2: to run some of the example scripts' diff --git a/community-testing/viking/PKGBUILD b/community-testing/viking/PKGBUILD new file mode 100644 index 000000000..6f73fc6ef --- /dev/null +++ b/community-testing/viking/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 45239 2011-04-18 13:40:23Z spupykin $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Nick Østergaard <oe.nick@gmail.com> +# Contributor: Jonny Gerold <jonny@fsk141.com> + +pkgname=viking +pkgver=1.1 +pkgrel=2 +pkgdesc="GTK+2 application to manage GPS data" +arch=('i686' 'x86_64') +url="http://viking.sourceforge.net/" +license=('GPL2') +depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils') +optdepends=('gpsbabel: for GPS management') +options=('!emptydirs') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://downloads.sourceforge.net/viking/$pkgname-$pkgver.tar.gz + gpsd-2.96.patch) +sha256sums=('5c34a76c09b6fda092e8170f7546606814382cf9d13174e87c4ee43fffa36743' + '7277a6f0bbe7b16440ca92a5975c6f0b38261f13bbbb6f04e4fc684b8965c902') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + patch -p1 <$srcdir/gpsd-2.96.patch + autoreconf + + ./configure --prefix=/usr + make +} + +package(){ + cd ${srcdir}/$pkgname-$pkgver + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/viking/gpsd-2.96.patch b/community-testing/viking/gpsd-2.96.patch new file mode 100644 index 000000000..01b117312 --- /dev/null +++ b/community-testing/viking/gpsd-2.96.patch @@ -0,0 +1,47 @@ +diff -wbBur viking-1.1/configure.ac viking-1.1.my/configure.ac +--- viking-1.1/configure.ac 2011-02-08 21:29:01.000000000 +0000 ++++ viking-1.1.my/configure.ac 2011-04-18 13:31:07.000000000 +0000 +@@ -244,7 +244,7 @@ + [ac_cv_enable_realtimegpstracking], [ac_cv_enable_realtimegpstracking=yes]) + case $ac_cv_enable_realtimegpstracking in + yes) +- AC_CHECK_LIB(gps,gps_poll,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking])) ++ AC_CHECK_LIB(gps,gps_read,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking])) + AC_DEFINE(VIK_CONFIG_REALTIME_GPS_TRACKING, [], [REALTIME GPS TRACKING STUFF]) + ;; + esac +diff -wbBur viking-1.1/src/vikgpslayer.c viking-1.1.my/src/vikgpslayer.c +--- viking-1.1/src/vikgpslayer.c 2011-02-08 21:09:00.000000000 +0000 ++++ viking-1.1.my/src/vikgpslayer.c 2011-04-18 13:35:48.000000000 +0000 +@@ -1377,8 +1377,11 @@ + { + VikGpsLayer *vgl = data; + if (condition == G_IO_IN) { +- if (!gps_poll(&vgl->vgpsd->gpsd)) ++ if (!gps_read(&vgl->vgpsd->gpsd)) ++ { ++ gpsd_raw_hook(&vgl->vgpsd->gpsd, NULL); + return TRUE; ++ } + else { + g_warning("Disconnected from gpsd. Trying to reconnect"); + rt_gpsd_disconnect(vgl); +@@ -1408,7 +1411,8 @@ + { + VikGpsLayer *vgl = (VikGpsLayer *)data; + #ifndef HAVE_GPS_OPEN_R +- struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port); ++ static struct gps_data_t __gd; ++ struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port, &__gd) ? NULL : &__gd; + + if (gpsd == NULL) { + #else +@@ -1439,7 +1443,7 @@ + vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track); + } + +- gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); ++// gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); + vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd); + vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel, + G_IO_IN | G_IO_ERR | G_IO_HUP, gpsd_data_available, vgl); diff --git a/community-testing/viking/viking.changelog b/community-testing/viking/viking.changelog new file mode 100644 index 000000000..d38e25a9e --- /dev/null +++ b/community-testing/viking/viking.changelog @@ -0,0 +1,6 @@ +2011-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * gebabbel 1.1-1 + +2011-02-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * gebabbel 1.0.2-2 + * moved to [community] with 62 AUR votes diff --git a/community-testing/viking/viking.install b/community-testing/viking/viking.install new file mode 100644 index 000000000..8de1998bf --- /dev/null +++ b/community-testing/viking/viking.install @@ -0,0 +1,11 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/alure/PKGBUILD b/community/alure/PKGBUILD index 4edf0db43..12bc6606a 100644 --- a/community/alure/PKGBUILD +++ b/community/alure/PKGBUILD @@ -3,16 +3,19 @@ pkgname=alure pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc='Utility library to help manage common tasks with OpenAL applications.' arch=('i686' 'x86_64' 'mips64el') url='http://kcat.strangesoft.net/alure.html' license=('LGPL') depends=('openal') -makedepends=('cmake') -optdepends=('sndfile: Uncompressed audio support' - 'vorbisfile: OGG Vorbis support' - 'flac: FLAC support') +makedepends=('cmake' 'libsndfile' 'libvorbis' 'flac' 'mpg123' 'dumb' 'fluidsynth') +optdepends=('libsndfile: for uncompressed audio support' + 'libvorbis: for OGG Vorbis support' + 'flac: for FLAC support' + 'mpg123: for MPEG support' + 'dumb: for IT, XM, S3M and MOD support' + 'fluidsynth: for SoundFont 2 support') source=("http://kcat.strangesoft.net/alure-releases/${pkgname}-${pkgver}.tar.bz2") md5sums=('a2f6934d3783c8478c460965a13e4e12') diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index d9ae9a7ca..f61bc69c8 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45148 2011-04-17 18:17:05Z giovanni $ +# $Id: PKGBUILD 45260 2011-04-18 21:38:03Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre pkgver=0.7.56 -pkgrel=1 +pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') url="http://calibre.kovidgoyal.net/" @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('83ed678bf0d0178093fd4cce5a94754e' +md5sums=('876fd29039f473b92dbeb2f0918502e8' 'bcc538a3b004429bf8f5a0ac1d89a37f') build() { diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index 6ce37dc6c..d2abd4885 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40459 2011-02-24 02:16:11Z giovanni $ +# $Id: PKGBUILD 45275 2011-04-18 22:55:20Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=1 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64' 'mips64el') @@ -12,18 +12,22 @@ license=('LGPL' 'GPL') depends=('pcsclite') makedepends=('pkgconfig') backup=(etc/reader.conf.d/libccidtwin) -source=(https://alioth.debian.org/frs/download.php/3518/${pkgname}-${pkgver}.tar.bz2) -md5sums=('4a8f954c0aef48e8e5ab5d458cf819e8') +source=("https://alioth.debian.org/frs/download.php/3535/${pkgname}-${pkgver}.tar.bz2") +md5sums=('a269baa572be6f93ec57da279c7ec276') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ - --enable-twinserial || return 1 + --enable-twinserial - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -D -m644 src/92_pcscd_ccid.rules "${pkgdir}/lib/udev/rules.d/85-pcscd-ccid.rules" || return 1 } diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD index 1c1880e2a..caaba4ce1 100644 --- a/community/courier-imap/PKGBUILD +++ b/community/courier-imap/PKGBUILD @@ -4,7 +4,7 @@ # Committer: Manolis Tzanidakis <manolis@archlinux.org> pkgname=courier-imap -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="IMAP(s)/POP3(s) Server" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ options=('!libtool') source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2 courier-imap.conf.d courier-imap.rc.d) -md5sums=('5623b98b7fb5cf5595eeb0c18c0c2807' +md5sums=('780929e509c4e9199d5efc68d9158ba1' '3e08f017f6c5a52dea28f6f0dbd50b86' '3e4910c5a34af68dfdeed932e573a9f9') diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD index 081ebda1d..7bee3245f 100644 --- a/community/courier-mta/PKGBUILD +++ b/community/courier-mta/PKGBUILD @@ -8,7 +8,7 @@ pkgname=courier-mta -pkgver=0.66.0 +pkgver=0.66.1 pkgrel=1 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" arch=(i686 x86_64 'mips64el') @@ -32,7 +32,7 @@ install=courier-mta.install source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 courier-mta.rc.d courier-mta.conf.d) -md5sums=('5d5ed1ae407ee4ffcf1302e5cbac661f' +md5sums=('79250d71d88ba2bcb630b7356f0250cd' 'e140f320968e57cfe459cd7a3b4017e0' 'f3ff70b40c7a1f7a017e8c4cc4d92f4f') diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD index 09a4f6d7d..60581c497 100644 --- a/community/cuneiform/PKGBUILD +++ b/community/cuneiform/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 20123 2010-07-02 14:54:46Z spupykin $ +# $Id: PKGBUILD 45314 2011-04-19 21:30:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Maxim Vuets <maxim.vuets@gmail.com> pkgname=cuneiform -pkgver=1.0.0 -_dpkgver=1.0 +pkgver=1.1.0 +_dpkgver=1.1 pkgrel=1 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('BSD') depends=(imagemagick) makedepends=(cmake) source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2) -md5sums=('785232ffffad7d82446fbac08a1c3ef9') +md5sums=('09fd160cdfc512f26442a7e91246598d') build() { _SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" @@ -22,9 +22,9 @@ build() { mkdir builddir cd builddir - cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr .. || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr .. + make + make DESTDIR="${pkgdir}" install mkdir -p "${pkgdir}/usr/share/licenses/cuneiform" cp "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD index f398fbc04..50e1096e5 100644 --- a/community/libinfinity/PKGBUILD +++ b/community/libinfinity/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 44189 2011-04-04 13:07:36Z spupykin $ +# $Id: PKGBUILD 45226 2011-04-18 13:01:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Gregory Haynes <greg@greghaynes.net> pkgname=libinfinity -pkgver=0.4.2 -pkgrel=2 +pkgver=0.5.0 +pkgrel=1 pkgdesc="An implementation of the Infininote protocol written in GObject-based C" arch=('i686' 'x86_64' 'mips64el') url="http://gobby.0x539.de" @@ -16,12 +16,16 @@ optdepends=('avahi: zeroconf support' 'gtk2: gtk support') options=('!libtool') source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('db9b0622b6a42d70bb88c9d284692578') +md5sums=('2b25de033c3a4c9975340300b09b84b0') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --localstatedir=/var make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install rm -rf $pkgdir/var } diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index f2daa94a1..8494b2150 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44221 2011-04-04 14:55:37Z spupykin $ +# $Id: PKGBUILD 45197 2011-04-18 09:53:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -37,8 +37,8 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" openbsd-netcat-default.patch unixperms.patch) md5sums=('53d005e6f3732aba1fd6b2718f9cec99' - '26005f9fe6085e2858f855d94eace5f4' - 'cb4e9bc6b209c1f3077d3698bf1d4437' + '018d97dafc0049075fba6f2850f17a12' + '3ed0e24f5b5e25bf553f5427d64915e6' '7d5a841d51321be56ad3c4f93d112fb0' 'db95aecdf2ccf3693fef5821cdcb7eba') diff --git a/community/libvirt/libvirtd.conf.d b/community/libvirt/libvirtd.conf.d index 31d559c83..d4d25b47a 100644 --- a/community/libvirt/libvirtd.conf.d +++ b/community/libvirt/libvirtd.conf.d @@ -1,3 +1,3 @@ -LIBVIRTD_CONFIG= -LIBVIRTD_ARGS= -KRB5_KTNAME=/etc/libvirt/krb5.tab +LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf" +LIBVIRTD_ARGS="-p /var/run/libvirtd.pid" +KRB5_KTNAME="/etc/libvirt/krb5.tab" diff --git a/community/libvirt/libvirtd.rc.d b/community/libvirt/libvirtd.rc.d index 12e3d927e..2f949ab9d 100755 --- a/community/libvirt/libvirtd.rc.d +++ b/community/libvirt/libvirtd.rc.d @@ -40,7 +40,7 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - rm_daemon acpid + rm_daemon libvirtd stat_done fi ;; diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index 7d4074927..2837a9802 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=mathomatic -pkgver=15.5.2 +pkgver=15.5.3 pkgrel=1 pkgdesc="General purpose Computer Algebra System written in C" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'bash: for running a test script' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('c86a4bfb71497b34f24a3fa2141b2911') +md5sums=('661efbc2482acb343db521ea69a4a088') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/medit/PKGBUILD b/community/medit/PKGBUILD index 46aafe136..03b1b806a 100644 --- a/community/medit/PKGBUILD +++ b/community/medit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 44959 2011-04-13 12:32:32Z spupykin $ +# $Id: PKGBUILD 45179 2011-04-18 08:57:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=medit -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="A GTK text editor" arch=('i686' 'x86_64' 'mips64el') @@ -14,15 +14,12 @@ depends=('pygtk' 'libxml2' 'pcre' 'libsm' 'python2' 'gtk2' 'gcc-libs') optdepends=('ctags') makedepends=(pkgconfig perlxml intltool gcc-objc) install=medit.install -source=(http://downloads.sourceforge.net/mooedit/medit-$pkgver.tar.bz2 - capsule.diff) -md5sums=('331701a1e0255ec3cd1899c7a6f6818b' - 'd3386ca02ba598c73c581bf983a15f23') +source=(http://downloads.sourceforge.net/mooedit/medit-$pkgver.tar.bz2) +md5sums=('8f863082ce984e347b95627e3726e936') build() { cd $srcdir/medit-$pkgver export PYTHON=/usr/bin/python2 -# patch -Np1 -i $srcdir/capsule.diff [ -f Makefile ] || ./configure --prefix=/usr make } diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 4e75294b2..f0210c3ae 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 38887 2011-02-02 21:51:51Z svenstaro $ +# $Id: PKGBUILD 45343 2011-04-20 13:49:48Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest -pkgver=3.4.0 +pkgver=3.5.0 pkgrel=1 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/megaglest/" license=('GPL2') -depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'mesa' 'lua') +depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'mesa' 'lua' 'icu') makedepends=('ftjam' 'p7zip' 'wxgtk' 'cmake') source=("http://downloads.sourceforge.net/project/${pkgname}/current_release/${pkgname}-source-${pkgver}.tar.bz2" "http://downloads.sourceforge.net/project/${pkgname}/current_release/megaglest-data-${pkgver}.7z" "megaglest.png" "megaglest.desktop" "megaglest.sh") -md5sums=('904846c60369f7898c7f83d506624d5a' - 'e46270881f1949e0876f4c39ecbf0a05' +md5sums=('5c84966ee6657274eeb5a28ce8b702c0' + '4405134d91d8303e9485de42ffc53e09' '5622ce716033d9afb62a3291b47844ed' '97dc7ea865efbea5daaf300207dad518' 'e3d6abbe79263d2fa5edb0bcbcf8755a') @@ -43,9 +43,9 @@ package() { # Damnit, upstream. install -d -m 0755 "${pkgdir}"/usr/{bin,share/${pkgname}} install -m 0755 "${srcdir}"/$pkgname.sh "${pkgdir}"/usr/bin/$pkgname - install -m 0755 mk/linux/glest.bin "${pkgdir}"/usr/share/${pkgname}/$pkgname - install -m 0755 mk/linux/glest_configurator "${pkgdir}"/usr/bin/glest_configurator - install -m 0755 mk/linux/glest_editor "${pkgdir}"/usr/bin/glest_editor + install -m 0755 mk/linux/megaglest.bin "${pkgdir}"/usr/share/${pkgname}/$pkgname + install -m 0755 mk/linux/megaglest_configurator "${pkgdir}"/usr/bin/megaglest_configurator + install -m 0755 mk/linux/megaglest_editor "${pkgdir}"/usr/bin/megaglest_editor install -m 0644 glest.ini glestkeys.ini servers.ini "${pkgdir}"/usr/share/$pkgname install -D -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop diff --git a/community/mp3splt-gtk/PKGBUILD b/community/mp3splt-gtk/PKGBUILD index 51f4f8a49..263718941 100644 --- a/community/mp3splt-gtk/PKGBUILD +++ b/community/mp3splt-gtk/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 29245 2010-10-11 18:43:38Z jlichtblau $ +# $Id: PKGBUILD 45270 2011-04-18 22:34:45Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=mp3splt-gtk -pkgver=0.6 +pkgver=0.6.1a pkgrel=1 pkgdesc="Split mp3 and ogg files without decoding" arch=('i686' 'x86_64' 'mips64el') url="http://mp3splt.sourceforge.net/" license=('GPL') -depends=('gtk2' 'libmp3splt') -makedepends=('pkgconfig' 'desktop-file-utils') +depends=('desktop-file-utils' 'gstreamer0.10-ffmpeg' 'gtk2' 'libgnomeui' 'libmp3splt') +makedepends=('gnome-doc-utils' 'pkgconfig') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz \ $pkgname.desktop) -md5sums=('0a88bf1a8928a36842a35a174ab18aa3' - '9e5a5748d40594e0090e7ceed903c674') +sha256sums=('e52935ef5f9be41c2eacd8c8a473366bad0aa7472de5916e088da3d19a673c7f' + 'a50dd43c28a723c824d658b9468ff3719dcc302c57ecb3b122124e63c20800ed') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --disable-mp3splttest --disable-audacious --disable-gstreamer + ./configure --prefix=/usr --disable-mp3splttest --disable-audacious make } diff --git a/community/mp3splt-gtk/mp3splt-gtk.changelog b/community/mp3splt-gtk/mp3splt-gtk.changelog index 3164382a5..26e258b56 100644 --- a/community/mp3splt-gtk/mp3splt-gtk.changelog +++ b/community/mp3splt-gtk/mp3splt-gtk.changelog @@ -1,3 +1,7 @@ +2011-04-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * mp3splt-gtk O.6.1a-1 + * FS#23275 fixed + 2010-10-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Update to major release O.6 diff --git a/community/omniorb/PKGBUILD b/community/omniorb/PKGBUILD index a7a396037..462496844 100644 --- a/community/omniorb/PKGBUILD +++ b/community/omniorb/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 27121 2010-09-17 15:17:17Z schuay $ +# $Id: PKGBUILD 45305 2011-04-19 11:39:08Z jelle $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Essien Ita Essien <me@essienitaessien.com> # Contributor: Brice Mealier <mealier_brice@yahoo.fr> pkgname=omniorb -pkgver=4.1.4 -pkgrel=2 +pkgver=4.1.5 +pkgrel=1 pkgdesc="A CORBA object request broker for C++ and Python." arch=('i686' 'x86_64' 'mips64el') url="http://omniorb.sourceforge.net/" license=('GPL2' 'LGPL2') depends=('gcc-libs' 'python2' 'openssl') makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/omniorb/omniORB-$pkgver.tar.gz) +source=(http://downloads.sourceforge.net/omniorb/omniORB-$pkgver.tar.bz2) md5sums=('1f6070ff9b6339876976d61981eeaa6a') build() { @@ -31,9 +31,13 @@ build() { ./configure --prefix=/usr --with-omniORB-config=/etc/omniorb/omniORB.cfg \ --with-omniNames-logdir=/var/log/omniORB --with-openssl=/usr make +} +package(){ + cd $srcdir/omniORB-$pkgver make DESTDIR=$pkgdir install for i in man/man1/*.1; do install -D -m 644 $i $pkgdir/usr/share/$i done chmod 755 $pkgdir/{usr,usr/bin,usr/lib,usr/share,usr/include,usr/share/idl,usr/lib/pkgconfig,usr/lib/python2.7,usr/lib/python2.7/site-packages} } +md5sums=('579af43a7ab1f2f88a845f1436e5238b') diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index dd96965df..6a8bc29eb 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 34331 2010-12-06 11:18:09Z lcarlier $ +# $Id: PKGBUILD 45321 2011-04-20 07:05:05Z jelle $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd -pkgver=1.0.5 -pkgrel=3 +pkgver=1.1.0 +pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64' 'mips64el') url='http://www.openttd.org' @@ -12,8 +12,8 @@ depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo2' 'hicolor-icon-theme' 'desktop- install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') -source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.bz2") -md5sums=('fc79f788e2be140948b972c32b0f1eec') +source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") +md5sums=('b5b1f2ecc7327505e360047236b09d06') build() { cd ${pkgname}-${pkgver} diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 579d4b57a..73aa20e61 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 43054 2011-03-23 21:46:21Z spupykin $ +# $Id: PKGBUILD 45351 2011-04-20 15:07:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributer: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=3.2.0 -_rel=devel -#_rel=stable +pkgver=3.3.0 +#_rel=devel +_rel=stable pkgrel=1 pkgdesc="standalone virtual machine that can be used to execute bytecode compiled dynamic languages" arch=(i686 x86_64 'mips64el') url="http://www.parrotcode.org/" license=('GPL') -depends=('gmp' 'gdbm' 'readline' 'icu' 'openssl') +depends=('gmp' 'gdbm' 'readline' 'icu' 'openssl' 'libffi') makedepends=('perl-json') optdepends=('freeglut') options=(!emptydirs !makeflags) source=(ftp://ftp.parrot.org/pub/parrot/releases/${_rel}/$pkgver/parrot-$pkgver.tar.gz) -md5sums=('380c237404c513cd83f02d62dbacca03') +md5sums=('335d50fbef245bfe6d0bb277e224c728') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 233778888..d4f8d828c 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43871 2011-03-30 17:08:58Z giovanni $ +# $Id: PKGBUILD 45280 2011-04-18 23:09:30Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64' 'mips64el') @@ -12,9 +12,9 @@ license=('BSD') depends=('libusb') makedepends=('pkgconfig') options=('!libtool' '!docs') -source=(https://alioth.debian.org/frs/download.php/3531/pcsc-lite-${pkgver}.tar.bz2 +source=(https://alioth.debian.org/frs/download.php/3533/pcsc-lite-${pkgver}.tar.bz2 pcscd) -md5sums=('dcd60aa6bf22c9b16dfc75e5afca5540' +md5sums=('47e7055cfc14399fdaa1b7a4aa06e5aa' '80d90388e4d2a551cb7aefe3bd5147bd') build() { diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD index 7cb98a423..997ae290b 100644 --- a/community/quvi/PKGBUILD +++ b/community/quvi/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 43700 2011-03-29 09:36:38Z lfleischer $ +# $Id: PKGBUILD 45360 2011-04-20 15:12:08Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us pkgname=quvi -pkgver=0.2.14 +pkgver=0.2.15 pkgrel=1 pkgdesc='Command-line tool for parsing video download links.' arch=('i686' 'x86_64' 'mips64el') -url='http://quvi.googlecode.com/' +url='http://quvi.sourceforge.net/' license=('LGPL') depends=('curl' 'pcre' 'lua') options=('!libtool') -source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") -md5sums=('9958319e82232dea781526198b98985e') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('7cda6c6593c1281e89d91de3b0bed284') build() { cd "${pkgname}-${pkgver}" diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 3ad333375..4f1023c68 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 42328 2011-03-16 11:14:22Z jelle $ +# $Id: PKGBUILD 45185 2011-04-18 08:58:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=5.6.4 -pkgrel=2 +pkgver=5.8.0 +pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('0530db8ca71575ef23a027e9d514aa7e' +md5sums=('37562d0e71a24938a9ed7f242bd32d35' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '1a0cd4530dd5d1439456d5ae230574d9') diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 247d802a1..9cf223be6 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43947 2011-04-01 02:11:49Z dreisner $ +# $Id: PKGBUILD 45374 2011-04-21 02:36:08Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=systemd -pkgver=22 -pkgrel=2 +pkgver=25 +pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -11,10 +11,11 @@ license=('GPL2') depends=('dbus-core' 'initscripts' 'sysvinit' 'util-linux>=2.19') makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'libnotify') optdepends=('cryptsetup: required for encrypted block devices' - 'initscripts-systemd: native boot and initialization scripts' 'dbus-python: systemd-analyze' 'gtk2: systemadm' + 'initscripts-systemd: native boot and initialization scripts' 'libnotify: systemadm' + 'python2-cairo: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') groups=('systemd') options=('!libtool') @@ -24,14 +25,14 @@ backup=(etc/systemd/system.conf install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" "os-release") -md5sums=('79cfbca526eaa5833723b48adeb0b323' +md5sums=('11c64b4af8ba863d650b6a7339610fc2' 'f9922299150b4adda7b89e10bca33033') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ - --with-rootdir=/ \ + --with-rootdir= \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install index 259d09b9e..0c75c4b27 100644 --- a/community/systemd/systemd.install +++ b/community/systemd/systemd.install @@ -1,14 +1,7 @@ -#!/bin/sh +#!/bin/bash checkgroups() { getent group lock >/dev/null || groupadd -g 54 lock - - utmpent=$(getent group utmp) - if [ -z $utmpent ]; then - getent group utmp >/dev/null || groupadd -g 32 utmp - elif [ $(echo $utmpent | cut -d: -f3) = '22' ]; then - groupmod -g 32 utmp - fi } post_install() { @@ -44,7 +37,6 @@ pre_remove() { post_remove() { getent group lock >/dev/null && groupdel lock - getent group utmp >/dev/null && groupdel utmp } # vim:set ts=2 sw=2 et: diff --git a/community/tasks/PKGBUILD b/community/tasks/PKGBUILD index 2dce0b58d..bff3f7a71 100644 --- a/community/tasks/PKGBUILD +++ b/community/tasks/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 28839 2010-10-06 10:29:24Z spupykin $ +# $Id: PKGBUILD 45229 2011-04-18 13:02:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: lp76 <l.peduto@gmail.com> pkgname=tasks -pkgver=0.18 -pkgrel=2 +pkgver=0.19 +pkgrel=1 pkgdesc="A simple to do list application that uses libecal" +arch=(i686 x86_64 mips64el) url="http://pimlico-project.org/tasks.html" license=('GPL') depends=('evolution-data-server>=2.32.0' 'xdg-utils' 'gtk2') makedepends=('intltool') -arch=(i686 x86_64 'mips64el') install=tasks.install source=(http://pimlico-project.org/sources/tasks/$pkgname-$pkgver.tar.gz) -md5sums=('d40c0227e496b51be6fde10f387215ed') +md5sums=('0afd969758561599fd782e1effb39c08') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make } package() { diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD index a777c8280..d3a799376 100644 --- a/community/xwax/PKGBUILD +++ b/community/xwax/PKGBUILD @@ -1,23 +1,20 @@ -# $Id: PKGBUILD 32173 2010-11-11 09:30:57Z lfleischer $ +# $Id: PKGBUILD 45265 2011-04-18 22:19:06Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: sputnick <gilles DOT quenot AT gmail DOT com> pkgname=xwax -pkgver=0.8 +pkgver=0.9 pkgrel=1 -pkgdesc="Open-source vinyl emulation software for Linux." +pkgdesc='Open-source vinyl emulation software for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://www.xwax.co.uk/' license=('GPL') depends=('alsa-lib' 'sdl_ttf' 'ttf-dejavu') -optdepends=('vorbis-tools: for OGG import' - 'faad2: for AAC import' - 'cdparanoia: for CD import' +optdepends=('cdparanoia: for CD import' 'mpg123: for MP3 import' - 'flac: for FLAC import' 'ffmpeg: for video fallback import') source=("http://www.xwax.co.uk/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('e015363e96412d0e6702596cfa6a3485') +md5sums=('37152a16cbeb6878818ca406959af9b2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index 4343ce5ac..4bf78b019 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116411 2011-03-23 16:23:20Z dan $ +# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=pacman -pkgver=3.5.1 +pkgver=3.5.2 pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') @@ -19,9 +19,9 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf pacman.conf.x86_64 makepkg.conf) -md5sums=('6e609a6cf0af2a49a0f8b35fc2459131' +md5sums=('b4f1fdbc17100923071ebe8fe9377be5' 'e99eb721b6b704f68c5f47468507c102' - '28e6a1f97ed3c47a3961ad00d2a43822' + 'f8b939d9b2beb79a0436961a2d707d7c' 'a8684989d3dfad5a6e1bcf95af3e571b') # keep an upgrade path for older installations diff --git a/core/pacman/pacman.conf.x86_64 b/core/pacman/pacman.conf.x86_64 index a5bb2db61..6f0423647 100644 --- a/core/pacman/pacman.conf.x86_64 +++ b/core/pacman/pacman.conf.x86_64 @@ -74,7 +74,11 @@ Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repository here. +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + #[multilib] #Include = /etc/pacman.d/mirrorlist diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 9494fe18c..d5b3c6560 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 118043 2011-04-05 07:31:37Z jgc $ +# $Id: PKGBUILD 118985 2011-04-09 21:29:33Z tpowa $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=166 -pkgrel=2 -arch=(i686 x86_64 'mips64el') +pkgver=167 +pkgrel=1 +arch=(i686 x86_64 mips64el) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') groups=('base') @@ -19,11 +19,6 @@ source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.ta 81-arch.rules load-modules.sh cdsymlinks.sh) -md5sums=('4db27d73fdbe94f47fd89fdd105c2dfb' - '4427855146513a4703ab5c7eb8a0156e' - 'f17c99779173ddc79f866cf3a5de5e68' - 'f91fddc67609b45b244a624977c4247b' - '2e808ee78d237c478b57af2a68d43769') build() { cd $srcdir/$pkgbase-$pkgver @@ -110,3 +105,8 @@ package_udev-compat() { install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules } +md5sums=('4b37e1222f06c14c24147de346aa0bad' + '4427855146513a4703ab5c7eb8a0156e' + 'f17c99779173ddc79f866cf3a5de5e68' + 'f91fddc67609b45b244a624977c4247b' + '2e808ee78d237c478b57af2a68d43769') diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index f3c39018f..9113e9a96 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 117693 2011-04-04 16:32:27Z giovanni $ +# $Id: PKGBUILD 120058 2011-04-18 22:46:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10515 +pkgver=10525 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('68bb769089615e5b3a1b3e88fc5da0c6') +md5sums=('d1b925a2ceac1c63b5fb1e42702c1a2a') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD index 7b7057fe6..84c07d37f 100644 --- a/extra/consolekit/PKGBUILD +++ b/extra/consolekit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119015 2011-04-10 13:37:10Z ibiru $ +# $Id: PKGBUILD 120022 2011-04-18 12:49:11Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: onestep_ua <onestep@ukr.net> pkgname=consolekit -pkgver=0.4.3 -pkgrel=3 +pkgver=0.4.4 +pkgrel=1 pkgdesc="A framework for defining and tracking users, login sessions, and seats" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/ConsoleKit" @@ -14,7 +14,7 @@ makedepends=('pkgconfig' 'xmlto' 'docbook-xsl') options=(!libtool) source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${pkgver}.tar.bz2 pam-foreground-compat.ck consolekit.logrotate) -md5sums=('4c39c6eacc75334b890f21eead1d2945' +md5sums=('b57eb18eae8c4d3631d5f4f030218a29' 'a8a4de71d9b0549b8143e5f6c2a36fc7' '6fefa451d9fe2fc6d6269629d3529793') @@ -37,5 +37,5 @@ package() { # install the logrotate config install -D -m644 ${srcdir}/consolekit.logrotate ${pkgdir}/etc/logrotate.d/consolekit - rm -rf "${pkgdir}/var/run" +# rm -rf "${pkgdir}/var/run" } diff --git a/extra/libplist/PKGBUILD b/extra/libplist/PKGBUILD index 5a386e3b7..fbf81c3a7 100644 --- a/extra/libplist/PKGBUILD +++ b/extra/libplist/PKGBUILD @@ -1,36 +1,30 @@ -# $Id: PKGBUILD 89629 2010-09-02 17:11:43Z remy $ +# $Id: PKGBUILD 120143 2011-04-20 11:59:42Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libplist -pkgver=1.3 -pkgrel=2 +pkgver=1.4 +pkgrel=1 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML" url="http://libimobiledevice.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') -depends=('glib2>=2.24.1' 'libxml2>=2.7.7') -makedepends=('cmake' 'swig' 'python2') -source=(http://cloud.github.com/downloads/JonathanBeck/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('982c8aac59cdc3fafc925a407a29b6cf367c5ec9bad6ad509fe5ea25d3e5b6b0') +depends=('glib2' 'libxml2' 'python2') +makedepends=('cmake' 'swig') +source=(http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('2ad226abe1131a72e7ecbb2b921ad92f54b8e787c2281c89b00145b519479a71') build() { - # CMake is not patched yet - cd "${srcdir}/${pkgname}-${pkgver}/cmake/modules" -# cp /usr/share/cmake-2.8/Modules/FindPython*.cmake . -# sed -i -e 's#2.6#2.7 2.6#' FindPythonLibs.cmake -# sed -i -e 's#python2.6#python2.7 python2.6#' FindPythonInterp.cmake - cd "${srcdir}" mkdir build cd build cmake ../"${pkgname}-${pkgver}" \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX:PATH=/usr - make || return 1 + make } package() { cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 22dea715e..77f1d048b 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111968 2011-03-02 18:24:01Z ibiru $ +# $Id: PKGBUILD 120130 2011-04-20 11:35:26Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.15.5 -pkgrel=2 +pkgver=0.15.6 +pkgrel=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +12,10 @@ license=('custom') depends=('boost-libs' 'python2') makedepends=('boost') source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('f1504a619e876c2731ee9a6b7d19cb1d') +sha1sums=('e6f33b139933ec245e8850558efe52e88081fc6d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" ./configure --prefix=/usr --enable-python-binding make } diff --git a/extra/mirage/PKGBUILD b/extra/mirage/PKGBUILD index 9b53ef7d8..633b00d3c 100644 --- a/extra/mirage/PKGBUILD +++ b/extra/mirage/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 89709 2010-09-03 11:45:48Z remy $ +# $Id: PKGBUILD 120115 2011-04-20 11:08:02Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: James Rayner <james@archlinux.org> # Contributor: Scott Horowitz <stonecrest@gmail.com> pkgname=mirage -pkgver=0.9.5.1 -pkgrel=2 +pkgver=0.9.5.2 +pkgrel=1 pkgdesc="A simple GTK+ Image Viewer" url="http://mirageiv.berlios.de" license=("GPL") -depends=('pygtk>=2.17.0' 'desktop-file-utils') +depends=('pygtk' 'desktop-file-utils') arch=('i686' 'x86_64' 'mips64el') source=(http://download.berlios.de/mirageiv/${pkgname}-${pkgver}.tar.gz) install=$pkgname.install -md5sums=('8b74db43ca6c81e3326d70c81df4bc56') +md5sums=('dace5cf01e5e53317ba8be0f8a74f4bf') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - python2 setup.py install --root="${pkgdir}" + cd "${srcdir}/${pkgname}-${pkgver}" + python2 setup.py build +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + python2 setup.py install --root="${pkgdir}" } diff --git a/extra/mtools/PKGBUILD b/extra/mtools/PKGBUILD index 24fb5f851..9f90d79a2 100644 --- a/extra/mtools/PKGBUILD +++ b/extra/mtools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108705 2011-02-02 17:20:00Z giovanni $ +# $Id: PKGBUILD 120053 2011-04-18 22:34:00Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=mtools -pkgver=4.0.15 +pkgver=4.0.16 pkgrel=1 pkgdesc="A collection of utilities to access MS-DOS disks" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ optdepends=('libx11: required by floppyd' backup=('etc/mtools.conf') install=mtools.install source=("http://ftp.gnu.org/gnu/mtools/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b7550b649af77812cb696a780e853f47') +md5sums=('e9b07f35272210f407012abaf5d1b9b5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nitrogen/PKGBUILD b/extra/nitrogen/PKGBUILD index 20794a8db..5b6df2daa 100644 --- a/extra/nitrogen/PKGBUILD +++ b/extra/nitrogen/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 67236 2010-02-05 22:06:57Z ibiru $ +# $Id: PKGBUILD 120125 2011-04-20 11:21:45Z ibiru $ # Maintainer: James Rayner <james@archlinux.org> # Maintainer: Alexander Fehr <pizzapunk gmail com> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=nitrogen -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="Background browser and setter for X windows" arch=('i686' 'x86_64' 'mips64el') url="http://projects.l3ib.org/nitrogen/" license=('GPL') -depends=('gtkmm' 'hicolor-icon-theme' 'librsvg>=2.26') +depends=('gtkmm' 'hicolor-icon-theme' 'librsvg') install=nitrogen.install -source=(http://projects.l3ib.org/nitrogen/files/nitrogen-$pkgver.tar.gz) -md5sums=('e683d7c10c17bd18eb9fd78c87c4e08c') +source=(http://projects.l3ib.org/nitrogen/files/${pkgname}-${pkgver}.tar.gz) +md5sums=('dd779a252a222eb9d329d74b809cfe73') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD index 9e2955d34..1e0b644e0 100644 --- a/extra/orc/PKGBUILD +++ b/extra/orc/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 98440 2010-11-08 23:53:36Z ibiru $ +# $Id: PKGBUILD 120120 2011-04-20 11:12:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=orc -pkgver=0.4.11 +pkgver=0.4.13 pkgrel=1 pkgdesc="The Oild Runtime Compiler" arch=('i686' 'x86_64' 'mips64el') @@ -10,14 +10,15 @@ url="http://code.entropywave.com/projects/orc/" depends=('glibc') options=('!libtool') source=(http://code.entropywave.com/download/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('b8b0b148d319422c3ad250c29483b3c4') +md5sums=('f6d0aed003f67c91933c22d9e5f1696a') build () { cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --disable-static + ./configure --prefix=/usr --disable-static make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 109775ea6..8f54d6031 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 118966 2011-04-09 20:51:34Z pierre $ +# $Id: PKGBUILD 120015 2011-04-18 10:42:15Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -24,7 +24,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.3.6 -pkgrel=2 +pkgrel=3 _suhosinver=${pkgver}-0.9.10 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -40,7 +40,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" md5sums=('2286f5a82a6e8397955a0025c1c2ad98' 'fff1a38877142f3ae6036dbe5a85d0a6' '39eaa70d276fc3d45d6bcf6cd5ae1106' - '96ca078be6729b665be8a865535a97bf' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' 'd50ff349da08110a7cc8c691ce2d0423' '07c4e412909ac65a44ec90e7a2c4bade') diff --git a/extra/php/apache.conf b/extra/php/apache.conf index 86344c803..c3ca0aad5 100644 --- a/extra/php/apache.conf +++ b/extra/php/apache.conf @@ -3,7 +3,11 @@ <IfModule dir_module> <IfModule php5_module> DirectoryIndex index.php index.html - AddHandler application/x-httpd-php .php - AddHandler application/x-httpd-php-source .phps + <FilesMatch "\.php$"> + SetHandler application/x-httpd-php + </FilesMatch> + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> </IfModule> -</IfModule>
\ No newline at end of file +</IfModule> diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 641a1e8d7..ce0dd60c7 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108463 2011-01-31 13:52:30Z dan $ +# $Id: PKGBUILD 120038 2011-04-18 17:35:03Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.0.3 +pkgver=9.0.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org" @@ -11,6 +11,7 @@ license=('custom:PostgreSQL') makedepends=('libxml2' 'python2' 'perl') source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \ postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate) +install=postgresql.install build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -128,8 +129,8 @@ package_postgresql() { "${pkgdir}/etc/logrotate.d/postgresql" } -md5sums=('928df8c40bb012ad10756e58b70516fb' - '49bfa0d1089e26e2098d362ca5fa6503' +md5sums=('80390514d568a7af5ab61db1cda27e29' + '89ada7c282d9ffb82c6adc89bc2778ad' 'd63a05943cf0a2726aa2070f3033c569' '4d74f4227dc5e12bf95b3490758d86c9' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/postgresql/postgresql b/extra/postgresql/postgresql index fb7be3dd7..3a8bf44f8 100755 --- a/extra/postgresql/postgresql +++ b/extra/postgresql/postgresql @@ -4,34 +4,31 @@ . /etc/rc.d/functions . /etc/conf.d/postgresql +# Default PGROOT if it wasn't defined in the conf.d file +PGROOT=${PGROOT:-/var/lib/postgres} +PG_CTL="/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -s -w" + +postgres_init() { + # initialization + if [ ! -d $PGROOT/data ]; then + mkdir -p $PGROOT/data && chown -R postgres:postgres $PGROOT + su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data" + fi + if [ ! -e /var/log/postgresql.log ]; then + touch /var/log/postgresql.log + chown postgres /var/log/postgresql.log + fi +} + case "$1" in start) + postgres_init stat_busy "Starting PostgreSQL" - # initialization - if [ ! `egrep '^postgres:' /etc/group` ]; then - stat_busy "Adding postgres group" - groupadd -g 88 postgres - stat_done - fi - if [ ! `egrep '^postgres:' /etc/passwd` ]; then - stat_busy "Adding postgres user" - useradd -u 88 -g postgres -d $PGROOT -s /bin/bash postgres - [ -d $PGROOT ] && chown -R postgres:postgres $PGROOT - stat_done - fi - if [ ! -d $PGROOT/data ]; then - mkdir -p $PGROOT/data && chown -R postgres:postgres $PGROOT - su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data" - fi - if [ ! -e /var/log/postgresql.log ]; then - touch /var/log/postgresql.log - chown postgres /var/log/postgresql.log - fi - # start the process su - postgres -c \ - "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -W start" + "$PG_CTL start" if [ $? -gt 0 ]; then stat_fail + exit 1 else add_daemon postgresql stat_done @@ -40,7 +37,7 @@ case "$1" in stop) stat_busy "Stopping PostgreSQL" su - postgres -c \ - "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -w stop" + "$PG_CTL stop -m fast" if [ $? -gt 0 ]; then stat_fail else @@ -48,12 +45,35 @@ case "$1" in stat_done fi ;; + reload) + stat_busy "Reloading PostgreSQL" + su - postgres -c \ + "$PG_CTL reload" + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + stat_done + fi + ;; restart) - $0 stop - sleep 3 - $0 start + postgres_init + stat_busy "Restarting PostgreSQL" + su - postgres -c \ + "$PG_CTL restart -m fast" + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon postgresql + stat_done + fi + ;; + status) + stat_busy "Checking PostgreSQL status"; + ck_status postgresql ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|reload|restart|status}" esac exit 0 diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install new file mode 100644 index 000000000..4a6f9b848 --- /dev/null +++ b/extra/postgresql/postgresql.install @@ -0,0 +1,14 @@ +post_install() { + getent group postgres >/dev/null || groupadd -g 88 postgres + getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /sbin/nologin postgres + passwd -l postgres >/dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + getent passwd postgres >/dev/null && userdel postgres + getent group postgres >/dev/null && groupdel postgres +} diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD index f5ad7c03e..785fb5e04 100644 --- a/extra/rdesktop/PKGBUILD +++ b/extra/rdesktop/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 77123 2010-04-10 21:21:07Z andrea $ +# $Id: PKGBUILD 120030 2011-04-18 14:48:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=rdesktop -pkgver=1.6.0 -pkgrel=5 +pkgver=1.7.0 +pkgrel=1 depends=('libx11' 'openssl' 'libao' 'libsamplerate') -pkgdesc="Is used to connect to windows terminal servers" +pkgdesc="An open source client for Windows Remote Desktop Services" url="http://www.rdesktop.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - 'rdesktop-send_physical_buttons.diff') -md5sums=('c6fcbed7f0ad7e60ac5fcb2d324d8b16' +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'rdesktop-send_physical_buttons.diff') +md5sums=('77fa93b21aa38837a85e81c00e757228' '880d3aeac67b901e6bf44d1323374768') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -i ${srcdir}/rdesktop-send_physical_buttons.diff || return 1 + # FS#15113 + patch -i ${srcdir}/rdesktop-send_physical_buttons.diff ./configure --prefix=/usr - make || return 1 + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/extra/sofia-sip/PKGBUILD b/extra/sofia-sip/PKGBUILD index 1be0af73a..cb6cf1d73 100644 --- a/extra/sofia-sip/PKGBUILD +++ b/extra/sofia-sip/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 75544 2010-04-01 19:17:05Z ibiru $ +# $Id: PKGBUILD 120138 2011-04-20 11:51:10Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=sofia-sip -pkgver=1.12.10 -pkgrel=2 +pkgver=1.12.11 +pkgrel=1 pkgdesc="An open-source SIP User-Agent library" arch=('i686' 'x86_64' 'mips64el') url="http://sofia-sip.sourceforge.net" options=('!libtool' 'zipman') license=('LGPL') depends=('glib2' 'openssl') -source=(http://downloads.sourceforge.net/sofia-sip/$pkgname-$pkgver.tar.gz) -md5sums=('9e07fde3ad2009e44d1100ca3950d02b') +source=(http://downloads.sourceforge.net/sofia-sip/${pkgname}-${pkgver}.tar.gz) +md5sums=('f3582c62080eeecd3fa4cd5d4ccb4225') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --with-openssl - make || return 1 - make DESTDIR="$pkgdir" install + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index f27b0200a..eaed67b0b 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111927 2011-03-02 08:18:23Z guillaume $ +# $Id: PKGBUILD 120079 2011-04-19 13:10:40Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume at alaux dot net> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=(wireshark-cli wireshark-gtk) pkgbase=wireshark -pkgver=1.4.4 +pkgver=1.4.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -11,7 +11,7 @@ makedepends=('bison' 'flex' 'gtk2' 'heimdal' 'libpcap' 'bash' 'gnutls' 'libcap') url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('11ce019d85d9822597b163ce5b4da858') +md5sums=('fd301004ebc5fac8e56c2f0d4ef6173f') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install index 0afdf0c8f..6585ba272 100644 --- a/extra/wireshark/wireshark.install +++ b/extra/wireshark/wireshark.install @@ -6,7 +6,9 @@ post_install() { } post_upgrade() { - post_install $1 + getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + + setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap } post_remove() { diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD index f9c85401f..1b438d296 100644 --- a/extra/wxpython/PKGBUILD +++ b/extra/wxpython/PKGBUILD @@ -1,25 +1,21 @@ -# $Id: PKGBUILD 119109 2011-04-10 23:04:52Z eric $ +# $Id: PKGBUILD 120105 2011-04-20 04:06:15Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Andrew Wright <andreww@photism.org> pkgname=wxpython -pkgver=2.8.11.0 -pkgrel=3 +pkgver=2.8.12.0 +pkgrel=1 pkgdesc="A wxWidgets GUI toolkit for Python" arch=('i686' 'x86_64' 'mips64el') license=('custom:wxWindows') url="http://www.wxpython.org" depends=('wxgtk' 'python2') makedepends=('mesa') -source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 editra-aui.diff) -md5sums=('63f73aae49e530852db56a31b57529fa' - '06c637c34c1570d8c82b870ce19c0622') -sha1sums=('18982edc236a1d87e4eef018928358c925aa5b17' - '077fe341bf8822647934d6b1ea82ce9b0adbf93a') +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) +md5sums=('402e0b81e06f596d849e221a7a76acc6') +sha1sums=('f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4') build() { cd "${srcdir}/wxPython-src-${pkgver}" - patch -p1 < ../editra-aui.diff ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD index af92c7480..eb5d3e5be 100644 --- a/extra/xfce4-xkb-plugin/PKGBUILD +++ b/extra/xfce4-xkb-plugin/PKGBUILD @@ -1,32 +1,23 @@ -# $Id: PKGBUILD 107269 2011-01-22 22:04:45Z andyrtr $ +# $Id: PKGBUILD 120152 2011-04-20 16:40:20Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-xkb-plugin -pkgver=0.5.3.3 -pkgrel=4 +pkgver=0.5.4.0 +pkgrel=1 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel" arch=(i686 x86_64 'mips64el') license=('custom') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'libxklavier>=5.0' 'librsvg') +depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg') makedepends=('intltool') options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.gz - xfce4-xkb-plugin-0.5.3.3-libxklavier.patch - crashfix.diff) -md5sums=('b233cc9de1cbace075eaf6e2c9a8e685' - '781165ce1bc08059ae8e846c45c0bab2' - '4faeaaea7d294cbad2972af964508086') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2) +md5sums=('3ea1efe366367af660e6e1d24a240b5f') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch" - - # https://bugs.archlinux.org/task/21067 - http://bugzilla.xfce.org/show_bug.cgi?id=6477 - patch -Np1 -i ${srcdir}/crashfix.diff - ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD index aadec565c..10aa642a4 100644 --- a/libre/ffmpeg-libre/PKGBUILD +++ b/libre/ffmpeg-libre/PKGBUILD @@ -17,9 +17,9 @@ makedepends=('yasm' 'git') source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz) md5sums=('dd682a876a496b9f9ae8afb3b3b70389') #source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2) -provides=('ffmpeg') +provides=("ffmpeg=$pkgver") conflicts=('ffmpeg') -replaces=("ffmpeg=$pkgver") +replaces=('ffmpeg') build() { cd "$srcdir/${pkgname%-libre}" diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 0e1791a9f..7e99341f0 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -18,7 +18,7 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(ftp://ftp.archlinux.org/other/${pkgname%-libre}/${pkgname%-libre}-${pkgver}.tar.xz mplayer.desktop mplayer.png) provides=("mplayer=$pkgver") conflicts=('mplayer') -replaces=("mplayer=$pkgver") +replaces=('mplayer') md5sums=('caedcdc1e50b5575c38c2a85f9c53afc' '647b9f4ab5284a7fef3f84f992214e77' 'd00874ccc644b7f43d6ef1c942fcef28') diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index ce5861e18..1cab3e716 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -18,9 +18,9 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'libva' 'desktop-file-utils') makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm') -provides=("mplayer-vaapi=$pkgver") +provides=("mplayer-vaapi=$pkgver" 'mplayer') conflicts=('mplayer' 'mplayer-vaapi') -replaces=("mplayer-vaapi=$pkgver") +replaces=('mplayer-vaapi') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2 diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi-libre/PKGBUILD index 13832bb91..3f88f1cee 100644 --- a/libre/xorg-fonts-100dpi-libre/PKGBUILD +++ b/libre/xorg-fonts-100dpi-libre/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> pkgname=xorg-fonts-100dpi-libre pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="X.org 100dpi fonts" arch=(any) url="http://xorg.freedesktop.org/" diff --git a/libre/xorg-fonts-100dpi-libre/xfonts.install b/libre/xorg-fonts-100dpi-libre/xfonts.install index 3eb0455c9..5c5e8a2b4 100644 --- a/libre/xorg-fonts-100dpi-libre/xfonts.install +++ b/libre/xorg-fonts-100dpi-libre/xfonts.install @@ -1,8 +1,8 @@ post_install() { echo -n "Updating font cache... " fc-cache -f > /dev/null - mkfontscale /usr/share/fonts/Type1 - mkfontdir /usr/share/fonts/Type1 + mkfontscale /usr/share/fonts/100dpi + mkfontdir /usr/share/fonts/100dpi echo "done." } @@ -13,8 +13,3 @@ post_upgrade() { post_remove() { post_install $1 } - -op=$1 -shift - -$op $* diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi-libre/PKGBUILD index 5266bd550..c262229fc 100644 --- a/libre/xorg-fonts-75dpi-libre/PKGBUILD +++ b/libre/xorg-fonts-75dpi-libre/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xorg-fonts-75dpi-libre pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="X.org 75dpi fonts" arch=(any) url="http://xorg.freedesktop.org/" diff --git a/libre/xorg-fonts-75dpi-libre/xfonts.install b/libre/xorg-fonts-75dpi-libre/xfonts.install index 3eb0455c9..e52603946 100644 --- a/libre/xorg-fonts-75dpi-libre/xfonts.install +++ b/libre/xorg-fonts-75dpi-libre/xfonts.install @@ -1,8 +1,8 @@ post_install() { echo -n "Updating font cache... " fc-cache -f > /dev/null - mkfontscale /usr/share/fonts/Type1 - mkfontdir /usr/share/fonts/Type1 + mkfontscale /usr/share/fonts/75dpi + mkfontdir /usr/share/fonts/75dpi echo "done." } @@ -13,8 +13,3 @@ post_upgrade() { post_remove() { post_install $1 } - -op=$1 -shift - -$op $* diff --git a/libre/xorg-fonts-type1-libre/xfonts.install b/libre/xorg-fonts-type1-libre/xfonts.install index 3eb0455c9..51688a1d1 100644 --- a/libre/xorg-fonts-type1-libre/xfonts.install +++ b/libre/xorg-fonts-type1-libre/xfonts.install @@ -13,8 +13,3 @@ post_upgrade() { post_remove() { post_install $1 } - -op=$1 -shift - -$op $* diff --git a/staging/gpsd/LICENSE b/staging/gpsd/LICENSE deleted file mode 100644 index 076538678..000000000 --- a/staging/gpsd/LICENSE +++ /dev/null @@ -1,38 +0,0 @@ - COPYRIGHTS - -Compilation copyright is held by the GPSD project. All rights reserved. - -GPSD project copyrights are assigned to the project lead, currently -Eric S. Raymond. Other portions of the GPSD code are Copyright (c) -1997, 1998, 1999, 2000, 2001, 2002 by Remco Treffkorn, and others -Copyright (c) 2005 by Eric S. Raymond. For other copyrights, see -individual files. - - BSD LICENSE - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met:<P> - -Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer.<P> - -Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution.<P> - -Neither name of the GPSD project nor the names of its contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/staging/gpsd/PKGBUILD b/staging/gpsd/PKGBUILD deleted file mode 100644 index 26a2a8b0d..000000000 --- a/staging/gpsd/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# $Id: PKGBUILD 116032 2011-03-22 16:23:53Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: Giacomo Rizzo <alt@free-os.it> - -pkgname=gpsd -pkgver=2.96 -pkgrel=1 -pkgdesc="GPS daemon and library to support USB/serial GPS devices" -arch=('i686' 'x86_64' 'mips64el') -url="http://gpsd.berlios.de" -license=('BSD') -depends=('lesstif' 'libxaw' 'python2' 'pth' 'libusb' 'desktop-file-utils') -optdepends=('php: generate a PHP status page for your GPS' - 'php-gd: image support for the PHP status page') -makedepends=('docbook-xsl') -backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules') -options=('!libtool') -install="${pkgname}.install" -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gpsd' 'LICENSE') -md5sums=('26a7a04d4298bc3a3a5d89fef4582b64' - 'f929322fc4670543fcb36dafc7bb9e03' - 'd217a23f408e91c94359447735bc1800') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # install python to the same DESTDIR given make - sed -i 's|--prefix=${prefix} # --root=$(DESTDIR)|--prefix=${prefix} --root=$(DESTDIR)|' Makefile.am Makefile.in - - # fix python 2.7 path - sed -i 's|/usr/bin/python|/usr/bin/python2|' gpsd.hotplug{,.wrapper} - sed -i 's|/usr/bin/python2.6|/usr/bin/python2|' valgrind-audit - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gpscat \ - gpsfake gpsprof xgps xgpsspeed gps/gps.py - - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --disable-libQgpsmm \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix man pages path (FS#21715) - sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1 - - make DESTDIR="${pkgdir}" install - - # Our own udev-install since the Makefile uses absolute paths - # Original file names are [mostly] unmodified: useful to match process name in case of error - # Following the switch from hotplug to udev helper scripts now live in /lib/udev/ instead of /etc/hotplug/ - sed -i 's|GPSD_OPTIONS=""|GPSD_OPTIONS="-P /var/run/gpsd.pid"|' packaging/deb/etc_default_gpsd - sed -i 's|"/var/run/gpsd.sock"|"/var/run/gpsd/gpsd.sock"|' packaging/deb/etc_default_gpsd - install -D -m644 "packaging/deb/etc_default_gpsd" "${pkgdir}/etc/conf.d/gpsd" - - sed -i 's|Id: gpsd.rules|Id: 99-gpsd-usb.rules|' gpsd.rules - install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules" - - sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug.wrapper - install -D -m755 gpsd.hotplug.wrapper "${pkgdir}/lib/udev/gpsd.hotplug.wrapper" - - # Patch a path bug. Check to see if fixed in ensuing releases - sed -i 's|gpsdcmd = "gpsd %s|gpsdcmd = "/usr/sbin/gpsd %s|' gpsd.hotplug - install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug" - - install -D -m644 packaging/X11/xgps.desktop ${pkgdir}/usr/share/applications/xgps.desktop - install -D -m644 packaging/X11/xgpsspeed.desktop ${pkgdir}/usr/share/applications/xgpsspeed.desktop - install -D -m644 packaging/X11/gpsd-logo.png ${pkgdir}/usr/share/gpsd/gpsd-logo.png - - install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd" - - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/gpsd/gpsd b/staging/gpsd/gpsd deleted file mode 100755 index b0f22c735..000000000 --- a/staging/gpsd/gpsd +++ /dev/null @@ -1,43 +0,0 @@ -#! /bin/sh - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd - -NAME=gpsd -DAEMON=/usr/sbin/$NAME -PID=$(pidof -o %PPID /usr/sbin/gpsd) - -case "$1" in - start) - stat_busy "Starting gpsd" - [ ! -d /var/run/gpsd ] && install -d /var/run/gpsd - [ -z "$PID" ] && "$DAEMON" ${GPSD_OPTIONS} -F ${GPSD_SOCKET} ${DEVICES} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon gpsd - stat_done - fi - ;; - stop) - stat_busy "Stopping gpsd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/$PID.pid &>/dev/null - rm_daemon gpsd - stat_done - fi - ;; - - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/gpsd/gpsd.install b/staging/gpsd/gpsd.install deleted file mode 100644 index ee661fcb1..000000000 --- a/staging/gpsd/gpsd.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - echo ">>> Note: the supplied gpsd udev rules are device-specific, so" - echo ">>> if your device isn't detected correctly, please use lsusb or" - echo ">>> another suitable tool to determine the proper device IDs and" - echo ">>> use the commented rules to fill in the blanks for your device." - - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD index 54287473b..9c291afb7 100644 --- a/testing/curl/PKGBUILD +++ b/testing/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 119987 2011-04-18 02:10:36Z angvp $ +# $Id: PKGBUILD 120010 2011-04-18 10:28:14Z pierre $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> @@ -6,7 +6,7 @@ pkgname=curl pkgver=7.21.5 -pkgrel=1 +pkgrel=2 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" @@ -14,14 +14,16 @@ license=('MIT') depends=('zlib' 'openssl' 'bash' 'ca-certificates') options=('!libtool') source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 - curlbuild.h) + curlbuild.h curl-config-fix-version.patch) md5sums=('dadd6353c9407161ddd62c0943718d59' - '751bd433ede935c8fae727377625a8ae') + '751bd433ede935c8fae727377625a8ae' + 'b1c1705887db11e4a04f4dcd997a768a') [[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h [[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 -i ${srcdir}/curl-config-fix-version.patch ./configure \ --with-random=/dev/urandom \ diff --git a/testing/curl/curl-config-fix-version.patch b/testing/curl/curl-config-fix-version.patch new file mode 100644 index 000000000..6e34998a4 --- /dev/null +++ b/testing/curl/curl-config-fix-version.patch @@ -0,0 +1,75 @@ +From 82ecc85d9ed0fc05931fb6d6893eda567a3c443f Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Mon, 18 Apr 2011 09:03:12 +0200 +Subject: [PATCH] curl-config: fix --version + +curl-config --version didn't output the correct version string (bug +introduced in commit 0355e33b5f7b234cf3), and unfortunately the test +case 1022 that was supposed to check for this was broken. + +This change fixes the test to detect this problem and it fixes the +output. + +Bug: http://curl.haxx.se/bug/view.cgi?id=3288727 +--- + curl-config.in | 4 ++-- + tests/libtest/test1022.pl | 17 +++++++++++++---- + 2 files changed, 15 insertions(+), 6 deletions(-) + +diff --git a/curl-config.in b/curl-config.in +index 27b9f7f..0232803 100644 +--- a/curl-config.in ++++ b/curl-config.in +@@ -6,7 +6,7 @@ + # | (__| |_| | _ <| |___ + # \___|\___/|_| \_\_____| + # +-# Copyright (C) 2001 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. ++# Copyright (C) 2001 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + # + # This software is licensed as described in the file COPYING, which + # you should have received as part of this distribution. The terms +@@ -94,7 +94,7 @@ while test $# -gt 0; do + ;; + + --version) +- echo libcurl @VERSION@ ++ echo libcurl @CURLVERSION@ + exit 0 + ;; + +diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl +index 60eee38..7fac00e 100755 +--- a/tests/libtest/test1022.pl ++++ b/tests/libtest/test1022.pl +@@ -22,14 +22,23 @@ my $curlconfigversion; + open(CURLCONFIG, "sh $ARGV[0] --$what|") || die "Can't get curl-config --$what list\n"; + $_ = <CURLCONFIG>; + chomp; ++my $filever=$_; + if ( $what eq "version" ) { +- /^libcurl ([\.\d]+(-DEV)?)$/ ; +- $curlconfigversion = $1; ++ if($filever =~ /^libcurl ([\.\d]+(-DEV)?)$/) { ++ $curlconfigversion = $1; ++ } ++ else { ++ $curlconfigversion = "illegal value"; ++ } + } + else { + # Convert hex version to decimal for comparison's sake +- /^(..)(..)(..)$/ ; +- $curlconfigversion = hex($1) . "." . hex($2) . "." . hex($3); ++ if($filever =~ /^(..)(..)(..)$/) { ++ $curlconfigversion = hex($1) . "." . hex($2) . "." . hex($3); ++ } ++ else { ++ $curlconfigversion = "illegal value"; ++ } + + # Strip off the -DEV from the curl version if it's there + $version =~ s/-DEV$//; +-- +1.7.4.4 + diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD index 3f4055c5b..89927c6f6 100644 --- a/testing/ghc/PKGBUILD +++ b/testing/ghc/PKGBUILD @@ -1,8 +1,14 @@ -# $Id: PKGBUILD 114660 2011-03-15 09:16:12Z vesa $ +# $Id: PKGBUILD 120001 2011-04-18 09:44:35Z vesa $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Special note for devs looking to upgrade this package: +# ghc places a unique hash for each library when it is built. +# Libraries depend on versions specified by those hashes. +# This implies that all libraries need to be rebuilt when ghc is rebuilt. +# Also, due to dependency loop problems, haskell-ghc-paths and haddock +# do not carry version dependencies. You will have to remember to build them too. pkgname=ghc -pkgver=7.0.2 -pkgrel=2 +pkgver=7.0.3 +pkgrel=1 pkgdesc="The Glasgow Haskell Compiler" arch=(i686 x86_64 'mips64el') url="http://www.haskell.org/ghc/" @@ -76,3 +82,5 @@ package() { md5sums=('946a18a0dc30437db72c0d3fdf26ca42' '5a3e0880c80b1dcecf779ff2e63a9c0d') +md5sums=('10bc5e9ae1b581404376efb85f260ff3' + '5a3e0880c80b1dcecf779ff2e63a9c0d') diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD index 190aaa282..43ad29881 100644 --- a/testing/gnome-games/PKGBUILD +++ b/testing/gnome-games/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117797 2011-04-04 17:57:44Z heftig $ +# $Id: PKGBUILD 120100 2011-04-19 21:50:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games -pkgver=3.0.0 +pkgver=3.0.1.1 pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('359a1df5801271fc93c953ef7e5a81e8fc0088d35ed259e07db49261337aab51') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('dbbda8aa6960e36acff7537e49e033fc8037e6b3b3aa52d5f066cb67b34b4319') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/libxml++/PKGBUILD b/testing/libxml++/PKGBUILD index c4385a417..53566fd25 100644 --- a/testing/libxml++/PKGBUILD +++ b/testing/libxml++/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 119822 2011-04-15 13:14:14Z ibiru $ +# $Id: PKGBUILD 120095 2011-04-19 21:39:40Z ibiru $ # Maintainer: damir <damir@archlinux.org> pkgbase=libxml++ pkgname=('libxml++' 'libxml++-docs') -pkgver=2.34.0 +pkgver=2.34.1 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') url="http://libxmlplusplus.sourceforge.net/" -makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm' 'mm-common') +makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.34/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('09bc0e20cdc729660ebb0429cdfc8202f3e48fd65f443a0a3cc1278a14ad7807') +sha256sums=('664f3636c425554bf5e7d1b60253244e2d723899be8a971fc54332148bfce040') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD new file mode 100644 index 000000000..1e4ff27e1 --- /dev/null +++ b/testing/nilfs-utils/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 120135 2011-04-20 11:43:51Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> +pkgname=nilfs-utils +pkgver=2.0.22 +pkgrel=1 +pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" +arch=('i686' 'x86_64') +url="http://www.nilfs.org/" +license=('GPL2' 'LGPL2.1') +backup=('etc/nilfs_cleanerd.conf') +depends=('util-linux-ng') +options=(!libtool) +source=(http://www.nilfs.org/download/${pkgname}-${pkgver}.tar.bz2) +md5sums=('d7650e53fbd4a73ef56e07a354fdd2b0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --libdir=/lib + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install LDCONFIG=/bin/true +} diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD index d991085d4..b90751d34 100644 --- a/testing/opencv/PKGBUILD +++ b/testing/opencv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 119711 2011-04-13 23:48:14Z schiv $ +# $Id: PKGBUILD 120048 2011-04-18 20:44:58Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=opencv _realname=OpenCV pkgver=2.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') @@ -20,20 +20,17 @@ options=('!libtool') source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2 ptrcvcapture.patch gcc46.patch - nov4l1.patch) + v4l_2.6.38.patch) md5sums=('122c9ac793a46854ef2819fedbbd6b1b' '461a8b1b0f2264521e13d9ae051d13be' 'b5fb8d6786578ae7bf272615279e8865' - '0164bdbd54ee28b1f6cba20fcfd53812') + '82c8a8a76275acd4a73a4f8e948c3f78') build() { cd "$srcdir/$_realname-$pkgver" # Please do not remove any patches from trunk # - # libpng 1.4 compatibility - #patch -Np1 -i "$srcdir/libpng-1.4.patch" - # fix v4l issue #patch -Np0 -i "$srcdir/v4l-mmap.patch" @@ -50,8 +47,8 @@ build() { patch -Np3 -i "$srcdir/gcc46.patch" # distro kernel no longer has v4l1 - # see https://code.ros.org/trac/opencv/ticket/862 - patch -Np1 -i "$srcdir/nov4l1.patch" + # see https://bugs.archlinux.org/task/23826 + patch -Np1 -i "$srcdir/v4l_2.6.38.patch" cmake . -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/testing/opencv/v4l_2.6.38.patch b/testing/opencv/v4l_2.6.38.patch new file mode 100644 index 000000000..dd23cd133 --- /dev/null +++ b/testing/opencv/v4l_2.6.38.patch @@ -0,0 +1,33 @@ +diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp +--- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800 ++++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-04-18 10:40:01.984950054 +0800 +@@ -214,7 +214,7 @@ + #include <sys/types.h> + #include <sys/mman.h> + +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include <string.h> + #include <stdlib.h> +diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.cpp +--- OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp.nov4l1 2010-12-05 11:35:25.000000000 +0800 ++++ OpenCV-2.2.0/modules/highgui/src/cap_libv4l.cpp 2011-04-18 10:39:07.568578185 +0800 +@@ -224,7 +224,7 @@ + #include "highgui.h" + #include "precomp.hpp" + +-#if !defined WIN32 && defined HAVE_CAMV4L && defined HAVE_CAMV4L2 ++#if !defined WIN32 && defined HAVE_CAMV4L2 + + #define CLEAR(x) memset (&(x), 0, sizeof (x)) + +@@ -241,7 +241,7 @@ + #include <sys/stat.h> + #include <sys/ioctl.h> + +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <linux/videodev2.h> + + #include <libv4l1.h> diff --git a/testing/pacman/PKGBUILD b/testing/pacman/PKGBUILD new file mode 100644 index 000000000..6edea83d1 --- /dev/null +++ b/testing/pacman/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ +# Maintainer: Dan McGee <dan@archlinux.org> + +pkgname=pacman +pkgver=3.5.2 +pkgrel=1 +pkgdesc="A library-based package manager with dependency support" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/pacman/" +license=('GPL') +groups=('base') +depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist') +optdepends=('fakeroot: for makepkg usage as normal user' + 'curl: for rankmirrors usage') +backup=(etc/pacman.conf etc/makepkg.conf) +install=pacman.install +options=(!libtool) +source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz + pacman.conf + pacman.conf.x86_64 + makepkg.conf) +md5sums=('b4f1fdbc17100923071ebe8fe9377be5' + 'e99eb721b6b704f68c5f47468507c102' + 'f8b939d9b2beb79a0436961a2d707d7c' + 'a8684989d3dfad5a6e1bcf95af3e571b') + +# keep an upgrade path for older installations +PKGEXT='.pkg.tar.gz' + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --enable-doc + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + # install Arch specific stuff + mkdir -p $pkgdir/etc + case "$CARCH" in + i686) + install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf + mycarch="i686" + mychost="i686-pc-linux-gnu" + myflags="-march=i686 " + ;; + x86_64) + install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf + mycarch="x86_64" + mychost="x86_64-unknown-linux-gnu" + myflags="-march=x86-64 " + ;; + esac + install -m644 $srcdir/makepkg.conf $pkgdir/etc/ + # set things correctly in the default conf file + sed -i $pkgdir/etc/makepkg.conf \ + -e "s|@CARCH[@]|$mycarch|g" \ + -e "s|@CHOST[@]|$mychost|g" \ + -e "s|@CARCHFLAGS[@]|$myflags|g" + + # install completion files + mkdir -p $pkgdir/etc/bash_completion.d/ + install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman + mkdir -p $pkgdir/usr/share/zsh/site-functions/ + install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman +} + +# vim: set ts=2 sw=2 et: diff --git a/testing/pacman/makepkg.conf b/testing/pacman/makepkg.conf new file mode 100644 index 000000000..a655e935f --- /dev/null +++ b/testing/pacman/makepkg.conf @@ -0,0 +1,114 @@ +# +# /etc/makepkg.conf +# + +######################################################################### +# SOURCE ACQUISITION +######################################################################### +# +#-- The download utilities that makepkg should use to acquire sources +# Format: 'protocol::agent' +DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' + 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' + 'rsync::/usr/bin/rsync -z %u %o' + 'scp::/usr/bin/scp -C %u %o') + +# Other common tools: +# /usr/bin/snarf +# /usr/bin/lftpget -c +# /usr/bin/curl + +######################################################################### +# ARCHITECTURE, COMPILE FLAGS +######################################################################### +# +CARCH="@CARCH@" +CHOST="@CHOST@" + +#-- Exclusive: will only run on @CARCH@ +# -march (or -mcpu) builds exclusively for an architecture +# -mtune optimizes for an architecture, but builds for whole processor family +CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" +CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" +LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" +#-- Make Flags: change this for DistCC/SMP systems +#MAKEFLAGS="-j2" + +######################################################################### +# BUILD ENVIRONMENT +######################################################################### +# +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) +# A negated environment option will do the opposite of the comments below. +# +#-- fakeroot: Allow building packages as a non-root user +#-- distcc: Use the Distributed C/C++/ObjC compiler +#-- color: Colorize output messages +#-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD +# +BUILDENV=(fakeroot !distcc color !ccache check) +# +#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, +#-- specify a space-delimited list of hosts running in the DistCC cluster. +#DISTCC_HOSTS="" + +######################################################################### +# GLOBAL PACKAGE OPTIONS +# These are default values for the options=() settings +######################################################################### +# +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) +# A negated option will do the opposite of the comments below. +# +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +# +OPTIONS=(strip docs libtool emptydirs zipman purge) + +#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 +INTEGRITY_CHECK=(md5) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="--strip-all" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="--strip-unneeded" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="--strip-debug" +#-- Manual (man and info) directories to compress (if zipman is specified) +MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) +#-- Doc directories to remove (if !docs is specified) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +#-- Files to be removed from all packages (if purge is specified) +PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) + +######################################################################### +# PACKAGE OUTPUT +######################################################################### +# +# Default: put built package and cached source in build directory +# +#-- Destination: specify a fixed directory where all packages will be placed +#PKGDEST=/home/packages +#-- Source cache: specify a fixed directory where source files will be cached +#SRCDEST=/home/sources +#-- Source packages: specify a fixed directory where all src packages will be placed +#SRCPKGDEST=/home/srcpackages +#-- Packager: name/email of the person or organization building packages +#PACKAGER="John Doe <john@doe.com>" + +######################################################################### +# EXTENSION DEFAULTS +######################################################################### +# +# WARNING: Do NOT modify these variables unless you know what you are +# doing. +# +PKGEXT='.pkg.tar.xz' +SRCEXT='.src.tar.gz' + +# vim: set ft=sh ts=2 sw=2 et: diff --git a/testing/pacman/pacman.conf b/testing/pacman/pacman.conf new file mode 100644 index 000000000..206ab23b4 --- /dev/null +++ b/testing/pacman/pacman.conf @@ -0,0 +1,80 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#XferCommand = /usr/bin/curl -C - -f %u > %o +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload +#CheckSpace + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs + diff --git a/testing/pacman/pacman.conf.x86_64 b/testing/pacman/pacman.conf.x86_64 new file mode 100644 index 000000000..6f0423647 --- /dev/null +++ b/testing/pacman/pacman.conf.x86_64 @@ -0,0 +1,89 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#XferCommand = /usr/bin/curl -C - -f %u > %o +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload +#CheckSpace + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs + diff --git a/testing/pacman/pacman.install b/testing/pacman/pacman.install new file mode 100644 index 000000000..0e598bb4b --- /dev/null +++ b/testing/pacman/pacman.install @@ -0,0 +1,62 @@ +#!/bin/sh +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + # one time stuff for md5sum issue with older pacman versions + if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then + _resetbackups + fi + if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then + _warnupgrade + fi +} + +_warnupgrade() { + echo ">>> The pacman database format has changed as of pacman 3.5.0." + echo ">>> You will need to run \`pacman-db-upgrade\` as root." + echo ">>>" +} + +_resetbackups() { + echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" + echo ">>> you are able to remove all NoUpgrade lines of already protected" + echo ">>> files from pacman.conf." + echo ">>>" + + # path variables + pacconf="/etc/pacman.conf" + dbpath="/var/lib/pacman/local" + + # get a list of NoUpgrade files from the user's pacman.conf + echo ">>> Retrieving pacman.conf NoUpgrade list..." + config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2) + # add the standard list of files, even if they are already above + config="$config \ + etc/passwd etc/group etc/shadow etc/sudoers \ + etc/fstab etc/raidtab etc/ld.so.conf \ + etc/rc.conf etc/rc.local \ + etc/modprobe.conf etc/modules.conf \ + etc/lilo.conf boot/grub/menu.lst" + + # blank md5sum for use in sed expression + zeroes='00000000000000000000000000000000' + + for file in $config; do + echo ">>> -> finding owner of /$file..." + line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null) + # if file is owned by a package, go find its incorrectly stored sum + if [ ! -z "$line" ]; then + # get the name and version of the package owning file + name=$(echo $line | awk '{print $5}') + version=$(echo $line | awk '{print $6}') + # set the path to the backup array holding the md5sum + path="$dbpath/$name-$version/files" + # run a sed on the path to reset the line containing $file + # NOTE: literal tab characters in sed expression after $file + echo ">>> -> resetting sum of /$file..." + sed -i "s#$file [0-9a-fA-F]*#$file $zeroes#" $path + else + echo ">>> -> $file is unowned." + fi + done +} diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD new file mode 100644 index 000000000..d8daf9053 --- /dev/null +++ b/testing/php/PKGBUILD @@ -0,0 +1,379 @@ +# $Id: PKGBUILD 120015 2011-04-18 10:42:15Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=php +pkgname=('php' + 'php-cgi' + 'php-apache' + 'php-fpm' + 'php-embed' + 'php-pear' + 'php-curl' + 'php-enchant' + 'php-gd' + 'php-gmp' + 'php-intl' + 'php-ldap' + 'php-mcrypt' + 'php-mssql' + 'php-odbc' + 'php-pgsql' + 'php-pspell' + 'php-snmp' + 'php-sqlite' + 'php-tidy' + 'php-xsl') +pkgver=5.3.6 +pkgrel=3 +_suhosinver=${pkgver}-0.9.10 +arch=('i686' 'x86_64') +license=('PHP') +url='http://www.php.net' +makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'postfix' + 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'libpng' 'libjpeg' 'icu' + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" + "suhosin-patch-${_suhosinver}.patch.gz" + 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' + 'logrotate.d.php-fpm') +md5sums=('2286f5a82a6e8397955a0025c1c2ad98' + 'fff1a38877142f3ae6036dbe5a85d0a6' + '39eaa70d276fc3d45d6bcf6cd5ae1106' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' + 'b01be5f816988fcee7e78225836e5e27' + 'd50ff349da08110a7cc8c691ce2d0423' + '07c4e412909ac65a44ec90e7a2c4bade') + +build() { + # ldap-sasl does not compile with --as-needed + export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" + export LDFLAGS="${LDFLAGS//,--as-needed}" + + phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --prefix=/usr \ + --sysconfdir=/etc/php \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php \ + --with-config-file-scan-dir=/etc/php/conf.d \ + --enable-inline-optimization \ + --disable-debug \ + --disable-rpath \ + --disable-static \ + --enable-shared \ + --mandir=/usr/share/man \ + --without-pear \ + " + + phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-dba=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd-native-ttf \ + --enable-intl=shared \ + --enable-json=shared \ + --enable-mbregex \ + --enable-mbstring \ + --enable-pdo \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-session \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sqlite-utf8 \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-xml \ + --enable-zip=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=/usr \ + --with-enchant=shared,/usr \ + --with-freetype-dir=shared,/usr \ + --with-gd=shared \ + --with-gdbm=shared \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-icu-dir=/usr \ + --with-imap-ssl=shared \ + --with-imap=shared \ + --with-jpeg-dir=shared,/usr \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-mcrypt=shared \ + --with-mhash \ + --with-mssql=shared \ + --with-mysql-sock=/var/run/mysqld/mysqld.sock \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-pcre-regex=/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared,/usr \ + --with-pgsql=shared \ + --with-png-dir=shared,/usr \ + --with-pspell=shared \ + --with-regex=php \ + --with-snmp=shared \ + --with-sqlite3=shared,/usr \ + --with-sqlite=shared \ + --with-tidy=shared \ + --with-unixODBC=shared,/usr \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zlib \ + --without-db2 \ + --without-db3 \ + " + + EXTENSION_DIR=/usr/lib/php/modules + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR + + cd ${srcdir}/${pkgbase}-${pkgver} + + # apply suhosin patch + patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch + + # adjust paths + patch -p0 -i ${srcdir}/php.ini.patch + patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + + # php + mkdir ${srcdir}/build-php + cd ${srcdir}/build-php + ln -s ../${pkgbase}-${pkgver}/configure + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + ${phpextensions} + make + + # cgi and fcgi + # reuse the previous run; this will save us a lot of time + cp -a ${srcdir}/build-php ${srcdir}/build-cgi + cd ${srcdir}/build-cgi + ./configure ${phpconfig} \ + --disable-cli \ + --enable-cgi \ + ${phpextensions} + make + + # apache + cp -a ${srcdir}/build-php ${srcdir}/build-apache + cd ${srcdir}/build-apache + ./configure ${phpconfig} \ + --disable-cli \ + --with-apxs2 \ + ${phpextensions} + make + + # fpm + cp -a ${srcdir}/build-php ${srcdir}/build-fpm + cd ${srcdir}/build-fpm + ./configure ${phpconfig} \ + --disable-cli \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + ${phpextensions} + make + + # embed + cp -a ${srcdir}/build-php ${srcdir}/build-embed + cd ${srcdir}/build-embed + ./configure ${phpconfig} \ + --disable-cli \ + --enable-embed=shared \ + ${phpextensions} + make + + # pear + cp -a ${srcdir}/build-php ${srcdir}/build-pear + cd ${srcdir}/build-pear + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + --with-pear \ + ${phpextensions} + make +} + +# check() { +# cd ${srcdir}/build-php +# make test +# } + +package_php() { + pkgdesc='An HTML-embedded scripting language' + depends=('pcre' 'libxml2' 'bzip2' 'openssl') + replaces=('php-fileinfo') + provides=('php-fileinfo') + conflicts=('php-fileinfo') + backup=('etc/php/php.ini') + + cd ${srcdir}/build-php + make -j1 INSTALL_ROOT=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/pear + # install php.ini + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini + install -d -m755 ${pkgdir}/etc/php/conf.d/ + + # remove static modules + rm -f ${pkgdir}/usr/lib/php/modules/*.a + # remove modules provided by sub packages + rm -f ${pkgdir}/usr/lib/php/modules/{curl,enchant,gd,gmp,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so +} + +package_php-cgi() { + pkgdesc='CGI and FCGI SAPI for PHP' + depends=('php' 'pcre' 'libxml2') + + install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi +} + +package_php-apache() { + pkgdesc='Apache SAPI for PHP' + depends=('php' 'apache' 'pcre' 'libxml2') + backup=('etc/httpd/conf/extra/php5_module.conf') + + install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so + install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf +} + +package_php-fpm() { + pkgdesc='FastCGI Process Manager for PHP' + depends=('php') + backup=('etc/php/php-fpm.conf') + + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf + install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm + install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm + install -d -m755 ${pkgdir}/etc/php/fpm.d +} + +package_php-embed() { + pkgdesc='Embed SAPI for PHP' + depends=('php' 'pcre' 'libxml2') + + install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h +} + +package_php-pear() { + pkgdesc='PHP Extension and Application Repository' + depends=('php' 'bash') + backup=('etc/php/pear.conf') + + cd ${srcdir}/build-pear + make -j1 install-pear INSTALL_ROOT=${pkgdir} + local i + while read i; do + [ ! -e "$i" ] || rm -rf "$i" + done < <(find ${pkgdir} -name '.*') +} + +package_php-curl() { + depends=('php' 'curl') + pkgdesc='curl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/curl.so ${pkgdir}/usr/lib/php/modules/curl.so +} + +package_php-enchant() { + depends=('php' 'enchant') + pkgdesc='enchant module for PHP' + install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so +} + +package_php-gd() { + depends=('php' 'libpng' 'libjpeg' 'freetype2') + pkgdesc='gd module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so +} + +package_php-gmp() { + depends=('php' 'gmp') + pkgdesc='gmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gmp.so ${pkgdir}/usr/lib/php/modules/gmp.so +} + +package_php-intl() { + depends=('php' 'icu') + pkgdesc='intl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so +} + +package_php-ldap() { + depends=('php' 'libldap') + pkgdesc='ldap module for PHP' + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so +} + +package_php-mcrypt() { + depends=('php' 'libmcrypt' 'libtool') + pkgdesc='mcrypt module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so +} + +package_php-mssql() { + depends=('php' 'freetds') + pkgdesc='mssql module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so +} + +package_php-odbc() { + depends=('php' 'unixodbc') + pkgdesc='ODBC modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so + install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so +} + +package_php-pgsql() { + depends=('php' 'postgresql-libs') + pkgdesc='PostgreSQL modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so + install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so +} + +package_php-pspell() { + depends=('php' 'aspell') + pkgdesc='pspell module for PHP' + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so +} + +package_php-snmp() { + depends=('php' 'net-snmp') + pkgdesc='snmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so +} + +package_php-sqlite() { + depends=('php' 'sqlite3') + pkgdesc='sqlite3 module for PHP' + install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so + install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so +} + +package_php-tidy() { + depends=('php' 'tidyhtml') + pkgdesc='tidy module for PHP' + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so +} + +package_php-xsl() { + depends=('php' 'libxslt') + pkgdesc='xsl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so +} diff --git a/testing/php/apache.conf b/testing/php/apache.conf new file mode 100644 index 000000000..c3ca0aad5 --- /dev/null +++ b/testing/php/apache.conf @@ -0,0 +1,13 @@ +# Required modules: dir_module, php5_module + +<IfModule dir_module> + <IfModule php5_module> + DirectoryIndex index.php index.html + <FilesMatch "\.php$"> + SetHandler application/x-httpd-php + </FilesMatch> + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> + </IfModule> +</IfModule> diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm new file mode 100644 index 000000000..7a1ba2597 --- /dev/null +++ b/testing/php/logrotate.d.php-fpm @@ -0,0 +1,6 @@ +/var/log/php-fpm.log { + missingok + postrotate + /etc/rc.d/php-fpm logrotate >/dev/null || true + endscript +} diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch new file mode 100644 index 000000000..93c62430a --- /dev/null +++ b/testing/php/php-fpm.conf.in.patch @@ -0,0 +1,80 @@ +--- sapi/fpm/php-fpm.conf.in 2010-12-11 08:31:47.695294987 +0100 ++++ sapi/fpm/php-fpm.conf.in 2010-12-11 08:31:55.907812237 +0100 +@@ -12,7 +12,7 @@ + ; Relative path can also be used. They will be prefixed by: + ; - the global prefix if it's been set (-p arguement) + ; - @prefix@ otherwise +-;include=etc/fpm.d/*.conf ++;include=/etc/php/fpm.d/*.conf + + ;;;;;;;;;;;;;;;;;; + ; Global Options ; +@@ -22,7 +22,7 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = run/php-fpm/php-fpm.pid + + ; Error log file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ +@@ -93,7 +93,8 @@ + ; specific port; + ; '/path/to/unix/socket' - to listen on a unix socket. + ; Note: This value is mandatory. +-listen = 127.0.0.1:9000 ++;listen = 127.0.0.1:9000 ++listen = /var/run/php-fpm/php-fpm.sock + + ; Set listen(2) backlog. A value of '-1' means unlimited. + ; Default Value: 128 (-1 on FreeBSD and OpenBSD) +@@ -112,9 +113,9 @@ + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user + ; mode is set to 0666 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0666 ++listen.owner = @php_fpm_user@ ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; Unix user/group of processes + ; Note: The user is mandatory. If the group is not set, the default user's group +@@ -154,23 +155,23 @@ + ; The number of child processes created on startup. + ; Note: Used only when pm is set to 'dynamic' + ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +-;pm.start_servers = 20 ++pm.start_servers = 20 + + ; The desired minimum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.min_spare_servers = 5 ++pm.min_spare_servers = 5 + + ; The desired maximum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.max_spare_servers = 35 ++pm.max_spare_servers = 35 + + ; The number of requests each child process should execute before respawning. + ; This can be useful to work around memory leaks in 3rd party libraries. For + ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. + ; Default Value: 0 +-;pm.max_requests = 500 ++pm.max_requests = 500 + + ; The URI to view the FPM status page. If this value is not set, no URI will be + ; recognized as a status page. By default, the status page shows the following +@@ -264,7 +265,7 @@ + ; Chdir to this directory at the start. + ; Note: relative path can be used. + ; Default Value: current directory or / when chroot +-;chdir = /var/www ++;chdir = /srv/http + + ; Redirect worker stdout and stderr into main error log. If not set, stdout and + ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch new file mode 100644 index 000000000..356e190b4 --- /dev/null +++ b/testing/php/php.ini.patch @@ -0,0 +1,126 @@ +--- php.ini-production 2011-02-09 01:25:44.000000000 +0100 ++++ php.ini-production 2011-03-19 11:11:44.496987763 +0100 +@@ -376,7 +376,7 @@ + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir +-;open_basedir = ++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is +@@ -781,7 +781,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -804,7 +804,7 @@ + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-; extension_dir = "./" ++extension_dir = "/usr/lib/php/modules/" + ; On windows: + ; extension_dir = "ext" + +@@ -938,53 +938,49 @@ + ; If you only provide the name of the extension, PHP will look for it in its + ; default extension directory. + ; +-; Windows Extensions +-; Note that ODBC support is built in, so no dll is needed for it. +-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +-; extension folders as well as the separate PECL DLL download (PHP 5). +-; Be sure to appropriately set the extension_dir directive. +-; +-;extension=php_bz2.dll +-;extension=php_curl.dll +-;extension=php_fileinfo.dll +-;extension=php_gd2.dll +-;extension=php_gettext.dll +-;extension=php_gmp.dll +-;extension=php_intl.dll +-;extension=php_imap.dll +-;extension=php_interbase.dll +-;extension=php_ldap.dll +-;extension=php_mbstring.dll +-;extension=php_exif.dll ; Must be after mbstring as it depends on it +-;extension=php_mysql.dll +-;extension=php_mysqli.dll +-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client +-;extension=php_openssl.dll +-;extension=php_pdo_firebird.dll +-;extension=php_pdo_mssql.dll +-;extension=php_pdo_mysql.dll +-;extension=php_pdo_oci.dll +-;extension=php_pdo_odbc.dll +-;extension=php_pdo_pgsql.dll +-;extension=php_pdo_sqlite.dll +-;extension=php_pgsql.dll +-;extension=php_pspell.dll +-;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll ++;extension=bcmath.so ++;extension=bz2.so ++;extension=calendar.so ++;extension=curl.so ++;extension=dba.so ++;extension=enchant.so ++;extension=exif.so ++;extension=ftp.so ++;extension=gd.so ++extension=gettext.so ++;extension=gmp.so ++;extension=iconv.so ++;extension=imap.so ++;extension=intl.so ++;extension=json.so ++;extension=ldap.so ++;extension=mcrypt.so ++;extension=mssql.so ++;extension=mysqli.so ++;extension=mysql.so ++;extension=odbc.so ++;extension=openssl.so ++;extension=pdo_mysql.so ++;extension=pdo_odbc.so ++;extension=pdo_pgsql.so ++;extension=pdo_sqlite.so ++;extension=pgsql.so ++;extension=phar.so ++;extension=posix.so ++;extension=pspell.so ++;extension=shmop.so ++;extension=snmp.so ++;extension=soap.so ++;extension=sockets.so ++;extension=sqlite3.so ++;extension=sqlite.so ++;extension=sysvmsg.so ++;extension=sysvsem.so ++;extension=sysvshm.so ++;extension=tidy.so ++;extension=xmlrpc.so ++;extension=xsl.so ++;extension=zip.so + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm new file mode 100644 index 000000000..54bcf4d5b --- /dev/null +++ b/testing/php/rc.d.php-fpm @@ -0,0 +1,158 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +wait_for_pid () { + try=0 + while test $try -lt 35 ; do + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + stat_append '.' + try=`expr $try + 1` + sleep 1 + done +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/php/php-fpm.conf ]; then + stat_append '(/etc/php/php-fpm.conf not found)' + stat_die + fi + + local test=$(/usr/sbin/php-fpm -t 2>&1) + if [ $? -gt 0 ]; then + stat_append '(error in /etc/php/php-fpm.conf)' + stat_die + elif echo $test | grep -qi 'error'; then + stat_append '(error in /etc/php/php.ini)' + stat_die + fi + + [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm + + stat_done +} + +case "$1" in + start) + test_config + stat_busy 'Starting php-fpm' + + /usr/sbin/php-fpm + + if [ "$?" != 0 ] ; then + stat_fail + exit 1 + fi + + wait_for_pid created /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + add_daemon php-fpm + stat_done + fi + ;; + + stop) + test_config + stat_busy 'Gracefully shutting down php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + force-quit) + stat_busy 'Terminating php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -TERM `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + test_config + stat_busy 'Reload service php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + logrotate) + stat_busy 'Reopen php-fpm log' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + *) + echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" + exit 1 + ;; + +esac diff --git a/testing/php/suhosin-patch-5.3.6-0.9.10.patch.gz b/testing/php/suhosin-patch-5.3.6-0.9.10.patch.gz Binary files differnew file mode 100644 index 000000000..7167ce2d0 --- /dev/null +++ b/testing/php/suhosin-patch-5.3.6-0.9.10.patch.gz diff --git a/testing/polkit/CVE-2011-1485.patch b/testing/polkit/CVE-2011-1485.patch new file mode 100644 index 000000000..f7054a63a --- /dev/null +++ b/testing/polkit/CVE-2011-1485.patch @@ -0,0 +1,908 @@ +From dd848a42a64a3b22a0cc60f6657b56ce9b6010ae Mon Sep 17 00:00:00 2001 +From: David Zeuthen <davidz@redhat.com> +Date: Thu, 31 Mar 2011 16:59:09 +0000 +Subject: PolkitUnixProcess: Clarify that the real uid is returned, not the effective one + +On Linux, also switch to parsing /proc/<pid>/status instead of relying +on the st_uid returned by stat(2) to be the uid we want. + +This was pointed out by Neel Mehta <nmehta@google.com>. Thanks! + +Signed-off-by: David Zeuthen <davidz@redhat.com> +--- +diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c +index d95a1d4..876da69 100644 +--- a/src/polkit/polkitunixprocess.c ++++ b/src/polkit/polkitunixprocess.c +@@ -24,9 +24,7 @@ + #endif + + #include <sys/types.h> +-#ifndef HAVE_FREEBSD +-#include <sys/stat.h> +-#else ++#ifdef HAVE_FREEBSD + #include <sys/param.h> + #include <sys/sysctl.h> + #include <sys/user.h> +@@ -34,6 +32,7 @@ + #include <stdlib.h> + #include <string.h> + #include <errno.h> ++#include <stdio.h> + + #include "polkitunixprocess.h" + #include "polkitsubject.h" +@@ -208,6 +207,8 @@ polkit_unix_process_get_pid (PolkitUnixProcess *process) + * + * Gets the uid of the owner of @process. + * ++ * Note that this returns the real user-id (not the effective user-id) of @process. ++ * + * Returns: The UNIX user id of the owner for @process or 0 if @error is set. + **/ + gint +@@ -215,17 +216,21 @@ polkit_unix_process_get_owner (PolkitUnixProcess *process, + GError **error) + { + gint result; ++ gchar *contents; ++ gchar **lines; + #ifdef HAVE_FREEBSD + struct kinfo_proc p; + #else +- struct stat statbuf; +- char procbuf[32]; ++ gchar filename[64]; ++ guint n; + #endif + + g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); + g_return_val_if_fail (error == NULL || *error == NULL, 0); + + result = 0; ++ lines = NULL; ++ contents = NULL; + + #ifdef HAVE_FREEBSD + if (get_kinfo_proc (process->pid, &p) == 0) +@@ -241,23 +246,52 @@ polkit_unix_process_get_owner (PolkitUnixProcess *process, + + result = p.ki_uid; + #else +- g_snprintf (procbuf, sizeof procbuf, "/proc/%d", process->pid); +- if (stat (procbuf, &statbuf) != 0) ++ ++ /* see 'man proc' for layout of the status file ++ * ++ * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). ++ */ ++ g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); ++ if (!g_file_get_contents (filename, ++ &contents, ++ NULL, ++ error)) + { +- g_set_error (error, +- POLKIT_ERROR, +- POLKIT_ERROR_FAILED, +- "stat() failed for /proc/%d: %s", +- process->pid, +- g_strerror (errno)); + goto out; + } ++ lines = g_strsplit (contents, "\n", -1); ++ for (n = 0; lines != NULL && lines[n] != NULL; n++) ++ { ++ gint real_uid, effective_uid; ++ if (!g_str_has_prefix (lines[n], "Uid:")) ++ continue; ++ if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) ++ { ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "Unexpected line `%s' in file %s", ++ lines[n], ++ filename); ++ goto out; ++ } ++ else ++ { ++ result = real_uid; ++ goto out; ++ } ++ } + +- result = statbuf.st_uid; ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "Didn't find any line starting with `Uid:' in file %s", ++ filename); + #endif + +- out: +- ++out: ++ g_strfreev (lines); ++ g_free (contents); + return result; + } + +-- +cgit v0.8.3-6-g21f6 +From 129b6223a19e7fb2753f8cad7957ac5402394076 Mon Sep 17 00:00:00 2001 +From: David Zeuthen <davidz@redhat.com> +Date: Fri, 01 Apr 2011 16:09:45 +0000 +Subject: Make PolkitUnixProcess also record the uid of the process + +This is needed to avoid possible TOCTTOU issues since a process can +change both its real uid and effective uid. + +Signed-off-by: David Zeuthen <davidz@redhat.com> +--- +diff --git a/docs/polkit/polkit-1-sections.txt b/docs/polkit/polkit-1-sections.txt +index 12141e3..9f4fcf8 100644 +--- a/docs/polkit/polkit-1-sections.txt ++++ b/docs/polkit/polkit-1-sections.txt +@@ -145,10 +145,13 @@ POLKIT_UNIX_SESSION_GET_CLASS + PolkitUnixProcess + polkit_unix_process_new + polkit_unix_process_new_full ++polkit_unix_process_new_for_owner ++polkit_unix_process_set_pid + polkit_unix_process_get_pid ++polkit_unix_process_set_start_time + polkit_unix_process_get_start_time +-polkit_unix_process_set_pid +-polkit_unix_process_get_owner ++polkit_unix_process_set_uid ++polkit_unix_process_get_uid + <SUBSECTION Standard> + PolkitUnixProcessClass + POLKIT_UNIX_PROCESS +diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c +index 577afec..d2c4c20 100644 +--- a/src/polkit/polkitsubject.c ++++ b/src/polkit/polkitsubject.c +@@ -238,13 +238,18 @@ polkit_subject_from_string (const gchar *str, + { + gint scanned_pid; + guint64 scanned_starttime; +- if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2) ++ gint scanned_uid; ++ if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT ":%d", &scanned_pid, &scanned_starttime, &scanned_uid) == 3) ++ { ++ subject = polkit_unix_process_new_for_owner (scanned_pid, scanned_starttime, scanned_uid); ++ } ++ else if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2) + { + subject = polkit_unix_process_new_full (scanned_pid, scanned_starttime); + } + else if (sscanf (str, "unix-process:%d", &scanned_pid) == 1) + { +- subject = polkit_unix_process_new_full (scanned_pid, 0); ++ subject = polkit_unix_process_new (scanned_pid); + if (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) == 0) + { + g_object_unref (subject); +@@ -297,6 +302,8 @@ polkit_subject_to_gvariant (PolkitSubject *subject) + g_variant_new_uint32 (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)))); + g_variant_builder_add (&builder, "{sv}", "start-time", + g_variant_new_uint64 (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)))); ++ g_variant_builder_add (&builder, "{sv}", "uid", ++ g_variant_new_int32 (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)))); + } + else if (POLKIT_IS_UNIX_SESSION (subject)) + { +@@ -395,6 +402,7 @@ polkit_subject_new_for_gvariant (GVariant *variant, + GVariant *v; + guint32 pid; + guint64 start_time; ++ gint32 uid; + + v = lookup_asv (details_gvariant, "pid", G_VARIANT_TYPE_UINT32, error); + if (v == NULL) +@@ -414,7 +422,18 @@ polkit_subject_new_for_gvariant (GVariant *variant, + start_time = g_variant_get_uint64 (v); + g_variant_unref (v); + +- ret = polkit_unix_process_new_full (pid, start_time); ++ v = lookup_asv (details_gvariant, "uid", G_VARIANT_TYPE_INT32, error); ++ if (v != NULL) ++ { ++ uid = g_variant_get_int32 (v); ++ g_variant_unref (v); ++ } ++ else ++ { ++ uid = -1; ++ } ++ ++ ret = polkit_unix_process_new_for_owner (pid, start_time, uid); + } + else if (g_strcmp0 (kind, "unix-session") == 0) + { +diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c +index 876da69..913be3a 100644 +--- a/src/polkit/polkitunixprocess.c ++++ b/src/polkit/polkitunixprocess.c +@@ -62,6 +62,7 @@ struct _PolkitUnixProcess + + gint pid; + guint64 start_time; ++ gint uid; + }; + + struct _PolkitUnixProcessClass +@@ -74,6 +75,7 @@ enum + PROP_0, + PROP_PID, + PROP_START_TIME, ++ PROP_UID + }; + + static void subject_iface_init (PolkitSubjectIface *subject_iface); +@@ -81,6 +83,9 @@ static void subject_iface_init (PolkitSubjectIface *subject_iface); + static guint64 get_start_time_for_pid (gint pid, + GError **error); + ++static gint _polkit_unix_process_get_owner (PolkitUnixProcess *process, ++ GError **error); ++ + #ifdef HAVE_FREEBSD + static gboolean get_kinfo_proc (gint pid, struct kinfo_proc *p); + #endif +@@ -92,6 +97,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixProcess, polkit_unix_process, G_TYPE_OBJECT, + static void + polkit_unix_process_init (PolkitUnixProcess *unix_process) + { ++ unix_process->uid = -1; + } + + static void +@@ -108,6 +114,10 @@ polkit_unix_process_get_property (GObject *object, + g_value_set_int (value, unix_process->pid); + break; + ++ case PROP_UID: ++ g_value_set_int (value, unix_process->uid); ++ break; ++ + case PROP_START_TIME: + g_value_set_uint64 (value, unix_process->start_time); + break; +@@ -132,6 +142,14 @@ polkit_unix_process_set_property (GObject *object, + polkit_unix_process_set_pid (unix_process, g_value_get_int (value)); + break; + ++ case PROP_UID: ++ polkit_unix_process_set_uid (unix_process, g_value_get_int (value)); ++ break; ++ ++ case PROP_START_TIME: ++ polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value)); ++ break; ++ + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; +@@ -139,12 +157,39 @@ polkit_unix_process_set_property (GObject *object, + } + + static void ++polkit_unix_process_constructed (GObject *object) ++{ ++ PolkitUnixProcess *process = POLKIT_UNIX_PROCESS (object); ++ ++ /* sets start_time and uid in case they are unset */ ++ ++ if (process->start_time == 0) ++ process->start_time = get_start_time_for_pid (process->pid, NULL); ++ ++ if (process->uid == -1) ++ { ++ GError *error; ++ error = NULL; ++ process->uid = _polkit_unix_process_get_owner (process, &error); ++ if (error != NULL) ++ { ++ process->uid = -1; ++ g_error_free (error); ++ } ++ } ++ ++ if (G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed != NULL) ++ G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed (object); ++} ++ ++static void + polkit_unix_process_class_init (PolkitUnixProcessClass *klass) + { + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->get_property = polkit_unix_process_get_property; + gobject_class->set_property = polkit_unix_process_set_property; ++ gobject_class->constructed = polkit_unix_process_constructed; + + /** + * PolkitUnixProcess:pid: +@@ -156,7 +201,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) + g_param_spec_int ("pid", + "Process ID", + "The UNIX process ID", +- -1, ++ 0, + G_MAXINT, + 0, + G_PARAM_CONSTRUCT | +@@ -166,6 +211,27 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) + G_PARAM_STATIC_NICK)); + + /** ++ * PolkitUnixProcess:uid: ++ * ++ * The UNIX user id of the process or -1 if unknown. ++ * ++ * Note that this is the real user-id, not the effective user-id. ++ */ ++ g_object_class_install_property (gobject_class, ++ PROP_UID, ++ g_param_spec_int ("uid", ++ "User ID", ++ "The UNIX user ID", ++ -1, ++ G_MAXINT, ++ -1, ++ G_PARAM_CONSTRUCT | ++ G_PARAM_READWRITE | ++ G_PARAM_STATIC_NAME | ++ G_PARAM_STATIC_BLURB | ++ G_PARAM_STATIC_NICK)); ++ ++ /** + * PolkitUnixProcess:start-time: + * + * The start time of the process. +@@ -178,7 +244,8 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) + 0, + G_MAXUINT64, + 0, +- G_PARAM_READABLE | ++ G_PARAM_CONSTRUCT | ++ G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_BLURB | + G_PARAM_STATIC_NICK)); +@@ -186,113 +253,50 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) + } + + /** +- * polkit_unix_process_get_pid: ++ * polkit_unix_process_get_uid: + * @process: A #PolkitUnixProcess. + * +- * Gets the process id for @process. ++ * Gets the user id for @process. Note that this is the real user-id, ++ * not the effective user-id. + * +- * Returns: The process id for @process. ++ * Returns: The user id for @process or -1 if unknown. + */ + gint +-polkit_unix_process_get_pid (PolkitUnixProcess *process) ++polkit_unix_process_get_uid (PolkitUnixProcess *process) + { +- g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); +- return process->pid; ++ g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), -1); ++ return process->uid; + } + + /** +- * polkit_unix_process_get_owner: ++ * polkit_unix_process_set_uid: + * @process: A #PolkitUnixProcess. +- * @error: (allow-none): Return location for error or %NULL. ++ * @uid: The user id to set for @process or -1 to unset it. + * +- * Gets the uid of the owner of @process. ++ * Sets the (real, not effective) user id for @process. ++ */ ++void ++polkit_unix_process_set_uid (PolkitUnixProcess *process, ++ gint uid) ++{ ++ g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); ++ g_return_if_fail (uid >= -1); ++ process->uid = uid; ++} ++ ++/** ++ * polkit_unix_process_get_pid: ++ * @process: A #PolkitUnixProcess. + * +- * Note that this returns the real user-id (not the effective user-id) of @process. ++ * Gets the process id for @process. + * +- * Returns: The UNIX user id of the owner for @process or 0 if @error is set. +- **/ ++ * Returns: The process id for @process. ++ */ + gint +-polkit_unix_process_get_owner (PolkitUnixProcess *process, +- GError **error) ++polkit_unix_process_get_pid (PolkitUnixProcess *process) + { +- gint result; +- gchar *contents; +- gchar **lines; +-#ifdef HAVE_FREEBSD +- struct kinfo_proc p; +-#else +- gchar filename[64]; +- guint n; +-#endif +- + g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); +- g_return_val_if_fail (error == NULL || *error == NULL, 0); +- +- result = 0; +- lines = NULL; +- contents = NULL; +- +-#ifdef HAVE_FREEBSD +- if (get_kinfo_proc (process->pid, &p) == 0) +- { +- g_set_error (error, +- POLKIT_ERROR, +- POLKIT_ERROR_FAILED, +- "get_kinfo_proc() failed for pid %d: %s", +- process->pid, +- g_strerror (errno)); +- goto out; +- } +- +- result = p.ki_uid; +-#else +- +- /* see 'man proc' for layout of the status file +- * +- * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). +- */ +- g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); +- if (!g_file_get_contents (filename, +- &contents, +- NULL, +- error)) +- { +- goto out; +- } +- lines = g_strsplit (contents, "\n", -1); +- for (n = 0; lines != NULL && lines[n] != NULL; n++) +- { +- gint real_uid, effective_uid; +- if (!g_str_has_prefix (lines[n], "Uid:")) +- continue; +- if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) +- { +- g_set_error (error, +- POLKIT_ERROR, +- POLKIT_ERROR_FAILED, +- "Unexpected line `%s' in file %s", +- lines[n], +- filename); +- goto out; +- } +- else +- { +- result = real_uid; +- goto out; +- } +- } +- +- g_set_error (error, +- POLKIT_ERROR, +- POLKIT_ERROR_FAILED, +- "Didn't find any line starting with `Uid:' in file %s", +- filename); +-#endif +- +-out: +- g_strfreev (lines); +- g_free (contents); +- return result; ++ return process->pid; + } + + /** +@@ -311,6 +315,21 @@ polkit_unix_process_get_start_time (PolkitUnixProcess *process) + } + + /** ++ * polkit_unix_process_set_start_time: ++ * @process: A #PolkitUnixProcess. ++ * @start_time: The start time for @pid. ++ * ++ * Set the start time of @process. ++ */ ++void ++polkit_unix_process_set_start_time (PolkitUnixProcess *process, ++ guint64 start_time) ++{ ++ g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); ++ process->start_time = start_time; ++} ++ ++/** + * polkit_unix_process_set_pid: + * @process: A #PolkitUnixProcess. + * @pid: A process id. +@@ -323,18 +342,17 @@ polkit_unix_process_set_pid (PolkitUnixProcess *process, + { + g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); + process->pid = pid; +- if (pid != (gint) -1) +- process->start_time = get_start_time_for_pid (pid, NULL); + } + + /** + * polkit_unix_process_new: + * @pid: The process id. + * +- * Creates a new #PolkitUnixProcess for @pid. The start time of the +- * process will be looked up in using e.g. the +- * <filename>/proc</filename> filesystem depending on the platform in +- * use. ++ * Creates a new #PolkitUnixProcess for @pid. ++ * ++ * The uid and start time of the process will be looked up in using ++ * e.g. the <filename>/proc</filename> filesystem depending on the ++ * platform in use. + * + * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). + */ +@@ -353,22 +371,42 @@ polkit_unix_process_new (gint pid) + * + * Creates a new #PolkitUnixProcess object for @pid and @start_time. + * ++ * The uid of the process will be looked up in using e.g. the ++ * <filename>/proc</filename> filesystem depending on the platform in ++ * use. ++ * + * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). + */ + PolkitSubject * + polkit_unix_process_new_full (gint pid, + guint64 start_time) + { +- PolkitUnixProcess *process; +- +- process = POLKIT_UNIX_PROCESS (polkit_unix_process_new ((gint) -1)); +- process->pid = pid; +- if (start_time != 0) +- process->start_time = start_time; +- else +- process->start_time = get_start_time_for_pid (pid, NULL); ++ return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS, ++ "pid", pid, ++ "start_time", start_time, ++ NULL)); ++} + +- return POLKIT_SUBJECT (process); ++/** ++ * polkit_unix_process_new_for_owner: ++ * @pid: The process id. ++ * @start_time: The start time for @pid or 0 to look it up in e.g. <filename>/proc</filename>. ++ * @uid: The (real, not effective) uid of the owner of @pid or -1 to look it up in e.g. <filename>/proc</filename>. ++ * ++ * Creates a new #PolkitUnixProcess object for @pid, @start_time and @uid. ++ * ++ * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). ++ */ ++PolkitSubject * ++polkit_unix_process_new_for_owner (gint pid, ++ guint64 start_time, ++ gint uid) ++{ ++ return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS, ++ "pid", pid, ++ "start_time", start_time, ++ "uid", uid, ++ NULL)); + } + + static guint +@@ -616,3 +654,95 @@ out: + + return start_time; + } ++ ++static gint ++_polkit_unix_process_get_owner (PolkitUnixProcess *process, ++ GError **error) ++{ ++ gint result; ++ gchar *contents; ++ gchar **lines; ++#ifdef HAVE_FREEBSD ++ struct kinfo_proc p; ++#else ++ gchar filename[64]; ++ guint n; ++#endif ++ ++ g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); ++ g_return_val_if_fail (error == NULL || *error == NULL, 0); ++ ++ result = 0; ++ lines = NULL; ++ contents = NULL; ++ ++#ifdef HAVE_FREEBSD ++ if (get_kinfo_proc (process->pid, &p) == 0) ++ { ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "get_kinfo_proc() failed for pid %d: %s", ++ process->pid, ++ g_strerror (errno)); ++ goto out; ++ } ++ ++ result = p.ki_uid; ++#else ++ ++ /* see 'man proc' for layout of the status file ++ * ++ * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). ++ */ ++ g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); ++ if (!g_file_get_contents (filename, ++ &contents, ++ NULL, ++ error)) ++ { ++ goto out; ++ } ++ lines = g_strsplit (contents, "\n", -1); ++ for (n = 0; lines != NULL && lines[n] != NULL; n++) ++ { ++ gint real_uid, effective_uid; ++ if (!g_str_has_prefix (lines[n], "Uid:")) ++ continue; ++ if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) ++ { ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "Unexpected line `%s' in file %s", ++ lines[n], ++ filename); ++ goto out; ++ } ++ else ++ { ++ result = real_uid; ++ goto out; ++ } ++ } ++ ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "Didn't find any line starting with `Uid:' in file %s", ++ filename); ++#endif ++ ++out: ++ g_strfreev (lines); ++ g_free (contents); ++ return result; ++} ++ ++/* deprecated public method */ ++gint ++polkit_unix_process_get_owner (PolkitUnixProcess *process, ++ GError **error) ++{ ++ return _polkit_unix_process_get_owner (process, error); ++} +diff --git a/src/polkit/polkitunixprocess.h b/src/polkit/polkitunixprocess.h +index b88cd03..531a57d 100644 +--- a/src/polkit/polkitunixprocess.h ++++ b/src/polkit/polkitunixprocess.h +@@ -47,16 +47,24 @@ typedef struct _PolkitUnixProcess PolkitUnixProcess; + typedef struct _PolkitUnixProcessClass PolkitUnixProcessClass; + + GType polkit_unix_process_get_type (void) G_GNUC_CONST; +-PolkitSubject *polkit_unix_process_new (gint pid); +-PolkitSubject *polkit_unix_process_new_full (gint pid, +- guint64 start_time); +- ++PolkitSubject *polkit_unix_process_new (gint pid); ++PolkitSubject *polkit_unix_process_new_full (gint pid, ++ guint64 start_time); ++PolkitSubject *polkit_unix_process_new_for_owner (gint pid, ++ guint64 start_time, ++ gint uid); + gint polkit_unix_process_get_pid (PolkitUnixProcess *process); + guint64 polkit_unix_process_get_start_time (PolkitUnixProcess *process); ++gint polkit_unix_process_get_uid (PolkitUnixProcess *process); + void polkit_unix_process_set_pid (PolkitUnixProcess *process, + gint pid); ++void polkit_unix_process_set_uid (PolkitUnixProcess *process, ++ gint uid); ++void polkit_unix_process_set_start_time (PolkitUnixProcess *process, ++ guint64 start_time); ++ + gint polkit_unix_process_get_owner (PolkitUnixProcess *process, +- GError **error); ++ GError **error) G_GNUC_DEPRECATED_FOR (polkit_unix_process_get_uid); + + G_END_DECLS + +-- +cgit v0.8.3-6-g21f6 +From c23d74447c7615dc74dae259f0fc3688ec988867 Mon Sep 17 00:00:00 2001 +From: David Zeuthen <davidz@redhat.com> +Date: Fri, 01 Apr 2011 16:12:27 +0000 +Subject: Use polkit_unix_process_get_uid() to get the owner of a process + +This avoids a TOCTTOU problem. + +Signed-off-by: David Zeuthen <davidz@redhat.com> +--- +diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c +index 495f752..9c331b6 100644 +--- a/src/polkitbackend/polkitbackendsessionmonitor.c ++++ b/src/polkitbackend/polkitbackendsessionmonitor.c +@@ -293,14 +293,15 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor + + if (POLKIT_IS_UNIX_PROCESS (subject)) + { +- local_error = NULL; +- uid = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), &local_error); +- if (local_error != NULL) ++ uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)); ++ if ((gint) uid == -1) + { +- g_propagate_prefixed_error (error, local_error, "Error getting user for process: "); ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "Unix process subject does not have uid set"); + goto out; + } +- + ret = polkit_unix_user_new (uid); + } + else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) +-- +cgit v0.8.3-6-g21f6 +From 3b12cfac29dddd27f1f166a7574d8374cc1dccf2 Mon Sep 17 00:00:00 2001 +From: David Zeuthen <davidz@redhat.com> +Date: Fri, 01 Apr 2011 16:13:15 +0000 +Subject: pkexec: Avoid TOCTTOU problems with parent process + +In a nutshell, the parent process may change its uid (either real- or +effective uid) after launching pkexec. It can do this by exec()'ing +e.g. a setuid root program. + +To avoid this problem, just use the uid the parent process had when it +executed pkexec. This happens to be the same uid of the pkexec process +itself. + +Additionally, remove some dubious code that allowed pkexec to continue +when the parent process died as there is no reason to support +something like that. Also ensure that the pkexec process is killed if +the parent process dies. + +This problem was pointed out by Neel Mehta <nmehta@google.com>. + +Signed-off-by: David Zeuthen <davidz@redhat.com> +--- +diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c +index 9217954..3e656be 100644 +--- a/src/programs/pkexec.c ++++ b/src/programs/pkexec.c +@@ -35,6 +35,10 @@ + #include <pwd.h> + #include <errno.h> + ++#ifdef __linux__ ++#include <sys/prctl.h> ++#endif ++ + #include <glib/gi18n.h> + + #ifdef POLKIT_AUTHFW_PAM +@@ -423,7 +427,6 @@ main (int argc, char *argv[]) + GPtrArray *saved_env; + gchar *opt_user; + pid_t pid_of_caller; +- uid_t uid_of_caller; + gpointer local_agent_handle; + + ret = 127; +@@ -598,40 +601,49 @@ main (int argc, char *argv[]) + */ + g_type_init (); + +- /* now check if the program that invoked us is authorized */ ++ /* make sure we are nuked if the parent process dies */ ++#ifdef __linux__ ++ if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0) ++ { ++ g_printerr ("prctl(PR_SET_PDEATHSIG, SIGTERM) failed: %s\n", g_strerror (errno)); ++ goto out; ++ } ++#else ++#warning "Please add OS specific code to catch when the parent dies" ++#endif ++ ++ /* Figure out the parent process */ + pid_of_caller = getppid (); + if (pid_of_caller == 1) + { + /* getppid() can return 1 if the parent died (meaning that we are reaped +- * by /sbin/init); get process group leader instead - for example, this +- * happens when launching via gnome-panel (alt+f2, then 'pkexec gedit'). ++ * by /sbin/init); In that case we simpy bail. + */ +- pid_of_caller = getpgrp (); +- } +- +- subject = polkit_unix_process_new (pid_of_caller); +- if (subject == NULL) +- { +- g_printerr ("No such process for pid %d: %s\n", (gint) pid_of_caller, error->message); +- g_error_free (error); ++ g_printerr ("Refusing to render service to dead parents.\n"); + goto out; + } + +- /* paranoia: check that the uid of pid_of_caller matches getuid() */ +- error = NULL; +- uid_of_caller = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), +- &error); +- if (error != NULL) +- { +- g_printerr ("Error determing pid of caller (pid %d): %s\n", (gint) pid_of_caller, error->message); +- g_error_free (error); +- goto out; +- } +- if (uid_of_caller != getuid ()) +- { +- g_printerr ("User of caller (%d) does not match our uid (%d)\n", uid_of_caller, getuid ()); +- goto out; +- } ++ /* This process we want to check an authorization for is the process ++ * that launched us - our parent process. ++ * ++ * At the time the parent process fork()'ed and exec()'ed us, the ++ * process had the same real-uid that we have now. So we use this ++ * real-uid instead of of looking it up to avoid TOCTTOU issues ++ * (consider the parent process exec()'ing a setuid helper). ++ * ++ * On the other hand, the monotonic process start-time is guaranteed ++ * to never change so it's safe to look that up given only the PID ++ * since we are guaranteed to be nuked if the parent goes away ++ * (cf. the prctl(2) call above). ++ */ ++ subject = polkit_unix_process_new_for_owner (pid_of_caller, ++ 0, /* 0 means "look up start-time in /proc" */ ++ getuid ()); ++ /* really double-check the invariants guaranteed by the PolkitUnixProcess class */ ++ g_assert (subject != NULL); ++ g_assert (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)) == pid_of_caller); ++ g_assert (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)) >= 0); ++ g_assert (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) > 0); + + error = NULL; + authority = polkit_authority_get_sync (NULL /* GCancellable* */, &error); +-- +cgit v0.8.3-6-g21f6 diff --git a/testing/polkit/PKGBUILD b/testing/polkit/PKGBUILD index e1026da28..fadb173be 100644 --- a/testing/polkit/PKGBUILD +++ b/testing/polkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 114364 2011-03-12 22:11:26Z ibiru $ +# $Id: PKGBUILD 120110 2011-04-20 09:34:59Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=polkit pkgver=0.101 -pkgrel=1 +pkgrel=2 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -13,12 +13,15 @@ makedepends=('intltool' 'gtk-doc' 'gobject-introspection') replaces=('policykit') options=('!libtool') source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz + CVE-2011-1485.patch polkit.pam) md5sums=('f925ac93aba3c072977370c1e27feb7f' + '4d858b8ab602614d7db2bc8574f6fd29' '6564f95878297b954f0572bc1610dd15') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/CVE-2011-1485.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ --disable-static --enable-gtk-doc diff --git a/testing/pygobject/PKGBUILD b/testing/pygobject/PKGBUILD index 0daa3d8e9..243834e80 100644 --- a/testing/pygobject/PKGBUILD +++ b/testing/pygobject/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 118503 2011-04-07 18:27:33Z ibiru $ +# $Id: PKGBUILD 120090 2011-04-19 21:33:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=pygobject pkgname=(pygobject py3gobject pygobject-devel) -pkgver=2.28.3 -pkgrel=2 +pkgver=2.28.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') depends=('glib2' 'gobject-introspection') @@ -12,7 +12,7 @@ makedepends=(python python2 python-cairo python2-cairo) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) options=('!libtool') url="http://www.pygtk.org/" -sha256sums=('7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6') +sha256sums=('70e3a05dd5f688e68b5dafa2412cd4fdbc0af83792a5752ef6353c4accf2022c') build() { cd "${srcdir}" diff --git a/testing/rp-pppoe/PKGBUILD b/testing/rp-pppoe/PKGBUILD new file mode 100644 index 000000000..3a23870da --- /dev/null +++ b/testing/rp-pppoe/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> +# Contributor: orelien <aurelien.foret@wanadoo.fr> + +pkgname=rp-pppoe +pkgver=3.10 +pkgrel=6 +pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client" +arch=('i686' 'x86_64') +url="http://www.roaringpenguin.com/pppoe/" +license=('GPL') +depends=('ppp>=2.4.5' 'sh') +options=('!makeflags') +backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options) +source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz adsl) +install=rp-pppoe.install +md5sums=('d58a13cc4185bca6121a606ff456dec0' + 'adace1ad441aa88dcb3db52fb7f9c97f') + +build() { + cd $srcdir/$pkgname-$pkgver/src + ./configure --prefix=/usr --enable-plugin + make PLUGIN_DIR="/usr/lib/rp-pppoe" || return 1 +} + +package() { + cd $srcdir/$pkgname-$pkgver/src + make DESTDIR=$pkgdir install + + #moving .so files to /usr/lib according to FS#13876 + mkdir -p ${pkgdir}/usr/lib/rp-pppoe + mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/ + #not necessary after moving the plugin + rm -rf ${pkgdir}/etc/ppp/plugins + #changing config to the new path + #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf + + install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl +} diff --git a/testing/rp-pppoe/adsl b/testing/rp-pppoe/adsl new file mode 100755 index 000000000..33bd91839 --- /dev/null +++ b/testing/rp-pppoe/adsl @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting ADSL Connection" + /usr/sbin/pppoe-start &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon adsl + stat_done + fi + ;; + stop) + stat_busy "Stopping ADSL Connection" + /usr/sbin/pppoe-stop &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon adsl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/rp-pppoe/rp-pppoe.install b/testing/rp-pppoe/rp-pppoe.install new file mode 100644 index 000000000..1d4bccce2 --- /dev/null +++ b/testing/rp-pppoe/rp-pppoe.install @@ -0,0 +1,12 @@ +#arg 1: the new package version +post_install() { +echo ">>> The kernel-mode plugin has a new place." +echo ">>> It's now located under /usr/lib/rp-pppoe/rp-pppoe.so" +echo ">>> Change LINUX_PLUGIN to the new path in your /etc/ppp/pppoe.conf" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} |