diff options
| author | root <root@rshg047.dnsready.net> | 2011-07-07 04:59:01 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-07-07 04:59:01 +0000 |
| commit | 75b1bc45a0e39074e42b6a26a9f72ac2e049bdc1 (patch) | |
| tree | 9bd2c1fbe4c9a0fd5ede1a5667137113d48d2c69 | |
| parent | a135f8563fea25509d9a92db7c03ac3d08230a3f (diff) | |
Thu Jul 7 04:59:01 UTC 2011
80 files changed, 1148 insertions, 314 deletions
diff --git a/community-testing/lightspark/PKGBUILD b/community-testing/lightspark/PKGBUILD new file mode 100644 index 000000000..4dc7cf4cd --- /dev/null +++ b/community-testing/lightspark/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=lightspark +pkgver=0.5.0rc1 +pkgrel=1 +pkgdesc='An alternative Flash Player for Linux.' +arch=('i686' 'x86_64') +url='http://lightspark.sourceforge.net' +license=('LGPL3') +conflicts=('lightspark-git') +depends=('mesa' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++') +makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost') +optdepends=('gnash-gtk: fallback support') +install="lightspark.install" +source=("http://launchpad.net/lightspark/trunk/lightspark-0.5.0/+download/lightspark-0.5.0~rc1.tar.gz") +md5sums=('bf668cf6178fbbb75a7898bd6c6dd1e5') +_pkgver='0.5.0~rc1' + +build() { + rm -rf build + mkdir build + cd build + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCOMPILE_PLUGIN=1 \ + -DCMAKE_BUILD_TYPE=Release \ + -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ + ../lightspark-${_pkgver} + + make +} + +package() { + cd build + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/lightspark/lightspark.install b/community-testing/lightspark/lightspark.install new file mode 100644 index 000000000..75e2b7b55 --- /dev/null +++ b/community-testing/lightspark/lightspark.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community/dsniff/PKGBUILD b/community/dsniff/PKGBUILD index a5a66f858..f7428aa09 100644 --- a/community/dsniff/PKGBUILD +++ b/community/dsniff/PKGBUILD @@ -1,36 +1,36 @@ -# $Id: PKGBUILD 44707 2011-04-11 12:21:58Z spupykin $ +# $Id: PKGBUILD 49679 2011-06-19 07:23:27Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ViNS <gladiator@fastwebnet.it> pkgname=dsniff pkgver=2.4b1 -pkgrel=19 +pkgrel=20 pkgdesc="Collection of tools for network auditing and penetration testing" url="http://www.monkey.org/~dugsong/dsniff/" arch=('i686' 'x86_64') license=('BSD') -depends=('libpcap' 'openssl' 'db' 'libxmu' 'glib2' 'libnet' 'libnids') -source=(http://www.monkey.org/~dugsong/dsniff/beta/$pkgname-$pkgver.tar.gz \ - http://ftp.de.debian.org/debian/pool/main/d/dsniff/dsniff_2.4b1+debian-18.diff.gz) +depends=('libpcap' 'openssl' 'libxmu' 'glib2' 'libnet' 'libnids') +source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz" + "http://ftp.de.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_2.4b1+debian-18.diff.gz") md5sums=('2f761fa3475682a7512b0b43568ee7d6' 'fbc9f62f9ab2f98f24f53ad497c1ce5d') build() { cd $srcdir/$pkgname-2.4 - patch -N < ../dsniff_2.4b1+debian-18.diff + patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff for i in *.dpatch; do patch -N < "$i" done - [ $NOEXTRACT -eq 1 ] || LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr + LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-2.4 - make prefix=$pkgdir/usr install - install -D -m0644 LICENSE $pkgdir/usr/share/licenses/dsniff/LICENSE + cd "$srcdir"/$pkgname-2.4 + make prefix="$pkgdir"/usr install + install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE - mkdir -p $pkgdir/usr/share - mv $pkgdir/usr/man $pkgdir/usr/share/ + install -d "$pkgdir"/usr/share + mv "$pkgdir"/usr/man "$pkgdir"/usr/share/ } diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index 2dbf30500..d30452d45 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46614 2011-05-10 07:06:59Z angvp $ +# $Id: PKGBUILD 49455 2011-06-16 18:57:50Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Maintainer: judd <jvinet@zeroflux.org> pkgname=exim pkgver=4.76 -pkgrel=1 +pkgrel=2 pkgdesc="A Message Transfer Agent" arch=(i686 x86_64) url="http://www.exim.org/" diff --git a/community/exim/exim.changelog b/community/exim/exim.changelog index 562a87b75..69182229e 100644 --- a/community/exim/exim.changelog +++ b/community/exim/exim.changelog @@ -1,3 +1,6 @@ +2010-06-16 Angel Velasquez <angvp@archlinux.org> + * Rebuilt against db 5.2.28 + 2010-05-09 Angel Velasquez <angvp@archlinux.org> * Updated to 4.76 * Removed previous patch since is no longer needed diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD index 4d013c6ef..03eda7afa 100644 --- a/community/gecko-mediaplayer/PKGBUILD +++ b/community/gecko-mediaplayer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45744 2011-04-28 09:33:53Z lfleischer $ +# $Id: PKGBUILD 51299 2011-07-06 15:48:09Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: fancris3 <fancris3 at aol.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gecko-mediaplayer -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=("gnome-mplayer>=${pkgver}" 'dbus-glib') makedepends=('xulrunner' 'pkgconfig') replaces=('mplayer-plugin') source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('4996b243ed720dc30f5dcc9bc253bf68') +md5sums=('7bb7665f8a1e6832907d052863e8f7aa') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD index 9c2686158..a77f142bb 100644 --- a/community/gnome-mplayer/PKGBUILD +++ b/community/gnome-mplayer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47944 2011-05-26 08:59:17Z lfleischer $ +# $Id: PKGBUILD 51291 2011-07-06 15:32:05Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gnome-mplayer -pkgver=1.0.3 -pkgrel=3 +pkgver=1.0.4 +pkgrel=1 pkgdesc='A simple MPlayer GUI.' arch=('i686' 'x86_64') url='http://gnome-mplayer.googlecode.com/' @@ -14,7 +14,7 @@ depends=('mplayer' 'dbus-glib' 'libnotify' 'gtk2' 'hicolor-icon-theme' 'dconf') makedepends=('gnome-power-manager' 'nautilus') install="${pkgname}.install" source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('72a1c7d640a67eb2d60f2671108919c2') +md5sums=('c97dcf12d6a6b5543d701944f95e850e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libgda3/PKGBUILD b/community/libgda3/PKGBUILD index ca2cc50b5..07313f713 100644 --- a/community/libgda3/PKGBUILD +++ b/community/libgda3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 42498 2011-03-17 10:53:49Z jelle $ +# $Id: PKGBUILD 49363 2011-06-15 09:20:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libgda3 pkgver=3.1.5 -pkgrel=8 +pkgrel=9 pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers" arch=('i686' 'x86_64') url="http://www.gnome-db.org/Download" diff --git a/community/librcc/PKGBUILD b/community/librcc/PKGBUILD index 1043c9432..ca2eb950c 100644 --- a/community/librcc/PKGBUILD +++ b/community/librcc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 30655 2010-10-19 14:04:46Z spupykin $ +# $Id: PKGBUILD 49369 2011-06-15 09:26:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=librcc pkgver=0.2.6 -pkgrel=3 +pkgrel=4 pkgdesc="Charset Conversion Library" arch=(i686 x86_64) url="http://rusxmms.sourceforge.net/" @@ -20,11 +20,12 @@ md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1' build() { cd ${startdir}/src/$pkgname-${pkgver} ./configure --prefix=/usr - patch -p1 <$srcdir/librcc-strnlen.patch + make +} - make || return 1 - +package() { + cd ${startdir}/src/$pkgname-${pkgver} mkdir -p $startdir/pkg/etc/rcc mkdir -p $startdir/pkg/usr/lib/rcc/engines mkdir -p $startdir/pkg/usr/bin diff --git a/community/librcc/librcc.install b/community/librcc/librcc.install index 8d2ccce98..53b1d7ce7 100644 --- a/community/librcc/librcc.install +++ b/community/librcc/librcc.install @@ -1,28 +1,6 @@ -pre_install() { - /bin/true -} - post_install() { echo "-- Don't forget to install gtk or/and gtk2 packages to enable librcc" echo " gui features" echo "-- Also you may change /usr/bin/rcc-config symlink to switch between" echo " gtk and gtk2 (rcc-gtk-config and rcc-gtk2-config)" - /bin/true -} - -pre_upgrade() { - /bin/true -} - -post_upgrade() { - /bin/true -} - -pre_remove() { - /bin/true -} - -post_remove() { - /bin/true } - diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD index 2476eaf71..f586d53b0 100644 --- a/community/perl-berkeleydb/PKGBUILD +++ b/community/perl-berkeleydb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47458 2011-05-23 15:36:16Z tdziedzic $ +# $Id: PKGBUILD 49372 2011-06-15 09:28:37Z spupykin $ # 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=5 +pkgrel=6 pkgdesc="Interface to Berkeley DB version 2, 3 or 4" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/BerkeleyDB/" @@ -16,12 +16,16 @@ source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar. md5sums=('3d0cf0651ed8cd3fc36e328d5924a1e9') build() { -_dbver=`pacman -Q db | cut -d\ -f2 | cut -d- -f1` -depends=('perl' "db=$_dbver") - cd $srcdir/BerkeleyDB-$pkgver PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + _dbver=`pacman -Q db | cut -d\ -f2 | cut -d- -f1` + depends=('perl' "db=$_dbver") + + cd $srcdir/BerkeleyDB-$pkgver make pure_install doc_install DESTDIR=$pkgdir find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete diff --git a/community/perl-libapreq2/PKGBUILD b/community/perl-libapreq2/PKGBUILD index 21d49f90f..b9526091a 100644 --- a/community/perl-libapreq2/PKGBUILD +++ b/community/perl-libapreq2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47519 2011-05-23 18:19:22Z jelle $ +# $Id: PKGBUILD 49380 2011-06-15 09:32:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-libapreq2 pkgver=2.12 -pkgrel=8 +pkgrel=9 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" @@ -17,12 +17,9 @@ md5sums=('76e2acde0d82246dea6f2565f3746eec') build() { cd $srcdir/libapreq2-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/sbin/apxs - - find . -type f -name Makefile -exec sed -i 's#-ldb-4.8#-ldb-5.1#' {} \; - sed -i 's#-ldb-4.8#-ldb-5.1#' apreq2-config - + find . -type f -name Makefile -exec sed -i 's#-ldb-5.1#-ldb-5.2#' {} \; + sed -i 's#-ldb-5.1#-ldb-5.2#' apreq2-config make } package(){ diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD index de58675ec..708898b9e 100644 --- a/community/perl-xml-libxslt/PKGBUILD +++ b/community/perl-xml-libxslt/PKGBUILD @@ -3,7 +3,7 @@ pkgname=perl-xml-libxslt pkgver=1.70 -pkgrel=5 +pkgrel=6 pkgdesc="Interface to the gnome libxslt library " arch=('i686' 'x86_64') url="http://search.cpan.org/dist/XML-LibXSLT" diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD index 4ee76514e..8c606f322 100644 --- a/community/poedit/PKGBUILD +++ b/community/poedit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 34005 2010-11-30 20:55:18Z lcarlier $ +# $Id: PKGBUILD 49387 2011-06-15 09:36:08Z spupykin $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alexander Fehr <pizzapunk@gmail.com> @@ -6,7 +6,7 @@ pkgname=poedit pkgver=1.4.6.1 -pkgrel=4 +pkgrel=5 pkgdesc="Cross-platform gettext catalogs (.po files) editor" arch=('i686' 'x86_64') url="http://www.poedit.net/" diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD index 84b7c181a..578d0921d 100644 --- a/community/python-bsddb/PKGBUILD +++ b/community/python-bsddb/PKGBUILD @@ -1,29 +1,62 @@ -# $Id: PKGBUILD 40159 2011-02-21 14:49:30Z stephane $ +# $Id: PKGBUILD 50695 2011-06-29 15:25:25Z stephane $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> -pkgname=python-bsddb -pkgver=5.1.0 -pkgrel=3 +pkgbase=python-bsddb +pkgname=('python2-bsddb' 'python-bsddb') +_hgrel=600 +pkgver=5.1.2.${_hgrel} +pkgrel=1 pkgdesc="Python interface for BerkeleyDB" license=('MIT') arch=('i686' 'x86_64') url="http://www.jcea.es/programacion/pybsddb.htm" -depends=('db' 'python') -source=("http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz" +makedepends=('python2-distribute' 'python-distribute' 'mercurial') +source=("ftp://ftp.archlinux.org/other/community/${pkgbase}/${pkgbase}-${pkgver}.src.tar.xz" 'LICENSE') -md5sums=('6d72d2533f0f3a4bb4b1207598624d6a' - 'f412b3fb37739f1c4be64c1e7a5dee67') +sha1sums=('50e7b4c9c11b06c6d871dd93af1cc228687a0227' + 'ef4e4caf618781104dbf5824279ed39d127b4713') + +# source PKGBUILD && mksource +mksource() { + _hgroot="http://hg.jcea.es/pybsddb/" + _hgrepo=pybsddb + [ -d "${_hgrepo}" ] && hg pull -u -r ${_hgrel} || hg clone ${_hgroot} -r ${_hgrel} + + _dirname=${pkgbase}-${pkgver} + mv ${_hgrepo} ${_dirname} + tar -cJvf ${_dirname}.src.tar.xz ${_dirname} + rm -fr ${_dirname} +} build () { - cd ${srcdir}/bsddb3-${pkgver} + cd "${srcdir}" + + cp -r ${pkgbase}-${pkgver}{,-python2} + + # Build python 3 module + cd ${pkgbase}-${pkgver} python setup.py --berkeley-db=/usr build + + # Build python 2 module + cd ../${pkgbase}-${pkgver}-python2 + python2 setup.py --berkeley-db=/usr build +} + +package_python2-bsddb() { + depends=('db' 'python2>=2.7') + cd "${srcdir}/${pkgbase}-${pkgver}-python2" + + python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 + install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } -package() { - cd ${srcdir}/bsddb3-${pkgver} - python setup.py --berkeley-db=/usr install --root=${pkgdir} --optimize=1 +package_python-bsddb() { + depends=('db' 'python>=3.2') + cd "${srcdir}/${pkgbase}-${pkgver}" - install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 + install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 3fd2d6c40..f7580492a 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49856 2011-06-21 12:25:02Z spupykin $ +# $Id: PKGBUILD 51232 2011-07-06 10:22:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.2.10 +pkgver=2.2.11 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('5b08ea64334b7a59df2c25ad7e42de7e' +md5sums=('5501c90ca02ae7ea93c34f067b3e0619' 'bf61968d18d0e42529880f5c488ea9ed' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index cf4f92432..643c7b379 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -3,7 +3,7 @@ pkgname=root pkgver=5.30.00 -pkgrel=1 +pkgrel=2 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') url='http://root.cern.ch' @@ -16,16 +16,22 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'root.sh' 'rootd' 'root.desktop' - 'root.xml') + 'root.xml' + 'reorder-lzma-search-r40128.diff') md5sums=('b4e00f419f63d5ec6b7f1aace33c0c6f' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' 'ac61b17395d75a2705fefa2ef841a6bf' - 'e2cf69b204192b5889ceb5b4dedc66f7') + 'e2cf69b204192b5889ceb5b4dedc66f7' + '6b5d5b875913d8468940b9fbb1ceeb60') build() { cd ${pkgname} + # causes an error because it includes lzma/lzma.h directly + # http://root.cern.ch/phpBB3/viewtopic.php?f=3&t=13013&p=55971 + patch -Np2 -i ${srcdir}/reorder-lzma-search-r40128.diff + if [ ${CARCH} == 'i686' ]; then TARGET=linux; else @@ -44,7 +50,7 @@ build() { --disable-builtin-glew \ --disable-builtin-pcre \ --disable-builtin-zlib \ - --enable-builtin-lzma \ + --disable-builtin-lzma \ --enable-gdml \ --enable-gsl-shared \ --enable-minuit2 \ @@ -57,10 +63,6 @@ build() { # move from aur #--disable-builtin-afterimage \ - # causes an error because it includes lzma/lzma.h directly.. need to file a BR for this - # http://root.cern.ch/phpBB3/viewtopic.php?f=3&t=13013&p=55971 - #--disable-builtin-lzma \ - make } diff --git a/community/root/reorder-lzma-search-r40128.diff b/community/root/reorder-lzma-search-r40128.diff new file mode 100644 index 000000000..1dd0fc56e --- /dev/null +++ b/community/root/reorder-lzma-search-r40128.diff @@ -0,0 +1,14 @@ +--- branches/v5-30-00-patches/configure 2011/06/27 13:38:32 39993 ++++ branches/v5-30-00-patches/configure 2011/07/04 15:43:59 40128 +@@ -2430,8 +2430,9 @@ + check_header "lzma.h" "" \ + $LZMA ${LZMA:+$LZMA/include} \ + ${finkdir:+$finkdir/include} \ +- /usr/local/include /usr/include/lzma /usr/local/include/lzma \ +- /opt/lzma/include /usr/include ++ /usr/local/include /usr/include \ ++ /usr/local/include/lzma /usr/include/lzma \ ++ /opt/lzma/include + if test "x$found_dir" = "x" ; then + enable_builtin_lzma=yes + else diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD index b8e3ccf85..05cd3340e 100644 --- a/community/tracker/PKGBUILD +++ b/community/tracker/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49818 2011-06-21 09:19:30Z spupykin $ +# $Id: PKGBUILD 51237 2011-07-06 10:22:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=tracker -pkgver=0.10.18 +pkgver=0.10.19 pkgrel=1 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer" arch=('i686' 'x86_64') @@ -25,7 +25,7 @@ conflicts=('libtracker') provides=("libtracker") install=tracker.install source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2) -md5sums=('571b915d0173d9d5f2e3310ffd02e8e6') +md5sums=('59f105fbe7248749aee7ae8d9432b6a9') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/wml/PKGBUILD b/community/wml/PKGBUILD index 2f7a3781f..33c34b025 100644 --- a/community/wml/PKGBUILD +++ b/community/wml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47762 2011-05-25 13:41:49Z tdziedzic $ +# $Id: PKGBUILD 50698 2011-06-29 15:35:12Z stephane $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=wml pkgver=2.0.11 -pkgrel=6 +pkgrel=7 pkgdesc="The Website Meta Language" arch=('i686' 'x86_64') url="http://thewml.org/" diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD index 2dcde06ee..8e7d3fe69 100644 --- a/community/xemacs/PKGBUILD +++ b/community/xemacs/PKGBUILD @@ -1,48 +1,37 @@ -# $Id: PKGBUILD 96361 2010-10-19 23:18:53Z stephane $ +# $Id: PKGBUILD 49690 2011-06-19 10:01:11Z ebelanger $ # Maintainer: juergen <juergen@archlinux.org> # Contributor : Stéphane Gaudreault <stephane@archlinux.org> pkgname=xemacs -pkgver=21.5.29 -pkgrel=3 -pkgdesc="highly customizable open source text editor and application development system forked from GNU Emacs" -arch=(i686 x86_64) +pkgver=21.5.31 +pkgrel=2 +pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" +arch=('i686' 'x86_64') url="http://www.xemacs.org/" license=('GPL') -depends=('db' 'libpng' 'libtiff' 'gpm>=1.20.4' 'bash' 'ncurses>=5.6-7' 'desktop-file-utils' 'libxaw' 'libjpeg') +depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib') optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface' 'xorg-fonts-100dpi: X bitmap fonts needed for the interface') -makedepends=('giflib' 'xbitmaps') +makedepends=('xbitmaps') install=xemacs.install source=(http://ftp.xemacs.org/pub/xemacs/beta/$pkgname-$pkgver.tar.gz xemacs.desktop - xemacs-21.5.29-large-images.patch - xemacs-21.5.29-optimization-bug.patch - xemacs-21.5.29-vcdiff.patch) -md5sums=('5364192ae0d3de23d9f4ce197e6493b5' + xemacs-21.5.29-optimization-bug.patch) +md5sums=('0185fe905d0b8d8d094d9b60cf262d4a' 'a4d3d5c0aa2c7ce7bec491f809ca3694' - '23ca5a7c50fe7ebebd9fc4525882cdf1' - 'eb061b10ea3bbe1026df5326ae1618e3' - '4ada657a351b226cdd557f9faaeab075') + 'eb061b10ea3bbe1026df5326ae1618e3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # Fix security issue in vcdiff script - patch -Np0 -i ../xemacs-21.5.29-vcdiff.patch - - # Fix problem caused by improper optimization with GCC>=4.1.2 on i686 - # (and possibly other arches). See - # http://tracker.xemacs.org/XEmacs/its/issue354 - # for the upstream bug report. +# Fix problem caused by improper optimization with GCC>=4.1.2 on i686 +# (and possibly other arches). See +# http://tracker.xemacs.org/XEmacs/its/issue354 +# for the upstream bug report. patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch - # Fix for security bug - # See http://bugs.gentoo.org/show_bug.cgi?id=275397 - patch -Np1 -i ../xemacs-21.5.29-large-images.patch - ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \ - --with-x11 --without-postgresql --with-athena=xaw \ + --without-postgresql --with-athena=xaw \ --enable-database=berkdb --without-ldap \ --enable-menubars=lucid --enable-scrollbars=lucid \ --enable-widgets=athena --enable-dialogs=athena \ @@ -60,20 +49,17 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man1" infodir="${pkgdir}/usr/share/info" install gzip-el - rm ${pkgdir}/usr/bin/{b2m,ctags,etags,rcs-checkin} - rm ${pkgdir}/usr/share/man/man1/{ctags.1,etags.1} + rm "${pkgdir}"/usr/bin/{b2m,ctags,etags} + rm "${pkgdir}"/usr/share/man/man1/{ctags.1,etags.1} # fix FS#7927 install -d -m755 "${pkgdir}/usr/share/pixmaps" - install -d -m755 "${pkgdir}/usr/share/applications" - install -m644 "${srcdir}/${pkgname}.desktop" ${pkgdir}/usr/share/applications/ || return 1 - ln -sf /usr/lib/xemacs-21.5-b28/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/" || return 1 + install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + ln -sf /usr/share/xemacs-${pkgver%.*}-b${pkgver##*.}/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/xemacs-icon.xpm" # correct permissions chown -R root:root "${pkgdir}" - rm ${pkgdir}/usr/share/info/dir - gzip ${pkgdir}/usr/share/info/* - rm ${pkgdir}/usr/share/info/{info.info.gz,texinfo.info-2.gz,cl.info.gz,texinfo.info-1.gz,texinfo.info.gz,standards.info.gz,widget.info.gz} + rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info} } # vim: ts=2 sw=2 et ft=sh diff --git a/community/xemacs/xemacs.install b/community/xemacs/xemacs.install index 2cdf5e488..a04ee187f 100644 --- a/community/xemacs/xemacs.install +++ b/community/xemacs/xemacs.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(beta.info.gz custom.info.gz emodules.info.gz external-widget.info.gz internals.info-1.gz internals.info-2.gz diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD index c9e1369f6..40d1b020b 100644 --- a/core/db/PKGBUILD +++ b/core/db/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 108790 2011-02-03 13:05:02Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 127440 2011-06-15 00:33:22Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=db -pkgver=5.1.25 -_basever=5.1.25 +pkgver=5.2.28 pkgrel=1 pkgdesc="The Berkeley DB embedded database system" arch=('i686' 'x86_64') @@ -13,20 +13,20 @@ license=('custom') depends=('gcc-libs' 'sh') options=('!libtool') install=db.install -source=(http://download-uk.oracle.com/berkeley-db/db-${_basever}.tar.gz) -md5sums=('06656429bfc1abb6c0498eaeff70cd04') +source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) +sha1sums=('e6572e3356cf8bc998da4e889db3b12638833435') build() { - cd ${srcdir}/$pkgname-${_basever}/build_unix + cd "${srcdir}/$pkgname-${pkgver}/build_unix" ../dist/configure --prefix=/usr --enable-compat185 \ --enable-shared --enable-static --enable-cxx --enable-dbm make LIBSO_LIBS=-lpthread } package() { - cd ${srcdir}/$pkgname-${_basever}/build_unix - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/docs - install -Dm644 ${srcdir}/${pkgname}-${_basever}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd "${srcdir}/$pkgname-${pkgver}/build_unix" + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/docs + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD index 81af6681c..a61f089c0 100644 --- a/core/gawk/PKGBUILD +++ b/core/gawk/PKGBUILD @@ -1,36 +1,41 @@ -# $Id: PKGBUILD 100064 2010-11-20 03:46:49Z allan $ +# $Id: PKGBUILD 130241 2011-07-04 15:07:06Z allan $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gawk -pkgver=3.1.8 -pkgrel=2 -pkgdesc="Gnu version of awk" -arch=(i686 x86_64) +pkgver=4.0.0 +pkgrel=1 +pkgdesc="GNU version of awk" +arch=('i686' 'x86_64') url="http://www.gnu.org/directory/GNU/gawk.html" license=('GPL') groups=('base') +depends=('sh' 'glibc') provides=('awk') install=gawk.install source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -depends=('sh' 'glibc') -md5sums=('35937a0f83f0efe7a8c2dee635624784') +md5sums=('51e417b71287629940051e6f652c6492') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr --libexecdir=/usr/lib make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + + make -j1 check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - mv ${pkgdir}/usr/libexec ${pkgdir}/usr/lib - install -dm755 ${pkgdir}/bin + + install -dm755 ${pkgdir}/bin mv ${pkgdir}/usr/bin/gawk* ${pkgdir}/bin/ - mv ${pkgdir}/usr/bin/awk ${pkgdir}/bin/ - cd ${pkgdir}/usr/bin/ - ln -sf /bin/gawk gawk + ln -sf gawk ${pkgdir}/bin/awk + ln -sf /bin/gawk ${pkgdir}/usr/bin/ } diff --git a/core/gawk/gawk.install b/core/gawk/gawk.install index 95973e40a..3f7f24cfe 100644 --- a/core/gawk/gawk.install +++ b/core/gawk/gawk.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(gawk.info.gz gawkinet.info.gz) post_install() { diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index f9479bd84..57089f2c0 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126335 2011-06-04 22:38:16Z tomegun $ +# $Id: PKGBUILD 127646 2011-06-17 12:59:11Z stephane $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 pkgver=2.6.38 -pkgrel=3 +pkgrel=4 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index e5ba8e935..0a92c6a7a 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96213 2010-10-19 11:41:43Z allan $ +# $Id: PKGBUILD 127649 2011-06-17 13:03:28Z stephane $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsasl pkgver=2.1.23 -pkgrel=5 +pkgrel=6 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index 3fe44d8aa..5a4f10780 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104544 2011-01-03 22:58:23Z tpowa $ +# $Id: PKGBUILD 127852 2011-06-18 20:12:05Z stephane $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam pkgver=1.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 8f6af76c0..d25f2aae4 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 128400 2011-06-23 21:11:34Z angvp $ +# $Id: PKGBUILD 129898 2011-06-29 17:25:10Z foutrelis $ # 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.14.1 -pkgrel=1 +pkgrel=3 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -21,7 +21,7 @@ install=perl.install options=('!makeflags' '!purge') md5sums=('97cd306a2c22929cc141a09568f43bb0' '5ed2542fdb9a60682f215bd33701e61a' - 'd76445605c49886c77734446247e439d' + '1f0cbbee783e8a6d32f01be5118e0d5e' 'c25d86206d649046538c3daab7874564') build() { diff --git a/core/perl/perlbin.csh b/core/perl/perlbin.csh index cc0d5d553..535f0b18d 100644 --- a/core/perl/perlbin.csh +++ b/core/perl/perlbin.csh @@ -4,12 +4,10 @@ # 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/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/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 diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index e9f8b7189..5cdab4d99 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125819 2011-05-30 09:26:18Z jgc $ +# $Id: PKGBUILD 129453 2011-06-28 01:17:42Z stephane $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=apr-util pkgver=1.3.12 -pkgrel=1 +pkgrel=2 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" @@ -20,5 +20,9 @@ build() { --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap make +} + +package() { + cd "${srcdir}/apr-util-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD index fd2534453..8bc5854a3 100644 --- a/extra/archboot/PKGBUILD +++ b/extra/archboot/PKGBUILD @@ -1,14 +1,19 @@ -# $Id: PKGBUILD 102962 2010-12-13 17:55:11Z tpowa $ +# $Id: PKGBUILD 130388 2011-07-06 10:05:42Z tpowa $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=archboot -pkgver=2010.12 +pkgver=2011.06 pkgrel=1 pkgdesc="Advanced, modular arch boot/install image creation utility" arch=(i686 x86_64) license=('GPL') url="http://www.archlinux.org/" -depends=('mkinitcpio>=0.6.7-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2010.07-2' 'subversion>=1.6.13-1' 'wget>=1.12-2' 'bash>=4.1.009-3' 'coreutils>=8.7-1' 'cryptsetup>=1.1.3-1' 'dialog>=1.1_20100428-2' 'e2fsprogs>=1.41.12-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20100214-2' 'jfsutils>=1.1.14-2' 'less>=436-2' 'lvm2>=2.02.77-1' 'mdadm>=3.1.4-1' 'module-init-tools>=3.12-1' 'nano>=2.2.6-1' 'ncurses>=5.7-4' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2.0.0-4' 'pcmciautils>=017-1' 'procps>=3.2.8-2' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.1-1' 'sysvinit>=2.88-2' 'tar>=1.25-1' 'util-linux-ng>=2.18-3' 'which>=2.20-4' 'kbd>=1.15.2-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.4-1' 'dnsutils>=9.7.1.P2-1' 'hdparm>=9.36-1' 'memtest86+>=4.10-1' 'grub>=0.97-17' 'inetutils>=1.8-2' 'openssh>=5.6p1-1' 'hwdetect>=2010.08-1' 'shadow>=4.1.4.2-3' 'bridge-utils>=1.4-3' 'ifenslave>=1.1.0-5' 'cpufrequtils>=008-1' 'links>=2.2-4' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.10-1' 'glibc>=2.12.1-4' 'linux-api-headers>=2.6.34-1' 'kernel26>=2.6.36.2-1' 'kernel26-lts>=2.6.32.27-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-2' 'ppp>=2.4.5-1' 'rp-pppoe>=3.10-5' 'lilo>=23.1-2' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2010.10.2-1' 'pciutils>=3.1.7-1' 'usbutils>=0.91-4' 'vpnc>=0.5.3-3' 'openvpn>=2.1.4-1' 'b43-fwcutter>=013-2' 'wpa_supplicant>=0.7.3-1' 'rsync>=3.0.7-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.77-1' 'screen>=4.0.3-10' 'elfutils>=0.149-2' 'pam>=1.1.1-2' 'cracklib>=2.8.16-1' 'nfs-utils>=1.2.2-4' 'nfsidmap>=0.23-4' 'readline>=6.1.002-2' 'acl>=2.2.49-1' 'attr>=2.4.44-2' 'pcre>=8.11-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.69-2' 'lzo2>=2.04-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.23-1' 'gpm>=1.20.6-6' 'libevent>=1.4.14b-2' 'gcc-libs>=4.5.1-2' 'sdparm>=1.06-1' 'licenses>=2.6-1' 'pptpclient>=1.7.2-3' 'ndiswrapper>=1.56-6' 'ndiswrapper-utils>=1.56-2' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.6-1' 'bittorrent>=5.2.2-3' 'dhcpcd>=5.2.9-1' 'openssl>=1.0.0.c-1' 'git>=1.7.3.3-1' 'dmraid>=1.0.0.rc16+CVS-2' 'linux-atm>=2.5.1-1' 'netcfg>=2.5.4-1' 'tiacx>=20080210-18' 'tiacx-firmware>=2-3' 'parted>=2.3-1' 'tzdata>=2010o-1' 'ntp>=4.2.6.p2-1' 'libgcrypt>=1.4.6-1' 'iw>=0.9.20-1' 'crda>=1.1.1-1' 'libnl>=1.1-2' 'iproute2>=2.6.35-4' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.9-11' 'dhclient>=4.2.0.1-1' 'syslinux>=4.03-1' 'mtools>=4.0.14-1' 'fsarchiver>=0.6.10-2' 'xz>=5.0.0-1' 'libtirpc>=0.2.1-2' 'librpcsecgss>=0.19-3' 'rpcbind>=0.2.0-2' 'testdisk>=6.11.3-3' 'wipe>=2.3.0-1' 'clamav>=0.96.5-1' 'ddrescue>=1.13-1' 'udev>=164-3' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-1' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-1' 'libgssglue>=0.1-3' 'mkinitcpio-nfs-utils>=0.2-1' 'gdisk>=0.6.13-1' 'nilfs-utils>=2.0.20-1' 'btrfs-progs-unstable>=0.19.20100607-3' 'ndiswrapper-lts>=1.56-3' 'nouveau-drm-lts>=0.0.16_20100313-4' 'linux-firmware>=20101108-1' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1') +depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1') +optdepends=('grub2-bios: for grub2 support' + 'grub2-efi-i386: for grub2 support' + 'grub2-efi-x86_64: for grub2 support' + 'efibootmgr: for grub2 support' +) source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c) backup=('etc/archboot/allinone.conf' 'etc/archboot/allinone-lts.conf' @@ -39,5 +44,5 @@ build() gcc -o vmware-detect vmware-detect.c install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect } -md5sums=('c122578bfa40e4d11f570ab066a98abf' +md5sums=('eac77ae13bf2e6b5a92317b9885c69dd' '7e2b03463747cb22ab388e79a09fa0cb') diff --git a/extra/archboot/archboot.install b/extra/archboot/archboot.install index 25d9c88d4..315f97d7e 100644 --- a/extra/archboot/archboot.install +++ b/extra/archboot/archboot.install @@ -18,7 +18,3 @@ EOF post_upgrade() { post_install $1 } - -op=$1 -shift -$op $* diff --git a/extra/bogofilter/PKGBUILD b/extra/bogofilter/PKGBUILD index d973643f2..860895cf9 100644 --- a/extra/bogofilter/PKGBUILD +++ b/extra/bogofilter/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 110357 2011-02-18 23:42:09Z allan $ +# $Id: PKGBUILD 127873 2011-06-19 06:22:51Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Low Kian Seong <fastmail_low@speedymail.org> pkgname=bogofilter pkgver=1.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="A fast Bayesian spam filtering tool" arch=('i686' 'x86_64') -license=(GPL3) +license=('GPL3') url="http://bogofilter.sourceforge.net" depends=('db' 'perl' 'gsl') -backup=(etc/bogofilter/bogofilter.cf) +backup=('etc/bogofilter/bogofilter.cf') source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2) md5sums=('4bcabdf8c5e7efefcb508eda7e80eebc') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc/bogofilter \ --localstatedir=/var \ @@ -24,11 +24,11 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - mv ${pkgdir}/etc/bogofilter/bogofilter.cf.example ${pkgdir}/etc/bogofilter/bogofilter.cf + mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf" - install -dm755 ${pkgdir}/usr/share/${pkgname}/contrib - install -m644 contrib/* ${pkgdir}/usr/share/${pkgname}/contrib/ + install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib" + install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/" } diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index 09a8564f2..b48969b16 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124918 2011-05-25 08:15:13Z ibiru $ +# $Id: PKGBUILD 127579 2011-06-16 17:10:43Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail pkgver=3.7.9 -pkgrel=3 +pkgrel=4 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64') license=('GPL3') diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 040385490..d7303a1eb 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124640 2011-05-23 17:24:46Z ibiru $ +# $Id: PKGBUILD 129456 2011-06-28 01:27:57Z stephane $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server pkgver=3.0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" arch=('i686' 'x86_64') depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD index c494c1fba..a04bdc13b 100644 --- a/extra/evolution-exchange/PKGBUILD +++ b/extra/evolution-exchange/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124646 2011-05-23 18:11:32Z ibiru $ +# $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=1 +pkgrel=2 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD index f28bf561b..107264bc4 100644 --- a/extra/libetpan/PKGBUILD +++ b/extra/libetpan/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 96521 2010-10-22 00:32:21Z allan $ +# $Id: PKGBUILD 127576 2011-06-16 17:03:09Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libetpan pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A portable middleware for email access" arch=('i686' 'x86_64') url="http://www.etpan.org/" license=("custom:etpan") -depends=('db>=5.1' 'libsasl>=2.1.23' 'curl>=7.19.5' 'expat>=2.0.1-1') +depends=('db>=5.2.28' 'libsasl>=2.1.23' 'curl>=7.21.' 'expat>=2.0.1-1') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('5addc766141a0b1d29ee1ca4ba1b6808') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 4ec3d5b00..74b940110 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 129540 2011-06-28 18:38:58Z andyrtr $ +# $Id: PKGBUILD 130106 2011-07-02 19:39:19Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -26,7 +26,7 @@ pkgname=('libreoffice' 'libreoffice-sdk' 'libreoffice-extension-wiki-publisher') _LOver=3.4.1.3 pkgver=3.4.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" diff --git a/extra/libreoffice/libreoffice.install b/extra/libreoffice/libreoffice.install index 27f3173ae..177f0d4e6 100644 --- a/extra/libreoffice/libreoffice.install +++ b/extra/libreoffice/libreoffice.install @@ -4,7 +4,7 @@ gtk-update-icon-cache -f -q /usr/share/icons/hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null 2>&1 -echo " * see http://wiki.archlinux.org/index.php/Openoffice" +echo " * see https://wiki.archlinux.org/index.php/LibreOffice" echo " * you may want to pacman -Ss libreoffice-extensions" echo " to see what extensions are prepared to install" echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg for spell checking" diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index 535afc1a5..d782e1b0f 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 126916 2011-06-08 17:30:45Z eric $ +# $Id: PKGBUILD 127443 2011-06-15 03:16:57Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=20110528 -pkgrel=2 +pkgrel=3 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" arch=('i686' 'x86_64') url="http://moc.daper.net/" diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD index 96719acbb..9f3595deb 100644 --- a/extra/mod_perl/PKGBUILD +++ b/extra/mod_perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129570 2011-06-28 22:45:51Z angvp $ +# $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=6 +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' 'perl-linux-pid') diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 639fd702c..2d61cac2e 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 126056 2011-06-01 08:38:57Z andrea $ +# $Id: PKGBUILD 130378 2011-07-06 07:48:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.13 +pkgver=5.5.14 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -15,7 +15,7 @@ options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('f0e519e90ee7c00fceb0730edf859d7b' +md5sums=('19f43bb9c72b1b5f7ff86a7f921c9244' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') @@ -103,7 +103,7 @@ package_mysql(){ pkgdesc="A fast SQL database server" backup=('etc/mysql/my.cnf') install=mysql.install - depends=('mysql-clients') + depends=('mysql-clients' 'net-tools') optdepends=('perl-dbi' 'perl-dbd-mysql') cd "${srcdir}"/build diff --git a/extra/openldap/PKGBUILD b/extra/openldap/PKGBUILD index 7e6266083..44029b398 100644 --- a/extra/openldap/PKGBUILD +++ b/extra/openldap/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 109957 2011-02-14 13:18:22Z andrea $ +# $Id: PKGBUILD 127879 2011-06-19 07:32:04Z andrea $ # Maintainer: # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=openldap pkgver=2.4.24 -pkgrel=1 +pkgrel=2 pkgdesc="LDAP Server" arch=('i686' 'x86_64') license=('custom') url="http://www.openldap.org/" backup=('etc/openldap/slapd.conf' 'etc/default/slapd' 'etc/conf.d/slapd') -depends=("libldap>=${pkgver}" 'db' 'tcp_wrappers' 'libfetch' 'util-linux-ng') +depends=("libldap>=${pkgver}" 'tcp_wrappers' 'libfetch' 'util-linux-ng') provides=('openldap-clients') replaces=('openldap-clients') source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgname}-${pkgver}.tgz" @@ -19,9 +19,10 @@ source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgname}-${pkgve md5sums=('116fe1e23a7b67686d5e62274367e6c0' '832354417c495f29affd2c772808959d' '6be69f6b7e522cb64cce8703da81ed32') +options=('emptydirs') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} export LIBS=-ldb ./configure --prefix=/usr \ @@ -71,36 +72,36 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} cd servers - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install cd ../clients - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install cd ../doc/man for dir in man{1,5,8}; do pushd ${dir} - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install popd done - rm ${pkgdir}/usr/share/man/man5/ldap.conf.5 + rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 cd ../.. - install -dm700 ${pkgdir}/etc/openldap/slapd.d - install -Dm755 ${srcdir}/slapd ${pkgdir}/etc/rc.d/slapd - install -Dm644 ${srcdir}/slapd.default ${pkgdir}/etc/conf.d/slapd - install -dm700 ${pkgdir}/var/lib/openldap + install -dm700 "${pkgdir}"/etc/openldap/slapd.d + install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd + install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd + install -dm700 "${pkgdir}"/var/lib/openldap # get rid of duplicate default conf files - rm ${pkgdir}/etc/openldap/*.default + rm "${pkgdir}"/etc/openldap/*.default # hack to fix screwed up dirs sed -e 's|^pidfile[[:space:]].*$|pidfile /var/run/slapd.pid|g' \ -e 's|^argsfile[[:space:]].*$|argsfile /var/run/slapd.args|g' \ - -i ${pkgdir}/etc/openldap/slapd.conf + -i "${pkgdir}"/etc/openldap/slapd.conf - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index ccbaae0cd..4e7f515cd 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126095 2011-06-01 12:12:00Z pierre $ +# $Id: PKGBUILD 127446 2011-06-15 08:33:01Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -24,7 +24,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.3.6 -pkgrel=4 +pkgrel=5 _suhosinver=${pkgver}-0.9.10 arch=('i686' 'x86_64') license=('PHP') diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index d22a45cfd..7ae08c572 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 124325 2011-05-19 16:07:15Z bisson $ +# $Id: PKGBUILD 127765 2011-06-18 08:12:47Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=postfix pkgver=2.8.3 -pkgrel=3 +pkgrel=4 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)' url='http://www.postfix.org/' arch=('i686' 'x86_64') diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index f1c56f85d..e0c363027 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,31 +1,27 @@ -# $Id: PKGBUILD 127261 2011-06-12 03:23:25Z stephane $ +# $Id: PKGBUILD 129895 2011-06-29 15:22:59Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 pkgver=2.7.2 -pkgrel=1 +pkgrel=2 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') license=('PSF') url="http://www.python.org/" -depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi') +depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi') makedepends=('tk') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz - python-2.7-db51.patch) -sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53' - '9667a2a2f8594902b352793e649f78696a77bd13') +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) +sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53') build() { cd "${srcdir}/Python-${pkgver}" - patch -Np1 -i ../python-2.7-db51.patch - # Temporary workaround for FS#22322 # See http://bugs.python.org/issue10835 for upstream report sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c @@ -33,7 +29,7 @@ build() { # Enable built-in SQLite3 module to load extensions (fix FS#22122) sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py - # FS#2399 + # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 684da1bf2..58b3a41d0 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,22 +1,31 @@ -# $Id: PKGBUILD 126317 2011-06-04 16:06:41Z andyrtr $ +# $Id: PKGBUILD 130397 2011-07-06 11:19:50Z andrea $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor pkgver=2.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64') url="http://librdf.org/raptor" -depends=('libxml2>=2.7.8' 'curl>=7.21.2' 'zlib>=1.2.5' 'libxslt>=1.1.26') +depends=('libxml2>=2.7.8' 'curl>=7.21.7' 'zlib>=1.2.5' 'libxslt>=1.1.26') license=('LGPL') options=('!libtool') -source=(http://librdf.org/dist/source/raptor2-$pkgver.tar.gz) -md5sums=('46eff4b20f8752d1146a3e0c8b2168dd') +source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz" + 'fix-soprano-bug.patch') +md5sums=('46eff4b20f8752d1146a3e0c8b2168dd' + 'fd63150d1e9f83bb59af0d86c373c8fa') build() { cd ${srcdir}/raptor2-${pkgver} + + # see http://bugs.librdf.org/mantis/view.php?id=451 + patch -p1 -i "${srcdir}"/fix-soprano-bug.patch + + # fix build with curl >= 7.21.2 + sed -i '/#include <curl\/types.h>/d' src/raptor_internal.h + ./configure --prefix=/usr --disable-static make } diff --git a/extra/raptor/fix-soprano-bug.patch b/extra/raptor/fix-soprano-bug.patch new file mode 100644 index 000000000..ec7f087e0 --- /dev/null +++ b/extra/raptor/fix-soprano-bug.patch @@ -0,0 +1,20 @@ +diff --git a/src/turtle_lexer.l b/src/turtle_lexer.l +index c2f249b..f133747 100644 +--- a/src/turtle_lexer.l ++++ b/src/turtle_lexer.l +@@ -381,9 +381,13 @@ EXPONENT [eE][+-]?[0-9]+ + while(1) { + int c = yytext[yyleng - 1]; + if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' || +- c == ':' || c == '-') { ++ c == '=' ) { + yyleng--; +- } else ++ } ++ else if ( yyleng >= 2 && ( c == '-' && yytext[yyleng - 2] == ':' ) ) { ++ yyleng -= 2; ++ } ++ else + break; + } + yytext[yyleng] = '\0'; diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD index 1ae150d37..949804063 100644 --- a/extra/redland/PKGBUILD +++ b/extra/redland/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 120965 2011-04-27 19:29:40Z andrea $ +# $Id: PKGBUILD 129914 2011-06-29 19:31:01Z andrea $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Francois Charette <francois.archlinux.org> pkgbase=redland epoch=1 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') -pkgver=1.0.12 -pkgrel=1 +pkgver=1.0.13 +pkgrel=4 url="http://librdf.org/" license=("GPL") arch=('i686' 'x86_64') -makedepends=('rasqal>=0.9.21' 'raptor1' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') +makedepends=('rasqal>=0.9.26' 'raptor>=2.0.3' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') options=('!libtool') source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz rpath.diff) -md5sums=('40f37a5ad97fdfbf984f78dcea0c6115' +md5sums=('96c15f36f842ad7e1c9d225e4ca97b68' 'acc85e784f01a656bd56777f95880787') build() { @@ -34,9 +34,7 @@ build() { package_redland() { pkgdesc="Library that provides a high-level interface to RDF data" - depends=('rasqal>=0.9.21' 'raptor1' 'libtool') - replaces=('redland-compat' 'redland-compat-devel') - conflicts=('redland-compat' 'redland-compat-devel') + depends=('rasqal>=0.9.26' 'raptor>=2.0.3' 'libtool') cd ${srcdir}/${pkgbase}-${pkgver} make DESTDIR=${pkgdir} install diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 0cbf5438b..a829449da 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125918 2011-05-31 21:19:50Z andrea $ +# $Id: PKGBUILD 127449 2011-06-15 09:33:37Z eric $ # Maintainer: # Contributor: Allan McRae <allan@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> @@ -7,13 +7,13 @@ pkgbase=ruby pkgname=('ruby' 'ruby-docs') pkgver=1.9.2_p180 -pkgrel=2 +pkgrel=3 pkgdesc="An object-oriented language for quick and easy programming" arch=('i686' 'x86_64') url="http://www.ruby-lang.org/en/" license=('custom') makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz') -options=('!emptydirs') +options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/${pkgbase}/1.9/${pkgbase}-${pkgver//_/-}.tar.bz2") md5sums=('68510eeb7511c403b91fe5476f250538') sha1sums=('10824b44c8060c7b9b5afc0b3519a1e9f02f7fe5') @@ -44,6 +44,6 @@ package_ruby-docs() { depends=('ruby') cd "${srcdir}/${pkgbase}-${pkgver//_/-}" - make -j1 DESTDIR="${pkgdir}" install-doc install-capi + make DESTDIR="${pkgdir}" install-doc install-capi install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 6bd883503..09284b3d3 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 122577 2011-05-04 17:48:52Z ibiru $ +# $Id: PKGBUILD 130383 2011-07-06 08:32:50Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba pkgname=('smbclient' 'samba') -pkgver=3.5.8 +pkgver=3.5.9 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=3.5.8 -pkgrel=3 +_realver=3.5.9 +pkgrel=2 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') @@ -79,7 +79,6 @@ backup=(etc/logrotate.d/samba etc/conf.d/samba) depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'fam' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') cd ${srcdir}/samba-${_realver}/source3 - mkdir -p ${pkgdir}/var/log/samba mkdir -p ${pkgdir}/etc/samba/private chmod 700 ${pkgdir}/etc/samba/private make DESTDIR=${pkgdir} install @@ -130,8 +129,8 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('355b4530c20997e94aebc74cd6ea5307' - '891b9be03e7adf65c9a00319c76d33e5' +md5sums=('fc3fe1103cf9d71abe12a8c604f31c76' + 'a3da19515a234c703876cf850c44e996' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/samba/samba b/extra/samba/samba index 1b222d6cc..458eb8e2b 100755 --- a/extra/samba/samba +++ b/extra/samba/samba @@ -13,6 +13,9 @@ case "$1" in if [ ! -x /var/run/samba ] ; then install -m755 -g 81 -o 81 -d /var/run/samba fi + if [ ! -x /var/log/samba ] ; then + install -m755 -g 81 -o 81 -d /var/log/samba + fi for d in ${SAMBA_DAEMONS[@]}; do PID=`pidof -o %PPID /usr/sbin/$d` [ -z "$PID" ] && /usr/sbin/$d -D diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 19cb12294..8f8e8adbe 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,26 +1,34 @@ -# $Id: PKGBUILD 127222 2011-06-11 09:32:25Z andrea $ +# $Id: PKGBUILD 130071 2011-07-01 21:53:41Z stephane $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion pkgver=1.6.17 -pkgrel=4 -pkgdesc="Replacement for CVS, another versioning system (SVN)" +pkgrel=6 +pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('apache' 'bsd') depends=('neon' 'apr-util' 'sqlite3') +optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion') 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') +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 + subversion-perl-bindings.patch) +md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14' + 'a2b029e8385007ffb99b437b30521c90' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'a6371baeda7e224504629ecdda2749b4' + '6b4340ba9d8845cd8497e013ae01be3f' + '1166f3b7413d7e7450299b3525680bbe' + '0591aa39837931161b4d61ff35c7b147') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,12 +38,13 @@ build() { # apply patches patch -Np0 -i ../subversion.rpath.fix.patch patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch + patch -Np1 -i ../subversion-perl-bindings.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.1 \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \ --enable-javahl --with-gnome-keyring --with-kwallet # build @@ -89,10 +98,3 @@ package() { 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/extra/subversion/subversion-perl-bindings.patch b/extra/subversion/subversion-perl-bindings.patch new file mode 100644 index 000000000..3c34daa47 --- /dev/null +++ b/extra/subversion/subversion-perl-bindings.patch @@ -0,0 +1,12 @@ +diff -Naur subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in +--- subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in 2010-11-24 20:42:16.000000000 +0000 ++++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in 2011-07-01 20:16:16.520892074 +0000 +@@ -43,7 +43,7 @@ + my %config = ( + ABSTRACT => 'Perl bindings for Subversion', + DEFINE => $cppflags, +- CCFLAGS => $cflags, ++ CCFLAGS => $Config{ccflags}, + INC => join(' ',$apr_cflags, $apu_cflags, + " -I$swig_srcdir/perl/libsvn_swig_perl", + " -I$svnlib_srcdir/include", diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD index c1c867847..32667675a 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49477 2011-06-17 12:30:44Z lcarlier $ +# $Id: PKGBUILD 51304 2011-07-06 17:52:30Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -10,7 +10,7 @@ _git=true #_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110616 + pkgver=7.10.99.git20110706 else pkgver=7.10.3 fi @@ -22,9 +22,9 @@ makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf8 url="http://mesa3d.sourceforge.net" license=('custom') if [ "${_git}" = "true" ]; then - # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe - source=('ftp://ftp.archlinux.org/other/mesa/mesa-fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe.tar.bz2') - md5sums=('f9cf11f9fd8f5d2092536fc48fad922f') + # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 + source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') + md5sums=('6d655a2573037838844019275dce66af') else source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip" nouveau-fix-header.patch) md5sums=('614d063ecd170940d9ae7b355d365d59' '67c87b77cc2236b52a3b47dad3fbb5d4') @@ -53,16 +53,12 @@ build() { if [ "${_git}" = "true" ]; then ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --enable-gallium-r300 \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ + --with-gallium-drivers=r300,r600,nouveau,swrast \ --enable-gallium-llvm \ --enable-gallium-egl \ - --enable-gallium-swrast \ --enable-glx-tls \ --with-driver=dri \ --enable-xcb \ - --with-state-trackers=dri,glx,egl \ --disable-glut \ --enable-gles1 \ --enable-gles2 \ @@ -72,7 +68,6 @@ build() { --enable-32-bit \ --libdir=/usr/lib32 # --enable-gallium-svga \ - # --enable-shared-dricore - link DRI modules with shared core DRI routines[default=disabled] http://bugs.gentoo.org/show_bug.cgi?id=357177 # --enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no] else ./configure --prefix=/usr \ @@ -155,7 +150,7 @@ package_lib32-libegl() { if [ "${_git}" = "true" ]; then cd ${srcdir}/mesa-* - make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install + make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install else cd "${srcdir}/Mesa-${pkgver}" fi diff --git a/multilib/lib32-glib2/PKGBUILD b/multilib/lib32-glib2/PKGBUILD index 4d98d0693..8d06a14fc 100644 --- a/multilib/lib32-glib2/PKGBUILD +++ b/multilib/lib32-glib2/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 45657 2011-04-26 16:44:11Z svenstaro $ +# $Id: PKGBUILD 51310 2011-07-06 22:35:51Z lcarlier $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> + _pkgbasename=glib2 pkgname=lib32-$_pkgbasename -pkgver=2.28.6 +pkgver=2.28.8 pkgrel=1 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)" url="http://www.gtk.org/" @@ -13,8 +14,8 @@ license=('LGPL') depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' $_pkgbasename) makedepends=('gcc-multilib') options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.bz2) -sha256sums=('557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.xz) +sha256sums=('4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353') build() { export CC="gcc -m32" diff --git a/staging/kdegraphics/PKGBUILD b/staging/kdegraphics/PKGBUILD index 5172735b6..37ac0ab2e 100644 --- a/staging/kdegraphics/PKGBUILD +++ b/staging/kdegraphics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130253 2011-07-04 19:27:12Z andrea $ +# $Id: PKGBUILD 130500 2011-07-06 23:50:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,7 +13,7 @@ pkgname=('kdegraphics-gwenview' 'kdegraphics-libs' 'kdegraphics-okular') pkgver=4.6.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -22,7 +22,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'sane' 'lcms' 'libxxf86vm' 'poppler-qt' 'libspectre' 'chmlib' 'djvulibre' 'ebook-tools' 'kdebase-runtime') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('6b681323798b764cd114313cbc07371fd1ce331a') +sha1sums=('1e64698993d0754dfae1296d8d16ba9370f9a08c') build() { cd ${srcdir} diff --git a/staging/kdepim-runtime/PKGBUILD b/staging/kdepim-runtime/PKGBUILD new file mode 100644 index 000000000..c53892f01 --- /dev/null +++ b/staging/kdepim-runtime/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 130494 2011-07-06 23:34:26Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdepim-runtime +pkgver=4.6.1 +pkgrel=1 +pkgdesc='KDE PIM Runtime Environment' +arch=('i686' 'x86_64') +url='http://pim.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('kdepimlibs' 'kdebase-runtime') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') +install=${pkgname}.install +source=("http://download.kde.org/stable/kdepim-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'disable-l10n.patch') +sha1sums=('e416ffd0142c720a779b4eb2e4a841ca751efdce' + 'd4f8c39911cf288973a30d4b71087906ebb26359') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/disable-l10n.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdepim-runtime/disable-l10n.patch b/staging/kdepim-runtime/disable-l10n.patch new file mode 100644 index 000000000..b49cd54a8 --- /dev/null +++ b/staging/kdepim-runtime/disable-l10n.patch @@ -0,0 +1,10 @@ +--- kdepim-runtime-4.6.0/CMakeLists.txt~ 2011-06-10 16:49:12.130427269 +0000 ++++ kdepim-runtime-4.6.0/CMakeLists.txt 2011-06-10 16:56:52.871414776 +0000 +@@ -194,7 +194,3 @@ + update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) + + macro_display_feature_log() +- +-find_package(Msgfmt REQUIRED) +-find_package(Gettext REQUIRED) +-add_subdirectory(po) diff --git a/staging/kdepim-runtime/kdepim-runtime.install b/staging/kdepim-runtime/kdepim-runtime.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/staging/kdepim-runtime/kdepim-runtime.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdepim/PKGBUILD b/staging/kdepim/PKGBUILD new file mode 100644 index 000000000..210df38c0 --- /dev/null +++ b/staging/kdepim/PKGBUILD @@ -0,0 +1,258 @@ +# $Id: PKGBUILD 130497 2011-07-06 23:35:24Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdepim +pkgname=('kdepim-akonadiconsole' + 'kdepim-akregator' + 'kdepim-blogilo' + 'kdepim-console' + 'kdepim-kaddressbook' + 'kdepim-kalarm' + 'kdepim-kjots' + 'kdepim-kleopatra' + 'kdepim-kmail' + 'kdepim-knode' + 'kdepim-knotes' + 'kdepim-kontact' + 'kdepim-korganizer' + 'kdepim-kresources' + 'kdepim-ktimetracker' + 'kdepim-libkdepim' + 'kdepim-wizards') +pkgver=4.6.1 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://pim.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdepim') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' + 'pilot-link' 'kde-agent') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'disable-l10n.patch') +sha1sums=('aa4dc75d33b3aa105e3f3b2f41e9d87b57cbf20a' + 'f52c8d3918e3cd6d8e0180af243333ee2d87d382') + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/disable-l10n.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDEPIM_BUILD_MOBILE=OFF + make +} + +package_kdepim-akonadiconsole() { + pkgdesc='Akonadi Management and Debugging Console' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + install='kdepim.install' + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install +} + +package_kdepim-akregator() { + pkgdesc='A Feed Reader for KDE' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/akregator/" + install='kdepim.install' + cd "${srcdir}"/build/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/akregator + make DESTDIR="${pkgdir}" install +} + +package_kdepim-blogilo() { + pkgdesc='A KDE Blogging Client' + depends=('kdepim-runtime') + url="http://kde.org/applications/internet/blogilo/" + replaces=('blogilo') + conflicts=('blogilo') + install='kdepim.install' + cd "${srcdir}"/build/blogilo + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/blogilo + make DESTDIR="${pkgdir}" install +} + +package_kdepim-console() { + pkgdesc='Command line tool for accessing calendar files' + depends=('kdepim-runtime') + url='http://pim.kde.org' + install='kdepim.install' + cd "${srcdir}"/build/console + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kaddressbook() { + pkgdesc='Contact Manager' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kaddressbook/" + install='kdepim.install' + cd "${srcdir}"/build/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/plugins/kaddressbook + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kalarm() { + pkgdesc='Personal Alarm Scheduler' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kalarm/" + install='kdepim.install' + cd "${srcdir}"/build/kalarm + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kalarm + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kjots() { + pkgdesc='Note Taker' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kjots/" + install='kdepim.install' + cd "${srcdir}"/build/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kjots + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kleopatra() { + pkgdesc='Certificate Manager and Unified Crypto GUI' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kleopatra/" + install='kdepim-kleopatra.install' + cd "${srcdir}"/build/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kleopatra + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kmail() { + pkgdesc='Mail Client' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/kmail/" + install='kdepim-kmail.install' + conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication') + for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \ + nepomuk_email_feeder ontologies templateparser kontact/plugins/kmail; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-knode() { + pkgdesc='News Reader' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/knode/" + install='kdepim.install' + cd "${srcdir}"/build/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knode + make DESTDIR="${pkgdir}" install +} + +package_kdepim-knotes() { + pkgdesc='Popup Notes' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/knotes/" + install='kdepim.install' + cd "${srcdir}"/build/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knotes + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kontact() { + pkgdesc='Personal Information Manager' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kontact/" + install='kdepim.install' + conflcits=('kdepim-kontactinterfaces') + replaces=('kdepim-kontactinterfaces') + for i in kontact/src doc/kontact \ + kontact/plugins/summary kontact/plugins/specialdates; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-korganizer() { + pkgdesc='Calendar and Scheduling Program' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/korganizer" + install='kdepim-korganizer.install' + cd "${srcdir}"/build/korganizer + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/korganizer + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/korganizer + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kresources() { + pkgdesc='KDE PIM resources' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + cd "${srcdir}"/build/kresources + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktimetracker() { + pkgdesc='Personal Time Tracker' + depends=('kdepim-kresources') + url="http://kde.org/applications/utilities/ktimetracker/" + install='kdepim.install' + cd "${srcdir}"/build/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/ktimetracker + make DESTDIR="${pkgdir}" install +} + +package_kdepim-libkdepim() { + pkgdesc='Library for KDE PIM' + groups=() + depends=('kde-agent' 'kdepim-runtime') + url='http://pim.kde.org' + conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' + 'kdepim-strigi-analyzer' 'kdepim-akonadi') + replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' + 'kdepim-strigi-analyzer' 'kdepim-akonadi') + for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \ + kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ + messagecomposer messagecore messagelist messageviewer icons \ + strigi-analyzer plugins/messageviewer plugins/ktexteditor; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-wizards() { + pkgdesc='KDE Groupware Wizard' + depends=('kdepim-kresources') + url='http://pim.kde.org' + cd "${srcdir}"/build/wizards + make DESTDIR="${pkgdir}" install +} diff --git a/staging/kdepim/disable-l10n.patch b/staging/kdepim/disable-l10n.patch new file mode 100644 index 000000000..0c24ab408 --- /dev/null +++ b/staging/kdepim/disable-l10n.patch @@ -0,0 +1,10 @@ +--- kdepim-4.6.1/CMakeLists.txt~ 2011-07-06 19:17:16.801814825 +0000 ++++ kdepim-4.6.1/CMakeLists.txt 2011-07-06 19:17:34.141961840 +0000 +@@ -425,7 +425,3 @@ + endif(NOT QGPGME_FOUND) + # All done, let's display what we found... + macro_display_feature_log() +-find_package(Msgfmt REQUIRED) +-find_package(Gettext REQUIRED) +-add_subdirectory(po) +-add_subdirectory(doc-translations) diff --git a/staging/kdepim/kdepim-kleopatra.install b/staging/kdepim/kdepim-kleopatra.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdepim/kdepim-kleopatra.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdepim/kdepim-kmail.install b/staging/kdepim/kdepim-kmail.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdepim/kdepim-kmail.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdepim/kdepim-korganizer.install b/staging/kdepim/kdepim-korganizer.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/kdepim/kdepim-korganizer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdepim/kdepim.install b/staging/kdepim/kdepim.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdepim/kdepim.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone new file mode 100644 index 000000000..509c311f6 --- /dev/null +++ b/testing/bind/127.0.0.zone @@ -0,0 +1,11 @@ +$ORIGIN 0.0.127.in-addr.arpa. + +@ 1D IN SOA localhost. root.localhost. ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS localhost. +1 1D IN PTR localhost. diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD new file mode 100644 index 000000000..9d34dc6dc --- /dev/null +++ b/testing/bind/PKGBUILD @@ -0,0 +1,86 @@ +# $Id: PKGBUILD 130507 2011-07-07 02:35:18Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +# Contributor: Mario Vazquez <mario_vazq@hotmail.com> + +pkgname=bind + +# Use a period and not a hyphen before the patch level for proper versioning. +pkgver=9.8.0.P4 +_pkgver=9.8.0-P4 +pkgrel=1 + +pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols' +arch=('i686' 'x86_64') +url='http://www.isc.org/software/bind/' +license=('custom:ISC') +provides=('dns-server') +backup=('etc/logrotate.d/named' + 'etc/conf.d/named' + 'etc/named.conf') +depends=('openssl' 'krb5' 'libxml2') +options=('!makeflags' '!libtool') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz" + 'root.hint::ftp://ftp.rs.internic.net/domain/db.cache' + 'so_bsdcompat.patch' + 'notools.patch' + 'named' + 'named.conf' + 'named.conf.d' + 'named.logrotate' + 'localhost.zone' + '127.0.0.zone') +sha1sums=('969864200c1516a8bea54266de60f316d79182b4' + 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' + 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' + '17444f9d759a4bde7688bdaa304dac57a138e4c1' + '46232e9db243c6c05e170a1781d7a7f413be5d03' + '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' + '7848edbfb9a848843f57c11c02b0289eefd42d00' + '9ffb5c3f72390a517aeae557e32349d5d278cb63' + '76a0d4cd1b913db177a5a375bebc47e5956866ec' + '53be0f1437ebe595240d8dbdd819939582b97fb9') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${_pkgver}" + + patch -p1 -i ../so_bsdcompat.patch + patch -p1 -i ../notools.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-gssapi \ + --with-libxml2 \ + --with-libtool \ + --with-dlz-dlopen \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${_pkgver}" + + make DESTDIR="${pkgdir}" install + + rmdir "${pkgdir}/var/run" + install -d "${pkgdir}"/usr/share/doc/bind + install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/ + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + install -D -m755 ../named "${pkgdir}"/etc/rc.d/named + install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named + install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named + install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf + + install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/ + install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/ + install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/ +} diff --git a/testing/bind/install b/testing/bind/install new file mode 100644 index 000000000..e3a1397cb --- /dev/null +++ b/testing/bind/install @@ -0,0 +1,21 @@ +post_install() { + getent group named >/dev/null || groupadd -g 40 named + getent passwd named >/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named + passwd -l named &>/dev/null + + touch var/log/named.log + chown named:named var/log/named.log + + # create an rndc.key if it doesn't already exist + if [ ! -s etc/rndc.key ]; then + usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key + chown root:named etc/rndc.key + chmod 640 etc/rndc.key + fi +} + +pre_remove() { + getent passwd named &>/dev/null && userdel named >/dev/null + getent group named &>/dev/null && groupdel named >/dev/null + return 0 +} diff --git a/testing/bind/localhost.zone b/testing/bind/localhost.zone new file mode 100644 index 000000000..e3ff9641c --- /dev/null +++ b/testing/bind/localhost.zone @@ -0,0 +1,10 @@ +$ORIGIN localhost. +@ 1D IN SOA @ root ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS @ + 1D IN A 127.0.0.1 diff --git a/testing/bind/named b/testing/bind/named new file mode 100755 index 000000000..7907f9983 --- /dev/null +++ b/testing/bind/named @@ -0,0 +1,52 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/named + +[[ -d /var/run/named ]] || mkdir -p /var/run/named +chown named:named /var/run/named + +PIDFILE=/var/run/named/named.pid +PID=$(cat $PIDFILE 2>/dev/null) +readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } + +case "$1" in + start) + stat_busy "Starting BIND" + [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon named + stat_done + fi + ;; + stop) + stat_busy "Stopping BIND" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon named + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + reload) + stat_busy "Reloading BIND" + [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|reload|restart}" +esac +exit 0 diff --git a/testing/bind/named.conf b/testing/bind/named.conf new file mode 100644 index 000000000..38fb12cbe --- /dev/null +++ b/testing/bind/named.conf @@ -0,0 +1,64 @@ +// +// /etc/named.conf +// + +options { + directory "/var/named"; + pid-file "/var/run/named/named.pid"; + auth-nxdomain yes; + datasize default; +// Uncomment these to enable IPv6 connections support +// IPv4 will still work: +// listen-on-v6 { any; }; +// Add this for no IPv4: +// listen-on { none; }; + + // Default security settings. + allow-recursion { 127.0.0.1; }; + allow-transfer { none; }; + allow-update { none; }; + version none; + hostname none; + server-id none; +}; + +zone "localhost" IN { + type master; + file "localhost.zone"; + allow-transfer { any; }; +}; + +zone "0.0.127.in-addr.arpa" IN { + type master; + file "127.0.0.zone"; + allow-transfer { any; }; +}; + +zone "." IN { + type hint; + file "root.hint"; +}; + +//zone "example.org" IN { +// type slave; +// file "example.zone"; +// masters { +// 192.168.1.100; +// }; +// allow-query { any; }; +// allow-transfer { any; }; +//}; + +logging { + channel xfer-log { + file "/var/log/named.log"; + print-category yes; + print-severity yes; + print-time yes; + severity info; + }; + category xfer-in { xfer-log; }; + category xfer-out { xfer-log; }; + category notify { xfer-log; }; +}; + diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d new file mode 100644 index 000000000..aecbd2307 --- /dev/null +++ b/testing/bind/named.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to BIND +# +NAMED_ARGS="-u named" diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate new file mode 100644 index 000000000..ef1a2d032 --- /dev/null +++ b/testing/bind/named.logrotate @@ -0,0 +1,6 @@ +/var/log/named.log { + missingok + postrotate + /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/bind/notools.patch b/testing/bind/notools.patch new file mode 100644 index 000000000..0ad083a01 --- /dev/null +++ b/testing/bind/notools.patch @@ -0,0 +1,12 @@ +diff -aur old/bin/Makefile.in new/bin/Makefile.in +--- old/bin/Makefile.in 2011-05-27 10:12:59.392416094 +0200 ++++ new/bin/Makefile.in 2011-05-27 10:13:12.372521984 +0200 +@@ -19,7 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ ++SUBDIRS = named rndc dnssec tests tools \ + check confgen @PKCS11_TOOLS@ + TARGETS = + diff --git a/testing/bind/so_bsdcompat.patch b/testing/bind/so_bsdcompat.patch new file mode 100644 index 000000000..4d7031fcc --- /dev/null +++ b/testing/bind/so_bsdcompat.patch @@ -0,0 +1,12 @@ +diff -aur old/lib/isc/unix/socket.c new/lib/isc/unix/socket.c +--- old/lib/isc/unix/socket.c 2011-02-18 05:01:16.000000000 +0100 ++++ new/lib/isc/unix/socket.c 2011-05-27 10:12:01.685269374 +0200 +@@ -712,6 +712,8 @@ + } + #endif + ++#undef SO_BSDCOMPAT ++ + static void + socket_log(isc__socket_t *sock, isc_sockaddr_t *address, + isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD new file mode 100644 index 000000000..724bb5c4d --- /dev/null +++ b/testing/dnsutils/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 130510 2011-07-07 02:37:46Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> +# Contributor: mario <mario_vazq@hotmail.com> + +pkgname=dnsutils + +# Use a period and not a hyphen before the patch level for proper versioning. +pkgver=9.8.0.P4 +_pkgver=9.8.0-P4 +pkgrel=1 + +pkgdesc='Various DNS utilities - dig host nslookup nsupdate' +arch=('i686' 'x86_64') +url='https://www.isc.org/software/bind' +license=('custom:ISC') +depends=('openssl' 'idnkit') +replaces=('bind-tools' 'host') +options=('!makeflags') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" + 'tools-only.patch') +sha1sums=('969864200c1516a8bea54266de60f316d79182b4' + 'ac88c89e25c26d73095a3dd85e1ca1070d184ded') + +build() { + cd "${srcdir}/bind-${_pkgver}" + + patch -p1 -i ../tools-only.patch + export STD_CDEFINES='-DDIG_SIGCHASE' + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-openssl=yes \ + --with-idn=yes \ + --disable-linux-caps \ + + make +} + +package() { + cd "${srcdir}/bind-${_pkgver}/bin" + + make DESTDIR="${pkgdir}" install + + install -Dm644 ../COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/dnsutils/tools-only.patch b/testing/dnsutils/tools-only.patch new file mode 100644 index 000000000..b46b71f60 --- /dev/null +++ b/testing/dnsutils/tools-only.patch @@ -0,0 +1,25 @@ +diff -Naur bind-9.7.1-P2.orig/bin/Makefile.in bind-9.7.1-P2/bin/Makefile.in +--- bind-9.7.1-P2.orig/bin/Makefile.in 2009-10-05 08:07:08.000000000 -0400 ++++ bind-9.7.1-P2/bin/Makefile.in 2010-07-22 15:55:00.000000000 -0400 +@@ -19,8 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +- check confgen @PKCS11_TOOLS@ ++SUBDIRS = dig nsupdate + TARGETS = + + @BIND9_MAKE_RULES@ +diff -Naur bind-9.7.1-P2.orig/lib/Makefile.in bind-9.7.1-P2/lib/Makefile.in +--- bind-9.7.1-P2.orig/lib/Makefile.in 2007-06-19 19:47:13.000000000 -0400 ++++ bind-9.7.1-P2/lib/Makefile.in 2010-07-22 15:56:29.000000000 -0400 +@@ -23,7 +23,7 @@ + # Attempt to disable parallel processing. + .NOTPARALLEL: + .NO_PARALLEL: +-SUBDIRS = isc isccc dns isccfg bind9 lwres tests ++SUBDIRS = isc dns isccfg bind9 lwres + TARGETS = + + @BIND9_MAKE_RULES@ diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index 8471be373..345e8c2b8 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127627 2011-06-17 09:07:14Z andyrtr $ +# $Id: PKGBUILD 130489 2011-07-06 16:35:35Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -9,11 +9,11 @@ _git=true #_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110616 + pkgver=7.10.99.git20110706 else pkgver=7.10.3 fi -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake' 'llvm') @@ -21,8 +21,8 @@ url="http://mesa3d.sourceforge.net" license=('custom') source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch) if [ "${_git}" = "true" ]; then - # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe - source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe.tar.bz2') + # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 + source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip" ) @@ -30,7 +30,7 @@ fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' '3ec78f340f9387abd7a37b195e764cbf' '67c87b77cc2236b52a3b47dad3fbb5d4' - 'f9cf11f9fd8f5d2092536fc48fad922f') + '6d655a2573037838844019275dce66af') build() { if [ "${_git}" = "true" ]; then @@ -50,16 +50,12 @@ fi if [ "${_git}" = "true" ]; then ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --enable-gallium-r300 \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ + --with-gallium-drivers=r300,r600,nouveau,swrast \ --enable-gallium-llvm \ --enable-gallium-egl \ - --enable-gallium-swrast \ --enable-glx-tls \ --with-driver=dri \ --enable-xcb \ - --with-state-trackers=dri,glx,egl \ --disable-glut \ --enable-gles1 \ --enable-gles2 \ @@ -68,8 +64,6 @@ if [ "${_git}" = "true" ]; then --enable-shared-dricore # --enable-gallium-svga \ - - #--enable-shared-dricore - link DRI modules with shared core DRI routines[default=disabled] http://bugs.gentoo.org/show_bug.cgi?id=357177 #--enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no] else @@ -155,7 +149,7 @@ package_libegl() { if [ "${_git}" = "true" ]; then cd ${srcdir}/mesa-* - make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install + make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install else cd "${srcdir}/Mesa-${pkgver}" fi |