diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-18 13:39:32 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-18 13:39:32 +0100 |
| commit | 7e6a790c47fb44426cdda8ea0aca8c247a524c5e (patch) | |
| tree | a120e55f735660c1ab1e7fa6174fe28fb3108d1f | |
| parent | e5592a9039761a22a117469303c77a4215ad5048 (diff) | |
| parent | d14a25fc4f65ae3d6e62f4668e9cb88d74834255 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gpsmanshp/PKGBUILD
community/parrot/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdegames/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libmtp/PKGBUILD
extra/libreoffice/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-libx11/PKGBUILD
testing/xf86-video-mga/PKGBUILD
testing/xf86-video-mga/git-fixes.patch
71 files changed, 737 insertions, 1054 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 1a61266cc..bd2e02c66 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67895 2012-03-15 23:14:18Z ebelanger $ +# $Id: PKGBUILD 67914 2012-03-16 09:03:50Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.42 -pkgrel=2 +pkgver=0.8.43 +pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('8353d4294984b8a3ff0981505e75eff2' +md5sums=('9c9656b0881ef8013018ec4cf42b3119' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/gpg-crypter/PKGBUILD b/community/gpg-crypter/PKGBUILD index 2bd83c169..cb313d0f9 100644 --- a/community/gpg-crypter/PKGBUILD +++ b/community/gpg-crypter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 9138 2010-01-23 20:04:16Z jlichtblau $ +# $Id: PKGBUILD 67947 2012-03-16 11:29:44Z giovanni $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=gpg-crypter pkgver=0.3.5 -pkgrel=4 +pkgrel=5 pkgdesc="A graphical front-end to GnuPG(GPG) using the GTK2 toolkit and libgpgme" arch=('i686' 'x86_64' 'mips64el') url="http://gpg-crypter.sourceforge.net/" @@ -19,18 +19,25 @@ md5sums=('be33140ae205b8a3f37217c1c2c0737a' build() { cd ${srcdir}/$pkgname-$pkgver + export CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" + ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install # icon install -Dm644 ${srcdir}/$pkgname-$pkgver/pixmaps/$pkgname.png \ - ${pkgdir}/usr/share/pixmaps/$pkgname.png || return 1 + ${pkgdir}/usr/share/pixmaps/$pkgname.png # .desktop file install -Dm644 ${srcdir}/$pkgname.desktop \ - ${pkgdir}/usr/share/applications/$pkgname.desktop || return 1 + ${pkgdir}/usr/share/applications/$pkgname.desktop # delete unneeded icon - rm -rf ${pkgdir}/usr/share/$pkgname || return 1 + rm -rf ${pkgdir}/usr/share/$pkgname } diff --git a/community/gpsmanshp/PKGBUILD b/community/gpsmanshp/PKGBUILD index 66ee0e9d6..0236d453a 100644 --- a/community/gpsmanshp/PKGBUILD +++ b/community/gpsmanshp/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 21514 2010-07-16 14:22:13Z tdziedzic $ +# $Id: PKGBUILD 67943 2012-03-16 11:12:57Z giovanni $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=gpsmanshp -pkgver=1.2 -pkgrel=4 -pkgdesc='A Tcl package to read and write shapefiles' +pkgver=1.2.1 +pkgrel=1 +pkgdesc="A Tcl package to read and write shapefiles" arch=('i686' 'x86_64' 'mips64el') -url='http://www.ncc.up.pt/gpsmanshp' +url="http://gpsmanshp.sourceforge.net/" license=('GPL') -depends=('bash' 'tcl' 'shapelib') -source=("http://www.ncc.up.pt/${pkgname}/${pkgname}_${pkgver}.tgz") -md5sums=('b32e16afe3e306cf991ea38713fd0c9e') +depends=('glibc' 'shapelib' 'tcl') +source=("http://sourceforge.net/projects/${pkgname}/files/distr/${pkgname}_${pkgver}.tgz") +md5sums=('c2876d7f67c8215b46b336b5b859d49f') build() { - cd ${pkgname}_${pkgver} + cd "${pkgname}_${pkgver}" - mv Makefile8.4.4 Makefile + mv Makefile8.5 Makefile + sed -i -e "s:shapefil.h:libshp/shapefil.h:g" gpsmanshp.c - mkdir -p ${pkgdir}/usr/lib/ + install -d ${pkgdir}/usr/lib/ # set install path sed -i -e "s|/usr/lib/tcl\$(TCLVERSION)|${pkgdir}/usr/lib/gpsmanshp|g" Makefile @@ -29,7 +31,7 @@ build() { } package() { - cd ${pkgname}_${pkgver} + cd "${pkgname}_${pkgver}" make install } diff --git a/community/gtk2fontsel/PKGBUILD b/community/gtk2fontsel/PKGBUILD index 84e71b52a..f92378248 100644 --- a/community/gtk2fontsel/PKGBUILD +++ b/community/gtk2fontsel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 22401 2010-07-21 18:22:42Z jlichtblau $ +# $Id: PKGBUILD 67937 2012-03-16 10:28:59Z giovanni $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=gtk2fontsel pkgver=0.1 -pkgrel=3 +pkgrel=4 pkgdesc="Font selection and preview tool" arch=('i686' 'x86_64' 'mips64el') url="http://gtk2fontsel.sourceforge.net/" @@ -17,6 +17,11 @@ build() { cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make prefix=${pkgdir}/usr install } diff --git a/community/happy/PKGBUILD b/community/happy/PKGBUILD new file mode 100644 index 000000000..783bb51d6 --- /dev/null +++ b/community/happy/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 67990 2012-03-16 18:40:06Z tdziedzic $ +# Maintainer: Thomas Dziedzic <gostrc@gmail.com> +# Contributor: simo <simo@archlinux.org> +# Contributor: Vesa Kaihlavirta <vegai@iki.fi> + +pkgname=happy +pkgver=1.18.9 +pkgrel=4 +pkgdesc="The Parser Generator for Haskell" +url="http://www.haskell.org/happy/" +arch=('i686' 'x86_64') +license=("custom:BSD3") +depends=('gmp') +makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4') +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('aeb565fe572f979f15a24db0df2de37d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + runhaskell Setup.lhs configure -O --prefix=/usr + runhaskell Setup.lhs build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + runhaskell Setup.lhs copy --destdir="${pkgdir}" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD index 442493585..bae3ce039 100644 --- a/community/ibus-anthy/PKGBUILD +++ b/community/ibus-anthy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47888 2011-05-25 23:35:15Z ebelanger $ +# $Id: PKGBUILD 68017 2012-03-17 00:56:59Z ebelanger $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-anthy -pkgver=1.2.6 +pkgver=1.2.7 pkgrel=1 pkgdesc="Japanese input method Anthy IMEngine for IBus Framework" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('ibus' 'anthy' 'python2') makedepends=('swig' 'intltool') options=('!libtool') source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('894c7311f4d5c96b1fdb8b3795446ead') +md5sums=('091a13ff950171981768463993ffb683') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ibus-unikey/PKGBUILD b/community/ibus-unikey/PKGBUILD index 3f2a781f5..0cb498684 100644 --- a/community/ibus-unikey/PKGBUILD +++ b/community/ibus-unikey/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55971 2011-09-27 06:50:51Z ebelanger $ +# $Id: PKGBUILD 68023 2012-03-17 01:19:28Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Trương Xuân Tính <xuantinh at gmail dot com> pkgname=ibus-unikey -pkgver=0.6.0 +pkgver=0.6.1 pkgrel=1 pkgdesc='IBus module for Vietnamese Keyboard' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url='http://code.google.com/p/ibus-unikey/' depends=('ibus') makedepends=('intltool') source=("http://ibus-unikey.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('cef0e737ea3fba5bf79642bfd85d44b3') +md5sums=('3bae6df0d4609a8c438c246030b9a61e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/iftop/PKGBUILD b/community/iftop/PKGBUILD index 2cdfc5fab..b22fcee65 100644 --- a/community/iftop/PKGBUILD +++ b/community/iftop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 17240 2010-05-22 14:21:13Z daenyth $ +# $Id: PKGBUILD 67935 2012-03-16 10:23:32Z giovanni $ # Maintainer: Daenyth <Daenyth+Arch at gmail dot com> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org> @@ -6,21 +6,26 @@ pkgname=iftop pkgver=0.17 -pkgrel=9 +pkgrel=10 pkgdesc="iftop does for network usage what top(1) does for CPU usage" arch=('i686' 'x86_64' 'mips64el') url="http://www.ex-parrot.com/~pdw/iftop/" license=('GPL') -depends=('libpcap>=1.0.0' 'ncurses') +depends=('libpcap' 'ncurses') options=('!makeflags') source=(http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz) md5sums=('062bc8fb3856580319857326e0b8752d') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="$pkgdir" install + + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make } -# vim:set ts=2 sw=2 et: +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community/jbig2dec/PKGBUILD b/community/jbig2dec/PKGBUILD index fc158b85d..6f6550950 100644 --- a/community/jbig2dec/PKGBUILD +++ b/community/jbig2dec/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 64909 2012-02-18 20:14:11Z bpiotrowski $ -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# $Id: PKGBUILD 67870 2012-03-15 15:48:59Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=jbig2dec pkgver=0.11 -pkgrel=3 +pkgrel=5 pkgdesc="decoder implementation of the JBIG2 image compression format" arch=('x86_64' 'i686' 'mips64el') url="http://jbig2dec.sourceforge.net/" license=('GPL3') -source=(http://ghostscript.com/~giles/jbig2/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('1f61e144852c86563fee6e5ddced63f1') -depends=('glibc') +depends=('glibc' 'libpng') +source=(http://ghostscript.com/~giles/jbig2/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname-$pkgver-libpng15.patch) +md5sums=('1f61e144852c86563fee6e5ddced63f1' + '6d80db1f3a5581a5e38234b9ed599b20') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir"/$pkgname-$pkgver + patch -Np0 -i "$srcdir"/$pkgname-$pkgver-libpng15.patch + autoreconf -fi ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir/" install } diff --git a/community/kaa-base/PKGBUILD b/community/kaa-base/PKGBUILD index 7074a24cb..596acfc0a 100644 --- a/community/kaa-base/PKGBUILD +++ b/community/kaa-base/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 27071 2010-09-17 12:26:08Z schuay $ +# $Id: PKGBUILD 68025 2012-03-17 01:28:26Z giovanni $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=kaa-base pkgver=0.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="KAA base package" url="http://freevo.sourceforge.net/" license=('GPL2') diff --git a/community/kaa-imlib2/PKGBUILD b/community/kaa-imlib2/PKGBUILD index cfdfd6e8b..9fa2cf127 100644 --- a/community/kaa-imlib2/PKGBUILD +++ b/community/kaa-imlib2/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 27187 2010-09-18 15:58:45Z schuay $ +# $Id: PKGBUILD 68027 2012-03-17 01:32:31Z giovanni $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=kaa-imlib2 pkgver=0.2.3 -pkgrel=4 +pkgrel=5 pkgdesc="KAA imlib2 package" url="http://freevo.sourceforge.net/" -license=(GPL2) +license=('GPL2') depends=('imlib2' 'python2' 'kaa-base') arch=('i686' 'x86_64' 'mips64el') source=(http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz) diff --git a/community/kaa-metadata/PKGBUILD b/community/kaa-metadata/PKGBUILD index 18e1f6b50..2b127ab53 100644 --- a/community/kaa-metadata/PKGBUILD +++ b/community/kaa-metadata/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 27187 2010-09-18 15:58:45Z schuay $ +# $Id: PKGBUILD 68029 2012-03-17 01:35:40Z giovanni $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=kaa-metadata pkgver=0.7.7 -pkgrel=3 +pkgrel=4 pkgdesc="KAA metadata package" url="http://freevo.sourceforge.net/" license=('GPL2') diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 1974cd4ea..ed8ff3f90 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61622 2012-01-04 22:29:04Z spupykin $ +# $Id: PKGBUILD 67923 2012-03-16 10:10:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> pkgname=lazarus -pkgver=0.9.30.2 -pkgrel=2 +pkgver=0.9.30.4 +pkgrel=1 pkgdesc='Delphi-like IDE for FreePascal' url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') @@ -13,7 +13,7 @@ depends=('fpc' 'fpc-src' 'gtk2') #makedepends=(rpmextract) options=('!emptydirs' '!makeflags') source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2) -md5sums=('0dcf54613c2f9d38a32d183431e2dfc9') +md5sums=('ebd40cdfdfc4b66d1ced7a0d48d6da84') build() { cd $srcdir/${pkgname} diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD index 2ab1f7b20..83cbc9f9a 100644 --- a/community/libmatio/PKGBUILD +++ b/community/libmatio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59370 2011-11-23 21:07:37Z andrea $ +# $Id: PKGBUILD 67968 2012-03-16 13:07:02Z giovanni $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libmatio pkgver=1.3.3 -pkgrel=2 +pkgrel=3 pkgdesc="A C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -19,7 +19,7 @@ build() { cd $srcdir/matio-$pkgver ./bootstrap ./configure --prefix=/usr --enable-fortran --enable-shared - make + make -j1 } package() { diff --git a/community/mcdp/PKGBUILD b/community/mcdp/PKGBUILD index 961480e9c..ad7e2b15f 100644 --- a/community/mcdp/PKGBUILD +++ b/community/mcdp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56613 2011-10-09 07:12:22Z jlichtblau $ +# $Id: PKGBUILD 67966 2012-03-16 12:59:54Z giovanni $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tino Reichardt <milky-archlinux@mcmilk.de> @@ -6,11 +6,12 @@ pkgname=mcdp pkgver=0.4b -pkgrel=1 +pkgrel=2 pkgdesc="Small console cd player" arch=('i686' 'x86_64' 'mips64el') url="http://www.mcmilk.de/projects/mcdp/" license=('GPL') +depends=('glibc') makedepends=('dietlibc') source=(http://www.mcmilk.de/projects/$pkgname/dl/${pkgname}-${pkgver}.tar.bz2) sha256sums=('0faa031b07299b0fb2353306a669328c877717e1bc7e274e40c3d2612e103cab') diff --git a/community/mezogis/PKGBUILD b/community/mezogis/PKGBUILD index 520bb36dd..83ce2c160 100644 --- a/community/mezogis/PKGBUILD +++ b/community/mezogis/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 27071 2010-09-17 12:26:08Z schuay $ +# $Id: PKGBUILD 67954 2012-03-16 12:03:52Z giovanni $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=mezogis pkgver=0.1.5 -pkgrel=4 +pkgrel=5 pkgdesc="A GIS application to query and analyse spatial data" arch=('i686' 'x86_64' 'mips64el') url="http://www.mezogis.org" license=('GPL') -depends=('pygtk' 'python-geotypes' 'postgis>=1.4') -source=(http://www.mezogis.org/files/mezogis-$pkgver.tar.gz) +depends=('pygtk' 'python-geotypes' 'postgis') +source=("http://www.mezogis.org/files/mezogis-$pkgver.tar.gz") md5sums=('1f886b849109a1a1bd3e165353b82368') -build() { +package() { cd $srcdir/mezogis-$pkgver # python2 fix diff --git a/community/mmsrip/PKGBUILD b/community/mmsrip/PKGBUILD index 752afaffd..54b85cfb8 100644 --- a/community/mmsrip/PKGBUILD +++ b/community/mmsrip/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 29248 2010-10-11 20:22:17Z jlichtblau $ +# $Id: PKGBUILD 67956 2012-03-16 12:10:10Z giovanni $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=mmsrip pkgver=0.7.0 -pkgrel=3 +pkgrel=4 pkgdesc="A downloader for the proprietary protocol MMS://" arch=('i686' 'x86_64' 'mips64el') url="http://nbenoit.tuxfamily.org/projects.php?rq=mmsrip" license=('GPL2') +depends=('glibc') source=(http://nbenoit.tuxfamily.org/projects/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('498a5ec10a004481532eaceacdff3a10') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr \ + --mandir=/usr/share/man make } diff --git a/community/mp3unicode/PKGBUILD b/community/mp3unicode/PKGBUILD index 83b233c20..60cd17584 100644 --- a/community/mp3unicode/PKGBUILD +++ b/community/mp3unicode/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 22433 2010-07-21 19:17:58Z jlichtblau $ +# $Id: PKGBUILD 67970 2012-03-16 13:11:55Z giovanni $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=mp3unicode pkgver=1.2 -pkgrel=4 +pkgrel=5 pkgdesc="A command line utility to convert ID3 tags in mp3 files between different encodings" arch=('i686' 'x86_64' 'mips64el') url="http://mp3unicode.yellowsite.ru/" license=('GPL') depends=('taglib') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('36665ee3ed71585e377f46fda6124a09') build() { cd ${srcdir}/$pkgname-$pkgver - #. /etc/profile.d/qt.sh - ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install } diff --git a/community/mtpfs/PKGBUILD b/community/mtpfs/PKGBUILD index 0c847afeb..7f34f7b56 100644 --- a/community/mtpfs/PKGBUILD +++ b/community/mtpfs/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 64861 2012-02-18 18:17:04Z lcarlier $ +# $Id: PKGBUILD 67994 2012-03-16 19:16:02Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: yugrotavele <yugrotavele at archlinux dot us> # Contributor: Anton Pirogov <anton.pirogov <AT> googlemail.com> pkgname=mtpfs -pkgver=1.0 -pkgrel=2 +pkgver=1.1 +pkgrel=1 pkgdesc="A FUSE filesystem that supports reading and writing from any MTP device" arch=('i686' 'x86_64' 'mips64el') url="http://www.adebenham.com/mtpfs/" license=('GPL3') depends=('libmtp' 'glib2' 'libid3tag' 'fuse' 'libmad') makedepends=('pkg-config') -source=(http://www.adebenham.com/debian/${pkgname}-${pkgver}.tar.gz) -md5sums=('7d62fdfdb59d87d115e2f804d0dc7f85') +source=(http://www.adebenham.com/files/mtp/${pkgname}-${pkgver}.tar.gz) +md5sums=('a299cadca336e6945b7275b44c6e8d27') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/musepack-tools/PKGBUILD b/community/musepack-tools/PKGBUILD index 21c8bf360..36883b709 100644 --- a/community/musepack-tools/PKGBUILD +++ b/community/musepack-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56848 2011-10-14 21:03:20Z schiv $ -# Maintainer: +# $Id: PKGBUILD 67972 2012-03-16 13:24:52Z giovanni $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Eric Belanger <belanger@astro.umontreal.ca> pkgname=musepack-tools pkgver=475 -pkgrel=1 +pkgrel=2 pkgdesc="Musepack decoder/encoder" arch=('i686' 'x86_64' 'mips64el') url="http://www.musepack.net/" @@ -13,7 +13,7 @@ license=('LGPL') depends=('libcuefile' 'libreplaygain') makedepends=('cmake') source=("http://files.musepack.net/source/musepack_src_r$pkgver.tar.gz" - "math.patch") + 'math.patch') md5sums=('754d67be67f713e54baf70fcfdb2817e' '9de31f07a3492c7b1db1248b055fbdc8') @@ -36,6 +36,8 @@ package() { for bin in chap cut dec enc gain 2sv8; do install -Dm755 mpc$bin/mpc$bin "$pkgdir/usr/bin/mpc$bin" done + + find ${pkgdir} -depth -type d -name .svn -exec rm -rf {} \; } # vim:set ts=2 sw=2 et: diff --git a/community/mxml/PKGBUILD b/community/mxml/PKGBUILD index df116ea61..c795e0f25 100644 --- a/community/mxml/PKGBUILD +++ b/community/mxml/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 59790 2011-11-30 09:27:23Z spupykin $ +# $Id: PKGBUILD 67931 2012-03-16 10:17:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=mxml -pkgver=2.6 -pkgrel=4 +pkgver=2.7 +pkgrel=1 pkgdesc="A small XML parsing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.minixml.org/" license=('LGPL') source=("http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -md5sums=('68977789ae64985dddbd1a1a1652642e') +md5sums=('76f2ae49bf0f5745d5cb5d9507774dc9') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/nmon/PKGBUILD b/community/nmon/PKGBUILD index 9cf278e07..6420dedb8 100644 --- a/community/nmon/PKGBUILD +++ b/community/nmon/PKGBUILD @@ -1,20 +1,25 @@ -# $Id$ +# $Id: PKGBUILD 67998 2012-03-16 23:55:43Z giovanni $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=nmon pkgver=14g -pkgrel=2 +pkgrel=3 pkgdesc="AIX & Linux Performance Monitoring tool" arch=('i686' 'x86_64') url="http://nmon.sourceforge.net" -license=("GPL") -depends=("ncurses") +license=('GPL') +depends=('ncurses') source=("http://downloads.sourceforge.net/${pkgname}/lmon$pkgver.c") +md5sums=('e537f51446fb375140368b115dc8278b') build() { - cd ${srcdir} - cc -o nmon lmon$pkgver.c -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g - install -D -m 0755 nmon "${pkgdir}/usr/bin/nmon" + cd ${srcdir} + + cc -o nmon lmon$pkgver.c -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g } -md5sums=('e537f51446fb375140368b115dc8278b') +package() { + cd ${srcdir} + + install -D -m 0755 nmon "${pkgdir}/usr/bin/nmon" +} diff --git a/community/noip/PKGBUILD b/community/noip/PKGBUILD index 55050d40c..1d9afbe5d 100644 --- a/community/noip/PKGBUILD +++ b/community/noip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 5867 2009-11-21 17:42:53Z jlichtblau $ +# $Id: PKGBUILD 67996 2012-03-16 23:45:15Z giovanni $ # Contributor: Lyle Putnam <lcputnam@amerytel.net> # Maintainer: Daenyth pkgname=noip pkgver=2.1.9 -pkgrel=2 +pkgrel=3 pkgdesc="A Dynamic DNS Client Updater for no-ip.com services" arch=('i686' 'x86_64' 'mips64el') url="http://www.no-ip.com/downloads.php?page=linux" @@ -12,9 +12,8 @@ license=('GPL') backup=('etc/no-ip2.conf') install=noip.install # Note that they have the one file for the current release, so if the md5sum breaks, it means they updated. -source=('http://www.no-ip.com/client/linux/noip-duc-linux.tar.gz' +source=("http://www.no-ip.com/client/linux/noip-duc-linux.tar.gz" 'noip-rc.d') - md5sums=('3b0f5f2ff8637c73ab337be403252a60' '63253de6f4d847015d111e5e5b20f2cf') @@ -24,9 +23,12 @@ build() { # Their Makefile is fucking horrid, do it by hand instead sed -i '/^#define CONFIG_FILEPATH/s/PREFIX//' noip2.c sed -i '/^#define CONFIG_FILENAME/s/PREFIX//' noip2.c - gcc -Wall $CLFAGS $LDFLAGS -g -Dlinux -DPREFIX="/usr" noip2.c -o noip2 || return 1 + gcc -Wall $CLFAGS $LDFLAGS -g -Dlinux -DPREFIX="/usr" noip2.c -o noip2 +} + +package() { + cd $srcdir/$pkgname-$pkgver-1 install -Dm755 noip2 $pkgdir/usr/bin/noip2 install -Dm755 $srcdir/noip-rc.d $pkgdir/etc/rc.d/noip } -# vim:set ts=2 sw=2 et: diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 5c5fcf876..b6a2e92e3 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 62750 2012-01-25 18:56:38Z spupykin $ +# $Id: PKGBUILD 67927 2012-03-16 10:14:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributer: mpie <michael.kyne-phillips1@ntlworld.com> +# Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=4.0.0 -#_rel=devel -_rel=stable +pkgver=4.1.0 +#_rel=stable +_rel=devel pkgrel=2 -pkgdesc="standalone virtual machine that can be used to execute bytecode compiled dynamic languages" -arch=(i686 x86_64 'mips64el') +pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" +arch=('x86_64' 'i686' 'mips64el') url="http://www.parrotcode.org/" license=('GPL') depends=('gmp' 'gdbm' 'readline' 'icu' 'openssl' 'libffi') makedepends=('perl-json') optdepends=('freeglut') options=(!emptydirs !makeflags) -source=(ftp://ftp.parrot.org/pub/parrot/releases/${_rel}/$pkgver/parrot-$pkgver.tar.gz) -md5sums=('fc613c41771baf79307c519072302299') +source=("ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/parrot-$pkgver.tar.gz") +md5sums=('23c37c82aeac2d5bf9fd00a7873dab0d') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" sed -i 's#auto::sha1##' lib/Parrot/Configure/Step/List.pm sed -i 's#auto::git_describe##' lib/Parrot/Configure/Step/List.pm @@ -27,18 +27,26 @@ build() { [ $NOEXTRACT -eq 1 ] || perl Configure.pl --prefix=/usr --parrot_is_shared find -type f -name Makefile | while read F; do - grep "$srcdir" $F && sed -i "s#-Wl,-rpath=$srcdir/parrot-$pkgver/blib/lib##" $F || true - grep "$srcdir" $F && sed -i "s#-rpath=$srcdir/parrot-$pkgver/blib/lib##" $F || true + grep "$srcdir" $F && sed -i \ + "s#-Wl,-rpath=$srcdir/parrot-$pkgver/blib/lib##" $F || true + grep "$srcdir" $F && sed -i \ + "s#-rpath=$srcdir/parrot-$pkgver/blib/lib##" $F || true done +} + +package() { + cd "$srcdir/$pkgname-$pkgver" OLD_LIB_PATH=$LD_LIBRARY_PATH export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$srcdir/parrot-$pkgver/blib/lib make -j1 all parrot_utils docs html RPATH_BLIB= export LD_LIBRARY_PATH=`pwd`/blib/lib - make -j1 DESTDIR=$pkgdir install-dev + make -j1 DESTDIR="$pkgdir" install-dev sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/lib/parrot/$pkgver/tools/lib/Parrot/Config/Generated.pm export LD_LIBRARY_PATH=$OLD_LIB_PATH } + +# vim:set ts=2 sw=2 et: diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index c62d94fac..7a341fcfa 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.2 +_dcpkgver=2.1.3 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index fe0e9511f..9cb6a966f 100644 --- a/community/solfege/PKGBUILD +++ b/community/solfege/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57439 2011-10-27 19:55:33Z schiv $ +# $Id: PKGBUILD 68019 2012-03-17 01:01:55Z giovanni $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: sickhate <sickhate@tux-linux.net> @@ -7,7 +7,7 @@ # bring in pyalsa, csound, mma pkgname=solfege pkgver=3.20.4 -pkgrel=1 +pkgrel=2 pkgdesc="Music education and ear training software" arch=('i686' 'x86_64' 'mips64el') url="http://www.solfege.org/" diff --git a/community/sqlite2/PKGBUILD b/community/sqlite2/PKGBUILD index b5d55b427..77bcf44b4 100644 --- a/community/sqlite2/PKGBUILD +++ b/community/sqlite2/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 20695 2010-07-10 22:08:38Z lcarlier $ +# $Id: PKGBUILD 68015 2012-03-17 00:56:03Z giovanni $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd <jvinet@zeroflux.org> pkgname=sqlite2 pkgver=2.8.17 -pkgrel=4 +pkgrel=5 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.sqlite.org/" depends=('readline>=6.0.00') -source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz 'LICENSE') +source=("http://www.sqlite.org/sqlite-$pkgver.tar.gz" + 'LICENSE') license=('custom') options=('!libtool') md5sums=('838dbac20b56d2c4292e98848505a05b' diff --git a/community/tightvnc/PKGBUILD b/community/tightvnc/PKGBUILD index 356e6006f..910446431 100644 --- a/community/tightvnc/PKGBUILD +++ b/community/tightvnc/PKGBUILD @@ -1,42 +1,48 @@ -# $Id: PKGBUILD 67142 2012-03-04 23:56:49Z pschmitz $ -# Maintainer: Paul Mattal <paul@archlinux.org> +# $Id: PKGBUILD 67960 2012-03-16 12:47:31Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Paul Mattal <paul@archlinux.org> + pkgname=tightvnc pkgver=1.3.10 -pkgrel=6 +pkgrel=7 pkgdesc="VNC Unix server && viewer" arch=('i686' 'x86_64') license=('GPL') url="http://www.tightvnc.com" -depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth') -makedepends=('imake') +depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth' 'perl') +makedepends=('imake' 'setconf') conflicts=('vnc') options=('!makeflags') source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2" - 'tightvnc-fontpath-xcolors.patch') -md5sums=('397b35faad32d5246b6d44b142f8304f' - '21aa7f3376ec3c608ff22d199a19c601') + 'http://people.csail.mit.edu/jaffer/Color/rgb.txt') +sha256sums=('f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d' + 'af6c056a95ae725f98534db22b9a4916d17f2356fdca84a4a038211a82fa8a73') build() { cd $srcdir/vnc_unixsrc - patch -Np1 -i ../tightvnc-fontpath-xcolors.patch - sed -i 's|/usr/local/|/usr/share/|' vncserver + setconf tightvncserver.conf '$colorPath' \"/usr/share/tightvnc\"\; + setconf vncserver '$colorPath' \"/usr/share/tightvnc\"\; + setconf vncserver '$vncClasses' \"/usr/share/tightvnc\"\; + setconf vncserver '$fontPath' \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\; xmkmf make World cd Xvnc ./configure - sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \ - -i programs/Xserver/os/Makefile lib/font/fc/Makefile + setconf programs/Xserver/os/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L" + setconf lib/font/fc/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L" make } package() { - cd $srcdir/vnc_unixsrc - mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 - ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man + cd "$srcdir/vnc_unixsrc" - # install java classes - mkdir -p $pkgdir/usr/share/vnc/classes - install -Dm644 $srcdir/vnc_unixsrc/classes/* \ - $pkgdir/usr/share/vnc/classes + mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1" + ./vncinstall "$pkgdir/usr/bin" "$pkgdir/usr/share/man" + mkdir -p "$pkgdir/usr/share/$pkgname" + install -Dm644 "$srcdir/vnc_unixsrc/classes/"* \ + "$pkgdir/usr/share/$pkgname" + install -Dm644 "$srcdir/rgb.txt" "$pkgdir/usr/share/$pkgname/rgb.txt" } + +# vim:set ts=2 sw=2 et: diff --git a/community/xmms-pulse/PKGBUILD b/community/xmms-pulse/PKGBUILD index 7f97c4ced..89fbad382 100644 --- a/community/xmms-pulse/PKGBUILD +++ b/community/xmms-pulse/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 17281 2010-05-22 17:51:17Z heftig $ +# $Id: PKGBUILD 68002 2012-03-17 00:12:40Z giovanni $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=xmms-pulse pkgver=0.9.4 -pkgrel=2 +pkgrel=3 pkgdesc="An XMMS output plugin for the PulseAudio sound server" arch=('i686' 'x86_64' 'mips64el') url="http://0pointer.de/lennart/projects/xmms-pulse" @@ -13,16 +14,19 @@ license=('GPL') depends=('xmms' 'pulseaudio') groups=('xmms-plugins' 'xmms-io-plugins') options=('!libtool') -source=(http://0pointer.de/lennart/projects/xmms-pulse/${pkgname}-${pkgver}.tar.gz) +source=("http://0pointer.de/lennart/projects/xmms-pulse/${pkgname}-${pkgver}.tar.gz") md5sums=('c879939a6242f07b69298b30bcdeb6c5') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-lynx - make || return 1 + + ./configure --prefix=/usr \ + --disable-lynx + make } package() { cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index d03e2876a..d06da0007 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64615 2012-02-17 03:15:27Z tdziedzic $ +# $Id: PKGBUILD 67933 2012-03-16 10:22:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=4 +pkgrel=5 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" @@ -60,7 +60,7 @@ build() { sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf ./waf configure --prefix=/usr \ - --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli \ + --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps \ --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \ --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` ./waf build diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD index 989a23021..3d5894c84 100644 --- a/community/xnee/PKGBUILD +++ b/community/xnee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55315 2011-09-09 20:38:51Z jlichtblau $ +# $Id: PKGBUILD 67919 2012-03-16 09:51:24Z giovanni $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=xnee -pkgver=3.10 +pkgver=3.12 pkgrel=1 pkgdesc="A program to record, distribute, and replay X (X11) protocol data" arch=('i686' 'x86_64' 'mips64el') @@ -12,9 +12,8 @@ license=('GPL3') depends=('gtk2' 'libgnomeui' 'libxtst') makedepends=('texinfo') options=('!libtool' '!emptydirs') -changelog=$pkgname.changelog source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('6260e02f4938d18a548e6a6716ae48e34f1bf33c7a832d5eda35d4191fb86b56') +sha256sums=('bc7ea43e62f4aed6148d1439b0061da613c364e9f981d44d8e52506023b07d83') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/xtmsplit/PKGBUILD b/community/xtmsplit/PKGBUILD index 2ca9375d9..e69bf849c 100644 --- a/community/xtmsplit/PKGBUILD +++ b/community/xtmsplit/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 21560 2010-07-16 16:18:53Z lcarlier $ +# $Id: PKGBUILD 67921 2012-03-16 09:56:53Z giovanni $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=xtmsplit pkgver=0.2 -pkgrel=2 +pkgrel=3 pkgdesc="Xtremsplit-compliant file splitter/merger" arch=('i686' 'x86_64' 'mips64el') url="http://www.software.caelistis.be/" @@ -16,11 +17,11 @@ build() { cd ${srcdir}/$pkgname ./configure --prefix=/usr + make } package() { cd ${srcdir}/$pkgname - make make DESTDIR="$pkgdir" install } diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index b3ddd142b..955217990 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147737 2012-01-27 16:09:24Z dan $ +# $Id: PKGBUILD 153601 2012-03-16 15:10:42Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.42 +pkgver=1.42.1 pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,9 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('e69bc63bc319e4d1e4242cc278bfd442a60646e6' +sha1sums=('c25c73de98737b5f6fb9debec36bfb6416b0ac07' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') + build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 9eb17fc59..de87fbe4a 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144896 2011-12-09 11:55:57Z stephane $ +# $Id: PKGBUILD 153617 2012-03-16 17:46:18Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 -pkgver=1.9.2 -pkgrel=2 +pkgver=1.10.1 +pkgrel=1 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -14,40 +14,20 @@ provides=('heimdal') replaces=('heimdal') conflicts=('heimdal') backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') -source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar krb5-kadmind krb5-kdc - krb5-kpropd - krb5-1.9.1-config-script.patch - krb5-1.9.1-2011-007.patch) -sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' + krb5-kpropd) +sha1sums=('f9f3b77173f68b268b43e4f9c29bf7c9f3fd1f0e' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' - '7f402078fa65bb9ff1beb6cbbbb017450df78560' - '7342410760cf44bfa01bb99bb4c49e12496cb46f' - 'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7') + '7f402078fa65bb9ff1beb6cbbbb017450df78560') options=('!emptydirs') build() { tar zxvf ${pkgname}-${pkgver}.tar.gz cd "${srcdir}/${pkgname}-${pkgver}/src" - # - Make krb5-config suppress CFLAGS output when called with --libs - # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391 - # - # - Omit extra libraries because their interfaces are not exposed to applications - # by libkrb5, unless do_deps is set to 1, which indicates that the caller - # wants the whole list. - # - # Patch from upstream : - # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 - patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch - - # Apply upstream patch to fix a null pointer dereference when processing TGS requests - # CVE-2011-1530 - # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt - patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch - # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 @@ -62,7 +42,8 @@ build() { --disable-rpath \ --without-tcl \ --enable-dns-for-realm \ - --with-ldap + --with-ldap \ + --without-system-verto make } diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD index 6c165e745..3a38ccded 100644 --- a/core/pcmciautils/PKGBUILD +++ b/core/pcmciautils/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 134400 2011-08-03 16:55:02Z tomegun $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 153635 2012-03-16 22:34:37Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=pcmciautils pkgver=018 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for inserting and removing PCMCIA cards" arch=(i686 x86_64 'mips64el') url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" @@ -11,7 +12,8 @@ groups=('base') # sysfsutils will not be required in the next release depends=('udev' 'sysfsutils') conflicts=('pcmcia-cs') -source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2) +# source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) options=(!makeflags) build() { @@ -24,4 +26,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('5d85669b3440baa4532363da6caaf1b4') +md5sums=('964c802994677a71b38ec56554aa229f') diff --git a/core/udev/0001-reinstate-TIMEOUT-handling.patch b/core/udev/0001-reinstate-TIMEOUT-handling.patch new file mode 100644 index 000000000..9b251b283 --- /dev/null +++ b/core/udev/0001-reinstate-TIMEOUT-handling.patch @@ -0,0 +1,126 @@ +From 86617453cd78bf88d347f0e75a5be8b5ebac6c2e Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Thu, 15 Mar 2012 02:12:43 +0100 +Subject: [PATCH] reinstate TIMEOUT= handling + +This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and +57c6f8ae5f52a6e8ffc66a54966346f733dded39. + +Signed-off-by: Tom Gundersen <teg@jklm.no> +--- + src/libudev-device.c | 19 +++++++++++++++++++ + src/libudev-private.h | 1 + + src/udevd.c | 13 ++++++++++--- + 3 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/libudev-device.c b/src/libudev-device.c +index 10f28b8..639c367 100644 +--- a/src/libudev-device.c ++++ b/src/libudev-device.c +@@ -68,6 +68,7 @@ struct udev_device { + struct udev_list tags_list; + unsigned long long int seqnum; + unsigned long long int usec_initialized; ++ int timeout; + int devlink_priority; + int refcount; + dev_t devnum; +@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum) + return 0; + } + ++int udev_device_get_timeout(struct udev_device *udev_device) ++{ ++ return udev_device->timeout; ++} ++ ++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) ++{ ++ char num[32]; ++ ++ udev_device->timeout = timeout; ++ snprintf(num, sizeof(num), "%u", timeout); ++ udev_device_add_property(udev_device, "TIMEOUT", num); ++ return 0; ++} ++ + const char *udev_device_get_devpath_old(struct udev_device *udev_device) + { + return udev_device->devpath_old; +@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, + udev_device_set_devpath_old(udev_device, &property[12]); + } else if (strncmp(property, "SEQNUM=", 7) == 0) { + udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10)); ++ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { ++ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); + } else if (strncmp(property, "IFINDEX=", 8) == 0) { + udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10)); + } else if (strncmp(property, "DEVMODE=", 8) == 0) { +@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev) + udev_list_init(udev, &udev_device->sysattr_value_list, true); + udev_list_init(udev, &udev_device->sysattr_list, false); + udev_list_init(udev, &udev_device->tags_list, true); ++ udev_device->timeout = -1; + udev_device->watch_handle = -1; + /* copy global properties */ + udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) +diff --git a/src/libudev-private.h b/src/libudev-private.h +index 5f5c64a..ec63b67 100644 +--- a/src/libudev-private.h ++++ b/src/libudev-private.h +@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); + void udev_device_set_is_initialized(struct udev_device *udev_device); + int udev_device_add_tag(struct udev_device *udev_device, const char *tag); + void udev_device_cleanup_tags_list(struct udev_device *udev_device); ++int udev_device_get_timeout(struct udev_device *udev_device); + unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); + void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); + int udev_device_get_devlink_priority(struct udev_device *udev_device); +diff --git a/src/udevd.c b/src/udevd.c +index 1702217..88e9272 100644 +--- a/src/udevd.c ++++ b/src/udevd.c +@@ -401,7 +401,7 @@ out: + } + } + +-static void event_run(struct event *event) ++static void event_run(struct event *event, bool force) + { + struct udev_list_node *loop; + +@@ -427,7 +427,7 @@ static void event_run(struct event *event) + return; + } + +- if (children >= children_max) { ++ if (!force && children >= children_max) { + if (children_max > 1) + info(event->udev, "maximum number (%i) of children reached\n", children); + return; +@@ -461,6 +461,13 @@ static int event_queue_insert(struct udev_device *dev) + + event->state = EVENT_QUEUED; + udev_list_node_append(&event->node, &event_list); ++ ++ /* run all events with a timeout set immediately */ ++ if (udev_device_get_timeout(dev) > 0) { ++ event_run(event, true); ++ return 0; ++ } ++ + return 0; + } + +@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev) + continue; + } + +- event_run(event); ++ event_run(event, false); + } + } + +-- +1.7.9.4 + diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 7fcfcf217..37ad6c423 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153480 2012-03-14 23:26:14Z tomegun $ +# $Id: PKGBUILD 153633 2012-03-16 22:34:33Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,14 +6,15 @@ pkgname=udev pkgver=181 -pkgrel=4 +pkgrel=5 pkgdesc="The userspace dev tools (udev)" -depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils' 'acl') +depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'acl') install=udev.install arch=(i686 x86_64 mips64el) license=('GPL') makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz + 0001-reinstate-TIMEOUT-handling.patch initcpio-hooks-udev initcpio-install-udev) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" @@ -24,6 +25,8 @@ options=(!makeflags !libtool) build() { cd $srcdir/$pkgname-$pkgver + patch -p1 -i ../0001-reinstate-TIMEOUT-handling.patch + ./configure --prefix=/usr \ --with-rootprefix= \ --sysconfdir=/etc \ @@ -39,6 +42,10 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install + # install the mkinitpcio hook + install -D -m644 ../initcpio-hooks-udev ${pkgdir}/usr/lib/initcpio/hooks/udev + install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev + # udevd moved, symlink to make life easy for restarting udevd manually ln -s ../../lib/udev/udevd ${pkgdir}/usr/bin/udevd @@ -52,11 +59,8 @@ package() { s#GROUP="tape"#GROUP="storage"#g; s#GROUP="cdrom"#GROUP="optical"#g' $i done - - # install the mkinitpcio hook - install -D -m644 ../initcpio-hooks-udev ${pkgdir}/lib/initcpio/hooks/udev - install -D -m644 ../initcpio-install-udev ${pkgdir}/lib/initcpio/install/udev } md5sums=('0d7af750702620a871b9f9b98d8ad859' + 'f758b3e62ab77a1a6b7be12bb900cb2d' 'a4dd853050bf2e0ae6b2e3d2c75499c2' 'ee0bfe91a20fff12cc25ab1d1e024853') diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 3bf4d08a7..b0ff4e2e6 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153482 2012-03-14 23:26:17Z tomegun $ +# $Id: PKGBUILD 153637 2012-03-16 22:34:40Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.21 -pkgrel=5 +pkgrel=6 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,8 @@ build() { --libdir=/usr/lib \ --enable-write \ --enable-raw \ - --disable-wall + --disable-wall \ + --enable-libmount-mount make } diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD index 664c29d51..1d87ba410 100644 --- a/extra/bftpd/PKGBUILD +++ b/extra/bftpd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 135462 2011-08-13 23:06:44Z thomas $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> +# $Id: PKGBUILD 153626 2012-03-16 18:21:58Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=bftpd -pkgver=3.6 +pkgver=3.7 pkgrel=1 pkgdesc="Small, easy-to-configure FTP server" arch=(i686 x86_64 'mips64el') @@ -19,7 +19,7 @@ source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz bftpd.logrotate bftpd.pam bftpd.xinetd) -md5sums=('7c45b158646e3b266530bf46778fc2d0' +md5sums=('6614e25ef1864ad80d92724d03832407' '56a1bf7738a6db2b2cff89e611f4f11a' '853680dad0df39d0b4d2fb43d4be430a' '96f82c38f3f540b53f3e5144900acf17' @@ -29,25 +29,31 @@ build() { cd "${srcdir}"/$pkgname # The bftpd author keeps screwing up the release tarballs rm -f config.{cache,status} - ./configure --prefix=/usr --enable-pam --mandir=/usr/share/man + ./configure --prefix=/usr \ + --enable-pam \ + --mandir=/usr/share/man \ + --sysconfdir=/etc make } package() { cd "${srcdir}"/$pkgname install -d -m755 "${pkgdir}"/usr/{sbin,share/man/man8} - install -d -m755 "${pkgdir}"/var/log install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd make DESTDIR="${pkgdir}" install # Remove log file and /var/run from the package - rm -f "${pkgdir}"/var/log/bftpd.log - rmdir "${pkgdir}"/var/{run/bftpd,run,log,} + # This guy keeps messing up his Makefile, /usr/var, wtf? + rm -f "${pkgdir}"/usr/var/log/bftpd.log + rmdir "${pkgdir}"/usr/var/{run/bftpd,run,log,} # Install PAM file mkdir -p "${pkgdir}"/etc/pam.d cp "${srcdir}"/bftpd.pam "${pkgdir}"/etc/pam.d/bftpd # Install xinetd file install -D -m644 "${srcdir}"/bftpd.xinetd "${pkgdir}"/etc/xinetd.d/bftpd + # Did I mention this guy keeps messing up his Makefiles? + mv "${pkgdir}"/usr/etc/bftpd.conf "${pkgdir}"/etc/ + rmdir "${pkgdir}"/usr/etc # Fix default in config file sed 's|#ROOTDIR="/path/for/anonymous/user"|# bftpd interprets ROOTDIR="%h" (the default), as ROOTDIR="/" for the anonymous user, override it\n ROOTDIR="/srv/ftp"|' -i "${pkgdir}"/etc/bftpd.conf } diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 022cd0e7d..7c4eb55fc 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 145066 2011-12-16 09:17:40Z bisson $ +# $Id: PKGBUILD 153568 2012-03-16 04:06:01Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav -pkgver=0.97.3 -pkgrel=2 +pkgver=0.97.4 +pkgrel=1 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') @@ -13,12 +13,12 @@ options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('bzip2' 'libltdl') backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'rc.d' 'conf.d' 'logrotate' 'config.patch') -sha1sums=('263c7b8b7dc1536652ab64e32263d1c60e138655' +sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d' '50cfe02c97e4297a0efd25b23142408380305d30' 'cb116cdab49a810381a515cbcfb6a6c148547f07' 'be3310d2b41a68ce06e33c84ab68ffe59fdce104' @@ -28,7 +28,9 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../config.patch + ./configure \ --prefix=/usr \ --sysconfdir=/etc/clamav \ diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index b3547eb01..0af1bd77f 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 153549 2012-03-15 21:48:10Z andyrtr $ +# $Id: PKGBUILD 153623 2012-03-16 18:05:31Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> pkgname=dovecot -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -20,8 +20,8 @@ provides=('imap-server' 'pop3-server') options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh) -md5sums=('6ab61b962ff7e732ea9faa0fa41a28cb' - 'fb097826d991cd70894a914d01b0e2a1' +md5sums=('a0e25243862c61de6274cf7d682a76ec' + '85c2737b822e095b1120e322f13ce3ad' '587159e84e2da6f83d70b3c706ba87cc') build() { diff --git a/extra/fwbuilder/PKGBUILD b/extra/fwbuilder/PKGBUILD index 384b1b6df..202056bb5 100644 --- a/extra/fwbuilder/PKGBUILD +++ b/extra/fwbuilder/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139474 2011-10-02 02:49:30Z eric $ +# $Id: PKGBUILD 153570 2012-03-16 04:12:42Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fwbuilder -pkgver=5.0.0.3568 -pkgrel=2 +pkgver=5.0.1.3592 +pkgrel=1 pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms" url="http://www.fwbuilder.org/" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ license=('GPL') depends=('libxslt' 'net-snmp' 'qt') conflicts=('libfwbuilder') install=fwbuilder.install -source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/5.0.0/fwbuilder-${pkgver}.tar.gz") -md5sums=('0324edab10329dde029953d646aa8dad') +source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/${pkgver%.*}/fwbuilder-${pkgver}.tar.gz") +md5sums=('50b567a9752e9dd4f4cd0d988d74d879') build() { cd "${srcdir}/fwbuilder-${pkgver}" diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD index fd0b3ee5b..386bfb7dc 100644 --- a/extra/iptraf-ng/PKGBUILD +++ b/extra/iptraf-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152688 2012-03-08 20:30:23Z foutrelis $ +# $Id: PKGBUILD 153597 2012-03-16 13:00:51Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: sh0 <mee@sh0.org> pkgname=iptraf-ng pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)" url="https://fedorahosted.org/iptraf-ng/" arch=('i686' 'x86_64' 'mips64el') @@ -27,5 +27,4 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR=$pkgdir install - install -dm755 "$pkgdir/var/lib/iptraf" } diff --git a/extra/jhead/PKGBUILD b/extra/jhead/PKGBUILD index f44742aba..f715ddbb8 100644 --- a/extra/jhead/PKGBUILD +++ b/extra/jhead/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144342 2011-12-04 21:25:01Z eric $ +# $Id: PKGBUILD 153645 2012-03-17 03:19:37Z eric $ # Maintainer: François Charette <francois ατ archlinux δοτ org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=jhead -pkgver=2.93 +pkgver=2.95 pkgrel=1 pkgdesc="EXIF JPEG info parser and thumbnail remover" url="http://www.sentex.net/~mwandel/jhead/" @@ -13,7 +13,7 @@ depends=('glibc') optdepends=('libjpeg: to up-right images according to rotation tag') source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz LICENSE) -md5sums=('23ac51b4aea2df663d684744e282eb7d' +md5sums=('49599697ffc1830648b057916165a192' '1f0db611d2642a981719f45252762a45') build() { diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 8f22b6f43..252028e35 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153114 2012-03-12 09:14:51Z andrea $ +# $Id: PKGBUILD 153588 2012-03-16 10:27:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -8,12 +8,12 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') pkgver=4.8.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeadmin') -makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common') +makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') sha1sums=('0ee44575bfb45159ced6d4d046b07323ebab00e7' @@ -67,15 +67,14 @@ package_kdeadmin-kuser() { package_kdeadmin-system-config-printer-kde() { pkgdesc='Configure local and remote Printers' - depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt' - 'cups' 'python2-gobject2') + depends=('kdebindings-python2' 'system-config-printer-common' 'cups' 'python2-gobject2') url="http://kde.org/applications/system/printerapplet/" cd $srcdir/build/system-config-printer-kde make DESTDIR=$pkgdir install - # Use the python2 executable - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py - sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \ - "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py + sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py } diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index fd5383353..61fe4c774 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,33 +1,67 @@ -# $Id: PKGBUILD 153078 2012-03-12 09:04:41Z andrea $ +# $Id: PKGBUILD 153599 2012-03-16 14:50:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> -pkgname=kdebindings-python +pkgbase=kdebindings-python +pkgname=('kdebindings-python' + 'kdebindings-python2') pkgver=4.8.1 -pkgrel=1 -pkgdesc="KDE bindings for Python" -url="http://kde.org/" +pkgrel=3 +url='http://kde.org/' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') -makedepends=('cmake' 'automoc4' 'boost') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") sha1sums=('b9ef35269d2e08578ba20d01822dbdbed72bffb8') build() { + export PYTHONDONTWRITEBYTECODE="TRUE" + cd "${srcdir}" mkdir build cd build cmake ../pykde4-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0 + make + cd .. + + mkdir build-python2 + cd build-python2 + cmake ../pykde4-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 make } -package() { +package_kdebindings-python() { + pkgdesc="A set of Python 3.x bindings for KDE" + depends=('kdepim-runtime' 'pyqt' 'qscintilla') + cd "${srcdir}"/build make DESTDIR="${pkgdir}" install +} + +package_kdebindings-python2() { + pkgdesc="A set of Python 2.x bindings for KDE" + depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') + conflicts=('kdebindings-python<4.8.1-2') + + cd "${srcdir}"/build-python2 + make DESTDIR="${pkgdir}" install + + # Fix conflicts + rm "${pkgdir}"/usr/bin/pykdeuic4 + ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \ + "${pkgdir}"/usr/bin/python2-pykdeuic4 + + mv "${pkgdir}"/usr/share/apps/pykde4/examples \ + "${pkgdir}"/usr/share/apps/pykde4/python2-examples + + mv "${pkgdir}"/usr/share/sip/PyKDE4 \ + "${pkgdir}"/usr/share/sip/python2-PyKDE4 # Use the python2 executable find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index 6ebfa9c53..83763880e 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153166 2012-03-12 09:29:12Z andrea $ +# $Id: PKGBUILD 153590 2012-03-16 10:44:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -44,12 +44,12 @@ pkgname=('kdegames-bomber' 'kdegames-lskat' 'kdegames-palapeli') pkgver=4.8.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdegames') -makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python' +makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python2' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") sha1sums=('bcf764fd1f2f8083c388c17f26b83eeac568b1d5') @@ -101,7 +101,7 @@ package_kdegames-granatier() { package_kdegames-kajongg() { pkgdesc='The ancient Chinese board game for 4 players' - depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted') + depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python2' 'twisted') url="http://www.kde.org/applications/games/kajongg/" install='kdegames.install' cd $srcdir/build/kajongg diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 8b334bf6c..49474efb0 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153200 2012-03-12 09:39:38Z andrea $ +# $Id: PKGBUILD 153595 2012-03-16 11:45:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -23,7 +23,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') pkgver=4.8.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -183,7 +183,7 @@ package_kdesdk-kuiviewer() { package_kdesdk-lokalize() { pkgdesc='Computer-Aided Translation System' - depends=('kdebase-runtime' 'kdebindings-python') + depends=('kdebase-runtime' 'kdebindings-python2') url="http://kde.org/applications/development/lokalize/" optdepends=('translate-toolkit: enable extra python script') install='kdesdk-lokalize.install' diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD index b45bff933..021c8d461 100644 --- a/extra/kshutdown/PKGBUILD +++ b/extra/kshutdown/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 151542 2012-02-27 16:09:41Z giovanni $ +# $Id: PKGBUILD 153572 2012-03-16 04:44:09Z eric $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kshutdown -pkgver=3.0beta2 +pkgver=3.0beta3 pkgrel=1 pkgdesc="Shutdown Utility for KDE" arch=(i686 x86_64 'mips64el') url="http://kshutdown.sourceforge.net/" license=('GPL') depends=('kdebase-workspace') -makedepends=('pkgconfig' 'cmake' 'automoc4') +makedepends=('pkg-config' 'cmake' 'automoc4') install='kshutdown.install' -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip" - 'kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch') -md5sums=('1621e19cc74c9578b6cfc3e32166f853' - 'c03185629d063c8ebbf59a423cf78980') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip") +md5sums=('2b1ee9aa2300989650cd808c3860cd0a') build() { cd "${srcdir}" - patch -Np0 -i "${srcdir}/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch" mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index 2dd96a307..142fd5c48 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 145614 2011-12-24 03:54:58Z dreisner $ +# $Id: PKGBUILD 153576 2012-03-16 05:45:45Z eric $ # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 -pkgdesc="library implementation of the Media Transfer Protocol" -arch=("i686" "x86_64" 'mips64el') +pkgdesc="Library implementation of the Media Transfer Protocol" +arch=("i686" "x86_64" "mips64el") url="http://libmtp.sourceforge.net" license=('LGPL') -depends=('libusb-compat') +depends=('libusb') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('073e1c2a00ba377f68dce47727e185ae') +md5sums=('6dc708757e3fd3ccce7445b4f2171263') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 29c2577a4..300cc8b72 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148834 2012-02-05 11:52:15Z ibiru $ +# $Id: PKGBUILD 153604 2012-03-16 15:27:04Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -12,49 +12,28 @@ pkgname=('libreoffice-common' 'libreoffice-math' 'libreoffice-writer' 'libreoffice-en-US' - #'libreoffice-extension-barcode' # - 'libreoffice-extension-hunart' - #'libreoffice-extension-lightproof' # no source integration - #'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity - 'libreoffice-extension-ct2n' - 'libreoffice-extension-numbertext' - 'libreoffice-extension-oooblogger' + 'libreoffice-postgresql-connector' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-scripting-python' - 'libreoffice-extension-typo') -[ "${CARCH}" != "mips64el" ] && pkgname+=('libreoffice-sdk' \ - 'libreoffice-sdk-doc' \ - 'libreoffice-extension-diagram' \ - 'libreoffice-extension-google-docs' \ - 'libreoffice-extension-nlpsolver' \ - 'libreoffice-extension-presenter-screen' \ - 'libreoffice-extension-report-builder' \ - 'libreoffice-extension-scripting-beanshell' \ - 'libreoffice-extension-scripting-javascript' \ - 'libreoffice-extension-validator' \ - 'libreoffice-extension-watch-window' \ - 'libreoffice-extension-wiki-publisher') -_LOver=3.4.5.2 -pkgver=3.4.5 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') -#_LO_tree="3.4" -_OFFICEUPD="340" + 'libreoffice-extension-report-builder') +_LOver=3.5.1.2 +pkgver=3.5.1 +pkgrel=1 +arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'boost' - 'gperf' 'poppler>=0.18.1' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' - 'vigra' 'libldap' 'libmythes' 'libwpg' 'imagemagick' - 'gstreamer0.10-base' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' + 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' + 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' #'saxon' - currently broken - # the depends from libreoffice main pkg + # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'dbus-glib' "icu>=4.6" 'libxslt' - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' # 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script - 'ttf-dejavu') # to satisfy regression tests + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' + 'ttf-dejavu') # to satisfy regression tests # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors @@ -63,11 +42,10 @@ makedepends=( # makedepends _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" #_mirror="http://dev-builds.libreoffice.org/pre-releases/src" -#_mirror="http://dev-builds.libreoffice.org/pre-releases-3-4/src" -_additional_source_url="http://hg.services.openoffice.org/binaries" _additional_source_url="http://dev-www.libreoffice.org/src" -source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations - ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 +source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz + ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + ${_additional_source_url}/d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -90,31 +68,23 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 + ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 + ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - buildfix_boost.diff - buildfix_ct2n.diff - vbahelper.visibility.patch - scp2-more-reasonable-file-access-rights.diff) -noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e + smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 + buildfix_kde4fpicker.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ee67c55260ec7723c39606955ccdbd3e2934935a) +noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 + 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz + 185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz + e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 + 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -132,39 +102,12 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt - 41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt - 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt - bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt - 23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt - b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt - b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt - 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt - dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt - b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2) -md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81' - 'c1e2dabdf4cfcd5957779014a7f9787e' - '79c9c7fc208e7f56af09f284f261a7da' - 'c83a8a374d3d5cc83c6ac3b5ff613e46' - 'fa64799ebad8cbd2c160ac2f87bd5599' - 'b24fba57aa4185934e86a0a8db4a3433' - '4f98020088ab9b597fc21b617121bd47' - '3c3be7c5f923339c90b0d1d6ecad0243' - '3a0bb4bb096b7488533ed2ee466a2bc9' - 'f2b180aa1eff3884b4ca81c048f1e327' - 'a9af488ef92ad4442eafba874249c529' - 'db6a67c96a9090bc5e21b64e202a984e' - 'e00187ae0840e1f6a00fa3290cacf0d1' - '20fbf6cffd2b06e90a52105b75a57828' - '4af055f590732ec19a2534b2278ac49c' - 'c84693796d2b1d9c8269425b1fa53aef' - 'd4926dc27b6884656feec6753f4fdf22' - '770678ca19cca0f7985c1c82b2dccf48' - '97a1e3de430b124faf35bf334248ad53' - 'f02578f5218f217a9f20e9c30e119c6a' + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) +md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3' + '607b544cd7b38f9e6db6fe7da25007a7' + 'a3fa7818bfab14a6cccec645193e9982' + '18f577b374d60b3c760a3a3350407632' + 'd28864eb2b59bb57b034c0d4662a3cee' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -187,58 +130,42 @@ md5sums=('a75d7d4ebefb4c9a4bb256acf866fa81' 'ace6ab49184e329db254e454a010f56d' 'db60e4fde8dd6d6807523deb71ee34dc' 'ba2930200c9f019c2d93a8c88c651a0f' - '18f577b374d60b3c760a3a3350407632' '0ff7d225d087793c8c2c680d77aac3e7' + 'e1c178b18f130b40494561f02bc1a948' + '7c2549f6b0a8bb604e6c4c729ffdcfe6' '185d60944ea767075d27247c3162b3bc' - '90401bca927835b6fbae4a707ed187c8' - '451ccf439a36a568653b024534669971' - '7e7efc5d4a03126bb9ae3ae9aa2c4e87' - '41c9b65ad60af4b3255bbecdfef11736' - 'bbdd5639ada63e3130761daaecae1a10' - '23bd75552206dfcd8fd4e29137dcac84' - 'b8cbca7b3363e6ca2d02bc0ba2b63904' - 'b632bdd25649cc4067bcb410bae23d2b' - '9d60b6cfa3ef1926848710bbcd11115b' - 'dbaafd21de055e582d92d7d32fe9da13' - 'b7b2d0e04e142f26dd96119c80757d1f' - 'bc228237108cab7745897a9f466b6d39' - 'eee273f501ff45dc5f1365e78c6d57c0' - '43b145db28e6c0d73578ae6fd35e510d' - '37638431e7e40baf2e47966ebb9bc0e9') + '60ce5dc9bd098f95c2e621a930c98dd9' + '661a52a02a31b3afbe4b3b3146061afd' + '15fe8b5d79fbdc0b6bc2b454086671e7') build() { if [ "${CARCH}" != "mips64el" ] ; then unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh - [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh extraconf="--enable-opengl --enable-ext-scripting-beanshell --with-system-lucene --with-ant-home=\"/usr/share/java/apache-ant\" --with-lucene-core-jar=/usr/share/java/lucene-core.jar --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar --with-java-target-version=1.5 --enable-odk --enable-ext-diagram --enable-ext-google-docs --enable-ext-nlpsolver --enable-ext-report-builder --enable-ext-scripting-javascript --enable-ext-validator --enable-ext-watch-window --enable-ext-wiki-publisher" else extraconf="--disable-opengl --without-java --without-system-lucene --without-system-hsqldb --without-system-beanshell --without-system-jfreereport --without-system-saxon --without-system-mesa-headers --without-junit" fi - # move all LibO sources into one build directory - mkdir ${srcdir}/build && cd ${srcdir}/build - for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations - mv ${srcdir}/$i/* . - done -# mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* . -# ./bin/unpack-sources ${srcdir}/build + cd ${srcdir}/libreoffice-core-$_LOver # move external sources into place - mkdir ${srcdir}/ext_sources && cd ${srcdir}/ext_sources + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources for source in "${noextract[@]}"; do ln -s ${srcdir}/$source . done - - cd ${srcdir}/build + popd + + ln -s ../libreoffice-help-$_LOver/helpcontent2 . + ln -s ../libreoffice-translations-$_LOver/translations . # buildfixes & bugfixes - #patch -Np1 -i ${srcdir}/buildfix_boost.diff - patch -Np1 -i ${srcdir}/buildfix_ct2n.diff - patch -Np0 -i ${srcdir}/vbahelper.visibility.patch - patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff + # one late fix to solve make distro-pack-install issue + patch -Np1 -i ${srcdir}/gmake_install.diff + patch -Np1 -i ${srcdir}/smp_buildfix.diff + patch -Np1 -i ${srcdir}/buildfix_kde4fpicker.diff # Checks if --hash-style is accepted, not if --hash-style=both is accepted. [ "${CARCH}" = "mips64el" ] && sed -i 's/--hash-style=both/--hash-style=sysv/' ${srcdir}/build/solenv/gbuild/platform/unxgcc.mk @@ -258,31 +185,21 @@ build() { # python2 fix export PYTHON=python2 - # http://wiki.documentfoundation.org/Development/How_to_build/Configure_options - -# if [ "$CARCH" = "x86_64" ]; then -# EXTRAOPTS="--without-stlport" -# else -# EXTRAOPTS="--with-stlport" # --without-system-boost" -# # # avoid problems with ixion for now -# sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1 -# fi - - # needed for 0003-distro-install-fix-en-US-only-installation.patch - autoconf -f +# autoconf -f # non-SMP test build # export MAKEFLAGS="-j1" - ./configure --with-build-version="${_LOver} Parabola GNU/Linux-libre build-${pkgrel}" --with-vendor="Parabola GNU/Linux-libre" \ +# touch autogen.lastrun + ./autogen.sh --with-build-version="${_LOver} Parabola GNU/Linux-libre build-${pkgrel}" --with-vendor="Parabola GNU/Linux-libre" \ --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \ + --libdir=/usr/lib --mandir=/usr/share/man \ --disable-verbose \ --with-lang="" \ - --enable-cairo\ --enable-crashdump \ --enable-dbus \ --enable-evolution2\ @@ -290,52 +207,59 @@ build() { --disable-gnome-vfs\ --disable-kde\ --enable-kde4\ - --enable-ldap \ + --enable-gtk3 \ --enable-lockdown\ + --enable-mergelibs \ --enable-opengl \ --enable-odk\ - --enable-ext-barcode \ - --enable-ext-hunart \ - --disable-ext-lightproof \ --disable-ext-mysql-connector \ --with-system-mysql \ - --enable-ext-ct2n \ - --enable-ext-numbertext \ - --enable-ext-oooblogger \ - --enable-ext-pdfimport \ - --enable-ext-presenter-console \ - --enable-ext-presenter-minimizer \ - --enable-ext-scripting-python \ - --enable-ext-typo \ + --enable-librsvg=system \ --without-fonts\ --without-afms\ --without-ppds\ --without-system-libwps\ --without-system-mdds\ --without-myspell-dicts \ + --without-system-libvisio \ + --without-system-libcmis \ + --without-system-sampleicc \ + --without-system-libexttextcat \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ --with-external-thes-dir=/usr/share/mythes \ + --with-system-beanshell \ --with-system-cppunit\ --with-system-libwpg \ --with-system-libwps \ --with-system-redland\ --without-system-saxon\ - --with-system-libtextcat \ - --with-external-libtextcat-data \ - --with-openldap\ - --without-system-boost\ + --disable-mozilla \ + --without-system-mozilla \ + --without-system-mozilla-headers \ + --with-ant-home="/usr/share/java/apache-ant"\ + --with-system-boost\ --with-system-cairo\ --with-system-libs\ - --with-system-mozilla\ --with-system-mythes\ - --with-system-xrender-headers\ --with-system-headers\ + --with-system-hsqldb \ --with-alloc=system\ - $extraconf \ - $EXTRAOPTS || return 1 + --with-system-lucene\ + --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ + --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ + --with-java-target-version=1.5 \ + $extraconf + $EXTRAOPTS + +# --disable-ext-lightproof \ + +#--with-install-dirname="${pkgbase}" +# --enable-cairo\ +# --with-system-libtextcat \ +# --with-external-libtextcat-data \ #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool #--with-servlet-api-jar=JARFILE @@ -345,10 +269,7 @@ build() { touch src.downloaded #./download - unset MAKEFLAGS - ./bootstrap make - # fake installation to create split file lists mkdir $srcdir/fakeinstall make DESTDIR=${srcdir}/fakeinstall distro-pack-install @@ -363,11 +284,9 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=${pkgbase}.install - depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libxslt' "icu>=4.6" - 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script - #'java-runtime' + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" + 'nspr' "icu>=4.6" 'libsm' 'redland' 'hyphen' 'graphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') #'saxon' [ "${CARCH}" != "mips64el" ] && depends+=('libgl') optdepends=('libreoffice-langpack: additional language support' @@ -377,10 +296,11 @@ package_libreoffice-common() { 'pstoedit: translates PostScript and PDF graphics into other vector formats' 'poppler: for shipped pdfimport extension' 'libmythes: for use in thesaurus' + 'beanshell: interactive java -- good for prototyping /macros' 'vigra: C++ computer vision library, usable in Basebmp' 'libmspack: library for Microsoft compression formats for use in FontOOo' 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' - 'libldap: to get profiles via ldap' + 'lucene: full-text search engine library for Java needed in the help section' 'sane: for scanner access' 'unixodbc: adds ODBC database support' 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') @@ -397,11 +317,11 @@ package_libreoffice-common() { replaces=('go-openoffice' 'openoffice-base' 'libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -409,18 +329,14 @@ package_libreoffice-common() { mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done - # # remove version in menu entry and make it visible -# sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop -# echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop - # put configuration files into place install -dm755 ${pkgdir}/etc/libreoffice install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ - install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ # install dummy links to make them found by LibO cd ${pkgdir}/usr/lib/libreoffice/program/ ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . - cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/ + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ ln -vsf /etc/libreoffice/psprint.conf . #fix http://bugs.archlinux.org/task/17656 @@ -432,18 +348,18 @@ package_libreoffice-common() { package_libreoffice-base() { pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." - depends=('libreoffice-common') - optdepends=() + depends=('libreoffice-common' 'hsqldb-java') + optdepends=('libreoffice-postgresql-connector') backup=() groups=('libreoffice') replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -452,6 +368,35 @@ package_libreoffice-base() { done } +package_libreoffice-postgresql-connector() { + pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" + depends=('libreoffice-base' 'postgresql-libs') + groups=('libreoffice') + replaces=('libreoffice') + + # no file-list so far + install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry + install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry + +# # create directories from *list.txt file +# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do +# install -dm755 ${pkgdir}/${directory/\%dir/} +# done +# # install files into the pkg from fakeinstall dir +# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do +# dirname=`dirname $file` +# # check if directory has been already been created - some are missing like manpages +# [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname +# # mv file from fakeinstall to pkgdir +# mv ${srcdir}/fakeinstall${file} ${pkgdir}$file +# done +} + package_libreoffice-calc() { pkgdesc="Spreadsheet application for LibreOffice." depends=('libreoffice-common' 'lpsolve' ) @@ -461,11 +406,11 @@ package_libreoffice-calc() { replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -483,11 +428,11 @@ package_libreoffice-draw() { replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -498,17 +443,17 @@ package_libreoffice-draw() { package_libreoffice-gnome() { pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'dbus-glib') + depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib' optdepends=() backup=() groups=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -526,11 +471,11 @@ package_libreoffice-impress() { replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -547,11 +492,11 @@ package_libreoffice-kde4() { groups=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -569,11 +514,11 @@ package_libreoffice-math() { replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -590,11 +535,11 @@ package_libreoffice-sdk() { groups=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -604,9 +549,9 @@ package_libreoffice-sdk() { # fix installation paths sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ - -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ + -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \ -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \ + -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \ -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ @@ -614,7 +559,7 @@ package_libreoffice-sdk() { -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ - -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in + -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{csh,sh}.in } package_libreoffice-sdk-doc() { @@ -625,11 +570,11 @@ package_libreoffice-sdk-doc() { groups=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -638,7 +583,7 @@ package_libreoffice-sdk-doc() { done #fix permissions - find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \; + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; } package_libreoffice-writer() { @@ -650,11 +595,11 @@ package_libreoffice-writer() { replaces=('libreoffice') # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -671,11 +616,11 @@ package_libreoffice-en-US() { conflicts=(openoffice-en-US) # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} done # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname @@ -684,117 +629,6 @@ package_libreoffice-en-US() { done } -package_libreoffice-extension-barcode() { - - pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw " - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode - chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode -} - -package_libreoffice-extension-diagram() { - - pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram -} - -package_libreoffice-extension-google-docs() { - - pkgdesc="Google Documents extension for LibreOffice" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs -} - -package_libreoffice-extension-hunart() { - - pkgdesc="Hungarian cross-reference toolbar extension" - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart -} - -#package_libreoffice-extension-lightproof() { - -# pkgdesc="Lightproof extension for LibreOffice" - #arch=('any') -# depends=('libreoffice-common') -# groups=('libreoffice-extensions') - -# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions -# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof -#} - -#package_libreoffice-extension-mysql-connector() { - -# pkgdesc="MySQL Connector extension for LibreOffice" - #arch=('any') -# depends=('libreoffice-common') -# groups=('libreoffice-extensions') - -# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions -# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector -#} - -package_libreoffice-extension-nlpsolver() { - - pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver -} - -package_libreoffice-extension-ct2n() { - - pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates." - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n -} - -package_libreoffice-extension-numbertext() { - - pkgdesc="NUMBERTEXT/MONEYTEXT extensions" - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext -} - -package_libreoffice-extension-oooblogger() { - - pkgdesc="An extensions for blogging" - #arch=('any') - depends=('libreoffice-common' 'coreutils' 'python') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger -} - package_libreoffice-extension-pdfimport() { pkgdesc="This extension allows you to import and modify PDF documents" @@ -802,7 +636,7 @@ package_libreoffice-extension-pdfimport() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport } package_libreoffice-extension-presenter-screen() { @@ -812,7 +646,7 @@ package_libreoffice-extension-presenter-screen() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen } package_libreoffice-extension-presentation-minimizer() { @@ -822,7 +656,7 @@ package_libreoffice-extension-presentation-minimizer() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer } package_libreoffice-extension-report-builder() { @@ -833,81 +667,5 @@ package_libreoffice-extension-report-builder() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} - -package_libreoffice-extension-scripting-beanshell() { - - pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell -} - -package_libreoffice-extension-scripting-javascript() { - - pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript -} - -package_libreoffice-extension-scripting-python() { - - pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice-common' 'python') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python -} - -package_libreoffice-extension-typo() { - - pkgdesc="Typography toolbar extension" - #arch=('any') - depends=('libreoffice-common') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo - find ${pkgdir} -type d -exec chmod 755 {} \; - #chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo -} - -package_libreoffice-extension-validator() { - - pkgdesc="Validator extension for LibreOffice" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator -} - -package_libreoffice-extension-wiki-publisher() { - - pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher -} - -package_libreoffice-extension-watch-window() { - - pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen." - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder } diff --git a/extra/libreoffice/libreoffice.install b/extra/libreoffice/libreoffice.install index cb0d393dd..e66b66f3d 100644 --- a/extra/libreoffice/libreoffice.install +++ b/extra/libreoffice/libreoffice.install @@ -1,7 +1,6 @@ post_install() { -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -#xdg-icon-resource forceupdate --theme hicolor +xdg-icon-resource forceupdate --theme hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null 2>&1 @@ -25,8 +24,7 @@ echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" post_upgrade() { # post_install $1 -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -#xdg-icon-resource forceupdate --theme hicolor +xdg-icon-resource forceupdate --theme hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null 2>&1 if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then @@ -44,7 +42,6 @@ update-mime-database usr/share/mime > /dev/null 2>&1 post_remove() { update-desktop-database -q -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -#xdg-icon-resource forceupdate --theme hicolor +xdg-icon-resource forceupdate --theme hicolor update-mime-database usr/share/mime > /dev/null 2>&1 } diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index c5c1d92ef..332328dcb 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153292 2012-03-12 20:52:22Z andyrtr $ +# $Id: PKGBUILD 153607 2012-03-16 17:04:23Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.4.99.1 +pkgver=1.4.99.901 pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 xorg.sh xorg.csh) -sha1sums=('317e0112926926a52c13f56f71c1ec9e4540cf4d ' +sha1sums=('af10b064c1c64ee9e7daae0a7f1f9719eb7e965a' '4b756387426afb2a5bb7a155631ec42348abf5c1' '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8') diff --git a/extra/libxt/PKGBUILD b/extra/libxt/PKGBUILD index d2b818319..ea3a280a1 100644 --- a/extra/libxt/PKGBUILD +++ b/extra/libxt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153273 2012-03-12 20:17:00Z andyrtr $ +# $Id: PKGBUILD 153609 2012-03-16 17:09:01Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxt -pkgver=1.1.2 -pkgrel=2 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X11 toolkit intrinsics library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,15 +11,11 @@ license=('custom') depends=('libsm' 'libx11') makedepends=('xorg-util-macros') options=('!libtool') -source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2" - Revert_treat_unexpected_returned_events_from_poll_as_errors.diff) -sha1sums=('9e84b807419d78bda4acbd7aea05aed2ab0556cf' - 'bebadf4b90f6a49530b5600a12a9385253e0daa6') +source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2") +sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a') build() { cd "${srcdir}/libXt-${pkgver}" - # revert broken commit, see https://bugs.archlinux.org/task/28844 + https://bugs.archlinux.org/task/28875 + https://bugs.freedesktop.org/show_bug.cgi?id=47203 - patch -Np1 -R -i ${srcdir}/Revert_treat_unexpected_returned_events_from_poll_as_errors.diff ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index a45c9a0fc..92641c74e 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151755 2012-03-02 08:43:36Z tpowa $ +# $Id: PKGBUILD 153619 2012-03-16 17:50:36Z stephane $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba @@ -8,7 +8,7 @@ pkgver=3.6.3 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.3 -pkgrel=2 +pkgrel=4 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') diff --git a/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch new file mode 100644 index 000000000..7ac9251b3 --- /dev/null +++ b/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch @@ -0,0 +1,32 @@ +From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001 +From: Michal Schmidt <mschmidt@redhat.com> +Date: Fri, 2 Mar 2012 10:39:10 +0100 +Subject: [PATCH] util: never follow symlinks in rm_rf_children() + +The function checks if the entry is a directory before recursing, but +there is a window between the check and the open, during which the +directory could be replaced with a symlink. + +CVE-2012-1174 +https://bugzilla.redhat.com/show_bug.cgi?id=803358 +--- + src/util.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/util.c b/src/util.c +index 20cbc2b..dfc1dc6 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) { + if (is_dir) { + int subdir_fd; + +- if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) { ++ subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); ++ if (subdir_fd < 0) { + if (ret == 0 && errno != ENOENT) + ret = -errno; + continue; +-- +1.7.9.4 + diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD index 9e77b3e95..d1f60b49c 100644 --- a/extra/systemd/PKGBUILD +++ b/extra/systemd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153036 2012-03-11 15:14:05Z heftig $ +# $Id: PKGBUILD 153641 2012-03-17 02:44:42Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgbase=systemd pkgname=('systemd' 'libsystemd') -pkgver=43 -pkgrel=4 +pkgver=44 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') @@ -12,17 +12,17 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - "os-release" "cpp-compat.patch") -md5sums=('446cc6db7625617af67e2d8e5f503a49' + "os-release" + 0001-util-never-follow-symlinks-in-rm_rf_children.patch) +md5sums=('11f44ff74c87850064e4351518bcff17' '752636def0db3c03f121f8b4f44a63cd' - '414968aa314ced0b0ab4b2207e46aa69') + 'b5863d6d4b47e2b5bda8eb57bde0d327') build() { cd "$pkgname-$pkgver" - - # Fix C++ compile error when including sd-login.h - # http://comments.gmane.org/gmane.comp.sysutils.systemd.devel/4514 - patch -p1 -i ../cpp-compat.patch + + # https://bugzilla.redhat.com/show_bug.cgi?id=803358 + patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch" ./configure --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD index af4ea4160..85fcd5090 100644 --- a/extra/xf86-input-mouse/PKGBUILD +++ b/extra/xf86-input-mouse/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153309 2012-03-12 20:52:47Z andyrtr $ +# $Id: PKGBUILD 153613 2012-03-16 17:12:24Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-mouse -pkgver=1.7.1 -pkgrel=3 +pkgver=1.7.2 +pkgrel=1 pkgdesc="X.org mouse input driver" arch=(i686 x86_64 'mips64el') license=('custom') @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed') +sha1sums=('0da6390c6f3d7d636110a52f08193739929ae4ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index af90b1df2..eac281821 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153467 2012-03-14 18:01:52Z andyrtr $ +# $Id: PKGBUILD 153621 2012-03-16 17:56:02Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> @@ -6,7 +6,7 @@ pkgname=xf86-input-synaptics pkgver=1.5.99.901 -pkgrel=1 +pkgrel=2 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -21,12 +21,15 @@ groups=('xorg-drivers' 'xorg') options=(!libtool) backup=('etc/X11/xorg.conf.d/10-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 10-synaptics.conf) + 10-synaptics.conf + synaptics-Fix-inverted-circular-scrolling-direction.patch) sha1sums=('8836b1c2bf443b2c11f38457e203c5309698d9d0' - '68e1f4ef5e1038231d210eb422fa4d18c5922f0f') + '68e1f4ef5e1038231d210eb422fa4d18c5922f0f' + '2e35cde5db6c435f612a5c6802f33aca8ba1b6bb') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/synaptics-Fix-inverted-circular-scrolling-direction.patch ./configure --prefix=/usr make } diff --git a/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch b/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch index fee383855..fee383855 100644 --- a/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch +++ b/extra/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch diff --git a/extra/zziplib/PKGBUILD b/extra/zziplib/PKGBUILD index 73d728632..36d8ec909 100644 --- a/extra/zziplib/PKGBUILD +++ b/extra/zziplib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126501 2011-06-05 18:50:29Z remy $ +# $Id: PKGBUILD 153578 2012-03-16 06:20:51Z eric $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> pkgname=zziplib -pkgver=0.13.60 +pkgver=0.13.62 pkgrel=1 pkgdesc="A lightweight library that offers the ability to easily extract data from files archived in a single zip file" arch=('i686' 'x86_64' 'mips64el') @@ -13,15 +13,12 @@ license=('LGPL' 'MPL') depends=('zlib') makedepends=('python2') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - zziplib-0.13.60-ldflags.patch) -md5sums=('54a6aa53262483a4d54f7c59f0a7258b' - 'e585052f884525a338ca341b5d2957dc') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('5fe874946390f939ee8f4abe9624b96c') build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 - patch -p1 -i ../zziplib-0.13.60-ldflags.patch ./configure --prefix=/usr make } diff --git a/gnome-unstable/colord/PKGBUILD b/gnome-unstable/colord/PKGBUILD deleted file mode 100644 index e1790b6c9..000000000 --- a/gnome-unstable/colord/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 153538 2012-03-15 18:02:11Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Ionut Biru <ibiru@archlinux.org> - -pkgname=colord -pkgver=0.1.18 -pkgrel=1 -pkgdesc="Color daemon" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/software/colord" -license=('GPL2') -depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') -makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -source=($url/releases/$pkgname-$pkgver.tar.xz) -options=('!libtool') -sha1sums=('6127e723a9beb932aae7a43b6e6b5fdb84c39611') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc --libexecdir=/usr/lib/colord \ - --localstatedir=/var --disable-static \ - --with-systemdsystemunitdir=/lib/systemd/system - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/neon/PKGBUILD b/testing/neon/PKGBUILD deleted file mode 100644 index 7fa3af41d..000000000 --- a/testing/neon/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 153541 2012-03-15 18:19:26Z pierre $ -# Maintainer: -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=neon -pkgver=0.29.6 -pkgrel=4 -pkgdesc="HTTP and WebDAV client library with a C interface" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -depends=('krb5' 'expat' 'ca-certificates') -url="http://www.webdav.org/neon/" -source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('591e0c82e6979e7e615211b386b8f6bc') -options=('libtool') # FS#16067 - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --with-expat \ - --enable-shared \ - --disable-static \ - --with-ssl=openssl \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - make - - # fix invalid .so links in man pages (FS#24902) - sed -i '/^\.so/s|\.so \([^.]\+\)\.\([[:digit:]]\)|.so man\2/\1.\2|' doc/man/* -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/testing/nx-common/NXproto.h.64bit.diff b/testing/nx-common/NXproto.h.64bit.diff deleted file mode 100644 index ac326ebcd..000000000 --- a/testing/nx-common/NXproto.h.64bit.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 -+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 -@@ -26,6 +26,30 @@ - #include <X11/Xmd.h> - #include <X11/Xproto.h> - -+/* -+ Copied from Xproto.h -+ */ -+ -+/* For the purpose of the structure definitions in this file, -+we must redefine the following types in terms of Xmd.h's types, which may -+include bit fields. All of these are #undef'd at the end of this file, -+restoring the definitions in X.h. */ -+ -+#define Window CARD32 -+#define Drawable CARD32 -+#define Font CARD32 -+#define Pixmap CARD32 -+#define Cursor CARD32 -+#define Colormap CARD32 -+#define GContext CARD32 -+#define Atom CARD32 -+#define VisualID CARD32 -+#define Time CARD32 -+#define KeyCode CARD8 -+#define KeySym CARD32 -+ -+/* End copied from Xproto.h */ -+ - #define sz_xNXGetControlParametersReq 4 - #define sz_xNXGetCleanupParametersReq 4 - #define sz_xNXGetImageParametersReq 4 -@@ -343,9 +367,9 @@ - CARD8 dstDepth; - CARD32 srcLength B32; - CARD32 dstLength B32; -- INT16 srcX B16, srcY B16; -+ CARD16 srcX B16, srcY B16; - CARD16 srcWidth B16, srcHeight B16; -- INT16 dstX B16, dstY B16; -+ CARD16 dstX B16, dstY B16; - CARD16 dstWidth B16, dstHeight B16; - } xNXPutPackedImageReq; - -@@ -463,4 +487,20 @@ - } - #endif - -+/* Copied from Xproto.h */ -+ -+/* restore these definitions back to the typedefs in X.h */ -+#undef Window -+#undef Drawable -+#undef Font -+#undef Pixmap -+#undef Cursor -+#undef Colormap -+#undef GContext -+#undef Atom -+#undef VisualID -+#undef Time -+#undef KeyCode -+#undef KeySym -+ - #endif /* NXproto_H */ diff --git a/testing/nx-common/PKGBUILD b/testing/nx-common/PKGBUILD deleted file mode 100644 index 8de3917c8..000000000 --- a/testing/nx-common/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 153543 2012-03-15 18:23:51Z pierre $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=nx-common -pkgver=3.5.0 -pkgrel=4 -pkgdesc="NoMachine NX common package for client and server" -arch=('i686' 'x86_64') -license=('GPL') -url="http://nomachine.com/" -depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'bash') -makedepends=('xorg-server-devel') -source=( #Compression libs and proxy sources - http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz - nxcompsh-gcc43.patch - nx-3.5.0-libpng15.patch) -options=(!libtool) -md5sums=('ad8c0f133122c6d07732ca69c8759410' - '84ade443b79ea079380b754aba9d392e' - 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' - 'b6c279654dac421fc3dd1a27d66ff53c' - '2966353cabb96829eab291212ef078dc') - -build() { - # nxcomp - cd ${srcdir}/nxcomp - patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch - - ./configure --prefix=/opt/NX - make - # nxcompsh - cd ${srcdir}/nxcompsh - patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch - - ./configure --prefix=/opt/NX - make - # nxssh - cd ${srcdir}/nxssh - ./configure --prefix=/opt/NX - make -} - -package() { - mkdir -p ${pkgdir}/opt/NX/bin - mkdir -p ${pkgdir}/opt/NX/lib - - # nxcomp - cd ${srcdir}/nxcomp - cp -a libXcomp.so* ${pkgdir}/opt/NX/lib - # nxcompsh - cd ${srcdir}/nxcompsh - cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib - # nxssh - cd ${srcdir}/nxssh - install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh -} diff --git a/testing/nx-common/nx-3.5.0-libpng15.patch b/testing/nx-common/nx-3.5.0-libpng15.patch deleted file mode 100644 index c8f2a9559..000000000 --- a/testing/nx-common/nx-3.5.0-libpng15.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp ---- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 -+++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 -@@ -414,7 +414,7 @@ - - png_read_info(pngPtr, infoPtr); - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -565,7 +565,7 @@ - - png_read_info( pngPtr, infoPtr ) ; - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -709,7 +709,7 @@ - png_read_info(pngPtr, infoPtr) ; - - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } diff --git a/testing/nx-common/nxcompsh-gcc43.patch b/testing/nx-common/nxcompsh-gcc43.patch deleted file mode 100644 index 681a0dab5..000000000 --- a/testing/nx-common/nxcompsh-gcc43.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 -@@ -18,10 +18,12 @@ - #ifndef Misc_H - #define Misc_H - --#include <iostream.h> -+#include <iostream> - --#include <errno.h> --#include <string.h> -+#include <cerrno> -+#include <cstring> -+ -+using namespace std; - - // - // Error handling macros. - diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD deleted file mode 100644 index 6dfb27d2c..000000000 --- a/testing/proftpd/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 153556 2012-03-16 00:18:26Z eric $ -# Maintainer: -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=proftpd -pkgver=1.3.4a -pkgrel=4 -epoch=1 -pkgdesc="A high-performance, scalable FTP server" -arch=('i686' 'x86_64') -url="http://www.proftpd.org" -license=('GPL') -depends=('libldap' 'libmysqlclient' 'postgresql-libs') -backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') -source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc} - 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') -sha1sums=('18ea33d8b9f858b6e735cc81af900f0eebee8d25' - '195b06e28e503f5e5ef355c3332884cc5e7954a9' - 'b7819d725817e55b69c73e2572c21a05db48cc86' - '83c38ec40efb7cc09d9824b98e65cd948a195cc6' - 'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib \ - --disable-pam \ - --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ - --sysconfdir=/etc \ - --localstatedir=/var/run \ - --enable-ctrls \ - --enable-ipv6 \ - --with-includes=/usr/include/mysql:/usr/include/postgresql \ - --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ - --enable-nls - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" - - install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" - install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" - install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" - install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" -} diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd deleted file mode 100755 index 357a7663d..000000000 --- a/testing/proftpd/proftpd +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -PROFTPD_ARGS= -[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting ProFTPd Server" - /usr/sbin/proftpd ${PROFTPD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon proftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ProFTPd Server" - [ -f /var/run/proftpd.pid ] && kill $(cat /var/run/proftpd.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/proftpd.pid - rm_daemon proftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d deleted file mode 100644 index 1a5a8a201..000000000 --- a/testing/proftpd/proftpd.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to proftpd -# -PROFTPD_ARGS="" diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate deleted file mode 100644 index 7b6d7a87b..000000000 --- a/testing/proftpd/proftpd.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/xferlog { - postrotate - /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true - endscript -} |