From 7e5cd77730015792e26338edcc137acf3f1bd2ae Mon Sep 17 00:00:00 2001 From: root Date: Thu, 4 Aug 2011 23:14:34 +0000 Subject: Thu Aug 4 23:14:34 UTC 2011 --- community/apcupsd/PKGBUILD | 6 +- community/apcupsd/apcupsd | 5 +- community/calcurse/PKGBUILD | 5 +- community/compiz/PKGBUILD | 6 +- community/directfb/PKGBUILD | 19 ++-- community/ibus-hangul/PKGBUILD | 13 +-- community/ibus-m17n/PKGBUILD | 13 +-- community/jshon/PKGBUILD | 4 +- community/kiwi/PKGBUILD | 9 +- community/libinfinity/PKGBUILD | 6 +- community/libvirt/PKGBUILD | 10 +- community/libvirt/openbsd-netcat-default.patch | 34 +++---- community/listen/PKGBUILD | 3 +- community/lxappearance/PKGBUILD | 8 +- community/lxde-common/PKGBUILD | 14 +-- community/lxdm/PKGBUILD | 6 +- community/lxsession/PKGBUILD | 29 ++++++ community/lxtask/PKGBUILD | 8 +- community/packagekit/PKGBUILD | 6 +- community/qbittorrent/PKGBUILD | 6 +- community/root/PKGBUILD | 9 +- community/synce-vdccm/PKGBUILD | 20 ++-- community/synce-vdccm/build-fix.patch | 123 +++++++++++++++++++++++++ community/systemd/PKGBUILD | 41 ++++++--- community/systemd/systemd.install | 36 ++++++-- 25 files changed, 310 insertions(+), 129 deletions(-) create mode 100644 community/lxsession/PKGBUILD create mode 100644 community/synce-vdccm/build-fix.patch (limited to 'community') diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD index 9ef6c7ff5..ecdc98517 100644 --- a/community/apcupsd/PKGBUILD +++ b/community/apcupsd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52280 2011-07-23 09:29:14Z spupykin $ +# $Id: PKGBUILD 53371 2011-08-03 09:47:21Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Todd Musall pkgname=apcupsd pkgver=3.14.9 -pkgrel=1 +pkgrel=2 pkgdesc="Apcupsd can be used for power mangement and controlling most of APC's UPS models on Unix and Windows machines." arch=(i686 x86_64) url="http://www.apcupsd.org" @@ -19,7 +19,7 @@ backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz apcupsd) md5sums=('aa5e2c2954a81c2f07e0a356e38fe853' - '5eae3c4d921eeb81798a0250fe3dd111') + '8bc674da24188c69b0ad5d7fe7510f73') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/apcupsd/apcupsd b/community/apcupsd/apcupsd index 3cd5c9dc8..73ca2b4bf 100755 --- a/community/apcupsd/apcupsd +++ b/community/apcupsd/apcupsd @@ -13,8 +13,6 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - PID=`pidof -o %PPID /sbin/apcupsd` - echo $PID > /var/run/apcupsd.pid add_daemon apcupsd stat_done fi @@ -25,7 +23,6 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - rm /var/run/apcupsd.pid rm_daemon apcupsd stat_done fi @@ -39,6 +36,6 @@ case "$1" in /sbin/apcaccess status ;; *) - echo "usage: $0 {start|stop|restart|status}" + echo "usage: $0 {start|stop|restart|status}" esac exit 0 diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD index 537483258..a3e9c8b43 100644 --- a/community/calcurse/PKGBUILD +++ b/community/calcurse/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 53331 2011-08-02 22:40:00Z lfleischer $ +# $Id: PKGBUILD 53403 2011-08-03 11:06:10Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Ronald van Haren # Contributor: wain pkgname=calcurse pkgver=2.9.1 -pkgrel=1 +pkgrel=2 pkgdesc='A text-based personal organizer.' arch=('i686' 'x86_64') url='http://calcurse.org/' license=('BSD') depends=('ncurses') +makedepends=('asciidoc') source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz") md5sums=('3a1af304a55a87169c425099b4886dc2') diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD index 6c28aaf4b..eb4a0c1fb 100644 --- a/community/compiz/PKGBUILD +++ b/community/compiz/PKGBUILD @@ -9,14 +9,14 @@ pkgname=('compiz-core' 'compiz-decorator-kde' 'compiz-decorator-gtk') pkgver=0.8.8 -pkgrel=1 +pkgrel=2 pkgdesc="Composite manager for Aiglx and Xgl" url="http://www.compiz.org/" license=('GPL' 'LGPL' 'MIT') arch=('i686' 'x86_64') groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion') makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace' - 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse') + 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse' 'metacity') options=(!libtool !emptydirs) conflicts=('compiz' 'compiz-core-git' 'compiz-git') replaces=('compiz') @@ -65,7 +65,7 @@ package_compiz-core() package_compiz-decorator-gtk() { pkgdesc="Compiz decorator for GNOME" - depends=('gnome-control-center' 'libwnck' 'compiz-core') + depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity') install=compiz-decorator-gtk.install cd $srcdir/compiz-$pkgver diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD index 7a366507a..322155d9f 100644 --- a/community/directfb/PKGBUILD +++ b/community/directfb/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 33711 2010-11-27 20:33:08Z jlichtblau $ +# $Id: PKGBUILD 53472 2011-08-03 20:58:54Z ebelanger $ # Maintainer: Jaroslav Lichtblau -# Maintainer: Eric Belanger -# Contributor: Eric Belanger +# Maintainer: Eric Bélanger pkgname=directfb -pkgver=1.4.11 +pkgver=1.4.14 pkgrel=1 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device" arch=('i686' 'x86_64') url="http://www.directfb.org" license=('LGPL') -depends=('libjpeg' 'libxext' 'sdl' 'sysfsutils' 'libpng' 'freetype2') +depends=('gcc-libs' 'libjpeg' 'sdl' 'sysfsutils' 'libpng' 'freetype2') options=('!libtool') changelog=$pkgname.changelog source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz) -md5sums=('94735ccec21120794adcce93a61445d2') +md5sums=('de0745d25a6ac9e337d4d5572df85471') build() { - cd ${srcdir}/DirectFB-${pkgver} - + cd "${srcdir}/DirectFB-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \ --enable-x11 --enable-sdl --disable-vnc --disable-osx \ --enable-video4linux2 --enable-voodoo @@ -26,7 +24,6 @@ build() { } package() { - cd ${srcdir}/DirectFB-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/DirectFB-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD index efeed5115..6191465bf 100644 --- a/community/ibus-hangul/PKGBUILD +++ b/community/ibus-hangul/PKGBUILD @@ -1,9 +1,10 @@ +# $Id: PKGBUILD 53477 2011-08-03 21:36:31Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Radim Hvizdák pkgname=ibus-hangul -pkgver=1.3.0.20100329 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc='Korean input engine for IBus' arch=('i686' 'x86_64') url='http://ibus.googlecode.com' @@ -11,10 +12,10 @@ license=('GPL') depends=('ibus' 'libhangul') makedepends=('intltool') source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('3464c98626685c8e23f6b0b580de2d08') +md5sums=('b71565bba3a1439a47212611b774ecf7') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ @@ -24,7 +25,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make NO_INDEX=true DESTDIR=${pkgdir} install + make NO_INDEX=true DESTDIR="${pkgdir}" install } diff --git a/community/ibus-m17n/PKGBUILD b/community/ibus-m17n/PKGBUILD index 3e08b4c03..1849c40dd 100644 --- a/community/ibus-m17n/PKGBUILD +++ b/community/ibus-m17n/PKGBUILD @@ -1,20 +1,21 @@ +# $Id: PKGBUILD 53482 2011-08-03 22:10:35Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Lonfucius # Contributor: Jesse Jaara pkgname=ibus-m17n -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 pkgdesc='M17N engine for IBus' arch=('i686' 'x86_64') url='http://code.google.com/p/ibus/' license=('LGPL') depends=('python-pyenchant' 'ibus' 'm17n-db' 'm17n-lib') source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('38ff41207518812945c60084deba0080') +md5sums=('4c406147318f94e5e805c408c4be075e') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ @@ -24,7 +25,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index b9d7c736c..653274e4d 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kyle Keen pkgname=jshon -pkgver=20110723 +pkgver=20110803 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ depends=('jansson') makedepends=() optdepends=() source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('604ae154cb29cee8369df465794872ec') +md5sums=('d14f012d6e9acf2c0ccc355fcd53c6fd') build() { cd "$srcdir/$pkgname" diff --git a/community/kiwi/PKGBUILD b/community/kiwi/PKGBUILD index bd02fe205..3b30c8fcc 100644 --- a/community/kiwi/PKGBUILD +++ b/community/kiwi/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 26968 2010-09-16 03:55:06Z bfanella $ +# $Id: PKGBUILD 53351 2011-08-03 06:50:46Z bfanella $ # Maintainer: Brad Fanella # Contributor: Douglas Soares de Andrade # Contributor: William Rea pkgname=kiwi -pkgver=1.9.26 -pkgrel=3 +pkgver=1.9.29 +pkgrel=1 pkgdesc="A set of classes and wrappers for PyGTK" arch=('i686' 'x86_64') url="http://www.async.com.br/projects/kiwi" @@ -13,7 +13,7 @@ license=("LGPL") depends=('pygtk') makedepends=('gettext') source=(http://download.gnome.org/sources/$pkgname/1.9/$pkgname-$pkgver.tar.bz2) -md5sums=('43c2aab9acf8d95321ee1ccec2c5e4e4') +sha256sums=('0ffa912cd180b3092b3ff636c582ab2c40f0f8eb541ada07b1432631a2d49e90') build() { cd $srcdir/$pkgname-$pkgver @@ -27,5 +27,6 @@ build() { } package() { cd $srcdir/$pkgname-$pkgver + python2 setup.py install --root=$pkgdir } diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD index 21497ff60..49f850d9a 100644 --- a/community/libinfinity/PKGBUILD +++ b/community/libinfinity/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 45226 2011-04-18 13:01:37Z spupykin $ +# $Id: PKGBUILD 53361 2011-08-03 09:42:41Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Sven-Hendrik Haase # Contributor: Gregory Haynes pkgname=libinfinity -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="An implementation of the Infininote protocol written in GObject-based C" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('avahi: zeroconf support' 'gtk2: gtk support') options=('!libtool') source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('2b25de033c3a4c9975340300b09b84b0') +md5sums=('85e6d75e101fe25503653d2202054eff') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index c2354f5e5..f15f7c2ad 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53281 2011-08-02 17:21:12Z spupykin $ +# $Id: PKGBUILD 53366 2011-08-03 09:43:53Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt -pkgver=0.9.3 -pkgrel=4 +pkgver=0.9.4 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -38,10 +38,10 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" openbsd-netcat-default.patch unixperms.patch yajl-2.x.patch) -md5sums=('04f47fad7d0c614af9dcc5d1351c2148' +md5sums=('86b411b11bd23d4af20611699f372af7' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' - 'ebb78cda893ca7991e0c22588a63132b' + 'ee7052f3929d5d918236c646a59edebf' 'db95aecdf2ccf3693fef5821cdcb7eba' '5745bb8d0b254abb7a3528c66e03b0f9') diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch index 29f05b34f..c7543c5a4 100644 --- a/community/libvirt/openbsd-netcat-default.patch +++ b/community/libvirt/openbsd-netcat-default.patch @@ -1,7 +1,7 @@ -diff -wbBur libvirt-0.9.3/src/qemu/qemu_migration.c libvirt-0.9.3.my/src/qemu/qemu_migration.c ---- libvirt-0.9.3/src/qemu/qemu_migration.c 2011-07-04 06:45:14.000000000 +0400 -+++ libvirt-0.9.3.my/src/qemu/qemu_migration.c 2011-07-04 15:03:15.000000000 +0400 -@@ -1763,7 +1763,7 @@ +diff -wbBur libvirt-0.9.4.org/src/qemu/qemu_migration.c libvirt-0.9.4/src/qemu/qemu_migration.c +--- libvirt-0.9.4.org/src/qemu/qemu_migration.c 2011-08-03 05:36:34.000000000 +0400 ++++ libvirt-0.9.4/src/qemu/qemu_migration.c 2011-08-03 13:29:56.000000000 +0400 +@@ -1612,7 +1612,7 @@ ret = qemuMonitorMigrateToUnix(priv->mon, background_flags, unixfile); } else if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) { @@ -10,24 +10,24 @@ diff -wbBur libvirt-0.9.3/src/qemu/qemu_migration.c libvirt-0.9.3.my/src/qemu/qe ret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args); } else { ret = -1; -diff -wbBur libvirt-0.9.3/src/remote/remote_driver.c libvirt-0.9.3.my/src/remote/remote_driver.c ---- libvirt-0.9.3/src/remote/remote_driver.c 2011-07-01 10:59:10.000000000 +0400 -+++ libvirt-0.9.3.my/src/remote/remote_driver.c 2011-07-04 15:03:32.000000000 +0400 -@@ -571,7 +571,7 @@ - command, +diff -wbBur libvirt-0.9.4.org/src/remote/remote_driver.c libvirt-0.9.4/src/remote/remote_driver.c +--- libvirt-0.9.4.org/src/remote/remote_driver.c 2011-07-29 09:14:03.000000000 +0400 ++++ libvirt-0.9.4/src/remote/remote_driver.c 2011-08-03 13:30:05.000000000 +0400 +@@ -588,7 +588,7 @@ username, - no_tty, + !tty, + !verify, - netcat ? netcat : "nc", + netcat ? netcat : "nc.openbsd", + keyfile, sockname))) goto failed; - -diff -wbBur libvirt-0.9.3/src/rpc/virnetsocket.c libvirt-0.9.3.my/src/rpc/virnetsocket.c ---- libvirt-0.9.3/src/rpc/virnetsocket.c 2011-07-01 10:59:10.000000000 +0400 -+++ libvirt-0.9.3.my/src/rpc/virnetsocket.c 2011-07-04 15:03:00.000000000 +0400 -@@ -597,7 +597,7 @@ - virCommandAddArgList(cmd, "-T", "-o", "BatchMode=yes", - "-e", "none", NULL); +diff -wbBur libvirt-0.9.4.org/src/rpc/virnetsocket.c libvirt-0.9.4/src/rpc/virnetsocket.c +--- libvirt-0.9.4.org/src/rpc/virnetsocket.c 2011-08-01 05:32:35.000000000 +0400 ++++ libvirt-0.9.4/src/rpc/virnetsocket.c 2011-08-03 13:29:46.000000000 +0400 +@@ -629,7 +629,7 @@ + if (noVerify) + virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); virCommandAddArgList(cmd, nodename, - netcat ? netcat : "nc", + netcat ? netcat : "nc.openbsd", diff --git a/community/listen/PKGBUILD b/community/listen/PKGBUILD index ca594fa72..87f1289b8 100644 --- a/community/listen/PKGBUILD +++ b/community/listen/PKGBUILD @@ -4,7 +4,7 @@ pkgname=listen pkgver=0.6.5 -pkgrel=6 +pkgrel=7 pkgdesc="Music player and management for GNOME" arch=('i686' 'x86_64') url="http://www.listen-project.org/" @@ -15,7 +15,6 @@ depends=('python2-egg' 'python2-libgnome' 'mutagen' makedepends=('gettext' 'pkgconfig' 'intltool' 'docbook2x' 'docbook-xml') optdepends=('python-musicbrainz2: musicbrainz & cd support' 'libgpod: iPod support' - 'hal: hal support' 'python-daap: DAAP support' 'tunepimp: tagging support') source=("http://download.listen-project.org/0.6/${pkgname}-${pkgver}.tar.gz") diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD index ba101365a..18136b30e 100644 --- a/community/lxappearance/PKGBUILD +++ b/community/lxappearance/PKGBUILD @@ -1,21 +1,21 @@ -#$Id: PKGBUILD 52925 2011-07-29 21:34:54Z angvp $ +#$Id: PKGBUILD 53436 2011-08-03 17:25:08Z angvp $ # Maintainer: Angel Velasquez # Contributor: Geoffroy Carrier pkgname=lxappearance pkgver=0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="GTK+ theme switcher of the LXDE Desktop (manages icons and fonts)" arch=('i686' 'x86_64') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk3' 'intltool') +depends=('gtk2' 'intltool') makedepends=('pkgconfig') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3 + ./configure --sysconfdir=/etc --prefix=/usr make } diff --git a/community/lxde-common/PKGBUILD b/community/lxde-common/PKGBUILD index b2516b833..808afbf1f 100644 --- a/community/lxde-common/PKGBUILD +++ b/community/lxde-common/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# $Id: PKGBUILD 53456 2011-08-03 20:00:26Z angvp $ # Maintainer: Angel Velasquez # Maintainer: Juergen Hoetzel pkgname=lxde-common -pkgver=0.5.0 -pkgrel=3 +pkgver=0.5.5 +pkgrel=1 pkgdesc="Common files of the LXDE Desktop" arch=('i686' 'x86_64') license=('GPL2') @@ -15,16 +15,12 @@ url="http://lxde.org/" makedepends=(automake) optdepends=(lxsession-lite) backup=(etc/xdg/lxsession/LXDE/{desktop.conf,autostart}) -source=("http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz" - "${pkgname}-arch.patch" "${pkgname}-invalid-distfile.patch") -md5sums=('23606ab3d6e1039386d62a4b68b4ffc6' - '21657157d9ab377de55deb19a42d68e8' - '24938631783683fd98dfd533023e6d4e') +source=("http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz") +md5sums=('e51a6b2a815a89fda1f497b509465a97') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ${srcdir}/${pkgname}-arch.patch autoreconf ./configure --sysconfdir=/etc --prefix=/usr } diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index f40329120..5e7a7ee29 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52900 2011-07-29 19:07:23Z angvp $ +# $Id: PKGBUILD 53431 2011-08-03 17:17:03Z angvp $ # Maintainer: AndyRTR # Contributor: kiefer pkgname=lxdm pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight Display Manager (part of LXDE)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/lxdm/" @@ -13,7 +13,7 @@ groups=('lxde') depends=('gtk2' 'xorg-server' 'consolekit') makedepends=('intltool') install=${pkgname}.install -backup=('etc/lxdm/lxdm.conf') # 'etc/lxdm/xinitrc') +backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm') # 'etc/lxdm/xinitrc') source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz" Xsession.patch lxdm.patch lxdm-pam.patch lxdm-daemon) md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' diff --git a/community/lxsession/PKGBUILD b/community/lxsession/PKGBUILD new file mode 100644 index 000000000..db8719774 --- /dev/null +++ b/community/lxsession/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 53453 2011-08-03 19:42:00Z angvp $ +# Maintainer: Angel Velasquez +# Maintainer: Juergen Hoetzel + +pkgname=lxsession +pkgver=0.4.6.1 +pkgrel=1 +pkgdesc="Session manager of the LXDE Desktop (light version)" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://lxde.org/" +groups=('lxde') +depends=('gtk2' 'dbus') +makedepends=('pkgconfig' 'intltool') +replaces=('lxde-settings-daemon' 'lxsession-lite') +conflicts=('lxsession-lite' 'lxde-settings-daemon') +source=(http://downloads.sourceforge.net/lxde/lxsession-${pkgver}.tar.gz) +md5sums=('e456b64c5ab3652a4dec661ec706dc6e') + +build() { + cd "$srcdir/lxsession-$pkgver" + ./configure --sysconfdir=/etc --prefix=/usr + make +} + +package() { + cd "$srcdir/lxsession-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD index 38c46743e..8d2e9a7e9 100644 --- a/community/lxtask/PKGBUILD +++ b/community/lxtask/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 52423 2011-07-24 22:29:09Z angvp $ +# $Id: PKGBUILD 53426 2011-08-03 17:15:52Z angvp $ # Maintainer: Angel Velasquez # Contributor: Geoffroy Carrier pkgname=lxtask pkgver=0.1.4 -pkgrel=2 +pkgrel=3 pkgdesc="Task manager of the LXDE Desktop" arch=('i686' 'x86_64') license=('GPL2') url="http://lxde.org/" groups=('lxde') -depends=('gtk3') +depends=('gtk2') makedepends=('pkgconfig' 'intltool') source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f') @@ -17,7 +17,7 @@ md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f') build() { cd "$srcdir/$pkgname-$pkgver" autoreconf - ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3 + ./configure --sysconfdir=/etc --prefix=/usr make } package() { diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index 36876fe3d..b12c49445 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 51085 2011-07-05 07:17:46Z jconder $ +# $Id: PKGBUILD 53398 2011-08-03 10:39:01Z jconder $ # Maintainer: Jonathan Conder pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python') -pkgver=0.6.16 +pkgver=0.6.17 pkgrel=1 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool' 'shared-mime-info' 'sqlite3' 'udev') options=('!libtool') source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz") -sha256sums=('28fc2149e2dac4bed5b6b0479488dacc8af7e8a18556851711502b26de567e67') +sha256sums=('7d6e0d0c63d0a0ef9b393a80ae3711e073cd4b884ff4996d5622f688e28d63c3') build() { cd "$srcdir/PackageKit-$pkgver" diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index ef9d59015..fc56d7629 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Geoffroy Carrier pkgname=qbittorrent -pkgver=2.8.2 -pkgrel=2 +pkgver=2.8.3 +pkgrel=1 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64') url="http://www.qbittorrent.org/" @@ -16,7 +16,7 @@ optdepends=('python2: needed for search' install='qbittorrent.install' source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz" 'python2.patch') -md5sums=('58008b6b0233c7997067a61cf07af50d' +md5sums=('2e977ece476a83116beee5bf9df7a6c1' 'db0d79fee8ce3470ad3741d36b02a94c') build() { diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 643c7b379..05d858e2c 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -3,7 +3,7 @@ pkgname=root pkgver=5.30.00 -pkgrel=2 +pkgrel=3 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') url='http://root.cern.ch' @@ -40,7 +40,12 @@ build() { # python2 switch find . -type f -exec sed -i -e 's/python -O/python2 -O/g' -e 's/python -c/python2 -c/g' {} \; - sed -i 's/python 2/python2 2/g' configure + sed \ + -e 's/python 2/python2 2/g' \ + -i configure + sed \ + -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \ + -i cint/reflex/python/genreflex/Makefile.am ./configure \ ${TARGET} \ diff --git a/community/synce-vdccm/PKGBUILD b/community/synce-vdccm/PKGBUILD index ef43928d7..384394e78 100644 --- a/community/synce-vdccm/PKGBUILD +++ b/community/synce-vdccm/PKGBUILD @@ -1,26 +1,24 @@ -# $Id: PKGBUILD 17750 2010-05-24 21:46:24Z spupykin $ +# $Id: PKGBUILD 53376 2011-08-03 10:12:14Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Zhukov Pavel pkgname=synce-vdccm pkgver=0.10.1 -pkgrel=2 +pkgrel=3 pkgdesc="provide a means of communication with a Windows CE device - daemon to communicate with a handheld device" arch=('i686' 'x86_64') url="http://synce.sourceforge.net/" license=('GPL') depends=('synce-libsynce') -source=(http://downloads.sourceforge.net/synce/vdccm-$pkgver.tar.gz) -md5sums=('43bca4c2fdb658f99b07549fa03832e0') +source=(http://downloads.sourceforge.net/synce/vdccm-$pkgver.tar.gz + build-fix.patch) +md5sums=('43bca4c2fdb658f99b07549fa03832e0' + 'b90e1f8b46e70cd7f8f66f7ef041f3ac') build() { cd $srcdir/vdccm-$pkgver + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr - sed -i 's#-pedantic-errors##' Makefile.in src/Makefile.in Makefile src/Makefile - sed -i '1,1i#include ' lib/tcpsocket.cpp lib/tcpconnectedsocket.cpp lib/tcpclientsocket.cpp lib/udpsocket.cpp src/rapiclient.cpp - sed -i '1,1i#include ' lib/udpsocket.h src/rapiclient.h - sed -i '1,1i#include ' src/rapiclient.h - sed -i '1,1i#include ' src/rapiconnection.cpp - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make + make DESTDIR=$pkgdir install } diff --git a/community/synce-vdccm/build-fix.patch b/community/synce-vdccm/build-fix.patch new file mode 100644 index 000000000..f3bd32cff --- /dev/null +++ b/community/synce-vdccm/build-fix.patch @@ -0,0 +1,123 @@ +diff -wbBur vdccm-0.10.1/lib/continousnode.cpp vdccm-0.10.1.my/lib/continousnode.cpp +--- vdccm-0.10.1/lib/continousnode.cpp 2006-03-28 02:40:15.000000000 +0400 ++++ vdccm-0.10.1.my/lib/continousnode.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include + /*************************************************************************** + * Copyright (c) 2003 Volker Christian * + * * +diff -wbBur vdccm-0.10.1/lib/localclientsocket.cpp vdccm-0.10.1.my/lib/localclientsocket.cpp +--- vdccm-0.10.1/lib/localclientsocket.cpp 2006-03-22 22:59:14.000000000 +0300 ++++ vdccm-0.10.1.my/lib/localclientsocket.cpp 2011-08-03 14:09:42.000000000 +0400 +@@ -68,6 +68,7 @@ + raddr.sun_family = AF_LOCAL; + strncpy(raddr.sun_path, path.c_str(), sizeof(raddr.sun_path)); + ++#define offsetof(type, member) __builtin_offsetof (type, member) + size_t size = (offsetof (struct sockaddr_un, sun_path) + strlen(raddr.sun_path) + 1); + + if (::connect(fd, (struct sockaddr *) &raddr, size) < 0) { +diff -wbBur vdccm-0.10.1/lib/localsocket.cpp vdccm-0.10.1.my/lib/localsocket.cpp +--- vdccm-0.10.1/lib/localsocket.cpp 2006-03-28 02:40:15.000000000 +0400 ++++ vdccm-0.10.1.my/lib/localsocket.cpp 2011-08-03 14:09:16.000000000 +0400 +@@ -78,6 +78,7 @@ + localAddress.sun_family = AF_LOCAL; + strncpy(localAddress.sun_path, path.c_str(), sizeof(localAddress.sun_path)); + ++#define offsetof(type, member) __builtin_offsetof (type, member) + size_t size = (offsetof (struct sockaddr_un, sun_path) + strlen(localAddress.sun_path) + 1); + + if (::bind(getDescriptor(), (struct sockaddr *) &localAddress, size) < 0) { +diff -wbBur vdccm-0.10.1/lib/tcpclientsocket.cpp vdccm-0.10.1.my/lib/tcpclientsocket.cpp +--- vdccm-0.10.1/lib/tcpclientsocket.cpp 2006-03-22 22:59:14.000000000 +0300 ++++ vdccm-0.10.1.my/lib/tcpclientsocket.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include + /*************************************************************************** + * Copyright (c) 2003 Volker Christian * + * * +diff -wbBur vdccm-0.10.1/lib/tcpconnectedsocket.cpp vdccm-0.10.1.my/lib/tcpconnectedsocket.cpp +--- vdccm-0.10.1/lib/tcpconnectedsocket.cpp 2006-06-29 23:01:48.000000000 +0400 ++++ vdccm-0.10.1.my/lib/tcpconnectedsocket.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include + /*************************************************************************** + * Copyright (c) 2003 Volker Christian * + * * +diff -wbBur vdccm-0.10.1/lib/tcpsocket.cpp vdccm-0.10.1.my/lib/tcpsocket.cpp +--- vdccm-0.10.1/lib/tcpsocket.cpp 2006-06-29 23:01:48.000000000 +0400 ++++ vdccm-0.10.1.my/lib/tcpsocket.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include + /*************************************************************************** + * Copyright (c) 2003 Volker Christian * + * * +diff -wbBur vdccm-0.10.1/lib/udpsocket.cpp vdccm-0.10.1.my/lib/udpsocket.cpp +--- vdccm-0.10.1/lib/udpsocket.cpp 2006-05-07 19:49:36.000000000 +0400 ++++ vdccm-0.10.1.my/lib/udpsocket.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include + // + // C++ Implementation: udpsocket + // +diff -wbBur vdccm-0.10.1/lib/udpsocket.h vdccm-0.10.1.my/lib/udpsocket.h +--- vdccm-0.10.1/lib/udpsocket.h 2006-05-06 17:07:32.000000000 +0400 ++++ vdccm-0.10.1.my/lib/udpsocket.h 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include + // + // C++ Interface: udpsocket + // +diff -wbBur vdccm-0.10.1/Makefile.in vdccm-0.10.1.my/Makefile.in +--- vdccm-0.10.1/Makefile.in 2007-12-19 22:59:02.000000000 +0300 ++++ vdccm-0.10.1.my/Makefile.in 2011-08-03 14:05:21.000000000 +0400 +@@ -186,9 +186,9 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + SUBDIRS = lib src tools +-AM_CFLAGS = -O2 -Werror -pedantic-errors -Wall +-AM_CXXFLAGS = -O2 -Werror -pedantic-errors -Wall +-AM_FFLAGS = -O2 -Werror -pedantic-errors -Wall ++AM_CFLAGS = -O2 -Werror -Wall ++AM_CXXFLAGS = -O2 -Werror -Wall ++AM_FFLAGS = -O2 -Werror -Wall + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +diff -wbBur vdccm-0.10.1/src/Makefile.in vdccm-0.10.1.my/src/Makefile.in +--- vdccm-0.10.1/src/Makefile.in 2007-12-19 22:59:01.000000000 +0300 ++++ vdccm-0.10.1.my/src/Makefile.in 2011-08-03 14:05:21.000000000 +0400 +@@ -250,7 +250,7 @@ + rapiproxy.cpp rapiproxyfactory.cpp rapiproxyconnection.cpp \ + $(am__append_3) + AM_CFLAGS = -Wall +-AM_CXXFLAGS = -pedantic-errors -Wall ++AM_CXXFLAGS = -Wall + man_MANS = vdccm.1 + EXTRA_DIST = $(man_MANS) + all: $(BUILT_SOURCES) +diff -wbBur vdccm-0.10.1/src/rapiclient.cpp vdccm-0.10.1.my/src/rapiclient.cpp +--- vdccm-0.10.1/src/rapiclient.cpp 2006-05-06 17:07:32.000000000 +0400 ++++ vdccm-0.10.1.my/src/rapiclient.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include + // + // C++ Implementation: rapiclient + // +diff -wbBur vdccm-0.10.1/src/rapiclient.h vdccm-0.10.1.my/src/rapiclient.h +--- vdccm-0.10.1/src/rapiclient.h 2006-05-06 17:07:32.000000000 +0400 ++++ vdccm-0.10.1.my/src/rapiclient.h 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,5 @@ ++#include ++#include + // + // C++ Interface: rapiclient + // +diff -wbBur vdccm-0.10.1/src/rapiconnection.cpp vdccm-0.10.1.my/src/rapiconnection.cpp +--- vdccm-0.10.1/src/rapiconnection.cpp 2007-05-10 22:27:03.000000000 +0400 ++++ vdccm-0.10.1.my/src/rapiconnection.cpp 2011-08-03 14:05:21.000000000 +0400 +@@ -1,3 +1,4 @@ ++#include + // + // C++ Implementation: rapiconnection + // diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 0efa9c6d0..03f85a55d 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 49447 2011-06-16 13:09:25Z dreisner $ -# Maintainer: Dave Reisner +# $Id: PKGBUILD 53341 2011-08-03 04:06:06Z dreisner $ +# Maintainer: Dave Reisner pkgname=systemd -pkgver=29 +pkgver=33 pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') -depends=('dbus-core' 'sysvinit' 'util-linux>=2.19') -makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'libnotify') +depends=('dbus-core' 'libcap' 'util-linux>=2.19' 'udev>=172') +makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'gperf') optdepends=('cryptsetup: required for encrypted block devices' 'dbus-python: systemd-analyze' 'gtk2: systemadm' @@ -20,29 +20,42 @@ optdepends=('cryptsetup: required for encrypted block devices' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') groups=('systemd') options=('!libtool') -backup=(etc/systemd/system.conf - etc/tmpfiles.d/console.conf - usr/lib/tmpfiles.d/legacy.conf - usr/lib/tmpfiles.d/systemd.conf - usr/lib/tmpfiles.d/x11.conf) +backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + etc/dbus-1/system.d/org.freedesktop.hostname1.conf + etc/dbus-1/system.d/org.freedesktop.login1.conf + etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/systemd-logind.conf) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" "os-release") -md5sums=('e91ffd208c5f03e5c11966eee7b684b0' +md5sums=('361cad7c3debbdd81c211527509ba181' '752636def0db3c03f121f8b4f44a63cd') build() { cd "$srcdir/$pkgname-$pkgver" + # Don't unset locale in getty + # https://bugzilla.redhat.com/show_bug.cgi?id=663900 + sed -i -e '/^Environ.*LANG/s/^/#/' \ + -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 + ./configure --prefix=/usr \ - --with-rootdir= \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ + --libdir=/usr/lib \ --localstatedir=/var \ + --with-rootdir= \ + --with-rootlibdir=/lib \ --disable-audit \ --disable-tcpwrap make + + # fix .so links in manpages + sed -i 's|\.so halt\.8|.so systemd.halt.8|' man/{halt,poweroff}.8 } package() { @@ -51,7 +64,7 @@ package() { make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - printf "d /run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf" + printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" # fix systemd-analyze for python2 sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" @@ -61,5 +74,5 @@ package() { for manpage in telinit halt reboot poweroff runlevel shutdown; do mv {,systemd.}"$manpage.8" done -} +} diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install index 7ec58682a..34f902276 100644 --- a/community/systemd/systemd.install +++ b/community/systemd/systemd.install @@ -1,13 +1,21 @@ #!/bin/sh checkgroups() { - getent group lock >/dev/null || groupadd -g 54 lock + if usr/bin/getent group lock >/dev/null; then + usr/sbin/groupadd -g 54 lock + fi +} + +sd_booted() { + [ -e sys/fs/cgroups/systemd ] } post_install() { checkgroups - [ -f /etc/machine-id ] || systemd-machine-id-setup + if [ -f etc/machine-id ]; then + bin/systemd-machine-id-setup + fi echo "systemd has been installed to /bin/systemd. Please ensure you append" echo "init=/bin/systemd to your kernel command line in your bootloader." @@ -16,16 +24,28 @@ post_install() { post_upgrade() { checkgroups - [ -f /etc/machine-id ] || systemd-machine-id-setup - systemctl daemon-reexec >/dev/null || : -} + if [ -f etc/machine-id ]; then + bin/systemd-machine-id-setup + fi + + if sd_booted; then + bin/systemctl daemon-reexec >/dev/null + fi + + newpkgver=${1%-*} + oldpkgver=${2%-*} -pre_remove() { - rm -f /etc/systemd/system/default.target + # catch v31 need for restarting systemd-logind.service + if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then + # but only if systemd is running + if sd_booted; then + bin/systemctl try-restart systemd-logind.service + fi + fi } post_remove() { - getent group lock >/dev/null && groupdel lock + usr/bin/getent group lock >/dev/null && usr/sbin/groupdel lock } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 6eacc0759bca4167f2dcd67ce43bca78cb2a06ca Mon Sep 17 00:00:00 2001 From: root Date: Fri, 5 Aug 2011 23:14:36 +0000 Subject: Fri Aug 5 23:14:36 UTC 2011 --- community/john/PKGBUILD | 6 ++--- community/python2-pyopencl/PKGBUILD | 15 +++++------ community/root/PKGBUILD | 5 ++-- community/xl2tpd/PKGBUILD | 11 +++----- core/dialog/PKGBUILD | 8 +++--- core/keyutils/PKGBUILD | 16 ++++++------ extra/samba/PKGBUILD | 8 +++--- extra/usbmuxd/PKGBUILD | 11 +++++--- extra/usbmuxd/usbmuxd-udevuser.patch | 12 +++++++++ testing/dirmngr/PKGBUILD | 4 +-- testing/file/PKGBUILD | 34 ++++++++++++++++++++++++ testing/gnupg2/PKGBUILD | 30 ++++++++++++++++++++++ testing/gnupg2/gnupg2-2.0.16-security.patch | 11 ++++++++ testing/gnupg2/gnupg2.install | 20 +++++++++++++++ testing/libksba/PKGBUILD | 10 ++++---- testing/lilo/PKGBUILD | 40 +++++++++++++++++++++++++++++ testing/lilo/lilo.conf | 28 ++++++++++++++++++++ testing/lilo/lilo.install | 5 ++++ testing/xf86-input-wacom/70-wacom.rules | 12 +++++++++ testing/xf86-input-wacom/PKGBUILD | 35 +++++++++++++++++++++++++ 20 files changed, 273 insertions(+), 48 deletions(-) create mode 100644 extra/usbmuxd/usbmuxd-udevuser.patch create mode 100644 testing/file/PKGBUILD create mode 100644 testing/gnupg2/PKGBUILD create mode 100644 testing/gnupg2/gnupg2-2.0.16-security.patch create mode 100644 testing/gnupg2/gnupg2.install create mode 100644 testing/lilo/PKGBUILD create mode 100644 testing/lilo/lilo.conf create mode 100644 testing/lilo/lilo.install create mode 100644 testing/xf86-input-wacom/70-wacom.rules create mode 100644 testing/xf86-input-wacom/PKGBUILD (limited to 'community') diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index cd8f7c0b9..6c7714e33 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,8 +6,8 @@ pkgname=john pkgver=1.7.8 -pkgrel=2 -_jumbover=4 +pkgrel=3 +_jumbover=5 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)" arch=('i686' 'x86_64') url="http://www.openwall.com/$pkgname/" @@ -19,7 +19,7 @@ source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz params.h.patch) md5sums=('e6d7f261829610d6949c706ebac0517c' - '978d9e6753c2e9b6bd3be283121a0d76' + '4dc38d4539fa019301c98a7a4094d6af' 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') diff --git a/community/python2-pyopencl/PKGBUILD b/community/python2-pyopencl/PKGBUILD index 94049932f..42bb0432a 100644 --- a/community/python2-pyopencl/PKGBUILD +++ b/community/python2-pyopencl/PKGBUILD @@ -1,28 +1,25 @@ -# $Id: PKGBUILD 42723 2011-03-19 23:12:59Z stephane $ +# $Id: PKGBUILD 53500 2011-08-04 16:53:43Z stephane $ # Maintainer: Stéphane Gaudreault pkgname=python2-pyopencl -pkgver=0.92 -pkgrel=2 +pkgver=2011.1.2 +pkgrel=1 pkgdesc="A complete, object-oriented language binding of OpenCL to Python" arch=('i686' 'x86_64') url="http://mathema.tician.de/software/pyopencl" license=('custom') -depends=('python2' 'boost' 'python2-numpy' 'libcl' 'opencl-headers') +depends=('python2' 'python2-numpy' 'python-mako' 'libcl' 'opencl-headers') makedepends=('ctags' 'python2-distribute') provides=('pyopencl=${pkgver}') replaces=('pyopencl') conflicts=('pyopencl') source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz" 'LICENSE.txt') -sha1sums=('5f683638328bc452e8ae5dceaf49c6059735fbca' +sha1sums=('5ecc476b86317ed065c75c1d8efb2a53d1d8f075' '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7') build() { cd "${srcdir}/pyopencl-${pkgver}" - python2 ./configure.py --boost-inc-dir=/usr/include \ - --boost-lib-dir=/usr/lib \ - --boost-python-libname=boost_python \ - --cl-inc-dir=/usr/include \ + python2 ./configure.py --cl-inc-dir=/usr/include \ --cl-lib-dir=/usr/lib \ --cl-libname=OpenCL python2 setup.py build diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 05d858e2c..d3c7cdd11 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -3,7 +3,7 @@ pkgname=root pkgver=5.30.00 -pkgrel=3 +pkgrel=4 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') url='http://root.cern.ch' @@ -63,7 +63,8 @@ build() { --enable-roofit \ --enable-python \ --with-python-incdir=/usr/include/python2.7 \ - --with-python-libdir=/usr/lib + --with-python-libdir=/usr/lib \ + --enable-explicitlink # move from aur #--disable-builtin-afterimage \ diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index ab66948f0..c9a0ceed5 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44028 2011-04-01 16:50:43Z spupykin $ +# $Id: PKGBUILD 53519 2011-08-04 21:10:02Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Hengfu pkgname=xl2tpd -pkgver=1.2.8 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64') url="http://www.xelerance.com" @@ -17,20 +17,17 @@ source=(ftp://ftp.xelerance.com/$pkgname/$pkgname-$pkgver.tar.gz xl2tpd.conf.client-example xl2tpd.conf.server-example options.l2tpd - as-needed.patch ipparam.patch) -md5sums=('8748ac5e2f5289963d9a908eede546b5' +md5sums=('28264284552c442b24cf421755a2bb48' '1439d13084fc09c2a19c97b24a834345' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' 'ed57eb67335cdf246251285dad502cc7' - '867ec7085f61ae129748325a08561776' '4d258a58cc109d5c4d96af8f81d481cf') build() { cd "$srcdir/$pkgname-$pkgver" -# patch -p0 <$srcdir/as-needed.patch patch -p1 <$srcdir/ipparam.patch make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index b9f4f68ba..6870e3d94 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113956 2011-03-10 22:08:22Z eric $ +# $Id: PKGBUILD 133064 2011-07-27 11:49:01Z stephane $ # Maintainer: Allan McRae # Contributor: Andreas Radke pkgname=dialog -pkgver=1.1_20110302 +pkgver=1.1_20110707 pkgrel=1 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url="http://invisible-island.net/dialog/" license=('LGPL2.1') depends=('ncurses') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) -md5sums=('2eaa82055b86006e205d2c3f74d9b800') -sha1sums=('ba4e79abaf579e0d23f247ae65196437f8d8e031') +md5sums=('34d01aaacbb2932b77774e6c1eec8d2a') +sha1sums=('31e0e3c40cd51629cc802d7ee0b1a4e1ada90f00') build() { cd "${srcdir}/$pkgname-${pkgver/_/-}" diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index 8e1810f9f..ec50d99c8 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 116950 2011-03-26 15:07:29Z tpowa $ +# $Id: PKGBUILD 133067 2011-07-27 11:57:16Z stephane $ # Maintainer: Tobias Powalowski pkgname=keyutils -pkgver=1.4 +pkgver=1.5.2 pkgrel=1 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64) @@ -9,16 +9,16 @@ url="http://www.kernel.org" license=('GPL2' 'LGPL2.1') depends=('glibc' 'sh') backup=(etc/request-key.conf) -source=(http://people.redhat.com/~dhowells/$pkgname/$pkgname-$pkgver.tar.bz2) +source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('19811ee31f683058a9aae3e6a3a23a7f') build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s|/lib64|/lib|g" Makefile make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b') diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 587d14cb5..1ce37842f 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 133513 2011-07-28 20:13:17Z tpowa $ +# $Id: PKGBUILD 134504 2011-08-04 16:59:32Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgbase=samba pkgname=('smbclient' 'samba') -pkgver=3.5.10 +pkgver=3.5.11 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=3.5.10 +_realver=3.5.11 pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" @@ -129,7 +129,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('63f092b7a7a7e10121fbf79a492a5ce5' +md5sums=('81bbd16048c6ca40baea8c59126ee385' 'a3da19515a234c703876cf850c44e996' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD index a2ee4733f..1fe072642 100644 --- a/extra/usbmuxd/PKGBUILD +++ b/extra/usbmuxd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130891 2011-07-08 15:48:48Z ibiru $ +# $Id: PKGBUILD 134490 2011-08-04 15:41:22Z ibiru $ # Maintainer : Ionut Biru # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=usbmuxd pkgver=1.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="USB Multiplex Daemon" url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" arch=('i686' 'x86_64') @@ -12,11 +12,14 @@ license=('GPL2' 'GPL3' 'LGPL2.1') depends=('libusb>=1.0.8') makedepends=('cmake') install=usbmuxd.install -source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6f431541f3177fa06aa6df9ceecb2da0') +source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + usbmuxd-udevuser.patch) +md5sums=('6f431541f3177fa06aa6df9ceecb2da0' + '8526f24f4ad16cd6b2a7321c0b59592c') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch" mkdir build cd build cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX="" diff --git a/extra/usbmuxd/usbmuxd-udevuser.patch b/extra/usbmuxd/usbmuxd-udevuser.patch new file mode 100644 index 000000000..51c8f3d3a --- /dev/null +++ b/extra/usbmuxd/usbmuxd-udevuser.patch @@ -0,0 +1,12 @@ +diff -Nur usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in usbmuxd-1.0.7/udev/85-usbmuxd.rules.in +--- usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in 2011-08-04 15:28:32.751579507 +0000 ++++ usbmuxd-1.0.7/udev/85-usbmuxd.rules.in 2011-08-04 15:36:20.139265124 +0000 +@@ -1,7 +1,7 @@ + # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd) + + # Forces iDevices to the last USB configuration and runs usbmuxd +-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" ++ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" + + # Exit usbmuxd when the last device is removed + ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x" diff --git a/testing/dirmngr/PKGBUILD b/testing/dirmngr/PKGBUILD index 49f81d6f4..f2f6b60e5 100644 --- a/testing/dirmngr/PKGBUILD +++ b/testing/dirmngr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131241 2011-07-12 07:38:53Z tpowa $ +# $Id: PKGBUILD 134465 2011-08-04 06:40:27Z tpowa $ # Maintainer: Tobias Powalowski pkgname=dirmngr pkgver=1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A daemon to handle CRL and certificate requests" arch=('i686' 'x86_64') license=('GPL') diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD new file mode 100644 index 000000000..4d7b9cf95 --- /dev/null +++ b/testing/file/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 134479 2011-08-04 09:59:01Z allan $ +# Maintainer: Allan McRae +# Contributor: Andreas Radke + +pkgname=file +pkgver=5.08 +pkgrel=1 +pkgdesc="File type identification utility" +arch=('i686' 'x86_64') +license=('custom') +groups=('base') +url="http://www.darwinsys.com/file/" +depends=('glibc' 'zlib') +options=('!libtool') +source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('6a2a263c20278f01fe3bb0f720b27d4e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's#\$(datadir)/misc#\$(datadir)#' configure + + ./configure --prefix=/usr --datadir=/usr/share/file + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR=${pkgdir} install + install -dm755 ${pkgdir}/usr/share/misc + ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc + + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/testing/gnupg2/PKGBUILD b/testing/gnupg2/PKGBUILD new file mode 100644 index 000000000..d286b8504 --- /dev/null +++ b/testing/gnupg2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 134457 2011-08-04 06:36:59Z tpowa $ +# Maintainer: Tobias Powalowski +# Contributor: Andreas Radke + +pkgname=gnupg2 +pkgver=2.0.17 +pkgrel=2 +pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool" +arch=('i686' 'x86_64') +depends=('libldap' 'curl' 'bzip2' 'zlib' 'libksba' 'libgcrypt' + 'pth' 'libusb-compat' 'libassuan' 'texinfo' 'readline' 'pinentry' 'dirmngr') +license=('GPL') +url="http://www.gnupg.org/" +install=${pkgname}.install +source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2) + +build() { + cd ${srcdir}/gnupg-$pkgver + ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg2 #$EXTRAOPTS + make +} + +package() { + cd ${srcdir}/gnupg-$pkgver + make DESTDIR=${pkgdir} install + # move conflicting files + mv ${pkgdir}/usr/share/gnupg{,2} + rm -f ${pkgdir}/usr/share/info/dir +} +md5sums=('123af099740fd159c73a0352a274ec81') diff --git a/testing/gnupg2/gnupg2-2.0.16-security.patch b/testing/gnupg2/gnupg2-2.0.16-security.patch new file mode 100644 index 000000000..b265c1532 --- /dev/null +++ b/testing/gnupg2/gnupg2-2.0.16-security.patch @@ -0,0 +1,11 @@ +--- kbx/keybox-blob.c (revision 5367) ++++ kbx/keybox-blob.c (working copy) +@@ -898,6 +898,7 @@ + rc = gpg_error_from_syserror (); + goto leave; + } ++ names = tmp; + } + names[blob->nuids++] = p; + if (!i && (p=x509_email_kludge (p))) + diff --git a/testing/gnupg2/gnupg2.install b/testing/gnupg2/gnupg2.install new file mode 100644 index 000000000..27c121ffd --- /dev/null +++ b/testing/gnupg2/gnupg2.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(gnupg.info gnupg.info-1 gnupg.info-2) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/libksba/PKGBUILD b/testing/libksba/PKGBUILD index b70d1b1fd..51f23e123 100644 --- a/testing/libksba/PKGBUILD +++ b/testing/libksba/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 131238 2011-07-12 07:37:20Z tpowa $ +# $Id: PKGBUILD 134460 2011-08-04 06:38:08Z tpowa $ # Maintainer: damir # Contributor: Damir Perisa pkgname=libksba -pkgver=1.0.8 -pkgrel=2 -pkgdesc="Libksba is a CMS and X.509 access library" +pkgver=1.2.0 +pkgrel=1 +pkgdesc="A CMS and X.509 access library" arch=(i686 x86_64) license=('GPL') url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba" @@ -20,4 +20,4 @@ build() { make make DESTDIR=$startdir/pkg install } -md5sums=('8acac0b3cbd0030dfc6d0f6a58c9b5b2') +md5sums=('e797f370b69b4dc776499d6a071ae137') diff --git a/testing/lilo/PKGBUILD b/testing/lilo/PKGBUILD new file mode 100644 index 000000000..c1c2863cf --- /dev/null +++ b/testing/lilo/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 134470 2011-08-04 06:48:32Z tpowa $ +# Maintainer: Eric Belanger +# Contributor: judd + +pkgname=lilo +pkgver=23.2 +pkgrel=2 +pkgdesc="A bootloader for Linux" +arch=('i686' 'x86_64') +url="https://alioth.debian.org/projects/lilo/" +license=('BSD') +# While lilo should stay in the base category, +# it usually makes no sense if it is installed +# with pacman -S base, therefore, don't add +# the base group here. +#groups=('base') +backup=('etc/lilo.conf') +depends=('device-mapper' 'coreutils') +makedepends=('bin86' 'sharutils') +optdepends=('perl: to use keytab-lilo') +install=lilo.install +options=('!makeflags') +source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz" + 'lilo.conf') +md5sums=('51b9b9db665d3b8724919e3d46054d12' + '4ae5986fe2f6bb7e20771ac7fea5343d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export LC_ALL=C + make all +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/lilo/lilo.conf b/testing/lilo/lilo.conf new file mode 100644 index 000000000..146a2b58b --- /dev/null +++ b/testing/lilo/lilo.conf @@ -0,0 +1,28 @@ +# +# /etc/lilo.conf +# + +boot=/dev/hda +# This line often fixes L40 errors on bootup +# disk=/dev/hda bios=0x80 + +default=arch +timeout=50 +lba32 +prompt + +image=/boot/vmlinuz-linux + label=arch + root=/dev/hda3 + initrd=/boot/initramfs-vmlinuz.img + read-only + +image=/boot/vmlinuz-linux + label=arch-fallback + root=/dev/hda3 + initrd=/boot/initramfs-linux-fallback.img + read-only + +#other=/dev/hda1 +# label=dos + diff --git a/testing/lilo/lilo.install b/testing/lilo/lilo.install new file mode 100644 index 000000000..7375fddf8 --- /dev/null +++ b/testing/lilo/lilo.install @@ -0,0 +1,5 @@ +post_upgrade() { + echo + echo "If you use the LILO bootloader, you should run 'lilo' after upgrading." + echo +} diff --git a/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules new file mode 100644 index 000000000..f6aa20835 --- /dev/null +++ b/testing/xf86-input-wacom/70-wacom.rules @@ -0,0 +1,12 @@ +ACTION!="add|change", GOTO="wacom_end" + +# Match all serial wacom tablets with a serial ID starting with WACf +# Notes: We assign NAME though we shouldn't, but currently the server requires it +# We assign the lot to subsystem pnp too because server reads NAME from +# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" +# will do and the ENV{NAME} can be removed. +SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" +SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" + +LABEL="wacom_end" + diff --git a/testing/xf86-input-wacom/PKGBUILD b/testing/xf86-input-wacom/PKGBUILD new file mode 100644 index 000000000..5eee08b5b --- /dev/null +++ b/testing/xf86-input-wacom/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 134510 2011-08-04 18:20:04Z heftig $ +# Maintainer: Jan "heftig" Steffens +# Contributor: Jan de Groot +# Contributor: M Rawash + +pkgname=xf86-input-wacom +pkgver=0.11.1 +pkgrel=2 +pkgdesc="X.Org Wacom tablet driver" +arch=('i686' 'x86_64') +url="http://linuxwacom.sourceforge.net/" +license=('GPL') +backup=('etc/X11/xorg.conf.d/50-wacom.conf') +depends=('libxi' 'libxrandr') +makedepends=('xorg-server-devel' 'libxext' 'libxi') +conflicts=('xorg-server<1.10.0') +options=(!libtool) +source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + 70-wacom.rules) +md5sums=('0aec4a338cc583ed497b6af68d6d80ab' + '10db4f8272286690255c1bcc18bfdd92') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/lib/udev/rules.d" + install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/lib/udev/rules.d/" +} -- cgit v1.2.3-54-g00ecf From 7f2d7bd11daf0c654d4147cb91f9913bc587c276 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 23:14:28 +0000 Subject: Sat Aug 6 23:14:27 UTC 2011 --- community-staging/ruby-glib2/PKGBUILD | 26 ++++++++++++++++++++ community/clipgrab/PKGBUILD | 4 +-- community/curlftpfs/PKGBUILD | 11 ++++++--- community/curlftpfs/ioerror.patch | 11 +++++++++ community/mathomatic/PKGBUILD | 4 +-- community/nas/PKGBUILD | 28 ++++++++++----------- community/rawtherapee/PKGBUILD | 4 +-- core/dbus-core/PKGBUILD | 6 ++--- core/file/PKGBUILD | 17 +++++-------- core/libcap/PKGBUILD | 10 ++++---- core/pcmciautils/PKGBUILD | 19 ++++++--------- extra/cups/PKGBUILD | 8 +++--- extra/dbus/PKGBUILD | 6 ++--- extra/emacs/PKGBUILD | 30 +++++++++++------------ extra/ettercap/PKGBUILD | 46 +++++++++++++++++++++-------------- extra/krusader/PKGBUILD | 7 +++--- extra/libvpx/PKGBUILD | 11 ++++----- multilib/lib32-curl/PKGBUILD | 15 ++++++------ multilib/lib32-libssh2/PKGBUILD | 39 +++++++++++++++++++++++++++++ multilib/wine/PKGBUILD | 8 +++--- 20 files changed, 193 insertions(+), 117 deletions(-) create mode 100644 community-staging/ruby-glib2/PKGBUILD create mode 100644 community/curlftpfs/ioerror.patch create mode 100644 multilib/lib32-libssh2/PKGBUILD (limited to 'community') diff --git a/community-staging/ruby-glib2/PKGBUILD b/community-staging/ruby-glib2/PKGBUILD new file mode 100644 index 000000000..fb2a1fac3 --- /dev/null +++ b/community-staging/ruby-glib2/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 53576 2011-08-05 22:47:58Z bfanella $ +# Maintainer: Brad Fanella +# Contributor: Bjorn Lindeijer +# Contributor: kritoke + +pkgname=ruby-glib2 +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Ruby bindings for glib2." +arch=('i686' 'x86_64') +url="http://ruby-gnome2.sourceforge.jp" +license=('LGPL') +depends=('ruby') +makedepends=('ruby-pkgconfig') +source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) +md5sums=('e9711eb5bd88debda90a920deb96d7d0') + +build() { + cd "$srcdir/ruby-gtk2-$pkgver" + ruby extconf.rb glib2 --topdir=$pkgdir + make +} +package() { + cd "$srcdir/ruby-gtk2-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/clipgrab/PKGBUILD b/community/clipgrab/PKGBUILD index 724a294d4..52618ef13 100644 --- a/community/clipgrab/PKGBUILD +++ b/community/clipgrab/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: thacrazze # Maintainer: Stefan Husmann pkgname=clipgrab -pkgver=3.1.0.1 +pkgver=3.1.0.2 pkgrel=1 pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ license=('GPL') depends=('qt') optdepends=('ffmpeg: for some encodings') source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.png ${pkgname}.desktop) -md5sums=('87df4d8fdc4c1097eb78cf064561db24' +md5sums=('1250e1fb29cd88b7ce1a37d937de0146' 'ef030502ae0922e632742f47283313f4' '9a141791f6952917c441050c3dac81ce') diff --git a/community/curlftpfs/PKGBUILD b/community/curlftpfs/PKGBUILD index 7db8af17f..e0570edaf 100644 --- a/community/curlftpfs/PKGBUILD +++ b/community/curlftpfs/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 17286 2010-05-22 17:59:00Z cbrannon $ +# $Id: PKGBUILD 53536 2011-08-05 12:01:25Z cbrannon $ # Maintainer: Chris Brannon # Contributor: Allan McRae # Contributor: Philip Nilsson pkgname=curlftpfs pkgver=0.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="A filesystem for acessing FTP hosts based on FUSE and libcurl." url="http://curlftpfs.sourceforge.net/" license=('GPL') depends=('curl>=7.15.4' 'fuse' 'glib2') makedepends=('pkgconfig>=0.9.0') arch=('i686' 'x86_64') -source=(http://downloads.sourceforge.net/sourceforge/curlftpfs/$pkgname-$pkgver.tar.gz) -md5sums=('b452123f755114cd4461d56c648d9f12') +source=(http://downloads.sourceforge.net/sourceforge/curlftpfs/$pkgname-$pkgver.tar.gz + ioerror.patch) +md5sums=('b452123f755114cd4461d56c648d9f12' + '7a8db686293463ba3148c7032871c883') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 < "$srcdir/ioerror.patch" ./configure --prefix=/usr || return 1 make || return 1 } diff --git a/community/curlftpfs/ioerror.patch b/community/curlftpfs/ioerror.patch new file mode 100644 index 000000000..6ca1afb4f --- /dev/null +++ b/community/curlftpfs/ioerror.patch @@ -0,0 +1,11 @@ +--- curlftpfs-0.9.2.orig/ftpfs.c 2008-04-30 03:05:47.000000000 +0400 ++++ curlftpfs-0.9.2.orig/ftpfs.c 2011-01-20 20:33:38.000000000 +0300 +@@ -503,7 +503,7 @@ static void *ftpfs_write_thread(void *da + + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1); +- curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1); ++ curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, (curl_off_t)-1); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1); diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index f708e5d61..bc1d4a8cf 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Thorsten Töpper pkgname=mathomatic -pkgver=15.6.2 +pkgver=15.6.3 pkgrel=1 pkgdesc="General purpose Computer Algebra System written in C" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'bash: for running a test script' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('96b64d056c6ab3c72338ff7566b6b11e') +md5sums=('afe923c5164b2d8746ef8dc87b868ba0') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/nas/PKGBUILD b/community/nas/PKGBUILD index b6e3fe87b..62c62ddf0 100644 --- a/community/nas/PKGBUILD +++ b/community/nas/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 21701 2010-07-16 22:42:31Z tdziedzic $ -# Maintainer: Sergej Pupykin +# $Id: PKGBUILD 53530 2011-08-05 06:06:18Z bfanella $ +# Maintainer: Brad Fanella +# Contributor: Sergej Pupykin # Contributor: William Rea pkgname=nas -pkgver=1.9.2 -pkgrel=2 +pkgver=1.9.3 +pkgrel=1 pkgdesc='Network Audio System is a network transparent, client/server audio transport system' arch=('i686' 'x86_64') url='http://radscan.com/nas.html' @@ -13,23 +14,20 @@ depends=('libxaw') makedepends=('imake') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tar.gz" 'license.txt') -md5sums=('ed7864f55b384452167959022cfb403b' +md5sums=('ecd01a3b4e17a9d464efa83a03618025' 'f11eb8c3fb83946e66e60f7532e8d5da') build() { - cd ${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} - xmkmf - - make World + xmkmf + make World } package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} USRLIBDIR=/usr/lib install - - chmod 644 ${pkgdir}/usr/include/audio/* + cd ${pkgname}-${pkgver} - install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license + make DESTDIR=${pkgdir} USRLIBDIR=/usr/lib install + chmod 644 ${pkgdir}/usr/include/audio/* + install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license } diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index 1e1d61777..a45136361 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52439 2011-07-25 17:38:27Z stativ $ +# $Id: PKGBUILD 53541 2011-08-05 12:13:39Z stativ $ # Maintainer: Lukas Jirkovsky # Contributor: Bogdan Szczurek # Contributor: Vaclav Kramar # Contributor: Archie pkgname=rawtherapee -pkgver=3.1.1 +pkgver=4.0.0 pkgrel=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64') diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD index 360802755..50c3d0110 100644 --- a/core/dbus-core/PKGBUILD +++ b/core/dbus-core/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128605 2011-06-24 14:03:41Z ibiru $ +# $Id: PKGBUILD 134377 2011-08-03 11:19:59Z ibiru $ # Maintainer: Jan de Groot # Contributor: Link Dupont # pkgname=dbus-core -pkgver=1.4.12 +pkgver=1.4.14 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -16,7 +16,7 @@ options=(!libtool) install=dbus.install source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz dbus) -md5sums=('104f2ea94c10a896dfb1edecb5714cb1' +md5sums=('ae6de2562a57516cfabaf56903375ba9' '08f93dd19cffd1b45ab05c1fd4efb560') build() { diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index 2a5489e9d..4d7b9cf95 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131726 2011-07-14 01:54:47Z allan $ +# $Id: PKGBUILD 134479 2011-08-04 09:59:01Z allan $ # Maintainer: Allan McRae # Contributor: Andreas Radke pkgname=file -pkgver=5.07 -pkgrel=4 +pkgver=5.08 +pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64') license=('custom') @@ -12,17 +12,12 @@ groups=('base') url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') -source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.07-zip-detect.patch) -md5sums=('b8d1f9a8a644067bd0a703cebf3f4858' - 'ac155cf89af6665dfee76738c27366d8') +source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('6a2a263c20278f01fe3bb0f720b27d4e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#\$(datadir)/misc#\$(datadir)#' configure - - # combined upstream patches to fix zip file detection - patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch + sed -i 's#\$(datadir)/misc#\$(datadir)#' configure ./configure --prefix=/usr --datadir=/usr/share/file make diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD index 2d91dbbf9..6afa61fee 100644 --- a/core/libcap/PKGBUILD +++ b/core/libcap/PKGBUILD @@ -1,17 +1,17 @@ -#$Id: PKGBUILD 122049 2011-05-02 01:47:02Z allan $ +#$Id: PKGBUILD 132720 2011-07-25 12:05:15Z allan $ # Maintainer: Allan McRae # Contributor: Hugo Doria pkgname=libcap -pkgver=2.21 +pkgver=2.22 pkgrel=1 pkgdesc="POSIX 1003.1e capabilities" arch=('i686' 'x86_64') -url="http://www.kernel.org/pub/linux/libs/security/linux-privs/" -license=('GPL') +url="http://sites.google.com/site/fullycapable/" +license=('GPL2') depends=('glibc' 'attr') source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz) -md5sums=('61966ef40f2dee8731b69db895e4548d') +md5sums=('b4896816b626bea445f0b3849bdd4077') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD index 8744b8392..fee30155d 100644 --- a/core/pcmciautils/PKGBUILD +++ b/core/pcmciautils/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 113400 2011-03-08 14:24:47Z stephane $ +# $Id: PKGBUILD 134400 2011-08-03 16:55:02Z tomegun $ # Maintainer: Tobias Powalowski pkgname=pcmciautils -pkgver=017 -pkgrel=2 +pkgver=018 +pkgrel=1 pkgdesc="Utilities for inserting and removing PCMCIA cards" arch=(i686 x86_64) url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" license=('GPL') groups=('base') -depends=('glibc' 'sysfsutils' 'module-init-tools>=3.2pre9') +# 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 - 60-pcmcia.rules) +source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2) options=(!makeflags) -md5sums=('5245af28eeba57ec0606a874d44d10f7' - 'f88ac464ab9c75fe1565af551e6553a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -25,8 +23,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - # fix lspcmcia symlink - ln -sf pccardctl "${pkgdir}"/sbin/lspcmcia - # add fixed rules file - install -D -m644 "${srcdir}"/60-pcmcia.rules "${pkgdir}"/lib/udev/rules.d/ } +md5sums=('5d85669b3440baa4532363da6caaf1b4') diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 43d36c2a6..1d3b15889 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134142 2011-08-02 09:11:04Z jgc $ +# $Id: PKGBUILD 134554 2011-08-05 18:35:01Z andyrtr $ # Maintainer: Andreas Radke pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.4.7 -pkgrel=4 +pkgver=1.4.8 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" @@ -16,7 +16,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-no-gcrypt.patch cups cups.logrotate cups.pam) #options=('!emptydirs') -md5sums=('1590033ab4c739b859aeb672fe849089' +md5sums=('0ec52d3f3c69bc2ab5ed70c594edbce6' '8ebd390197501ffd709f0ee546937fd5' '9b8467a1e51d360096b70e2c3c081e6c' 'c9ede95cfc8e76571bd8156f0a573e3b' diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD index bcac66a7a..6def02fe7 100644 --- a/extra/dbus/PKGBUILD +++ b/extra/dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128609 2011-06-24 14:05:28Z ibiru $ +# $Id: PKGBUILD 134376 2011-08-03 11:19:50Z ibiru $ # Maintainer: Jan de Groot # Contributor: Link Dupont # pkgname=dbus -pkgver=1.4.12 +pkgver=1.4.14 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -12,7 +12,7 @@ license=('GPL' 'custom') depends=("dbus-core>=${pkgver}" 'libx11') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz 30-dbus) -md5sums=('104f2ea94c10a896dfb1edecb5714cb1' +md5sums=('ae6de2562a57516cfabaf56903375ba9' 'd14e59575f04e55d21a04907b6fd9f3c') build() { diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 88b2e2eb0..c411dd4fc 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 113641 2011-03-10 11:31:08Z juergen $ +# $Id: PKGBUILD 134523 2011-08-05 07:55:30Z juergen $ # Maintainer: Juergen Hoetzel # Contributor: Renchi Raju pkgname=emacs -pkgver=23.3 +pkgver=23.3a pkgrel=1 pkgdesc="The Emacs Editor" arch=(i686 x86_64) @@ -12,30 +12,30 @@ options=(docs) replaces=(cedet) depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop) -md5sums=('bf07c01ef473d8540c9c39f94506b1e6' +md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04' '8af038d2ba4561271e935bb444ceb4e3') install=emacs.install build() { - cd $startdir/src/$pkgname-$pkgver + cd $startdir/src/$pkgname-${pkgver%[a-z]} mandir=/usr/share/man - + # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904 CFLAGS="${CFLAGS} -fno-optimize-sibling-calls"\ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --mandir=${mandir} --without-sound --with-x-toolkit=gtk - make - make DESTDIR=$startdir/pkg install + make + make DESTDIR=$startdir/pkg install # remove conflict with ctags package - mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} - mv $startdir/pkg/usr/bin/{etags,etags.emacs} - mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} - mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} + mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} + mv $startdir/pkg/usr/bin/{etags,etags.emacs} + mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} + mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} # fix all the 777 perms on directories - find $startdir/pkg/usr/share/emacs/$pkgver -type d -exec chmod 755 {} \; + find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -type d -exec chmod 755 {} \; # fix user/root permissions on usr/share files - find $startdir/pkg/usr/share/emacs/$pkgver -exec chown root.root {} \; + find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -exec chown root.root {} \; # fix perms on /var/games chmod 775 ${startdir}/pkg/var/games chmod 775 ${startdir}/pkg/var/games/emacs @@ -43,8 +43,8 @@ build() { chown -R root:50 ${startdir}/pkg/var/games - # fix FS#9253 + # fix FS#9253 mkdir -p $startdir/pkg/usr/share/pixmaps ${startdir}/pkg/usr/share/applications install -D -m644 ${startdir}/src/${pkgname}.desktop ${startdir}/pkg/usr/share/applications - ln -s ../emacs/${pkgver}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png + ln -s ../emacs/${pkgver%[a-z]}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png } diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD index c247ae6a9..f24789350 100644 --- a/extra/ettercap/PKGBUILD +++ b/extra/ettercap/PKGBUILD @@ -1,36 +1,46 @@ -# $Id: PKGBUILD 75608 2010-04-01 23:02:08Z giovanni $ +# $Id: PKGBUILD 134559 2011-08-05 19:15:39Z giovanni $ +# Maintainer: # Contributor: Tom Newsom -# Maintainer: Kevin Piche pkgname=ettercap pkgver=NG_0.7.3 _origver=NG-0.7.3 -pkgrel=15 +pkgrel=16 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" arch=('i686' 'x86_64') url="http://ettercap.sourceforge.net/" license=('GPL') -depends=('ncurses' 'openssl' 'libpcap>=1.0.0' 'zlib' 'pcre' 'libtool>=2.2.4' 'libnet') -makedepends=('libnet') +depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet') +makedepends=('libnet' 'pkgconfig') options=(!libtool) -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_origver.tar.gz - 01_pointers_and_ints_dont_mix.diff) +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar.gz" + 01_pointers_and_ints_dont_mix.diff) md5sums=('28fb15cd024162c55249888fe1b97820' 'ad235cd90aaa3e168575d06efac4d862') build() { cd ${srcdir}/${pkgname}-${_origver} + unset LDFLAGS - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff || return 1 + libtoolize --force --copy + aclocal + autoconf - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-plugins \ - --enable-https --disable-gtk - make || return 1 - make DESTDIR=$pkgdir install || return 1 - cd plug-ins - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - chmod 755 ${pkgdir}/usr/lib/ettercap/* - chmod 755 ${pkgdir}/usr/bin/ettercap + patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --datarootdir=/usr/share \ + --enable-plugins \ + --enable-https \ + --disable-gtk + sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c + make +} + +package() { + cd ${srcdir}/${pkgname}-${_origver} + + make DESTDIR=${pkgdir} install } diff --git a/extra/krusader/PKGBUILD b/extra/krusader/PKGBUILD index 413724c27..566054515 100644 --- a/extra/krusader/PKGBUILD +++ b/extra/krusader/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 129545 2011-06-28 19:04:18Z andrea $ +# $Id: PKGBUILD 134530 2011-08-05 09:45:45Z andrea $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Alexander Baldeck @@ -7,7 +7,7 @@ pkgname=krusader pkgver=2.4.0beta1 _pkgver=2.4.0-beta1 -pkgrel=3 +pkgrel=4 pkgdesc="An alternative file manager for KDE resembling Midnight Commander" arch=('i686' 'x86_64') url="http://krusader.sourceforge.net/" @@ -15,8 +15,9 @@ license=('GPL') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4' 'docbook-xsl' 'kdeutils-ark') optdepends=("kdebase-keditbookmarks: to edit bookmarks" + "kdebase-kwrite: to edit/view files" "kdeutils-ark: extract archive with right-click") -install=krusader.install +install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2") md5sums=('d2340718d05d69e7f2a7f0846471ee12') diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD index cbe82e07f..573747f4c 100644 --- a/extra/libvpx/PKGBUILD +++ b/extra/libvpx/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 113551 2011-03-09 12:18:46Z ibiru $ +# $Id: PKGBUILD 134545 2011-08-05 13:19:02Z ibiru $ # Maintainer: Ionut Biru pkgname=libvpx -pkgver=0.9.6 -pkgrel=2 +pkgver=0.9.7 +pkgrel=1 pkgdesc="The VP8 Codec SDK" arch=('i686' 'x86_64') url="http://www.webmproject.org/" @@ -10,11 +10,11 @@ license=('BSD') depends=('glibc') makedepends=('yasm') source=(http://webm.googlecode.com/files/${pkgname}-v${pkgver}.tar.bz2) -sha1sums=('a3522bd2b73d52381ba767ded1cbf4760e9cc6f8') +sha1sums=('639596df7182a93db83f61af8f5bb5b6a13dcf63') build() { cd "${srcdir}/${pkgname}-v${pkgver}" - ./configure --enable-vp8 \ + ./configure --prefix=/usr --enable-vp8 \ --enable-runtime-cpu-detect \ --enable-shared \ --enable-postproc \ @@ -28,5 +28,4 @@ package() { cd "${srcdir}/${pkgname}-v${pkgver}" make DIST_DIR="$pkgdir/usr" install install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" - chmod 644 "$pkgdir"/usr/include/vpx/*.h } diff --git a/multilib/lib32-curl/PKGBUILD b/multilib/lib32-curl/PKGBUILD index 48ab2a1b7..e082dac0f 100755 --- a/multilib/lib32-curl/PKGBUILD +++ b/multilib/lib32-curl/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 36008 2010-12-25 14:36:29Z ibiru $ +# $Id: PKGBUILD 53559 2011-08-05 17:14:56Z bluewind $ # Maintainer: Florian Pritz _pkgbasename=curl pkgname=lib32-$_pkgbasename -pkgver=7.21.3 +pkgver=7.21.7 pkgrel=1 pkgdesc="An URL retrieval utility and library (32-bit)" arch=('x86_64') url="http://curl.haxx.se" license=('MIT') -depends=('lib32-zlib' 'lib32-openssl' 'bash' 'ca-certificates' $_pkgbasename) +depends=('lib32-zlib' 'lib32-openssl' 'bash' 'ca-certificates' 'lib32-libssh2' $_pkgbasename) makedepends=(gcc-multilib) options=('!libtool') source=("http://curl.haxx.se/download/${_pkgbasename}-${pkgver}.tar.bz2") -md5sums=('5b57fee22090b5c43a6886fdd35af2ce') +md5sums=('5f6d50c4d4ee38c57fe37e3cff75adbd') build() { @@ -31,11 +31,12 @@ build() { --enable-ipv6 \ --disable-ldaps \ --disable-ldap \ - --enable-manual \ + --disable-manual \ --enable-versioned-symbols \ - --with-ca-path=/etc/ssl/certs \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ --without-libidn \ - --libdir=/usr/lib32 + --libdir=/usr/lib32 \ + --enable-threaded-resolver make } diff --git a/multilib/lib32-libssh2/PKGBUILD b/multilib/lib32-libssh2/PKGBUILD new file mode 100644 index 000000000..963693b7b --- /dev/null +++ b/multilib/lib32-libssh2/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Florian Pritz +# $Id: PKGBUILD 53557 2011-08-05 17:14:21Z bluewind $ +# Contributor: Angel Velasquez +# Contributor: Sergej Pupykin +# Contributor: Andrea Scarpino +# Contributor: ice-man + +_pkgbasename=libssh2 +pkgname=lib32-$_pkgbasename +pkgver=1.2.7 +pkgrel=2 +pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts (32-bit)" +url="http://www.libssh2.org/" +arch=('i686' 'x86_64') +license=('BSD') +depends=('openssl' $_pkgbasename) +makedepends=('zlib' "gcc-multilib") +options=('!libtool') +source=("http://www.libssh2.org/download/${_pkgbasename}-${pkgver}.tar.gz") +md5sums=('a5d78344886f1282e4008c09bf568076') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd ${srcdir}/${_pkgbasename}-${pkgver} + ./configure --prefix=/usr --libdir=/usr/lib32 + make +} + +package() { + cd ${srcdir}/${_pkgbasename}-${pkgver} + make DESTDIR=${pkgdir} install + + rm -rf "${pkgdir}"/usr/{include,share,bin,sbin} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 735e35d1c..0c98b6962 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 52371 2011-07-23 22:28:40Z svenstaro $ +# $Id: PKGBUILD 53566 2011-08-05 19:08:11Z bluewind $ # Maintainer: Sven-Hendrik Haase # Contributor: Jan "heftig" Steffens # Contributor: Eduardo Romero # Contributor: Giovanni Scafora pkgname=wine -pkgver=1.3.25 +pkgver=1.3.26 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('15471f78fee9d211c63381da815cbfb6') +md5sums=('92ea09eb11aec92672671853ce9b792b') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -46,7 +46,6 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink lcms lib32-lcms mpg123 lib32-mpg123 openal lib32-openal - jack lib32-jack libcups lib32-libcups gnutls lib32-gnutls v4l-utils lib32-v4l-utils @@ -61,7 +60,6 @@ optdepends=( libxml2 lib32-libxml2 mpg123 lib32-mpg123 openal lib32-openal - jack lib32-jack libcups lib32-libcups gnutls lib32-gnutls v4l-utils lib32-v4l-utils -- cgit v1.2.3-54-g00ecf From 0f9e4ba23bb6296d8bb8010f70d868fd08db9c54 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 7 Aug 2011 23:14:33 +0000 Subject: Sun Aug 7 23:14:33 UTC 2011 --- community-staging/ruby-atk/PKGBUILD | 26 +++ community-staging/ruby-gdkpixbuf2/PKGBUILD | 27 +++ community-staging/ruby-gio2/PKGBUILD | 24 +++ community-staging/ruby-pango/PKGBUILD | 26 +++ community/calibre/PKGBUILD | 6 +- community/clanlib/PKGBUILD | 8 +- community/cython/PKGBUILD | 6 +- community/fotoxx/PKGBUILD | 4 +- community/go/PKGBUILD | 10 +- community/mygui/PKGBUILD | 21 +- community/root/PKGBUILD | 5 +- core/libsasl/0003_saslauthd_mdoc.patch | 35 ++++ core/libsasl/0010_maintainer_mode.patch | 19 ++ core/libsasl/0011_saslauthd_ac_prog_libtool.patch | 15 ++ core/libsasl/0012_xopen_crypt_prototype.patch | 20 ++ .../libsasl/0016_pid_file_lock_creation_mask.patch | 27 +++ core/libsasl/0018_auth_rimap_quotes.patch | 35 ++++ core/libsasl/0019_ldap_deprecated.patch | 22 +++ core/libsasl/0022_gcc4.4_preprocessor_syntax.patch | 26 +++ core/libsasl/0025_ld_as_needed.patch | 27 +++ .../libsasl/0026_drop_krb5support_dependency.patch | 14 ++ core/libsasl/0027_db5_support.patch | 24 +++ ...030-dont_use_la_files_for_opening_plugins.patch | 134 +++++++++++++ core/libsasl/PKGBUILD | 208 +++++++++++++++++--- core/libsasl/cyrus-sasl-2.1.22-as-needed.patch | 11 ++ core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch | 94 +++++++++ core/libsasl/cyrus-sasl-2.1.22-crypt.patch | 71 +++++++ core/libsasl/cyrus-sasl-2.1.22-qa.patch | 22 +++ core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch | 28 +++ core/libsasl/saslauthd | 49 +++++ core/libsasl/saslauthd.conf.d | 1 + extra/cyrus-sasl/0003_saslauthd_mdoc.patch | 35 ++++ extra/cyrus-sasl/0010_maintainer_mode.patch | 19 ++ .../0011_saslauthd_ac_prog_libtool.patch | 15 ++ extra/cyrus-sasl/0012_xopen_crypt_prototype.patch | 20 ++ .../0016_pid_file_lock_creation_mask.patch | 27 +++ extra/cyrus-sasl/0018_auth_rimap_quotes.patch | 35 ++++ extra/cyrus-sasl/0019_ldap_deprecated.patch | 22 +++ .../0022_gcc4.4_preprocessor_syntax.patch | 26 +++ extra/cyrus-sasl/0025_ld_as_needed.patch | 27 +++ .../0026_drop_krb5support_dependency.patch | 14 ++ extra/cyrus-sasl/0027_db5_support.patch | 24 +++ ...030-dont_use_la_files_for_opening_plugins.patch | 134 +++++++++++++ extra/cyrus-sasl/PKGBUILD | 218 +++++++++++++++++---- extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch | 170 ++++++++++++++++ extra/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch | 11 ++ .../cyrus-sasl-2.1.22-automake-1.10.patch | 94 +++++++++ extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch | 71 +++++++ extra/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch | 22 +++ extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch | 28 +++ extra/cyrus-sasl/saslauthd | 21 +- extra/cyrus-sasl/saslauthd.conf.d | 2 +- extra/ettercap/PKGBUILD | 13 +- .../ettercap-NG-0.7.3_dns_support_on_x86_64.patch | 39 ++++ extra/fluidsynth/PKGBUILD | 18 +- extra/fvwm/PKGBUILD | 10 +- extra/libreoffice/PKGBUILD | 24 ++- extra/raptor/PKGBUILD | 25 +-- extra/redland/PKGBUILD | 12 +- extra/soprano/PKGBUILD | 11 +- extra/taglib/PKGBUILD | 21 +- extra/taglib/ape-idev2.patch | 12 ++ extra/wxgtk/PKGBUILD | 19 +- extra/wxpython/PKGBUILD | 10 +- 64 files changed, 2120 insertions(+), 174 deletions(-) create mode 100644 community-staging/ruby-atk/PKGBUILD create mode 100644 community-staging/ruby-gdkpixbuf2/PKGBUILD create mode 100644 community-staging/ruby-gio2/PKGBUILD create mode 100644 community-staging/ruby-pango/PKGBUILD create mode 100644 core/libsasl/0003_saslauthd_mdoc.patch create mode 100644 core/libsasl/0010_maintainer_mode.patch create mode 100644 core/libsasl/0011_saslauthd_ac_prog_libtool.patch create mode 100644 core/libsasl/0012_xopen_crypt_prototype.patch create mode 100644 core/libsasl/0016_pid_file_lock_creation_mask.patch create mode 100644 core/libsasl/0018_auth_rimap_quotes.patch create mode 100644 core/libsasl/0019_ldap_deprecated.patch create mode 100644 core/libsasl/0022_gcc4.4_preprocessor_syntax.patch create mode 100644 core/libsasl/0025_ld_as_needed.patch create mode 100644 core/libsasl/0026_drop_krb5support_dependency.patch create mode 100644 core/libsasl/0027_db5_support.patch create mode 100644 core/libsasl/0030-dont_use_la_files_for_opening_plugins.patch create mode 100644 core/libsasl/cyrus-sasl-2.1.22-as-needed.patch create mode 100644 core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch create mode 100644 core/libsasl/cyrus-sasl-2.1.22-crypt.patch create mode 100644 core/libsasl/cyrus-sasl-2.1.22-qa.patch create mode 100644 core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch create mode 100644 core/libsasl/saslauthd create mode 100644 core/libsasl/saslauthd.conf.d create mode 100644 extra/cyrus-sasl/0003_saslauthd_mdoc.patch create mode 100644 extra/cyrus-sasl/0010_maintainer_mode.patch create mode 100644 extra/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch create mode 100644 extra/cyrus-sasl/0012_xopen_crypt_prototype.patch create mode 100644 extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch create mode 100644 extra/cyrus-sasl/0018_auth_rimap_quotes.patch create mode 100644 extra/cyrus-sasl/0019_ldap_deprecated.patch create mode 100644 extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch create mode 100644 extra/cyrus-sasl/0025_ld_as_needed.patch create mode 100644 extra/cyrus-sasl/0026_drop_krb5support_dependency.patch create mode 100644 extra/cyrus-sasl/0027_db5_support.patch create mode 100644 extra/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch create mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch create mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch create mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch create mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch create mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch create mode 100644 extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch create mode 100644 extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch create mode 100644 extra/taglib/ape-idev2.patch (limited to 'community') diff --git a/community-staging/ruby-atk/PKGBUILD b/community-staging/ruby-atk/PKGBUILD new file mode 100644 index 000000000..2787f8556 --- /dev/null +++ b/community-staging/ruby-atk/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 53612 2011-08-07 01:11:19Z bfanella $ +# Maintainer: Brad Fanella +# Contributor: Bjorn Lindeijer +# Contributor: kritoke + +pkgname=ruby-atk +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Ruby bindings for atk." +arch=('i686' 'x86_64') +url="http://ruby-gnome2.sourceforge.jp" +license=('LGPL') +depends=('ruby-glib2') +makedepends=('ruby-glib2' 'atk' 'ruby-pkgconfig') +source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) +md5sums=('e9711eb5bd88debda90a920deb96d7d0') + +build() { + cd "$srcdir/ruby-gtk2-$pkgver" + ruby extconf.rb atk --topdir=$pkgdir + make +} +package() { + cd "$srcdir/ruby-gtk2-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/ruby-gdkpixbuf2/PKGBUILD b/community-staging/ruby-gdkpixbuf2/PKGBUILD new file mode 100644 index 000000000..7298e2339 --- /dev/null +++ b/community-staging/ruby-gdkpixbuf2/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 53620 2011-08-07 02:18:34Z bfanella $ +# Maintainer: Brad Fanella +# Contributor: Bjorn Lindeijer +# Contributor: kritoke + +pkgname=ruby-gdkpixbuf2 +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Ruby bindings for gdkpixbuf2." +arch=('i686' 'x86_64') +url="http://ruby-gnome2.sourceforge.jp" +license=('LGPL') +depends=('ruby-glib2' 'gtk2') +makedepends=('ruby-glib2' 'ruby-pkgconfig') +source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) +md5sums=('e9711eb5bd88debda90a920deb96d7d0') + +build() { + cd "$srcdir/ruby-gtk2-$pkgver" + ruby extconf.rb gdk_pixbuf2 --topdir=$pkgdir + make +} +package() { + cd "$srcdir/ruby-gtk2-$pkgver" + mkdir -p $pkgdir/usr/lib/pkgconfig + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/ruby-gio2/PKGBUILD b/community-staging/ruby-gio2/PKGBUILD new file mode 100644 index 000000000..297f60085 --- /dev/null +++ b/community-staging/ruby-gio2/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 31087 2010-10-27 01:37:14Z bfanella $ +# Maintainer: Brad Fanella + +pkgname=ruby-gio2 +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Ruby bindings for gio2." +arch=('i686' 'x86_64') +url="http://ruby-gnome2.sourceforge.jp" +license=('LGPL') +depends=('ruby-glib2') +makedepends=('ruby-pkgconfig') +source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) +md5sums=('e9711eb5bd88debda90a920deb96d7d0') + +build() { + cd "$srcdir/ruby-gtk2-$pkgver" + ruby extconf.rb gio2 --topdir=$pkgdir + make +} +package() { + cd "$srcdir/ruby-gtk2-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/ruby-pango/PKGBUILD b/community-staging/ruby-pango/PKGBUILD new file mode 100644 index 000000000..1f20c7a3d --- /dev/null +++ b/community-staging/ruby-pango/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 53626 2011-08-07 02:29:56Z bfanella $ +# Maintainer: Brad Fanella +# Contributor: Bjorn Lindeijer +# Contributor: kritoke + +pkgname=ruby-pango +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Ruby bindings for pango." +arch=('i686' 'x86_64') +url="http://ruby-gnome2.sourceforge.jp" +license=('LGPL') +depends=('ruby-glib2' 'ruby-cairo') +makedepends=('ruby-glib2' 'pango' 'ruby-pkgconfig' 'ruby-cairo') +source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) +md5sums=('e9711eb5bd88debda90a920deb96d7d0') + +build() { + cd "$srcdir/ruby-gtk2-$pkgver" + ruby extconf.rb pango --topdir=$pkgdir + make +} +package() { + cd "$srcdir/ruby-gtk2-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 5b904acd8..5190d90c6 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52910 2011-07-29 19:53:49Z giovanni $ +# $Id: PKGBUILD 53589 2011-08-06 08:10:57Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre -pkgver=0.8.12 +pkgver=0.8.13 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('03060d381cc3090fc42d5a646f926afe' +md5sums=('5612e030dce1cd5e46762d0dcaed00b0' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index 5d319f36f..1738cdeee 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 52518 2011-07-26 00:31:17Z svenstaro $ +# $Id: PKGBUILD 53615 2011-08-07 02:05:15Z svenstaro $ # Maintainer: Sven-Hendrik Haase pkgname=clanlib -pkgver=2.2.10 +pkgver=2.3.1 pkgrel=1 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64') url="http://clanlib.org/" license=('zlib') -depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2') +depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'mesa' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite3') makedepends=('doxygen' 'graphviz') options=('!libtool') source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) -md5sums=('61b7200ba8b895fc480850f4721dbc14') +md5sums=('af9f16543fa3da43f49b4a52634d2e82') build() { cd ${srcdir}/ClanLib-${pkgver} diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index 84cb89e10..b1ac9e391 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 39526 2011-02-11 12:10:41Z spupykin $ +# $Id: PKGBUILD 53594 2011-08-06 09:09:34Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Igor Scabini pkgname=cython -pkgver=0.14.1 +pkgver=0.15 pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64) @@ -11,7 +11,7 @@ url="http://www.cython.org" license=('APACHE') depends=('python2') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('6341bf3b2c49a39b8046219f6696f5c4') +md5sums=('794b93c4c1c4cc031f90302cacd834ca') build() { cd $srcdir/Cython-$pkgver diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD index 3dde2b70e..116ebfe93 100644 --- a/community/fotoxx/PKGBUILD +++ b/community/fotoxx/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Stefan Husmann pkgname=fotoxx -pkgver=11.08 +pkgver=11.08.1 pkgrel=1 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/fotoxx" @@ -9,8 +9,8 @@ license=('GPL3') depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils') optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('928368cfa250f6aab60c9a92aa27fefa') install=fotoxx.install +md5sums=('95aab93caf87dc24e5e6dd9abef2bc73') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 844e2fd2c..6221c2218 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Christian Himpel pkgname=go -pkgver=r58 +pkgver=r59 pkgrel=1 epoch=1 pkgdesc='Google Go compiler and tools (release version)' @@ -53,6 +53,14 @@ build() { . ./make.bash } +check() { + export GOROOT="$srcdir/$_hgrepo-build" + export GOOS=linux + export GOBIN="$GOROOT/bin" + cd "$GOROOT/src/pkg" + gomake -k test || true +} + package() { cd "$srcdir/release-build" diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD index a95e65ca1..d9c89d9b7 100644 --- a/community/mygui/PKGBUILD +++ b/community/mygui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46788 2011-05-11 17:19:25Z svenstaro $ +# $Id: PKGBUILD 53635 2011-08-07 03:07:13Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Andrew Belitsky pkgbase=mygui pkgname=('mygui' 'mygui-docs') -pkgver=3.0.1 +pkgver=3.2.0rc1 pkgrel=7 pkgdesc="A multilayer and overlappable GUI System for OGRE" arch=('i686' 'x86_64') @@ -12,11 +12,11 @@ license=('LGPL') depends=('boost-libs' 'ogre' 'ois') makedepends=('boost' 'cmake' 'doxygen' 'graphviz') install=mygui.install -source=("http://downloads.sourceforge.net/project/my-gui/MyGUI/MyGUI_3.0.1/MyGUI_3.0.1_source.zip") -md5sums=('e9e82bf60081be58fea3f64d32e2ab3a') +source=("http://downloads.sourceforge.net/my-gui/MyGUI_3.2.0_RC1.zip") +md5sums=('1ac1340148e81ad49a26c8a87acefc6b') build() { - cd $srcdir/MyGUI3.0 + cd $srcdir/MyGUI_3.2.0_RC1 # change CMake config so demos install to /opt sed -i 's:"bin:"../opt/MYGUI:' CMake/Utils/MyGUIConfigTargets.cmake @@ -26,8 +26,7 @@ build() { # get a clean build dir [[ -d build ]] && rm -rf build - mkdir build - cd build + mkdir build && cd build # generate CMake Makefile cmake .. \ @@ -50,7 +49,9 @@ build() { package_mygui() { optdepends=('mygui-docs: documentation') - cd $srcdir/MyGUI3.0/build + cd $srcdir/MyGUI_3.2.0_RC1 + + cd build # install the whole bunch make DESTDIR="$pkgdir" install @@ -64,7 +65,9 @@ package_mygui-docs() { pkgdesc="Documentation for mygui" depends=() - cd $srcdir/MyGUI3.0 + cd $srcdir/MyGUI_3.2.0_RC1 + + cd build # install docs install -d $pkgdir/usr/share/doc/ diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index d3c7cdd11..4441cb5dc 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -3,7 +3,7 @@ pkgname=root pkgver=5.30.00 -pkgrel=4 +pkgrel=5 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') url='http://root.cern.ch' @@ -46,6 +46,9 @@ build() { sed \ -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \ -i cint/reflex/python/genreflex/Makefile.am + sed \ + -e 's/python /python2 /' \ + -i config/genreflex.in config/genreflex-rootcint.in ./configure \ ${TARGET} \ diff --git a/core/libsasl/0003_saslauthd_mdoc.patch b/core/libsasl/0003_saslauthd_mdoc.patch new file mode 100644 index 000000000..694f4bb67 --- /dev/null +++ b/core/libsasl/0003_saslauthd_mdoc.patch @@ -0,0 +1,35 @@ +0003_saslauthd_mdoc.dpatch by + +Use the correct path for the saslauthd.conf file, and use another +date format (cosmetic). + +diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc +--- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 +@@ -10,7 +10,7 @@ + .\" manpage in saslauthd.8 whenever you change this source + .\" version. Only the pre-formatted manpage is installed. + .\" +-.Dd 10 24 2002 ++.Dd October 24 2002 + .Dt SASLAUTHD 8 + .Os "CMU-SASL" + .Sh NAME +@@ -216,7 +216,7 @@ + .Em (All platforms that support OpenLDAP 2.0 or higher) + .Pp + Authenticate against an ldap server. The ldap configuration parameters are +-read from /usr/local/etc/saslauthd.conf. The location of this file can be ++read from /etc/saslauthd.conf. The location of this file can be + changed with the -O parameter. See the LDAP_SASLAUTHD file included with the + distribution for the list of available parameters. + .It Li sia +@@ -249,7 +249,7 @@ + .Bl -tag -width "/var/run/saslauthd/mux" + .It Pa /var/run/saslauthd/mux + The default communications socket. +-.It Pa /usr/local/etc/saslauthd.conf ++.It Pa /etc/saslauthd.conf + The default configuration file for ldap support. + .El + .Sh SEE ALSO diff --git a/core/libsasl/0010_maintainer_mode.patch b/core/libsasl/0010_maintainer_mode.patch new file mode 100644 index 000000000..cf3d02a08 --- /dev/null +++ b/core/libsasl/0010_maintainer_mode.patch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0010_maintainer_mode.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable maintainer mode to avoid auto* problems. + +@DPATCH@ +diff -urNad trunk~/configure.in trunk/configure.in +--- trunk~/configure.in 2006-05-29 22:52:46.000000000 +0300 ++++ trunk/configure.in 2006-11-01 23:24:55.000000000 +0200 +@@ -62,6 +62,8 @@ + AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22) + CMU_INIT_AUTOMAKE + ++AM_MAINTAINER_MODE ++ + # and include our config dir scripts + ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config" + diff --git a/core/libsasl/0011_saslauthd_ac_prog_libtool.patch b/core/libsasl/0011_saslauthd_ac_prog_libtool.patch new file mode 100644 index 000000000..3805b4857 --- /dev/null +++ b/core/libsasl/0011_saslauthd_ac_prog_libtool.patch @@ -0,0 +1,15 @@ +0011_saslauthd_ac_prog_libtool.dpatch by + +Enable libtool use. + +diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in +--- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/configure.in 2006-11-01 23:41:51.000000000 +0200 +@@ -25,6 +25,7 @@ + AC_PROG_MAKE_SET + AC_PROG_LN_S + AC_PROG_INSTALL ++AC_PROG_LIBTOOL + + dnl Checks for build foo + CMU_C___ATTRIBUTE__ diff --git a/core/libsasl/0012_xopen_crypt_prototype.patch b/core/libsasl/0012_xopen_crypt_prototype.patch new file mode 100644 index 000000000..d50ec8343 --- /dev/null +++ b/core/libsasl/0012_xopen_crypt_prototype.patch @@ -0,0 +1,20 @@ +0012_xopen_crypt_prototype.dpatch by + +When _XOPEN_SOURCE is defined, the subsequent #include +will define a correct function prototype for the crypt function. +This avoids segfaults on architectures where the size of a pointer +is greater than the size of an integer (ia64 and amd64 are examples). +This may be detected by looking for build log lines such as the +following: +auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ +auth_shadow.c:183: warning: cast to pointer from integer of different +size + +diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c +--- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 +@@ -1,3 +1,4 @@ ++#define _XOPEN_SOURCE + #define PWBUFSZ 256 /***SWB***/ + + /* MODULE: auth_shadow */ diff --git a/core/libsasl/0016_pid_file_lock_creation_mask.patch b/core/libsasl/0016_pid_file_lock_creation_mask.patch new file mode 100644 index 000000000..e9170cef3 --- /dev/null +++ b/core/libsasl/0016_pid_file_lock_creation_mask.patch @@ -0,0 +1,27 @@ +0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar + +pid_file_lock is created with a mask of 644 instead of 0644. +This patch fixes this octal/decimal confusion as well as the +(harmless) one in the previous umask() call. + +diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c +--- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 +@@ -276,7 +276,7 @@ + exit(1); + } + +- umask(077); ++ umask(0077); + + pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; + if ((pid_file_lock = malloc(pid_file_size)) == NULL) { +@@ -287,7 +287,7 @@ + strlcpy(pid_file_lock, run_path, pid_file_size); + strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); + +- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { ++ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { + rc = errno; + logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); + logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/core/libsasl/0018_auth_rimap_quotes.patch b/core/libsasl/0018_auth_rimap_quotes.patch new file mode 100644 index 000000000..13fa999f0 --- /dev/null +++ b/core/libsasl/0018_auth_rimap_quotes.patch @@ -0,0 +1,35 @@ +0016_auth_rimap_quotes.dpatch by + +All lines beginning with `## DP:' are a description of the patch. +Avoid infinite loop when username/password has a double quote character. +Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 + +diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c +--- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 ++++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 +@@ -162,6 +162,7 @@ + num_quotes = 0; + p1 = s; + while ((p1 = strchr(p1, '"')) != NULL) { ++ p1++; + num_quotes++; + } + +@@ -438,7 +439,7 @@ + syslog(LOG_WARNING, "auth_rimap: writev: %m"); + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + (void)close(s); + return strdup(RESP_IERROR); +@@ -447,7 +448,7 @@ + /* don't need these any longer */ + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + + /* read and parse the LOGIN response */ diff --git a/core/libsasl/0019_ldap_deprecated.patch b/core/libsasl/0019_ldap_deprecated.patch new file mode 100644 index 000000000..8825256cb --- /dev/null +++ b/core/libsasl/0019_ldap_deprecated.patch @@ -0,0 +1,22 @@ +0019_ldap_deprecated.dpatch by dann frazier + +The function ldap_get_values, used in saslauthd/lak.c, is deprecated. +Therefore, its prototype is not included by default when compiling +against the ldap.h headers. As a result, the compiler cannot know the +return type of the function at compile time, and will implicitly +convert to a pointer. This has implications on 64-bit systems. +This patch sets the deprecation mode on, so that the function prototype +gets included when compiling. +(Description by Fabian Fagerholm ) + +diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c +--- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 ++++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 +@@ -55,6 +55,7 @@ + #include + #endif + ++#define LDAP_DEPRECATED 1 + #include + #include + #include diff --git a/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch b/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch new file mode 100644 index 000000000..a49b553f0 --- /dev/null +++ b/core/libsasl/0022_gcc4.4_preprocessor_syntax.patch @@ -0,0 +1,26 @@ +0022_gcc4.4_preprocessor_syntax.dpatch by + +The #elif preprocessor directive requires a test condition. +GCC 4.4 enforces this rule. + +diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c +--- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 ++++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 +@@ -2715,7 +2715,7 @@ + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, diff --git a/core/libsasl/0025_ld_as_needed.patch b/core/libsasl/0025_ld_as_needed.patch new file mode 100644 index 000000000..67b48b4a4 --- /dev/null +++ b/core/libsasl/0025_ld_as_needed.patch @@ -0,0 +1,27 @@ +Author: Matthias Klose +Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use +it. +--- a/saslauthd/Makefile.am ++++ b/saslauthd/Makefile.am +@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c + saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ + saslauthd_LDADD = @SASL_KRB_LIB@ \ + @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ +- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ ++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ + + testsaslauthd_SOURCES = testsaslauthd.c utils.c + testsaslauthd_LDADD = @LIB_SOCKET@ +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) +-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) ++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) + + # Prevent make dist stupidity + libsasldb_a_SOURCES = diff --git a/core/libsasl/0026_drop_krb5support_dependency.patch b/core/libsasl/0026_drop_krb5support_dependency.patch new file mode 100644 index 000000000..cc00867ef --- /dev/null +++ b/core/libsasl/0026_drop_krb5support_dependency.patch @@ -0,0 +1,14 @@ +Author: Roberto C. Sanchez +Description: Drop gratuitous dependency on krb5support +--- a/cmulocal/sasl2.m4 ++++ b/cmulocal/sasl2.m4 +@@ -112,9 +112,6 @@ if test "$gssapi" != no; then + fi + + if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then +- # check for libkrb5support first +- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) +- + gss_failed=0 + AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, + ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) diff --git a/core/libsasl/0027_db5_support.patch b/core/libsasl/0027_db5_support.patch new file mode 100644 index 000000000..522824074 --- /dev/null +++ b/core/libsasl/0027_db5_support.patch @@ -0,0 +1,24 @@ +Author: Ondřej Surý +Description: Support newer Berkeley DB versions +--- a/sasldb/db_berkeley.c ++++ b/sasldb/db_berkeley.c +@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); +--- a/utils/dbconverter-2.c ++++ b/utils/dbconverter-2.c +@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/core/libsasl/0030-dont_use_la_files_for_opening_plugins.patch b/core/libsasl/0030-dont_use_la_files_for_opening_plugins.patch new file mode 100644 index 000000000..14a322496 --- /dev/null +++ b/core/libsasl/0030-dont_use_la_files_for_opening_plugins.patch @@ -0,0 +1,134 @@ +--- a/lib/dlopen.c ++++ b/lib/dlopen.c +@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi + return result; + } + +-/* this returns the file to actually open. +- * out should be a buffer of size PATH_MAX +- * and may be the same as in. */ +- +-/* We'll use a static buffer for speed unless someone complains */ +-#define MAX_LINE 2048 +- +-static int _parse_la(const char *prefix, const char *in, char *out) +-{ +- FILE *file; +- size_t length; +- char line[MAX_LINE]; +- char *ntmp = NULL; +- +- if(!in || !out || !prefix || out == in) return SASL_BADPARAM; +- +- /* Set this so we can detect failure */ +- *out = '\0'; +- +- length = strlen(in); +- +- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) { +- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) { +- /* check for a .la file */ +- strcpy(line, prefix); +- strcat(line, in); +- length = strlen(line); +- *(line + (length - strlen(SO_SUFFIX))) = '\0'; +- strcat(line, LA_SUFFIX); +- file = fopen(line, "r"); +- if(file) { +- /* We'll get it on the .la open */ +- fclose(file); +- return SASL_FAIL; +- } +- } +- strcpy(out, prefix); +- strcat(out, in); +- return SASL_OK; +- } +- +- strcpy(line, prefix); +- strcat(line, in); +- +- file = fopen(line, "r"); +- if(!file) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "unable to open LA file: %s", line); +- return SASL_FAIL; +- } +- +- while(!feof(file)) { +- if(!fgets(line, MAX_LINE, file)) break; +- if(line[strlen(line) - 1] != '\n') { +- _sasl_log(NULL, SASL_LOG_WARN, +- "LA file has too long of a line: %s", in); +- return SASL_BUFOVER; +- } +- if(line[0] == '\n' || line[0] == '#') continue; +- if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) { +- /* We found the line with the name in it */ +- char *end; +- char *start; +- size_t len; +- end = strrchr(line, '\''); +- if(!end) continue; +- start = &line[sizeof("dlname=")-1]; +- len = strlen(start); +- if(len > 3 && start[0] == '\'') { +- ntmp=&start[1]; +- *end='\0'; +- /* Do we have dlname="" ? */ +- if(ntmp == end) { +- _sasl_log(NULL, SASL_LOG_DEBUG, +- "dlname is empty in .la file: %s", in); +- return SASL_FAIL; +- } +- strcpy(out, prefix); +- strcat(out, ntmp); +- } +- break; +- } +- } +- if(ferror(file) || feof(file)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Error reading .la: %s\n", in); +- fclose(file); +- return SASL_FAIL; +- } +- fclose(file); +- +- if(!(*out)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Could not find a dlname line in .la file: %s", in); +- return SASL_FAIL; +- } +- +- return SASL_OK; +-} + #endif /* DO_DLOPEN */ + + /* loads a plugin library */ +@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_ + if (length + pos>=PATH_MAX) continue; /* too big */ + + if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)), +- SO_SUFFIX) +- && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)), +- LA_SUFFIX)) ++ SO_SUFFIX)) + continue; + ++ /* We only use .so files for loading plugins */ ++ + memcpy(name,dir->d_name,length); + name[length]='\0'; + +- result = _parse_la(prefix, name, tmp); +- if(result != SASL_OK) +- continue; +- ++ /* Create full name with path */ ++ strncpy(tmp, prefix, PATH_MAX); ++ strncat(tmp, name, PATH_MAX); ++ + /* skip "lib" and cut off suffix -- + this only need be approximate */ + strcpy(plugname, name + 3); diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index 0a92c6a7a..4b59049a4 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -1,54 +1,202 @@ -# $Id: PKGBUILD 127649 2011-06-17 13:03:28Z stephane $ +# $Id: PKGBUILD 134437 2011-08-03 20:35:03Z jgc $ # Maintainer: Jan de Groot +# This package spans multiple repositories. +# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. + +#pkgbase=('cyrus-sasl') +#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl pkgver=2.1.23 -pkgrel=6 +pkgrel=7 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" license=('custom') -depends=('db>=4.8') -optdepends=('cyrus-sasl: saslauthd' - 'cyrus-sasl-plugins: authentication plugins other than sasldb') +options=('!makeflags' '!libtool') +makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl') source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.19-checkpw.c.patch - cyrus-sasl-db.patch) -options=('!makeflags') + cyrus-sasl-2.1.19-checkpw.c.patch + cyrus-sasl-2.1.22-crypt.patch + cyrus-sasl-2.1.22-qa.patch + cyrus-sasl-2.1.22-automake-1.10.patch + cyrus-sasl-2.1.23-authd-fix.patch + 0003_saslauthd_mdoc.patch + 0010_maintainer_mode.patch + 0011_saslauthd_ac_prog_libtool.patch + 0012_xopen_crypt_prototype.patch + 0016_pid_file_lock_creation_mask.patch + 0018_auth_rimap_quotes.patch + 0019_ldap_deprecated.patch + 0022_gcc4.4_preprocessor_syntax.patch + 0025_ld_as_needed.patch + 0026_drop_krb5support_dependency.patch + 0027_db5_support.patch + 0030-dont_use_la_files_for_opening_plugins.patch + saslauthd.conf.d + saslauthd) md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' 'e27ddff076342e7a3041c4759817d04b' - '0658201497aad359c0d66b0ab8032859') + 'd7e6886e88af04d05f3dec7f0a59ccf7' + '79b8a5e8689989e2afd4b7bda595a7b1' + 'f4131b077ddb5240b375d749162f1b7a' + 'c7ad2c70c1ef814eb4b119f316c064f2' + 'caeeac3feba19cbbd36e7345cc805600' + 'f45d8b60e8f74dd7f7c2ec1665fa602a' + '9d93880514cb5ff5da969f1ceb64a661' + 'dfdc052a7e678db9f687482c5d52f34e' + '4a09f6b24b91f8450892a78e378860da' + '213abe7c5dfe0d7f446992787da1e780' + '5a0321177ad30cb5518c8b6812e3961a' + '0c965748970eea29fa295524821d43f0' + '62bf892fe4d1df41ff748e91a1afaf67' + 'b7848957357e7c02d6490102be496bf9' + 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' + '8e7106f32e495e9ade69014fd1b3352a' + '49219af5641150edec288a3fdb65e7c1' + '75542f613185d5a90520ad0d7d926a20') build() { cd "${srcdir}/cyrus-sasl-${pkgver}" - patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch - patch -Np1 -i ${srcdir}/cyrus-sasl-db.patch + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" + patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" + patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" + patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" + patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" + patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" + patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" + patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" + patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" + patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" + patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" + patch -Np1 -i "${srcdir}/0027_db5_support.patch" + patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I cmulocal + automake -a -c + autoheader + autoconf + + pushd saslauthd + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I ../cmulocal -I ../config + automake -a -c + autoheader + autoconf + popd + ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-anon \ - --disable-cram \ - --disable-digest \ - --disable-gssapi \ - --enable-login \ - --disable-otp \ - --enable-plain \ - --mandir=/usr/share/man - for dir in include lib sasldb plugins utils; do - pushd ${dir} - make - popd - done + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-static \ + --enable-shared \ + --enable-alwaystrue \ + --enable-checkapop \ + --enable-cram \ + --enable-digest \ + --disable-otp \ + --disable-srp \ + --disable-srp-setpass \ + --disable-krb4 \ + --enable-gssapi \ + --enable-auth-sasldb \ + --enable-plain \ + --enable-anon \ + --enable-login \ + --enable-ntlm \ + --disable-passdss \ + --enable-sql \ + --enable-ldapdb \ + --disable-macos-framework \ + --with-pam \ + --with-saslauthd=/var/run/saslauthd \ + --with-ldap \ + --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ + --sysconfdir=/etc \ + --with-devrandom=/dev/urandom + make } -package() { +package_libsasl() { + pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" + depends=('openssl') + provides=('cyrus-sasl-plugins') + conflicts=('cyrus-sasl-plugins') + cd "${srcdir}/cyrus-sasl-${pkgver}" for dir in include lib sasldb plugins utils; do - pushd ${dir} || return 1 + pushd ${dir} make DESTDIR="${pkgdir}" install popd done + rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" + install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" +} + +package_cyrus-sasl() { + depends=("libsasl=${pkgver}-${pkgrel}") + pkgdesc="Cyrus saslauthd SASL authentication daemon" + + cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc/rc.d" + install -m755 -d "${pkgdir}/etc/conf.d" + install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/" + install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" +} + +package_cyrus-sasl-gssapi() { + pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'krb5') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" +} + +package_cyrus-sasl-ldap() { + pkgdesc="ldapdb auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'libldap') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/" +} + +package_cyrus-sasl-sql() { + pkgdesc="SQL auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/" - # install license - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/" } diff --git a/core/libsasl/cyrus-sasl-2.1.22-as-needed.patch b/core/libsasl/cyrus-sasl-2.1.22-as-needed.patch new file mode 100644 index 000000000..1294cb507 --- /dev/null +++ b/core/libsasl/cyrus-sasl-2.1.22-as-needed.patch @@ -0,0 +1,11 @@ +--- saslauthd/configure.in.orig 2006-05-23 15:53:17.000000000 -0700 ++++ saslauthd/configure.in 2006-05-23 15:53:33.000000000 -0700 +@@ -77,7 +77,7 @@ + AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) + SASL_DB_PATH_CHECK() + SASL_DB_CHECK() +- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" ++ SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB" + fi + + AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], diff --git a/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch b/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch new file mode 100644 index 000000000..8cd71c0c5 --- /dev/null +++ b/core/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch @@ -0,0 +1,94 @@ +Re-merged patch by Robert Scheck for cyrus-sasl >= 2.1.22, which was +originally written by Jacek Konieczny and makes cyrus-sasl building +using automake 1.10. + +--- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 ++++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 +@@ -82,73 +82,73 @@ + libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la + + libplain_la_SOURCES = plain.c plain_init.c $(common_sources) +-libplain_la_LDFLAGS = -version-info $(plain_version) ++libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) + libplain_la_DEPENDENCIES = $(COMPAT_OBJS) + libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) +-libanonymous_la_LDFLAGS = -version-info $(anonymous_version) ++libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) + libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) + libanonymous_la_LIBADD = $(COMPAT_OBJS) + + libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) +-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) ++libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) + libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) + libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) + + libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) +-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) ++libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) + libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) + libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) + + libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) +-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) ++libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) + libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libcrammd5_la_LIBADD = $(COMPAT_OBJS) + + libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) +-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) ++libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) + libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) + + liblogin_la_SOURCES = login.c login_init.c $(common_sources) +-liblogin_la_LDFLAGS = -version-info $(login_version) ++liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) + liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) + liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) +-libsrp_la_LDFLAGS = -version-info $(srp_version) ++libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) + libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) + libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) + + libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) +-libotp_la_LDFLAGS = -version-info $(otp_version) ++libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) + libotp_la_DEPENDENCIES = $(COMPAT_OBJS) + libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) + + libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) +-libntlm_la_LDFLAGS = -version-info $(ntlm_version) ++libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) + libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) + libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) + + libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) +-libpassdss_la_LDFLAGS = -version-info $(passdss_version) ++libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) + libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) + libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) + + # Auxprop Plugins + libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) +-libsasldb_la_LDFLAGS = -version-info $(sasldb_version) ++libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) + libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) + libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) + + libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) +-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) ++libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) + libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) + libldapdb_la_LIBADD = $(COMPAT_OBJS) + + libsql_la_SOURCES = sql.c sql_init.c $(common_sources) +-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) ++libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) + libsql_la_DEPENDENCIES = $(COMPAT_OBJS) + libsql_la_LIBADD = $(COMPAT_OBJS) + diff --git a/core/libsasl/cyrus-sasl-2.1.22-crypt.patch b/core/libsasl/cyrus-sasl-2.1.22-crypt.patch new file mode 100644 index 000000000..fd356327b --- /dev/null +++ b/core/libsasl/cyrus-sasl-2.1.22-crypt.patch @@ -0,0 +1,71 @@ +http://bugs.gentoo.org/152544 + +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -45,6 +45,7 @@ sasl_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb + ++AM_CFLAGS = -fPIC + EXTRA_DIST = windlopen.c staticopen.h NTMakefile + EXTRA_LIBRARIES = libsasl2.a + noinst_LIBRARIES = @SASL_STATIC_LIBS@ +--- cyrus-sasl-2.1.22/plugins/Makefile.am ++++ cyrus-sasl-2.1.22/plugins/Makefile.am +@@ -63,6 +63,7 @@ srp_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include + AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) ++AM_CFLAGS = -fPIC + + COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ + +--- cyrus-sasl-2.1.22/sasldb/Makefile.am ++++ cyrus-sasl-2.1.22/sasldb/Makefile.am +@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top + + extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c + ++AM_CFLAGS = -fPIC + EXTRA_DIST = NTMakefile + + noinst_LTLIBRARIES = libsasldb.la +--- cyrus-sasl-2.1.22/utils/Makefile.am ++++ cyrus-sasl-2.1.22/utils/Makefile.am +@@ -42,7 +42,7 @@ + # + ################################################################ + +-all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) ++all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) + all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) + + sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer +--- cyrus-sasl-2.1.22/sample/Makefile.am ++++ cyrus-sasl-2.1.22/sample/Makefile.am +@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c + server_SOURCES = server.c common.c common.h + client_SOURCES = client.c common.c common.h + +-server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + +-sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + + EXTRA_DIST = NTMakefile +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la + libsasl2_la_SOURCES = $(common_sources) $(common_headers) + libsasl2_la_LDFLAGS = -version-info $(sasl_version) + libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) +-libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) ++libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) + + if MACOSX + framedir = /Library/Frameworks/SASL2.framework diff --git a/core/libsasl/cyrus-sasl-2.1.22-qa.patch b/core/libsasl/cyrus-sasl-2.1.22-qa.patch new file mode 100644 index 000000000..4f7b04f13 --- /dev/null +++ b/core/libsasl/cyrus-sasl-2.1.22-qa.patch @@ -0,0 +1,22 @@ +fix missing prototype warnings + +--- cyrus-sasl-2.1.22/lib/auxprop.c ++++ cyrus-sasl-2.1.22/lib/auxprop.c +@@ -43,6 +43,7 @@ + */ + + #include ++#include + #include + #include + #include +--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c ++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c +@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF + ******************************************************************/ + + #include ++#include + + extern char *crypt(); + diff --git a/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch b/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch new file mode 100644 index 000000000..f5f372d17 --- /dev/null +++ b/core/libsasl/cyrus-sasl-2.1.23-authd-fix.patch @@ -0,0 +1,28 @@ +fix warnings: + +auth_sasldb.c: In function ‘auth_sasldb’: +auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ + +auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type +../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ + +--- saslauthd/auth_sasldb.c ++++ saslauthd/auth_sasldb.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + /* END PUBLIC DEPENDENCIES */ + + #define RETURN(x) return strdup(x) +@@ -131,7 +132,8 @@ + /* VARIABLES */ + char pw[1024]; /* pointer to passwd file entry */ + sasl_utils_t utils; +- int ret, outsize; ++ int ret; ++ size_t outsize; + const char *use_realm; + char realm_buf[MAXHOSTNAMELEN]; + /* END VARIABLES */ diff --git a/core/libsasl/saslauthd b/core/libsasl/saslauthd new file mode 100644 index 000000000..6afafae0b --- /dev/null +++ b/core/libsasl/saslauthd @@ -0,0 +1,49 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON_NAME="saslauthd" +SASLAUTHD_BIN=/usr/sbin/saslauthd +SASLAUTHD_RUN=/var/run/saslauthd +SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid + +case "$1" in + start) + stat_busy "Starting $DAEMON_NAME" + [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd + if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then + add_daemon $DAEMON_NAME + stat_done + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $DAEMON_NAME" + [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm_daemon $DAEMON_NAME + stat_done + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +# vim: ts=2 sw=2 et ft=sh diff --git a/core/libsasl/saslauthd.conf.d b/core/libsasl/saslauthd.conf.d new file mode 100644 index 000000000..167211290 --- /dev/null +++ b/core/libsasl/saslauthd.conf.d @@ -0,0 +1 @@ +SASLAUTHD_OPTS="-a pam" diff --git a/extra/cyrus-sasl/0003_saslauthd_mdoc.patch b/extra/cyrus-sasl/0003_saslauthd_mdoc.patch new file mode 100644 index 000000000..694f4bb67 --- /dev/null +++ b/extra/cyrus-sasl/0003_saslauthd_mdoc.patch @@ -0,0 +1,35 @@ +0003_saslauthd_mdoc.dpatch by + +Use the correct path for the saslauthd.conf file, and use another +date format (cosmetic). + +diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc +--- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 +@@ -10,7 +10,7 @@ + .\" manpage in saslauthd.8 whenever you change this source + .\" version. Only the pre-formatted manpage is installed. + .\" +-.Dd 10 24 2002 ++.Dd October 24 2002 + .Dt SASLAUTHD 8 + .Os "CMU-SASL" + .Sh NAME +@@ -216,7 +216,7 @@ + .Em (All platforms that support OpenLDAP 2.0 or higher) + .Pp + Authenticate against an ldap server. The ldap configuration parameters are +-read from /usr/local/etc/saslauthd.conf. The location of this file can be ++read from /etc/saslauthd.conf. The location of this file can be + changed with the -O parameter. See the LDAP_SASLAUTHD file included with the + distribution for the list of available parameters. + .It Li sia +@@ -249,7 +249,7 @@ + .Bl -tag -width "/var/run/saslauthd/mux" + .It Pa /var/run/saslauthd/mux + The default communications socket. +-.It Pa /usr/local/etc/saslauthd.conf ++.It Pa /etc/saslauthd.conf + The default configuration file for ldap support. + .El + .Sh SEE ALSO diff --git a/extra/cyrus-sasl/0010_maintainer_mode.patch b/extra/cyrus-sasl/0010_maintainer_mode.patch new file mode 100644 index 000000000..cf3d02a08 --- /dev/null +++ b/extra/cyrus-sasl/0010_maintainer_mode.patch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 0010_maintainer_mode.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable maintainer mode to avoid auto* problems. + +@DPATCH@ +diff -urNad trunk~/configure.in trunk/configure.in +--- trunk~/configure.in 2006-05-29 22:52:46.000000000 +0300 ++++ trunk/configure.in 2006-11-01 23:24:55.000000000 +0200 +@@ -62,6 +62,8 @@ + AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22) + CMU_INIT_AUTOMAKE + ++AM_MAINTAINER_MODE ++ + # and include our config dir scripts + ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config" + diff --git a/extra/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch b/extra/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch new file mode 100644 index 000000000..3805b4857 --- /dev/null +++ b/extra/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch @@ -0,0 +1,15 @@ +0011_saslauthd_ac_prog_libtool.dpatch by + +Enable libtool use. + +diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in +--- trunk~/saslauthd/configure.in 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/configure.in 2006-11-01 23:41:51.000000000 +0200 +@@ -25,6 +25,7 @@ + AC_PROG_MAKE_SET + AC_PROG_LN_S + AC_PROG_INSTALL ++AC_PROG_LIBTOOL + + dnl Checks for build foo + CMU_C___ATTRIBUTE__ diff --git a/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch b/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch new file mode 100644 index 000000000..d50ec8343 --- /dev/null +++ b/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch @@ -0,0 +1,20 @@ +0012_xopen_crypt_prototype.dpatch by + +When _XOPEN_SOURCE is defined, the subsequent #include +will define a correct function prototype for the crypt function. +This avoids segfaults on architectures where the size of a pointer +is greater than the size of an integer (ia64 and amd64 are examples). +This may be detected by looking for build log lines such as the +following: +auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ +auth_shadow.c:183: warning: cast to pointer from integer of different +size + +diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c +--- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 +@@ -1,3 +1,4 @@ ++#define _XOPEN_SOURCE + #define PWBUFSZ 256 /***SWB***/ + + /* MODULE: auth_shadow */ diff --git a/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch b/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch new file mode 100644 index 000000000..e9170cef3 --- /dev/null +++ b/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch @@ -0,0 +1,27 @@ +0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar + +pid_file_lock is created with a mask of 644 instead of 0644. +This patch fixes this octal/decimal confusion as well as the +(harmless) one in the previous umask() call. + +diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c +--- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 ++++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 +@@ -276,7 +276,7 @@ + exit(1); + } + +- umask(077); ++ umask(0077); + + pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; + if ((pid_file_lock = malloc(pid_file_size)) == NULL) { +@@ -287,7 +287,7 @@ + strlcpy(pid_file_lock, run_path, pid_file_size); + strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); + +- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { ++ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { + rc = errno; + logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); + logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/extra/cyrus-sasl/0018_auth_rimap_quotes.patch b/extra/cyrus-sasl/0018_auth_rimap_quotes.patch new file mode 100644 index 000000000..13fa999f0 --- /dev/null +++ b/extra/cyrus-sasl/0018_auth_rimap_quotes.patch @@ -0,0 +1,35 @@ +0016_auth_rimap_quotes.dpatch by + +All lines beginning with `## DP:' are a description of the patch. +Avoid infinite loop when username/password has a double quote character. +Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 + +diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c +--- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 ++++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 +@@ -162,6 +162,7 @@ + num_quotes = 0; + p1 = s; + while ((p1 = strchr(p1, '"')) != NULL) { ++ p1++; + num_quotes++; + } + +@@ -438,7 +439,7 @@ + syslog(LOG_WARNING, "auth_rimap: writev: %m"); + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + (void)close(s); + return strdup(RESP_IERROR); +@@ -447,7 +448,7 @@ + /* don't need these any longer */ + memset(qlogin, 0, strlen(qlogin)); + free(qlogin); +- memset(qpass, 0, strlen(qlogin)); ++ memset(qpass, 0, strlen(qpass)); + free(qpass); + + /* read and parse the LOGIN response */ diff --git a/extra/cyrus-sasl/0019_ldap_deprecated.patch b/extra/cyrus-sasl/0019_ldap_deprecated.patch new file mode 100644 index 000000000..8825256cb --- /dev/null +++ b/extra/cyrus-sasl/0019_ldap_deprecated.patch @@ -0,0 +1,22 @@ +0019_ldap_deprecated.dpatch by dann frazier + +The function ldap_get_values, used in saslauthd/lak.c, is deprecated. +Therefore, its prototype is not included by default when compiling +against the ldap.h headers. As a result, the compiler cannot know the +return type of the function at compile time, and will implicitly +convert to a pointer. This has implications on 64-bit systems. +This patch sets the deprecation mode on, so that the function prototype +gets included when compiling. +(Description by Fabian Fagerholm ) + +diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c +--- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 ++++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 +@@ -55,6 +55,7 @@ + #include + #endif + ++#define LDAP_DEPRECATED 1 + #include + #include + #include diff --git a/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch b/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch new file mode 100644 index 000000000..a49b553f0 --- /dev/null +++ b/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch @@ -0,0 +1,26 @@ +0022_gcc4.4_preprocessor_syntax.dpatch by + +The #elif preprocessor directive requires a test condition. +GCC 4.4 enforces this rule. + +diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c +--- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 ++++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 +@@ -2715,7 +2715,7 @@ + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, diff --git a/extra/cyrus-sasl/0025_ld_as_needed.patch b/extra/cyrus-sasl/0025_ld_as_needed.patch new file mode 100644 index 000000000..67b48b4a4 --- /dev/null +++ b/extra/cyrus-sasl/0025_ld_as_needed.patch @@ -0,0 +1,27 @@ +Author: Matthias Klose +Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use +it. +--- a/saslauthd/Makefile.am ++++ b/saslauthd/Makefile.am +@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c + saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ + saslauthd_LDADD = @SASL_KRB_LIB@ \ + @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ +- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ ++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ + + testsaslauthd_SOURCES = testsaslauthd.c utils.c + testsaslauthd_LDADD = @LIB_SOCKET@ +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) +-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) ++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) + + # Prevent make dist stupidity + libsasldb_a_SOURCES = diff --git a/extra/cyrus-sasl/0026_drop_krb5support_dependency.patch b/extra/cyrus-sasl/0026_drop_krb5support_dependency.patch new file mode 100644 index 000000000..cc00867ef --- /dev/null +++ b/extra/cyrus-sasl/0026_drop_krb5support_dependency.patch @@ -0,0 +1,14 @@ +Author: Roberto C. Sanchez +Description: Drop gratuitous dependency on krb5support +--- a/cmulocal/sasl2.m4 ++++ b/cmulocal/sasl2.m4 +@@ -112,9 +112,6 @@ if test "$gssapi" != no; then + fi + + if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then +- # check for libkrb5support first +- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) +- + gss_failed=0 + AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1, + ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET}) diff --git a/extra/cyrus-sasl/0027_db5_support.patch b/extra/cyrus-sasl/0027_db5_support.patch new file mode 100644 index 000000000..522824074 --- /dev/null +++ b/extra/cyrus-sasl/0027_db5_support.patch @@ -0,0 +1,24 @@ +Author: Ondřej Surý +Description: Support newer Berkeley DB versions +--- a/sasldb/db_berkeley.c ++++ b/sasldb/db_berkeley.c +@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); +--- a/utils/dbconverter-2.c ++++ b/utils/dbconverter-2.c +@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/extra/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch b/extra/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch new file mode 100644 index 000000000..14a322496 --- /dev/null +++ b/extra/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch @@ -0,0 +1,134 @@ +--- a/lib/dlopen.c ++++ b/lib/dlopen.c +@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi + return result; + } + +-/* this returns the file to actually open. +- * out should be a buffer of size PATH_MAX +- * and may be the same as in. */ +- +-/* We'll use a static buffer for speed unless someone complains */ +-#define MAX_LINE 2048 +- +-static int _parse_la(const char *prefix, const char *in, char *out) +-{ +- FILE *file; +- size_t length; +- char line[MAX_LINE]; +- char *ntmp = NULL; +- +- if(!in || !out || !prefix || out == in) return SASL_BADPARAM; +- +- /* Set this so we can detect failure */ +- *out = '\0'; +- +- length = strlen(in); +- +- if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) { +- if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) { +- /* check for a .la file */ +- strcpy(line, prefix); +- strcat(line, in); +- length = strlen(line); +- *(line + (length - strlen(SO_SUFFIX))) = '\0'; +- strcat(line, LA_SUFFIX); +- file = fopen(line, "r"); +- if(file) { +- /* We'll get it on the .la open */ +- fclose(file); +- return SASL_FAIL; +- } +- } +- strcpy(out, prefix); +- strcat(out, in); +- return SASL_OK; +- } +- +- strcpy(line, prefix); +- strcat(line, in); +- +- file = fopen(line, "r"); +- if(!file) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "unable to open LA file: %s", line); +- return SASL_FAIL; +- } +- +- while(!feof(file)) { +- if(!fgets(line, MAX_LINE, file)) break; +- if(line[strlen(line) - 1] != '\n') { +- _sasl_log(NULL, SASL_LOG_WARN, +- "LA file has too long of a line: %s", in); +- return SASL_BUFOVER; +- } +- if(line[0] == '\n' || line[0] == '#') continue; +- if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) { +- /* We found the line with the name in it */ +- char *end; +- char *start; +- size_t len; +- end = strrchr(line, '\''); +- if(!end) continue; +- start = &line[sizeof("dlname=")-1]; +- len = strlen(start); +- if(len > 3 && start[0] == '\'') { +- ntmp=&start[1]; +- *end='\0'; +- /* Do we have dlname="" ? */ +- if(ntmp == end) { +- _sasl_log(NULL, SASL_LOG_DEBUG, +- "dlname is empty in .la file: %s", in); +- return SASL_FAIL; +- } +- strcpy(out, prefix); +- strcat(out, ntmp); +- } +- break; +- } +- } +- if(ferror(file) || feof(file)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Error reading .la: %s\n", in); +- fclose(file); +- return SASL_FAIL; +- } +- fclose(file); +- +- if(!(*out)) { +- _sasl_log(NULL, SASL_LOG_WARN, +- "Could not find a dlname line in .la file: %s", in); +- return SASL_FAIL; +- } +- +- return SASL_OK; +-} + #endif /* DO_DLOPEN */ + + /* loads a plugin library */ +@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_ + if (length + pos>=PATH_MAX) continue; /* too big */ + + if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)), +- SO_SUFFIX) +- && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)), +- LA_SUFFIX)) ++ SO_SUFFIX)) + continue; + ++ /* We only use .so files for loading plugins */ ++ + memcpy(name,dir->d_name,length); + name[length]='\0'; + +- result = _parse_la(prefix, name, tmp); +- if(result != SASL_OK) +- continue; +- ++ /* Create full name with path */ ++ strncpy(tmp, prefix, PATH_MAX); ++ strncat(tmp, name, PATH_MAX); ++ + /* skip "lib" and cut off suffix -- + this only need be approximate */ + strcpy(plugname, name + 3); diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 6d42f9f75..f4d80b6a6 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,53 +1,203 @@ -# $Id: PKGBUILD 122168 2011-05-02 15:13:37Z stephane $ +# $Id: PKGBUILD 134446 2011-08-03 20:43:28Z jgc $ # Maintainer: Jan de Groot -pkgname=cyrus-sasl +# This package spans multiple repositories. +# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk. + +pkgbase=('cyrus-sasl') +pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') +#pkgname=libsasl pkgver=2.1.23 -pkgrel=5 -pkgdesc="SASL authentication daemon" +pkgrel=7 +pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64') +url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" license=('custom') -url="http://asg.web.cmu.edu/cyrus/download/" -depends=('pam>=1.0.1-2' 'krb5' 'libldap' 'cyrus-sasl-plugins' 'db>=5.0') -replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql) -conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql) -backup=(etc/conf.d/saslauthd) -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${pkgname}-${pkgver}.tar.gz - saslauthd +options=('!makeflags' '!libtool') +makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl') +source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz + cyrus-sasl-2.1.19-checkpw.c.patch + cyrus-sasl-2.1.22-crypt.patch + cyrus-sasl-2.1.22-qa.patch + cyrus-sasl-2.1.22-automake-1.10.patch + cyrus-sasl-2.1.23-authd-fix.patch + 0003_saslauthd_mdoc.patch + 0010_maintainer_mode.patch + 0011_saslauthd_ac_prog_libtool.patch + 0012_xopen_crypt_prototype.patch + 0016_pid_file_lock_creation_mask.patch + 0018_auth_rimap_quotes.patch + 0019_ldap_deprecated.patch + 0022_gcc4.4_preprocessor_syntax.patch + 0025_ld_as_needed.patch + 0026_drop_krb5support_dependency.patch + 0027_db5_support.patch + 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.conf.d - cyrus-sasl-2.1.23-gcc4.patch - cyrus-sasl-2.1.23+db-5.0.patch) + saslauthd) md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - '697dfb51206c398bc976ce9f4cffe72d' - '96d8a2f6189501f8044838e04d5cae7f' - '3a71688df7d5724cd55a8de17d74f34e' - '35c189c8e93ad37e3ae3c49386fdeb2c') + 'e27ddff076342e7a3041c4759817d04b' + 'd7e6886e88af04d05f3dec7f0a59ccf7' + '79b8a5e8689989e2afd4b7bda595a7b1' + 'f4131b077ddb5240b375d749162f1b7a' + 'c7ad2c70c1ef814eb4b119f316c064f2' + 'caeeac3feba19cbbd36e7345cc805600' + 'f45d8b60e8f74dd7f7c2ec1665fa602a' + '9d93880514cb5ff5da969f1ceb64a661' + 'dfdc052a7e678db9f687482c5d52f34e' + '4a09f6b24b91f8450892a78e378860da' + '213abe7c5dfe0d7f446992787da1e780' + '5a0321177ad30cb5518c8b6812e3961a' + '0c965748970eea29fa295524821d43f0' + '62bf892fe4d1df41ff748e91a1afaf67' + 'b7848957357e7c02d6490102be496bf9' + 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' + '8e7106f32e495e9ade69014fd1b3352a' + '49219af5641150edec288a3fdb65e7c1' + '75542f613185d5a90520ad0d7d926a20') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/cyrus-sasl-${pkgver}" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" + patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" + patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" + patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" + patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" + patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" + patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" + patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" + patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" + patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" + patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" + patch -Np1 -i "${srcdir}/0027_db5_support.patch" + patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" - # Fix building with db v5.x - patch -Np1 -i ../cyrus-sasl-2.1.23+db-5.0.patch + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I cmulocal + automake -a -c + autoheader + autoconf - # Fix error: #elif with no expression - patch -Np1 -i ../cyrus-sasl-2.1.23-gcc4.patch + pushd saslauthd + rm -f config/config.guess config/config.sub + rm -f config/ltconfig config/ltmain.sh config/libtool.m4 + rm -fr autom4te.cache + libtoolize -c + aclocal -I config -I ../cmulocal -I ../config + automake -a -c + autoheader + autoconf + popd - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-ldap=/usr --with-saslauthd=/var/run/saslauthd \ - --disable-krb4 --with-gss_impl=mit --disable-otp - cd saslauthd + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --disable-static \ + --enable-shared \ + --enable-alwaystrue \ + --enable-checkapop \ + --enable-cram \ + --enable-digest \ + --disable-otp \ + --disable-srp \ + --disable-srp-setpass \ + --disable-krb4 \ + --enable-gssapi \ + --enable-auth-sasldb \ + --enable-plain \ + --enable-anon \ + --enable-login \ + --enable-ntlm \ + --disable-passdss \ + --enable-sql \ + --enable-ldapdb \ + --disable-macos-framework \ + --with-pam \ + --with-saslauthd=/var/run/saslauthd \ + --with-ldap \ + --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \ + --sysconfdir=/etc \ + --with-devrandom=/dev/urandom make } -package() { - cd "${srcdir}/${pkgname}-${pkgver}/saslauthd" +package_libsasl() { + pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" + depends=('openssl') + provides=('cyrus-sasl-plugins') + conflicts=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}" + for dir in include lib sasldb plugins utils; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" + install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" +} + +package_cyrus-sasl() { + depends=("libsasl=${pkgver}-${pkgrel}") + pkgdesc="Cyrus saslauthd SASL authentication daemon" + backup=('etc/conf.d/saslauthd') + + cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" make DESTDIR="${pkgdir}" install - make testsaslauthd - install -m755 testsaslauthd "${pkgdir}/usr/sbin" + install -m755 -d "${pkgdir}/etc/rc.d" + install -m755 -d "${pkgdir}/etc/conf.d" + install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/" + install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/" +} + +package_cyrus-sasl-gssapi() { + pkgdesc="GSSAPI authentication mechanism for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'krb5') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" +} + +package_cyrus-sasl-ldap() { + pkgdesc="ldapdb auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'libldap') + replaces=('cyrus-sasl-plugins') + + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/" + + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/" +} + +package_cyrus-sasl-sql() { + pkgdesc="SQL auxprop module for Cyrus SASL" + depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient') + replaces=('cyrus-sasl-plugins') - install -dm766 "${pkgdir}/var/run/saslauthd" - install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" - install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + install -m755 -d "${pkgdir}/usr/lib/sasl2" + cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/" - install -Dm644 ../COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING" + install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql" + ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/" } diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch new file mode 100644 index 000000000..f7bf44b79 --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch @@ -0,0 +1,170 @@ +diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in +--- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 ++++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 +@@ -120,7 +120,7 @@ + JAVA_TRUE = @JAVA_TRUE@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = -lcrypt @LIBS@ + LIBTOOL = @LIBTOOL@ + LIB_CRYPT = @LIB_CRYPT@ + LIB_DES = @LIB_DES@ +diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c +--- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 ++++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 +@@ -94,6 +94,23 @@ + # endif + #endif + ++/****************************** ++ * crypt(3) patch start * ++ ******************************/ ++char *crypt(const char *key, const char *salt); ++ ++/* cleartext password formats */ ++#define PASSWORD_FORMAT_CLEARTEXT 1 ++#define PASSWORD_FORMAT_CRYPT 2 ++#define PASSWORD_FORMAT_CRYPTTRAD 3 ++#define PASSWORD_SALT_BUF_LEN 22 ++ ++/* weeds out crypt(3) password's salt */ ++int _sasl_get_salt (char *dest, char *src, int format); ++ ++/****************************** ++ * crypt(3) patch stop * ++ ******************************/ + + /* we store the following secret to check plaintext passwords: + * +@@ -143,7 +160,51 @@ + "*cmusaslsecretPLAIN", + NULL }; + struct propval auxprop_values[3]; +- ++ ++ /****************************** ++ * crypt(3) patch start * ++ * for password format check * ++ ******************************/ ++ sasl_getopt_t *getopt; ++ void *context; ++ const char *p = NULL; ++ /** ++ * MD5: 12 char salt ++ * BLOWFISH: 16 char salt ++ */ ++ char salt[PASSWORD_SALT_BUF_LEN]; ++ int password_format; ++ ++ /* get password format from auxprop configuration */ ++ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { ++ getopt(context, NULL, "password_format", &p, NULL); ++ } ++ ++ /* set password format */ ++ if (p) { ++ /* ++ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); ++ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); ++ */ ++ /* modern, modular crypt(3) */ ++ if (strncmp(p, "crypt", 11) == 0) ++ password_format = PASSWORD_FORMAT_CRYPT; ++ /* traditional crypt(3) */ ++ else if (strncmp(p, "crypt_trad", 11) == 0) ++ password_format = PASSWORD_FORMAT_CRYPTTRAD; ++ /* cleartext password */ ++ else ++ password_format = PASSWORD_FORMAT_CLEARTEXT; ++ } else { ++ /* cleartext password */ ++ password_format = PASSWORD_FORMAT_CLEARTEXT; ++ } ++ ++ /****************************** ++ * crypt(3) patch stop * ++ * for password format check * ++ ******************************/ ++ + if (!conn || !userstr) + return SASL_BADPARAM; + +@@ -180,14 +241,31 @@ + goto done; + } + +- /* At the point this has been called, the username has been canonified +- * and we've done the auxprop lookup. This should be easy. */ +- if(auxprop_values[0].name +- && auxprop_values[0].values +- && auxprop_values[0].values[0] +- && !strcmp(auxprop_values[0].values[0], passwd)) { +- /* We have a plaintext version and it matched! */ +- return SASL_OK; ++ ++ /****************************** ++ * crypt(3) patch start * ++ ******************************/ ++ ++ /* get salt */ ++ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); ++ ++ /* crypt(3)-ed password? */ ++ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { ++ /* compare password */ ++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) ++ return SASL_OK; ++ else ++ ret = SASL_BADAUTH; ++ } ++ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { ++ /* compare passwords */ ++ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) ++ return SASL_OK; ++ else ++ ret = SASL_BADAUTH; ++ /****************************** ++ * crypt(3) patch stop * ++ ******************************/ + } else if(auxprop_values[1].name + && auxprop_values[1].values + && auxprop_values[1].values[0]) { +@@ -975,3 +1053,37 @@ + #endif + { NULL, NULL } + }; ++ ++/* weeds out crypt(3) password's salt */ ++int _sasl_get_salt (char *dest, char *src, int format) { ++ int num; /* how many characters is salt long? */ ++ switch (format) { ++ case PASSWORD_FORMAT_CRYPT: ++ /* md5 crypt */ ++ if (src[1] == '1') ++ num = 12; ++ /* blowfish crypt */ ++ else if (src[1] == '2') ++ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; ++ /* traditional crypt */ ++ else ++ num = 2; ++ break; ++ ++ case PASSWORD_FORMAT_CRYPTTRAD: ++ num = 2; ++ break; ++ ++ default: ++ return 1; ++ } ++ ++ /* destroy destination */ ++ memset(dest, '\0', (num + 1)); ++ ++ /* copy salt to destination */ ++ strncpy(dest, src, num); ++ ++ return 1; ++} ++ diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch new file mode 100644 index 000000000..1294cb507 --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch @@ -0,0 +1,11 @@ +--- saslauthd/configure.in.orig 2006-05-23 15:53:17.000000000 -0700 ++++ saslauthd/configure.in 2006-05-23 15:53:33.000000000 -0700 +@@ -77,7 +77,7 @@ + AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) + SASL_DB_PATH_CHECK() + SASL_DB_CHECK() +- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" ++ SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB" + fi + + AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch new file mode 100644 index 000000000..8cd71c0c5 --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch @@ -0,0 +1,94 @@ +Re-merged patch by Robert Scheck for cyrus-sasl >= 2.1.22, which was +originally written by Jacek Konieczny and makes cyrus-sasl building +using automake 1.10. + +--- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 ++++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 +@@ -82,73 +82,73 @@ + libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la + + libplain_la_SOURCES = plain.c plain_init.c $(common_sources) +-libplain_la_LDFLAGS = -version-info $(plain_version) ++libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) + libplain_la_DEPENDENCIES = $(COMPAT_OBJS) + libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) +-libanonymous_la_LDFLAGS = -version-info $(anonymous_version) ++libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) + libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) + libanonymous_la_LIBADD = $(COMPAT_OBJS) + + libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) +-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) ++libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) + libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) + libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) + + libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) +-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) ++libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) + libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) + libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) + + libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) +-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) ++libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) + libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libcrammd5_la_LIBADD = $(COMPAT_OBJS) + + libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) +-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) ++libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) + libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) + libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) + + liblogin_la_SOURCES = login.c login_init.c $(common_sources) +-liblogin_la_LDFLAGS = -version-info $(login_version) ++liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) + liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) + liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) + + libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) +-libsrp_la_LDFLAGS = -version-info $(srp_version) ++libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) + libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) + libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) + + libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) +-libotp_la_LDFLAGS = -version-info $(otp_version) ++libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) + libotp_la_DEPENDENCIES = $(COMPAT_OBJS) + libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) + + libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) +-libntlm_la_LDFLAGS = -version-info $(ntlm_version) ++libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) + libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) + libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) + + libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) +-libpassdss_la_LDFLAGS = -version-info $(passdss_version) ++libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) + libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) + libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) + + # Auxprop Plugins + libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) +-libsasldb_la_LDFLAGS = -version-info $(sasldb_version) ++libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) + libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) + libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) + + libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) +-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) ++libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) + libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) + libldapdb_la_LIBADD = $(COMPAT_OBJS) + + libsql_la_SOURCES = sql.c sql_init.c $(common_sources) +-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) ++libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) + libsql_la_DEPENDENCIES = $(COMPAT_OBJS) + libsql_la_LIBADD = $(COMPAT_OBJS) + diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch new file mode 100644 index 000000000..fd356327b --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch @@ -0,0 +1,71 @@ +http://bugs.gentoo.org/152544 + +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -45,6 +45,7 @@ sasl_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb + ++AM_CFLAGS = -fPIC + EXTRA_DIST = windlopen.c staticopen.h NTMakefile + EXTRA_LIBRARIES = libsasl2.a + noinst_LIBRARIES = @SASL_STATIC_LIBS@ +--- cyrus-sasl-2.1.22/plugins/Makefile.am ++++ cyrus-sasl-2.1.22/plugins/Makefile.am +@@ -63,6 +63,7 @@ srp_version = 2:22:0 + + INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include + AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) ++AM_CFLAGS = -fPIC + + COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ + +--- cyrus-sasl-2.1.22/sasldb/Makefile.am ++++ cyrus-sasl-2.1.22/sasldb/Makefile.am +@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top + + extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c + ++AM_CFLAGS = -fPIC + EXTRA_DIST = NTMakefile + + noinst_LTLIBRARIES = libsasldb.la +--- cyrus-sasl-2.1.22/utils/Makefile.am ++++ cyrus-sasl-2.1.22/utils/Makefile.am +@@ -42,7 +42,7 @@ + # + ################################################################ + +-all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) ++all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) + all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) + + sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer +--- cyrus-sasl-2.1.22/sample/Makefile.am ++++ cyrus-sasl-2.1.22/sample/Makefile.am +@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c + server_SOURCES = server.c common.c common.h + client_SOURCES = client.c common.c common.h + +-server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + +-sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) +-sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) ++sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) ++sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) + + EXTRA_DIST = NTMakefile +--- cyrus-sasl-2.1.22/lib/Makefile.am ++++ cyrus-sasl-2.1.22/lib/Makefile.am +@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la + libsasl2_la_SOURCES = $(common_sources) $(common_headers) + libsasl2_la_LDFLAGS = -version-info $(sasl_version) + libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) +-libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) ++libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) + + if MACOSX + framedir = /Library/Frameworks/SASL2.framework diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch new file mode 100644 index 000000000..4f7b04f13 --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch @@ -0,0 +1,22 @@ +fix missing prototype warnings + +--- cyrus-sasl-2.1.22/lib/auxprop.c ++++ cyrus-sasl-2.1.22/lib/auxprop.c +@@ -43,6 +43,7 @@ + */ + + #include ++#include + #include + #include + #include +--- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c ++++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c +@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF + ******************************************************************/ + + #include ++#include + + extern char *crypt(); + diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch new file mode 100644 index 000000000..f5f372d17 --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch @@ -0,0 +1,28 @@ +fix warnings: + +auth_sasldb.c: In function ‘auth_sasldb’: +auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ + +auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type +../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ + +--- saslauthd/auth_sasldb.c ++++ saslauthd/auth_sasldb.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + /* END PUBLIC DEPENDENCIES */ + + #define RETURN(x) return strdup(x) +@@ -131,7 +132,8 @@ + /* VARIABLES */ + char pw[1024]; /* pointer to passwd file entry */ + sasl_utils_t utils; +- int ret, outsize; ++ int ret; ++ size_t outsize; + const char *use_realm; + char realm_buf[MAXHOSTNAMELEN]; + /* END VARIABLES */ diff --git a/extra/cyrus-sasl/saslauthd b/extra/cyrus-sasl/saslauthd index c470c801c..6afafae0b 100644 --- a/extra/cyrus-sasl/saslauthd +++ b/extra/cyrus-sasl/saslauthd @@ -8,33 +8,32 @@ DAEMON_NAME="saslauthd" SASLAUTHD_BIN=/usr/sbin/saslauthd -SASLAUTHD_PID=`pidof -o %PPID $SASLAUTHD_BIN` +SASLAUTHD_RUN=/var/run/saslauthd +SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid case "$1" in start) stat_busy "Starting $DAEMON_NAME" - [ -z "$SASLAUTHD_PID" ] && $SASLAUTHD_BIN $SASLAUTHD_OPTS - if [ $? -gt 0 ]; then + [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd + if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then + add_daemon $DAEMON_NAME + stat_done + else stat_fail exit 1 - else - echo `pidof -o %PPID $SASLAUTHD_BIN` > /var/run/$DAEMON_NAME.pid fi - add_daemon $DAEMON_NAME - stat_done ;; stop) stat_busy "Stopping $DAEMON_NAME" - [ ! -z "$SASLAUTHD_PID" ] && kill $SASLAUTHD_PID &> /dev/null + [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null if [ $? -gt 0 ]; then stat_fail exit 1 else - rm /var/run/$DAEMON_NAME.pid &> /dev/null + rm_daemon $DAEMON_NAME + stat_done fi - rm_daemon $DAEMON_NAME - stat_done ;; restart) diff --git a/extra/cyrus-sasl/saslauthd.conf.d b/extra/cyrus-sasl/saslauthd.conf.d index b42b5d0b0..167211290 100644 --- a/extra/cyrus-sasl/saslauthd.conf.d +++ b/extra/cyrus-sasl/saslauthd.conf.d @@ -1 +1 @@ -SASLAUTHD_OPTS="-m /var/run/saslauthd -a pam" +SASLAUTHD_OPTS="-a pam" diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD index f24789350..0d88722b6 100644 --- a/extra/ettercap/PKGBUILD +++ b/extra/ettercap/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 134559 2011-08-05 19:15:39Z giovanni $ +# $Id: PKGBUILD 134606 2011-08-06 11:42:31Z giovanni $ # Maintainer: # Contributor: Tom Newsom pkgname=ettercap pkgver=NG_0.7.3 _origver=NG-0.7.3 -pkgrel=16 +pkgrel=17 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" arch=('i686' 'x86_64') url="http://ettercap.sourceforge.net/" license=('GPL') depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet') makedepends=('libnet' 'pkgconfig') +backup=('etc/etter.conf') options=(!libtool) source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar.gz" - 01_pointers_and_ints_dont_mix.diff) + 01_pointers_and_ints_dont_mix.diff + ettercap-NG-0.7.3_dns_support_on_x86_64.patch) md5sums=('28fb15cd024162c55249888fe1b97820' - 'ad235cd90aaa3e168575d06efac4d862') + 'ad235cd90aaa3e168575d06efac4d862' + 'f3d66186eece056a6d71453f9f288623') build() { cd ${srcdir}/${pkgname}-${_origver} @@ -28,6 +31,8 @@ build() { patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff + [ "$CARCH" = "x86_64" ] && patch -Np1 -i ${srcdir}/ettercap-NG-0.7.3_dns_support_on_x86_64.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ diff --git a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch new file mode 100644 index 000000000..ed455a878 --- /dev/null +++ b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch @@ -0,0 +1,39 @@ +--- a/configure 2011-08-06 12:50:26.000000000 +0200 ++++ b/configure 2011-08-06 13:01:56.000000000 +0200 +@@ -15732,7 +15732,7 @@ + if ${ac_cv_search_dn_expand+:} false; then : + + else +- ac_cv_search_dn_expand=no ++ ac_cv_search_dn_expand='-lresolv' + fi + rm conftest.$ac_ext + LIBS=$ac_func_search_save_LIBS +@@ -15790,14 +15790,14 @@ + ac_ec_dns=yes + + else +- if false; then ++if true; then + HAVE_DN_EXPAND_TRUE= + HAVE_DN_EXPAND_FALSE='#' + else + HAVE_DN_EXPAND_TRUE='#' + HAVE_DN_EXPAND_FALSE= + fi +- ac_ec_dns=no ++ ac_ec_dns=yes + fi + + +--- a/src/ec_log.c 2004-09-30 18:01:45.000000000 +0200 ++++ b/src/ec_log.c 2011-08-06 13:04:30.000000000 +0200 +@@ -190,7 +190,7 @@ + if (fd->cfd == NULL) + SEMIFATAL_ERROR("%s", gzerror(fd->cfd, &zerr)); + } else { +- fd->fd = open(filename, O_CREAT | O_TRUNC | O_RDWR | O_BINARY); ++ fd->fd = open(filename, O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0666); + if (fd->fd == -1) + SEMIFATAL_ERROR("Can't create %s: %s", filename, strerror(errno)); + } diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD index 831b180cf..b82e347d7 100644 --- a/extra/fluidsynth/PKGBUILD +++ b/extra/fluidsynth/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 102552 2010-12-08 07:09:52Z schiv $ +# $Id: PKGBUILD 134628 2011-08-06 19:12:36Z schiv $ # Maintainer: Ray Rashif # Contributor: damir pkgname=fluidsynth -pkgver=1.1.3 -pkgrel=2 +pkgver=1.1.4 +pkgrel=1 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.fluidsynth.org/" depends=('glib2' 'jack' 'dbus-core' 'libpulse') makedepends=('cmake' 'ladspa' 'doxygen') -optdepends=('pulseaudio' +optdepends=('pulseaudio: PulseAudio sound support' 'bash: init script') license=('LGPL') backup=('etc/conf.d/fluidsynth') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - fluidsynth.conf - fluidsynthd) -md5sums=('0d3e3cc770b4da413010dfb7dfdce9c8' +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'fluidsynth.conf' + 'fluidsynthd') +md5sums=('71f297a90d00a253f0f12ceb5d3d661d' '16c5f4d4cbdddc6c5fcbd4fd4cc142f1' 'b296dbfb524c2164f552f68bd9abe2ec') diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index 88ea17960..b5ff775d7 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127312 2011-06-13 03:53:57Z eric $ +# $Id: PKGBUILD 134633 2011-08-07 01:06:26Z eric $ # Maintainer: Eric Bélanger pkgname=fvwm -pkgver=2.6.1 -pkgrel=3 +pkgver=2.6.2 +pkgrel=1 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64') url="http://www.fvwm.org" @@ -15,9 +15,9 @@ conflicts=('fvwm-devel') replaces=('fvwm-devel') options=('!emptydirs' '!makeflags') source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop) -md5sums=('fbbbed1bb41fa0878b17ee209947602d' +md5sums=('78c830a324680d22e95428ea277b8ece' 'a12c52729a74355838404ee2f5716e0c') -sha1sums=('cf7165d40180b45409e604736066cf9fcc792e36' +sha1sums=('522e1fac1101de7825e792ba36bb956216f40fda' '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb') build() { diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 96155e9b3..ebcbdab57 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 134107 2011-08-01 16:13:27Z stephane $ +# $Id: PKGBUILD 134623 2011-08-06 17:29:22Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -37,7 +37,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-wiki-publisher') _LOver=3.4.2.3 pkgver=3.4.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" @@ -52,13 +52,13 @@ makedepends=( # makedepends # the depends from libreoffice main pkg "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' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' - 'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script 'ttf-dejavu') # to satisfy regression tests # translate-toolkit - todo move them to extra to allow --with-system-foo builds # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors -_mirror="http://download.documentfoundation.org/libreoffice/src" +_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" #_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://hg.services.openoffice.org/binaries" 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 @@ -90,6 +90,7 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + http://download.go-oo.org/src/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz 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/451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt @@ -141,7 +142,8 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) + f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz) md5sums=('1600ebf998ec7075bd0e96e7a49513dc' #libreoffice-artwork-3.4.2.3.tar.bz2 '0e12b4a03d14645dac1f073eb2f67423' #libreoffice-base-3.4.2.3.tar.bz2 @@ -190,6 +192,7 @@ md5sums=('1600ebf998ec7075bd0e96e7a49513dc' #libreoffice-artwork-3.4.2.3.tar.bz2 'b4cae0700aa1c2aef7eb7f345365e6f1' #b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 '90401bca927835b6fbae4a707ed187c8' #90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 'f02578f5218f217a9f20e9c30e119c6a' #f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + '0625a7d661f899a8ce263fc8a9879108' #0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz '7e7efc5d4a03126bb9ae3ae9aa2c4e87' #7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt '41c9b65ad60af4b3255bbecdfef11736' #41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt '451ccf439a36a568653b024534669971' #451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt @@ -282,7 +285,7 @@ build() { --enable-crashdump \ --enable-dbus \ --enable-evolution2\ - --disable-graphite\ + --enable-graphite --without-system-graphite \ --enable-gio\ --disable-gnome-vfs\ --disable-kde\ @@ -348,7 +351,6 @@ build() { #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool -#--with-system-graphite --enable-graohite ? #--with-servlet-api-jar=JARFILE # see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 # --with-system-saxon\ @@ -402,7 +404,7 @@ package_libreoffice-common() { etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf) groups=('libreoffice') - provides=('go-openoffice' 'libreoffice') + provides=('go-openoffice') conflicts=('go-openoffice') replaces=('go-openoffice' 'openoffice-base' 'libreoffice') @@ -446,6 +448,7 @@ package_libreoffice-base() { optdepends=() backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do @@ -467,6 +470,7 @@ package_libreoffice-calc() { optdepends=() backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do @@ -488,6 +492,7 @@ package_libreoffice-draw() { optdepends=() backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do @@ -530,6 +535,7 @@ package_libreoffice-impress() { optdepends=('mesa: for the OGLTrans extension') backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do @@ -572,6 +578,7 @@ package_libreoffice-math() { optdepends=() backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do @@ -652,6 +659,7 @@ package_libreoffice-writer() { optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 70b91af17..2f73f333a 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,30 +1,22 @@ -# $Id: PKGBUILD 131270 2011-07-12 17:27:06Z andrea $ +# $Id: PKGBUILD 134573 2011-08-06 08:14:08Z andrea $ # Maintainer: Andreas Radke # Contributor: eric # Contributor: Damir Perisa pkgname=raptor -pkgver=2.0.3 -pkgrel=3 +pkgver=2.0.4 +pkgrel=1 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64') url="http://librdf.org/raptor" depends=('libxml2>=2.7.8' 'curl>=7.21.7' 'zlib>=1.2.5' 'libxslt>=1.1.26') license=('LGPL') options=('!libtool') -source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz" - 'Allow-instead-of-in-TRiG.patch') -md5sums=('46eff4b20f8752d1146a3e0c8b2168dd' - '73cfb0c1098ded4eff8c7f64bcaa5471') +source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz") +md5sums=('46eff4b20f8752d1146a3e0c8b2168dd') build() { - cd ${srcdir}/raptor2-${pkgver} - - # see http://bugs.librdf.org/mantis/view.php?id=451 - patch -p1 -i "${srcdir}"/Allow-instead-of-in-TRiG.patch - - # fix build with curl >= 7.21.2 - sed -i '/#include /d' src/raptor_internal.h + cd "${srcdir}"/raptor2-${pkgver} ./configure --prefix=/usr \ --disable-static \ @@ -33,6 +25,7 @@ build() { } package() { - cd ${srcdir}/raptor2-${pkgver} - make prefix=${pkgdir}/usr install + cd "${srcdir}"/raptor2-${pkgver} + make prefix="${pkgdir}"/usr install } +md5sums=('0373efb8d85dc872bc7bb5b1c69299fb') diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD index 949804063..85ea14d13 100644 --- a/extra/redland/PKGBUILD +++ b/extra/redland/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 129914 2011-06-29 19:31:01Z andrea $ +# $Id: PKGBUILD 134578 2011-08-06 08:18:12Z andrea $ # Maintainer: AndyRTR # Contributor: Francois Charette pkgbase=redland epoch=1 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') -pkgver=1.0.13 -pkgrel=4 +pkgver=1.0.14 +pkgrel=1 url="http://librdf.org/" license=("GPL") arch=('i686' 'x86_64') -makedepends=('rasqal>=0.9.26' 'raptor>=2.0.3' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') +makedepends=('rasqal>=0.9.26' 'raptor>=2.0.4' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') options=('!libtool') source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz rpath.diff) -md5sums=('96c15f36f842ad7e1c9d225e4ca97b68' +md5sums=('3400579d137da82c4175debf9f6d53ba' 'acc85e784f01a656bd56777f95880787') build() { @@ -34,7 +34,7 @@ build() { package_redland() { pkgdesc="Library that provides a high-level interface to RDF data" - depends=('rasqal>=0.9.26' 'raptor>=2.0.3' 'libtool') + depends=('rasqal>=0.9.26' 'raptor>=2.0.4' 'libtool') cd ${srcdir}/${pkgbase}-${pkgver} make DESTDIR=${pkgdir} install diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index fd610c59d..bad4099ab 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 133416 2011-07-27 23:26:32Z andrea $ +# $Id: PKGBUILD 134583 2011-08-06 08:22:40Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=soprano -pkgver=2.6.50git20110728 +pkgver=2.7.0 pkgrel=1 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64') @@ -11,9 +11,8 @@ url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso') makedepends=('cmake' 'openjdk6' 'doxygen') -#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=soprano.git&a=snapshot&h=a2f8207cc83fb33253d548eaca8029c8f836addf&fmt=tbz2") -md5sums=('1d7f99d7d5954fc88e4f7653aa89862e') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('52f216c82e731499bb25bf3b4cf0eecb') build() { cd "${srcdir}" @@ -21,7 +20,7 @@ build() { cd build . /etc/profile.d/openjdk6.sh # we need the rpath - cmake ../${pkgname} \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD index 8bc4d8721..00801f6f1 100644 --- a/extra/taglib/PKGBUILD +++ b/extra/taglib/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 118894 2011-04-09 10:13:00Z andrea $ +# $Id: PKGBUILD 134613 2011-08-06 13:04:31Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=taglib pkgver=1.7 -pkgrel=1 +pkgrel=3 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats" arch=('i686' 'x86_64') url="http://developer.kde.org/~wheeler/taglib.html" license=('GPL2') depends=('sh' 'zlib' 'gcc-libs') makedepends=('cmake' 'pkgconfig') -source=(http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz) +source=("http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz" + 'ape-idev2.patch') options=('!libtool') -md5sums=('6a7e312668f153fa905a81714aebc257') +md5sums=('6a7e312668f153fa905a81714aebc257' + 'c7c165d99acf01456351ba39ff7056cb') build() { - cd ${srcdir} + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/ape-idev2.patch + + cd "${srcdir}" mkdir build cd build - cmake ../$pkgname-$pkgver \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_MP4=ON \ @@ -28,6 +33,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/extra/taglib/ape-idev2.patch b/extra/taglib/ape-idev2.patch new file mode 100644 index 000000000..9c58da420 --- /dev/null +++ b/extra/taglib/ape-idev2.patch @@ -0,0 +1,12 @@ +diff -Nur taglib-1.7.orig/taglib/ape/apeproperties.cpp taglib-1.7/taglib/ape/apeproperties.cpp +--- taglib-1.7.orig/taglib/ape/apeproperties.cpp 2011-03-12 00:15:38.000000000 +1100 ++++ taglib-1.7/taglib/ape/apeproperties.cpp 2011-07-29 21:19:45.984345060 +1000 +@@ -137,7 +137,7 @@ + long ID3v2OriginalSize = 0; + bool hasID3v2 = false; + if(ID3v2Location >= 0) { +- ID3v2::Tag tag(d->file, ID3v2Location, 0); ++ ID3v2::Tag tag(d->file, ID3v2Location); + ID3v2OriginalSize = tag.header()->completeTagSize(); + if(tag.header()->tagSize() > 0) + hasID3v2 = true; diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD index cbce9cc63..f56cd59ec 100644 --- a/extra/wxgtk/PKGBUILD +++ b/extra/wxgtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 119104 2011-04-10 22:59:50Z eric $ +# $Id: PKGBUILD 134643 2011-08-07 02:49:25Z eric $ # Maintainer: Eric Bélanger pkgname=wxgtk -pkgver=2.8.12 +pkgver=2.8.12.1 pkgrel=1 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64') @@ -10,14 +10,14 @@ url="http://wxwidgets.org" license=('custom:wxWindows') depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm') makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'mesa') -#source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) -source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2) -md5sums=('08f81ab60647308058f6ce99712b14f8') -sha1sums=('a8d31ef924ae49e97690646b13d5a2a7be7dda10') +#source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2) +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) +md5sums=('8c06c5941477beee213b4f2fa78be620') +sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') build() { -# cd "${srcdir}/wxPython-src-${pkgver}" - cd "${srcdir}/wxGTK-${pkgver}" + cd "${srcdir}/wxPython-src-${pkgver}" +# cd "${srcdir}/wxGTK-${pkgver}" ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys @@ -28,7 +28,8 @@ build() { } package() { - cd "${srcdir}/wxGTK-${pkgver}" + cd "${srcdir}/wxPython-src-${pkgver}" +# cd "${srcdir}/wxGTK-${pkgver}" make DESTDIR="${pkgdir}" install cd contrib/src make DESTDIR="${pkgdir}" install diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD index ccb46efba..7f02de61a 100644 --- a/extra/wxpython/PKGBUILD +++ b/extra/wxpython/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120105 2011-04-20 04:06:15Z eric $ +# $Id: PKGBUILD 134638 2011-08-07 02:39:42Z eric $ # Maintainer: Eric Bélanger pkgname=wxpython -pkgver=2.8.12.0 +pkgver=2.8.12.1 pkgrel=1 pkgdesc="A wxWidgets GUI toolkit for Python" arch=('i686' 'x86_64') @@ -11,11 +11,13 @@ url="http://www.wxpython.org" depends=('wxgtk' 'python2') makedepends=('mesa') source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) -md5sums=('402e0b81e06f596d849e221a7a76acc6') -sha1sums=('f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4') +md5sums=('8c06c5941477beee213b4f2fa78be620') +sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') build() { cd "${srcdir}/wxPython-src-${pkgver}" + find . -type f -exec sed -i 's/env python/env python2/' {} \; + mv wxPython/wx/tools/Editra/editra wxPython/wx/tools/Editra/Editra ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys -- cgit v1.2.3-54-g00ecf