diff options
| author | root <root@rshg054.dnsready.net> | 2013-01-30 00:08:41 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-01-30 00:08:41 -0800 |
| commit | c25b7aa323ab71b1a524d15dbbe942dbebd55761 (patch) | |
| tree | c7dd8d810c5d08168ee757083d3b6bce150c1915 | |
| parent | cb333f0d5d536b1436262e1b3e45647b22f136b0 (diff) | |
Wed Jan 30 00:08:41 PST 2013
32 files changed, 239 insertions, 145 deletions
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index 43955999d..083591db7 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82534 2013-01-20 09:37:44Z lcarlier $ +# $Id: PKGBUILD 83313 2013-01-29 13:27:03Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee pkgver=2.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" @@ -24,7 +24,8 @@ build() { cd ${srcdir}/chmsee-*/src cp Makefile.arch Makefile - sed -i -e 's/17.*/18.*/g' ../application.ini + sed -i -e 's/17.*/18.0/g' ../application.ini + sed -i -e 's/19.*/19.0/g' ../application.ini make -j1 } diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD index fb3658edb..157bb1867 100644 --- a/community/cuneiform/PKGBUILD +++ b/community/cuneiform/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82693 2013-01-23 00:16:03Z eric $ +# $Id: PKGBUILD 83315 2013-01-29 14:01:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Maxim Vuets <maxim.vuets@gmail.com> pkgname=cuneiform pkgver=1.1.0 _dpkgver=1.1 -pkgrel=5 +pkgrel=6 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." arch=('i686' 'x86_64') url="https://launchpad.net/cuneiform-linux" @@ -24,7 +24,11 @@ build() { mkdir builddir cd builddir - cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr .. + cmake \ + -DCMAKE_BUILD_TYPE=release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DImageMagick_Magick++_LIBRARY=/usr/lib/libMagick++-Q16.so.7 \ + .. make } diff --git a/community/espeakup/PKGBUILD b/community/espeakup/PKGBUILD index c6d147531..5cad1dcf7 100644 --- a/community/espeakup/PKGBUILD +++ b/community/espeakup/PKGBUILD @@ -1,6 +1,7 @@ -# $Id: PKGBUILD 80362 2012-11-20 18:55:18Z tomegun $ -# Contributor: Chris Brannon <chris@the-brannons.com> +# $Id$ +# Maintainer: Chris Brannon <chris@the-brannons.com> # Contributor: Kyle <kyle@gmx.ca> + pkgname=espeakup pkgver=0.71 pkgrel=7 diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 018fbe488..ff0ea2752 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80567 2012-11-25 17:21:40Z spupykin $ +# $Id: PKGBUILD 83307 2013-01-29 09:59:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive -pkgver=0.9.2 -pkgrel=6 +pkgver=0.9.4 +pkgrel=1 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64') # http://download.kde.org/stable/kdenlive/ @@ -21,7 +21,7 @@ optdepends=('recordmydesktop: screen capture' install=kdenlive.install options=('docs') source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2) -md5sums=('40f108f26e2c2e08807a1c183d8764ec') +md5sums=('fed17b584aca6a9811a49f2348b4f6db') build() { export LDFLAGS="$LDFLAGS -lX11" diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index ff55295ab..e959ef944 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 78553 2012-10-20 20:21:09Z idevolder $ +# $Id: PKGBUILD 83326 2013-01-29 17:19:32Z spupykin $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: Philippe Cherel <philippe.cherel@mayenne.org> pkgname=libcec -pkgver=1.9.0 -pkgrel=2 +pkgver=2.0.5 +pkgrel=1 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') url="https://github.com/Pulse-Eight/libcec" license=('GPL') depends=('udev' 'lockdev') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-217b236 -sha256sums=('93c0c56b446f82ef71499fd88186c7212a92b037cb8a19516140216cc0aae68f') +_srcfolder=Pulse-Eight-libcec-e1599e0 options=(!libtool) +sha256sums=('83d99cf759531d8c8a217f360f4748159cb9cedac98d77a4615450bad6d570c4') build() { mv "$_srcfolder" "$pkgname-$pkgver" cd "$pkgname-$pkgver" + export CFLAGS="$CFLAGS -fPIC" + export CXXFLAGS="$CXXFLAGS -fPIC" + export LDFLAGS="$LDFLAGS -fPIC" autoreconf -vif ./configure --prefix=/usr make diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index b03cd36c6..5b05c4255 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82286 2013-01-14 10:03:34Z spupykin $ +# $Id: PKGBUILD 83324 2013-01-29 14:07:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=1.0.1 -pkgrel=2 +pkgrel=4 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -12,7 +12,7 @@ license=('LGPL') depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'netcf' 'libnl' 'libx11') + 'iproute2' 'libnl' 'libx11' 'audit') makedepends=('pkgconfig' 'lvm2' 'linux-api-headers') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' @@ -40,7 +40,7 @@ md5sums=('86a8c0acabb01e11ac84fe00624dc54e' '3ed0e24f5b5e25bf553f5427d64915e6' '0ee5b6c58590ff392a266f20f7928d1f' '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '8d98e62915785686b0b6c8c070628392') + '020971887442ebbf1b6949e031c8dd3f') build() { cd "$srcdir/$pkgname-$pkgver" @@ -56,8 +56,10 @@ build() { export RADVD=/usr/sbin/radvd [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ --with-storage-lvm --without-xen --with-udev --without-hal --disable-static \ - --with-init-script=systemd - make -j1 + --with-init-script=systemd --with-audit \ + --with-qemu-user=nobody --with-qemu-group=nobody \ + --without-netcf --with-interface + make sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service sed -i 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' tools/libvirt-guests.service sed -i 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' tools/libvirt-guests.service @@ -76,21 +78,21 @@ package() { install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests - install -dm0755 $pkgdir/usr/lib/sysctl.d - mv $pkgdir/etc/sysctl.d/libvirtd $pkgdir/usr/lib/sysctl.d/libvirtd + install -dm0755 "$pkgdir"/usr/lib/sysctl.d + mv "$pkgdir"/etc/sysctl.d/libvirtd "$pkgdir"/usr/lib/sysctl.d/libvirtd.conf # systemd stuff install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf - mv $pkgdir/lib/* $pkgdir/usr/lib/ + mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/ sed -i \ 's|After=.*|After=syslog.target network.target libvirtd.service|' \ - $pkgdir/usr/lib/systemd/system/libvirt-guests.service + "$pkgdir"/usr/lib/systemd/system/libvirt-guests.service rm -rf \ - $pkgdir/var/run \ - $pkgdir/etc/sysconfig \ - $pkgdir/etc/rc.d/init.d \ - $pkgdir/lib \ - $pkgdir/etc/sysctl.d + "$pkgdir"/var/run \ + "$pkgdir"/etc/sysconfig \ + "$pkgdir"/etc/rc.d/init.d \ + "$pkgdir"/lib \ + "$pkgdir"/etc/sysctl.d } diff --git a/community/libvirt/libvirt.tmpfiles.d b/community/libvirt/libvirt.tmpfiles.d index 0cec93271..2804c43c8 100644 --- a/community/libvirt/libvirt.tmpfiles.d +++ b/community/libvirt/libvirt.tmpfiles.d @@ -1,4 +1,4 @@ -d /var/run/libvirt/qemu 0755 root root - -d /var/run/libvirt/lxc 0755 root root - -d /var/run/libvirt/uml 0755 root root - -d /var/run/libvirt/network 0755 root root - +d /run/libvirt/qemu 0755 root root - +d /run/libvirt/lxc 0755 root root - +d /run/libvirt/uml 0755 root root - +d /run/libvirt/network 0755 root root - diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD index e22deeef1..5a4de60d5 100644 --- a/community/lockdev/PKGBUILD +++ b/community/lockdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76820 2012-09-30 13:49:03Z lfleischer $ +# $Id: PKGBUILD 83333 2013-01-29 17:40:17Z spupykin $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <a.wagner@stud.uni-frankfurt.de> @@ -6,7 +6,7 @@ pkgname=lockdev pkgver=1.0.3_1.5 _pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.' url='http://packages.qa.debian.org/l/lockdev.html' license=("GPL") @@ -22,8 +22,8 @@ build() { patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff" sed -i "s|CFLAGS = -g|CFLAGS = -g -fPIC|" Makefile - make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\"" - make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\"" + make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC" + make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC" } package() { diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 6350ae0ef..0276cad96 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83259 2013-01-28 16:49:45Z stephane $ +# $Id: PKGBUILD 83319 2013-01-29 14:02:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=2.1.0 -pkgrel=5 +pkgrel=6 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64') url="http://mapnik.org/" diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD index 45e3fbb2e..660dafc40 100644 --- a/community/mednafen/PKGBUILD +++ b/community/mednafen/PKGBUILD @@ -1,32 +1,36 @@ -# $Id: PKGBUILD 82331 2013-01-15 11:35:02Z allan $ +# $Id: PKGBUILD 83342 2013-01-29 21:58:18Z jsteel $ # Maintainer: Jonathan Steel <mail at jsteel dot org> +# Contributor: megadriver <megadriver at gmx dot com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: kagan <juanynie@mi.madritel.es> +# Contributor: Hans-Kristian Arntzen <maister@archlinux.us> pkgname=mednafen -pkgver=0.8.D.3 -pkgrel=3 +pkgver=0.9.28 +_pkgver=0.9.28-wip +pkgrel=1 pkgdesc="A command-line multi-system gaming emulator" -url="http://mednafen.sourceforge.net/" +url="http://mednafen.sourceforge.net" license=('GPL') arch=('i686' 'x86_64') -depends=('libcdio' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') -makedepends=('pkgconfig' 'mesa' 'glu') -changelog=ChangeLog -source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2 - mednafen-0.8.13.3-zlib-1.2.6.patch) -md5sums=('57d22805071becd81858b0c088a275e5' - '450bb5aa7552db5b8f6d6713bdb725ce') +depends=('libcdio' 'libsamplerate' 'sdl_net' 'zlib') +makedepends=('mesa' 'glu') +replaces=('mednafen-wip') +install="$pkgname.install" +source=(http://downloads.sourceforge.net/mednafen/$pkgname-$_pkgver.tar.bz2) +md5sums=('2b9f0be9f77a6e1b5d26093e30b24e77') build() { - cd $srcdir/$pkgname - patch -Np1 -i $srcdir/mednafen-0.8.13.3-zlib-1.2.6.patch + cd "$srcdir"/$pkgname + ./configure --prefix=/usr + make } package() { - cd $srcdir/$pkgname - make DESTDIR=$pkgdir install + cd "$srcdir"/$pkgname + + make DESTDIR="$pkgdir"/ install } diff --git a/community/mednafen/mednafen.install b/community/mednafen/mednafen.install new file mode 100644 index 000000000..8a0672362 --- /dev/null +++ b/community/mednafen/mednafen.install @@ -0,0 +1,5 @@ +post_upgrade() { + echo 'Save states from 0.8.x and earlier are not compatible with 0.9.x, + [...] The configuration file name has changed to "mednafen-09x.cfg" + [...] http://mednafen.sourceforge.net/releases/' +} diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD index f8266faec..1b462e15f 100644 --- a/community/mingw32-binutils/PKGBUILD +++ b/community/mingw32-binutils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82709 2013-01-23 10:13:43Z spupykin $ +# $Id: PKGBUILD 83337 2013-01-29 19:58:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> # Contributor: mosra <mosra@centrum.cz> pkgname=mingw32-binutils pkgver=2.23.1 -pkgrel=2 +pkgrel=3 _uprel=1 arch=(i686 x86_64) url="https://sourceforge.net/projects/mingw/files/MinGW/Base/binutils/" @@ -13,7 +13,7 @@ pkgdesc="A set of programs to assemble and manipulate binary and object files (m depends=('glibc' 'zlib') license=(GPL) source=("https://downloads.sourceforge.net/project/mingw/MinGW/Base/binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma" - "http://sourceware.org/git/?p=binutils.git;a=patch;h=260cd95271cdf002ed8e419898fd29c42e257841") + "260cd952.patch::http://sourceware.org/git/?p=binutils.git;a=patch;h=260cd95271cdf002ed8e419898fd29c42e257841") md5sums=('5d76604f545b151230d1c86e1b8cfab3' '9226501a8258a12c81956252ba3b4ba1') @@ -22,6 +22,7 @@ build() { [ $NOEXTRACT -eq 1 ] || tar xjf binutils-$pkgver-${_uprel}-mingw32-src/binutils-$pkgver.tar.bz2 cd $srcdir/binutils-$pkgver + patch -Np1 <$srcdir/260cd952.patch || true ./configure \ --target=i486-mingw32 \ --host=$CHOST \ diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 85ac97bf8..4eb4cd9b2 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81311 2012-12-17 10:05:50Z spupykin $ +# $Id: PKGBUILD 83305 2013-01-29 09:44:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -7,7 +7,7 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') -pkgver=0.8.6 +pkgver=0.8.8 pkgrel=1 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ff 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz ffmpeg.patch) -md5sums=('8d2c5b0f24a8b90fb44961920e3770ff' +md5sums=('06de4052cffd6760c468d7da9557edae' 'c28b4691d1715432d4de0055f4e2f5eb') build() { diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 950896dae..0a345b8fb 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82411 2013-01-16 23:44:10Z jconder $ +# $Id: PKGBUILD 83332 2013-01-29 17:35:51Z spupykin $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.26.0 -pkgrel=4 +pkgrel=5 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -32,18 +32,21 @@ source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'alsa.patch' 'mythbackend.rc' 'mythbackend.conf' - 'mythbackend.service') + 'mythbackend.service' + 'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.patch') md5sums=('f57066bf75e6f14824c494d41639f4f9' 'f64b8219e3d27a2edf96733b851e576b' 'c8f935d42fb8617e9279bd539811ca5f' 'ab962d83614cbd0ac11ce3fcc929829d' - 'e4d572dcc307d6d8ae26bee5aebf9f3a') + 'e4d572dcc307d6d8ae26bee5aebf9f3a' + '6e156c9fc0b369346d93ccafad46cba3') build() { cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' patch -Np1 -i "$srcdir/alsa.patch" + patch -Np2 -i "$srcdir/libcec-2-support.patch" ARCH="${CARCH/_/-}" ./configure --prefix=/usr \ diff --git a/community/python2-imaging/PKGBUILD b/community/python2-imaging/PKGBUILD index c5cb6db71..b44c571c2 100644 --- a/community/python2-imaging/PKGBUILD +++ b/community/python2-imaging/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81687 2012-12-26 19:34:45Z foutrelis $ +# $Id: PKGBUILD 83335 2013-01-29 19:26:55Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,7 +6,7 @@ pkgname=python2-imaging pkgver=1.1.7 -pkgrel=7 +pkgrel=8 pkgdesc="PIL. Provides image processing capabilities for python" arch=('i686' 'x86_64') url="http://www.pythonware.com/products/pil/index.htm" @@ -23,6 +23,10 @@ md5sums=('fc14a54e1ce02a0225be8854bfba478e') build() { cd "${srcdir}/Imaging-${pkgver}" + + # FS#33452 + export CFLAGS="$CFLAGS -fno-strict-aliasing" + python2 setup.py build_ext cd Sane python2 setup.py build_ext diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD index 8d0e09399..46cb818ef 100644 --- a/community/qupzilla/PKGBUILD +++ b/community/qupzilla/PKGBUILD @@ -1,30 +1,23 @@ -# $Id: PKGBUILD 80685 2012-11-29 04:01:25Z speps $ +# $Id: PKGBUILD 83299 2013-01-29 01:36:39Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> _name=QupZilla +_commit=fbfcc70 pkgname=qupzilla -pkgver=1.3.5 -pkgrel=3 +pkgver=1.3.5_git20130128 +pkgrel=1 pkgdesc="Cross-platform QtWebKit browser" arch=(i686 x86_64) url="http://www.qupzilla.com/" license=('GPL3') depends=('qtwebkit') install="$pkgname.install" -source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/v$pkgver" - "https://github.com/QupZilla/qupzilla/commit/37da53731c6c92b4ece0bdb6e264472adf2f6d9.patch" - "https://github.com/QupZilla/qupzilla/commit/7a1bbd993d6f54d01b88a8d1f05bcfe0dec1c2b5.patch") -md5sums=('95d19c0e22c6dbf605b760125a4b7ef3' - 'c40fbec4f2d6877b6536834c45ec6323' - 'ace1933025c3fba757911336560b00d0') +source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/$_commit") +md5sums=('ff8bd77f785335a8157aceb3cd54507a') build() { cd "$srcdir/$_name-$pkgname-"* - # FS#32840 - patch -p1 -i "$srcdir/${source[1]##*/}" #624 - Don't crash on adblock menu when adblock is disabled. - patch -p1 -i "$srcdir/${source[2]##*/}" #652 - Infinite loop on bookmarking a page while history is empty - # enable webgl support export USE_WEBGL=true diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 5ba646e89..edf4a1fac 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82193 2013-01-11 10:21:06Z spupykin $ +# $Id: PKGBUILD 83339 2013-01-29 20:01:01Z 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.6.8 +pkgver=2.6.9 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.service" "redis.logrotate") -md5sums=('a41dcfb0ed537f4a6dd7afd8c60df623' +md5sums=('5093fb7c5f763e828c857daf260665bc' '8d843919d9f165e9a47e56cadb4ac2ed' '5ab9fdb200e15c13b450fda77fa030b6' '9e2d75b7a9dc421122d673fe520ef17f') @@ -26,6 +26,7 @@ md5sums=('a41dcfb0ed537f4a6dd7afd8c60df623' build() { cd "$srcdir/${pkgname}-${pkgver}" make MALLOC=libc + sed -i 's|# bind 127.0.0.1|bind 127.0.0.1|' redis.conf } package() { diff --git a/community/ripperx/PKGBUILD b/community/ripperx/PKGBUILD index 2c9b0cfa8..d852ced60 100644 --- a/community/ripperx/PKGBUILD +++ b/community/ripperx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80016 2012-11-15 13:29:30Z spupykin $ +# $Id: PKGBUILD 83323 2013-01-29 14:04:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=ripperx pkgver=2.7.3 -pkgrel=3 +pkgrel=4 pkgdesc="GTK program to rip and encode mp3 files" arch=(i686 x86_64) url="http://ripperx.sourceforge.net/" @@ -17,6 +17,7 @@ build() { cd $srcdir/ripperX-$pkgver LDFLAGS=-lm ./configure --prefix=/usr sed -i 's|Icon=.*|Icon=ripperX.xpm|g' ripperX.desktop + echo "Categories=GTK;GNOME;AudioVideo;DiscBurning;" >>ripperX.desktop make } diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index 53b05ea39..345cce42c 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83280 2013-01-28 16:50:17Z stephane $ +# $Id: PKGBUILD 83329 2013-01-29 17:20:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> @@ -6,7 +6,7 @@ pkgname=wt pkgver=3.2.3 _pkgver=3.2.3 -pkgrel=3 +pkgrel=4 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64') url="http://www.webtoolkit.eu/" diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index 68aa6f7ed..1601e1e13 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82338 2013-01-15 11:35:10Z allan $ +# $Id: PKGBUILD 83330 2013-01-29 17:21:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -8,8 +8,8 @@ _prefix=/usr pkgname=xbmc -pkgver=11.0 -pkgrel=14 +pkgver=12.0 +pkgrel=1 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -18,9 +18,10 @@ depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' - 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu') + 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu' + 'tinyxml' 'taglib') makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' - 'udisks' 'upower' 'bluez' 'mesa') + 'udisks' 'upower' 'bluez' 'mesa' 'doxygen' 'swig' 'java-environment') optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'vdpau-video: accelerated video playback for nvidia cards' 'xvba-video: accelerated video playback for amd cards' @@ -34,7 +35,7 @@ install="${pkgname}.install" source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" "xbmc.service" "cdio.patch") -md5sums=('9e8a26ee25173c7268abea7f1d82d428' +md5sums=('a79128b9d094a046947bfd9bb4550809' '76fae229ebc3bcfaab7e7f27e4fb51f5' '49c0a7cbfca3666a24e8824950bd371b') @@ -44,11 +45,11 @@ build() { # fix lsb_release dependency sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADER:' \ - lib/libid3tag/libid3tag/configure.ac \ - lib/libdvd/libdvdcss/configure.ac +# sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADER:' \ +# lib/libid3tag/libid3tag/configure.ac \ +# lib/libdvd/libdvdcss/configure.ac - patch -p1 <$srcdir/cdio.patch +# patch -p1 <$srcdir/cdio.patch # Bootstrapping XBMC ./bootstrap diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 5d991467a..efbc00dd9 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175919 2013-01-25 01:06:48Z bisson $ +# $Id: PKGBUILD 176299 2013-01-29 03:50:02Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,7 +6,7 @@ pkgname=gnupg pkgver=2.0.19 -pkgrel=4 +pkgrel=5 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') @@ -17,9 +17,11 @@ optdepends=('curl: gpg2keys_curl' makedepends=('curl' 'libldap' 'libusb-compat') depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig} + 'valid-keyblock-packet.patch' 'protect-tool-env.patch') sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f' 'f6e6830610a8629b0aad69d789373bf8ca481733' + '474d827f1c2976bb107985047f61ac9096ae0953' '2ec97ba55ae47ff0d63bc813b8c64cb79cef11db') install=install @@ -31,6 +33,7 @@ replaces=('gnupg2') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../protect-tool-env.patch # FS#31900 + patch -p1 -i ../valid-keyblock-packet.patch ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg make } diff --git a/core/gnupg/valid-keyblock-packet.patch b/core/gnupg/valid-keyblock-packet.patch new file mode 100644 index 000000000..64bf1c2da --- /dev/null +++ b/core/gnupg/valid-keyblock-packet.patch @@ -0,0 +1,61 @@ +From: Werner Koch <wk@gnupg.org> +Date: Thu, 20 Dec 2012 08:43:41 +0000 (+0100) +Subject: gpg: Import only packets which are allowed in a keyblock. +X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff_plain;h=498882296ffac7987c644aaf2a0aa108a2925471;hp=20c95ef258f8520283406239f7c6f4729341d463 + +gpg: Import only packets which are allowed in a keyblock. + +* g10/import.c (valid_keyblock_packet): New. +(read_block): Store only valid packets. +-- + +A corrupted key, which for example included a mangled public key +encrypted packet, used to corrupt the keyring. This change skips all +packets which are not allowed in a keyblock. + +GnuPG-bug-id: 1455 + +(cherry-picked from commit 3a4b96e665fa639772854058737ee3d54ba0694e) +--- + +diff --git a/g10/import.c b/g10/import.c +index ba2439d..ad112d6 100644 +--- a/g10/import.c ++++ b/g10/import.c +@@ -347,6 +347,27 @@ import_print_stats (void *hd) + } + + ++/* Return true if PKTTYPE is valid in a keyblock. */ ++static int ++valid_keyblock_packet (int pkttype) ++{ ++ switch (pkttype) ++ { ++ case PKT_PUBLIC_KEY: ++ case PKT_PUBLIC_SUBKEY: ++ case PKT_SECRET_KEY: ++ case PKT_SECRET_SUBKEY: ++ case PKT_SIGNATURE: ++ case PKT_USER_ID: ++ case PKT_ATTRIBUTE: ++ case PKT_RING_TRUST: ++ return 1; ++ default: ++ return 0; ++ } ++} ++ ++ + /**************** + * Read the next keyblock from stream A. + * PENDING_PKT should be initialzed to NULL +@@ -424,7 +445,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root ) + } + in_cert = 1; + default: +- if( in_cert ) { ++ if (in_cert && valid_keyblock_packet (pkt->pkttype)) { + if( !root ) + root = new_kbnode( pkt ); + else diff --git a/core/reiserfsprogs/PKGBUILD b/core/reiserfsprogs/PKGBUILD index ca73bf439..d586f2ed2 100644 --- a/core/reiserfsprogs/PKGBUILD +++ b/core/reiserfsprogs/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 142934 2011-11-18 14:00:58Z pierre $ +# $Id: PKGBUILD 176315 2013-01-29 16:20:21Z andrea $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=reiserfsprogs -pkgver=3.6.21 -pkgrel=4 +pkgver=3.6.22 +pkgrel=1 pkgdesc="Reiserfs utilities" arch=('i686' 'x86_64') url="http://www.kernel.org/" license=('GPL') groups=('base') -depends=('util-linux-ng') -source=("ftp://ftp.archlinux.org/other/reiserfsprogs/reiserfsprogs-${pkgver}.tar.bz2") -md5sums=('0639cefac8f8150536cfa7531c2aa2d2') +depends=('util-linux') +source=("http://ftp.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v3.6.22/${pkgname}-${pkgver}.tar.xz") +md5sums=('91d2fdb5eeaa15c8afcc9e815179690d') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,7 +28,4 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - ln -s reiserfsck "${pkgdir}/sbin/fsck.reiserfs" - ln -s mkreiserfs "${pkgdir}/sbin/mkfs.reiserfs" } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 8ea4c7e09..1f9a60ec3 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 175132 2013-01-14 22:24:03Z dan $ +# $Id: PKGBUILD 176301 2013-01-29 03:57:43Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.1.1 +pkgver=1.8.1.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -109,8 +109,8 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('2bf7fd005ecf2e0a311b849e6add7994' - '4ac4ea5a72ec96ac24b7d6fba9ad1277' +md5sums=('9f912370a1831c851ff8df171e8a7218' + 'b3034a199b544fd8ea0d6036ed69a09f' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD index e08c31a79..3506ba984 100644 --- a/extra/gst-libav/PKGBUILD +++ b/extra/gst-libav/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173802 2012-12-24 02:14:25Z foutrelis $ +# $Id: PKGBUILD 176320 2013-01-29 20:24:29Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-libav -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="Gstreamer libav Plugin" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('yasm') options=(!libtool !emptydirs) provides=("gst-ffmpeg=$pkgver-$pkgrel") source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('5685fa94eaadad11017bca4fd5f4acc9f3bea63a8be89030e86b341e5a491a50') +sha256sums=('aef8be665096b3a4e64424fb39d7c5da57faaaf95e9fea6c1bb44295d4fb32d5') build() { cd $pkgname-$pkgver diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 5922c966b..97246248d 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167231 2012-09-28 20:06:45Z andyrtr $ +# $Id: PKGBUILD 176314 2013-01-29 15:39:14Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.4.0 +pkgver=4.4.1 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 lftp-4.3.8-gets.patch) -md5sums=('9d6a048bb6be9bc3baecfea53b0d8330' +md5sums=('1a6de8e3922ffb51ec21642e51744b02' '77168a7f368b07eec7e079b55496fa97') build() { diff --git a/extra/libmowgli/PKGBUILD b/extra/libmowgli/PKGBUILD index 2fa7c854d..79fd9a574 100644 --- a/extra/libmowgli/PKGBUILD +++ b/extra/libmowgli/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165079 2012-08-10 03:54:41Z bisson $ +# $Id: PKGBUILD 176308 2013-01-29 11:24:40Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Brad Gordon <brad@rpgcyco.net> @@ -12,7 +12,7 @@ url='http://www.atheme.org/project/mowgli' license=('custom') depends=('glibc') arch=('i686' 'x86_64') -source=("http://atheme.org/downloads/${pkgname}-${pkgver}.tar.gz") +source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz") sha1sums=('5a697380f253f0456a5d8a38006a9d12847fb538') build() { diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD index 6d91e7d02..0f11f741e 100644 --- a/extra/most/PKGBUILD +++ b/extra/most/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 144477 2011-12-06 14:33:19Z stephane $ +# $Id: PKGBUILD 176312 2013-01-29 13:46:57Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: juergen <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=most pkgver=5.0.0a -pkgrel=4 +pkgrel=5 pkgdesc="A terminal pager similar to 'more' and 'less'" arch=('i686' 'x86_64') depends=('slang') @@ -28,5 +28,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=$pkgdir install + make DESTDIR="${pkgdir}" install } diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index b15e3cfd7..c9f68d4a8 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 169126 2012-10-18 15:53:50Z andyrtr $ +# $Id: PKGBUILD 176318 2013-01-29 17:04:23Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" _javaver=6 -_icedteaver=1.11.5 -_openjdk_version=b24 -_openjdk_date=14_nov_2011 +_icedteaver=1.12.0 +_openjdk_version=b27 +_openjdk_date=26_oct_2012 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} pkgrel=1 url='http://icedtea.classpath.org' arch=('i686' 'x86_64') license=('custom') makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2' - 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' #'xalan-java' + 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6' 'inetutils' 'wget') -options=('!emptydirs') # 'force') # force needed for hg shots +options=('!emptydirs') source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig} http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz - http://icedtea.classpath.org/download/drops/jaxp144_03.zip + http://icedtea.classpath.org/download/drops/jaxp144_04.zip http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip fix_jdk_cmds_path.diff @@ -30,13 +30,13 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar openjdk6.profile openjdk6.profile.csh) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz - jaxp144_03.zip + jaxp144_04.zip jdk6-jaxws2_1_6-2011_06_13.zip jdk6-jaf-b20.zip) -sha256sums=('258d81d957f8ab9322fbaf7c90647f27f6b4e675504fa279858e6dfe513f7574' - '50cd8e6868875b15d0a5652723b58f9d4e0a2f9b24e3a2ef997405670456e96a' - 'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227' - 'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012' +sha256sums=('4f27f3f42b57836cfb11541736282ccfc22de3f4acc0e540560fcf5512d66ced' + 'e1cf397644e039402c0f86a9fc1a4690d747e0ce347d1d4e8afb8bc5c797f6a2' + '044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0' + '490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c' '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3' '78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012' 'f5f59e121f7645ebc449bb13569fd924cbab3194e41db901f4fbe9dbd45720c5' @@ -66,7 +66,6 @@ build() { autoreconf -i export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff" -# export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/nonreparenting-wm.diff" export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" @@ -75,7 +74,7 @@ build() { ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \ --with-ant-home=/usr/share/java/apache-ant \ --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \ - --with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \ + --with-jaxp-drop-zip=${srcdir}/jaxp144_04.zip \ --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \ --disable-bootstrap \ diff --git a/extra/pgbouncer/PKGBUILD b/extra/pgbouncer/PKGBUILD index fb0277192..e03c9c9c1 100644 --- a/extra/pgbouncer/PKGBUILD +++ b/extra/pgbouncer/PKGBUILD @@ -1,23 +1,24 @@ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=pgbouncer -_dlid=3393 pkgver=1.5.4 -pkgrel=4 +pkgrel=5 pkgdesc="A lightweight connection pooler for PostgreSQL" arch=('i686' 'x86_64') url="http://pgfoundry.org/projects/pgbouncer" license=('BSD') depends=('libevent>=2.0' 'postgresql') makedepends=('asciidoc' 'xmlto') -backup=('etc/pgbouncer/pgbouncer.ini') +backup=('etc/pgbouncer/pgbouncer.ini' 'etc/logrotate.d/pgbouncer') install=$pkgname.install -source=("http://pgfoundry.org/frs/download.php/${_dlid}/${pkgname}-${pkgver}.tar.gz" +source=("http://ftp.postgresql.org/pub/projects/pgFoundry/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" pgbouncer.ini + pgbouncer.logrotate pgbouncer.service pgbouncer.tmpfiles.conf) md5sums=('9ffaf2e6232e18e676651429813732df' '810813b9ef8891be382be9ffdd425edc' + '6c65fe91821591bde0b5bcf70f23e959' 'eede238f5ff3709dbfeef6dad3fbefc7' '472659f4c5de2b59a420f5ca42327ec1') @@ -32,6 +33,7 @@ package() { make DESTDIR="$pkgdir/" install install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -D -m644 ../pgbouncer.ini "$pkgdir/etc/pgbouncer/pgbouncer.ini" + install -D -m644 ../pgbouncer.logrotate "$pkgdir/etc/logrotate.d/pgbouncer" install -D -m644 ../pgbouncer.service "$pkgdir/usr/lib/systemd/system/pgbouncer.service" install -D -m644 ../pgbouncer.tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/pgbouncer.conf" mkdir -p "$pkgdir/var/log/pgbouncer" diff --git a/extra/pgbouncer/pgbouncer.install b/extra/pgbouncer/pgbouncer.install index 2f77ae50f..6374fdf94 100644 --- a/extra/pgbouncer/pgbouncer.install +++ b/extra/pgbouncer/pgbouncer.install @@ -8,10 +8,10 @@ post_install() { fi chown pgbouncer:pgbouncer /var/log/pgbouncer systemd-tmpfiles --create pgbouncer.conf - post_update + post_upgrade } -post_update() { +post_upgrade() { gpasswd -a pgbouncer postgres } diff --git a/extra/pgbouncer/pgbouncer.logrotate b/extra/pgbouncer/pgbouncer.logrotate new file mode 100644 index 000000000..2037875eb --- /dev/null +++ b/extra/pgbouncer/pgbouncer.logrotate @@ -0,0 +1,8 @@ +/var/log/pgbouncer/pgbouncer.log { + copytruncate + missingok + notifempty + postrotate + /bin/kill -HUP $(cat /run/pgbouncer/pgbouncer.pid 2>/dev/null) 2> /dev/null || true + endscript +} |