diff options
59 files changed, 1835 insertions, 167 deletions
diff --git a/community-testing/gnustep-back/PKGBUILD b/community-testing/gnustep-back/PKGBUILD index 60ad92dd8..4755f9e02 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') @@ -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 57ec54df7..556c873d5 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') @@ -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 95c38b3b0..a9ea47daf 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') @@ -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 0d7632363..ca9a49322 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') 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 801d14d7d..82bbe2770 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') 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 daa057cef..2521fa226 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') 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 d22bafa0a..88548b65d 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') 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 4d4c4665d..bfae14fb4 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') @@ -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 544edc1c2..5bb1ab164 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') @@ -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 3127ce984..6f5849b2d 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) @@ -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/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD index 1cc5479ee..21497ff60 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') 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 8cda3a98e..f12c165ef 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') 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/medit/PKGBUILD b/community/medit/PKGBUILD index 3664e3001..c11facc74 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') @@ -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/mp3splt-gtk/PKGBUILD b/community/mp3splt-gtk/PKGBUILD index 31821b2f2..49677067d 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') 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/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 687577c45..f192e2052 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') @@ -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/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 3dea5e5e4..20173dcf3 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') @@ -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/tasks/PKGBUILD b/community/tasks/PKGBUILD index 72875e1ca..2d9e4f2e2 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) 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) 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 aa9d8f971..cac828060 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') 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/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index c2451cb91..dbeee3c53 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') @@ -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 d1a6f8519..f8ed34036 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') 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/mtools/PKGBUILD b/extra/mtools/PKGBUILD index dd1eb2c81..4db0f42fe 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') @@ -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/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 741ffc2fe..f6c50c036 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') 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 bdcd3a283..c2adab552 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') -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/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index e99b73914..530da2b20 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 119998 2011-04-18 09:40:46Z 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.5 pkgrel=1 arch=('i686' 'x86_64') 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=('d278e377a830024e7ee1f279d0a50035') build() { cd "${srcdir}/${pkgbase}-${pkgver}" 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 27dda458f..a526404af 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) url="http://www.haskell.org/ghc/" @@ -76,3 +82,5 @@ package() { md5sums=('946a18a0dc30437db72c0d3fdf26ca42' '5a3e0880c80b1dcecf779ff2e63a9c0d') +md5sums=('10bc5e9ae1b581404376efb85f260ff3' + '5a3e0880c80b1dcecf779ff2e63a9c0d') diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD index b371f6930..b909207c7 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') 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/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 +} |