diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-29 23:10:39 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-29 23:10:39 +0000 |
| commit | 5e8a6a470237711ad18f12dde87deea6f2b8b0e0 (patch) | |
| tree | 438c05155823f16b71f4277fef949610bf6fe826 | |
| parent | 108636e69eaeef67f4e7263c7f26105e25979e89 (diff) | |
Wed Jun 29 23:10:38 UTC 2011
179 files changed, 4735 insertions, 837 deletions
diff --git a/community-staging/perl-xml-libxslt/PKGBUILD b/community-staging/perl-xml-libxslt/PKGBUILD new file mode 100644 index 000000000..708898b9e --- /dev/null +++ b/community-staging/perl-xml-libxslt/PKGBUILD @@ -0,0 +1,30 @@ +# Id:$ +# Maintainer: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-xml-libxslt +pkgver=1.70 +pkgrel=6 +pkgdesc="Interface to the gnome libxslt library " +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/XML-LibXSLT" +license=('GPL') +depends=('perl-xml-libxml' 'libxslt') +source=(http://www.cpan.org/authors/id/P/PA/PAJAS/XML-LibXSLT-$pkgver.tar.gz) +md5sums=('c63a7913999de076e5c911810f69b392') + +build() { + cd $srcdir/XML-LibXSLT-$pkgver + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check () { + cd $srcdir/XML-LibXSLT-$pkgver + make test +} + +package() { + cd $srcdir/XML-LibXSLT-$pkgver + make install DESTDIR=$pkgdir +} + diff --git a/community/aircrack-ng/ChangeLog b/community/aircrack-ng/ChangeLog index f65ab984b..a8feddaab 100644 --- a/community/aircrack-ng/ChangeLog +++ b/community/aircrack-ng/ChangeLog @@ -1,3 +1,7 @@ +2011-06-28 Brad Fanella + + * Fix FS#24880 + 2011-06-15 Brad Fanella * Fix FS#24633 diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD index 8c08b7a8a..27f257e5c 100644 --- a/community/aircrack-ng/PKGBUILD +++ b/community/aircrack-ng/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49442 2011-06-16 05:26:13Z bfanella $ +# $Id: PKGBUILD 50616 2011-06-29 02:16:27Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,19 +7,17 @@ pkgbase=aircrack-ng pkgname=(aircrack-ng aircrack-ng-scripts) pkgver=1.1 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') url="http://www.aircrack-ng.org" license=('GPL2') source=("http://download.aircrack-ng.org/${pkgname}-${pkgver}.tar.gz") md5sums=('f7a24ed8fad122c4187d06bfd6f998b4') -depends=('openssl' 'sqlite3' 'iw') - +depends=('openssl' 'sqlite3' 'iw' 'net-tools') build() { cd ${srcdir}/${pkgbase}-${pkgver} make SQLITE=true unstable=true - } package_aircrack-ng() { @@ -31,18 +29,16 @@ package_aircrack-ng() { ### Remove installed scripts/corresponding man pages (installed in aircrack-ng-scripts) ### # Scripts - rm ${pkgdir}/usr/sbin/airmon-ng rm ${pkgdir}/usr/sbin/airdriver-ng rm ${pkgdir}/usr/sbin/airodump-ng-oui-update # Man pages mkdir -p ${srcdir}/tmp/ - mv ${pkgdir}/usr/share/man/man1/airmon-ng.1 ${srcdir}/tmp/ mv ${pkgdir}/usr/share/man/man1/airdriver-ng.1 ${srcdir}/tmp/ } package_aircrack-ng-scripts() { pkgdesc="Included scripts for a key cracker for the 802.11 WEP and WPA-PSK protocols" - depends=('python2' 'graphviz' 'pylorcon' 'net-tools') + depends=('python2' 'graphviz' 'pylorcon') cd ${srcdir}/aircrack-ng-${pkgver}/scripts mkdir -p ${pkgdir}/usr/share/man/man1/ \ @@ -86,13 +82,6 @@ package_aircrack-ng-scripts() { sed s/python/python2/ -i airgraph-ng/dump-join.py install -Dm644 airgraph-ng/dump-join.py ${pkgdir}/usr/sbin/dump-join.py chmod +x ${pkgdir}/usr/sbin/dump-join.py - - ### AIRMON-NG ### - # Man page - mv ${srcdir}/tmp/airmon-ng.1 ${pkgdir}/usr/share/man/man1/ - # Script - install -Dm644 airmon-ng ${pkgdir}/usr/sbin/ - chmod +x ${pkgdir}/usr/sbin/airmon-ng ### AIRODUMP-NG-OUI-UPDATE ### # Script diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 193b35857..668a9cec5 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49776 2011-06-21 04:55:41Z foutrelis $ +# $Id: PKGBUILD 49792 2011-06-21 05:03:51Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.0.0 -pkgrel=5 +pkgrel=6 pkgdesc='Daemon which collects system performance statistics periodically' arch=('i686' 'x86_64') url='http://collectd.org/' diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD index d1101f498..77a930762 100644 --- a/community/ekg2/PKGBUILD +++ b/community/ekg2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 39770 2011-02-16 12:06:58Z mherych $ +# $Id: PKGBUILD 47741 2011-05-25 05:00:38Z svenstaro $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=ekg2 pkgver=0.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" arch=('i686' 'x86_64') url="http://ekg2.org/" diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index 3b8b268d1..5937ef33d 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 15899 2010-04-17 20:43:27Z spupykin $ +# $Id: PKGBUILD 50330 2011-06-28 12:02:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=flightgear pkgver=2.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) depends=('simgear' 'libxmu' 'libxi' 'zlib' 'flightgear-data' 'openscenegraph' 'subversion') @@ -13,14 +13,18 @@ makedepends=('boost') license=("GPL") url="http://www.flightgear.org" options=('!makeflags') -source=(ftp://ftp.ibiblio.org/pub/mirrors/flightgear/ftp/Source/FlightGear-$pkgver.tar.gz) +#source=(ftp://ftp.ibiblio.org/pub/mirrors/flightgear/ftp/Source/FlightGear-$pkgver.tar.gz) +source=(http://ftp.linux.kiev.ua/pub/fgfs/Source/FlightGear-$pkgver.tar.gz) md5sums=('549aa45171480082f5b6e5e8d5ce8930') build() { cd $startdir/src/FlightGear-$pkgver - [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \; [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $startdir/src/FlightGear-$pkgver make DESTDIR=$startdir/pkg install } diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 3727a8cb3..1b3d364f0 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 45793 2011-04-29 10:36:54Z spupykin $ +# $Id: PKGBUILD 47452 2011-05-23 15:07:24Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.1.10 -pkgrel=6 +pkgrel=7 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index dbf9e06ec..682d3aea6 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 41793 2011-03-08 22:30:52Z spupykin $ +# $Id: PKGBUILD 50322 2011-06-28 10:28:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl pkgver=1.22.10 -pkgrel=3 +pkgrel=5 pkgdesc="VRML viewer" arch=('i686' 'x86_64') url="http://freewrl.sourceforge.net/" license=('GPL') -depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'xulrunner' 'curl' 'freetype2' - 'imlib2' 'sox' 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif') -makedepends=('java-environment' 'xulrunner') +depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' + 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'spidermonkey') +makedepends=('java-environment') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 build-fix.patch) @@ -22,9 +22,17 @@ build() { . /etc/profile.d/openjdk6.sh cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/build-fix.patch + export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" + export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -ljs" ./configure \ --prefix=/usr --with-fontsdir=/usr/share/fonts/TTF --enable-libeai \ - --enable-libcurl --with-expat=/usr --with-target=motif + --enable-libcurl --with-expat=/usr --with-target=x11 --disable-plugin \ + --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js \ + --disable-seamonkey-js make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/haskell-dbus/PKGBUILD b/community/haskell-dbus/PKGBUILD index 722024016..316df37f3 100644 --- a/community/haskell-dbus/PKGBUILD +++ b/community/haskell-dbus/PKGBUILD @@ -5,12 +5,12 @@ _hkgname=DBus pkgname=haskell-dbus pkgver=0.4 -pkgrel=3.1 +pkgrel=1 pkgdesc="DBus bindings" url="http://hackage.haskell.org/package/DBus" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.0.2' 'sh') +depends=('ghc=7.0.3' 'sh') options=('strip') source=(http://hackage.haskell.org/packages/archive/DBus/0.4/DBus-0.4.tar.gz dbus-0.4.patch) diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index 3316fd98a..a53dbed2c 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 42779 2011-03-20 20:19:44Z spupykin $ +# $Id: PKGBUILD 47455 2011-05-23 15:33:39Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc pkgver=4.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Qt-based IRC client" url="http://www.kvirc.net" depends=('python2' 'esound' 'qt' 'libxss') optdepends=('esound: needed for snd plugin') arch=(i686 x86_64) -makedepends=() +makedepends=('cmake') license=('GPL') options=("!libtool") install=kvirc.install diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index 4c92c4539..8823ba609 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49263 2011-06-13 14:27:33Z icelaya $ +# $Id: PKGBUILD 50301 2011-06-28 07:26:18Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> @@ -7,7 +7,7 @@ pkgver=0.8 _pkgver=45d3e13eb94c _luxblend=9cb3fcee0be8 _blender=2.57 -pkgrel=3 +pkgrel=4 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64') url="http://www.luxrender.net/" @@ -15,13 +15,13 @@ license=('GPL') depends=('boost-libs' 'freeimage' 'openexr') optdepends=('blender: Blender exporter' 'qt: Qt GUI') makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python') -source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \ - https://bitbucket.org/luxrender/luxblend25/get/$_luxblend.tar.bz2) -md5sums=('0f2d856385db72131f51e44a7ee527fa' - '0c3c8d9efba76133f8c687b5dd2bca8a') +source=(http://src.luxrender.net/lux/archive/$_pkgver.tar.bz2 \ + http://src.luxrender.net/luxblend25/archive/$_luxblend.tar.bz2) +md5sums=('ad8d2ede00aa244cad884d9696ff5fbb' + '29c34f97791db3af1b827d9e9a1b3d79') build() { - cd "$srcdir"/luxrender-lux-$_pkgver + cd "$srcdir"/lux-$_pkgver sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt @@ -36,7 +36,7 @@ build() { } package() { - cd "$srcdir"/luxrender-lux-$_pkgver + cd "$srcdir"/lux-$_pkgver make DESTDIR="$pkgdir" install # fix library path on x86_64 @@ -44,9 +44,9 @@ package() { # install blender exporter install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons - cp -a "$srcdir"/luxrender-luxblend25-$_luxblend/src/luxrender \ + cp -a "$srcdir"/luxblend25-$_luxblend/src/luxrender \ "$pkgdir"/usr/share/blender/$_blender/scripts/addons - cp -a "$srcdir"/luxrender-lux-$_pkgver/pylux.so "$pkgdir"/usr/share/blender/$_blender/scripts/addons/luxrender/ + cp -a "$srcdir"/lux-$_pkgver/pylux.so "$pkgdir"/usr/share/blender/$_blender/scripts/addons/luxrender/ } # vim:set ts=2 sw=2 et: diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 8c262832b..b083d8935 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47048 2011-05-14 19:07:46Z tdziedzic $ +# $Id: PKGBUILD 50319 2011-06-28 10:21:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=openscenegraph -pkgver=2.8.4 +pkgver=2.8.5 pkgrel=1 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') @@ -17,22 +17,18 @@ optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') conflicts=('openthreads') provides=('openthreads') source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip) -md5sums=('283215b4040f7c5b85d30862a8eba97c') +md5sums=('de844947d410726ba50ed07eb6319e6f') build() { cd OpenSceneGraph-$pkgver - [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release - + sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp make } package() { cd OpenSceneGraph-$pkgver - make DESTDIR="$pkgdir" install - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true } diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD index 80f4f36f4..2476eaf71 100644 --- a/community/perl-berkeleydb/PKGBUILD +++ b/community/perl-berkeleydb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 39597 2011-02-12 08:57:25Z spupykin $ +# $Id: PKGBUILD 47458 2011-05-23 15:36:16Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-berkeleydb pkgver=0.43 -pkgrel=4 +pkgrel=5 pkgdesc="Interface to Berkeley DB version 2, 3 or 4" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/BerkeleyDB/" diff --git a/community/perl-class-data-inheritable/PKGBUILD b/community/perl-class-data-inheritable/PKGBUILD index cf54b9df0..279d6da79 100644 --- a/community/perl-class-data-inheritable/PKGBUILD +++ b/community/perl-class-data-inheritable/PKGBUILD @@ -3,7 +3,7 @@ pkgname=perl-class-data-inheritable pkgver=0.08 -pkgrel=3 +pkgrel=4 pkgdesc="Inheritable, overridable class data " arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Class-Data-Inheritable" diff --git a/community/perl-class-factory-util/PKGBUILD b/community/perl-class-factory-util/PKGBUILD index 3fe555c39..d22f619c9 100644 --- a/community/perl-class-factory-util/PKGBUILD +++ b/community/perl-class-factory-util/PKGBUILD @@ -3,7 +3,7 @@ pkgname=perl-class-factory-util _realname=Class-Factory-Util pkgver=1.7 -pkgrel=2 +pkgrel=3 pkgdesc="Provide utility methods for factory classes" arch=(i686 x86_64) license=('GPL' 'Artistic') diff --git a/community/perl-class-methodmaker/PKGBUILD b/community/perl-class-methodmaker/PKGBUILD index 2a7ba1d1e..9896a9d33 100644 --- a/community/perl-class-methodmaker/PKGBUILD +++ b/community/perl-class-methodmaker/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 35577 2010-12-21 22:43:37Z tdziedzic $ +# $Id: PKGBUILD 47471 2011-05-23 15:46:41Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-class-methodmaker -pkgver=2.15 -pkgrel=3 +pkgver=2.18 +pkgrel=4 pkgdesc="Create generic class methods" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Class-MethodMaker" license=('GPL' 'PerlArtistic') depends=('perl>=5.10.0') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-$pkgver.tar.gz) -md5sums=('7af92ddaee49815ade7c5886b74d5e64') +source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/Class-MethodMaker-${pkgver}.tar.gz") +md5sums=('99435d78e0a1754b102fe39597c6c3df') build() { cd $srcdir/Class-MethodMaker-$pkgver diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD index 04dd4f03c..ede090293 100644 --- a/community/perl-clone/PKGBUILD +++ b/community/perl-clone/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-clone pkgver=0.31 -pkgrel=2 +pkgrel=3 pkgdesc='Recursive copy of nested objects.' arch=('i686' 'x86_64') url='http://search.cpan.org/~RDF/Clone' diff --git a/community/perl-crypt-blowfish/PKGBUILD b/community/perl-crypt-blowfish/PKGBUILD index 67622c598..204a0d0f9 100644 --- a/community/perl-crypt-blowfish/PKGBUILD +++ b/community/perl-crypt-blowfish/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 35583 2010-12-21 22:46:05Z tdziedzic $ +# $Id: PKGBUILD 47477 2011-05-23 15:51:28Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-crypt-blowfish pkgver=2.12 -pkgrel=2 +pkgrel=3 pkgdesc="Perl/CPAN Module Crypt::Blowfish : XSbased implementation of Blowfish" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Crypt-Blowfish" diff --git a/community/perl-crypt-des/PKGBUILD b/community/perl-crypt-des/PKGBUILD index 31c65b5f7..ae854b92b 100644 --- a/community/perl-crypt-des/PKGBUILD +++ b/community/perl-crypt-des/PKGBUILD @@ -1,7 +1,7 @@ #Contributor: Pete Morris <pete dot morris at gmail dot com> pkgname=perl-crypt-des pkgver=2.05 -pkgrel=2 +pkgrel=3 pkgdesc="Perl DES encryption module" arch=('i686' 'x86_64') url="http://search.cpan.org/~dparis/Crypt-DES" diff --git a/community/perl-crypt-openssl-bignum/PKGBUILD b/community/perl-crypt-openssl-bignum/PKGBUILD index 527b39622..33f382066 100644 --- a/community/perl-crypt-openssl-bignum/PKGBUILD +++ b/community/perl-crypt-openssl-bignum/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 35589 2010-12-21 22:48:24Z tdziedzic $ +# $Id: PKGBUILD 47483 2011-05-23 15:54:16Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-crypt-openssl-bignum pkgver=0.04 -pkgrel=4 +pkgrel=5 pkgdesc="OpenSSL's multiprecision integer arithmetic " arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" diff --git a/community/perl-crypt-openssl-random/PKGBUILD b/community/perl-crypt-openssl-random/PKGBUILD index 112f52e1e..b9a8adb52 100644 --- a/community/perl-crypt-openssl-random/PKGBUILD +++ b/community/perl-crypt-openssl-random/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 35592 2010-12-21 22:49:23Z tdziedzic $ +# $Id: PKGBUILD 47486 2011-05-23 15:55:23Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-crypt-openssl-random pkgver=0.04 -pkgrel=4 +pkgrel=5 pkgdesc="Interface to OpenSSL PRNG methods" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" diff --git a/community/perl-crypt-openssl-rsa/PKGBUILD b/community/perl-crypt-openssl-rsa/PKGBUILD index 21ac6ce4a..23151f63e 100644 --- a/community/perl-crypt-openssl-rsa/PKGBUILD +++ b/community/perl-crypt-openssl-rsa/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 35595 2010-12-21 22:50:52Z tdziedzic $ +# $Id: PKGBUILD 47489 2011-05-23 15:56:48Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-crypt-openssl-rsa pkgver=0.26 -pkgrel=3 +pkgrel=4 pkgdesc="Interface to OpenSSL RSA methods" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA" diff --git a/community/perl-curses/PKGBUILD b/community/perl-curses/PKGBUILD index 4d65930dc..629c01041 100644 --- a/community/perl-curses/PKGBUILD +++ b/community/perl-curses/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 35598 2010-12-21 22:52:51Z tdziedzic $ +# $Id: PKGBUILD 47492 2011-05-23 15:58:40Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-curses pkgver=1.28 -pkgrel=2 +pkgrel=3 pkgdesc="Character screen handling and windowing" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Curses" diff --git a/community/perl-data-structure-util/PKGBUILD b/community/perl-data-structure-util/PKGBUILD index ffffa0058..765098374 100644 --- a/community/perl-data-structure-util/PKGBUILD +++ b/community/perl-data-structure-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 35601 2010-12-21 22:53:40Z tdziedzic $ +# $Id: PKGBUILD 47495 2011-05-23 16:00:16Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-data-structure-util pkgver=0.15 -pkgrel=3 +pkgrel=4 pkgdesc="Perl/CPAN Module Data::Structure::Util" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Data-Structure-Util" diff --git a/community/perl-datetime-format-builder/PKGBUILD b/community/perl-datetime-format-builder/PKGBUILD index af6e67f4d..094777a66 100644 --- a/community/perl-datetime-format-builder/PKGBUILD +++ b/community/perl-datetime-format-builder/PKGBUILD @@ -3,7 +3,7 @@ pkgname=perl-datetime-format-builder pkgver=0.8000 -pkgrel=4 +pkgrel=5 pkgdesc="Create DateTime parser classes and objects" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') diff --git a/community/perl-datetime-format-mail/PKGBUILD b/community/perl-datetime-format-mail/PKGBUILD index 3d798666c..dc6c69605 100644 --- a/community/perl-datetime-format-mail/PKGBUILD +++ b/community/perl-datetime-format-mail/PKGBUILD @@ -3,7 +3,7 @@ pkgname=perl-datetime-format-mail pkgver=0.3001 -pkgrel=5 +pkgrel=7 pkgdesc="Convert between DateTime and RFC2822/822 formats " arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DateTime-Format-Mail" @@ -14,10 +14,13 @@ source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-Format-Mail-$pkgver md5sums=('15e36249e866463bd0237262a8e43b16') build() { - cd $startdir/src/DateTime-Format-Mail-$pkgver + cd $srcdir/DateTime-Format-Mail-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make - make install DESTDIR=$startdir/pkg - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete +} +package() { + cd $srcdir/DateTime-Format-Mail-$pkgver + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index c9ba1f736..b5c86bd7f 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47204 2011-05-18 20:20:25Z jelle $ +# $Id: PKGBUILD 47498 2011-05-23 16:01:46Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime pkgver=0.70 -pkgrel=1 +pkgrel=2 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DateTime" diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD index 49a980cac..d787e37b5 100644 --- a/community/perl-dbd-odbc/PKGBUILD +++ b/community/perl-dbd-odbc/PKGBUILD @@ -1,25 +1,33 @@ -# $Id: PKGBUILD 35616 2010-12-21 22:59:14Z tdziedzic $ +# $Id: PKGBUILD 47750 2011-05-25 13:23:38Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-odbc -pkgver=1.24 -pkgrel=2 +pkgver=1.29 +pkgrel=1 pkgdesc="ODBC Driver for DBI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DBD-ODBC/" license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'unixodbc') +depends=('perl-dbi' 'perl' 'unixodbc') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-$pkgver.tar.gz) -md5sums=('2abf660489f4649725f47bd0e7507137') +source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz") +md5sums=('66fee532cab75a1e5ffa81dfd26b2367') build() { - cd $srcdir/DBD-ODBC-$pkgver + cd DBD-ODBC-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd DBD-ODBC-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-dbd-pg/PKGBUILD b/community/perl-dbd-pg/PKGBUILD index 2573b9128..7af282d37 100644 --- a/community/perl-dbd-pg/PKGBUILD +++ b/community/perl-dbd-pg/PKGBUILD @@ -1,24 +1,32 @@ -# $Id: PKGBUILD 35619 2010-12-21 23:00:16Z tdziedzic $ +# $Id: PKGBUILD 47753 2011-05-25 13:27:50Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-dbd-pg -pkgver=2.17.2 -pkgrel=2 +pkgver=2.18.1 +pkgrel=1 pkgdesc="Postgres Driver for DBI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DBD-Pg" license=('GPL' 'PerlArtistic') depends=('perl-dbi>=1.52' 'postgresql-libs') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-$pkgver.tar.gz) -md5sums=('2cd63605a9420a63c780f627420a359a') +source=("http://www.cpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-${pkgver}.tar.gz") +md5sums=('1f4a837b3d79789ad6854443fce7a901') build() { - cd $srcdir/DBD-Pg-$pkgver + cd DBD-Pg-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd DBD-Pg-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-dbd-sqlite2/PKGBUILD b/community/perl-dbd-sqlite2/PKGBUILD index 4128c77d2..314f129d4 100644 --- a/community/perl-dbd-sqlite2/PKGBUILD +++ b/community/perl-dbd-sqlite2/PKGBUILD @@ -1,24 +1,31 @@ -# $Id: PKGBUILD 35622 2010-12-21 23:01:28Z tdziedzic $ +# $Id: PKGBUILD 47756 2011-05-25 13:30:12Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-dbd-sqlite2 pkgver=0.33 -pkgrel=6 +pkgrel=7 pkgdesc="Perl/CPAN Module DBD::SQLite2" arch=("i686" "x86_64") url="http://search.cpan.org/dist/DBD-SQLite2" license=("GPL" "PerlArtistic") -makedepends=("perl-dbi") depends=("perl-dbi") -source=("http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite2-$pkgver.tar.gz") +source=("http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite2-${pkgver}.tar.gz") md5sums=('babd83fd5eb9ba7560ad4bab4c76c0eb') build() { - cd $srcdir/DBD-SQLite2-$pkgver + cd DBD-SQLite2-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd DBD-SQLite2-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-dbd-sybase/PKGBUILD b/community/perl-dbd-sybase/PKGBUILD index 67f8188f6..a33488520 100644 --- a/community/perl-dbd-sybase/PKGBUILD +++ b/community/perl-dbd-sybase/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 35625 2010-12-21 23:02:34Z tdziedzic $ +# $Id: PKGBUILD 47759 2011-05-25 13:32:36Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-dbd-sybase -pkgver=1.10 -pkgrel=2 +pkgver=1.12 +pkgrel=1 pkgdesc="Sybase Driver for DBI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/DBD-Sybase/" license=('GPL' 'PerlArtistic') depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'freetds') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/M/ME/MEWP/DBD-Sybase-$pkgver.tar.gz) -md5sums=('86668c8f626f5aa33620b2746c4dbcf1') +source=("http://search.cpan.org/CPAN/authors/id/M/ME/MEWP/DBD-Sybase-${pkgver}.tar.gz") +md5sums=('fc01efe30102e801f6fdc1c96352fcde') build() { - cd $srcdir/DBD-Sybase-$pkgver + cd $srcdir/DBD-Sybase-${pkgver} + export SYBASE=/usr + echo -e "\n\n\n\n\n\n" | PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd $srcdir/DBD-Sybase-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-digest-md5/PKGBUILD b/community/perl-digest-md5/PKGBUILD index bb6d0bbd5..c0d7a1512 100644 --- a/community/perl-digest-md5/PKGBUILD +++ b/community/perl-digest-md5/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48551 2011-06-01 19:52:59Z spupykin $ +# $Id: PKGBUILD 48561 2011-06-02 06:48:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil@gmail.com> pkgname=perl-digest-md5 pkgver=2.51 -pkgrel=1 +pkgrel=2 pkgdesc="Digest::MD5::Perl - Perl implementation of Ron Rivests MD5 Algorithm" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Digest-MD5" diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD index 32dcd5cf8..079721841 100644 --- a/community/perl-fuse/PKGBUILD +++ b/community/perl-fuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 46387 2011-05-06 21:11:28Z spupykin $ +# $Id: PKGBUILD 47546 2011-05-23 19:23:45Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-fuse pkgver=0.11 -pkgrel=1 +pkgrel=2 pkgdesc="write filesystems in Perl using FUSE" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Fuse" @@ -12,6 +12,7 @@ depends=('perl' 'fuse') license=('GPL') source=(http://www.cpan.org/authors/id/D/DP/DPAVLIN/Fuse-$pkgver.tar.gz) md5sums=('4b4cb2399dc409015779af0940513c97') +options=('!emptydirs') build() { cd $srcdir/Fuse-$pkgver diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD index 8e31c238a..b29f364b0 100644 --- a/community/perl-gd/PKGBUILD +++ b/community/perl-gd/PKGBUILD @@ -3,7 +3,7 @@ pkgname=perl-gd pkgver=2.44 -pkgrel=3 +pkgrel=4 pkgdesc="Interface to Gd Graphics Library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/GD" @@ -14,15 +14,16 @@ source=(http://www.cpan.org/authors/id/L/LD/LDS/GD-$pkgver.tar.gz) md5sums=('9b9a4d78a5af0616a96264b0aa354859') build() { - cd $startdir/src/GD-$pkgver + cd $srcdir/GD-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make - make install DESTDIR=$startdir/pkg - +} +package() { + cd $srcdir/GD-$pkgver + make install DESTDIR=$pkgdir install -D -m0644 GD/Group.pm $pkgdir/usr/lib/perl5/vendor_perl/GD/Group.pm - - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } diff --git a/community/perl-gnome2-wnck/PKGBUILD b/community/perl-gnome2-wnck/PKGBUILD index d9e72e446..25e0df822 100644 --- a/community/perl-gnome2-wnck/PKGBUILD +++ b/community/perl-gnome2-wnck/PKGBUILD @@ -1,23 +1,32 @@ -# $Id: PKGBUILD 35646 2010-12-21 23:11:34Z tdziedzic $ +# $Id: PKGBUILD 47727 2011-05-25 02:44:57Z tdziedzic $ # Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=perl-gnome2-wnck pkgver=0.16 -pkgrel=2 +pkgrel=4 pkgdesc="Perl interface to the Window Navigator Construction Kit" arch=('i686' 'x86_64') license=("GPL" "Artistic") url="http://search.cpan.org/dist/Gnome2-Wnck" depends=('perl' 'perl-extutils-depends' 'perl-extutils-pkgconfig' 'gnome-perl' 'libwnck') -source=(http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Wnck-$pkgver.tar.gz) +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/T/TS/TSCH/Gnome2-Wnck-${pkgver}.tar.gz") md5sums=('439f4569ffd7af96ef1d3feaab23760e') build() { - cd $startdir/src/Gnome2-Wnck-$pkgver + cd Gnome2-Wnck-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$startdir/pkg - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete +} + +package() { + cd Gnome2-Wnck-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gssapi/PKGBUILD b/community/perl-gssapi/PKGBUILD index ec1e50684..714407586 100644 --- a/community/perl-gssapi/PKGBUILD +++ b/community/perl-gssapi/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 45801 2011-04-29 10:49:42Z spupykin $ +# $Id: PKGBUILD 47705 2011-05-25 02:18:24Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-gssapi pkgver=0.28 -pkgrel=3 +pkgrel=4 pkgdesc="Perl/CPAN Module GSSAPI" arch=("i686" "x86_64") url="http://search.cpan.org/dist/GSSAPI" license=("GPL" "PerlArtistic") depends=('krb5') -source=("http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-$pkgver.tar.gz") +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-${pkgver}.tar.gz") md5sums=('65f00a0749212af064289c8a05e59b3f') build() { - cd $srcdir/GSSAPI-$pkgver + cd GSSAPI-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make } package() { - cd $srcdir/GSSAPI-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete + cd GSSAPI-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gstreamer-interfaces/PKGBUILD b/community/perl-gstreamer-interfaces/PKGBUILD index 92ddf705c..61a9b62e6 100644 --- a/community/perl-gstreamer-interfaces/PKGBUILD +++ b/community/perl-gstreamer-interfaces/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 35658 2010-12-21 23:15:57Z tdziedzic $ +# $Id: PKGBUILD 47709 2011-05-25 02:21:42Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gstreamer-interfaces pkgver=0.06 -pkgrel=2 +pkgrel=3 pkgdesc="GStreamer::Interfaces" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/GStreamer-Interfaces" license=('GPL' 'PerlArtistic') -depends=('glib-perl>=1.180' 'gstreamer0.10-base' 'perl-extutils-pkgconfig>=1.07' - 'perl-gstreamer>=0.06' 'perl-extutils-depends>=0.205') +depends=('glib-perl' 'gstreamer0.10-base' 'perl-extutils-pkgconfig' 'perl-gstreamer' 'perl-extutils-depends') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TS/TSCH/GStreamer-Interfaces-$pkgver.tar.gz) +source=("http://www.cpan.org/authors/id/T/TS/TSCH/GStreamer-Interfaces-${pkgver}.tar.gz") md5sums=('aa9583a484fa6829935b360887ecda45') build() { - cd $srcdir/GStreamer-Interfaces-$pkgver + cd GStreamer-Interfaces-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd GStreamer-Interfaces-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD index 752b4a856..84f62fa75 100644 --- a/community/perl-gstreamer/PKGBUILD +++ b/community/perl-gstreamer/PKGBUILD @@ -1,24 +1,32 @@ -# $Id: PKGBUILD 35655 2010-12-21 23:14:54Z tdziedzic $ +# $Id: PKGBUILD 47702 2011-05-25 01:05:10Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gstreamer -pkgver=0.15 -pkgrel=4 +pkgver=0.16 +pkgrel=1 pkgdesc="Interface to the GStreamer library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/GStreamer" license=('GPL' 'PerlArtistic') depends=('glib-perl>=1.180' 'gstreamer0.10' 'perl-extutils-pkgconfig>=1.07' 'perl-extutils-depends>=0.205') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TS/TSCH/GStreamer-$pkgver.tar.gz) -md5sums=('a01261f5a1012f4d6763e3721f1c9de7') +source=("http://www.cpan.org/authors/id/T/TS/TSCH/GStreamer-${pkgver}.tar.gz") +md5sums=('e2d51158f3c671c0e4c11a82c9171b2b') build() { - cd $srcdir/GStreamer-$pkgver + cd GStreamer-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd GStreamer-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gtk2-mozembed/PKGBUILD b/community/perl-gtk2-mozembed/PKGBUILD index fdc78ab73..bc2a503a0 100644 --- a/community/perl-gtk2-mozembed/PKGBUILD +++ b/community/perl-gtk2-mozembed/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 42141 2011-03-13 22:19:27Z spupykin $ +# $Id: PKGBUILD 47713 2011-05-25 02:25:45Z tdziedzic $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gtk2-mozembed -pkgver=0.08 -pkgrel=4 +pkgver=0.09 +pkgrel=1 pkgdesc="Interface to the Mozilla embedding widget" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-MozEmbed" license=('GPL' 'PerlArtistic') depends=('perl-extutils-pkgconfig>=1.03' 'gtk2-perl>=1.081' 'perl-extutils-depends>=0.20' 'xulrunner>1.9') options=('!emptydirs') -source=("http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-MozEmbed-${pkgver}.tar.gz" - 'missing-pixbuf.patch') -md5sums=('ddafafa0e2684050a5d8b9f2c15f6dca' - '82313ca5da7dafdae0a8890f031d07f9') +source=("http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-MozEmbed-${pkgver}.tar.gz") +md5sums=('8c391fbe1ebf23a0af22d5ad3b571f19') build() { - # fix https://rt.cpan.org/Public/Bug/Display.html?id=61063 - patch -Np0 -i ${srcdir}/missing-pixbuf.patch cd Gtk2-MozEmbed-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make } package() { cd Gtk2-MozEmbed-${pkgver} + make install DESTDIR=${pkgdir} + find ${pkgdir} -name '.packlist' -delete find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gtk2-sexy/PKGBUILD b/community/perl-gtk2-sexy/PKGBUILD index 2a23b98c6..6b4789bd2 100644 --- a/community/perl-gtk2-sexy/PKGBUILD +++ b/community/perl-gtk2-sexy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 36684 2011-01-06 04:50:07Z angvp $ +# $Id: PKGBUILD 47716 2011-05-25 02:28:38Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Charles Mauch <cmauch@gmail.com> # Creator: Florian Ragwitz <http://search.cpan.org/~/> pkgname=perl-gtk2-sexy pkgver=0.05 -pkgrel=4 +pkgrel=5 pkgdesc="Perl/CPAN Module Gtk2::Sexy" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-Sexy" @@ -13,18 +13,22 @@ license=('GPL' 'PerlArtistic') depends=('gtk2' 'libsexy') makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends' 'gtk2-perl') options=(docs !emptydirs) -source=("http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-Sexy-$pkgver.tar.gz") +source=("http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-Sexy-${pkgver}.tar.gz") md5sums=('3e291808250d7b956ba8443013a1b461') build() { - cd $srcdir/Gtk2-Sexy-$pkgver + cd Gtk2-Sexy-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make } package() { - cd $srcdir/Gtk2-Sexy-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete + cd Gtk2-Sexy-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gtk2-trayicon/PKGBUILD b/community/perl-gtk2-trayicon/PKGBUILD index d9b6e1c86..a4cdb9e76 100644 --- a/community/perl-gtk2-trayicon/PKGBUILD +++ b/community/perl-gtk2-trayicon/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 35661 2010-12-21 23:29:25Z tdziedzic $ +# $Id: PKGBUILD 47733 2011-05-25 02:54:41Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-gtk2-trayicon pkgver=0.06 -pkgrel=6 +pkgrel=7 pkgdesc="Perl interface to the EggTrayIcon library" arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/TrayIcon.html" +url="http://search.cpan.org/dist/Gtk2-TrayIcon/" depends=('gtk2-perl') makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') license=("GPL") -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-TrayIcon-$pkgver.tar.gz) +options=('!emptydirs') +source=("http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-TrayIcon-${pkgver}.tar.gz") md5sums=('522c328f14681a25d76eeaf317e05049') build() { - cd $srcdir/Gtk2-TrayIcon-$pkgver + cd Gtk2-TrayIcon-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd Gtk2-TrayIcon-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-gtk2-webkit/PKGBUILD b/community/perl-gtk2-webkit/PKGBUILD index 038f4748a..269e6080a 100644 --- a/community/perl-gtk2-webkit/PKGBUILD +++ b/community/perl-gtk2-webkit/PKGBUILD @@ -1,24 +1,32 @@ -# $Id: PKGBUILD 44460 2011-04-07 16:27:39Z spupykin $ +# $Id: PKGBUILD 47720 2011-05-25 02:33:54Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=perl-gtk2-webkit -pkgver=0.08 -pkgrel=3 +pkgver=0.09 +pkgrel=1 pkgdesc="Gtk2::WebKit" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Gtk2-WebKit" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0' 'gtk2-perl' 'libwebkit' 'perl-extutils-depends' 'perl-extutils-pkgconfig') +depends=('perl' 'gtk2-perl' 'libwebkit' 'perl-extutils-depends' 'perl-extutils-pkgconfig') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-WebKit-$pkgver.tar.gz) -md5sums=('5dc7e0ea470754f6e24e40e54da942ee') +source=(http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-WebKit-${pkgver}.tar.gz) +md5sums=('e696fc2b15d6189370e19bce9a9e56f3') build() { - cd $srcdir/Gtk2-WebKit-$pkgver + cd Gtk2-WebKit-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd Gtk2-WebKit-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-html-strip/PKGBUILD b/community/perl-html-strip/PKGBUILD index 558da9874..2f93db01f 100644 --- a/community/perl-html-strip/PKGBUILD +++ b/community/perl-html-strip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 35667 2010-12-21 23:32:23Z tdziedzic $ +# $Id: PKGBUILD 47534 2011-05-23 18:42:18Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-html-strip pkgver=1.06 -pkgrel=5 +pkgrel=6 pkgdesc="Perl/CPAN Module HTML::Strip" arch=('i686' 'x86_64') url="http://search.cpan.org/~kilinrax/HTML-Strip/" @@ -12,11 +12,15 @@ license=("GPL" "PerlArtistic") depends=('perl') source=("http://www.cpan.org/authors/id/K/KI/KILINRAX/HTML-Strip-$pkgver.tar.gz") md5sums=('ceeacef0c7c31983e3a991e77bb58b45') +options=('!emptydirs') build() { cd $srcdir/HTML-Strip-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} +package() { + cd $srcdir/HTML-Strip-$pkgver make install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-inline-java/PKGBUILD b/community/perl-inline-java/PKGBUILD index d5ba906dc..d9396fc00 100644 --- a/community/perl-inline-java/PKGBUILD +++ b/community/perl-inline-java/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 36952 2011-01-10 21:37:18Z spupykin $ +# $Id: PKGBUILD 47531 2011-05-23 18:37:03Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> pkgname=perl-inline-java pkgver=0.53 -pkgrel=1 +pkgrel=2 pkgdesc="The Inline::Java module allows you to put Java source code directly inline in a Perl script or module." arch=('i686' 'x86_64') depends=('perl' 'perl-inline' 'java-runtime') @@ -13,12 +13,16 @@ license=("GPL" "PerlArtistic") url="http://search.cpan.org/dist/Inline-Java" source=(http://search.cpan.org/CPAN/authors/id/P/PA/PATL/Inline-Java-$pkgver.tar.gz) md5sums=('23f96c2ac4915302c3647c0abc92916f') +options=('!emptydirs') build() { cd $srcdir/Inline-Java-$pkgver - yes | PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor J2SDK=$J2SDKDIR + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor J2SDK=$J2SDKDIR make java make +} +package() { + cd $srcdir/Inline-Java-$pkgver make install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-io-tty/PKGBUILD b/community/perl-io-tty/PKGBUILD index 565099f95..7fe7b0b0d 100644 --- a/community/perl-io-tty/PKGBUILD +++ b/community/perl-io-tty/PKGBUILD @@ -3,19 +3,24 @@ pkgname=perl-io-tty _realname=IO-Tty pkgver=1.08 -pkgrel=3 +pkgrel=4 pkgdesc="Provide an interface to TTYs and PTYs" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/IO-Tty/" license=("GPL" "PerlArtistic") +depends=('glibc') source=("http://www.cpan.org/authors/id/R/RG/RGIERSIG/${_realname}-$pkgver.tar.gz") md5sums=('e99d819a6f8c11ae105b770cc508a4fc') +options=('!emptydirs') build() { - cd $startdir/src/${_realname}-$pkgver + cd $srcdir/${_realname}-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make - make install DESTDIR=$startdir/pkg - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete +} +package(){ + cd $srcdir/${_realname}-$pkgver + make install DESTDIR=$pkgdir + find $pkgdir -name '.packlist' -delete + find $pkgdir -name '*.pod' -delete } diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD index d376698fd..0c935e5ca 100644 --- a/community/perl-json-xs/PKGBUILD +++ b/community/perl-json-xs/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 35682 2010-12-21 23:39:21Z tdziedzic $ +# $Id: PKGBUILD 47516 2011-05-23 18:15:13Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> pkgname=perl-json-xs pkgver=2.3 -pkgrel=2 +pkgrel=3 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" url="http://search.cpan.org/dist/JSON-XS/" license=("GPL") arch=('i686' 'x86_64') depends=('perl' 'perl-common-sense') -options=('!emptydirs' 'force') -LC_NUMERIC=C -provides=("$pkgname=`printf %.4f $pkgver`") +options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz) md5sums=('4dc2a968e41f8cf330d46be12f221a12') build() { cd $srcdir/JSON-XS-$pkgver - eval `perl -V:archname` +# eval `perl -V:archname` perl Makefile.PL INSTALLDIRS=vendor make +} +package() { + cd $srcdir/JSON-XS-$pkgver make DESTDIR=$pkgdir install find $pkgdir -name '.packlist' -delete && \ diff --git a/community/perl-libapreq2/PKGBUILD b/community/perl-libapreq2/PKGBUILD index e378ce473..21d49f90f 100644 --- a/community/perl-libapreq2/PKGBUILD +++ b/community/perl-libapreq2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 35685 2010-12-21 23:43:49Z tdziedzic $ +# $Id: PKGBUILD 47519 2011-05-23 18:19:22Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-libapreq2 pkgver=2.12 -pkgrel=7 +pkgrel=8 pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data." arch=('i686' 'x86_64') url="http://search.cpan.org/dist/libapreq2" @@ -24,10 +24,11 @@ build() { sed -i 's#-ldb-4.8#-ldb-5.1#' apreq2-config make +} +package(){ + cd $srcdir/libapreq2-$pkgver make install DESTDIR=$pkgdir - sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/bin/apreq2-config - find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete } diff --git a/community/perl-linux-pid/PKGBUILD b/community/perl-linux-pid/PKGBUILD new file mode 100644 index 000000000..f50e9a06a --- /dev/null +++ b/community/perl-linux-pid/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 50357 2011-06-28 18:54:54Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Generator : CPANPLUS::Dist::Arch 1.12 + +pkgname='perl-linux-pid' +pkgver='0.04' +pkgrel='1' +pkgdesc="Interface to Linux getpp?id functions" +arch=('i686' 'x86_64') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl') +url='http://search.cpan.org/dist/Linux-Pid' +source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-0.04.tar.gz') +md5sums=('130c4d299f827abf1f2285fddf03fccb') +_distdir="${srcdir}/Linux-Pid-0.04" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + cd "$_distdir" + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + make test + ) +} + +package() { + cd "$_distdir" + make install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + diff --git a/community/perl-list-moreutils/PKGBUILD b/community/perl-list-moreutils/PKGBUILD index ffcff2b04..fc399b9a7 100644 --- a/community/perl-list-moreutils/PKGBUILD +++ b/community/perl-list-moreutils/PKGBUILD @@ -3,7 +3,7 @@ pkgname=perl-list-moreutils _cpanname=List-MoreUtils pkgver=0.22 -pkgrel=5 +pkgrel=6 pkgdesc="Provide the stuff missing in List::Util" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/List-MoreUtils" diff --git a/community/perl-mail-box-parser-c/PKGBUILD b/community/perl-mail-box-parser-c/PKGBUILD index f9fcf27e7..cf1fc16f4 100644 --- a/community/perl-mail-box-parser-c/PKGBUILD +++ b/community/perl-mail-box-parser-c/PKGBUILD @@ -1,22 +1,31 @@ -# $Id: PKGBUILD 35688 2010-12-22 01:20:44Z tdziedzic $ +# $Id: PKGBUILD 47593 2011-05-23 20:41:57Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-mail-box-parser-c pkgver=3.006 -pkgrel=5 +pkgrel=6 pkgdesc="Perl/CPAN Module Mail::Box::Parser::C : extends MailBox with the speed of C" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Mail-Box-Parser-C" license=("GPL" "PerlArtistic") -source=("http://www.cpan.org/authors/id/M/MA/MARKOV/Mail-Box-Parser-C-$pkgver.tar.gz") +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/M/MA/MARKOV/Mail-Box-Parser-C-${pkgver}.tar.gz") md5sums=('3dfb3e2729597ae33114250cbce1b884') build() { - cd $srcdir/Mail-Box-Parser-C-$pkgver + cd Mail-Box-Parser-C-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd Mail-Box-Parser-C-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-mail-transport-dbx/PKGBUILD b/community/perl-mail-transport-dbx/PKGBUILD index b5be3e8f7..15244af54 100644 --- a/community/perl-mail-transport-dbx/PKGBUILD +++ b/community/perl-mail-transport-dbx/PKGBUILD @@ -1,22 +1,31 @@ -# $Id: PKGBUILD 35691 2010-12-22 01:21:45Z tdziedzic $ +# $Id: PKGBUILD 47596 2011-05-23 20:45:10Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-mail-transport-dbx pkgver=0.07 -pkgrel=5 +pkgrel=6 pkgdesc="Perl/CPAN Module Mail::Transport::Dbx : Parse Outlook Express mailboxes" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Mail-Transport-Dbx" license=("GPL" "PerlArtistic") -source=("http://www.cpan.org/authors/id/V/VP/VPARSEVAL/Mail-Transport-Dbx-$pkgver.tar.gz") +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/V/VP/VPARSEVAL/Mail-Transport-Dbx-${pkgver}.tar.gz") md5sums=('4dcf5346a67c0a7f861cb2bb51a7d14e') build() { - cd $srcdir/Mail-Transport-Dbx-$pkgver + cd Mail-Transport-Dbx-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd Mail-Transport-Dbx-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-net-dbus/PKGBUILD b/community/perl-net-dbus/PKGBUILD index ebb396310..a7307c2a8 100644 --- a/community/perl-net-dbus/PKGBUILD +++ b/community/perl-net-dbus/PKGBUILD @@ -1,24 +1,32 @@ -# $Id: PKGBUILD 35694 2010-12-22 01:22:55Z tdziedzic $ +# $Id: PKGBUILD 47599 2011-05-23 20:48:03Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-net-dbus pkgver=0.33.6 -pkgrel=5 +pkgrel=6 pkgdesc="Binding for DBus messaging protocol" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Net-DBus" license=('GPL' 'PerlArtistic') depends=('dbus' 'perl-xml-twig') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DA/DANBERR/Net-DBus-$pkgver.tar.gz) +source=("http://www.cpan.org/authors/id/D/DA/DANBERR/Net-DBus-${pkgver}.tar.gz") md5sums=('a1dbce89b1b839fd0e46d74067ae2e35') build() { - cd $srcdir/Net-DBus-$pkgver + cd Net-DBus-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd Net-DBus-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-net-libidn/PKGBUILD b/community/perl-net-libidn/PKGBUILD index fd0280247..1d2f41001 100644 --- a/community/perl-net-libidn/PKGBUILD +++ b/community/perl-net-libidn/PKGBUILD @@ -1,22 +1,31 @@ -# $Id: PKGBUILD 35697 2010-12-22 01:23:45Z tdziedzic $ +# $Id: PKGBUILD 47590 2011-05-23 20:30:08Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-net-libidn pkgver=0.12 -pkgrel=3 +pkgrel=4 pkgdesc="Perl/CPAN Module Net::LibIDN" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Net-LibIDN/" license=("GPL" "PerlArtistic") depends=(perl libidn) -source=("http://search.cpan.org/CPAN/authors/id/T/TH/THOR/Net-LibIDN-$pkgver.tar.gz") +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/T/TH/THOR/Net-LibIDN-${pkgver}.tar.gz") md5sums=('c3e4de2065009d67bcb1df0afb473e12') build() { - cd $srcdir/Net-LibIDN-$pkgver + cd Net-LibIDN-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd Net-LibIDN-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD index c14a85c97..2dd4124e8 100644 --- a/community/perl-params-validate/PKGBUILD +++ b/community/perl-params-validate/PKGBUILD @@ -3,24 +3,28 @@ pkgname=perl-params-validate pkgver=0.98 -pkgrel=1 +pkgrel=2 pkgdesc="Validate sub params against a spec" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Params-Validate" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') +depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-$pkgver.tar.gz) +source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") md5sums=('6dacb26b1bdb6338b6eed45cd86958bb') build() { - cd $startdir/src/Params-Validate-$pkgver + cd Params-Validate-${pkgver} + perl ./Build.PL --installdirs=vendor + ./Build } package(){ - cd $startdir/src/Params-Validate-$pkgver - ./Build install --destdir=$pkgdir - find $startdir/pkg -name '.packlist' -delete - find $startdir/pkg -name '*.pod' -delete + cd Params-Validate-${pkgver} + + ./Build install --destdir=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-string-crc32/PKGBUILD b/community/perl-string-crc32/PKGBUILD index 4c0e43d4f..de3d39177 100644 --- a/community/perl-string-crc32/PKGBUILD +++ b/community/perl-string-crc32/PKGBUILD @@ -1,22 +1,31 @@ -# $Id: PKGBUILD 35703 2010-12-22 01:25:32Z tdziedzic $ +# $Id: PKGBUILD 47584 2011-05-23 20:23:28Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-string-crc32 pkgver=1.4 -pkgrel=5 +pkgrel=6 pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation" arch=("i686" "x86_64") url="http://search.cpan.org/dist/String-CRC32" license=("GPL" "PerlArtistic") -source=("http://www.cpan.org/authors/id/S/SO/SOENKE/String-CRC32-$pkgver.tar.gz") +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/S/SO/SOENKE/String-CRC32-${pkgver}.tar.gz") md5sums=('9b241bc4a482a3aa59fbb1429bc30546') build() { - cd $srcdir/String-CRC32-$pkgver + cd String-CRC32-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd String-CRC32-${pkgver} + + make pure_install doc_install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-text-charwidth/PKGBUILD b/community/perl-text-charwidth/PKGBUILD index 9250a552a..db2e6d27a 100644 --- a/community/perl-text-charwidth/PKGBUILD +++ b/community/perl-text-charwidth/PKGBUILD @@ -1,22 +1,31 @@ -# $Id: PKGBUILD 35706 2010-12-22 01:26:17Z tdziedzic $ +# $Id: PKGBUILD 47581 2011-05-23 20:20:00Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-text-charwidth pkgver=0.04 -pkgrel=5 +pkgrel=6 pkgdesc="Perl/CPAN Module Text::CharWidth" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Text-CharWidth" license=("GPL" "PerlArtistic") -source=("http://www.cpan.org/authors/id/K/KU/KUBOTA/Text-CharWidth-$pkgver.tar.gz") +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/K/KU/KUBOTA/Text-CharWidth-${pkgver}.tar.gz") md5sums=('37a723df0580c0758c0ee67b37336c15') build() { - cd $srcdir/Text-CharWidth-$pkgver + cd Text-CharWidth-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd Text-CharWidth-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-text-kakasi/PKGBUILD b/community/perl-text-kakasi/PKGBUILD index f9813af76..78b522c7c 100644 --- a/community/perl-text-kakasi/PKGBUILD +++ b/community/perl-text-kakasi/PKGBUILD @@ -1,25 +1,33 @@ -# $Id: PKGBUILD 35709 2010-12-22 01:27:08Z tdziedzic $ +# $Id: PKGBUILD 47575 2011-05-23 20:14:17Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-text-kakasi pkgver=2.04 -pkgrel=6 +pkgrel=7 pkgdesc="Perl frontend to kakasi" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Text-Kakasi" license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0' 'kakasi') +depends=('perl' 'kakasi') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DA/DANKOGAI/Text-Kakasi-$pkgver.tar.gz) +source=("http://www.cpan.org/authors/id/D/DA/DANKOGAI/Text-Kakasi-${pkgver}.tar.gz") md5sums=('5a9e381cb93edfd707124a63c60f96b1') build() { - cd $srcdir/Text-Kakasi-$pkgver + cd Text-Kakasi-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd Text-Kakasi-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-tie-hash-indexed/PKGBUILD b/community/perl-tie-hash-indexed/PKGBUILD index 45d51b8e5..687e000c1 100644 --- a/community/perl-tie-hash-indexed/PKGBUILD +++ b/community/perl-tie-hash-indexed/PKGBUILD @@ -1,24 +1,32 @@ -# $Id: PKGBUILD 35712 2010-12-22 01:27:48Z tdziedzic $ +# $Id: PKGBUILD 47578 2011-05-23 20:16:48Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-tie-hash-indexed pkgver=0.05 -pkgrel=5 +pkgrel=6 pkgdesc="Ordered hashes for Perl" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Tie-Hash-Indexed" license=('GPL' 'PerlArtistic') depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/M/MH/MHX/Tie-Hash-Indexed-$pkgver.tar.gz) +source=(http://www.cpan.org/authors/id/M/MH/MHX/Tie-Hash-Indexed-${pkgver}.tar.gz) md5sums=('41e2d013df8cfafdd239bc65bbada014') build() { - cd $srcdir/Tie-Hash-Indexed-$pkgver + cd Tie-Hash-Indexed-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd Tie-Hash-Indexed-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-tk-tablematrix/PKGBUILD b/community/perl-tk-tablematrix/PKGBUILD index 294f0bd20..8f9dd8986 100644 --- a/community/perl-tk-tablematrix/PKGBUILD +++ b/community/perl-tk-tablematrix/PKGBUILD @@ -1,25 +1,33 @@ -# $Id: PKGBUILD 35715 2010-12-22 01:29:04Z tdziedzic $ +# $Id: PKGBUILD 47698 2011-05-24 20:28:40Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-tk-tablematrix pkgver=1.23 -pkgrel=6 +pkgrel=7 pkgdesc="Display data in TableSpreadsheet format" arch=("i686" "x86_64") url="http://search.cpan.org/dist/Tk-TableMatrix" license=("GPL" "PerlArtistic") depends=('perl-tk') options=('!emptydirs') -source=("http://www.cpan.org/authors/id/C/CE/CERNEY/Tk-TableMatrix-$pkgver.tar.gz") +source=("http://www.cpan.org/authors/id/C/CE/CERNEY/Tk-TableMatrix-${pkgver}.tar.gz") md5sums=('6b7653d129bf1a8327054a88b58d6364') build() { - cd $srcdir/Tk-TableMatrix-$pkgver + cd Tk-TableMatrix-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete - rm -f $pkgdir/usr/lib/perl5/vendor_perl/auto/Tk/pTk/extralibs.ld +} + +package() { + cd Tk-TableMatrix-${pkgver} + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete + + rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Tk/pTk/extralibs.ld } diff --git a/community/perl-www-curl/PKGBUILD b/community/perl-www-curl/PKGBUILD index fdae94bee..ba9fcc3f1 100644 --- a/community/perl-www-curl/PKGBUILD +++ b/community/perl-www-curl/PKGBUILD @@ -1,23 +1,32 @@ -# $Id: PKGBUILD 35718 2010-12-22 01:29:59Z tdziedzic $ +# $Id: PKGBUILD 47564 2011-05-23 19:59:27Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=perl-www-curl -pkgver=4.12 -pkgrel=2 +pkgver=4.15 +pkgrel=1 pkgdesc="Perl/CPAN Module WWW::Curl" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/WWW-Curl/" license=("GPL" "PerlArtistic") depends=("curl") -source=("http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-$pkgver.tar.gz") -md5sums=('b7f0eaf81b118d9a9b4e94b40aa40543') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-${pkgver}.tar.gz") +md5sums=('31c0b8c7e5e2d26bcc8213d702186d5f') build() { - cd $srcdir/WWW-Curl-$pkgver + cd WWW-Curl-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete +} + +package() { + cd WWW-Curl-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete } diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD index dbfb8ca26..38d4fd63f 100644 --- a/community/perl-xml-libxml/PKGBUILD +++ b/community/perl-xml-libxml/PKGBUILD @@ -2,7 +2,7 @@ pkgname=perl-xml-libxml pkgver=1.70 -pkgrel=3 +pkgrel=4 pkgdesc="Interface to the libxml library" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/XML-LibXML" @@ -12,19 +12,21 @@ provides=('perl-libxml' 'perl-xml-libxml-common') replaces=('perl-libxml' 'perl-xml-libxml-common') conflicts=('perl-libxml' 'perl-xml-libxml-common') install=perl-xml-libxml.install -options=('!emptydirs') source=(http://www.cpan.org/authors/id/P/PA/PAJAS/XML-LibXML-$pkgver.tar.gz) md5sums=('33d4294f708e20c298cfe534d1166844') build() { - cd $srcdir/XML-LibXML-$pkgver + cd $srcdir/XML-LibXML-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } +check() { + cd $srcdir/XML-LibXML-$pkgver + make test +} + package() { - cd $srcdir/XML-LibXML-$pkgver + cd $srcdir/XML-LibXML-$pkgver make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete } diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD index f982ee279..de58675ec 100644 --- a/community/perl-xml-libxslt/PKGBUILD +++ b/community/perl-xml-libxslt/PKGBUILD @@ -3,14 +3,14 @@ pkgname=perl-xml-libxslt pkgver=1.70 -pkgrel=4 +pkgrel=5 pkgdesc="Interface to the gnome libxslt library " arch=('i686' 'x86_64') url="http://search.cpan.org/dist/XML-LibXSLT" license=('GPL') depends=('perl-xml-libxml' 'libxslt') -options=('!emptydirs') source=(http://www.cpan.org/authors/id/P/PA/PAJAS/XML-LibXSLT-$pkgver.tar.gz) +md5sums=('c63a7913999de076e5c911810f69b392') build() { cd $srcdir/XML-LibXSLT-$pkgver @@ -18,11 +18,13 @@ build() { make } +check () { + cd $srcdir/XML-LibXSLT-$pkgver + make test +} + package() { cd $srcdir/XML-LibXSLT-$pkgver make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete } -md5sums=('c63a7913999de076e5c911810f69b392') diff --git a/community/perl-xmms/PKGBUILD b/community/perl-xmms/PKGBUILD index 050f81bda..053086167 100644 --- a/community/perl-xmms/PKGBUILD +++ b/community/perl-xmms/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 35727 2010-12-22 01:34:30Z tdziedzic $ +# $Id: PKGBUILD 47561 2011-05-23 19:55:02Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Georg Grabler <ggrabler@gmail.com> pkgname=perl-xmms pkgver=0.12 -pkgrel=5 +pkgrel=6 pkgdesc="Bundle::Xmms - Bundle for xmms remote control shell" arch=('i686' 'x86_64') url="http://search.cpan.org/~dougm/Xmms-Perl/" diff --git a/community/pork/PKGBUILD b/community/pork/PKGBUILD index c10aec036..53946b6e1 100644 --- a/community/pork/PKGBUILD +++ b/community/pork/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 24954 2010-08-29 19:25:12Z jlichtblau $ +# $Id: PKGBUILD 47556 2011-05-23 19:46:39Z tdziedzic $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=pork pkgver=0.99.8.1 -pkgrel=3 +pkgrel=4 pkgdesc="Console-based AOL Instant Messenger & IRC client" arch=('i686' 'x86_64') url="http://dev.ojnk.net/" @@ -14,13 +14,16 @@ source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.g md5sums=('0c720db7e4e843aeee0fa53ade7cdffd') build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr + cd $pkgname-$pkgver + + ./configure \ + --prefix=/usr + make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR=${pkgdir} install -}
\ No newline at end of file +} diff --git a/community/python-gnutls/PKGBUILD b/community/python-gnutls/PKGBUILD index 5eca1eea7..0c6280609 100644 --- a/community/python-gnutls/PKGBUILD +++ b/community/python-gnutls/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 26275 2010-09-14 14:29:54Z schuay $ +# $Id: PKGBUILD 50350 2011-06-28 14:23:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hugo Doria <hugo@archlinux.org> # Contributor: N3RD3X <n3rd3x@linuxmail.org> pkgname=python-gnutls -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="Python wrapper for the GNUTLS library" arch=('i686' 'x86_64') url="http://cheeseshop.python.org/pypi/python-gnutls" depends=('python2' 'gnutls') license=('LGPL') source=(http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('18a7b92abdc1598b916d7ff5019b72bf') +md5sums=('b02d29b47830bbd8aec0b13206c2800e') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD index 99dae87f7..8806d5b01 100644 --- a/community/qtfm/PKGBUILD +++ b/community/qtfm/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Wittfella <wittfella@wittfella.com> pkgname=qtfm -pkgver=4.9 +pkgver=5.0 pkgrel=1 pkgdesc="A lightweight file manager" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="http://www.qtfm.org" license=('GPL') depends=('qt') source=(http://www.qtfm.org/$pkgname-$pkgver.tar.gz) -md5sums=('09e4e09f4d18c9967e65249f8b509522') +md5sums=('ad8e6d2d1533b2b1327cda557251a35d') build() { cd "$startdir/src/$pkgname-$pkgver" diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 4f46232cf..abdd3f8fc 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.28.00d -pkgrel=2 +pkgver=5.28.00e +pkgrel=1 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') url='http://root.cern.ch' @@ -17,7 +17,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'rootd' 'root.desktop' 'root.xml') -md5sums=('53505fcb256df38526d446916e6efc15' +md5sums=('e023538c046ebdde7f93284b5f6511e2' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' 'ac61b17395d75a2705fefa2ef841a6bf' @@ -58,9 +58,6 @@ build() { # move from aur #--disable-builtin-afterimage \ - #--with-python-incdir=/usr/include/python2.7/Python.h \ - #--with-python-libdir=/usr/lib/libpython2.7.so - make } diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index 3e745df7f..1aac5c75d 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 15902 2010-04-17 20:44:11Z spupykin $ +# $Id: PKGBUILD 50327 2011-06-28 11:35:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=simgear pkgver=2.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." arch=(i686 x86_64) depends=('glut' 'freealut' 'plib' 'openscenegraph') @@ -19,6 +19,10 @@ md5sums=('414bea545ea1e8ce17e4aa0809159cec') build() { cd $startdir/src/SimGear-$pkgver ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $startdir/src/SimGear-$pkgver make DESTDIR=$startdir/pkg install } diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index 5ba8968d1..59cbb4d36 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44500 2011-04-07 20:45:19Z spupykin $ +# $Id: PKGBUILD 50309 2011-06-28 09:32:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat -pkgver=10.0.0 -pkgrel=2 +pkgver=10.0.1 +pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64') url="http://pagesperso-orange.fr/sebastien.godard/" @@ -15,23 +15,24 @@ optdepends=('tk: to use isag' options=(zipman) source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat) -md5sums=('accc17cc1fa855be6b27def77dd92a0d' +md5sums=('a8b12230452dc0e0b6cae5fd5ec3c579' 'ad46159609a2c13b4a46b506ff847bf6') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr \ --mandir=/usr/share/man \ --enable-install-isag \ --disable-man-group make - make DESTDIR=$pkgdir install +} +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install install -D -m 644 sysstat.sysconfig $pkgdir/etc/sysstat/sysstat install -D -m 744 cron/sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat - chown -R root:root $pkgdir } diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 4ab5fde5d..3aacd232f 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48620 2011-06-03 13:51:59Z ibiru $ +# $Id: PKGBUILD 50314 2011-06-28 09:33:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=29.0.3 -pkgrel=2 +pkgver=30.0.0 +pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64') url="http://tea-editor.sourceforge.net/" @@ -16,12 +16,11 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/tea-editor/${pkgname}-${pkgver}.tar.bz2 tea.desktop) -md5sums=('1c900e7f57a0fe72fb4cc481450a5b32' +md5sums=('07508b4972403fc7c3a72169700e6157' '377ace3363124f4c086de0babb820761') build() { cd "${srcdir}/${pkgname}-${pkgver}" - qmake PREFIX=/usr/bin make } @@ -29,7 +28,6 @@ build() { package(){ cd "${srcdir}/${pkgname}-${pkgver}" make INSTALL_ROOT="${pkgdir}" install - install -Dm644 "${srcdir}/tea.desktop" "${pkgdir}/usr/share/applications/tea.desktop" install -Dm644 icons/tea_icon_v2.png "${pkgdir}/usr/share/pixmaps/tea.png" } diff --git a/community/wml/PKGBUILD b/community/wml/PKGBUILD index e5ec882a6..2f7a3781f 100644 --- a/community/wml/PKGBUILD +++ b/community/wml/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 30972 2010-10-24 14:22:26Z ibiru $ +# $Id: PKGBUILD 47762 2011-05-25 13:41:49Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=wml pkgver=2.0.11 -pkgrel=5 +pkgrel=6 pkgdesc="The Website Meta Language" arch=('i686' 'x86_64') url="http://thewml.org/" license=('GPL') -depends=('perl' 'libpng' 'gdbm' 'db>=4.8.24' 'ncurses') +depends=('perl' 'libpng' 'gdbm' 'db' 'ncurses') makedepends=('lynx') source=("http://thewml.org/distrib/${pkgname}-${pkgver}.tar.gz") md5sums=('a26feebf4e59e9a6940f54c69dde05b5') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} # missing Perl modules fix sed -i 's/PREFIX=$(libdir)\/perl/DESTDIR=\.\.\/\.\.\/\.\.\/\.\.\/pkg\/ PREFIX=$(libdir)\/perl/' wml_common/Makefile.in sed -i 's/$(MAKE) pure_perl_install $(MM_INSTALL_OPTS)/$(MAKE) pure_perl_install/' wml_common/Makefile.in unset LDFLAGS - ./configure --prefix=/usr + ./configure \ + --prefix=/usr # compile fixhack sed -i 's#/usr/lib/perl5/core_perl/auto/DynaLoader/DynaLoader.a##' wml_backend/p3_eperl/Makefile @@ -28,8 +29,13 @@ build() { sed -i 's|strip $dsttmp|#strip $dsttmp|' etc/shtool mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib/wml/exec ${pkgdir}/usr/man/man{1,3,7} ${pkgdir}/usr/man/cat{1,7} -# make clean || return 1 +# make clean make +} + +package() { + cd ${pkgname}-${pkgver} + make prefix=${pkgdir}/usr install [ -d ${pkgdir}/usr/man ] && mkdir -p ${pkgdir}/usr/share && mv ${pkgdir}/usr/man ${pkgdir}/usr/share diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index abefc073f..0bc108944 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44397 2011-04-07 02:06:55Z kchen $ +# $Id: PKGBUILD 47765 2011-05-25 13:51:21Z tdziedzic $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc pkgver=0.098 -pkgrel=2 +pkgrel=3 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') @@ -13,21 +13,28 @@ arch=('i686' 'x86_64') depends=('c-ares' 'gcc-libs' 'openssl') makedepends=('swig' 'tcl' 'python' 'perl' 'cyrus-sasl') optdepends=('tcl: modtcl module' - 'python: modpython module' - 'perl: modperl module' - 'cyrus-sasl: saslauth module') + 'python: modpython module' + 'perl: modperl module' + 'cyrus-sasl: saslauth module') -md5sums=('38eec4f1911a68b4d2fc704170e7cbf6') -source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz") +source=("http://znc.in/releases/znc-${pkgver}.tar.gz") +md5sums=('5667b4acb1f01309d6eded77abac700c') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd znc-${pkgver} + ./configure --prefix=/usr \ --enable-sasl \ --enable-tcl \ --enable-python \ --enable-perl \ --enable-extra - make; make DESTDIR="$pkgdir" install + + make +} + +package() { + cd znc-${pkgver} + + make DESTDIR=${pkgdir} install } -md5sums=('5667b4acb1f01309d6eded77abac700c') diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index bcfd44008..790948675 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 126772 2011-06-07 07:37:01Z allan $ +# $Id: PKGBUILD 129398 2011-06-27 11:06:48Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils -pkgver=2.21 -pkgrel=9 -_date=20110605 +pkgver=2.21.1 +pkgrel=1 +_date=20110627 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils/" license=('GPL') groups=('base') depends=('glibc>=2.14' 'zlib') -makedepends=('dejagnu') +checkdepends=('dejagnu') options=('!libtool' '!distcc' '!ccache') install=binutils.install source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('a2e7784d5d66c1d692a0a1fa248ea66c') +md5sums=('2face559e80d649ba148e42bb2d1fb0f') mksource() { mkdir ${pkgname}-${_date} @@ -40,7 +40,7 @@ build() { --enable-plugins --enable-threads \ --enable-shared $CONFIGFLAG - # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. + # check the host environment and makes sure all the necessary tools are available make configure-host make tooldir=${pkgdir}/usr diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index cedbfa948..743c0fe49 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 126776 2011-06-07 08:00:51Z allan $ +# $Id: PKGBUILD 129471 2011-06-28 04:17:45Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.6.0 -pkgrel=7 -_snapshot=4.6-20110603 +pkgver=4.6.1 +pkgrel=1 +#_snapshot=4.6-20110603 _libstdcppmanver=20110201 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'dejagnu') +makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada') +checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('c97d52b2b4e6c8c5cf665ae3eb9e8e49' +md5sums=('c57a9170c677bf795bdc04ed796ca491' '1e9fd2eaf0ee47ea64e82c48998f1999' '4030ee1c08dd1e843c0225b772360e76' '4df25b623799b148a0703eaeec8fdf3f') @@ -83,7 +84,7 @@ package_gcc-libs() { pkgdesc="Runtime libraries shipped by GCC" groups=('base') - depends=('glibc>=2.13') + depends=('glibc>=2.14') install=gcc-libs.install cd gcc-build @@ -112,7 +113,7 @@ package_gcc-libs() package_gcc() { pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21-9' 'libmpc' 'cloog' 'ppl') + depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21.1' 'libmpc' 'cloog' 'ppl') groups=('base-devel') install=gcc.install diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index 44e629e1e..980ac3408 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 116987 2011-03-27 06:40:02Z allan $ +# $Id: PKGBUILD 129474 2011-06-28 04:34:20Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,12 +6,12 @@ pkgname=libtool pkgver=2.4 -pkgrel=3 +pkgrel=4 pkgdesc="A generic library support script" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libtool" license=('GPL') -depends=('sh' 'tar' 'texinfo') +depends=('sh' 'tar' 'gcc=4.6.1') groups=('base-devel') options=('!libtool') install=libtool.install @@ -22,6 +22,10 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} make check } diff --git a/core/libtool/libtool.install b/core/libtool/libtool.install index 424c8cb88..73cf56422 100644 --- a/core/libtool/libtool.install +++ b/core/libtool/libtool.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(libtool.info libtool.info-1 libtool.info-2) post_install() { @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/core/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/core/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch new file mode 100644 index 000000000..1404460df --- /dev/null +++ b/core/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch @@ -0,0 +1,83 @@ +From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Thu, 28 Apr 2011 09:18:54 +0300 +Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in + EU::CBuilder + +Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4), +CFLAGS and LDFLAGS from the environment have overridden the Config.pm +ccflags and ldflags settings. This can cause binary incompatibilities +between the core Perl and extensions built with EU::CBuilder. + +Append to the Config.pm values rather than overriding them. +--- + .../lib/ExtUtils/CBuilder/Base.pm | 6 +++- + dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++- + 2 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +index b572312..2255c51 100644 +--- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm ++++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm +@@ -40,11 +40,13 @@ sub new { + $self->{config}{$k} = $v unless exists $self->{config}{$k}; + } + $self->{config}{cc} = $ENV{CC} if defined $ENV{CC}; +- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS}; ++ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS}) ++ if defined $ENV{CFLAGS}; + $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX}; + $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS}; + $self->{config}{ld} = $ENV{LD} if defined $ENV{LD}; +- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS}; ++ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS}) ++ if defined $ENV{LDFLAGS}; + + unless ( exists $self->{config}{cxx} ) { + my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/); +diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t +index c3bf6b5..1bb15aa 100644 +--- a/dist/ExtUtils-CBuilder/t/04-base.t ++++ b/dist/ExtUtils-CBuilder/t/04-base.t +@@ -1,7 +1,7 @@ + #! perl -w + + use strict; +-use Test::More tests => 50; ++use Test::More tests => 64; + use Config; + use Cwd; + use File::Path qw( mkpath ); +@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args, + "_prepare_mksymlists_args(): got expected arguments for Mksymlists", + ); + ++my %testvars = ( ++ CFLAGS => 'ccflags', ++ LDFLAGS => 'ldflags', ++); ++ ++while (my ($VAR, $var) = each %testvars) { ++ local $ENV{$VAR}; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "honours $var from Config.pm"); ++ ++ $ENV{$VAR} = "-foo -bar"; ++ $base = ExtUtils::CBuilder::Base->new( quiet => 1 ); ++ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" ); ++ isa_ok( $base, 'ExtUtils::CBuilder::Base' ); ++ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/, ++ "honours $VAR from the environment"); ++ like($base->{config}{$var}, qr/\Q$Config{$var}/, ++ "doesn't override $var from Config.pm with $VAR from the environment"); ++} ++ + ##### + + for ($source_file, $object_file, $lib_file) { +-- +1.7.4.4 + diff --git a/core/perl/ChangeLog b/core/perl/ChangeLog index 2de069d5d..9add39e20 100644 --- a/core/perl/ChangeLog +++ b/core/perl/ChangeLog @@ -1,3 +1,19 @@ +2011-06-22 Angel Velasquez <angvp@archlinux.org> + * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS + * Fixed #FS22197, FS#22441, FS#24767 + * Rebuilt perl 5.14.1-2 against db 5.2.28 + +2011-06-16 Angel Velasquez <angvp@archlinux.org> + * Fixed #FS24660 + * Rebuilt against db 5.2.28 + +2011-05-16 Angel Velasquez <angvp@archlinux.org> + * perl 5.14.0 + * Removed patch for h2ph warning from 5.12.3 + * Removed provides array, you can use corelist -v 5.14.0 to know the + modules included with the perl core, through Module::CoreList (thx j3nnn1 + for the tip) + 2010-11-07 kevin <kevin@archlinux.org> * perl 5.12.2-1 diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 37f3a0e91..8f6af76c0 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,136 +1,28 @@ -# $Id: PKGBUILD 107935 2011-01-27 21:58:49Z angvp $ -# Maintainer: kevin <kevin.archlinux.org> +# $Id: PKGBUILD 128400 2011-06-23 21:11:34Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> # Contributor: francois <francois.archlinux.org> pkgname=perl -pkgver=5.12.3 +pkgver=5.14.1 pkgrel=1 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') url="http://www.perl.org" groups=('base') -depends=('gdbm' 'db>=4.8' 'coreutils' 'glibc' 'sh') +depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') changelog=ChangeLog -source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh fix-h2ph-and-tests.patch) +source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 +perlbin.sh +perlbin.csh +0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch) install=perl.install -provides=( -perl-archive-extract=0.38 -perl-archive-tar=1.54 -perl-attribute-handlers=0.87 -perl-autodie=2.06_01 -perl-autoloader=5.70 -perl-base=2.15 -perl-b-debug=1.12 -perl-bignum=0.23 -perl-b-lint=1.11_01 -perl-cgi=3.49 -perl-class-isa=0.36 -perl-compress-raw-bzip2=2.024 -perl-compress-raw-zlib=2.024 -perl-constant=1.20 -perl-cpan=1.94_56 -perl-cpanplus=0.90 -perl-cpanplus-dist-build=0.46 -perl-data-dumper=2.125 -perl-db_file=1.820 -perl-devel-dprof=20080331.00 -perl-devel-peek=1.04 -perl-devel-ppport=3.19 -perl-digest=1.16 -perl-digest-md5=2.39 -perl-digest-sha=5.47 -perl-encode=2.39 -perl-encoding-warnings=0.11 -perl-exporter=5.64_01 -perl-extutils-cbuilder=0.27 -perl-extutils-command=1.16 -perl-extutils-constant=0.22 -perl-extutils-embed=1.28 -perl-extutils-install=1.55 -perl-extutils-makemaker=6.56 -perl-extutils-manifest=1.57 -perl-extutils-parsexs=2.21 -perl-file-fetch=0.24 -perl-file-path=2.08_01 -perl-file-temp=0.22 -perl-filter=1.37 -perl-filter-simple=0.84 -perl-getopt-long=2.38 -perl-if=0.05 -perl-io=1.25_02 -perl-io-compress=2.024 -perlio-via-quotedprint=0.06 -perl-io-zlib=1.10 -perl-ipc-cmd=0.54 -perl-ipc-sysv=2.01 -perl-libnet=1.22 -perl-locale-codes=2.07 -perl-locale-maketext=1.14 -perl-locale-maketext-simple=0.21 -perl-log-message=0.02 -perl-log-message-simple=0.06 -perl-math-bigint=1.89_01 -perl-math-bigint-fastcalc=0.19 -perl-math-bigrat=0.24 -perl-math-complex=1.56 -perl-memoize=1.01_03 -perl-mime-base64=3.08 -perl-module-build=0.3603 -perl-module-corelist=2.29 -perl-module-load=0.16 -perl-module-load-conditional=0.34 -perl-module-loaded=0.06 -perl-module-pluggable=3.9 -perl-net-ping=2.36 -perl-next=0.64 -perl-object-accessor=0.36 -perl-package-constants=0.02 -perl-params-check=0.26 -perl-parent=0.223 -perl-parse-cpan-meta=1.40 -perl-pathtools=3.31 -perl-pod-escapes=1.04 -perl-pod-latex=0.58 -perl-podlators=2.3.1 -perl-pod-parser=1.37 -perl-pod-perldoc=3.15_02 -perl-pod-plainer=1.02 -perl-pod-simple=3.14 -perl-safe=2.27 -perl-scalar-list-utils=1.22 -perl-selfloader=1.17 -perl-shell=0.72_01 -perl-storable=2.22 -perl-switch=2.16 -perl-sys-syslog=0.27 -perl-term-ansicolor=2.02 -perl-term-cap=1.12 -perl-term-ui=0.20 -perl-test=1.25_02 -perl-test-harness=3.17 -perl-test-simple=0.94 -perl-text-balanced=2.02 -perl-text-parsewords=3.27 -perl-text-soundex=3.03_01 -perl-text-tabs+wraps=2009.0305 -perl-thread-queue=2.11 -perl-threads=1.75 -perl-thread-semaphore=2.09 -perl-threads-shared=1.32 -perl-tie-file=0.97_02 -perl-tie-refhash=1.38 -perl-time-hires=1.9719 -perl-time-local=1.1901_01 -perl-time-piece=1.15_01 -perl-unicode-collate=0.52_01 -perl-unicode-normalize=1.03 -perl-version=0.82 -perl-win32=0.39 -perl-win32api-file=0.1101 -perl-xsloader=0.10 -) options=('!makeflags' '!purge') +md5sums=('97cd306a2c22929cc141a09568f43bb0' + '5ed2542fdb9a60682f215bd33701e61a' + 'd76445605c49886c77734446247e439d' + 'c25d86206d649046538c3daab7874564') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -154,9 +46,9 @@ build() { -Dsitescript=/usr/bin/site_perl \ -Dvendorscript=/usr/bin/vendor_perl \ -Dinc_version_list=none \ - -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} - #-Dotherlibdirs=/usr/lib/perl5/site_perl/5.10.1:/usr/share/perl5/site_perl/5.10.1:/usr/lib/perl5/current:/usr/lib/perl5/site_perl/current \ - patch -Np1 -i $srcdir/fix-h2ph-and-tests.patch + -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \ + -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}" + patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch make } package() { @@ -183,9 +75,12 @@ package() { -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm - # Profile script so set paths to perl scripts. + # Profile script to set paths to perl scripts. install -D -m755 ${srcdir}/perlbin.sh \ ${pkgdir}/etc/profile.d/perlbin.sh + # Profile script to set paths to perl scripts on csh. (FS#22441) + install -D -m755 ${srcdir}/perlbin.csh \ + ${pkgdir}/etc/profile.d/perlbin.csh (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) @@ -202,7 +97,7 @@ package() { done find $pkgdir/usr/lib -name *.pod -delete find $pkgdir -name .packlist -delete + # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660) + install -dv ${pkgdir}/etc/ld.so.conf.d + echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf } -md5sums=('72f3f7e1c700e79bbf9d9279ca5b42d9' - 'f86eb0dba1638ca6d1c8fff1b06c2a71' - '294b5311cbfc50e7dcffbee85854da38') diff --git a/core/perl/perlbin.csh b/core/perl/perlbin.csh new file mode 100644 index 000000000..cc0d5d553 --- /dev/null +++ b/core/perl/perlbin.csh @@ -0,0 +1,17 @@ +# Set path to perl scriptdirs if they exist +# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts +# Added /usr/bin/*_perl dirs for scripts +# Remove /usr/lib/perl5/*_perl/bin in next release + +[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH +${PATH}:/usr/lib/perl5/site_perl/bin + +[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH +${PATH}:/usr/lib/perl5/vendor_perl/bin + +[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl + +# If you have modules in non-standard directories you can add them here. +#export PERLLIB=dir1:dir2 diff --git a/core/perl/perlbin.sh b/core/perl/perlbin.sh index 09811a8b4..20f830436 100755 --- a/core/perl/perlbin.sh +++ b/core/perl/perlbin.sh @@ -3,18 +3,13 @@ # Added /usr/bin/*_perl dirs for scripts # Remove /usr/lib/perl5/*_perl/bin in next release -[ -d /usr/bin/site_perl ] && - PATH=$PATH:/usr/bin/site_perl -[ -d /usr/lib/perl5/site_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/site_perl/bin +[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin -[ -d /usr/bin/vendor_perl ] && - PATH=$PATH:/usr/bin/vendor_perl -[ -d /usr/lib/perl5/vendor_perl/bin ] && - PATH=$PATH:/usr/lib/perl5/vendor_perl/bin +[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin -[ -d /usr/bin/core_perl ] && - PATH=$PATH:/usr/bin/core_perl +[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl export PATH diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index 0ed221910..765b76685 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 111803 2011-03-01 02:29:23Z allan $ +# $Id: PKGBUILD 129370 2011-06-27 05:49:47Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,13 +6,15 @@ pkgname=readline _basever=6.2 _patchlevel=001 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=1 +pkgrel=2 pkgdesc="GNU readline library" arch=('i686' 'x86_64') url="http://tiswww.case.edu/php/chet/readline/rltop.html" license=('GPL') depends=('glibc' 'ncurses') backup=('etc/inputrc') +options=('!emptydirs') +install=readline.install source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz inputrc) if [ $_patchlevel -gt 00 ]; then diff --git a/core/readline/readline.install b/core/readline/readline.install index a8ffe80c6..06b646f23 100644 --- a/core/readline/readline.install +++ b/core/readline/readline.install @@ -1,17 +1,13 @@ infodir=usr/share/info filelist=(history.info readline.info rluserman.info) -post_install() { +post_upgrade() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do install-info $infodir/$file.gz $infodir/dir 2> /dev/null done } -post_upgrade() { - post_install $1 -} - pre_remove() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do diff --git a/extra/botan/PKGBUILD b/extra/botan/PKGBUILD index 89e0dd396..2d05b70e8 100644 --- a/extra/botan/PKGBUILD +++ b/extra/botan/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98518 2010-11-10 20:05:00Z angvp $ +# $Id: PKGBUILD 128341 2011-06-23 05:31:14Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: d'Ronin <daronin@2600.com> pkgname=botan -pkgver=1.8.11 +pkgver=1.10.0 pkgrel=1 pkgdesc="BSD-licensed crypto library written in C++" license=('BSD') @@ -12,14 +12,17 @@ url="http://botan.randombit.net/" depends=('gcc-libs' 'sh') makedepends=('python2') source=(http://files.randombit.net/botan/Botan-${pkgver}.tgz) -options=('force') -md5sums=('ccb2c3cb8a324214a89b45a03422870b') +md5sums=('1f03a6a84f402a12e50665868dddae99') build() { cd ${srcdir}/Botan-${pkgver} sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' configure.py ./configure.py --prefix=/usr make +} + +package() { + cd ${srcdir}/Botan-${pkgver} make DESTDIR=${pkgdir}/usr install } diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD index aa8a93a81..b697e5e16 100644 --- a/extra/cairo-perl/PKGBUILD +++ b/extra/cairo-perl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 104389 2011-01-02 04:22:32Z kevin $ +# $Id: PKGBUILD 124873 2011-05-24 21:13:32Z remy $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cairo-perl _realname=Cairo pkgver=1.061 -pkgrel=3 +pkgrel=4 pkgdesc="Perl wrappers for cairo" arch=(i686 x86_64) license=('LGPL') url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') -depends=('cairo>=1.8.10' 'perl>=5.12.1') +depends=('cairo>=1.8.10' 'perl>=5.14') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) md5sums=('08cd5e847f61858651fc4de769066e88') @@ -21,6 +21,11 @@ build() { make } +check() { + cd "${srcdir}/${_realname}-${pkgver}" + make test || true +} + package() { cd "${srcdir}/${_realname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD index 1b6a58831..9d233d726 100644 --- a/extra/claws-mail-extra-plugins/PKGBUILD +++ b/extra/claws-mail-extra-plugins/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 121174 2011-04-29 06:49:28Z andyrtr $ +# $Id: PKGBUILD 125144 2011-05-25 19:01:27Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Mildred <mildred593 at online dot fr> pkgname=claws-mail-extra-plugins pkgver=3.7.9 -pkgrel=3 +pkgrel=4 pkgdesc="Extra plugins for claws-mail" url="http://www.claws-mail.org/plugins.php?branch=EXT" license=('GPL3') diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index c717425a3..b9f3effa8 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127716 2011-06-17 19:45:36Z andyrtr $ +# $Id: PKGBUILD 129509 2011-06-28 15:26:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.4.6 -pkgrel=4 +pkgver=1.4.7 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" @@ -14,7 +14,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-avahi.patch cups cups.logrotate cups.pam) #options=('!emptydirs') -md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1' +md5sums=('1590033ab4c739b859aeb672fe849089' '8ebd390197501ffd709f0ee546937fd5' '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' diff --git a/extra/dvdrip/PKGBUILD b/extra/dvdrip/PKGBUILD index 03283687d..119a2a1d9 100644 --- a/extra/dvdrip/PKGBUILD +++ b/extra/dvdrip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110171 2011-02-17 08:54:21Z giovanni $ +# $Id: PKGBUILD 126069 2011-06-01 10:23:05Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Fredrik Hammar <Horney_C86@Hotmail.com> pkgname=dvdrip pkgver=0.98.11 -pkgrel=6 +pkgrel=8 pkgdesc="A Gtk frontend for transcode writen in Perl" arch=('i686' 'x86_64') license=('custom') @@ -16,26 +16,25 @@ optdepends=('ogmtools: for ogm/odd video creation' 'lsdvd: fast reading of DVD table') source=(http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz \ ${pkgname}.desktop) -options=(!emptydirs) +options=('!emptydirs' '!makeflags') md5sums=('6dfa4199d451757a37eea233a07da4c0' 'e91cf411928fd0500d07a0022b4ef546') build() { - export MAKEFLAGS="-j1" cd "${srcdir}/${pkgname}-${pkgver}" # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make install DESTDIR="${pkgdir}" + make install DESTDIR="${pkgdir}" # remove perllocal.pod and .packlist find ${pkgdir} -name perllocal.pod -delete find ${pkgdir} -name .packlist -delete - install -Dm644 ${srcdir}/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 ${srcdir}/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/dvdrip/dvdrip.install b/extra/dvdrip/dvdrip.install index 4cd6160c4..e111ef946 100644 --- a/extra/dvdrip/dvdrip.install +++ b/extra/dvdrip/dvdrip.install @@ -1,19 +1,11 @@ -# this is the scrollkeeper handling sample file - post_install() { - echo "update desktop mime database..." update-desktop-database -q } post_upgrade() { - post_install $1 -} - -pre_remove() { - /bin/true + post_install } post_remove() { - echo "update desktop mime database..." - update-desktop-database -q + post_install } diff --git a/extra/frozen-bubble/PKGBUILD b/extra/frozen-bubble/PKGBUILD index 883852aa4..fb21cbd21 100644 --- a/extra/frozen-bubble/PKGBUILD +++ b/extra/frozen-bubble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112696 2011-03-06 00:54:34Z heftig $ +# $Id: PKGBUILD 127529 2011-06-15 21:23:24Z remy $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Brandon Niemczyk <maccorin@cfl.rr.com> @@ -6,7 +6,7 @@ pkgname=frozen-bubble _pkgver=2.2.1-beta1 pkgver=${_pkgver/-/} -pkgrel=1 +pkgrel=3 pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles" arch=(i686 x86_64) url="http://www.frozen-bubble.org" @@ -19,13 +19,22 @@ source=(http://www.frozen-bubble.org/data/$pkgname-$_pkgver.tar.bz2 \ md5sums=('825cc23ed806838b9d86de9982a5687a' '01b10b77ba6ad856f5c199121c582272') -package() { +build() { cd "$srcdir/$pkgname-$_pkgver" + unset CFLAGS # install module in vendor directories - perl Build.PL installdirs=vendor destdir="$pkgdir" - + perl Build.PL installdirs=vendor perl Build - perl Build install +} + +check() { + cd "$srcdir/$pkgname-$_pkgver" + perl Build test +} + +package() { + cd "$srcdir/$pkgname-$_pkgver" + perl Build install destdir="$pkgdir" install -D -m644 share/icons/frozen-bubble-icon-64x64.png "$pkgdir/usr/share/pixmaps/frozen-bubble.png" install -D -m644 "$srcdir/frozen-bubble.desktop" "$pkgdir/usr/share/applications/frozen-bubble.desktop" diff --git a/extra/gconf-perl/PKGBUILD b/extra/gconf-perl/PKGBUILD index c95f1eba2..e4f58af63 100644 --- a/extra/gconf-perl/PKGBUILD +++ b/extra/gconf-perl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 104906 2011-01-05 14:35:54Z jgc $ +# $Id: PKGBUILD 124841 2011-05-24 18:04:05Z remy $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gconf-perl _realname=Gnome2-GConf pkgver=1.044 -pkgrel=4 +pkgrel=5 pkgdesc="Gnome2-GConf perl bindings for gconf" arch=('i686' 'x86_64') license=('LGPL') url="http://gtk2-perl.sourceforge.net/" makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('glib-perl' 'gconf' 'perl') +depends=('glib-perl' 'gconf' 'perl>=5.14') options=(!emptydirs) source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) md5sums=('ea386003b18f067524833b0eeb271330') @@ -19,5 +19,14 @@ build() { cd "${srcdir}/${_realname}-${pkgver}" perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + dbus-launch --exit-with-session make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index 8299a770e..1c1cd9e7e 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 127501 2011-06-15 15:14:38Z ibiru $ +# $Id: PKGBUILD 129483 2011-06-28 07:59:13Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 -pkgver=2.23.4 +pkgver=2.23.5 pkgrel=1 pkgdesc="An image loading library for gtk2" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.xz) -sha256sums=('66140dda9fb51b3f3d3612db837e82dcdd830cd83809f1feb92154a146b486d7') +sha256sums=('7a6c3550426f38f6b0eeeb49295654d9e706ce8f1786a4d0932f9d2c0d0bc500') build() { cd "${srcdir}/gdk-pixbuf-${pkgver}" diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index f03e2c7ea..e4ae40280 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 124414 2011-05-20 16:19:11Z dan $ +# $Id: PKGBUILD 129435 2011-06-27 17:14:23Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.5.2 +pkgver=1.7.6 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) url="http://git-scm.com/" license=('GPL2') -depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.12.2') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0') makedepends=('python2' 'emacs') optdepends=('tk: gitk and git gui' 'perl-libwww: git svn' @@ -47,7 +47,7 @@ package() { INSTALLDIRS=vendor DESTDIR="$pkgdir" install # bash completion - mkdir -p $pkgdir/etc/bash_completion.d/ + mkdir -p "$pkgdir"/etc/bash_completion.d/ install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git # more contrib stuff cp -a ./contrib $pkgdir/usr/share/git/ @@ -75,11 +75,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('f79ab8fe79b35346b499f131cbf381a4' - '43fc5538f137231f5c96e7da5eb6c934' +md5sums=('9e0a438eb71e89eedb61f89470ed32a0' + 'a017935cf9e90d9f056b6547c318fd15' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('65dbb9789a1ff8aa7e4f7e156b9ce36ef101810608ed55a297156348d70f9349' - '8521210a77809d189a3fe72e2bd13df50ecf8ec58e7098ec1655dfdb4086b6ca' +sha256sums=('778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082' + 'a0ffd7e16997262ef741db5e2dd8eabf44b6767cf1a213753c7d8a268b4553ad' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/glade-perl/PKGBUILD b/extra/glade-perl/PKGBUILD index aa8e6ed13..96d77bced 100644 --- a/extra/glade-perl/PKGBUILD +++ b/extra/glade-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104918 2011-01-05 15:15:03Z jgc $ +# $Id: PKGBUILD 125153 2011-05-25 19:04:01Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glade-perl _realname=Gtk2-GladeXML pkgver=1.007 -pkgrel=3 +pkgrel=4 pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD index 4b57e3065..89610fe1e 100644 --- a/extra/glib-perl/PKGBUILD +++ b/extra/glib-perl/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 104386 2011-01-02 04:08:45Z kevin $ +# $Id: PKGBUILD 124651 2011-05-23 19:33:30Z remy $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=glib-perl _realname=Glib pkgver=1.223 -pkgrel=2 +pkgrel=3 pkgdesc="Perl wrappers for glib 2.x, including GObject" arch=(i686 x86_64) license=('LGPL') url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') -depends=('glib2>=2.24.1' 'perl>=5.12.1') +depends=('glib2>=2.24.1' 'perl>=5.14') makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12') source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) md5sums=('cfdeaa8c95448f86c30b505e4701abf1') @@ -20,6 +20,10 @@ build() { cd "${srcdir}/${_realname}-${pkgver}" perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" make test } diff --git a/extra/gnome-perl/PKGBUILD b/extra/gnome-perl/PKGBUILD index e4e4271a1..81f68ee25 100644 --- a/extra/gnome-perl/PKGBUILD +++ b/extra/gnome-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104940 2011-01-05 16:02:27Z jgc $ +# $Id: PKGBUILD 125159 2011-05-25 19:04:51Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-perl _realname=Gnome2 pkgver=1.042 -pkgrel=5 +pkgrel=6 pkgdesc="Perl bindings for libgnome" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/gnome-vfs-perl/PKGBUILD b/extra/gnome-vfs-perl/PKGBUILD index 5f8707948..3960f5285 100644 --- a/extra/gnome-vfs-perl/PKGBUILD +++ b/extra/gnome-vfs-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104927 2011-01-05 15:25:06Z jgc $ +# $Id: PKGBUILD 125162 2011-05-25 19:05:23Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs-perl _realname=Gnome2-VFS pkgver=1.081 -pkgrel=3 +pkgrel=4 pkgdesc="Gnome2-VFS perl bindings for gnome-vfs" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/gnomecanvas-perl/PKGBUILD b/extra/gnomecanvas-perl/PKGBUILD index da6af9368..2563caae4 100644 --- a/extra/gnomecanvas-perl/PKGBUILD +++ b/extra/gnomecanvas-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104924 2011-01-05 15:20:58Z jgc $ +# $Id: PKGBUILD 125156 2011-05-25 19:04:24Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnomecanvas-perl _realname=Gnome2-Canvas pkgver=1.002 -pkgrel=7 +pkgrel=8 pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index da011eb7c..2fd9e4799 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124498 2011-05-22 15:36:35Z ibiru $ +# $Id: PKGBUILD 125165 2011-05-25 19:05:49Z foutrelis $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric pkgver=1.10.15 -pkgrel=1 +pkgrel=2 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/gnumeric/" diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 9aa39b089..f1e8ba234 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 129240 2011-06-26 08:51:17Z bisson $ +# $Id: PKGBUILD 129245 2011-06-26 09:32:03Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.28.0 -pkgrel=3 +pkgrel=4 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') diff --git a/extra/gtk2-perl/PKGBUILD b/extra/gtk2-perl/PKGBUILD index c684e5578..215b21109 100644 --- a/extra/gtk2-perl/PKGBUILD +++ b/extra/gtk2-perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 104912 2011-01-05 15:05:46Z jgc $ +# $Id: PKGBUILD 124902 2011-05-25 01:27:30Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=gtk2-perl _realname=Gtk2 pkgver=1.222 -pkgrel=2 +pkgrel=3 pkgdesc="Gtk2-Perl allows Perl developers to write GTK+ 2.x applications." arch=(i686 x86_64) license=('LGPL') diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index fd6e7d1b6..558bd5fde 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122661 2011-05-05 21:34:04Z eric $ +# $Id: PKGBUILD 127963 2011-06-20 08:24:42Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.6.9.8 +pkgver=6.7.0.8 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -13,9 +13,9 @@ depends=('libtool' 'lcms' 'libxt' 'gcc-libs' 'bzip2' 'xz' 'freetype2' 'fontconfi makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -md5sums=('8cd5fe2bc5a29b38c24a6f9576518319' +md5sums=('67d8631c20fc9a2409343c02b159407d' 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('f5fb5844934e23bffbd0ab2a36ea4914eab0dcd0' +sha1sums=('03b8534d16aee3efc5496817f804d21964be79ad' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -25,7 +25,7 @@ build() { autoreconf patch -Np0 -i ../perlmagick.rpath.patch - ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ + LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ --enable-openmp --with-wmf --with-openexr --with-xml \ --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ --with-perl --with-perl-options="INSTALLDIRS=vendor" \ diff --git a/extra/irssi/PKGBUILD b/extra/irssi/PKGBUILD index 9fe5258a1..bba878633 100644 --- a/extra/irssi/PKGBUILD +++ b/extra/irssi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102836 2010-12-12 08:15:33Z angvp $ +# $Id: PKGBUILD 125226 2011-05-25 19:11:10Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=irssi pkgver=0.8.15 -pkgrel=4 +pkgrel=5 pkgdesc="Modular text mode IRC client with Perl scripting" arch=('i686' 'x86_64') url="http://irssi.org/" diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD index 4b8b2aca0..d2af71f19 100644 --- a/extra/jack/PKGBUILD +++ b/extra/jack/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125794 2011-05-29 20:29:19Z schiv $ +# $Id: PKGBUILD 129477 2011-06-28 06:24:10Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: tobias <tobias@archlinux.net> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=jack _longname=jack-audio-connection-kit -pkgver=0.120.2 +pkgver=0.121.1 pkgrel=1 pkgdesc="A low-latency audio server" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ provides=("$_longname=$pkgver") replaces=("$_longname") changelog=$pkgname.changelog source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz") -md5sums=('21f453676bfb9cb63a3df7e19546f0ed') +md5sums=('a51005bfd6e993af8517e19e823cf3c6') build() { cd "$srcdir/$_longname-$pkgver" @@ -32,7 +32,7 @@ build() { package() { cd "$srcdir/$_longname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/jack/jack.changelog b/extra/jack/jack.changelog index 4c3533694..47909c872 100644 --- a/extra/jack/jack.changelog +++ b/extra/jack/jack.changelog @@ -12,4 +12,4 @@ * jack.changelog : Added this changelog. - Only important things will be logged. + Only important changes will be logged. diff --git a/extra/krusader/PKGBUILD b/extra/krusader/PKGBUILD index 439c1024b..413724c27 100644 --- a/extra/krusader/PKGBUILD +++ b/extra/krusader/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 129430 2011-06-27 12:22:42Z andrea $ +# $Id: PKGBUILD 129545 2011-06-28 19:04:18Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -7,17 +7,17 @@ pkgname=krusader pkgver=2.4.0beta1 _pkgver=2.4.0-beta1 -pkgrel=2 +pkgrel=3 pkgdesc="An alternative file manager for KDE resembling Midnight Commander" arch=('i686' 'x86_64') url="http://krusader.sourceforge.net/" license=('GPL') -depends=('kdebase-runtime') +depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4' 'docbook-xsl' 'kdeutils-ark') optdepends=("kdebase-keditbookmarks: to edit bookmarks" "kdeutils-ark: extract archive with right-click") install=krusader.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2) +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2") md5sums=('d2340718d05d69e7f2a7f0846471ee12') build() { diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index e77f17db2..e4838b8c5 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127768 2011-06-18 10:02:24Z andyrtr $ +# $Id: PKGBUILD 129514 2011-06-28 15:35:00Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.3.0 +pkgver=4.3.1 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('autoconf') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3c6ff88f8c6e93ff90d8e3b054f3b086') +md5sums=('ea45acfb47b5590d4675c50dc0c6e13c') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD index 9f1126262..2622ebbd7 100644 --- a/extra/libdbusmenu-qt/PKGBUILD +++ b/extra/libdbusmenu-qt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122259 2011-05-03 14:55:26Z andrea $ +# $Id: PKGBUILD 129478 2011-06-28 07:38:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libdbusmenu-qt -pkgver=0.8.2 +pkgver=0.8.3 pkgrel=1 pkgdesc="A library that provides a Qt implementation of the DBusMenu spec" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('qt') makedepends=('cmake') source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('88be2548e00acf988c66ed3a35844f64') +md5sums=('8def56db4f58ca0a40d60807786f5912') build() { cd "${srcdir}" diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD index 935b97672..7fde7ae6d 100644 --- a/extra/libproxy/PKGBUILD +++ b/extra/libproxy/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libproxy pkgver=0.4.6 -pkgrel=6 +pkgrel=7 pkgdesc="A library that provides automatic proxy configuration management" arch=(i686 x86_64) license=('LGPL') @@ -28,7 +28,7 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DPERL_VENDORINSTALL=yes \ -DCMAKE_BUILD_TYPE=None \ - -WITH_WEBKIT=OFF \ + -DWITH_WEBKIT=OFF \ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ -DCMAKE_C_FLAGS="${CFLAGS}" \ .. diff --git a/extra/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch b/extra/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch new file mode 100644 index 000000000..31ad95d36 --- /dev/null +++ b/extra/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch @@ -0,0 +1,31 @@ +From 900baff9ff400a6eba034089ed69362c2c2d61e4 Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.cz> +Date: Wed, 22 Jun 2011 12:05:19 +0200 +Subject: [PATCH] fix configure without the optional translations module + +--- + set_soenv.in | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/set_soenv.in b/set_soenv.in +index f015bab..8e39314 100755 +--- a/set_soenv.in ++++ b/set_soenv.in +@@ -1068,9 +1068,11 @@ $XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.'; + $L10N_MODULE = PathFormat($SRC_ROOT."/translations"); + + # Check for poor help localizations, i.e. no help translation at all... +-opendir(DIR,$L10N_MODULE . "/source"); +-@languages = readdir(DIR); +-closedir(DIR); ++@languages=(); ++if (opendir(DIR,$L10N_MODULE . "/source")) ++{ @languages = readdir(DIR); ++ closedir(DIR); ++} + $WITH_POOR_HELP_LOCALIZATIONS = ""; + + foreach $language (@languages) +-- +1.7.3.4 + diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 4fd0cf1a8..4ec3d5b00 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126270 2011-06-03 14:47:40Z stephane $ +# $Id: PKGBUILD 129540 2011-06-28 18:38:58Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -24,9 +24,9 @@ pkgname=('libreoffice' 'libreoffice-sdk' 'libreoffice-extension-validator' 'libreoffice-extension-watch-window' 'libreoffice-extension-wiki-publisher') -_LOver=3.4.0.2 -pkgver=3.4.0 -pkgrel=2 +_LOver=3.4.1.3 +pkgver=3.4.1 +pkgrel=1 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" @@ -90,11 +90,10 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - buildfix_i116795.diff buildfix_boost.diff buildfix_ct2n.diff vbahelper.visibility.patch - buildfix_bison25.diff) + 0001-fix-configure-without-the-optional-translations-modu.patch) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 @@ -133,25 +132,25 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) -md5sums=('7427ddd5ae63b6ee7aa868201dfbccaa' - 'a78a8e08731213da02c65060cedc5589' - '596da255e2728faccc8f2361171270ec' - '8ed9803a34d13da1764e7523d550d6b0' - '9be46d7c4bf3a60ee8dd0a5ef3638f82' - 'b60db802866ab71c485de42e6382d1bb' - '09e374cf3bd8f07a043883393012d69b' - 'af9f25aa04dc4ef7b797f7bcc743877c' - 'ad29de786d76d67759f9d2dd574b29be' - 'ff13a8ac0ea324122b75773fd80a9245' - '6eb8f53e01da7a945ee4cd42b7297732' - '90df27d4cbf490668ce4f03ff7dba521' - 'c0ea197183564c49306a1c79ca571e51' - '91e69ed3c0be542fa7f69ca3da2d7808' - 'a81c787b2e5469c2acc9f335b2c9e52f' - 'ee1c78af6553657614b1a43adf4750ac' - 'c970d6212618fc9b34526907eb030ce6' - '6d25488c81af09d87015bf487243042f' - '9a39234a49516b7035309e28dd4f0784' +md5sums=('10b3212002688e7ce49a276c68352b50' + 'c6547ec8f971284ea1e58bb39375c500' + '26328364a0804dedab94818c15e76871' + 'd26c6ab53c9404e82e04ea366d4db261' + '132aa87f2f3e7fff62d7211a86b769f3' + '801c254c28402df0c5fb5e2615817a6d' + 'b94208fdae537f0b026ee26cede9a946' + '096e3071949d1eedf73faa13a2cf7b7e' + 'e27e715b08cc6a35988aaa6efab6cc7f' + 'e94d7adb79f38d3fd8119b712b04cc6e' + '1d2e7ca24b9fffafeaf236817fc8cbe9' + '69a9af6536607340a57b54b5562077f7' + '3b4e819497ba695f5c64a0107c2aac8d' + '5a7370a79e563f649f6bf506bc71928c' + 'c480ed571703e68d851fbbcd4aa520be' + '222cec135152c108068baa4e370a3f68' + '93524298efb472503b12ae47c95de399' + '5420c40473f8bf8e5b400dd8a1e54f02' + '1516196f023bb1ae55fd1773a8db9d16' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -191,11 +190,10 @@ md5sums=('7427ddd5ae63b6ee7aa868201dfbccaa' '9d60b6cfa3ef1926848710bbcd11115b' 'dbaafd21de055e582d92d7d32fe9da13' 'b7b2d0e04e142f26dd96119c80757d1f' - '0520d63c946e272ed3bdfc863fbdc42e' 'bc228237108cab7745897a9f466b6d39' 'eee273f501ff45dc5f1365e78c6d57c0' '43b145db28e6c0d73578ae6fd35e510d' - '4fa96e04b41a6e86774e74a972024b3e') + 'f8a8fdcc58f50560fbc266e28efdbbfe') build() { @@ -219,11 +217,10 @@ build() { cd ${srcdir}/build # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix_i116795.diff patch -Np1 -i ${srcdir}/buildfix_boost.diff patch -Np1 -i ${srcdir}/buildfix_ct2n.diff patch -Np0 -i ${srcdir}/vbahelper.visibility.patch - patch -Np0 -i ${srcdir}/buildfix_bison25.diff + patch -Np1 -i ${srcdir}/0001-fix-configure-without-the-optional-translations-modu.patch # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -461,14 +458,27 @@ package_libreoffice() { package_libreoffice-sdk() { pkgdesc="Software development kit for LibreOffice" - depends=('libreoffice' 'gcc-libs' 'sh') + depends=('libreoffice' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') cd ${srcdir}/sdk-install cp -r * ${pkgdir} cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk - mv setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix.sh - rm -f ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in + cp setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix{,.sh} + + # fix ArchLinux LIbreOffice installation paths + sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ + -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ + -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ + -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \ + -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ + -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ + -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ + -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ + -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ + -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ + -e "s,@SDK_AUTO_DEPLOYMENT@,NO," setsdkenv_unix.{csh,sh}.in #fix permissions find examples -type f -exec chmod -x {} \; } diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD index b78666e9a..96719acbb 100644 --- a/extra/mod_perl/PKGBUILD +++ b/extra/mod_perl/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 119582 2011-04-12 15:02:19Z angvp $ +# $Id: PKGBUILD 129570 2011-06-28 22:45:51Z angvp $ # Maintainer: Firmicus <francois.archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=mod_perl pkgver=2.0.5 -pkgrel=1 +pkgrel=6 pkgdesc="Apache module that embeds the Perl interpreter within the server" -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl=5.12.3' 'apache' 'db' 'apr-util') +url="http://search.cpan.org/dist/${pkgname}/" +depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid') license=('APACHE') arch=('i686' 'x86_64') options=(!emptydirs) diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index 5506932b1..42faa88a3 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112465 2011-03-05 03:33:40Z eric $ +# $Id: PKGBUILD 125239 2011-05-25 19:13:43Z foutrelis $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp pkgver=5.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64') url="http://www.net-snmp.org/" @@ -18,7 +18,8 @@ provides=('ucd-snmp') options=('!libtool' '!makeflags' '!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'snmpd.rc') -md5sums=('b4e30ead5783b0bb1d280172c6095ea4' '9f0d13676ba1fae1eb7eb178edd85b43') +md5sums=('b4e30ead5783b0bb1d280172c6095ea4' + '9f0d13676ba1fae1eb7eb178edd85b43') sha1sums=('45bbf1295253d5379a5d1efd918593160387fd00' '2c679b564a2c319d9ce2714a9776aa0e6d89c60a') build() { diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD index 45afe7624..ad489dec4 100644 --- a/extra/pango-perl/PKGBUILD +++ b/extra/pango-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104909 2011-01-05 14:41:37Z jgc $ +# $Id: PKGBUILD 124899 2011-05-25 01:24:25Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango-perl _realname=Pango pkgver=1.221 -pkgrel=3 +pkgrel=4 pkgdesc="Perl bindings for Pango" arch=(i686 x86_64) license=('LGPL') diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD index ad8557e6a..25bd18eeb 100644 --- a/extra/perl-alien-sdl/PKGBUILD +++ b/extra/perl-alien-sdl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112695 2011-03-06 00:40:04Z heftig $ +# $Id: PKGBUILD 124820 2011-05-24 15:44:07Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> @@ -8,7 +8,7 @@ pkgname=perl-alien-sdl _realname=Alien-SDL -pkgver=1.425 +pkgver=1.426 pkgrel=1 pkgdesc="Building, finding and using SDL binaries" arch=(i686 x86_64) @@ -18,7 +18,7 @@ depends=(sdl=1.2.14 perl-file-sharedir perl-capture-tiny) makedepends=(perl-file-which perl-text-patch) options=(!emptydirs) source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz) -md5sums=('c6adaa35ea0779740950de36c8a8ffe2') +md5sums=('ab5e1167934418f4a7b3285a9d05c89b') package() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/perl-bit-vector/PKGBUILD b/extra/perl-bit-vector/PKGBUILD index cbab210ac..ebdc0719d 100644 --- a/extra/perl-bit-vector/PKGBUILD +++ b/extra/perl-bit-vector/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100723 2010-11-25 17:21:16Z kevin $ +# $Id: PKGBUILD 125243 2011-05-25 19:15:01Z foutrelis $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: K. Piche <kpiche@rogers.com> pkgname=perl-bit-vector _cpanname=Bit-Vector pkgver=7.1 -pkgrel=2 +pkgrel=3 pkgdesc='Efficient bit vector, set of integers and "big int" math library' arch=(i686 x86_64) license=('GPL' 'LGPL' 'PerlArtistic') diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index fdfd5bcf3..fc142e677 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 112695 2011-03-06 00:40:04Z heftig $ +# $Id: PKGBUILD 127799 2011-06-18 15:54:27Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 pkgver=2.09 -pkgrel=1 +pkgrel=3 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64) license=(GPL2) depends=(perl bzip2) -url='http://search.cpan.org/dist/$_realname' +url="http://search.cpan.org/dist/$_realname" options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY/$_realname-$pkgver.tar.gz") md5sums=('1699fde3e86f2a036f135ae606d456bf') diff --git a/extra/perl-crypt-ssleay/PKGBUILD b/extra/perl-crypt-ssleay/PKGBUILD index 2864851a5..37f315f89 100644 --- a/extra/perl-crypt-ssleay/PKGBUILD +++ b/extra/perl-crypt-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103974 2010-12-24 20:16:07Z kevin $ +# $Id: PKGBUILD 125246 2011-05-25 19:15:29Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-crypt-ssleay pkgver=0.58 -pkgrel=2 +pkgrel=3 pkgdesc="OpenSSL glue that provides LWP https support" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Crypt-SSLeay" diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index ed01cefd8..42d22d211 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,29 +1,44 @@ -# $Id: PKGBUILD 115053 2011-03-16 15:26:25Z andrea $ +# $Id: PKGBUILD 125309 2011-05-25 19:54:00Z remy $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-dbd-mysql _realname=DBD-mysql -pkgver=4.018 -pkgrel=2 +pkgver=4.019 +pkgrel=1 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('libmysqlclient' 'perl-dbi' 'perl>=5.10.0') +depends=('libmysqlclient' 'perl-dbi' 'perl>=5.14.0') makedepends=('mysql') options=(!emptydirs) source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) -md5sums=('d1d4ee2f20910d6491d1b6216471b2f1') +md5sums=('566d98ab8ffac9626a31f6f6d455558e') build() { cd ${srcdir}/${_realname}-${pkgver} # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor + perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql make } +check() { + cd ${srcdir}/${_realname}-${pkgver} + mkdir -p /tmp/mysql_test + mysql_install_db \ + --basedir=/usr \ + --datadir=/tmp/mysql_test + mysqld -P 17999 \ + --socket=/tmp/socket.mysql \ + --datadir=/tmp/mysql_test & + sleep 10 + DAEMON_PORT=$! + make test || true + kill -9 $DAEMON_PORT +} + package() { cd ${srcdir}/${_realname}-${pkgver} make install DESTDIR=${pkgdir} diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD index e82203111..298cc2008 100644 --- a/extra/perl-dbd-sqlite/PKGBUILD +++ b/extra/perl-dbd-sqlite/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 100851 2010-11-26 00:50:08Z kevin $ +# $Id: PKGBUILD 125249 2011-05-25 19:15:53Z foutrelis $ # Contributor: Tom Killian <tomk@runbox.com> # Contributor: francois at archlinux dot org pkgname=perl-dbd-sqlite _cpanname=DBD-SQLite pkgver=1.31 -pkgrel=1 +pkgrel=2 pkgdesc="Self-contained RDBMS in a DBI driver" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/${_cpanname}" license=('GPL' 'PerlArtistic') depends=('perl-dbi>=1.61' 'sqlite3') -makedepends=('perl-pathtools>=0.82') options=('!emptydirs') source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) md5sums=('67b3575104efd606c8093bc416e3338d') diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index 3c95327b5..42f7a5770 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 105336 2011-01-07 21:29:30Z angvp $ +# $Id: PKGBUILD 124915 2011-05-25 07:47:08Z foutrelis $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Matt Thompson <mattt@defunct.ca> pkgname=perl-dbi _realname=DBI pkgver=1.616 -pkgrel=1 +pkgrel=2 pkgdesc="Database independent interface for Perl" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') diff --git a/extra/perl-digest-nilsimsa/PKGBUILD b/extra/perl-digest-nilsimsa/PKGBUILD index 31728572d..40e9ae353 100644 --- a/extra/perl-digest-nilsimsa/PKGBUILD +++ b/extra/perl-digest-nilsimsa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100551 2010-11-24 02:25:52Z kevin $ +# $Id: PKGBUILD 125252 2011-05-25 19:16:38Z foutrelis $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-nilsimsa _realname=Digest-Nilsimsa pkgver=0.06 -pkgrel=6 +pkgrel=7 pkgdesc="Perl version of Nilsimsa code." arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/perl-digest-sha1/PKGBUILD b/extra/perl-digest-sha1/PKGBUILD index 448bfb663..eaae5e528 100644 --- a/extra/perl-digest-sha1/PKGBUILD +++ b/extra/perl-digest-sha1/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100547 2010-11-24 02:18:32Z kevin $ +# $Id: PKGBUILD 125255 2011-05-25 19:17:02Z foutrelis $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-sha1 _realname=Digest-SHA1 pkgver=2.13 -pkgrel=1 +pkgrel=2 pkgdesc="Perl interface to the SHA-1 Algorithm" arch=(i686 x86_64) license=('PerlArtistic') diff --git a/extra/perl-event/PKGBUILD b/extra/perl-event/PKGBUILD index a2c36f9aa..3e20ec4c2 100644 --- a/extra/perl-event/PKGBUILD +++ b/extra/perl-event/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 100545 2010-11-24 01:37:38Z kevin $ +# $Id: PKGBUILD 125258 2011-05-25 19:17:24Z foutrelis $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: François Charette <francois.archlinux.org> pkgname=perl-event _srcname=Event -pkgver=1.13 -pkgrel=3 +pkgver=1.17 +pkgrel=1 pkgdesc="Framework for GUI events" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') url="http://search.cpan.org/dist/${_srcname}/" -depends=('perl>=5.10.0') +depends=('perl') options=(!emptydirs) source=(http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/${_srcname}-${pkgver}.tar.gz) -md5sums=('88cf5bb6b4b06e016072a5ff2ff8fa1a') +md5sums=('c58cdf7c56cd5f10a58b234d2c81295f') build() { cd "${srcdir}/${_srcname}-${pkgver}" diff --git a/extra/perl-fcgi/PKGBUILD b/extra/perl-fcgi/PKGBUILD index c658fd3b9..d44eddf2a 100644 --- a/extra/perl-fcgi/PKGBUILD +++ b/extra/perl-fcgi/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 101395 2010-11-29 01:59:43Z kevin $ +# $Id: PKGBUILD 125303 2011-05-25 19:27:52Z remy $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-fcgi -pkgver=0.71 -pkgrel=3 +pkgver=0.72 +pkgrel=1 pkgdesc="Fast CGI" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/FCGI" license=('GPL' 'PerlArtistic') -depends=('perl') +depends=('perl>=5.14') options=('!emptydirs') source=(http://www.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-${pkgver}.tar.gz) -md5sums=('26bc4ea53ccc9c9c16695e88e46a1cfb') +md5sums=('7b793e177caa93d972c6fb7ebe7c7ae1') build() { cd "${srcdir}/FCGI-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/FCGI-${pkgver}" make test } package() { cd "${srcdir}/FCGI-${pkgver}" make install DESTDIR="${pkgdir}" - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete } diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index 98e5bdb51..7e3b0a701 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100913 2010-11-26 16:20:58Z kevin $ +# $Id: PKGBUILD 125261 2011-05-25 19:17:47Z foutrelis $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis # Contributor: Firmicus <francois.archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-html-parser _realname=HTML-Parser pkgver=3.68 -pkgrel=1 +pkgrel=2 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64') license=('PerlArtistic') diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD index b21c6bb36..af266d871 100644 --- a/extra/perl-libintl-perl/PKGBUILD +++ b/extra/perl-libintl-perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100859 2010-11-26 01:58:35Z kevin $ +# $Id: PKGBUILD 125264 2011-05-25 19:18:10Z foutrelis $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=perl-libintl-perl _realname=libintl-perl pkgver=1.20 -pkgrel=2 +pkgrel=3 pkgdesc="Perl Module: Localization support" arch=('i686' 'x86_64') license=('LGPL') diff --git a/extra/perl-locale-gettext/PKGBUILD b/extra/perl-locale-gettext/PKGBUILD index 8b8cff5af..6f916e28e 100644 --- a/extra/perl-locale-gettext/PKGBUILD +++ b/extra/perl-locale-gettext/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103982 2010-12-24 20:55:26Z kevin $ +# $Id: PKGBUILD 125267 2011-05-25 19:18:48Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Paul Mattal <paul@archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-locale-gettext _realname=gettext pkgver=1.05 -pkgrel=6 +pkgrel=7 pkgdesc="Permits access from Perl to the gettext() family of functions" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD index b34bed718..1a4f7c0cc 100644 --- a/extra/perl-net-dns/PKGBUILD +++ b/extra/perl-net-dns/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100863 2010-11-26 02:27:59Z kevin $ +# $Id: PKGBUILD 125273 2011-05-25 19:19:34Z foutrelis $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-dns _realname=Net-DNS pkgver=0.66 -pkgrel=3 +pkgrel=4 pkgdesc="Perl Module: Interface to the DNS resolver." arch=(i686 x86_64) license=('PerlArtistic') diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 1c3b17d57..6620fbd6f 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102842 2010-12-12 08:25:28Z angvp $ +# $Id: PKGBUILD 125276 2011-05-25 19:20:00Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay pkgver=1.36 -pkgrel=4 +pkgrel=5 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64') license=('custom:BSD') diff --git a/extra/perl-net-upnp/PKGBUILD b/extra/perl-net-upnp/PKGBUILD index 9e77c0cb0..e54c70917 100644 --- a/extra/perl-net-upnp/PKGBUILD +++ b/extra/perl-net-upnp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102845 2010-12-12 08:32:04Z angvp $ +# $Id: PKGBUILD 125279 2011-05-25 19:20:27Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Drew Gilbert <gilbert dot drew at gmail dot com> pkgname=perl-net-upnp pkgver=1.4.2 -pkgrel=2 +pkgrel=3 pkgdesc="Perl Module UPnP" arch=('i686' 'x86_64') url="http://search.cpan.org/~skonno/Net-UPnP-1.4.2/" diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD index adb0c7671..fa6549515 100644 --- a/extra/perl-netaddr-ip/PKGBUILD +++ b/extra/perl-netaddr-ip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100919 2010-11-26 17:02:08Z kevin $ +# $Id: PKGBUILD 125270 2011-05-25 19:19:11Z foutrelis $ # Maintainer: Dale Blount <dale@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Francois Charette <francois.archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-netaddr-ip _realname=NetAddr-IP pkgver=4.037 -pkgrel=1 +pkgrel=2 pkgdesc="Perl module to manage IP addresses and subnets" arch=(i686 x86_64) license=('PerlArtistic' 'GPL') diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD index 68d52a69d..29483fdc1 100644 --- a/extra/perl-sdl/PKGBUILD +++ b/extra/perl-sdl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112695 2011-03-06 00:40:04Z heftig $ +# $Id: PKGBUILD 127524 2011-06-15 21:01:17Z remy $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=perl-sdl pkgver=2.531 -pkgrel=1 +pkgrel=3 pkgdesc="Simple DirectMedia Layer for Perl" arch=(i686 x86_64) license=(LGPL) @@ -20,12 +20,21 @@ provides=("sdl_perl=$pkgver") source=(http://search.cpan.org/CPAN/authors/id/G/GA/GARU/SDL-$pkgver.tar.gz) md5sums=('ed39c87ae685d3a933705a2ea82a9e18') -package() { +build() { cd "$srcdir/SDL-$pkgver" - + # Perl selects the proper CFLAGS set for binary modules + unset CFLAGS # install module in vendor directories - perl Build.PL installdirs=vendor destdir="$pkgdir" - + perl Build.PL installdirs=vendor perl Build - perl Build install +} + +check() { + cd "$srcdir/SDL-$pkgver" + perl Build test || true +} + +package() { + cd "$srcdir/SDL-$pkgver" + perl Build install destdir="$pkgdir" } diff --git a/extra/perl-template-toolkit/PKGBUILD b/extra/perl-template-toolkit/PKGBUILD index 49d2d4540..d955edfdd 100644 --- a/extra/perl-template-toolkit/PKGBUILD +++ b/extra/perl-template-toolkit/PKGBUILD @@ -5,7 +5,7 @@ pkgname=perl-template-toolkit _realname=Template-Toolkit pkgver=2.22 -pkgrel=3 +pkgrel=4 pkgdesc="Perl template processing system" arch=(i686 x86_64) license=('PerlArtistic') diff --git a/extra/perl-term-readkey/PKGBUILD b/extra/perl-term-readkey/PKGBUILD index 5380fffe6..25f9e397d 100644 --- a/extra/perl-term-readkey/PKGBUILD +++ b/extra/perl-term-readkey/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100930 2010-11-26 17:19:14Z kevin $ +# $Id: PKGBUILD 125285 2011-05-25 19:22:27Z foutrelis $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Francois Charette <francois.archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-term-readkey _realname=TermReadKey pkgver=2.30.01 -pkgrel=3 +pkgrel=4 pkgdesc="Provides simple control over terminal driver modes" arch=('i686' 'x86_64') license=('custom') diff --git a/extra/perl-text-iconv/PKGBUILD b/extra/perl-text-iconv/PKGBUILD index c69bef274..acd6932e2 100644 --- a/extra/perl-text-iconv/PKGBUILD +++ b/extra/perl-text-iconv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 100932 2010-11-26 17:44:01Z kevin $ +# $Id: PKGBUILD 125288 2011-05-25 19:22:57Z foutrelis $ # Maintainer: # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-text-iconv _realname=Text-Iconv pkgver=1.7 -pkgrel=5 +pkgrel=6 pkgdesc="Interface to iconv codeset conversion" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/${_realname}/" diff --git a/extra/perl-time-hires/PKGBUILD b/extra/perl-time-hires/PKGBUILD index 779b5c9af..db9ddcb7f 100644 --- a/extra/perl-time-hires/PKGBUILD +++ b/extra/perl-time-hires/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102848 2010-12-12 08:36:02Z angvp $ +# $Id: PKGBUILD 125291 2011-05-25 19:23:52Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: mezcal <fila at pruda dot com> pkgname=perl-time-hires pkgver=1.9721 -pkgrel=3 +pkgrel=4 pkgdesc="Perl module: high resolution time, sleep, and alarm" arch=('i686' 'x86_64') license=('PerlArtistic') diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 3d779063b..2a80a320e 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102852 2010-12-12 10:35:16Z remy $ +# $Id: PKGBUILD 124660 2011-05-23 20:07:22Z remy $ # Maintainer: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-tk _cpanname=Tk pkgver=804.029 -pkgrel=2 +pkgrel=3 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/${_cpanname}" @@ -27,11 +27,14 @@ build() { make } +#check() { +# cd $srcdir/${_cpanname}-$pkgver +# make test +#} + package() { cd $srcdir/${_cpanname}-$pkgver make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete # license install -D -m644 pTk/license.terms \ diff --git a/extra/perl-unicode-string/PKGBUILD b/extra/perl-unicode-string/PKGBUILD index 8df72bbfe..c8bcd6c7a 100644 --- a/extra/perl-unicode-string/PKGBUILD +++ b/extra/perl-unicode-string/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101387 2010-11-29 01:27:16Z kevin $ +# $Id: PKGBUILD 125294 2011-05-25 19:24:14Z foutrelis $ # Maintainer: James Rayner <iphitus@gmail.com> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=perl-unicode-string _realname=Unicode-String pkgver=2.09 -pkgrel=5 +pkgrel=6 pkgdesc="String of Unicode characters for perl (UCS2/UTF16)" arch=('i686' 'x86_64') license=('PerlArtistic') diff --git a/extra/perl-xml-parser/PKGBUILD b/extra/perl-xml-parser/PKGBUILD index aef91068e..021aa1b05 100644 --- a/extra/perl-xml-parser/PKGBUILD +++ b/extra/perl-xml-parser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 101389 2010-11-29 01:30:43Z kevin $ +# $Id: PKGBUILD 129383 2011-06-27 06:10:42Z andrea $ # Maintainer: # Contributor: firmicus <francois@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -6,8 +6,8 @@ pkgname=perl-xml-parser _realname=XML-Parser -pkgver=2.40 -pkgrel=2 +pkgver=2.41 +pkgrel=1 pkgdesc="Expat-based XML parser module for perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') @@ -16,8 +16,8 @@ depends=('perl' 'expat') replaces=('perlxml') provides=("perlxml=${pkgver}") options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/${_realname}-${pkgver}.tar.gz") -md5sums=('c66e9adba003d0667cc40115ccd837a5') +source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/${_realname}-${pkgver}.tar.gz") +md5sums=('c320d2ffa459e6cdc6f9f59c1185855e') build() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 5a2695d2a..c2ab5a4f8 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101391 2010-11-29 01:38:44Z kevin $ +# $Id: PKGBUILD 125297 2011-05-25 19:24:39Z foutrelis $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin <kevin@archlinux.org> pkgname=perl-yaml-syck _realname=YAML-Syck pkgver=1.17 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64') license=('custom') diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 0d939ffd2..91e94bb66 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 128509 2011-06-24 07:30:26Z foutrelis $ +# $Id: PKGBUILD 128517 2011-06-24 07:46:40Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.9.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index a0d0e3cc5..d5a887585 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 122182 2011-05-02 17:54:57Z dan $ +# $Id: PKGBUILD 125329 2011-05-25 22:33:15Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') pkgver=9.0.4 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.postgresql.org" 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) + postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate + perl-5.14-fix.patch) install=postgresql.install build() { @@ -18,6 +19,8 @@ build() { # patch to remove regress/test make target (won't build with it present) patch -Np1 -i ../build.patch + # fix for perl 5.14 + patch -Np1 -i ../perl-5.14-fix.patch # configure ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \ @@ -134,4 +137,5 @@ md5sums=('80390514d568a7af5ab61db1cda27e29' 'd63a05943cf0a2726aa2070f3033c569' '4d74f4227dc5e12bf95b3490758d86c9' '96f82c38f3f540b53f3e5144900acf17' - 'd28e443f9f65a5712c52018b84e27137') + 'd28e443f9f65a5712c52018b84e27137' + '6606e4279d91fc617b5c4dae0d76c603') diff --git a/extra/postgresql/perl-5.14-fix.patch b/extra/postgresql/perl-5.14-fix.patch new file mode 100644 index 000000000..82ef7d688 --- /dev/null +++ b/extra/postgresql/perl-5.14-fix.patch @@ -0,0 +1,25 @@ +--- a/src/pl/plperl/plperl.c ++++ b/src/pl/plperl/plperl.c +@@ -926,7 +926,7 @@ plperl_trusted_init(void) + if (!isGV_with_GP(sv) || !GvCV(sv)) + continue; + SvREFCNT_dec(GvCV(sv)); /* free the CV */ +- GvCV(sv) = NULL; /* prevent call via GV */ ++ GvCV_set(sv, NULL); /* prevent call via GV */ + } + hv_clear(stash); + +--- a/src/pl/plperl/plperl.h ++++ b/src/pl/plperl/plperl.h +@@ -49,6 +49,11 @@ + (U32)HeKUTF8(he)) + #endif + ++/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */ ++#ifndef GvCV_set ++#define GvCV_set(gv, cv) (GvCV(gv) = cv) ++#endif ++ + /* declare routines from plperl.c for access by .xs files */ + HV *plperl_spi_exec(char *, int); + void plperl_return_next(SV *); diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD index 3f596706d..87905b577 100644 --- a/extra/razor/PKGBUILD +++ b/extra/razor/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 101393 2010-11-29 01:47:33Z kevin $ -# Maintainer: Dale Blount <dale@archlinux.org> +# $Id: PKGBUILD 124559 2011-05-22 23:44:08Z andrea $ +# Maintainer: +# Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=razor pkgver=2.84 -pkgrel=4 -pkgdesc="A distributed, collaborative, spam detection and filtering network." -arch=(i686 x86_64) +pkgrel=5 +pkgdesc="A distributed, collaborative, spam detection and filtering network" +arch=('i686' 'x86_64') url="http://razor.sourceforge.net" license=('PerlArtistic') -depends=('glibc' 'perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl>=5.10.0') -source=(http://downloads.sourceforge.net/sourceforge/razor/${pkgname}-agents-${pkgver}.tar.bz2) +depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl>=5.14.0') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2) md5sums=('8b9a11a6ce020383c32c45d1530d77c2') options=(!emptydirs) build() { - cd ${srcdir}/${pkgname}-agents-${pkgver} + cd "${srcdir}"/${pkgname}-agents-${pkgver} # skip install_razor_agents (we'll do the linking later) # /bin/sed -i "s|install :: all pure_install doc_install install_razor_agents|install :: all pure_install doc_install|g" Makefile diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog index 6b3a80c20..d4275a700 100644 --- a/extra/rxvt-unicode/ChangeLog +++ b/extra/rxvt-unicode/ChangeLog @@ -1,2 +1,5 @@ +2011-05-22 Angel Velasquez <angvp@archlinux.org> + * Rebuilt against perl 5.14.0 + 2011-05-17 Angel Velasquez <angvp@archlinux.org> * Removed not accepted upstream patch (closes FS#23324) diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD index 2f99e89dd..a72fa7c11 100644 --- a/extra/rxvt-unicode/PKGBUILD +++ b/extra/rxvt-unicode/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 124251 2011-05-18 04:52:29Z angvp $ +# $Id: PKGBUILD 124538 2011-05-22 21:23:30Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=rxvt-unicode pkgver=9.11 -pkgrel=2 +pkgrel=4 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)" arch=('i686' 'x86_64') url="http://software.schmorp.de/pkg/rxvt-unicode.html" diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD index 5559ec48e..164475d46 100644 --- a/extra/spamassassin/PKGBUILD +++ b/extra/spamassassin/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 106385 2011-01-16 17:09:43Z angvp $ +# $Id: PKGBUILD 129532 2011-06-28 18:19:06Z angvp $ # Maintainer: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis - pkgname=spamassassin -pkgver=3.3.1 -pkgrel=4 +pkgver=3.3.2 +pkgrel=2 pkgdesc="A mail filter to identify spam." arch=(i686 x86_64) license=(APACHE) url="http://spamassassin.apache.org" -depends=('perl>=5.12.2' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \ +depends=('perl>=5.14' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \ 'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \ - 'perl-libwww' 'perl-io-zlib' 'perl-mail-spf' \ - 'perl-archive-tar' 'zlib' 're2c') + 'perl-libwww' 'perl-mail-spf' \ + 'zlib' 're2c') + # perl-archive-tar perl-io-zlib) makedepends=('razor' 'perl-dbi') optdepends=('razor: to identify collaborately-flagged spam' - 'gnupg: gpg support, without this use --nogpg flag for sa-update' - 're2c: regexp compiler, for compiling rules with sa-compile') + 'gnupg: gpg support, without this use --nogpg flag for sa-update' + 're2c: regexp compiler, for compiling rules with sa-compile' + 'perl-mail-dkim: DomainKeys Identified Mail (DKIM) checking') backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \ etc/mail/spamassassin/init.pre \ etc/mail/spamassassin/v310.pre \ @@ -26,7 +27,7 @@ install=${pkgname}.install options=(!emptydirs) source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz \ spamd.conf.d spamd) -md5sums=('5a93f81fda315411560ff5da099382d2' +md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' 'af501c6b0bb937a2775b747cc4b6d150' '0534d3071a526a27ddc2b297afa03b04') @@ -39,12 +40,14 @@ build() { /usr/bin/make } +check() { + cd ${srcdir}/Mail-SpamAssassin-${pkgver} + /usr/bin/make test || true +} + package() { cd ${srcdir}/Mail-SpamAssassin-${pkgver} /usr/bin/make DESTDIR=${pkgdir} install - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete /bin/install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd /bin/install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index e4d352797..19cb12294 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 126235 2011-06-02 19:57:23Z stephane $ +# $Id: PKGBUILD 127222 2011-06-11 09:32:25Z andrea $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion pkgver=1.6.17 -pkgrel=2 +pkgrel=4 pkgdesc="Replacement for CVS, another versioning system (SVN)" arch=('i686' 'x86_64') license=('apache' 'bsd') -depends=('neon' 'apr-util') +depends=('neon' 'apr-util' 'sqlite3') makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' - 'autoconf' 'sqlite3' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 svnserve svn svnserve.conf svnmerge.py subversion.rpath.fix.patch diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD index b78448b94..747013569 100644 --- a/extra/swt/PKGBUILD +++ b/extra/swt/PKGBUILD @@ -1,33 +1,35 @@ -# $Id: PKGBUILD 90058 2010-09-06 21:07:12Z guillaume $ +# $Id: PKGBUILD 129501 2011-06-28 14:09:34Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=swt -pkgver=3.6 -pkgrel=2 +pkgver=3.7 +pkgrel=1 pkgdesc="An open source widget toolkit for Java" -_date=201006080911 +_date=201106131736 arch=(i686 x86_64) url="http://www.eclipse.org/swt/" license=('EPL') depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst') -optdepends=('libgnomeui' 'xulrunner' 'mesa') -makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner>=1.9.1' 'unzip' 'pkgconfig' 'apache-ant') +#optdepends=('libgnomeui' 'xulrunner' 'mesa') +#makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner>=1.9.1' 'unzip' 'pkgconfig' 'apache-ant') +optdepends=('libgnomeui' 'mesa') +makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'apache-ant') source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip build-swt.xml) -md5sums=('514206a4b9e27ac66cb7876157c3e74f' - '244f63edc7e609c7ac7f4bd1d7e0298a' +md5sums=('21d084526f5df4e02900b2ce4ae8b5d1' + '60f11408bc8db299c5406a904a665a5e' 'f5e548bc26a0f1f3c18131be76face40') if [ "${CARCH}" = "i686" ]; then source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip build-swt.xml) noextract=(swt-${pkgver}-gtk-linux-x86.zip) - md5sums=('514206a4b9e27ac66cb7876157c3e74f' + md5sums=('21d084526f5df4e02900b2ce4ae8b5d1' 'f5e548bc26a0f1f3c18131be76face40') fi if [ "${CARCH}" = "x86_64" ]; then source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip build-swt.xml) - md5sums=('244f63edc7e609c7ac7f4bd1d7e0298a' + md5sums=('60f11408bc8db299c5406a904a665a5e' 'f5e548bc26a0f1f3c18131be76face40') noextract=(swt-${pkgver}-gtk-linux-x86_64.zip) fi @@ -41,32 +43,39 @@ build() { rm -rf about_files mkdir src mv org src/ - cp build-swt.xml build.xml || return 1 + cp build-swt.xml build.xml - [ "${CARCH}" = "x86_64" ] && export SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 + [ "${CARCH}" = "x86_64" ] && export SWT_PTR_CFLAGS=-DJNI64 - make -f make_linux.mak make_awt || return 1 - make -f make_linux.mak make_swt || return 1 - make -f make_linux.mak make_atk || return 1 - make -f make_linux.mak make_gnome || return 1 - export MOZILLA_INCLUDES="`pkg-config --cflags libxul`" - export MOZILLA_LIBS="-Wl,-R`pkg-config libxul --variable=libdir` `pkg-config libxul --libs`" - export XULRUNNER_INCLUDES="${MOZILLA_INCLUDES}" - export XULRUNNER_LIBS="${MOZILLA_LIBS}" - make -f make_linux.mak make_mozilla || return 1 - make -f make_linux.mak make_xulrunner || return 1 + make -f make_linux.mak make_awt + make -f make_linux.mak make_swt + make -f make_linux.mak make_atk + make -f make_linux.mak make_gnome +# "XULRunner >= 2.0 is not currently supported" +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=327696 +# +# export MOZILLA_INCLUDES="`pkg-config --cflags libxul`" +# export MOZILLA_LIBS="-Wl,-R`pkg-config libxul --variable=libdir` `pkg-config libxul --libs`" +# export XULRUNNER_INCLUDES="${MOZILLA_INCLUDES}" +# export XULRUNNER_LIBS="${MOZILLA_LIBS}" +# make -f make_linux.mak make_mozilla +# make -f make_linux.mak make_xulrunner - make -f make_linux.mak make_cairo || return 1 - make -f make_linux.mak make_glx || return 1 + make -f make_linux.mak make_cairo + make -f make_linux.mak make_glx - ant compile || return 1 + ant compile +} + +package() { + cd "${srcdir}" cp version.txt build/version.txt cp src/org/eclipse/swt/internal/SWTMessages.properties build/org/eclipse/swt/internal/ - ant jar || return 1 + ant jar install -m755 -d "${pkgdir}/usr/share/java" install -m755 -d "${pkgdir}/usr/lib" - install -m644 swt.jar "${pkgdir}/usr/share/java/" || return 1 - install -m755 *.so "${pkgdir}/usr/lib/" || return 1 + install -m644 swt.jar "${pkgdir}/usr/share/java/" + install -m755 *.so "${pkgdir}/usr/lib/" } diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index f309599b4..603de624a 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123129 2011-05-08 21:00:10Z heftig $ +# $Id: PKGBUILD 125313 2011-05-25 20:09:55Z heftig $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,9 +6,9 @@ pkgbase=vim pkgname=(vim gvim vim-runtime) _topver=7.3 -_patchlevel=177 +_patchlevel=206 pkgver=${_topver}.${_patchlevel} -__hgrev=60890b26cb17 +__hgrev=e9538cfd0d9c pkgrel=1 arch=('i686' 'x86_64') license=('custom:vim') diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index d3c7b0fd5..7e2144efc 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124014 2011-05-15 23:09:30Z giovanni $ +# $Id: PKGBUILD 125306 2011-05-25 19:29:12Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat pkgver=0.3.5 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64') url="http://www.weechat.org/" diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD index 952d22b11..e9aa9d885 100644 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ b/multilib-testing/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48902 2011-06-07 12:26:35Z heftig $ +# $Id: PKGBUILD 50355 2011-06-28 17:45:40Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -7,23 +7,24 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') -pkgver=4.6.0 -pkgrel=7 -_snapshot=4.6-20110603 +pkgver=4.6.1 +pkgrel=1 +#_snapshot=4.6-20110603 _libstdcppmanver=20110201 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils-multilib>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'dejagnu' - 'lib32-glibc>=2.13') +makedepends=('binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' + 'lib32-glibc>=2.14') +checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('c97d52b2b4e6c8c5cf665ae3eb9e8e49' +md5sums=('c57a9170c677bf795bdc04ed796ca491' '1e9fd2eaf0ee47ea64e82c48998f1999' '22cec272f9cc2801d3cd348feaca888b' '4df25b623799b148a0703eaeec8fdf3f') @@ -83,7 +84,7 @@ check() { package_gcc-libs-multilib() { pkgdesc="Runtime libraries shipped by GCC for multilib" - depends=('glibc>=2.13' "lib32-gcc-libs=$pkgver-$pkgrel") + depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel") provides=("gcc-libs=$pkgver-$pkgrel") conflicts=('gcc-libs') install=gcc-libs.install @@ -117,7 +118,7 @@ package_gcc-libs-multilib() package_lib32-gcc-libs() { pkgdesc="Runtime libraries shipped by GCC (32-bit)" - depends=('lib32-glibc>=2.13' "gcc-libs>=$pkgver") + depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver") cd gcc-build make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared @@ -147,7 +148,7 @@ package_lib32-gcc-libs() package_gcc-multilib() { pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib" - depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.21-9' 'libmpc' 'cloog' 'ppl') + depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl') groups=('multilib-devel') provides=("gcc=$pkgver-$pkgrel") conflicts=('gcc') diff --git a/staging/evolution-exchange/PKGBUILD b/staging/evolution-exchange/PKGBUILD new file mode 100644 index 000000000..a04bdc13b --- /dev/null +++ b/staging/evolution-exchange/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 129506 2011-06-28 14:23:10Z stephane $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evolution-exchange +pkgver=3.0.2 +pkgrel=2 +pkgdesc="Ximian Connector Exchange plugin for Evolution" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.ximian.com" +depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop' 'libunique3') +makedepends=('intltool' 'evolution') +options=('!libtool' '!emptydirs') +install=evolution-exchange.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('84f5c638aee1f6ed49de0d0f331d3b29907f7b211bd6c70f37698dedcd3e5f5a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/evolution --disable-static \ + --with-libdb=/usr --with-krb5=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-exchange-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/staging/evolution-exchange/evolution-exchange.install b/staging/evolution-exchange/evolution-exchange.install new file mode 100644 index 000000000..1179887f9 --- /dev/null +++ b/staging/evolution-exchange/evolution-exchange.install @@ -0,0 +1,17 @@ +pkgname=evolution-exchange + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/staging/mod_perl/PKGBUILD b/staging/mod_perl/PKGBUILD index 91af58005..9f3595deb 100644 --- a/staging/mod_perl/PKGBUILD +++ b/staging/mod_perl/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 129459 2011-06-28 01:36:46Z stephane $ +# $Id: PKGBUILD 129799 2011-06-28 23:07:22Z angvp $ # Maintainer: Firmicus <francois.archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=mod_perl pkgver=2.0.5 -pkgrel=5 +pkgrel=7 pkgdesc="Apache module that embeds the Perl interpreter within the server" url="http://search.cpan.org/dist/${pkgname}/" -depends=('perl' 'apache' 'db' 'apr-util') +depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid') license=('APACHE') arch=('i686' 'x86_64') options=(!emptydirs) diff --git a/staging/subversion/PKGBUILD b/staging/subversion/PKGBUILD new file mode 100644 index 000000000..44c626813 --- /dev/null +++ b/staging/subversion/PKGBUILD @@ -0,0 +1,98 @@ +# $Id: PKGBUILD 129526 2011-06-28 16:08:03Z stephane $ +# Maintainer: Paul Mattal <paul@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=subversion +pkgver=1.6.17 +pkgrel=5 +pkgdesc="Replacement for CVS, another versioning system (SVN)" +arch=('i686' 'x86_64') +license=('apache' 'bsd') +depends=('neon' 'apr-util' 'sqlite3') +makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') +source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 + svnserve svn svnserve.conf svnmerge.py + subversion.rpath.fix.patch + subversion.suppress.deprecation.warnings.patch) + +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +url="http://subversion.apache.org/" +provides=('svn') +options=('!makeflags' '!libtool') +optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export PYTHON=/usr/bin/python2 + + # apply patches + patch -Np0 -i ../subversion.rpath.fix.patch + patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch + + # configure + autoreconf + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ + --with-zlib=/usr --with-neon=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \ + --enable-javahl --with-gnome-keyring --with-kwallet + + # build + (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py CLEANUP=yes +#} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # install + export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH + make DESTDIR=${pkgdir} install + + make DESTDIR=${pkgdir} swig-py + make install-swig-py DESTDIR=${pkgdir} + + install -d ${pkgdir}/usr/lib/python2.7 + mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages + + install -d ${pkgdir}/usr/share/subversion + install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ + rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in + + make DESTDIR=${pkgdir} swig-pl + make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor + rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist + rm -rf ${pkgdir}/usr/lib/perl5/core_perl + + make DESTDIR=${pkgdir} swig-rb + make install-swig-rb DESTDIR=${pkgdir} + + make DESTDIR=${pkgdir} javahl + make DESTDIR=${pkgdir} install-javahl + + install -d ${pkgdir}/etc/{rc.d,xinetd.d,conf.d} + + install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d + install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d + install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve + install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge + install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \ + ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + + # bash completion + install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \ + ${pkgdir}/etc/bash_completion.d/subversion +} +md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14' + 'a2b029e8385007ffb99b437b30521c90' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'a6371baeda7e224504629ecdda2749b4' + '6b4340ba9d8845cd8497e013ae01be3f' + '1166f3b7413d7e7450299b3525680bbe') diff --git a/staging/subversion/subversion.rpath.fix.patch b/staging/subversion/subversion.rpath.fix.patch new file mode 100644 index 000000000..ba6ee9e4e --- /dev/null +++ b/staging/subversion/subversion.rpath.fix.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 ++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 +@@ -678,6 +678,7 @@ + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} + + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile diff --git a/staging/subversion/subversion.suppress.deprecation.warnings.patch b/staging/subversion/subversion.suppress.deprecation.warnings.patch new file mode 100644 index 000000000..94ce89b18 --- /dev/null +++ b/staging/subversion/subversion.suppress.deprecation.warnings.patch @@ -0,0 +1,22 @@ +diff -urN subversion-1.6.9/subversion/bindings/swig/python/svn/core.py subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py +--- subversion-1.6.9/subversion/bindings/swig/python/svn/core.py 2009-02-13 11:22:26.000000000 -0500 ++++ subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py 2010-02-08 07:46:29.000000000 -0500 +@@ -19,6 +19,7 @@ + from libsvn.core import * + import libsvn.core as _libsvncore + import atexit as _atexit ++import warnings + + class SubversionException(Exception): + def __init__(self, message=None, apr_err=None, child=None, +@@ -44,7 +45,9 @@ + Exception.__init__(self, *args) + + self.apr_err = apr_err +- self.message = message ++ with warnings.catch_warnings(): ++ warnings.simplefilter("ignore", DeprecationWarning) ++ self.message = message + self.child = child + self.file = file + self.line = line diff --git a/staging/subversion/svn b/staging/subversion/svn new file mode 100644 index 000000000..8988aaf63 --- /dev/null +++ b/staging/subversion/svn @@ -0,0 +1,11 @@ +service svn +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/bin/svnserve + server_args = -i + log_on_failure += USERID + disable = yes +} diff --git a/staging/subversion/svnmerge.py b/staging/subversion/svnmerge.py new file mode 100644 index 000000000..d8931648f --- /dev/null +++ b/staging/subversion/svnmerge.py @@ -0,0 +1,2370 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- +# Copyright (c) 2005, Giovanni Bajo +# Copyright (c) 2004-2005, Awarix, Inc. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +# +# Author: Archie Cobbs <archie at awarix dot com> +# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com> +# +# Acknowledgments: +# John Belmonte <john at neggie dot net> - metadata and usability +# improvements +# Blair Zajac <blair at orcaware dot com> - random improvements +# Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive +# merging support +# Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple +# location identifier formats +# +# $HeadURL$ +# $LastChangedDate$ +# $LastChangedBy$ +# $LastChangedRevision$ +# +# Requisites: +# svnmerge.py has been tested with all SVN major versions since 1.1 (both +# client and server). It is unknown if it works with previous versions. +# +# Differences from svnmerge.sh: +# - More portable: tested as working in FreeBSD and OS/2. +# - Add double-verbose mode, which shows every svn command executed (-v -v). +# - "svnmerge avail" now only shows commits in source, not also commits in +# other parts of the repository. +# - Add "svnmerge block" to flag some revisions as blocked, so that +# they will not show up anymore in the available list. Added also +# the complementary "svnmerge unblock". +# - "svnmerge avail" has grown two new options: +# -B to display a list of the blocked revisions +# -A to display both the blocked and the available revisions. +# - Improved generated commit message to make it machine parsable even when +# merging commits which are themselves merges. +# - Add --force option to skip working copy check +# - Add --record-only option to "svnmerge merge" to avoid performing +# an actual merge, yet record that a merge happened. +# - Can use a variety of location-identifier formats +# +# TODO: +# - Add "svnmerge avail -R": show logs in reverse order +# +# Information for Hackers: +# +# Identifiers for branches: +# A branch is identified in three ways within this source: +# - as a working copy (variable name usually includes 'dir') +# - as a fully qualified URL +# - as a path identifier (an opaque string indicating a particular path +# in a particular repository; variable name includes 'pathid') +# A "target" is generally user-specified, and may be a working copy or +# a URL. + +import sys, os, getopt, re, types, tempfile, time, locale +from bisect import bisect +from xml.dom import pulldom + +NAME = "svnmerge" +if not hasattr(sys, "version_info") or sys.version_info < (2, 0): + error("requires Python 2.0 or newer") + +# Set up the separator used to separate individual log messages from +# each revision merged into the target location. Also, create a +# regular expression that will find this same separator in already +# committed log messages, so that the separator used for this run of +# svnmerge.py will have one more LOG_SEPARATOR appended to the longest +# separator found in all the commits. +LOG_SEPARATOR = 8 * '.' +LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR), + re.MULTILINE) + +# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX. +LOG_LINE_PREFIX = 2 * ' ' + +# Set python to the default locale as per environment settings, same as svn +# TODO we should really parse config and if log-encoding is specified, set +# the locale to match that encoding +locale.setlocale(locale.LC_ALL, '') + +# We want the svn output (such as svn info) to be non-localized +# Using LC_MESSAGES should not affect localized output of svn log, for example +if os.environ.has_key("LC_ALL"): + del os.environ["LC_ALL"] +os.environ["LC_MESSAGES"] = "C" + +############################################################################### +# Support for older Python versions +############################################################################### + +# True/False constants are Python 2.2+ +try: + True, False +except NameError: + True, False = 1, 0 + +def lstrip(s, ch): + """Replacement for str.lstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + i = 0 + try: + while s[i] == ch: + i = i+1 + return s[i:] + except IndexError: + return "" + +def rstrip(s, ch): + """Replacement for str.rstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + try: + if s[-1] != ch: + return s + i = -2 + while s[i] == ch: + i = i-1 + return s[:i+1] + except IndexError: + return "" + +def strip(s, ch): + """Replacement for str.strip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + return lstrip(rstrip(s, ch), ch) + +def rsplit(s, sep, maxsplits=0): + """Like str.rsplit, which is Python 2.4+ only.""" + L = s.split(sep) + if not 0 < maxsplits <= len(L): + return L + return [sep.join(L[0:-maxsplits])] + L[-maxsplits:] + +############################################################################### + +def kwextract(s): + """Extract info from a svn keyword string.""" + try: + return strip(s, "$").strip().split(": ")[1] + except IndexError: + return "<unknown>" + +__revision__ = kwextract('$Rev$') +__date__ = kwextract('$Date$') + +# Additional options, not (yet?) mapped to command line flags +default_opts = { + "svn": "svn", + "prop": NAME + "-integrated", + "block-prop": NAME + "-blocked", + "commit-verbose": True, + "verbose": 0, +} +logs = {} + +def console_width(): + """Get the width of the console screen (if any).""" + try: + return int(os.environ["COLUMNS"]) + except (KeyError, ValueError): + pass + + try: + # Call the Windows API (requires ctypes library) + from ctypes import windll, create_string_buffer + h = windll.kernel32.GetStdHandle(-11) + csbi = create_string_buffer(22) + res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi) + if res: + import struct + (bufx, bufy, + curx, cury, wattr, + left, top, right, bottom, + maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw) + return right - left + 1 + except ImportError: + pass + + # Parse the output of stty -a + if os.isatty(1): + out = os.popen("stty -a").read() + m = re.search(r"columns (\d+);", out) + if m: + return int(m.group(1)) + + # sensible default + return 80 + +def error(s): + """Subroutine to output an error and bail.""" + print >> sys.stderr, "%s: %s" % (NAME, s) + sys.exit(1) + +def report(s): + """Subroutine to output progress message, unless in quiet mode.""" + if opts["verbose"]: + print "%s: %s" % (NAME, s) + +def prefix_lines(prefix, lines): + """Given a string representing one or more lines of text, insert the + specified prefix at the beginning of each line, and return the result. + The input must be terminated by a newline.""" + assert lines[-1] == "\n" + return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n" + +def recode_stdout_to_file(s): + if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \ + or sys.stdout.encoding is None: + return s + u = s.decode(sys.stdout.encoding) + return u.encode(locale.getdefaultlocale()[1]) + +class LaunchError(Exception): + """Signal a failure in execution of an external command. Parameters are the + exit code of the process, the original command line, and the output of the + command.""" + +try: + """Launch a sub-process. Return its output (both stdout and stderr), + optionally split by lines (if split_lines is True). Raise a LaunchError + exception if the exit code of the process is non-zero (failure). + + This function has two implementations, one based on subprocess (preferred), + and one based on popen (for compatibility). + """ + import subprocess + import shlex + + def launch(cmd, split_lines=True): + # Requiring python 2.4 or higher, on some platforms we get + # much faster performance from the subprocess module (where python + # doesn't try to close an exhorbitant number of file descriptors) + stdout = "" + stderr = "" + try: + if os.name == 'nt': + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + else: + # Use shlex to break up the parameters intelligently, + # respecting quotes. shlex can't handle unicode. + args = shlex.split(cmd.encode('ascii')) + p = subprocess.Popen(args, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + stdoutAndErr = p.communicate() + stdout = stdoutAndErr[0] + stderr = stdoutAndErr[1] + except OSError, inst: + # Using 1 as failure code; should get actual number somehow? For + # examples see svnmerge_test.py's TestCase_launch.test_failure and + # TestCase_launch.test_failurecode. + raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst)) + + if p.returncode == 0: + if split_lines: + # Setting keepends=True for compatibility with previous logic + # (where file.readlines() preserves newlines) + return stdout.splitlines(True) + else: + return stdout + else: + raise LaunchError(p.returncode, cmd, stdout + stderr) +except ImportError: + # support versions of python before 2.4 (slower on some systems) + def launch(cmd, split_lines=True): + if os.name not in ['nt', 'os2']: + import popen2 + p = popen2.Popen4(cmd) + p.tochild.close() + if split_lines: + out = p.fromchild.readlines() + else: + out = p.fromchild.read() + ret = p.wait() + if ret == 0: + ret = None + else: + ret >>= 8 + else: + i,k = os.popen4(cmd) + i.close() + if split_lines: + out = k.readlines() + else: + out = k.read() + ret = k.close() + + if ret is None: + return out + raise LaunchError(ret, cmd, out) + +def launchsvn(s, show=False, pretend=False, **kwargs): + """Launch SVN and grab its output.""" + username = password = configdir = "" + if opts.get("username", None): + username = "--username=" + opts["username"] + if opts.get("password", None): + password = "--password=" + opts["password"] + if opts.get("config-dir", None): + configdir = "--config-dir=" + opts["config-dir"] + cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive", + username, password, configdir, s])) + if show or opts["verbose"] >= 2: + print cmd + if pretend: + return None + return launch(cmd, **kwargs) + +def svn_command(s): + """Do (or pretend to do) an SVN command.""" + out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"], + pretend=opts["dry-run"], + split_lines=False) + if not opts["dry-run"]: + print out + +def check_dir_clean(dir): + """Check the current status of dir for local mods.""" + if opts["force"]: + report('skipping status check because of --force') + return + report('checking status of "%s"' % dir) + + # Checking with -q does not show unversioned files or external + # directories. Though it displays a debug message for external + # directories, after a blank line. So, practically, the first line + # matters: if it's non-empty there is a modification. + out = launchsvn("status -q %s" % dir) + if out and out[0].strip(): + error('"%s" has local modifications; it must be clean' % dir) + +class PathIdentifier: + """Abstraction for a path identifier, so that we can start talking + about it before we know the form that it takes in the properties (its + external_form). Objects are referenced in the class variable 'locobjs', + keyed by all known forms.""" + + # a map of UUID (or None) to repository root URL. + repo_hints = {} + + # a map from any known string form to the corresponding PathIdentifier + locobjs = {} + + def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None): + self.repo_relative_path = repo_relative_path + self.uuid = uuid + self.url = url + self.external_form = external_form + + def __repr__(self): + return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>' + + def __str__(self): + """Return a printable string representation""" + if self.external_form: + return self.external_form + if self.url: + return self.format('url') + if self.uuid: + return self.format('uuid') + return self.format('path') + + def from_pathid(pathid_str): + """convert pathid_str to a PathIdentifier""" + if not PathIdentifier.locobjs.has_key(pathid_str): + if is_url(pathid_str): + # we can determine every form; PathIdentifier.hint knows how to do that + PathIdentifier.hint(pathid_str) + elif pathid_str[:7] == 'uuid://': + mo = re.match('uuid://([^/]*)(.*)', pathid_str) + if not mo: + error("Invalid path identifier '%s'" % pathid_str) + uuid, repo_relative_path = mo.groups() + pathid = PathIdentifier(repo_relative_path, uuid=uuid) + # we can cache this by uuid:// pathid and by repo-relative path + PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid + elif pathid_str and pathid_str[0] == '/': + # strip any trailing slashes + pathid_str = pathid_str.rstrip('/') + pathid = PathIdentifier(repo_relative_path=pathid_str) + # we can only cache this by repo-relative path + PathIdentifier.locobjs[pathid_str] = pathid + else: + error("Invalid path identifier '%s'" % pathid_str) + return PathIdentifier.locobjs[pathid_str] + from_pathid = staticmethod(from_pathid) + + def from_target(target): + """Convert a target (either a working copy path or an URL) into a + path identifier.""" + # prime the cache first if we don't know about this target yet + if not PathIdentifier.locobjs.has_key(target): + PathIdentifier.hint(target) + + try: + return PathIdentifier.locobjs[target] + except KeyError: + error("Could not recognize path identifier '%s'" % target) + from_target = staticmethod(from_target) + + def hint(target): + """Cache some information about target, as it may be referenced by + repo-relative path in subversion properties; the cache can help to + expand such a relative path to a full path identifier.""" + if PathIdentifier.locobjs.has_key(target): return + if not is_url(target) and not is_wc(target): return + + url = target_to_url(target) + + root = get_repo_root(url) + assert root[-1] != "/" + assert url[:len(root)] == root, "url=%r, root=%r" % (url, root) + repo_relative_path = url[len(root):] + + try: + uuid = get_svninfo(target)['Repository UUID'] + uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path) + except KeyError: + uuid = None + uuid_pathid = None + + locobj = PathIdentifier.locobjs.get(url) or \ + (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid)) + if not locobj: + locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url) + + PathIdentifier.repo_hints[uuid] = root # (uuid may be None) + + PathIdentifier.locobjs[target] = locobj + PathIdentifier.locobjs[url] = locobj + if uuid_pathid: + PathIdentifier.locobjs[uuid_pathid] = locobj + if not PathIdentifier.locobjs.has_key(repo_relative_path): + PathIdentifier.locobjs[repo_relative_path] = locobj + hint = staticmethod(hint) + + def format(self, fmt): + if fmt == 'path': + return self.repo_relative_path + elif fmt == 'uuid': + return "uuid://%s%s" % (self.uuid, self.repo_relative_path) + elif fmt == 'url': + return self.url + else: + error("Unkonwn path type '%s'" % fmt) + + def match_substring(self, str): + """Test whether str is a substring of any representation of this + PathIdentifier.""" + if self.repo_relative_path.find(str) >= 0: + return True + + if self.uuid: + if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0: + return True + + if self.url: + if (self.url + self.repo_relative_path).find(str) >= 0: + return True + + return False + + def get_url(self): + """Convert a pathid into a URL. If this is not possible, error out.""" + if self.url: + return self.url + # if we have a uuid and happen to know the URL for it, use that + elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid): + self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + return self.url + # if we've only seen one rep, use that (a guess, but an educated one) + elif not self.uuid and len(PathIdentifier.repo_hints) == 1: + uuid, root = PathIdentifier.repo_hints.items()[0] + if uuid: + self.uuid = uuid + PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self + self.url = root + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + report("Guessing that '%s' refers to '%s'" % (self, self.url)) + return self.url + else: + error("Cannot determine URL for '%s'; " % self + + "Explicit source argument (-S/--source) required.\n") + +class RevisionLog: + """ + A log of the revisions which affected a given URL between two + revisions. + """ + + def __init__(self, url, begin, end, find_propchanges=False): + """ + Create a new RevisionLog object, which stores, in self.revs, a list + of the revisions which affected the specified URL between begin and + end. If find_propchanges is True, self.propchange_revs will contain a + list of the revisions which changed properties directly on the + specified URL. URL must be the URL for a directory in the repository. + """ + self.url = url + + # Setup the log options (--quiet, so we don't show log messages) + log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url) + if find_propchanges: + # The --verbose flag lets us grab merge tracking information + # by looking at propchanges + log_opts = "--verbose " + log_opts + + # Read the log to look for revision numbers and merge-tracking info + self.revs = [] + self.propchange_revs = [] + repos_pathid = PathIdentifier.from_target(url) + for chg in SvnLogParser(launchsvn("log %s" % log_opts, + split_lines=False)): + self.revs.append(chg.revision()) + for p in chg.paths(): + if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path: + self.propchange_revs.append(chg.revision()) + + # Save the range of the log + self.begin = int(begin) + if end == "HEAD": + # If end is not provided, we do not know which is the latest + # revision in the repository. So we set 'end' to the latest + # known revision. + self.end = self.revs[-1] + else: + self.end = int(end) + + self._merges = None + self._blocks = None + + def merge_metadata(self): + """ + Return a VersionedProperty object, with a cached view of the merge + metadata in the range of this log. + """ + + # Load merge metadata if necessary + if not self._merges: + self._merges = VersionedProperty(self.url, opts["prop"]) + self._merges.load(self) + + return self._merges + + def block_metadata(self): + if not self._blocks: + self._blocks = VersionedProperty(self.url, opts["block-prop"]) + self._blocks.load(self) + + return self._blocks + + +class VersionedProperty: + """ + A read-only, cached view of a versioned property. + + self.revs contains a list of the revisions in which the property changes. + self.values stores the new values at each corresponding revision. If the + value of the property is unknown, it is set to None. + + Initially, we set self.revs to [0] and self.values to [None]. This + indicates that, as of revision zero, we know nothing about the value of + the property. + + Later, if you run self.load(log), we cache the value of this property over + the entire range of the log by noting each revision in which the property + was changed. At the end of the range of the log, we invalidate our cache + by adding the value "None" to our cache for any revisions which fall out + of the range of our log. + + Once self.revs and self.values are filled, we can find the value of the + property at any arbitrary revision using a binary search on self.revs. + Once we find the last revision during which the property was changed, + we can lookup the associated value in self.values. (If the associated + value is None, the associated value was not cached and we have to do + a full propget.) + + An example: We know that the 'svnmerge' property was added in r10, and + changed in r21. We gathered log info up until r40. + + revs = [0, 10, 21, 40] + values = [None, "val1", "val2", None] + + What these values say: + - From r0 to r9, we know nothing about the property. + - In r10, the property was set to "val1". This property stayed the same + until r21, when it was changed to "val2". + - We don't know what happened after r40. + """ + + def __init__(self, url, name): + """View the history of a versioned property at URL with name""" + self.url = url + self.name = name + + # We know nothing about the value of the property. Setup revs + # and values to indicate as such. + self.revs = [0] + self.values = [None] + + # We don't have any revisions cached + self._initial_value = None + self._changed_revs = [] + self._changed_values = [] + + def load(self, log): + """ + Load the history of property changes from the specified + RevisionLog object. + """ + + # Get the property value before the range of the log + if log.begin > 1: + self.revs.append(log.begin-1) + try: + self._initial_value = self.raw_get(log.begin-1) + except LaunchError: + # The specified URL might not exist before the + # range of the log. If so, we can safely assume + # that the property was empty at that time. + self._initial_value = { } + self.values.append(self._initial_value) + else: + self._initial_value = { } + self.values[0] = self._initial_value + + # Cache the property values in the log range + old_value = self._initial_value + for rev in log.propchange_revs: + new_value = self.raw_get(rev) + if new_value != old_value: + self._changed_revs.append(rev) + self._changed_values.append(new_value) + self.revs.append(rev) + self.values.append(new_value) + old_value = new_value + + # Indicate that we know nothing about the value of the property + # after the range of the log. + if log.revs: + self.revs.append(log.end+1) + self.values.append(None) + + def raw_get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + return get_revlist_prop(self.url, self.name, rev) + + def get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + + if rev is not None: + + # Find the index using a binary search + i = bisect(self.revs, rev) - 1 + + # Return the value of the property, if it was cached + if self.values[i] is not None: + return self.values[i] + + # Get the current value of the property + return self.raw_get(rev) + + def changed_revs(self, key=None): + """ + Get a list of the revisions in which the specified dictionary + key was changed in this property. If key is not specified, + return a list of revisions in which any key was changed. + """ + if key is None: + return self._changed_revs + else: + changed_revs = [] + old_val = self._initial_value + for rev, val in zip(self._changed_revs, self._changed_values): + if val.get(key) != old_val.get(key): + changed_revs.append(rev) + old_val = val + return changed_revs + + def initialized_revs(self): + """ + Get a list of the revisions in which keys were added or + removed in this property. + """ + initialized_revs = [] + old_len = len(self._initial_value) + for rev, val in zip(self._changed_revs, self._changed_values): + if len(val) != old_len: + initialized_revs.append(rev) + old_len = len(val) + return initialized_revs + +class RevisionSet: + """ + A set of revisions, held in dictionary form for easy manipulation. If we + were to rewrite this script for Python 2.3+, we would subclass this from + set (or UserSet). As this class does not include branch + information, it's assumed that one instance will be used per + branch. + """ + def __init__(self, parm): + """Constructs a RevisionSet from a string in property form, or from + a dictionary whose keys are the revisions. Raises ValueError if the + input string is invalid.""" + + self._revs = {} + + revision_range_split_re = re.compile('[-:]') + + if isinstance(parm, types.DictType): + self._revs = parm.copy() + elif isinstance(parm, types.ListType): + for R in parm: + self._revs[int(R)] = 1 + else: + parm = parm.strip() + if parm: + for R in parm.split(","): + rev_or_revs = re.split(revision_range_split_re, R) + if len(rev_or_revs) == 1: + self._revs[int(rev_or_revs[0])] = 1 + elif len(rev_or_revs) == 2: + for rev in range(int(rev_or_revs[0]), + int(rev_or_revs[1])+1): + self._revs[rev] = 1 + else: + raise ValueError, 'Ill formatted revision range: ' + R + + def sorted(self): + revnums = self._revs.keys() + revnums.sort() + return revnums + + def normalized(self): + """Returns a normalized version of the revision set, which is an + ordered list of couples (start,end), with the minimum number of + intervals.""" + revnums = self.sorted() + revnums.reverse() + ret = [] + while revnums: + s = e = revnums.pop() + while revnums and revnums[-1] in (e, e+1): + e = revnums.pop() + ret.append((s, e)) + return ret + + def __str__(self): + """Convert the revision set to a string, using its normalized form.""" + L = [] + for s,e in self.normalized(): + if s == e: + L.append(str(s)) + else: + L.append(str(s) + "-" + str(e)) + return ",".join(L) + + def __contains__(self, rev): + return self._revs.has_key(rev) + + def __sub__(self, rs): + """Compute subtraction as in sets.""" + revs = {} + for r in self._revs.keys(): + if r not in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __and__(self, rs): + """Compute intersections as in sets.""" + revs = {} + for r in self._revs.keys(): + if r in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __nonzero__(self): + return len(self._revs) != 0 + + def __len__(self): + """Return the number of revisions in the set.""" + return len(self._revs) + + def __iter__(self): + return iter(self.sorted()) + + def __or__(self, rs): + """Compute set union.""" + revs = self._revs.copy() + revs.update(rs._revs) + return RevisionSet(revs) + +def merge_props_to_revision_set(merge_props, pathid): + """A converter which returns a RevisionSet instance containing the + revisions from PATH as known to BRANCH_PROPS. BRANCH_PROPS is a + dictionary of pathid -> revision set branch integration information + (as returned by get_merge_props()).""" + if not merge_props.has_key(pathid): + error('no integration info available for path "%s"' % pathid) + return RevisionSet(merge_props[pathid]) + +def dict_from_revlist_prop(propvalue): + """Given a property value as a string containing per-source revision + lists, return a dictionary whose key is a source path identifier + and whose value is the revisions for that source.""" + prop = {} + + # Multiple sources are separated by any whitespace. + for L in propvalue.split(): + # We use rsplit to play safe and allow colons in pathids. + pathid_str, revs = rsplit(L.strip(), ":", 1) + + pathid = PathIdentifier.from_pathid(pathid_str) + + # cache the "external" form we saw + pathid.external_form = pathid_str + + prop[pathid] = revs + return prop + +def get_revlist_prop(url_or_dir, propname, rev=None): + """Given a repository URL or working copy path and a property + name, extract the values of the property which store per-source + revision lists and return a dictionary whose key is a source path + identifier, and whose value is the revisions for that source.""" + + # Note that propget does not return an error if the property does + # not exist, it simply does not output anything. So we do not need + # to check for LaunchError here. + args = '--strict "%s" "%s"' % (propname, url_or_dir) + if rev: + args = '-r %s %s' % (rev, args) + out = launchsvn('propget %s' % args, split_lines=False) + + return dict_from_revlist_prop(out) + +def get_merge_props(dir): + """Extract the merged revisions.""" + return get_revlist_prop(dir, opts["prop"]) + +def get_block_props(dir): + """Extract the blocked revisions.""" + return get_revlist_prop(dir, opts["block-prop"]) + +def get_blocked_revs(dir, source_pathid): + p = get_block_props(dir) + if p.has_key(source_pathid): + return RevisionSet(p[source_pathid]) + return RevisionSet("") + +def format_merge_props(props, sep=" "): + """Formats the hash PROPS as a string suitable for use as a + Subversion property value.""" + assert sep in ["\t", "\n", " "] # must be a whitespace + props = props.items() + props.sort() + L = [] + for h, r in props: + L.append("%s:%s" % (h, r)) + return sep.join(L) + +def _run_propset(dir, prop, value): + """Set the property 'prop' of directory 'dir' to value 'value'. We go + through a temporary file to not run into command line length limits.""" + try: + fd, fname = tempfile.mkstemp() + f = os.fdopen(fd, "wb") + except AttributeError: + # Fallback for Python <= 2.3 which does not have mkstemp (mktemp + # suffers from race conditions. Not that we care...) + fname = tempfile.mktemp() + f = open(fname, "wb") + + try: + f.write(value) + f.close() + report("property data written to temp file: %s" % value) + svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir)) + finally: + os.remove(fname) + +def set_props(dir, name, props): + props = format_merge_props(props) + if props: + _run_propset(dir, name, props) + else: + # Check if NAME exists on DIR before trying to delete it. + # As of 1.6 propdel no longer supports deleting a + # non-existent property. + out = launchsvn('propget "%s" "%s"' % (name, dir)) + if out: + svn_command('propdel "%s" "%s"' % (name, dir)) + +def set_merge_props(dir, props): + set_props(dir, opts["prop"], props) + +def set_block_props(dir, props): + set_props(dir, opts["block-prop"], props) + +def set_blocked_revs(dir, source_pathid, revs): + props = get_block_props(dir) + if revs: + props[source_pathid] = str(revs) + elif props.has_key(source_pathid): + del props[source_pathid] + set_block_props(dir, props) + +def is_url(url): + """Check if url looks like a valid url.""" + return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid' + +def check_url(url): + """Similar to is_url, but actually invoke get_svninfo to find out""" + return get_svninfo(url) != {} + +def is_pathid(pathid): + return isinstance(pathid, PathIdentifier) + +def is_wc(dir): + """Check if a directory is a working copy.""" + return os.path.isdir(os.path.join(dir, ".svn")) or \ + os.path.isdir(os.path.join(dir, "_svn")) + +_cache_svninfo = {} +def get_svninfo(target): + """Extract the subversion information for a target (through 'svn info'). + This function uses an internal cache to let clients query information + many times.""" + if _cache_svninfo.has_key(target): + return _cache_svninfo[target] + info = {} + for L in launchsvn('info "%s"' % target): + L = L.strip() + if not L: + continue + key, value = L.split(": ", 1) + info[key] = value.strip() + _cache_svninfo[target] = info + return info + +def target_to_url(target): + """Convert working copy path or repos URL to a repos URL.""" + if is_wc(target): + info = get_svninfo(target) + return info["URL"] + return target + +_cache_reporoot = {} +def get_repo_root(target): + """Compute the root repos URL given a working-copy path, or a URL.""" + # Try using "svn info WCDIR". This works only on SVN clients >= 1.3 + if not is_url(target): + try: + info = get_svninfo(target) + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except KeyError: + pass + url = target_to_url(target) + assert url[-1] != '/' + else: + url = target + + # Go through the cache of the repository roots. This avoids extra + # server round-trips if we are asking the root of different URLs + # in the same repository (the cache in get_svninfo() cannot detect + # that of course and would issue a remote command). + assert is_url(url) + for r in _cache_reporoot: + if url.startswith(r): + return r + + # Try using "svn info URL". This works only on SVN clients >= 1.2 + try: + info = get_svninfo(url) + # info may be {}, in which case we'll see KeyError here + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except (KeyError, LaunchError): + pass + + # Constrained to older svn clients, we are stuck with this ugly + # trial-and-error implementation. It could be made faster with a + # binary search. + while url: + temp = os.path.dirname(url) + try: + launchsvn('proplist "%s"' % temp) + except LaunchError: + _cache_reporoot[url] = None + return rstrip(url, "/") + url = temp + + error("svn repos root of %s not found" % target) + +class SvnLogParser: + """ + Parse the "svn log", going through the XML output and using pulldom (which + would even allow streaming the command output). + """ + def __init__(self, xml): + self._events = pulldom.parseString(xml) + def __getitem__(self, idx): + for event, node in self._events: + if event == pulldom.START_ELEMENT and node.tagName == "logentry": + self._events.expandNode(node) + return self.SvnLogRevision(node) + raise IndexError, "Could not find 'logentry' tag in xml" + + class SvnLogRevision: + def __init__(self, xmlnode): + self.n = xmlnode + def revision(self): + return int(self.n.getAttribute("revision")) + def author(self): + return self.n.getElementsByTagName("author")[0].firstChild.data + def paths(self): + return [self.SvnLogPath(n) + for n in self.n.getElementsByTagName("path")] + + class SvnLogPath: + def __init__(self, xmlnode): + self.n = xmlnode + def action(self): + return self.n.getAttribute("action") + def pathid(self): + return self.n.firstChild.data + def copyfrom_rev(self): + try: return self.n.getAttribute("copyfrom-rev") + except KeyError: return None + def copyfrom_pathid(self): + try: return self.n.getAttribute("copyfrom-path") + except KeyError: return None + +def get_copyfrom(target): + """Get copyfrom info for a given target (it represents the + repository-relative path from where it was branched). NOTE: + repos root has no copyfrom info. In this case None is returned. + + Returns the: + - source file or directory from which the copy was made + - revision from which that source was copied + - revision in which the copy was committed + """ + repos_path = PathIdentifier.from_target(target).repo_relative_path + for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"' + % target, split_lines=False)): + for p in chg.paths(): + if p.action() == 'A' and p.pathid() == repos_path: + # These values will be None if the corresponding elements are + # not found in the log. + return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision() + return None,None,None + +def get_latest_rev(url): + """Get the latest revision of the repository of which URL is part.""" + try: + info = get_svninfo(url) + if not info.has_key("Revision"): + error("Not a valid URL: %s" % url) + return info["Revision"] + except LaunchError: + # Alternative method for latest revision checking (for svn < 1.2) + report('checking latest revision of "%s"' % url) + L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0] + rev = re.search("revision (\d+)", L).group(1) + report('latest revision of "%s" is %s' % (url, rev)) + return rev + +def get_created_rev(url): + """Lookup the revision at which the path identified by the + provided URL was first created.""" + oldest_rev = -1 + report('determining oldest revision for URL "%s"' % url) + ### TODO: Refactor this to use a modified RevisionLog class. + lines = None + cmd = "log -r1:HEAD --stop-on-copy -q " + url + try: + lines = launchsvn(cmd + " --limit=1") + except LaunchError: + # Assume that --limit isn't supported by the installed 'svn'. + lines = launchsvn(cmd) + if lines and len(lines) > 1: + i = lines[1].find(" ") + if i != -1: + oldest_rev = int(lines[1][1:i]) + if oldest_rev == -1: + error('unable to determine oldest revision for URL "%s"' % url) + return oldest_rev + +def get_commit_log(url, revnum): + """Return the log message for a specific integer revision + number.""" + out = launchsvn("log --incremental -r%d %s" % (revnum, url)) + return recode_stdout_to_file("".join(out[1:])) + +def construct_merged_log_message(url, revnums): + """Return a commit log message containing all the commit messages + in the specified revisions at the given URL. The separator used + in this log message is determined by searching for the longest + svnmerge separator existing in the commit log messages and + extending it by one more separator. This results in a new commit + log message that is clearer in describing merges that contain + other merges. Trailing newlines are removed from the embedded + log messages.""" + messages = [''] + longest_sep = '' + for r in revnums.sorted(): + message = get_commit_log(url, r) + if message: + message = re.sub(r'(\r\n|\r|\n)', "\n", message) + message = rstrip(message, "\n") + "\n" + messages.append(prefix_lines(LOG_LINE_PREFIX, message)) + for match in LOG_SEPARATOR_RE.findall(message): + sep = match[1] + if len(sep) > len(longest_sep): + longest_sep = sep + + longest_sep += LOG_SEPARATOR + "\n" + messages.append('') + return longest_sep.join(messages) + +def get_default_source(branch_target, branch_props): + """Return the default source for branch_target (given its branch_props). + Error out if there is ambiguity.""" + if not branch_props: + error("no integration info available") + + props = branch_props.copy() + pathid = PathIdentifier.from_target(branch_target) + + # To make bidirectional merges easier, find the target's + # repository local path so it can be removed from the list of + # possible integration sources. + if props.has_key(pathid): + del props[pathid] + + if len(props) > 1: + err_msg = "multiple sources found. " + err_msg += "Explicit source argument (-S/--source) required.\n" + err_msg += "The merge sources available are:" + for prop in props: + err_msg += "\n " + str(prop) + error(err_msg) + + return props.keys()[0] + +def should_find_reflected(branch_dir): + should_find_reflected = opts["bidirectional"] + + # If the source has integration info for the target, set find_reflected + # even if --bidirectional wasn't specified + if not should_find_reflected: + source_props = get_merge_props(opts["source-url"]) + should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir)) + + return should_find_reflected + +def analyze_revs(target_pathid, url, begin=1, end=None, + find_reflected=False): + """For the source of the merges in the source URL being merged into + target_pathid, analyze the revisions in the interval begin-end (which + defaults to 1-HEAD), to find out which revisions are changes in + the url, which are changes elsewhere (so-called 'phantom' + revisions), optionally which are reflected changes (to avoid + conflicts that can occur when doing bidirectional merging between + branches), and which revisions initialize merge tracking against other + branches. Return a tuple of four RevisionSet's: + (real_revs, phantom_revs, reflected_revs, initialized_revs). + + NOTE: To maximize speed, if "end" is not provided, the function is + not able to find phantom revisions following the last real + revision in the URL. + """ + + begin = str(begin) + if end is None: + end = "HEAD" + else: + end = str(end) + if long(begin) > long(end): + return RevisionSet(""), RevisionSet(""), \ + RevisionSet(""), RevisionSet("") + + logs[url] = RevisionLog(url, begin, end, find_reflected) + revs = RevisionSet(logs[url].revs) + + if end == "HEAD": + # If end is not provided, we do not know which is the latest revision + # in the repository. So return the phantom revision set only up to + # the latest known revision. + end = str(list(revs)[-1]) + + phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs + + if find_reflected: + reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid) + reflected_revs += logs[url].block_metadata().changed_revs(target_pathid) + else: + reflected_revs = [] + + initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs()) + reflected_revs = RevisionSet(reflected_revs) + + return revs, phantom_revs, reflected_revs, initialized_revs + +def analyze_source_revs(branch_target, source_url, **kwargs): + """For the given branch and source, extract the real and phantom + source revisions.""" + branch_url = target_to_url(branch_target) + branch_pathid = PathIdentifier.from_target(branch_target) + + # Extract the latest repository revision from the URL of the branch + # directory (which is already cached at this point). + end_rev = get_latest_rev(source_url) + + # Calculate the base of analysis. If there is a "1-XX" interval in the + # merged_revs, we do not need to check those. + base = 1 + r = opts["merged-revs"].normalized() + if r and r[0][0] == 1: + base = r[0][1] + 1 + + # See if the user filtered the revision set. If so, we are not + # interested in something outside that range. + if opts["revision"]: + revs = RevisionSet(opts["revision"]).sorted() + if base < revs[0]: + base = revs[0] + if end_rev > revs[-1]: + end_rev = revs[-1] + + return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs) + +def minimal_merge_intervals(revs, phantom_revs): + """Produce the smallest number of intervals suitable for merging. revs + is the RevisionSet which we want to merge, and phantom_revs are phantom + revisions which can be used to concatenate intervals, thus minimizing the + number of operations.""" + revnums = revs.normalized() + ret = [] + + cur = revnums.pop() + while revnums: + next = revnums.pop() + assert next[1] < cur[0] # otherwise it is not ordered + assert cur[0] - next[1] > 1 # otherwise it is not normalized + for i in range(next[1]+1, cur[0]): + if i not in phantom_revs: + ret.append(cur) + cur = next + break + else: + cur = (next[0], cur[1]) + + ret.append(cur) + ret.reverse() + return ret + +def display_revisions(revs, display_style, revisions_msg, source_url): + """Show REVS as dictated by DISPLAY_STYLE, either numerically, in + log format, or as diffs. When displaying revisions numerically, + prefix output with REVISIONS_MSG when in verbose mode. Otherwise, + request logs or diffs using SOURCE_URL.""" + if display_style == "revisions": + if revs: + report(revisions_msg) + print revs + elif display_style == "logs": + for start,end in revs.normalized(): + svn_command('log --incremental -v -r %d:%d %s' % \ + (start, end, source_url)) + elif display_style in ("diffs", "summarize"): + if display_style == 'summarize': + summarize = '--summarize ' + else: + summarize = '' + + for start, end in revs.normalized(): + print + if start == end: + print "%s: changes in revision %d follow" % (NAME, start) + else: + print "%s: changes in revisions %d-%d follow" % (NAME, + start, end) + print + + # Note: the starting revision number to 'svn diff' is + # NOT inclusive so we have to subtract one from ${START}. + svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize, + source_url)) + else: + assert False, "unhandled display style: %s" % display_style + +def action_init(target_dir, target_props): + """Initialize for merges.""" + # Check that directory is ready for being modified + check_dir_clean(target_dir) + + target_pathid = PathIdentifier.from_target(target_dir) + source_pathid = opts['source-pathid'] + if source_pathid == target_pathid: + error("cannot init integration source path '%s'\nIts path identifier does not " + "differ from the path identifier of the current directory, '%s'." + % (source_pathid, target_pathid)) + + source_url = opts['source-url'] + + # If the user hasn't specified the revisions to use, see if the + # "source" is a copy from the current tree and if so, we can use + # the version data obtained from it. + revision_range = opts["revision"] + if not revision_range: + # If source was originally copied from target, and we are merging + # changes from source to target (the copy target is the merge source, + # and the copy source is the merge target), then we want to mark as + # integrated up to the rev in which the copy was committed which + # created the merge source: + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(source_url) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + if target_pathid == cf_pathid: + report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' % + (source_url, target_dir, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + str(copy_committed_in_rev) + + if not revision_range: + # If the reverse is true: copy source is the merge source, and + # the copy target is the merge target, then we want to mark as + # integrated up to the specific rev of the merge target from + # which the merge source was copied. (Longer discussion at: + # http://subversion.tigris.org/issues/show_bug.cgi?id=2810 ) + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(target_dir) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + source_pathid = PathIdentifier.from_target(source_url) + if source_pathid == cf_pathid: + report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' % + (target_dir, source_url, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + cf_rev + + # When neither the merge source nor target is a copy of the other, and + # the user did not specify a revision range, then choose a default which is + # the current revision; saying, in effect, "everything has been merged, so + # mark as integrated up to the latest rev on source url). + if not revision_range: + revision_range = "1-" + get_latest_rev(source_url) + + revs = RevisionSet(revision_range) + + report('marking "%s" as already containing revisions "%s" of "%s"' % + (target_dir, revs, source_url)) + + revs = str(revs) + # If the local svnmerge-integrated property already has an entry + # for the source-pathid, simply error out. + if not opts["force"] and target_props.has_key(source_pathid): + error('Repository-relative path %s has already been initialized at %s\n' + 'Use --force to re-initialize' % (source_pathid, target_dir)) + # set the pathid's external_form based on the user's options + source_pathid.external_form = source_pathid.format(opts['location-type']) + + revs = str(revs) + target_props[source_pathid] = revs + + # Set property + set_merge_props(target_dir, target_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \ + % (NAME, revs) + print >>f, '%s' % source_url + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_avail(branch_dir, branch_props): + """Show commits available for merges.""" + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + report('skipping phantom revisions: %s' % phantom_revs) + if reflected_revs: + report('skipping reflected revisions: %s' % reflected_revs) + report('skipping initialized revisions: %s' % initialized_revs) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \ + reflected_revs - initialized_revs + + # Compose the set of revisions to show + revs = RevisionSet("") + report_msg = "revisions available to be merged are:" + if "avail" in opts["avail-showwhat"]: + revs |= avail_revs + if "blocked" in opts["avail-showwhat"]: + revs |= blocked_revs + report_msg = "revisions blocked are:" + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["avail-display"], + report_msg, + opts["source-url"]) + +def action_integrated(branch_dir, branch_props): + """Show change sets already merged. This set of revisions is + calculated from taking svnmerge-integrated property from the + branch, and subtracting any revision older than the branch + creation revision.""" + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + revs = merge_props_to_revision_set(branch_props, opts["source-pathid"]) + + # Lookup the oldest revision on the branch path. + oldest_src_rev = get_created_rev(opts["source-url"]) + + # Subtract any revisions which pre-date the branch. + report("subtracting revisions which pre-date the source URL (%d)" % + oldest_src_rev) + revs = revs - RevisionSet(range(1, oldest_src_rev)) + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["integrated-display"], + "revisions already integrated are:", opts["source-url"]) + +def action_merge(branch_dir, branch_props): + """Record merge meta data, and do the actual merge (if not + requested otherwise via --record-only).""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + + if opts["revision"]: + revs = RevisionSet(opts["revision"]) + else: + revs = source_revs + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + merged_revs = opts["merged-revs"] + + # Show what we're doing + if opts["verbose"]: # just to avoid useless calculations + if merged_revs & revs: + report('"%s" already contains revisions %s' % (branch_dir, + merged_revs & revs)) + if phantom_revs: + report('memorizing phantom revision(s): %s' % phantom_revs) + if reflected_revs: + report('memorizing reflected revision(s): %s' % reflected_revs) + if blocked_revs & revs: + report('skipping blocked revisions(s): %s' % (blocked_revs & revs)) + if initialized_revs: + report('skipping initialized revision(s): %s' % initialized_revs) + + # Compute final merge set. + revs = revs - merged_revs - blocked_revs - reflected_revs - \ + phantom_revs - initialized_revs + if not revs: + report('no revisions to merge, exiting') + return + + # When manually marking revisions as merged, we only update the + # integration meta data, and don't perform an actual merge. + record_only = opts["record-only"] + + if record_only: + report('recording merge of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('merging in revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the merge(s). Note: the starting revision number to 'svn merge' + # is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + old_block_props = get_block_props(branch_dir) + merge_metadata = logs[opts["source-url"]].merge_metadata() + block_metadata = logs[opts["source-url"]].block_metadata() + for start,end in minimal_merge_intervals(revs, phantom_revs): + if not record_only: + # Preset merge/blocked properties to the source value at + # the start rev to avoid spurious property conflicts + set_merge_props(branch_dir, merge_metadata.get(start - 1)) + set_block_props(branch_dir, block_metadata.get(start - 1)) + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (start - 1, end, opts["source-url"], branch_dir)) + # TODO: to support graph merging, add logic to merge the property + # meta-data manually + + # Update the set of merged revisions. + merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + # Reset the blocked revs + set_block_props(branch_dir, old_block_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded merge of revisions %s via %s from ' % \ + (revs, NAME) + else: + print >>f, 'Merged revisions %s via %s from ' % \ + (revs, NAME) + print >>f, '%s' % opts["source-url"] + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], revs), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_block(branch_dir, branch_props): + """Block revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"]) + revs_to_block = source_revs - opts["merged-revs"] + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_block = RevisionSet(opts["revision"]) & revs_to_block + + if not revs_to_block: + error('no available revisions to block') + + # Change blocked information + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + blocked_revs = blocked_revs | revs_to_block + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_block), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_unblock(branch_dir, branch_props): + """Unblock revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + revs_to_unblock = blocked_revs + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"]) + + if not revs_to_unblock: + error('no available revisions to unblock') + + # Change blocked information + blocked_revs = blocked_revs - revs_to_unblock + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_unblock), + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_rollback(branch_dir, branch_props): + """Rollback previously integrated revisions.""" + + # Make sure the revision arguments are present + if not opts["revision"]: + error("The '-r' option is mandatory for rollback") + + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + # Get the list of all revisions already merged into this source-pathid. + merged_revs = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # At which revision was the src created? + oldest_src_rev = get_created_rev(opts["source-url"]) + src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev) + + # Limit to revisions specified by -r (if any) + revs = merged_revs & RevisionSet(opts["revision"]) + + # make sure there's some revision to rollback + if not revs: + report("Nothing to rollback in revision range r%s" % opts["revision"]) + return + + # If even one specified revision lies outside the lifetime of the + # merge source, error out. + if revs & src_pre_exist_range: + err_str = "Specified revision range falls out of the rollback range.\n" + err_str += "%s was created at r%d" % (opts["source-pathid"], + oldest_src_rev) + error(err_str) + + record_only = opts["record-only"] + + if record_only: + report('recording rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the reverse merge(s). Note: the starting revision number + # to 'svn merge' is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + rollback_intervals = minimal_merge_intervals(revs, []) + # rollback in the reverse order of merge + rollback_intervals.reverse() + for start, end in rollback_intervals: + if not record_only: + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (end, start - 1, opts["source-url"], branch_dir)) + + # Write out commit message if desired + # calculate the phantom revs first + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded rollback of revisions %s via %s from ' % \ + (revs , NAME) + else: + print >>f, 'Rolled back revisions %s via %s from ' % \ + (revs , NAME) + print >>f, '%s' % opts["source-url"] + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + + # Update the set of merged revisions. + merged_revs = merged_revs - revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + +def action_uninit(branch_dir, branch_props): + """Uninit SOURCE URL.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # If the source-pathid does not have an entry in the svnmerge-integrated + # property, simply error out. + if not branch_props.has_key(opts["source-pathid"]): + error('Repository-relative path "%s" does not contain merge ' + 'tracking information for "%s"' \ + % (opts["source-pathid"], branch_dir)) + + del branch_props[opts["source-pathid"]] + + # Set merge property with the selected source deleted + set_merge_props(branch_dir, branch_props) + + # Set blocked revisions for the selected source to None + set_blocked_revs(branch_dir, opts["source-pathid"], None) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Removed merge tracking for "%s" for ' % NAME + print >>f, '%s' % opts["source-url"] + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +############################################################################### +# Command line parsing -- options and commands management +############################################################################### + +class OptBase: + def __init__(self, *args, **kwargs): + self.help = kwargs["help"] + del kwargs["help"] + self.lflags = [] + self.sflags = [] + for a in args: + if a.startswith("--"): self.lflags.append(a) + elif a.startswith("-"): self.sflags.append(a) + else: + raise TypeError, "invalid flag name: %s" % a + if kwargs.has_key("dest"): + self.dest = kwargs["dest"] + del kwargs["dest"] + else: + if not self.lflags: + raise TypeError, "cannot deduce dest name without long options" + self.dest = self.lflags[0][2:] + if kwargs: + raise TypeError, "invalid keyword arguments: %r" % kwargs.keys() + def repr_flags(self): + f = self.sflags + self.lflags + r = f[0] + for fl in f[1:]: + r += " [%s]" % fl + return r + +class Option(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs.setdefault("default", 0) + del kwargs["default"] + self.value = kwargs.setdefault("value", None) + del kwargs["value"] + OptBase.__init__(self, *args, **kwargs) + def apply(self, state, value): + assert value == "" + if self.value is not None: + state[self.dest] = self.value + else: + state[self.dest] += 1 + +class OptionArg(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs["default"] + del kwargs["default"] + self.metavar = kwargs.setdefault("metavar", None) + del kwargs["metavar"] + OptBase.__init__(self, *args, **kwargs) + + if self.metavar is None: + if self.dest is not None: + self.metavar = self.dest.upper() + else: + self.metavar = "arg" + if self.default: + self.help += " (default: %s)" % self.default + def apply(self, state, value): + assert value is not None + state[self.dest] = value + def repr_flags(self): + r = OptBase.repr_flags(self) + return r + " " + self.metavar + +class CommandOpts: + class Cmd: + def __init__(self, *args): + self.name, self.func, self.usage, self.help, self.opts = args + def short_help(self): + return self.help.split(".")[0] + def __str__(self): + return self.name + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) + + def __init__(self, global_opts, common_opts, command_table, version=None): + self.progname = NAME + self.version = version.replace("%prog", self.progname) + self.cwidth = console_width() - 2 + self.ctable = command_table.copy() + self.gopts = global_opts[:] + self.copts = common_opts[:] + self._add_builtins() + for k in self.ctable.keys(): + cmd = self.Cmd(k, *self.ctable[k]) + opts = [] + for o in cmd.opts: + if isinstance(o, types.StringType) or \ + isinstance(o, types.UnicodeType): + o = self._find_common(o) + opts.append(o) + cmd.opts = opts + self.ctable[k] = cmd + + def _add_builtins(self): + self.gopts.append( + Option("-h", "--help", help="show help for this command and exit")) + if self.version is not None: + self.gopts.append( + Option("-V", "--version", help="show version info and exit")) + self.ctable["help"] = (self._cmd_help, + "help [COMMAND]", + "Display help for a specific command. If COMMAND is omitted, " + "display brief command description.", + []) + + def _cmd_help(self, cmd=None, *args): + if args: + self.error("wrong number of arguments", "help") + if cmd is not None: + cmd = self._command(cmd) + self.print_command_help(cmd) + else: + self.print_command_list() + + def _paragraph(self, text, width=78): + chunks = re.split("\s+", text.strip()) + chunks.reverse() + lines = [] + while chunks: + L = chunks.pop() + while chunks and len(L) + len(chunks[-1]) + 1 <= width: + L += " " + chunks.pop() + lines.append(L) + return lines + + def _paragraphs(self, text, *args, **kwargs): + pars = text.split("\n\n") + lines = self._paragraph(pars[0], *args, **kwargs) + for p in pars[1:]: + lines.append("") + lines.extend(self._paragraph(p, *args, **kwargs)) + return lines + + def _print_wrapped(self, text, indent=0): + text = self._paragraphs(text, self.cwidth - indent) + print text.pop(0) + for t in text: + print " " * indent + t + + def _find_common(self, fl): + for o in self.copts: + if fl in o.lflags+o.sflags: + return o + assert False, fl + + def _compute_flags(self, opts, check_conflicts=True): + back = {} + sfl = "" + lfl = [] + for o in opts: + sapp = lapp = "" + if isinstance(o, OptionArg): + sapp, lapp = ":", "=" + for s in o.sflags: + if check_conflicts and back.has_key(s): + raise RuntimeError, "option conflict: %s" % s + back[s] = o + sfl += s[1:] + sapp + for l in o.lflags: + if check_conflicts and back.has_key(l): + raise RuntimeError, "option conflict: %s" % l + back[l] = o + lfl.append(l[2:] + lapp) + return sfl, lfl, back + + def _extract_command(self, args): + """ + Try to extract the command name from the argument list. This is + non-trivial because we want to allow command-specific options even + before the command itself. + """ + opts = self.gopts[:] + for cmd in self.ctable.values(): + opts.extend(cmd.opts) + sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False) + + lopts,largs = getopt.getopt(args, sfl, lfl) + if not largs: + return None + return self._command(largs[0]) + + def _fancy_getopt(self, args, opts, state=None): + if state is None: + state= {} + for o in opts: + if not state.has_key(o.dest): + state[o.dest] = o.default + + sfl, lfl, back = self._compute_flags(opts) + try: + lopts,args = getopt.gnu_getopt(args, sfl, lfl) + except AttributeError: + # Before Python 2.3, there was no gnu_getopt support. + # So we can't parse intermixed positional arguments + # and options. + lopts,args = getopt.getopt(args, sfl, lfl) + + for o,v in lopts: + back[o].apply(state, v) + return state, args + + def _command(self, cmd): + if not self.ctable.has_key(cmd): + self.error("unknown command: '%s'" % cmd) + return self.ctable[cmd] + + def parse(self, args): + if not args: + self.print_small_help() + sys.exit(0) + + cmd = None + try: + cmd = self._extract_command(args) + opts = self.gopts[:] + if cmd: + opts.extend(cmd.opts) + args.remove(cmd.name) + state, args = self._fancy_getopt(args, opts) + except getopt.GetoptError, e: + self.error(e, cmd) + + # Handle builtins + if self.version is not None and state["version"]: + self.print_version() + sys.exit(0) + if state["help"]: # special case for --help + if cmd: + self.print_command_help(cmd) + sys.exit(0) + cmd = self.ctable["help"] + else: + if cmd is None: + self.error("command argument required") + if str(cmd) == "help": + cmd(*args) + sys.exit(0) + return cmd, args, state + + def error(self, s, cmd=None): + print >>sys.stderr, "%s: %s" % (self.progname, s) + if cmd is not None: + self.print_command_help(cmd) + else: + self.print_small_help() + sys.exit(1) + def print_small_help(self): + print "Type '%s help' for usage" % self.progname + def print_usage_line(self): + print "usage: %s <subcommand> [options...] [args...]\n" % self.progname + def print_command_list(self): + print "Available commands (use '%s help COMMAND' for more details):\n" \ + % self.progname + cmds = self.ctable.keys() + cmds.sort() + indent = max(map(len, cmds)) + for c in cmds: + h = self.ctable[c].short_help() + print " %-*s " % (indent, c), + self._print_wrapped(h, indent+6) + def print_command_help(self, cmd): + cmd = self.ctable[str(cmd)] + print 'usage: %s %s\n' % (self.progname, cmd.usage) + self._print_wrapped(cmd.help) + def print_opts(opts, self=self): + if not opts: return + flags = [o.repr_flags() for o in opts] + indent = max(map(len, flags)) + for f,o in zip(flags, opts): + print " %-*s :" % (indent, f), + self._print_wrapped(o.help, indent+5) + print '\nCommand options:' + print_opts(cmd.opts) + print '\nGlobal options:' + print_opts(self.gopts) + + def print_version(self): + print self.version + +############################################################################### +# Options and Commands description +############################################################################### + +global_opts = [ + Option("-F", "--force", + help="force operation even if the working copy is not clean, or " + "there are pending updates"), + Option("-n", "--dry-run", + help="don't actually change anything, just pretend; " + "implies --show-changes"), + Option("-s", "--show-changes", + help="show subversion commands that make changes"), + Option("-v", "--verbose", + help="verbose mode: output more information about progress"), + OptionArg("-u", "--username", + default=None, + help="invoke subversion commands with the supplied username"), + OptionArg("-p", "--password", + default=None, + help="invoke subversion commands with the supplied password"), + OptionArg("-c", "--config-dir", metavar="DIR", + default=None, + help="cause subversion commands to consult runtime config directory DIR"), +] + +common_opts = [ + Option("-b", "--bidirectional", + value=True, + default=False, + help="remove reflected and initialized revisions from merge candidates. " + "Not required but may be specified to speed things up slightly"), + OptionArg("-f", "--commit-file", metavar="FILE", + default="svnmerge-commit-message.txt", + help="set the name of the file where the suggested log message " + "is written to"), + Option("-M", "--record-only", + value=True, + default=False, + help="do not perform an actual merge of the changes, yet record " + "that a merge happened"), + OptionArg("-r", "--revision", + metavar="REVLIST", + default="", + help="specify a revision list, consisting of revision numbers " + 'and ranges separated by commas, e.g., "534,537-539,540"'), + OptionArg("-S", "--source", "--head", + default=None, + help="specify a merge source for this branch. It can be either " + "a working directory path, a full URL, or an unambiguous " + "substring of one of the locations for which merge tracking was " + "already initialized. Needed only to disambiguate in case of " + "multiple merge sources"), +] + +command_table = { + "init": (action_init, + "init [OPTION...] [SOURCE]", + """Initialize merge tracking from SOURCE on the current working + directory. + + If SOURCE is specified, all the revisions in SOURCE are marked as already + merged; if this is not correct, you can use --revision to specify the + exact list of already-merged revisions. + + If SOURCE is omitted, then it is computed from the "svn cp" history of the + current working directory (searching back for the branch point); in this + case, %s assumes that no revision has been integrated yet since + the branch point (unless you teach it with --revision).""" % NAME, + [ + "-f", "-r", # import common opts + OptionArg("-L", "--location-type", + dest="location-type", + default="path", + help="Use this type of location identifier in the new " + + "Subversion properties; 'uuid', 'url', or 'path' " + + "(default)"), + ]), + + "avail": (action_avail, + "avail [OPTION...] [PATH]", + """Show unmerged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to those + also specified in the option. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions.""", + [ + Option("-A", "--all", + dest="avail-showwhat", + value=["blocked", "avail"], + default=["avail"], + help="show both available and blocked revisions (aka ignore " + "blocked revisions)"), + "-b", + Option("-B", "--blocked", + dest="avail-showwhat", + value=["blocked"], + help="show the blocked revision list (see '%s block')" % NAME), + Option("-d", "--diff", + dest="avail-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("--summarize", + dest="avail-display", + value="summarize", + help="show summarized diff instead of revision list"), + Option("-l", "--log", + dest="avail-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "integrated": (action_integrated, + "integrated [OPTION...] [PATH]", + """Show merged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to + those also specified in the option.""", + [ + Option("-d", "--diff", + dest="integrated-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("-l", "--log", + dest="integrated-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "rollback": (action_rollback, + "rollback [OPTION...] [PATH]", + """Rollback previously merged in revisions from PATH. The + --revision option is mandatory, and specifies which revisions + will be rolled back. Only the previously integrated merges + will be rolled back. + + When manually rolling back changes, --record-only can be used to + instruct %s that a manual rollback of a certain revision + already happened, so that it can record it and offer that + revision for merge henceforth.""" % (NAME), + [ + "-f", "-r", "-S", "-M", # import common opts + ]), + + "merge": (action_merge, + "merge [OPTION...] [PATH]", + """Merge in revisions into PATH from its source. If --revision is omitted, + all the available revisions will be merged. In any case, already merged-in + revisions will NOT be merged again. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions. + + When manually merging changes across branches, --record-only can + be used to instruct %s that a manual merge of a certain revision + already happened, so that it can record it and not offer that + revision for merge anymore. Conversely, when there are revisions + which should not be merged, use '%s block'.""" % (NAME, NAME), + [ + "-b", "-f", "-r", "-S", "-M", # import common opts + ]), + + "block": (action_block, + "block [OPTION...] [PATH]", + """Block revisions within PATH so that they disappear from the available + list. This is useful to hide revisions which will not be integrated. + If --revision is omitted, it defaults to all the available revisions. + + Do not use this option to hide revisions that were manually merged + into the branch. Instead, use '%s merge --record-only', which + records that a merge happened (as opposed to a merge which should + not happen).""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "unblock": (action_unblock, + "unblock [OPTION...] [PATH]", + """Revert the effect of '%s block'. If --revision is omitted, all the + blocked revisions are unblocked""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "uninit": (action_uninit, + "uninit [OPTION...] [PATH]", + """Remove merge tracking information from PATH. It cleans any kind of merge + tracking information (including the list of blocked revisions). If there + are multiple sources, use --source to indicate which source you want to + forget about.""", + [ + "-f", "-S", # import common opts + ]), +} + + +def main(args): + global opts + + # Initialize default options + opts = default_opts.copy() + logs.clear() + + optsparser = CommandOpts(global_opts, common_opts, command_table, + version="%%prog r%s\n modified: %s\n\n" + "Copyright (C) 2004,2005 Awarix Inc.\n" + "Copyright (C) 2005, Giovanni Bajo" + % (__revision__, __date__)) + + cmd, args, state = optsparser.parse(args) + opts.update(state) + + source = opts.get("source", None) + branch_dir = "." + + if str(cmd) == "init": + if len(args) == 1: + source = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + elif str(cmd) in command_table.keys(): + if len(args) == 1: + branch_dir = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + else: + assert False, "command not handled: %s" % cmd + + # Validate branch_dir + if not is_wc(branch_dir): + if str(cmd) == "avail": + info = None + # it should be noted here that svn info does not error exit + # if an invalid target is specified to it (as is + # intuitive). so the try, except code is not absolutely + # necessary. but, I retain it to indicate the intuitive + # handling. + try: + info = get_svninfo(branch_dir) + except LaunchError: + pass + # test that we definitely targeted a subversion directory, + # mirroring the purpose of the earlier is_wc() call + if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory": + error('"%s" is neither a valid URL, nor a working directory' % branch_dir) + else: + error('"%s" is not a subversion working directory' % branch_dir) + + # give out some hints as to potential pathids + PathIdentifier.hint(branch_dir) + if source: PathIdentifier.hint(source) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + + # Calculate source_url and source_path + report("calculate source path for the branch") + if not source: + if str(cmd) == "init": + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir) + if not cf_source: + error('no copyfrom info available. ' + 'Explicit source argument (-S/--source) required.') + opts["source-url"] = get_repo_root(branch_dir) + cf_source + opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"]) + + if not opts["revision"]: + opts["revision"] = "1-" + cf_rev + else: + opts["source-pathid"] = get_default_source(branch_dir, branch_props) + opts["source-url"] = opts["source-pathid"].get_url() + + assert is_pathid(opts["source-pathid"]) + assert is_url(opts["source-url"]) + else: + # The source was given as a command line argument and is stored in + # SOURCE. Ensure that the specified source does not end in a /, + # otherwise it's easy to have the same source path listed more + # than once in the integrated version properties, with and without + # trailing /'s. + source = rstrip(source, "/") + if not is_wc(source) and not is_url(source): + # Check if it is a substring of a pathid recorded + # within the branch properties. + found = [] + for pathid in branch_props.keys(): + if pathid.match_substring(source): + found.append(pathid) + if len(found) == 1: + # (assumes pathid is a repository-relative-path) + source_pathid = found[0] + source = source_pathid.get_url() + else: + error('"%s" is neither a valid URL, nor an unambiguous ' + 'substring of a repository path, nor a working directory' + % source) + else: + source_pathid = PathIdentifier.from_target(source) + + source_pathid = PathIdentifier.from_target(source) + if str(cmd) == "init" and \ + source_pathid == PathIdentifier.from_target("."): + error("cannot init integration source path '%s'\n" + "Its repository-relative path must differ from the " + "repository-relative path of the current directory." + % source_pathid) + opts["source-pathid"] = source_pathid + opts["source-url"] = target_to_url(source) + + # Sanity check source_url + assert is_url(opts["source-url"]) + # SVN does not support non-normalized URL (and we should not + # have created them) + assert opts["source-url"].find("/..") < 0 + + report('source is "%s"' % opts["source-url"]) + + # Get previously merged revisions (except when command is init) + if str(cmd) != "init": + opts["merged-revs"] = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # Perform the action + cmd(branch_dir, branch_props) + + +if __name__ == "__main__": + try: + main(sys.argv[1:]) + except LaunchError, (ret, cmd, out): + err_msg = "command execution failed (exit code: %d)\n" % ret + err_msg += cmd + "\n" + err_msg += "".join(out) + error(err_msg) + except KeyboardInterrupt: + # Avoid traceback on CTRL+C + print "aborted by user" + sys.exit(1) diff --git a/staging/subversion/svnserve b/staging/subversion/svnserve new file mode 100755 index 000000000..670fee742 --- /dev/null +++ b/staging/subversion/svnserve @@ -0,0 +1,42 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/svnserve + +PID=`pidof -o %PPID /usr/bin/svnserve` +case "$1" in + start) + stat_busy "Starting svnserve" + if [ -z "$PID" ]; then + if [ -n "$SVNSERVE_USER" ]; then + su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & + else + /usr/bin/svnserve -d $SVNSERVE_ARGS & + fi + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon svnserve + stat_done + fi + ;; + stop) + stat_busy "Stopping svnserve" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon svnserve + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/staging/subversion/svnserve.conf b/staging/subversion/svnserve.conf new file mode 100644 index 000000000..37fb7ea10 --- /dev/null +++ b/staging/subversion/svnserve.conf @@ -0,0 +1,7 @@ +# +# Parameters to be passed to svnserve +# +#SVNSERVE_ARGS="-r /path/to/some/repos" +SVNSERVE_ARGS="" + +#SVNSERVE_USER="svn" diff --git a/testing/cronie/PKGBUILD b/testing/cronie/PKGBUILD index a455e705b..795884823 100644 --- a/testing/cronie/PKGBUILD +++ b/testing/cronie/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname='cronie' -pkgver=1.4.7 -pkgrel=9 +pkgver=1.4.8 +pkgrel=1 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -13,17 +13,14 @@ optdepends=('smtp-server: sending cron job output via email') source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'cron.deny' - 'crontab' 'pam.d' 'rc.d') -sha1sums=('c6644ba0e58bcb14e0bb3f925e3e8cc3f0d47a7f' +sha1sums=('1d2ce3a6ca2a6f96ff31921e4060be3199dc10f3' '0f279b8fb820340267d578dc85511c980715f91e' - '4059bc4ccb75f08b0d4970940799e5d9722b339f' '5eff7fb31f6bc0a924243ff046704726cf20c221' 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') -backup=('etc/crontab' - 'etc/anacrontab' +backup=('etc/anacrontab' 'etc/conf.d/crond' 'etc/pam.d/crond' 'etc/cron.deny') @@ -57,7 +54,6 @@ package() { install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond - install -Dm644 ../crontab "${pkgdir}"/etc/crontab install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly diff --git a/testing/llvm/PKGBUILD b/testing/llvm/PKGBUILD new file mode 100644 index 000000000..3aeb30afa --- /dev/null +++ b/testing/llvm/PKGBUILD @@ -0,0 +1,231 @@ +# $Id: PKGBUILD 129537 2011-06-28 18:36:08Z foutrelis $ +# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Sebastian Nowicki <sebnow@gmail.com> +# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> +# Contributor: Tobias Kieslich <tobias@justdreams.de> +# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> +# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> +# Contributor: Roberto Alsina <ralsina@kde.org> +# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> + +pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') +pkgver=2.9 +_gcc_ver=4.6.1 +pkgrel=6 +arch=('i686' 'x86_64') +url="http://llvm.org/" +license=('custom:University of Illinois/NCSA Open Source License') +makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver") +source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz + http://llvm.org/releases/$pkgver/clang-$pkgver.tgz + ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz + clang-plugin-loader-registry.patch + cindexer-clang-path.patch + clang-toolchains-gcc-versions.patch + clang-pure64.patch + enable-lto.patch + bug-9869-operator-h-c++0x.patch) +md5sums=('793138412d2af2c7c7f54615f8943771' + '634de18d04b7a4ded19ec4c17d23cfca' + '70e23a3dc2b38ecb2bb4d2c48f47295d' + '02c23b4aaca3445b8bf39fddb2f9906e' + '87a7162dbe99e9ffce6c40bd09f5f4f0' + '016d70145d52255c9a46fedde51634e2' + '225ee6b531f8327f34f344a18cb4ec81' + '8f7582d7440e4a8342c3aea9ec714fb4' + '047cac563a557463d7ec6bd87d953f5e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # At the present, clang must reside inside the LLVM source code tree to build + # See http://llvm.org/bugs/show_bug.cgi?id=4840 + rm -rf tools/clang + cp -r "$srcdir/clang-$pkgver" tools/clang + + # Fix symbolic links from OCaml bindings to LLVM libraries + sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml + + # Fix installation directories, ./configure doesn't seem to set them right + sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ + -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \ + -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ + Makefile.config.in + + # Fix insecure rpath (http://bugs.archlinux.org/task/14017) + sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules + + # Get the correct list of symbols to export + # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html + patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch" + + # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) + patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" + + # Add GCC 4.6.1 to GccVersions (FS#23631) + patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" + + if [[ $CARCH == x86_64 ]]; then + # Adjust lib paths + patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" + fi + + # Make -flto work + # Use gold instead of default linker, and always use the plugin + patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" + + # Fix upstream bug #9869: + # Operator.h incompatibility with GCC 4.6 in C++0x mode + patch -Np2 -i "$srcdir/bug-9869-operator-h-c++0x.patch" + + # Apply strip option to configure + _optimized_switch="enable" + [[ $(check_option strip) == n ]] && _optimized_switch="disable" + + # Include location of libffi headers in CPPFLAGS + export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" + + # TODO: Uncomment when clang works with GCC 4.6+ + #_cxx_headers="/usr/include/c++/$_gcc_ver" + #if [[ ! -d $_cxx_headers ]]; then + # error "Couldn't find the C++ headers, PKGBUILD needs fixing!" + # return 1 + #fi + _cxx_headers="/usr/include/c++/clang-$pkgver" + + _32bit_headers="" + if [[ $CARCH == x86_64 ]]; then + # Important for multilib + _32bit_headers="32" + fi + + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib/llvm \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-libffi \ + --enable-targets=all \ + --disable-expensive-checks \ + --disable-debug-runtime \ + --disable-assertions \ + --with-binutils-include=/usr/include \ + --with-cxx-include-root=$_cxx_headers \ + --with-cxx-include-arch=$CHOST \ + --with-cxx-include-32bit-dir=$_32bit_headers \ + --$_optimized_switch-optimized + + make REQUIRES_RTTI=1 +} + +package_llvm() { + pkgdesc="Low Level Virtual Machine" + depends=('perl' 'libffi') + + cd "$srcdir/$pkgname-$pkgver" + + # We move the clang directory out of the tree so it won't get installed and + # then we bring it back in for the clang package + mv tools/clang "$srcdir" + # -j1 is due to race conditions during the installation of the OCaml bindings + make -j1 DESTDIR="$pkgdir" install + mv "$srcdir/clang" tools + + # OCaml bindings go to a separate package + rm -rf "$srcdir"/{ocaml,ocamldoc} + mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir" + + # Remove duplicate files installed by the OCaml bindings + rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz} + + # Fix permissions of static libs + chmod -x "$pkgdir"/usr/lib/llvm/*.a + + # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) + sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config" + + # Get rid of example Hello transformation + rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* + + # Symlink the gold plugin where clang expects it + ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so" + + # Add ld.so.conf.d entry + install -d "$pkgdir/etc/ld.so.conf.d" + echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf" + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_llvm-ocaml() { + pkgdesc="OCaml bindings for LLVM" + depends=("llvm=$pkgver-$pkgrel" 'ocaml') + + cd "$srcdir/llvm-$pkgver" + + install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} + cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" + cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm" + + # Remove execute bit from static libraries + chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE" +} + +package_clang() { + pkgdesc="C language family frontend for LLVM" + url="http://clang.llvm.org/" + # It looks like clang still needs GCC to assemble and link object files + # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html + depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver") + + # Fix installation path for clang docs + sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ + "$srcdir/llvm-$pkgver/Makefile.config" + + cd "$srcdir/llvm-$pkgver/tools/clang" + make DESTDIR="$pkgdir" install + + # Fix permissions of static libs + chmod -x "$pkgdir"/usr/lib/llvm/*.a + + # Revert the path change in case we want to do a repackage later + sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ + "$srcdir/llvm-$pkgver/Makefile.config" + + # Install old libstdc++ headers. Contains combined headers from + # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64 + install -d "$pkgdir/usr/include/c++" + cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver" + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" +} + +package_clang-analyzer() { + pkgdesc="A source code analysis framework" + url="http://clang-analyzer.llvm.org/" + depends=("clang=$pkgver-$pkgrel" 'python2') + + cd "$srcdir/llvm-$pkgver/tools/clang" + + install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} + for _tool in scan-{build,view}; do + cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/" + ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" + done + + # Use Python 2 + sed -i 's/env python$/\02/' \ + "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \ + "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer" + + # Compile Python scripts + python2 -m compileall "$pkgdir/usr/lib/clang-analyzer" + python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer" + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/llvm/bug-9869-operator-h-c++0x.patch b/testing/llvm/bug-9869-operator-h-c++0x.patch new file mode 100644 index 000000000..b95d7d772 --- /dev/null +++ b/testing/llvm/bug-9869-operator-h-c++0x.patch @@ -0,0 +1,57 @@ +--- llvm/trunk/include/llvm/Operator.h 2011/02/07 16:40:21 125006 ++++ llvm/trunk/include/llvm/Operator.h 2011/05/08 01:59:22 131062 +@@ -186,28 +186,46 @@ + }; + + class AddOperator +- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {}; ++ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> { ++ ~AddOperator(); // DO NOT IMPLEMENT ++}; + class SubOperator +- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {}; ++ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> { ++ ~SubOperator(); // DO NOT IMPLEMENT ++}; + class MulOperator +- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {}; ++ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> { ++ ~MulOperator(); // DO NOT IMPLEMENT ++}; + class ShlOperator +- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {}; ++ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> { ++ ~ShlOperator(); // DO NOT IMPLEMENT ++}; + + + class SDivOperator +- : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {}; ++ : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> { ++ ~SDivOperator(); // DO NOT IMPLEMENT ++}; + class UDivOperator +- : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {}; ++ : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> { ++ ~UDivOperator(); // DO NOT IMPLEMENT ++}; + class AShrOperator +- : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {}; ++ : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> { ++ ~AShrOperator(); // DO NOT IMPLEMENT ++}; + class LShrOperator +- : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {}; ++ : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> { ++ ~LShrOperator(); // DO NOT IMPLEMENT ++}; + + + + class GEPOperator + : public ConcreteOperator<Operator, Instruction::GetElementPtr> { ++ ~GEPOperator(); // DO NOT IMPLEMENT ++ + enum { + IsInBounds = (1 << 0) + }; diff --git a/testing/llvm/cindexer-clang-path.patch b/testing/llvm/cindexer-clang-path.patch new file mode 100644 index 000000000..ddaab690e --- /dev/null +++ b/testing/llvm/cindexer-clang-path.patch @@ -0,0 +1,10 @@ +--- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 ++++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 +@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP + + // We now have the CIndex directory, locate clang relative to it. + LibClangPath.eraseComponent(); ++ LibClangPath.eraseComponent(); + #endif + + LibClangPath.appendComponent("clang"); diff --git a/testing/llvm/clang-plugin-loader-registry.patch b/testing/llvm/clang-plugin-loader-registry.patch new file mode 100644 index 000000000..f46eb9fce --- /dev/null +++ b/testing/llvm/clang-plugin-loader-registry.patch @@ -0,0 +1,11 @@ +diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map +--- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200 ++++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300 +@@ -2,6 +2,7 @@ + global: main; + __progname; + environ; ++ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE; + + local: *; + }; diff --git a/testing/llvm/clang-pure64.patch b/testing/llvm/clang-pure64.patch new file mode 100644 index 000000000..da6178519 --- /dev/null +++ b/testing/llvm/clang-pure64.patch @@ -0,0 +1,38 @@ +Index: lib/Driver/Tools.cpp +=================================================================== +--- lib/Driver/Tools.cpp (revision 123373) ++++ lib/Driver/Tools.cpp (working copy) +@@ -3306,7 +3306,7 @@ + else if (ToolChain.getArch() == llvm::Triple::arm) + CmdArgs.push_back("/lib/ld-linux.so.3"); + else +- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); ++ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); + } + + CmdArgs.push_back("-o"); +Index: lib/Driver/ToolChains.cpp +=================================================================== +--- lib/Driver/ToolChains.cpp (revision 123373) ++++ lib/Driver/ToolChains.cpp (working copy) +@@ -1317,18 +1317,10 @@ + if (Arch == llvm::Triple::x86) + Suffix64 = "/64"; + +- std::string Lib32 = "lib"; +- +- bool Exists; +- if (!llvm::sys::fs::exists("/lib32", Exists) && Exists) +- Lib32 = "lib32"; +- ++ std::string Lib32 = "lib32"; + std::string Lib64 = "lib"; +- bool Symlink; +- if (!llvm::sys::fs::exists("/lib64", Exists) && Exists && +- (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink)) +- Lib64 = "lib64"; + ++ bool Exists; + std::string GccTriple = ""; + if (Arch == llvm::Triple::arm) { + if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) && diff --git a/testing/llvm/clang-toolchains-gcc-versions.patch b/testing/llvm/clang-toolchains-gcc-versions.patch new file mode 100644 index 000000000..7e0083791 --- /dev/null +++ b/testing/llvm/clang-toolchains-gcc-versions.patch @@ -0,0 +1,12 @@ +diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp +--- clang-2.9.orig/lib/Driver/ToolChains.cpp 2011-03-21 23:29:27.000000000 +0200 ++++ clang-2.9/lib/Driver/ToolChains.cpp 2011-04-08 00:03:34.000000000 +0300 +@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const + GccTriple = "i586-suse-linux"; + } + +- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", ++ const char* GccVersions[] = {"4.6.1", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", + "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2", + "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1", + "4.2"}; diff --git a/testing/llvm/enable-lto.patch b/testing/llvm/enable-lto.patch new file mode 100644 index 000000000..40d93104a --- /dev/null +++ b/testing/llvm/enable-lto.patch @@ -0,0 +1,36 @@ +Index: lib/Driver/ToolChains.cpp +=================================================================== +--- lib/Driver/ToolChains.cpp (revision 123373) ++++ lib/Driver/ToolChains.cpp (working copy) +@@ -1398,11 +1398,11 @@ + Lib = Lib64; + } + +- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); ++ llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold"); + if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) + Linker = LinkerPath.str(); + else +- Linker = GetProgramPath("ld"); ++ Linker = GetProgramPath("ld.gold"); + + LinuxDistro Distro = DetectLinuxDistro(Arch); + +Index: lib/Driver/Tools.cpp +=================================================================== +--- lib/Driver/Tools.cpp (revision 123373) ++++ lib/Driver/Tools.cpp (working copy) +@@ -3412,11 +3412,11 @@ + } + } + +- if (Args.hasArg(options::OPT_use_gold_plugin)) { ++ // if (Args.hasArg(options::OPT_use_gold_plugin)) { + CmdArgs.push_back("-plugin"); + std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; + CmdArgs.push_back(Args.MakeArgString(Plugin)); +- } ++ // } + + C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs)); + } diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD new file mode 100644 index 000000000..78e063ee7 --- /dev/null +++ b/testing/sqlite3/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 129519 2011-06-28 15:50:46Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgbase="sqlite3" +pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') +_amalgamationver=3070700 +_amalgamationver2=${_amalgamationver/00/} +_docver=${_amalgamationver} #3070700 +pkgver=${_amalgamationver2//0/.} +pkgrel=1 +pkgdesc="A C library that implements an SQL database engine" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.sqlite.org/" +makedepends=('tcl' 'readline>=6.0.00') +source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) + http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz + #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip + http://www.sqlite.org/sqlite-doc-${_docver}.zip + license.txt) +options=('!libtool' '!emptydirs') +md5sums=('a98df57053adf4c132b6b7ab59e9f333' + '91a9a3327b46d6d0a1341e9c95cba1e9' + 'c1cdbc5544034d9012e421e75a5e4890') + +build() { + export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" + + # build sqlite + cd "$srcdir"/sqlite-autoconf-$_amalgamationver + ./configure --prefix=/usr \ + --disable-static + make + + # build the tcl extension + cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea + ./configure --prefix=/usr \ + --with-system-sqlite + make + +} + +package_sqlite3() { + + pkgdesc="A C library that implements an SQL database engine" + depends=('readline>=6.0.00') + conflicts=('sqlite') + replaces=('sqlite') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver + make DESTDIR=${pkgdir} install + + # license + install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt +} + +package_sqlite3-tcl() { + + pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" + depends=('sqlite3>=3.7.5') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea + make DESTDIR=${pkgdir} install +} + +package_sqlite3-doc() { + pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation" + #arch=('any') - not yet supported + + #cd ${srcdir}/sqlite-doc-${_amalgamationver} + cd ${srcdir}/sqlite-doc-${_docver} + mkdir -p ${pkgdir}/usr/share/doc/${pkgbase} + cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/ +} diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt new file mode 100644 index 000000000..118c5d5e6 --- /dev/null +++ b/testing/sqlite3/license.txt @@ -0,0 +1,33 @@ +SQLite Copyright +SQLite is in the +Public Domain + + +All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. + +The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. + +All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. +Obtaining An Explicit License To Use SQLite + +Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: +You are using SQLite in a jurisdiction that does not recognize the public domain. +You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. +You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. +Your legal department tells you that you have to purchase a license. + +If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. +Contributed Code + +In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: +The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. + +We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to: +Hwaci +6200 Maple Cove Lane +Charlotte, NC 28269 +USA + +A template copyright release is available in PDF or HTML. You can use this release to make future changes. + +see http://www.sqlite.org/copyright.html
\ No newline at end of file diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD new file mode 100644 index 000000000..c54007652 --- /dev/null +++ b/testing/syslog-ng/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 129498 2011-06-28 13:40:42Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Maintainer: Eric BĂ©langer <eric@archlinux.org> +# Maintainer: Aaron Griffin <aaron@archlinux.org> + +pkgname=syslog-ng +pkgver=3.2.4 +pkgrel=2 +pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" +arch=('i686' 'x86_64') +license=('GPL2') +groups=('base') +url="http://www.balabit.com/network-security/syslog-ng/" +depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap' 'awk') +makedepends=('flex' 'pkg-config') +optdepends=('logrotate: for rotating log files') +provides=('logger') +options=('!libtool') +backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \ + 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') +source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz + non-blocking-systemd-fds.patch + syslog-ng.conf syslog-ng.logrotate syslog-ng.rc cap_syslog.patch) +md5sums=('5995f7dad0053a478b60a63f6f754203' + '25e43afe51eb2223c25168e3c3e7aaf6' + '344dddfff946300f5576b13a7e8ea19f' + '735636090be4582885974542d2a75855' + '8b4441343d859c2f01c2cf799a7e6f98' + '46e5dcff71f820d497898331a3f608fe') +sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1' + '73b83deae9a8b945dfb13adf331e6bf6f119b83e' + 'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f' + 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' + '4481819762fd1b6f25903016a8878e63c0058fcb' + 'f093a09626a528d23f0f2aeece018cab15a735a9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # fix #22555 for kernels >=2.6.38 + patch -p1 -i ../cap_syslog.patch + + # fix systemd blocking FD bug + # https://bugzilla.balabit.com/show_bug.cgi?id=125 + patch -Np1 < "$srcdir/non-blocking-systemd-fds.patch" + + ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \ + --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \ + --enable-tcp-wrapper \ + --with-pidfile-dir=/var/run \ + --disable-spoof-source \ + --enable-systemd + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -dm755 "${pkgdir}/var/lib/syslog-ng" "${pkgdir}/etc/syslog-ng/patterndb.d" + install -Dm644 "${srcdir}/syslog-ng.conf" "${pkgdir}/etc/syslog-ng/syslog-ng.conf" + install -Dm644 "${srcdir}/syslog-ng.logrotate" "${pkgdir}/etc/logrotate.d/syslog-ng" + install -Dm755 "${srcdir}/syslog-ng.rc" "${pkgdir}/etc/rc.d/syslog-ng" + install -Dm644 "doc/examples/syslog-ng.service" "$pkgdir/lib/systemd/system/syslog-ng.service" +} diff --git a/testing/syslog-ng/cap_syslog.patch b/testing/syslog-ng/cap_syslog.patch new file mode 100644 index 000000000..b6e6db6e4 --- /dev/null +++ b/testing/syslog-ng/cap_syslog.patch @@ -0,0 +1,101 @@ +diff --git a/lib/gprocess.h b/lib/gprocess.h +index cda35b0..5c449f7 100644 +--- a/lib/gprocess.h ++++ b/lib/gprocess.h +@@ -28,9 +28,14 @@ + #include "syslog-ng.h" + + #include <sys/types.h> ++#include <sys/utsname.h> + + #if ENABLE_LINUX_CAPS + # include <sys/capability.h> ++# ++# ifndef CAP_SYSLOG ++# define CAP_SYSLOG 34 ++# endif + #endif + + typedef enum +@@ -78,5 +83,8 @@ void g_process_finish(void); + + void g_process_add_option_group(GOptionContext *ctx); + ++extern int kernel_version; ++extern void get_kernel_version(void); ++#define LINUX_VERSION(x,y,z) (0x10000*(x) + 0x100*(y) + z) + + #endif +diff --git a/modules/affile/affile.c b/modules/affile/affile.c +index e145324..886fa72 100644 +--- a/modules/affile/affile.c ++++ b/modules/affile/affile.c +@@ -59,7 +59,12 @@ affile_open_file(gchar *name, gint flags, + if (privileged) + { + g_process_cap_modify(CAP_DAC_READ_SEARCH, TRUE); +- g_process_cap_modify(CAP_SYS_ADMIN, TRUE); ++ if (!kernel_version) ++ get_kernel_version(); ++ if (kernel_version < LINUX_VERSION(2, 6, 38)) ++ g_process_cap_modify(CAP_SYS_ADMIN, TRUE); ++ else ++ g_process_cap_modify(CAP_SYSLOG, TRUE); + } + else + { +diff --git a/syslog-ng/main.c b/syslog-ng/main.c +index 9880c1f..ee5031b 100644 +--- a/syslog-ng/main.c ++++ b/syslog-ng/main.c +@@ -67,6 +67,7 @@ static gboolean syntax_only = FALSE; + static gboolean display_version = FALSE; + static gchar *ctlfilename = PATH_CONTROL_SOCKET; + static gchar *preprocess_into = NULL; ++int kernel_version; + + static volatile sig_atomic_t sig_hup_received = FALSE; + static volatile sig_atomic_t sig_term_received = FALSE; +@@ -363,6 +364,20 @@ version(void) + ON_OFF_STR(ENABLE_PACCT_MODULE)); + } + ++void ++get_kernel_version(void) { ++ static struct utsname uts; ++ int x = 0, y = 0, z = 0; ++ ++ if (uname(&uts) == -1) { ++ fprintf(stderr, "Unable to retrieve kernel version.\n"); ++ exit(1); ++ } ++ ++ sscanf(uts.release, "%d.%d.%d", &x, &y, &z); ++ kernel_version = LINUX_VERSION(x, y, z); ++} ++ + int + main(int argc, char *argv[]) + { +@@ -379,9 +394,20 @@ main(int argc, char *argv[]) + * indicate readability. Enabling/disabling cap_sys_admin on every poll + * invocation seems to be too expensive. So I enable it for now. */ + +- g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," ++ if (!kernel_version) ++ get_kernel_version(); ++ if (kernel_version < LINUX_VERSION(2, 6, 34)) ++ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," + "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner=p " + "cap_sys_admin=ep"); ++ else if (kernel_version < LINUX_VERSION(2, 6, 38)) ++ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," ++ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner," ++ "cap_sys_admin=p"); ++ else ++ g_process_set_caps("cap_net_bind_service,cap_net_broadcast,cap_net_raw," ++ "cap_dac_read_search,cap_dac_override,cap_chown,cap_fowner," ++ "cap_syslog=p"); + ctx = g_option_context_new("syslog-ng"); + g_process_add_option_group(ctx); + msg_add_option_group(ctx); diff --git a/testing/syslog-ng/non-blocking-systemd-fds.patch b/testing/syslog-ng/non-blocking-systemd-fds.patch new file mode 100644 index 000000000..bd056088b --- /dev/null +++ b/testing/syslog-ng/non-blocking-systemd-fds.patch @@ -0,0 +1,32 @@ +From 2f214c4f87d944aa28d53e331a67b1fd88d9840f Mon Sep 17 00:00:00 2001 +From: Balazs Scheidler <bazsi@balabit.hu> +Date: Wed, 22 Jun 2011 12:50:53 +0200 +Subject: [PATCH] systemd: make sure the acquired fd is in non-blocking mode + +The fd acquired from systemd is in blocking mode, and syslog-ng +didn't explicitly set it to non-blocking, causing syslog-ng +to stall. This patch changes that, explicitly enables +O_NONBLOCK and O_CLOEXEC on systemd acquired fds. + +Reported-By: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> +Signed-off-by: Balazs Scheidler <bazsi@balabit.hu> +--- + modules/afsocket/afunix.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/modules/afsocket/afunix.c b/modules/afsocket/afunix.c +index cd9c205..9a4e37b 100644 +--- a/modules/afsocket/afunix.c ++++ b/modules/afsocket/afunix.c +@@ -108,6 +108,8 @@ afunix_sd_acquire_socket(AFSocketSourceDriver *s, gint *result_fd) + + if (*result_fd != -1) + { ++ g_fd_set_nonblock(*result_fd, TRUE); ++ g_fd_set_cloexec(*result_fd, TRUE); + msg_verbose("Acquired systemd socket", + evt_tag_str("filename", self->filename), + evt_tag_int("systemd-sock-fd", *result_fd), +-- +1.7.5.4 + diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..6e3362681 --- /dev/null +++ b/testing/syslog-ng/syslog-ng.conf @@ -0,0 +1,92 @@ +@version: 3.2 +# +# /etc/syslog-ng/syslog-ng.conf +# + +options { + stats_freq (0); + flush_lines (0); + time_reopen (10); + log_fifo_size (1000); + long_hostnames(off); + use_dns (no); + use_fqdn (no); + create_dirs (no); + keep_hostname (yes); + perm(0640); + group("log"); +}; + +source src { + unix-dgram("/dev/log"); + internal(); + file("/proc/kmsg"); +}; + +destination d_authlog { file("/var/log/auth.log"); }; +destination d_syslog { file("/var/log/syslog.log"); }; +destination d_cron { file("/var/log/crond.log"); }; +destination d_daemon { file("/var/log/daemon.log"); }; +destination d_kernel { file("/var/log/kernel.log"); }; +destination d_lpr { file("/var/log/lpr.log"); }; +destination d_user { file("/var/log/user.log"); }; +destination d_uucp { file("/var/log/uucp.log"); }; +destination d_mail { file("/var/log/mail.log"); }; +destination d_news { file("/var/log/news.log"); }; +destination d_ppp { file("/var/log/ppp.log"); }; +destination d_debug { file("/var/log/debug.log"); }; +destination d_messages { file("/var/log/messages.log"); }; +destination d_errors { file("/var/log/errors.log"); }; +destination d_everything { file("/var/log/everything.log"); }; +destination d_iptables { file("/var/log/iptables.log"); }; +destination d_acpid { file("/var/log/acpid.log"); }; +destination d_console { usertty("root"); }; + +# Log everything to tty12 +destination console_all { file("/dev/tty12"); }; + +filter f_auth { facility(auth); }; +filter f_authpriv { facility(auth, authpriv); }; +filter f_syslog { program(syslog-ng); }; +filter f_cron { facility(cron); }; +filter f_daemon { facility(daemon); }; +filter f_kernel { facility(kern) and not filter(f_iptables); }; +filter f_lpr { facility(lpr); }; +filter f_mail { facility(mail); }; +filter f_news { facility(news); }; +filter f_user { facility(user); }; +filter f_uucp { facility(uucp); }; +filter f_ppp { facility(local2); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; +filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; +filter f_emergency { level(emerg); }; +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; +filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; +filter f_acpid { program("acpid"); }; + +log { source(src); filter(f_acpid); destination(d_acpid); }; +log { source(src); filter(f_authpriv); destination(d_authlog); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_cron); destination(d_cron); }; +log { source(src); filter(f_daemon); destination(d_daemon); }; +log { source(src); filter(f_kernel); destination(d_kernel); }; +log { source(src); filter(f_lpr); destination(d_lpr); }; +log { source(src); filter(f_mail); destination(d_mail); }; +log { source(src); filter(f_news); destination(d_news); }; +log { source(src); filter(f_ppp); destination(d_ppp); }; +log { source(src); filter(f_user); destination(d_user); }; +log { source(src); filter(f_uucp); destination(d_uucp); }; +#log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); filter(f_messages); destination(d_messages); }; +log { source(src); filter(f_err); destination(d_errors); }; +log { source(src); filter(f_emergency); destination(d_console); }; +log { source(src); filter(f_everything); destination(d_everything); }; +log { source(src); filter(f_iptables); destination(d_iptables); }; + +# Log everything to tty12 +#log { source(src); destination(console_all); }; diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate new file mode 100644 index 000000000..e0e6929f2 --- /dev/null +++ b/testing/syslog-ng/syslog-ng.logrotate @@ -0,0 +1,7 @@ +/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { + missingok + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true + endscript +} diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc new file mode 100755 index 000000000..bb5320b2c --- /dev/null +++ b/testing/syslog-ng/syslog-ng.rc @@ -0,0 +1,63 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +checkconfig() { + syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf + if [ $? -gt 0 ]; then + stat_busy "Configuration error. Please fix your config file (/etc/syslog-ng/syslog-ng.conf)." + stat_fail + exit 0 + fi +} + +PID=`pidof -o %PPID /usr/sbin/syslog-ng` +case "$1" in + start) + stat_busy "Starting Syslog-NG" + checkconfig + [ -z "$PID" ] && /usr/sbin/syslog-ng + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon syslog-ng + stat_done + fi + ;; + stop) + stat_busy "Stopping Syslog-NG" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/syslog-ng.pid +# Removing stale syslog-ng.persist file. Its new location, as of 2.0.6-1, is /var/lib/syslog-ng/ + rm -f /var/syslog-ng.persist + rm_daemon syslog-ng + stat_done + fi + ;; + reload) + stat_busy "Reloading Syslog-NG configuration and re-opening log files" + if [ -z "$PID" ]; then + stat_fail + else + checkconfig + kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart|reload}" +esac +exit 0 |