From 54b7119c36756b86ea463649ee972cd6c1ce5863 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 8 Feb 2012 23:15:20 +0000 Subject: Wed Feb 8 23:15:20 UTC 2012 --- extra/aalib/PKGBUILD | 10 +++--- extra/apache/PKGBUILD | 17 +++++++---- extra/apache/pcre_info.patch | 11 +++++++ extra/apr-util/PKGBUILD | 13 +++++--- extra/beep/PKGBUILD | 7 ++--- extra/ddd/PKGBUILD | 24 ++++++++------- extra/ddd/ddd.install | 2 +- extra/faad2/PKGBUILD | 6 ++-- extra/ffmpeg/PKGBUILD | 4 +-- extra/gifsicle/PKGBUILD | 7 ++--- extra/gnome-bluetooth/PKGBUILD | 6 ++-- extra/jasper/PKGBUILD | 46 ++++++++++++---------------- extra/libasyncns/PKGBUILD | 16 +++++----- extra/libmad/PKGBUILD | 20 ++++++------ extra/libmikmod/PKGBUILD | 7 +++-- extra/libqalculate/PKGBUILD | 9 +++--- extra/libsndfile/PKGBUILD | 18 ++++++++--- extra/libvorbis/PKGBUILD | 21 ++++++++----- extra/libxslt/CVE-2011-1202.patch | 56 ++++++++++++++++++++++++++++++++++ extra/libxslt/PKGBUILD | 33 +++++++++++++------- extra/openal/PKGBUILD | 6 ++-- extra/ossp/PKGBUILD | 25 +++++++++------ extra/ossp/osspd.modules-load | 2 ++ extra/ossp/osspd.rc.d | 2 +- extra/ossp/osspd.service | 8 +++++ extra/pathological/PKGBUILD | 16 +++++----- extra/perl-compress-bzip2/PKGBUILD | 9 +++--- extra/qalculate-gtk/PKGBUILD | 8 ++--- extra/qalculate-kde/PKGBUILD | 6 ++-- extra/qt3/PKGBUILD | 31 +++++++------------ extra/qt3/qt-copy-kde-patches.tar.bz2 | Bin 31498 -> 29688 bytes extra/rtkit/PKGBUILD | 14 ++++----- extra/sdl_pango/PKGBUILD | 7 +++-- extra/xfce4-timer-plugin/PKGBUILD | 25 ++++++--------- 34 files changed, 292 insertions(+), 200 deletions(-) create mode 100644 extra/apache/pcre_info.patch create mode 100644 extra/libxslt/CVE-2011-1202.patch create mode 100644 extra/ossp/osspd.modules-load create mode 100644 extra/ossp/osspd.service (limited to 'extra') diff --git a/extra/aalib/PKGBUILD b/extra/aalib/PKGBUILD index d86d8220c..ae5a98b54 100644 --- a/extra/aalib/PKGBUILD +++ b/extra/aalib/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 110751 2011-02-22 01:17:25Z eric $ +# $Id: PKGBUILD 149374 2012-02-07 09:56:45Z eric $ # Maintainer: Eric Bélanger pkgname=aalib pkgver=1.4rc5 -pkgrel=8 +pkgrel=9 pkgdesc="A portable ASCII art graphic library" arch=('i686' 'x86_64') url="http://aa-project.sourceforge.net/aalib/" license=('LGPL') -depends=('glibc' 'ncurses' 'gpm' 'libx11') +depends=('gpm' 'libx11') makedepends=('libxt') options=('!libtool') install=aalib.install source=(http://downloads.sourceforge.net/sourceforge/aa-project/${pkgname}-${pkgver}.tar.gz aclocal-fixes.patch) -md5sums=('9801095c42bba12edebd1902bcf0a990' '863a96a6689aa7ee073ca448bc2f133d') -sha1sums=('a23269e950a249d2ef93625837cace45ddbce03b' '98d8c5a13672a8107945d694ff4520e0bc87d3e9') +sha1sums=('a23269e950a249d2ef93625837cace45ddbce03b' + '98d8c5a13672a8107945d694ff4520e0bc87d3e9') build() { cd "${srcdir}/${pkgname}-1.4.0" diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index 6f2ee060d..5f9ff1786 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138021 2011-09-14 11:59:52Z pierre $ +# $Id: PKGBUILD 149398 2012-02-07 13:58:02Z jgc $ # Maintainer: Jan de Groot # Contributor: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=apache -pkgver=2.2.21 -pkgrel=1 +pkgver=2.2.22 +pkgrel=2 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') options=('!libtool') @@ -20,6 +20,7 @@ depends=('openssl' 'zlib' 'apr-util' 'pcre') optdepends=('lynx: apachectl status') _itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01 source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 + http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc ${_itkurl}/02-rename-prefork-to-itk.patch ${_itkurl}/03-add-mpm-to-build-system.patch ${_itkurl}/04-correct-output-makefile-location.patch @@ -34,8 +35,10 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 apache.conf.d httpd.logrotate httpd - arch.layout) -md5sums=('1696ae62cd879ab1d4dd9ff021a470f2' + arch.layout + pcre_info.patch) +md5sums=('9fe3093194c8a57f085ff7c3fc43715f' + '41b3a6e4948679cab70b9caf490877c4' 'f1d9d41360908ceb2374da55ae99197a' 'cdfa04985a0efa850976aef01c2a0c40' '0930d2d0612eb0a53a0d00aea7e8687f' @@ -50,11 +53,13 @@ md5sums=('1696ae62cd879ab1d4dd9ff021a470f2' '08b3c875f6260644f2f52b4056d656b0' '6382331e9700ed9e8cc78ea51887b537' 'c7e300a287ef7e2e066ac7639536f87e' - '3d659d41276ba3bfcb20c231eb254e0c') + '3d659d41276ba3bfcb20c231eb254e0c' + 'f74652f3169baaae595026116ef54599') build() { cd "${srcdir}/httpd-${pkgver}" + #patch -p1 -i "${srcdir}/pcre_info.patch" patch -Np0 -i "${srcdir}/apachectl-confd.patch" # set default user diff --git a/extra/apache/pcre_info.patch b/extra/apache/pcre_info.patch new file mode 100644 index 000000000..f1774db63 --- /dev/null +++ b/extra/apache/pcre_info.patch @@ -0,0 +1,11 @@ +--- httpd-2.2.22/server/util_pcre.c 2005-11-11 01:20:05.000000000 +1000 ++++ httpd-2.2.22/server/util_pcre.c 2012-02-06 23:45:37.687946748 +1000 +@@ -137,7 +137,7 @@ + + if (preg->re_pcre == NULL) return AP_REG_INVARG; + +-preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL); ++preg->re_nsub = pcre_fullinfo((const pcre *)preg->re_pcre, NULL, NULL, NULL); + return 0; + } + diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD index 9d906429e..4a8b38052 100644 --- a/extra/apr-util/PKGBUILD +++ b/extra/apr-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146457 2012-01-11 15:21:45Z stephane $ +# $Id: PKGBUILD 149396 2012-02-07 13:30:38Z jgc $ # Maintainer: Jan de Groot # Maintainer: Pierre Schmitz pkgname=apr-util -pkgver=1.3.12 -pkgrel=5 +pkgver=1.4.1 +pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" @@ -12,7 +12,7 @@ depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') options=('!libtool') license=('APACHE') source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") -md5sums=('0f671b037ca62751a8a7005578085560') +md5sums=('52b31b33fb1aa16e65ddaefc76e41151') build() { cd "${srcdir}/apr-util-${pkgver}" @@ -22,6 +22,11 @@ build() { make } +check() { + cd "${srcdir}/apr-util-${pkgver}" + make -j1 check +} + package() { cd "${srcdir}/apr-util-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/beep/PKGBUILD b/extra/beep/PKGBUILD index bee2afc6d..be85621ee 100644 --- a/extra/beep/PKGBUILD +++ b/extra/beep/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 90320 2010-09-10 17:01:06Z eric $ -# Maintainer: Eric Belanger +# $Id: PKGBUILD 149366 2012-02-07 08:26:35Z eric $ +# Maintainer: Eric Bélanger pkgname=beep pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced PC speaker beeping program" arch=('i686' 'x86_64') url="http://www.johnath.com/beep" license=('GPL2') depends=('glibc') source=(http://www.johnath.com/beep/${pkgname}-${pkgver}.tar.gz) -md5sums=('49c340ceb95dbda3f97b2daafac7892a') sha1sums=('8cba283e507dc9e401da011a9c92a2e24ea2bf70') build() { diff --git a/extra/ddd/PKGBUILD b/extra/ddd/PKGBUILD index 8fdf4cc16..6e7b8447e 100644 --- a/extra/ddd/PKGBUILD +++ b/extra/ddd/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 87277 2010-08-11 19:35:53Z eric $ -# Maintainer: Eric Belanger -# Contributor: Aurelien Foret +# $Id: PKGBUILD 149362 2012-02-07 07:35:45Z eric $ +# Maintainer: Eric Bélanger pkgname=ddd pkgver=3.3.12 -pkgrel=2 +pkgrel=3 pkgdesc="A graphical front-end for command-line debuggers such as GDB, JDB, pydb, perl debugger..." arch=('i686' 'x86_64') url="http://www.gnu.org/software/ddd/" license=('GPL3' 'LGPL3') -depends=('gcc-libs' 'ncurses' 'lesstif' 'libxaw' 'elfutils' 'libxext') -optdepends=('gdb: to use the Gnu debugger' 'jdk: to use the Java debugger' 'pydb: to use the Python debugger' 'perl: to use the Perl debugger') +depends=('gcc-libs' 'lesstif' 'libxaw') +optdepends=('gdb: to use the Gnu debugger' + 'jdk: to use the Java debugger' + 'pydb: to use the Python debugger' + 'perl: to use the Perl debugger') install=ddd.install -changelog=ChangeLog -source=(http://ftp.gnu.org/gnu/ddd/${pkgname}-${pkgver}.tar.gz ddd-3.3.12-gcc44.patch) -md5sums=('c50396db7bac3862a6d2555b3b22c34e' '41dc59d8cf502569bab1b1a4a222a1c6') -sha1sums=('b91d2dfb1145af409138bd34517a898341724e56' '3d43c9d56347f248732b1d72f29c7bf799f03864') +source=(http://ftp.gnu.org/gnu/ddd/${pkgname}-${pkgver}.tar.gz{,.sig} ddd-3.3.12-gcc44.patch) +sha1sums=('b91d2dfb1145af409138bd34517a898341724e56' + 'de155d812da6e11e55cc882292bb5c7b30bd31a1' + '3d43c9d56347f248732b1d72f29c7bf799f03864') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 < ../ddd-3.3.12-gcc44.patch - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + ./configure --prefix=/usr make } diff --git a/extra/ddd/ddd.install b/extra/ddd/ddd.install index a23e415e7..2ccccd06a 100644 --- a/extra/ddd/ddd.install +++ b/extra/ddd/ddd.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(ddd.info.gz ddd-themes.info.gz) post_install() { diff --git a/extra/faad2/PKGBUILD b/extra/faad2/PKGBUILD index 04aae2b74..46a388a16 100644 --- a/extra/faad2/PKGBUILD +++ b/extra/faad2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120668 2011-04-25 22:17:14Z eric $ +# $Id: PKGBUILD 149405 2012-02-07 15:27:21Z eric $ # Maintainer: Eric Bélanger pkgname=faad2 pkgver=2.7 -pkgrel=2 +pkgrel=3 pkgdesc="ISO AAC audio decoder" arch=('i686' 'x86_64') url="http://www.audiocoding.com/" @@ -11,8 +11,6 @@ license=('custom:GPL') depends=('glibc') options=('!libtool' '!makeflags') source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 LICENSE) -md5sums=('4c332fa23febc0e4648064685a3d4332' - 'ec95f38142e14fb46c849503897a37a0') sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5' '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 22629e605..809df96f0 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149272 2012-02-06 17:33:26Z ibiru $ +# $Id: PKGBUILD 149381 2012-02-07 10:39:41Z ibiru $ # Maintainer : Ionut Biru # Contributor: Tom Newsom # Contributor: Paul Mattal pkgname=ffmpeg pkgver=20120127 -pkgrel=2 +pkgrel=3 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') url="http://ffmpeg.org/" diff --git a/extra/gifsicle/PKGBUILD b/extra/gifsicle/PKGBUILD index d4bbf366d..b2688d96c 100644 --- a/extra/gifsicle/PKGBUILD +++ b/extra/gifsicle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 114736 2011-03-15 20:13:11Z eric $ +# $Id: PKGBUILD 149400 2012-02-07 14:30:32Z eric $ # Maintainer: Eric Bélanger pkgname=gifsicle -pkgver=1.61 +pkgver=1.64 pkgrel=1 pkgdesc="A powerful command-line program for creating, editing, manipulating and getting information about GIF images and animations" arch=('i686' 'x86_64') @@ -10,8 +10,7 @@ url="http://www.lcdf.org/gifsicle/" license=('GPL') depends=('libx11') source=(http://www.lcdf.org/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('3d9e45873daaf960a35d1b89505f1101') -sha1sums=('2b9e1c83a926731c10153ab8aa77470627b48583') +sha1sums=('14f1f69d41287eb06d69ae98b672a0f8c5cf28e5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 514f4088c..e0b1316f0 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140881 2011-10-20 05:42:28Z ibiru $ +# $Id: PKGBUILD 149409 2012-02-07 16:18:44Z heftig $ # Maintainer: Ionut Biru # Contributor: Roman Kyrylych pkgname=gnome-bluetooth -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('f67abc26e2a8003b5e3b58e1541ed3955e0ea05a08bfaa8d5dc4b2133d948df0' +sha256sums=('30ba375f4d9b08fc31b9eb86f17ea2d3fc1696b3e778236270414260d4e26905' 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') build() { diff --git a/extra/jasper/PKGBUILD b/extra/jasper/PKGBUILD index 542f1a91e..fac3b03c0 100644 --- a/extra/jasper/PKGBUILD +++ b/extra/jasper/PKGBUILD @@ -1,44 +1,36 @@ -# $Id: PKGBUILD 87502 2010-08-15 02:53:20Z eric $ -# Contributor: Eric Belanger -# Contributor: Tobias Powalowski -# Maintainer: Daniel J Griffiths +# $Id: PKGBUILD 149364 2012-02-07 08:11:39Z eric $ +# Maintainer: Eric Bélanger pkgname=jasper pkgver=1.900.1 -pkgrel=6 +pkgrel=7 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard" arch=('i686' 'x86_64') url="http://www.ece.uvic.ca/~mdadams/jasper/" license=('custom:JasPer2.0') -depends=('libjpeg' 'freeglut' 'libxi' 'libxmu' 'mesa') -makedepends=('unzip') +depends=('libjpeg' 'freeglut' 'libxmu') options=('!libtool') source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch jasper-1.900.1-CVE-2008-3522.patch) -md5sums=('a342b2b4495b3e1394e161eb5d85d754' '36de7128eea6f701c1e2e13ce5bd8d37'\ - '24785d8eb3eea19eec7e77d59f3e6a25' '911bb13529483c093d12c15eed4e9243'\ - 'ed441f30c4231f319d9ff77d86db2ef9') -sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191' 'c1a0176a15210c0af14d85e55ce566921957d780'\ - 'f298566fef08c8a589d072582112cd51c72c3983' '2483dba925670bf29f531d85d73c4e5ada513b01'\ - '0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4') +sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191' + 'c1a0176a15210c0af14d85e55ce566921957d780' + 'f298566fef08c8a589d072582112cd51c72c3983' + '2483dba925670bf29f531d85d73c4e5ada513b01' + '0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 < "${srcdir}/jpc_dec.c.patch" - patch -Np1 < "${srcdir}/patch-libjasper-stepsizes-overflow.diff" - patch -Np1 < "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch" - patch -Np1 < "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch" - - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared - make + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/jpc_dec.c.patch" + patch -p1 -i "${srcdir}/patch-libjasper-stepsizes-overflow.diff" + patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch" + patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - install -Dm644 LICENSE \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libasyncns/PKGBUILD b/extra/libasyncns/PKGBUILD index 06ac6eaac..2776eb4e8 100644 --- a/extra/libasyncns/PKGBUILD +++ b/extra/libasyncns/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 99900 2010-11-19 13:00:38Z heftig $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 149434 2012-02-07 17:05:44Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) # Contributor: Corrado Primier # Contributor: Eric Belanger # Contributor: William Rea @@ -7,23 +7,23 @@ pkgname=libasyncns pkgver=0.8 -pkgrel=3 -pkgdesc="A C library for Linux/Unix for executing name service queries asynchronously" +pkgrel=4 +pkgdesc="A C library for executing name service queries asynchronously" arch=('i686' 'x86_64') url="http://0pointer.de/lennart/projects/libasyncns" license=('LGPL') options=('!libtool') depends=('glibc') -source=(http://0pointer.de/lennart/projects/libasyncns/${pkgname}-${pkgver}.tar.gz) +source=("$url/$pkgname-$pkgver.tar.gz") md5sums=('1f553d6ce1ad255bc83b3d8e9384f515') build() { - cd ${srcdir}/libasyncns-${pkgver} + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --disable-lynx make } package() { - cd ${srcdir}/libasyncns-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libmad/PKGBUILD b/extra/libmad/PKGBUILD index 842fbe930..30339145a 100644 --- a/extra/libmad/PKGBUILD +++ b/extra/libmad/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 120663 2011-04-25 21:54:20Z eric $ +# $Id: PKGBUILD 149402 2012-02-07 14:56:23Z eric $ # Maintainer: Eric Bélanger pkgname=libmad pkgver=0.15.1b -pkgrel=5 +pkgrel=6 pkgdesc="A high-quality MPEG audio decoder" arch=('i686' 'x86_64') url="http://www.underbit.com/products/mad/" license=('GPL') depends=('glibc') -makedepends=('autoconf') -replaces=('mad') -conflicts=('mad') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/mad/${pkgname}-${pkgver}.tar.gz +source=(http://downloads.sourceforge.net/sourceforge/mad/${pkgname}-${pkgver}.tar.gz{,.sign} libmad.patch amd64-64bit.diff frame_length.diff optimize.diff) -md5sums=('1be543bc30c56fb6bea1d7bf6a64e66c' - 'fbcca0267a423bae45389666f4cb04d5' - '8d8bd64a2842dd59153b3a6642059e23' - '3329b032118a68e18908197e65b3198d' - '3e52afe2103f367810a18bef9e82eb9f') +sha1sums=('cac19cd00e1a907f3150cc040ccc077783496d76' + '24c44ac7c96dca472e7305a7e59f1efd921a3499' + '5e7369c77de2329f6542ffc4f633eec5a5245091' + '97eba307b3343d5ba8938d59ec8f2c4b7449ae17' + 'b9c61ecacc6a6d47425d66f33327e0634cd8a33c' + '3d5b958244ef0395ccdcb00344f2cf301ca07e34') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD index a84418dbb..e71aa0d44 100644 --- a/extra/libmikmod/PKGBUILD +++ b/extra/libmikmod/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 59174 2009-11-21 01:09:33Z allan $ -# Maintainer: Allan McRae +# $Id: PKGBUILD 149426 2012-02-07 16:55:08Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae # Contributor: Tom Newsom pkgname=libmikmod pkgver=3.1.12 -pkgrel=3 +pkgrel=4 pkgdesc="A portable sound library" license=('GPL' 'LGPL') url="http://sourceforge.net/projects/mikmod/" diff --git a/extra/libqalculate/PKGBUILD b/extra/libqalculate/PKGBUILD index b9ffa1c21..9e228f345 100644 --- a/extra/libqalculate/PKGBUILD +++ b/extra/libqalculate/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 108627 2011-02-02 01:51:53Z eric $ +# $Id: PKGBUILD 149451 2012-02-08 01:06:52Z eric $ # Maintainer: Eric Bélanger pkgname=libqalculate pkgver=0.9.7 -pkgrel=2 +pkgrel=3 pkgdesc="Multi-purpose desktop calculator" arch=('i686' 'x86_64') url="http://qalculate.sourceforge.net/" license=('GPL') -depends=('libxml2' 'cln' 'glib2' 'ncurses' 'readline') -makedepends=('perlxml') +depends=('libxml2' 'cln' 'glib2') +makedepends=('perl-xml-parser') optdepends=('gnuplot: for plotting support' 'wget: for retrieval of exchange rates (not needed if you use one of the GUI)' 'gnome-vfs: for retrieval of exchange rates (not needed if you use one of the GUI)') options=('!libtool' '!makeflags') source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz) -md5sums=('a1507ab862f4ad9852788619aada35cd') sha1sums=('c15f7f3a97995decf62cc964956fc1e374ecd78c') build() { diff --git a/extra/libsndfile/PKGBUILD b/extra/libsndfile/PKGBUILD index b2c8cd0bb..cff3c6442 100644 --- a/extra/libsndfile/PKGBUILD +++ b/extra/libsndfile/PKGBUILD @@ -1,25 +1,33 @@ -# $Id: PKGBUILD 133971 2011-07-31 04:15:25Z heftig $ +# $Id: PKGBUILD 149407 2012-02-07 15:40:58Z eric $ # Maintainer: Eric Bélanger pkgname=libsndfile pkgver=1.0.25 -pkgrel=1 +pkgrel=2 pkgdesc="A C library for reading and writing files containing sampled sound" arch=('i686' 'x86_64') url="http://www.mega-nerd.com/libsndfile" license=('LGPL') depends=('alsa-lib' 'flac' 'libvorbis') +checkdepends=('python2') options=('!libtool') -source=(http://www.mega-nerd.com/libsndfile/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('e2b7bb637e01022c7d20f95f9c3990a2') -sha1sums=('e95d9fca57f7ddace9f197071cbcfb92fa16748e') +source=(http://www.mega-nerd.com/libsndfile/files/${pkgname}-${pkgver}.tar.gz{,.asc}) +sha1sums=('e95d9fca57f7ddace9f197071cbcfb92fa16748e' + 'a93d26016730cb9fa214c753d079ee77dca1f326') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' src/binheader_writef_check.py \ + src/create_symbols_file.py programs/test-sndfile-metadata-set.py ./configure --prefix=/usr --disable-sqlite make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/libvorbis/PKGBUILD b/extra/libvorbis/PKGBUILD index b144a90b1..20b4270ce 100644 --- a/extra/libvorbis/PKGBUILD +++ b/extra/libvorbis/PKGBUILD @@ -1,29 +1,34 @@ -# $Id: PKGBUILD 102123 2010-12-06 01:49:44Z allan $ +# $Id: PKGBUILD 149459 2012-02-08 04:00:58Z eric $ # Maintainer: Tobias Kieslich # Contributor: dorphell # Contributor: John Proctor pkgname=libvorbis -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=1 pkgdesc="Vorbis codec library" arch=('i686' 'x86_64') -license=('custom') -url="http://www.xiph.org/ogg/vorbis/" +url="http://www.xiph.org/vorbis/" +license=('BSD') depends=('libogg') options=('!libtool') source=(http://downloads.xiph.org/releases/vorbis/${pkgname}-${pkgver}.tar.gz) -md5sums=('c870b9bd5858a0ecb5275c14486d9554') +md5sums=('6b1a36f0d72332fae5130688e65efe1f') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" #-march=i686 optimizes too much, strip it out - CFLAGS=${CFLAGS/-march=$CARCH} ./configure --prefix=/usr --disable-static + CFLAGS=${CFLAGS/-march=$CARCH} LIBS+="-lm" ./configure --prefix=/usr --disable-static make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 check +} + package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/libxslt/CVE-2011-1202.patch b/extra/libxslt/CVE-2011-1202.patch new file mode 100644 index 000000000..61ea213c8 --- /dev/null +++ b/extra/libxslt/CVE-2011-1202.patch @@ -0,0 +1,56 @@ +From ecb6bcb8d1b7e44842edde3929f412d46b40c89f Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Tue, 22 Feb 2011 02:14:23 +0000 +Subject: Fix generate-id() to not expose object addresses + +As pointed out by Chris Evans it's better +security wise to not expose object addresses directly, use a diff +w.r.t. the document root own address to avoid this +* libxslt/functions.c: fix IDs generation code +--- +diff --git a/libxslt/functions.c b/libxslt/functions.c +index 4720c7a..de962f4 100644 +--- a/libxslt/functions.c ++++ b/libxslt/functions.c +@@ -654,8 +654,9 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) + void + xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ + xmlNodePtr cur = NULL; +- unsigned long val; +- xmlChar str[20]; ++ long val; ++ xmlChar str[30]; ++ xmlDocPtr doc; + + if (nargs == 0) { + cur = ctxt->context->node; +@@ -694,9 +695,24 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ + * Okay this is ugly but should work, use the NodePtr address + * to forge the ID + */ +- val = (unsigned long)((char *)cur - (char *)0); +- val /= sizeof(xmlNode); +- sprintf((char *)str, "id%ld", val); ++ if (cur->type != XML_NAMESPACE_DECL) ++ doc = cur->doc; ++ else { ++ xmlNsPtr ns = (xmlNsPtr) cur; ++ ++ if (ns->context != NULL) ++ doc = ns->context; ++ else ++ doc = ctxt->context->doc; ++ ++ } ++ ++ val = (long)((char *)cur - (char *)doc); ++ if (val >= 0) { ++ sprintf((char *)str, "idp%ld", val); ++ } else { ++ sprintf((char *)str, "idm%ld", -val); ++ } + valuePush(ctxt, xmlXPathNewString(str)); + } + +-- +cgit v0.9.0.2 diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD index c956c0f08..7cdc5e9d2 100644 --- a/extra/libxslt/PKGBUILD +++ b/extra/libxslt/PKGBUILD @@ -1,31 +1,42 @@ -# $Id: PKGBUILD 87866 2010-08-18 15:17:10Z ibiru $ +# $Id: PKGBUILD 149384 2012-02-07 12:34:45Z jgc $ # Maintainer: Eric Belanger # Contributor: John Proctor pkgname=libxslt pkgver=1.1.26 -pkgrel=2 +pkgrel=3 pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64') url="http://xmlsoft.org/XSLT/" license=('custom') -depends=('libxml2>=2.7.7' 'libgcrypt>=1.4.6') +depends=('libxml2' 'libgcrypt') makedepends=('python2') +checkdepends=('docbook-xml') options=('!libtool') -source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz) -md5sums=('e61d0364a30146aaa3001296f853b2b9') +source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz + CVE-2011-1202.patch) +md5sums=('e61d0364a30146aaa3001296f853b2b9' + 'ce9744943575efaa6b5501668899b753') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-python=/usr/bin/python2.7 + patch -Np1 -i "${srcdir}/CVE-2011-1202.patch" + sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py + ./configure --prefix=/usr --with-python=/usr/bin/python2 make - make DESTDIR="${pkgdir}" install +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} - for f in pyxsltproc.py extfunc.py exslt.py extelem.py basic.py; do - sed -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ - -i ${pkgdir}/usr/share/doc/libxslt-python-1.1.26/examples/${f} - done +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + + rm -f "${pkgdir}"/usr/lib/python*/site-packages/*.a } diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD index 0a3c8f1a2..80b85a2c9 100644 --- a/extra/openal/PKGBUILD +++ b/extra/openal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 129235 2011-06-26 06:15:14Z heftig $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 149424 2012-02-07 16:51:11Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributer: Jason Chu pkgname=openal pkgver=1.13 -pkgrel=2 +pkgrel=3 pkgdesc="A cross-platform 3D audio library" arch=(i686 x86_64) url="http://www.openal.org/" diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD index 2b71ca3f9..4aa28f495 100644 --- a/extra/ossp/PKGBUILD +++ b/extra/ossp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132457 2011-07-24 17:19:01Z heftig $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 149425 2012-02-07 16:52:37Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jonathan Liu pkgname=ossp pkgver=1.3.2 -pkgrel=11 +pkgrel=12 pkgdesc="Emulate OSS device using CUSE" arch=(i686 x86_64) url="http://sourceforge.net/projects/osspd" @@ -15,10 +15,12 @@ optdepends=("libpulse: PulseAudio backend" "alsa-lib: ALSA backend") backup=(etc/conf.d/osspd) source=("http://downloads.sourceforge.net/project/osspd/${pkgname}-${pkgver}.tar.gz" - osspd.rc.d osspd.conf.d) + osspd.rc.d osspd.conf.d osspd.service osspd.modules-load) md5sums=('ee2d8c894de2fa4eb3291804fbc7df45' - '0c02208ce1dfe74b6e9840f3600678cc' - '5a5a3db1bb3c98d48d4794613cf12ef0') + '103d9d1b4d89872618ffa0326ddf93f1' + '5a5a3db1bb3c98d48d4794613cf12ef0' + '98dc2b2f55f69e3d2fb37f32742d30d4' + '36c01e144db7cf253df12d8ad9dac942') build() { cd "$srcdir/$pkgname-$pkgver" @@ -35,8 +37,13 @@ package() { sed -e 's/GROUP="audio"/SUBSYSTEM=="cuse", MODE="0666"/' \ -i "$pkgdir/lib/udev/rules.d/98-osscuse.rules" - install -D -m644 README "$pkgdir/usr/share/doc/$pkgname/README" + install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" - install -D -m755 "$srcdir/osspd.rc.d" "$pkgdir/etc/rc.d/osspd" - install -D -m644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd" + # initscripts + install -Dm755 "$srcdir/osspd.rc.d" "$pkgdir/etc/rc.d/osspd" + install -Dm644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd" + + # systemd + install -Dm644 "$srcdir/osspd.service" "$pkgdir/lib/systemd/system/osspd.service" + install -Dm644 "$srcdir/osspd.modules-load" "$pkgdir/usr/lib/modules-load.d/osspd.conf" } diff --git a/extra/ossp/osspd.modules-load b/extra/ossp/osspd.modules-load new file mode 100644 index 000000000..35578317b --- /dev/null +++ b/extra/ossp/osspd.modules-load @@ -0,0 +1,2 @@ +cuse +snd-seq-oss diff --git a/extra/ossp/osspd.rc.d b/extra/ossp/osspd.rc.d index c5fabf855..2b8e94506 100755 --- a/extra/ossp/osspd.rc.d +++ b/extra/ossp/osspd.rc.d @@ -19,7 +19,7 @@ case "$1" in start) stat_busy "Starting OSS userspace bridge" if [ -z "$PID" ]; then - /sbin/modprobe cuse &>/dev/null + /sbin/modprobe -a cuse snd-seq-oss &>/dev/null /sbin/udevadm settle --quiet /usr/sbin/osspd --dsp-slave="$DSP_SLAVE" fi diff --git a/extra/ossp/osspd.service b/extra/ossp/osspd.service new file mode 100644 index 000000000..f0a5f3306 --- /dev/null +++ b/extra/ossp/osspd.service @@ -0,0 +1,8 @@ +[Unit] +Description=OSS Userspace Bridge + +[Service] +ExecStart=/usr/sbin/osspd -f + +[Install] +WantedBy=multi-user.target diff --git a/extra/pathological/PKGBUILD b/extra/pathological/PKGBUILD index cdc1bd856..f87746608 100644 --- a/extra/pathological/PKGBUILD +++ b/extra/pathological/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 88505 2010-08-24 07:21:52Z eric $ -# Maintainer: Eric Belanger -# Contributor: Eric Johnson +# $Id: PKGBUILD 149371 2012-02-07 09:25:53Z eric $ +# Maintainer: Eric Bélanger pkgname=pathological pkgver=1.1.3 -pkgrel=6 +pkgrel=7 pkgdesc="A puzzle game with the same feel as frozen bubble" arch=('i686' 'x86_64') url="http://pathological.sourceforge.net/" @@ -12,13 +11,12 @@ license=('GPL') depends=('python-pygame') makedepends=('netpbm') install=pathological.install -changelog=ChangeLog source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz pathological.desktop pygame_181.patch encoding.patch) -md5sums=('76a446080c0fed12baf39354d8e0ce4a' '0fbf64860efe3d287eb74681758c4f75'\ - 'bcd59890efe29a9f8c83227656c31a3e' '06d9221d0d8adaf232a3766870a8bcc0') -sha1sums=('70b1c9e12704c7fd3b301aa90bceee2e8373b7b9' '9b57f854ce9621542d810a21c61325de343950d7'\ - '6f0aa0f74a87bd53771f2db6d3117981c4f070d3' '7dbaa9ced7da0094280425a68b4c8db3382f230a') +sha1sums=('70b1c9e12704c7fd3b301aa90bceee2e8373b7b9' + '9b57f854ce9621542d810a21c61325de343950d7' + '6f0aa0f74a87bd53771f2db6d3117981c4f070d3' + '7dbaa9ced7da0094280425a68b4c8db3382f230a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index fc142e677..dc709e2b4 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 127799 2011-06-18 15:54:27Z ibiru $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 149423 2012-02-07 16:50:05Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 pkgver=2.09 -pkgrel=3 +pkgrel=4 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64) license=(GPL2) depends=(perl bzip2) -url="http://search.cpan.org/dist/$_realname" +url="http://search.cpan.org/dist/Compress-Bzip2" options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY/$_realname-$pkgver.tar.gz") md5sums=('1699fde3e86f2a036f135ae606d456bf') diff --git a/extra/qalculate-gtk/PKGBUILD b/extra/qalculate-gtk/PKGBUILD index 9eb48dcaf..5c7d40e06 100644 --- a/extra/qalculate-gtk/PKGBUILD +++ b/extra/qalculate-gtk/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 108632 2011-02-02 01:54:11Z eric $ +# $Id: PKGBUILD 149453 2012-02-08 03:00:54Z eric $ # Maintainer: Eric Bélanger pkgname=qalculate-gtk pkgver=0.9.7 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME frontend for libqalculate" arch=('i686' 'x86_64') url="http://qalculate.sourceforge.net/" license=('GPL') depends=('libqalculate' 'libgnome' 'libglade' 'cln') -makedepends=('perlxml' 'gnome-doc-utils') +makedepends=('perl-xml-parser' 'gnome-doc-utils') optdepends=('yelp: for displaying the help') +options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz) -md5sums=('7a7ab4680e285690ca3625992f477f0f') sha1sums=('c714c91224045fa49f261686e985df0aefa1d678') build() { diff --git a/extra/qalculate-kde/PKGBUILD b/extra/qalculate-kde/PKGBUILD index 1b8a372a1..7f88109ff 100644 --- a/extra/qalculate-kde/PKGBUILD +++ b/extra/qalculate-kde/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 108637 2011-02-02 01:55:58Z eric $ +# $Id: PKGBUILD 149455 2012-02-08 03:17:17Z eric $ # Maintainer: Eric Bélanger pkgname=qalculate-kde pkgver=0.9.7 -pkgrel=2 +pkgrel=3 pkgdesc="KDE frontend for libqalculate" arch=('i686' 'x86_64') url="http://qalculate.sourceforge.net/" license=('GPL') depends=('libqalculate' 'kdelibs3' 'cln') +options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz) -md5sums=('90104c97894f4775737349ad99428bcf') sha1sums=('fa0db8a3fb80264328770c4bbcbc0892a4d4ce91') build() { diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index 0145907e8..cdd4ac7f1 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 148906 2012-02-05 11:55:17Z ibiru $ +# $Id: PKGBUILD 149356 2012-02-07 05:40:02Z eric $ # Maintainer: Eric Bélanger pkgname=qt3 -pkgver=3.3.8 -pkgrel=22 +pkgver=3.3.8b +pkgrel=1 +epoch=1 pkgdesc="The QT3 gui toolkit" arch=('i686' 'x86_64') url="http://www.trolltech.com/products/qt/index.html" @@ -14,18 +15,14 @@ makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3') optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') options=('!libtool') install=qt.install -source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2 - qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 - qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff - mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) -sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' +source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.gz + qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 + eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) +sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83' '3d19510c46016a1a211d97bf8f82b01498b1b33c' - '9cb2e5bec782069692ee337cfa171539d9d73753' + '33418e5b117458af23c72cdbffc0c339bc34bdc4' '116afa0e737bdf27ea27f9b3653aeb56db9ec151' - 'ca5ecb29c7f1c826d48703339a3371038e306bb7' - 'd928ff55adb52c4bab2fb268df022651551cd70c' - 'bb6aad81cce143c23ff7840b1d79f6b2007a0c04' '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17' '1346320614f6f86fbeb10b9fbad721dea29f5b61' 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f') @@ -42,18 +39,12 @@ build() { cd "${srcdir}"/qt-x11-free-${pkgver} # apply qt patches from kde.org for i in ../qt-copy-kde-patches/*; do - patch -Np0 -i $i + patch -p0 -i $i done # apply other qt patches and one security fix from debian/gentoo for i in ../qt-patches/*; do - patch -Np1 -i $i + patch -p1 -i $i done - # fix utf8 bug - patch -p0 -i "${srcdir}"/utf8-bug-qt3.diff - # fix asia fonts - patch -p0 -i "${srcdir}"/qt-font-default-subst.diff - # fix segfaults on exit when using mysql DB driver - patch -p0 -i "${srcdir}"/mysql.patch # fix CJK font/chars select error (FS#11245) patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff # fix build problem against new unixODBC diff --git a/extra/qt3/qt-copy-kde-patches.tar.bz2 b/extra/qt3/qt-copy-kde-patches.tar.bz2 index 19d899963..519f7173a 100644 Binary files a/extra/qt3/qt-copy-kde-patches.tar.bz2 and b/extra/qt3/qt-copy-kde-patches.tar.bz2 differ diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD index 2a9ed84eb..c240df1e1 100644 --- a/extra/rtkit/PKGBUILD +++ b/extra/rtkit/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 134840 2011-08-07 20:46:13Z heftig $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 149435 2012-02-07 17:06:43Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) # Contributor: Corrado Primier pkgname=rtkit pkgver=0.10 -pkgrel=2 +pkgrel=3 pkgdesc="Realtime Policy and Watchdog Daemon" arch=('i686' 'x86_64') url="http://git.0pointer.de/?p=rtkit.git" -license=('GPL' 'custom:BSD') -depends=('dbus' 'polkit') -makedepends=('pkgconfig') +license=(GPL 'custom:BSD') +depends=(dbus polkit) install=rtkit.install source=(http://0pointer.de/public/$pkgname-$pkgver.tar.gz) md5sums=('9ab7f2a25ddf05584ea2216dfe4cefd4') @@ -33,7 +32,8 @@ package() { # DBus configuration mkdir -p "$pkgdir/usr/share/dbus-1/interfaces" - ./rtkit-daemon --introspect >"$pkgdir/usr/share/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml" + ./rtkit-daemon --introspect \ + > "$pkgdir/usr/share/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml" # Client license mkdir -p "$pkgdir/usr/share/licenses/rtkit" diff --git a/extra/sdl_pango/PKGBUILD b/extra/sdl_pango/PKGBUILD index 68b686aeb..2587f1ed1 100644 --- a/extra/sdl_pango/PKGBUILD +++ b/extra/sdl_pango/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 106434 2011-01-16 22:40:34Z andrea $ -# Maintainer: Allan McRae +# $Id: PKGBUILD 149427 2012-02-07 16:56:19Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae # Contributor: gyo pkgname=sdl_pango pkgver=0.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="Pango SDL binding" arch=('i686' 'x86_64') url="http://sdlpango.sourceforge.net/" diff --git a/extra/xfce4-timer-plugin/PKGBUILD b/extra/xfce4-timer-plugin/PKGBUILD index 95f738dbc..44daac145 100644 --- a/extra/xfce4-timer-plugin/PKGBUILD +++ b/extra/xfce4-timer-plugin/PKGBUILD @@ -1,37 +1,32 @@ -# $Id: PKGBUILD 149260 2012-02-06 16:38:59Z foutrelis $ +# $Id: PKGBUILD 149457 2012-02-08 03:29:26Z eric $ # Maintainer: AndyRTR # Contributor: Tobias Kieslich pkgname=xfce4-timer-plugin -pkgver=0.6.1 -pkgrel=2 +pkgver=0.6.2 +pkgrel=1 pkgdesc="plugin to track time for the Xfce4 panel" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL2') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin" groups=('xfce4-goodies') depends=('xfce4-panel' 'libxfcegui4') makedepends=('intltool') options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2 - panel48.patch) -md5sums=('ba5ae0e25f69517338f74a27fbaf4ca2' - 'fc9444aa98d7ef9c61d97dbd9f47e082') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2) +md5sums=('688fe2dde9645bee1855e6a6c9579161') build() { - cd ${srcdir}/${pkgname}-${pkgver} - # patch from git master - patch -Np1 -i ${srcdir}/panel48.patch + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/ \ --localstatedir=/var \ - --disable-static \ - --disable-debug + --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -- cgit v1.2.3-54-g00ecf