diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-18 23:03:19 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-18 23:03:19 +0000 |
| commit | c80552b41838a5668458ebb1eb9b0f44ea6fe879 (patch) | |
| tree | d8404bc10128ad69e29c762d116434876e5885a7 | |
| parent | e96f6ac6e912185a495a99af2b0d51b73bd1d044 (diff) | |
Sat Jun 18 23:03:19 UTC 2011
60 files changed, 1720 insertions, 317 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 14ae58ba1..cb05d8e31 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49119 2011-06-11 10:20:21Z giovanni $ +# $Id: PKGBUILD 49493 2011-06-17 22:21:07Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.5 +pkgver=0.8.6 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -20,8 +20,8 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('b6b07a35afe4dbf188f42e932536cca3' - 'f4b80e3b34e34bce68b3f052ff52dee8') +md5sums=('859d856bdcbd12189ffb91c581928ed9' + '253ce4fe5d01f8ff76b63cd3825755ea') build() { cd "${srcdir}/${pkgname}" diff --git a/community/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch index 40d48c03e..4dbf53757 100644 --- a/community/calibre/desktop_integration.patch +++ b/community/calibre/desktop_integration.patch @@ -1,6 +1,6 @@ ---- a/src/calibre/linux.py 2011-05-27 18:42:14.000000000 +0200 -+++ b/src/calibre/linux.py 2011-05-29 14:57:49.000000000 +0200 -@@ -340,51 +340,39 @@ +--- a/src/calibre/linux.py 2011-06-17 19:56:05.000000000 +0200 ++++ b/src/calibre/linux.py 2011-06-18 00:07:46.000000000 +0200 +@@ -339,51 +339,39 @@ with TemporaryDirectory() as tdir: with CurrentDir(tdir): diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD index 6c2216d1a..348a197d0 100644 --- a/community/camlp5/PKGBUILD +++ b/community/camlp5/PKGBUILD @@ -1,46 +1,62 @@ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Nathan Owe <ndowens.aur at gmail dot com> +# Contributor: George Giorgidze <giorgidze@gmail.com> +# Contributor: Massimiliano Brocchini <brocchini@netseven.it> -pkgname=camlp5 -pkgver=6.02.2 +pkgname=('camlp5' 'camlp5-transitional') +pkgver=6.02.3 pkgrel=1 -pkgdesc='A preprocessor-pretty-printer of OCaml.' arch=('i686' 'x86_64') url='http://pauillac.inria.fr/~ddr/camlp5/' license=('BSD') depends=('sh') makedepends=('ocaml') -conflicts=('camlp5-transitional') options=('!makeflags') -source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/${pkgname}-${pkgver}.tgz" - 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-1' - 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-2' - 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-3') -md5sums=('b495bf26355451186c6725ee01add0da' - '3acab547f3c0acb3c09d1d707e6c5ee3' - '2e911c01e7da967bf68deee13e9712c8' - '6fa59ec7c684919b6c8e2eb2bcabcf93') +source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${pkgver}.tgz") +md5sums=('a4f5e0dc13c43d50eb655c8e929f556e') build() { - cd ${pkgname}-${pkgver} + cp -r camlp5-${pkgver} camlp5-transitional-${pkgver} - patch -Np0 -i ${srcdir}/patch-6.02.2-1 - patch -Np0 -i ${srcdir}/patch-6.02.2-2 - patch -Np0 -i ${srcdir}/patch-6.02.2-3 + cd ${srcdir}/camlp5-${pkgver} ./configure \ -prefix '/usr' \ -mandir '/usr/share/man' \ - -strict + -strict - make world.opt + make world.opt + + cd ${srcdir}/camlp5-transitional-${pkgver} + + ./configure \ + -prefix '/usr' \ + -mandir '/usr/share/man' \ + -transitional + + make world.opt } -package() { - cd ${pkgname}-${pkgver} +package_camlp5() { + pkgdesc='A preprocessor-pretty-printer of OCaml.' + conflicts=('camlp5-transitional') + + cd camlp5-${pkgver} + + make DESTDIR=${pkgdir} install + + install -D -m644 LICENSE \ + ${pkgdir}/usr/share/licenses/camlp5/LICENSE +} + +package_camlp5-transitional() { + pkgdesc='A preprocessor-pretty-printer of OCaml. (transitional)' + conflicts=('camlp5') + + cd camlp5-transitional-${pkgver} - make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} install install -D -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + ${pkgdir}/usr/share/licenses/camlp5-transitional/LICENSE } diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD index 4358f1a53..1f88ecec8 100644 --- a/community/dosbox/PKGBUILD +++ b/community/dosbox/PKGBUILD @@ -1,37 +1,46 @@ -# $Id: PKGBUILD 46953 2011-05-13 20:41:08Z andrea $ +# $Id: PKGBUILD 49481 2011-06-17 21:30:52Z jelle $ # Maintainer : +# Contribute : Jelle van der Waa <jelle@vdwaa.nl> # Contributor: James Rayner <james@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=dosbox pkgver=0.74 -pkgrel=1 +pkgrel=2 pkgdesc="An emulator with builtin DOS for running DOS Games" arch=('i686' 'x86_64') url="http://dosbox.sourceforge.net/" license=('GPL') -depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') +depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') makedepends=('mesa') source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" - 'dosbox.png' 'dosbox.desktop') -md5sums=('b9b240fa87104421962d14eee71351e8' - '2aac25fc06979e375953fcc36824dc5e' - '85169ca599028bee8e29e0b3b7b34dd8') + 'dosbox.png' 'dosbox.desktop' 'gcc46.patch') build(){ cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's/png_check_sig/png_sig_cmp/' configure || return 1 - ./configure --prefix=/usr \ - --sysconfdir=/etc/dosbox || return 1 - make || return 1 + patch -Np1 -i $srcdir/gcc46.patch + sed -i 's/png_check_sig/png_sig_cmp/' configure + ./configure --prefix=/usr \ + --sysconfdir=/etc/dosbox + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install + + + # install docs, make does not install them + install -d $pkgdir/usr/share/doc/$pkgname + install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README + install -Dm644 $srcdir/$pkgname-$pkgver/docs/README.video $pkgdir/usr/share/doc/$pkgname/README.video install -Dm644 ${srcdir}/${pkgname}.png \ - ${pkgdir}/usr/share/pixmaps/${pkgname}.png || return 1 + ${pkgdir}/usr/share/pixmaps/${pkgname}.png install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1 + ${pkgdir}/usr/share/applications/${pkgname}.desktop } +md5sums=('b9b240fa87104421962d14eee71351e8' + '2aac25fc06979e375953fcc36824dc5e' + '85169ca599028bee8e29e0b3b7b34dd8' + '3fba2e3c7c43290319b2928f40ed30e5') diff --git a/community/dosbox/gcc46.patch b/community/dosbox/gcc46.patch new file mode 100644 index 000000000..eae9ae63e --- /dev/null +++ b/community/dosbox/gcc46.patch @@ -0,0 +1,12 @@ +diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h +--- dosbox-0.74/include/dos_inc.h 2010-05-10 17:43:54.000000000 +0000 ++++ dosbox-0.74.new//include/dos_inc.h 2011-06-17 20:42:43.982548979 +0000 +@@ -28,6 +28,8 @@ + #include "mem.h" + #endif + ++#include <stddef.h> //for offsetof ++ + #ifdef _MSC_VER + #pragma pack (1) + #endif diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD index f66f426a0..432ccbef4 100644 --- a/community/ginac/PKGBUILD +++ b/community/ginac/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 38846 2011-02-02 01:49:37Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=ginac -pkgver=1.5.8 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 pkgdesc='A set of libraries that allow the creation of integrated systems that embed symbolic manipulations.' arch=('i686' 'x86_64') url='http://www.ginac.de' @@ -12,11 +11,11 @@ license=('GPL') depends=('cln') makedepends=('transfig') options=('!libtool') -source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8693b3c9c3467694032ce9c8b3063d4c') +source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-${pkgver}.tar.bz2") +md5sums=('6d1385b440c00705a368ad51d60a292d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ginac-${pkgver} ./configure \ --prefix=/usr @@ -27,7 +26,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ginac-${pkgver} - make DESTDIR="${pkgdir}" install + make DESTDIR=${pkgdir} install } diff --git a/community/gnofract4d/PKGBUILD b/community/gnofract4d/PKGBUILD index 28e11bcea..4d8b5b0dd 100644 --- a/community/gnofract4d/PKGBUILD +++ b/community/gnofract4d/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=gnofract4d -pkgver=3.13 -pkgrel=2 +pkgver=3.14 +pkgrel=1 pkgdesc='A fractal browser with PyGTK gui' arch=('i686' 'x86_64') url='http://gnofract4d.sourceforge.net' @@ -11,24 +11,20 @@ license=('custom') depends=('pygtk' 'libjpeg' 'libpng' 'shared-mime-info') options=('!strip') install='gnofract4d.install' -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'imageIO.cpp.patch') -md5sums=('d739eb0a61bc518ada8f5b8952298166' - 'ff29a621a27a3836de211c577f6ab9a4') +source=("http://downloads.sourceforge.net/sourceforge/gnofract4d/gnofract4d-${pkgver}.tar.gz") +md5sums=('5c4956ff9aed37b5ad8b984e3673937d') build() { - cd ${pkgname}-${pkgver} - - patch -p0 < ${srcdir}/imageIO.cpp.patch + cd gnofract4d-${pkgver} python2 setup.py build } package() { - cd ${pkgname}-${pkgver} + cd gnofract4d-${pkgver} python2 setup.py install --root=${pkgdir} --optimize=1 install -D -m644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + ${pkgdir}/usr/share/licenses/gnofract4d/COPYING } diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD index f3f1c41d0..3cc26cea6 100644 --- a/community/intel-tbb/PKGBUILD +++ b/community/intel-tbb/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=3.0_20101215 +pkgver=3.0_20110427 pkgrel=1 pkgdesc='An award-winning C++ runtime library that abstracts the low-level threading details necessary for optimal multi-core performance.' arch=('i686' 'x86_64') url='http://www.threadingbuildingblocks.org/' license=('GPL') -source=("http://www.threadingbuildingblocks.org/uploads/77/164/3.0%20Update%205/tbb30_20101215oss_src.tgz") -md5sums=('d1f65b7ba8bafda5a8616dfc8159ea05') +source=("http://threadingbuildingblocks.org/uploads/77/171/3.0%20update%207/tbb30_20110427oss_src.tgz") +md5sums=('ba406f4767592179e7930e790036f00a') build() { cd tbb${pkgver/\./}oss diff --git a/community/mediatomb/PKGBUILD b/community/mediatomb/PKGBUILD index 56780af99..4b1245ce6 100644 --- a/community/mediatomb/PKGBUILD +++ b/community/mediatomb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 36085 2010-12-27 00:44:09Z jconder $ +# $Id: PKGBUILD 49488 2011-06-17 21:55:59Z jelle $ # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Nikhil Bysani <nikron@gmail.com> # Contributor: Mika Hynnä <igheax@gmail.com> @@ -6,23 +6,26 @@ pkgname=mediatomb pkgver=0.12.1 -pkgrel=3 +pkgrel=4 pkgdesc="Free UPnP/DLNA media server" arch=('i686' 'x86_64') url="http://mediatomb.cc/" license=('GPL') -depends=('libexif' 'taglib' 'sqlite3' 'spidermonkey' 'curl' 'ffmpegthumbnailer') +depends=('libexif' 'libmp4v2' 'taglib' 'sqlite3' 'spidermonkey' 'curl' 'ffmpegthumbnailer') backup=('etc/conf.d/mediatomb') install=mediatomb.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'mediatomb.rc' - 'mediatomb.conf') + 'mediatomb.conf' + 'gcc46.patch') md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2' 'aa1191ec508d8bd4b3b9a5fe48efc079' - 'bec297e4178332a26b42bbde873b94cd') + 'bec297e4178332a26b42bbde873b94cd' + '0ae34c0d73b76e3d215887834c3c08cf') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/gcc46.patch ./configure --prefix=/usr \ --disable-mysql \ @@ -39,5 +42,5 @@ package() { install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb" install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb" - mkdir -p "$pkgdir/var/lib/mediatomb" + install -d "$pkgdir/var/lib/mediatomb" } diff --git a/community/mediatomb/gcc46.patch b/community/mediatomb/gcc46.patch new file mode 100644 index 000000000..0f4fe490f --- /dev/null +++ b/community/mediatomb/gcc46.patch @@ -0,0 +1,10 @@ +--- a/src/zmm/object.h ++++ b/src/zmm/object.h +@@ -33,6 +33,7 @@ + #define __ZMM_OBJECT_H__ + + #include <new> // for size_t ++#include <cstddef> + #include "atomic.h" + + namespace zmm diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index c3e44c8fa..c19206216 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=1.8.1 -pkgrel=2 +pkgver=1.8.2 +pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64') url='http://www.mongodb.org' @@ -16,25 +16,15 @@ backup=('etc/mongodb.conf') install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' - 'mongodb.conf' - 'gcc46fixes.diff' - 'gcc46fixes2.diff') -md5sums=('e75a5cae641a53760df8cb866ad5d929' + 'mongodb.conf') +md5sums=('951fb1a75d90fc822cf4528585a970cf' '859f8f9bb32ef2bd21fec55ae9a87d0a' - '9e0ea3f96732bb7811f0b64dace56440' - 'e90c78350e25df2d24f98e4767677d4b' - '5097de6ce2c347c3703ab8cf5a611052') + '9e0ea3f96732bb7811f0b64dace56440') build() { export SCONSFLAGS="$MAKEFLAGS" - cd ${pkgname}-src-r${pkgver} - - patch -Np1 -i ${srcdir}/gcc46fixes.diff - patch -Np1 -i ${srcdir}/gcc46fixes2.diff - - # scons is "special" - sed -i 's/-Wall -Wsign-compare/& -DBOOST_FILESYSTEM_VERSION=2/' SConstruct + cd mongodb-src-r${pkgver} scons \ all \ @@ -42,7 +32,7 @@ build() { } package() { - cd ${pkgname}-src-r${pkgver} + cd mongodb-src-r${pkgver} scons \ install \ diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 880792b3d..1711534b8 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127301 2011-06-12 14:10:02Z bisson $ +# $Id: PKGBUILD 127641 2011-06-17 11:09:38Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> @@ -7,7 +7,7 @@ pkgname=bitlbee pkgver=3.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64') url='http://www.bitlbee.org/' @@ -31,9 +31,11 @@ build() { --etcdir=/etc/bitlbee \ --pidfile=/var/run/bitlbee/bitlbee.pid \ --ipcsocket=/var/run/bitlbee/bitlbee.sock \ + --systemdsystemunitdir=/lib/systemd/system \ + --ssl=openssl \ --strip=0 \ --otr=1 \ - --ssl=openssl + make } diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD index a7ad9827c..29a5da889 100644 --- a/extra/bluez-hcidump/PKGBUILD +++ b/extra/bluez-hcidump/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 108242 2011-01-30 15:00:57Z andrea $ +# $Id: PKGBUILD 127665 2011-06-17 17:18:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy carrier <geoffroy@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=bluez-hcidump -pkgver=2.0 +pkgver=2.1 pkgrel=1 pkgdesc="Bluetooth HCI package analyzer" url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') depends=('glibc' 'bluez') -source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz) -md5sums=('5c2e3ef0a68b2845047867ba51ff8ac9') +source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.gz") +md5sums=('b160f0672276398344eebe9df1b37a2c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index e99bbd0d4..554c12923 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 117363 2011-03-31 21:07:25Z andrea $ +# $Id: PKGBUILD 127670 2011-06-17 17:20:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=cfitsio -pkgver=3.270 -_pkgver=3270 +pkgver=3.280 +_pkgver=3280 pkgrel=1 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format" arch=('i686' 'x86_64') url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" license=('GPL2') +depends=('glibc') makedepends=('pkgconfig') options=('!libtool') source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${_pkgver}.tar.gz") -md5sums=('2a72b323de3f40ad1a671f2167500336') +md5sums=('fdb9c0f51678b47e78592c70fb5dc793') build() { - cd ${srcdir}/${pkgname} + cd "${srcdir}"/${pkgname} ./configure --prefix=/usr make shared } package() { - cd ${srcdir}/${pkgname} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname} + make DESTDIR="${pkgdir}" install } diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 2ddf74e03..c717425a3 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 126330 2011-06-04 22:35:21Z andyrtr $ +# $Id: PKGBUILD 127716 2011-06-17 19:45:36Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.4.6 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" -makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' +makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' 'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme') source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-avahi.patch @@ -16,7 +16,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 #options=('!emptydirs') md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1' '8ebd390197501ffd709f0ee546937fd5' - '5c85b7d8d2ddd02c2c64955cebbf55ea' + '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17') @@ -32,14 +32,36 @@ build() { autoconf -I config-scripts ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \ - --with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \ - --disable-ldap --libdir=/usr/lib --enable-raw-printing \ - --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\ - --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS" + --libdir=/usr/lib \ + --with-logdir=/var/log/cups \ + --with-docdir=/usr/share/cups/doc \ + --with-cups-user=daemon \ + --with-cups-group=lp \ + --enable-pam=yes \ + --disable-ldap \ + --enable-raw-printing \ + --enable-dbus --with-dbusdir=/etc/dbus-1 \ + --enable-ssl=yes --enable-gnutls \ + --disable-threads \ + --enable-avahi\ + --with-php=/usr/bin/php-cgi \ + --with-pdftops=pdftops \ + --with-optim="$CFLAGS" + + #reminder + #Restored support for GNU TLS and OpenSSL with threading enabled (STR #3605) in cups 1.5b1 + make } +check() { + cd "$srcdir/$pkgbase-$pkgver" + #httpAddrGetList(workstation64): FAIL + #1 TESTS FAILED! + #make[1]: *** [testhttp] Error 1 + make -k check || /bin/true +} + package_libcups() { pkgdesc="The CUPS Printing System - client libraries and headers" depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi') @@ -66,12 +88,13 @@ backup=(etc/cups/cupsd.conf etc/logrotate.d/cups etc/pam.d/cups etc/xinetd.d/cups-lpd) -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme') +depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme') optdepends=('php: for included phpcups.so module' 'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly' - 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly') + 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly' + 'xdg-utils: xdg .desktop file support') cd ${srcdir}/${pkgbase}-${pkgver} make BUILDROOT=${pkgdir} install-data install-exec @@ -95,7 +118,9 @@ optdepends=('php: for included phpcups.so module' # install ssl directory where to store the certs, solves some samba issues install -dm700 -g lp ${pkgdir}/etc/cups/ssl - install -dm511 -g lp ${pkgdir}/var/run/cups/certs + # remove directory from package, we create it in cups rc.d file + rm -rf ${pkgdir}/var/run +# install -dm511 -g lp ${pkgdir}/var/run/cups/certs # install some more configuration files that will get filled by cupsd touch ${pkgdir}/etc/cups/printers.conf diff --git a/extra/cups/cups b/extra/cups/cups index 4afaf5a7c..744c8e663 100755 --- a/extra/cups/cups +++ b/extra/cups/cups @@ -1,38 +1,68 @@ #!/bin/bash +daemon_name=cupsd + . /etc/rc.conf . /etc/rc.d/functions +#. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} -PID=`pidof -o %PPID /usr/sbin/cupsd` case "$1" in start) - stat_busy "Starting CUPS Daemon" - [ -z "$PID" ] && /usr/sbin/cupsd - if [ $? -gt 0 ]; then - stat_fail + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi else - echo $(pidof -o %PPID -x /usr/sbin/cupsd) > /var/run/cups.pid - add_daemon cups - stat_done + stat_fail + exit 1 fi ;; + stop) - stat_busy "Stopping CUPS Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # if [ $? -gt 0 ]; then stat_fail + exit 1 else - rm /var/run/cups.pid - rm_daemon cups + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name stat_done fi ;; + restart) $0 stop - sleep 1 + sleep 3 $0 start ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart|status}" esac + exit 0 diff --git a/extra/cups/cups.install b/extra/cups/cups.install index e92e17ed3..c4307912b 100644 --- a/extra/cups/cups.install +++ b/extra/cups/cups.install @@ -1,5 +1,7 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi echo ">> If you use an HTTPS connection to CUPS, the first time you access" echo ">> the interface it may take a very long time before the site comes up." echo ">> This is because the first request triggers the generation of the CUPS" @@ -7,9 +9,13 @@ post_install() { } post_upgrade() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi } post_remove() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi } diff --git a/extra/dotconf/PKGBUILD b/extra/dotconf/PKGBUILD index 14b7bb6f1..c33a2d0e5 100644 --- a/extra/dotconf/PKGBUILD +++ b/extra/dotconf/PKGBUILD @@ -1,38 +1,28 @@ -# $Id$ +# $Id: PKGBUILD 127711 2011-06-17 18:24:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Chris Brannon <cmbrannon@cox.net> pkgname=dotconf pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc='A C library for parsing configuration files' -url="http://www.opentts.org/projects/dotconf/" +url="https://github.com/williamh/dotconf" arch=('i686' 'x86_64') depends=('glibc') makedepends=('pkgconfig' 'findutils') license=('LGPL2.1') -source=("http://files.opentts.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('35c19ec9b96648f53e987e47e52dbc4c') +source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/williamh/${pkgname}/tarball/v${pkgver}") +md5sums=('36bfdde245072fc2f4f5766b7db97c45') options=('!libtool') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/williamh-${pkgname}-4cd7b3a + autoreconf -i ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/williamh-${pkgname}-4cd7b3a make DESTDIR="${pkgdir}" install - - # There are no manpages. Docu consists of textfiles and small examples. - # "make install" didn't install the docu, so do it manually. - install -d ${pkgdir}/usr/share/doc/${pkgname} - cp -a doc/*.txt README examples/ ${pkgdir}/usr/share/doc/${pkgname} - # Get rid of files specific to Microsoft products: - find ${pkgdir}/usr/share/doc/${pkgname} -name '*.dsp' | xargs rm -f - - # Dotconf uses libpool internally for memory management. No need to install. - rm -f ${pkgdir}/usr/lib/libpool.a - rm -f ${pkgdir}/usr/include/libpool.h } diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD index cde1743e8..b6081ed88 100644 --- a/extra/fbida/PKGBUILD +++ b/extra/fbida/PKGBUILD @@ -1,42 +1,27 @@ -# $Id: PKGBUILD 70970 2010-03-02 20:48:52Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: damir <damir@archlinux.org> +# $Id: PKGBUILD 127739 2011-06-18 00:11:19Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fbida -pkgver=2.07 -pkgrel=5 +pkgver=2.08 +pkgrel=1 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran" arch=('i686' 'x86_64') -url="http://linux.bytesex.org/fbida/" +url="http://www.kraxel.org/blog/linux/fbida/" license=('GPL2') -depends=('giflib' 'libtiff' 'libjpeg' 'libexif' 'lesstif' 'libxpm' 'libpng' 'libx11' 'libxext' 'fontconfig') +depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig') +makedepends=('libxpm') optdepends=('ghostscript: to use fbgs') -replaces=('fbi') -provides=('fbi') -source=(http://dl.bytesex.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz libpng-1.4.patch \ - transupp.h transupp.c jinclude.h) -md5sums=('3e05910fb7c1d9b2bd3e272d96db069c' '31b5a5318c16808d55403e06110ff5a5'\ - '785d928f4ff04e06bd2c8acc6b6c5e7b' 'f2d6f905c4ce6098f6c1af77a0a4eef8'\ - 'dbde79bc104a2caa9316cc2a9df7fd25') -sha1sums=('4758178299e09d5251b9cf20337a81cc20553d45' 'dcb39c82e7e6f4d7d6e8d0e95c661f83a2655c7f'\ - '5028318704fbc8f476f858d24b39cf454a16fe85' '0d9f58703d2eb4ce2d11f42a1ad01d958efe3312'\ - '31ab682733b096b3a98c0a35f9b54a7936e480d5') +source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('9b3693ab26a58194e36b479bffb61ed0') +sha1sums=('597e0953c68112bf7c363b1ccaa94e72100b116a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../libpng-1.4.patch || return 1 - -# Using source code from libjpeg 8a - rm jpeg/* - cp ${srcdir}/transupp.h jpeg/ - cp ${srcdir}/transupp.c jpeg/ - cp ${srcdir}/jinclude.h jpeg/ - - make Make.config || return 1 - for config in HAVE_LIB{SANE,CURL,LIRC}; do - sed -i "s/$config.*/$config := no/" Make.config || return 1 - done - make CC=gcc || return 1 - make DESTDIR="${pkgdir}" prefix=/usr install || return 1 + sed -i 's/ungif/gif/' GNUmakefile + make } +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" prefix=/usr install +} diff --git a/extra/gnupg/PKGBUILD b/extra/gnupg/PKGBUILD index 56b0c2274..997075abb 100644 --- a/extra/gnupg/PKGBUILD +++ b/extra/gnupg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 101334 2010-11-28 23:08:17Z tpowa $ +# $Id: PKGBUILD 127729 2011-06-17 22:03:38Z andyrtr $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=gnupg pkgver=1.4.11 -pkgrel=2 +pkgrel=3 pkgdesc="GNU Privacy Guard - a PGP replacement tool" arch=('i686' 'x86_64') license=('GPL3') @@ -15,14 +15,21 @@ md5sums=('411744e1ef8ce90b87938c4203f001f1') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/lib # docdir can't be set properly - make || return 1 - ln -s ${pkgname}-${pkgver}/scripts .. + ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --enable-noexecstack + make + #ln -s ${pkgname}-${pkgver}/scripts .. # seems obsolete now } - + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check #All 27 tests passed +} + package () { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install # fix fileconflict with gnupg2 pkg rm ${pkgdir}/usr/share/man/man1/gpg-zip.1 diff --git a/extra/happy/PKGBUILD b/extra/happy/PKGBUILD index 47445be85..ac93ba2bf 100644 --- a/extra/happy/PKGBUILD +++ b/extra/happy/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103748 2010-12-22 17:23:27Z remy $ +# $Id: PKGBUILD 127724 2011-06-17 20:54:42Z eric $ # Maintainer: simo <simo@archlinux.org> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> @@ -10,21 +10,21 @@ url="http://www.haskell.org/happy/" arch=('i686' 'x86_64') license=("custom:BSD3") depends=(gmp) -makedepends=(ghc=7.0.1 haskell-mtl=2.0.1.0) +makedepends=(ghc=7.0.2 haskell-mtl=2.0.1.0) options=(strip) source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('7d4d1425f5068633cd477a2b2216880d') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" runhaskell Setup.lhs configure -O --prefix=/usr runhaskell Setup.lhs build } package() { - cd ${srcdir}/${pkgname}-${pkgver} - runhaskell Setup.lhs copy --destdir=${pkgdir} - install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + runhaskell Setup.lhs copy --destdir="${pkgdir}" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD index 5bfaa6476..30f02eb3c 100644 --- a/extra/libdmtx/PKGBUILD +++ b/extra/libdmtx/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 107616 2011-01-26 22:10:46Z andrea $ +# $Id: PKGBUILD 127675 2011-06-17 17:32:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: jose <jose1711 [at] gmail (dot) com> pkgname=libdmtx -pkgver=0.7.2 -pkgrel=2 +pkgver=0.7.4 +pkgrel=1 pkgdesc="A software for reading and writing Data Matrix 2D barcodes" -url=('http://www.libdmtx.org/') +url="http://www.libdmtx.org/" arch=('i686' 'x86_64') license=('GPL2') -depends=('imagemagick') +depends=('glibc' 'imagemagick') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0684cf3857591e777b57248d652444ae') +md5sums=('d3a4c0becd92895eb606dbdb78b023e2') options=('!libtool') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD index 54427ffd4..0de4645b0 100644 --- a/extra/libindi/PKGBUILD +++ b/extra/libindi/PKGBUILD @@ -3,29 +3,23 @@ # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libindi -pkgver=0.7.2 +pkgver=0.8 pkgrel=1 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation" url="http://www.indilib.org/index.php?title=Main_Page" license=('GPL2') arch=('i686' 'x86_64') -depends=('gcc-libs' 'zlib' 'libnova' 'cfitsio') -makedepends=('pkgconfig' 'cmake') +depends=('libnova' 'cfitsio' 'boost-libs') +makedepends=('pkgconfig' 'cmake' 'boost') provides=('indilib') replaces=('indilib') conflicts=('indilib') options=('!libtool') -source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz" - 'linking-pthread.patch') -md5sums=('a78a77dc2322a46f5bf4c5d75380e8b0' - '1ebc282e259cb0c9c52cad3dadd5e044') +source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz") +md5sums=('ca2b7c56431eb5e08218929e5eb72150') build() { - # fixed upstream - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np2 -i ${srcdir}/linking-pthread.patch - - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -35,6 +29,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 57ce12fce..acdf209ef 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 119766 2011-04-14 20:23:04Z schiv $ +# $Id: PKGBUILD 127604 2011-06-16 17:50:00Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.16.2 -pkgrel=3 +pkgver=0.16.3 +pkgrel=1 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64') license=('GPL') @@ -18,7 +18,7 @@ makedepends=('pkgconfig' 'doxygen') install=${pkgname}.install source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" 'mpd') -md5sums=('dedb75cef8e489f3de5231031876fb77' +md5sums=('6e708c02b0e8c288aec855eecf441a5a' 'e5669c2bff4031928531e52475addeb1') build() { diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 3e5e72eda..8975dc93b 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 122860 2011-05-06 19:46:40Z eric $ +# $Id: PKGBUILD 127745 2011-06-18 02:59:47Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Ben Mazer <blm@groknil.org> pkgname=msmtp pkgver=1.4.24 -pkgrel=1 +pkgrel=2 pkgdesc="A mini smtp client" arch=('i686' 'x86_64') license=('GPL3') url="http://msmtp.sourceforge.net" depends=('gnutls' 'libidn') +makedepends=('texlive-core') provides=('smtp-forwarder') -install=${pkgname}.install +install=msmtp.install source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2) md5sums=('3ed704fbd3e7419cab5c65bb7928d9ba') @@ -19,12 +20,19 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls make + make -C doc html pdf } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" -C doc install-html install-pdf - # this can not be the default - #install -Dm644 doc/msmtprc-system.example "${pkgdir}"/etc/msmtprc +# Installing example configs and scripts to /usr/share/doc/msmtp +# as they are not installed by default (Debian and Gentoo do it this way) + install -d "${pkgdir}/usr/share/doc/msmtp" + cp -r scripts/{find_alias,msmtp-gnome-tool,msmtpqueue,msmtpq,set_sendmail} "${pkgdir}/usr/share/doc/msmtp/" + install -D -m644 doc/*.example "${pkgdir}/usr/share/doc/msmtp/" + + install -D -m644 scripts/vim/msmtp.vim "${pkgdir}/usr/share/vim/vimfiles/syntax/msmtp.vim" } diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index 9431d307f..e95119cfb 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 101379 2010-11-29 00:46:39Z andrea $ +# $Id: PKGBUILD 127685 2011-06-17 17:49:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Keerthi <keerthi.linux@gmail.com> pkgname=obex-data-server -pkgver=0.4.5 -pkgrel=3 +pkgver=0.4.6 +pkgrel=1 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64') url="http://wiki.muiline.com/obex-data-server" license=('GPL') depends=('dbus-glib' 'openobex' 'imagemagick') source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz") -md5sums=('8b11e7527c1e3a36a2a9a0c52816ec7b') +md5sums=('961ca5db6fe9c97024e133cc6203cc4d') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD index 9d1109f93..1f9637dc0 100644 --- a/extra/pycups/PKGBUILD +++ b/extra/pycups/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 118849 2011-04-08 14:57:23Z andrea $ +# $Id: PKGBUILD 127690 2011-06-17 17:53:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: nesl247 <nesl247@gmail.com> pkgname=pycups -pkgver=1.9.55 +pkgver=1.9.57 pkgrel=1 pkgdesc="Python CUPS Bindings" url="http://cyberelk.net/tim/software/pycups/" @@ -11,7 +11,7 @@ arch=('i686' 'x86_64') license=('GPL') depends=('libcups' 'python2') source=("http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b2a5082cfacc3350b53e7fee188b2dc5') +md5sums=('64e328e2c628e41862efe97f04e66da4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/pysmbc/PKGBUILD b/extra/pysmbc/PKGBUILD index b3d4f91e8..6a0855ee6 100644 --- a/extra/pysmbc/PKGBUILD +++ b/extra/pysmbc/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 103364 2010-12-18 14:48:53Z andrea $ +# $Id: PKGBUILD 127695 2011-06-17 17:55:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Shane Peelar <lookatyouhacker@gm@il(d0t)c0m> pkgname=pysmbc -pkgver=1.0.10 +pkgver=1.0.11 pkgrel=1 -pkgdesc="Python libsmbclient bindings" +pkgdesc="Python bindings for libsmbclient" arch=('i686' 'x86_64') -url="http://cyberelk.net/tim/software/pysmbc/" +url="http://pypi.python.org/pypi/pysmbc/" license=('GPL') depends=('python2' 'smbclient') -source=("http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('72cc12d6c037c68ca81355151a58083b') +source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('8593053cfe3cc0b79d8c4ab892044d4b') build(){ - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" python2 setup.py build } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" python2 setup.py install --root="$pkgdir" --optimize=1 } diff --git a/extra/rcs/PKGBUILD b/extra/rcs/PKGBUILD index a9edf2fe8..b034c7cda 100644 --- a/extra/rcs/PKGBUILD +++ b/extra/rcs/PKGBUILD @@ -1,22 +1,31 @@ -# $Id: PKGBUILD 78028 2010-04-19 08:23:42Z dgriffiths $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 127635 2011-06-17 10:04:08Z bisson $ +# Contributor: dorphell <dorphell@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + pkgname=rcs pkgver=5.7 -pkgrel=5 -pkgdesc="Revision Control System" +pkgrel=6 +pkgdesc='Revision Control System' arch=('i686' 'x86_64') url="http://www.cs.purdue.edu/homes/trinkle/RCS/" license=('GPL') -depends=('glibc') -source=(http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${pkgver}.tar.Z \ - rcs-5.7.patch) -md5sums=('423282f0edb353296d9f3498ab683abf' '7ae4b7cb79259ccdf5eee0ab94fe2a2a') +source=("http://www.cs.purdue.edu/homes/trinkle/RCS/rcs-${pkgver}.tar.Z" \ + 'path.patch') +sha1sums=('976774bda26a7743b8375797f92fbd18e51ac7a2' + '0f0be997e5d018e0d638b5f16430423ccb3774be') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ../rcs-5.7.patch || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 - make prefix=${pkgdir}/usr man1dir=${pkgdir}/usr/share/man/man1 \ - man5dir=${pkgdir}/usr/share/man/man5 install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../path.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make install \ + prefix="${pkgdir}"/usr \ + man1dir="${pkgdir}"/usr/share/man/man1 \ + man5dir="${pkgdir}"/usr/share/man/man5 \ + } diff --git a/extra/rcs/path.patch b/extra/rcs/path.patch new file mode 100644 index 000000000..0f062b357 --- /dev/null +++ b/extra/rcs/path.patch @@ -0,0 +1,67 @@ +diff -Naur rcs-5.7-orig/src/conf.heg rcs-5.7/src/conf.heg +--- rcs-5.7-orig/src/conf.heg 1995-06-02 11:19:00.000000000 -0700 ++++ rcs-5.7/src/conf.heg 2004-11-29 12:41:37.000000000 -0800 +@@ -210,10 +210,10 @@ + /* Do struct stat s and t describe the same file? Answer d if unknown. */ + #define same_file(s,t,d) ((s).st_ino==(t).st_ino && (s).st_dev==(t).st_dev) + #define has_utimbuf 1 /* Does struct utimbuf work? */ +-#define CO "/usr/local/bin/co" /* name of 'co' program */ ++#define CO "/usr/bin/co" /* name of 'co' program */ + #define COMPAT2 0 /* Are version 2 files supported? */ +-#define DIFF "/usr/local/bin/diff" /* name of 'diff' program */ +-#define DIFF3 "/usr/local/bin/diff3" /* name of 'diff3' program */ ++#define DIFF "/usr/bin/diff" /* name of 'diff' program */ ++#define DIFF3 "/usr/bin/diff3" /* name of 'diff3' program */ + #define DIFF3_BIN 1 /* Is diff3 user-visible (not the /usr/lib auxiliary)? */ + #define DIFFFLAGS "-an" /* Make diff output suitable for RCS. */ + #define DIFF_L 1 /* Does diff -L work? */ +@@ -221,7 +221,7 @@ + #define DIFF_FAILURE 1 /* DIFF status if differences are found */ + #define DIFF_TROUBLE 2 /* DIFF status if trouble */ + #define ED "/bin/ed" /* name of 'ed' program (used only if !DIFF3_BIN) */ +-#define MERGE "/usr/local/bin/merge" /* name of 'merge' program */ ++#define MERGE "/usr/bin/merge" /* name of 'merge' program */ + #define TMPDIR "/tmp" /* default directory for temporary files */ + #define SLASH '/' /* principal filename separator */ + #define SLASHes '/' /* `case SLASHes:' labels all filename separators */ +diff -Naur rcs-5.7-orig/src/conf.sh rcs-5.7/src/conf.sh +--- rcs-5.7-orig/src/conf.sh 1995-06-15 23:19:24.000000000 -0700 ++++ rcs-5.7/src/conf.sh 2004-11-29 12:42:28.000000000 -0800 +@@ -32,7 +32,7 @@ + # and can be inspected for clues otherwise. + + # The Makefile overrides the following defaults. +-: ${RCSPREFIX=/usr/local/bin/} ++: ${RCSPREFIX=/usr/bin/} + : ${ALL_CFLAGS=-Dhas_conf_h} + : ${CC=cc} + : ${COMPAT2=0} +@@ -42,8 +42,8 @@ + : ${DIFFFLAGS=-an} + : ${DIFF_L=1} + : ${DIFF_SUCCESS=0} ${DIFF_FAILURE=1} ${DIFF_TROUBLE=2} +-: ${ED=/bin/ed} +-: ${SENDMAIL='"/usr/lib/sendmail"'} ++: ${ED=/usr/bin/ed} ++: ${SENDMAIL='"/usr/sbin/sendmail"'} + # : ${LDFLAGS=} ${LIBS=} tickles old shell bug + + C="$CC $ALL_CFLAGS" +@@ -73,17 +73,6 @@ + ech='echo -n' dots='... ' + esac + +-$ech >&3 "$0: testing permissions $dots" +-rm -f a.d && +-date >a.d && +-chmod 0 a.d && +-{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && { +- echo >&3 "$n$0: This command should not be run with superuser permissions." +- exit 1 +-} +-echo >&3 OK +-rm -f a.d || exit +- + $ech >&3 "$0: testing compiler for plausibility $dots" + echo 'main() { return 0; }' >a.c + rm -f a.exe a.out || exit diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 57a5f4fac..510afc089 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 122180 2011-05-02 17:30:24Z andrea $ +# $Id: PKGBUILD 127700 2011-06-17 17:59:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.12.2 +pkgver=4.12.3 pkgrel=1 arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('9df80f88e0e4022cdd8a8891c6c38048') +md5sums=('d0f1fa60494db04b4d115d4c2d92f79e') build() { cd "${srcdir}" diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 0cc06257a..39bcaabfd 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 117485 2011-04-04 07:01:13Z andrea $ +# $Id: PKGBUILD 127705 2011-06-17 18:04:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=1 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" @@ -12,10 +12,10 @@ arch=('i686' 'x86_64') license=('GPL') makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2') source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz") -md5sums=('34a0ce9a11be5695b3b4065e4f17b009') +md5sums=('658516848c6ced2b1acc6d3525d27204') build() { - cd ${srcdir}/${pkgbase}-${pkgver} + cd "${srcdir}"/${pkgbase}-${pkgver} sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ @@ -39,8 +39,8 @@ package_system-config-printer-common() { provides=("system-config-printer=${pkgver}") conflicts=('system-config-printer') - cd ${srcdir}/${pkgbase}-${pkgver} - install -d ${pkgdir}/usr/share/${pkgbase} + cd "${srcdir}"/${pkgbase}-${pkgver} + install -d "${pkgdir}"/usr/share/${pkgbase} install -m644 config.py \ debug.py \ installpackage.py \ @@ -52,27 +52,27 @@ package_system-config-printer-common() { smburi.py \ statereason.py \ XmlHelper.py \ - ${pkgdir}/usr/share/${pkgbase}/ + "${pkgdir}"/usr/share/${pkgbase}/ install -m755 pysmb.py \ - ${pkgdir}/usr/share/${pkgbase}/ + "${pkgdir}"/usr/share/${pkgbase}/ - install -d ${pkgdir}/etc/dbus-1/system.d/ + install -d "${pkgdir}"/etc/dbus-1/system.d/ install -m644 dbus/com.redhat.NewPrinterNotification.conf \ dbus/com.redhat.PrinterDriversInstaller.conf \ - ${pkgdir}/etc/dbus-1/system.d/ - install -d ${pkgdir}/etc/cupshelpers/ - install -m644 xml/preferreddrivers.xml ${pkgdir}/etc/cupshelpers/ + "${pkgdir}"/etc/dbus-1/system.d/ + install -d "${pkgdir}"/etc/cupshelpers/ + install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/ - install -d ${pkgdir}/lib/udev/rules.d + install -d "${pkgdir}"/lib/udev/rules.d install -m755 udev/{udev-add-printer,udev-configure-printer} \ - ${pkgdir}/lib/udev/ + "${pkgdir}"/lib/udev/ install -m644 udev/70-printers.rules \ - ${pkgdir}/lib/udev/rules.d + "${pkgdir}"/lib/udev/rules.d for file in build/lib/cupshelpers/*.py; do install -Dm644 $file \ - ${pkgdir}/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file) + "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file) done } @@ -81,11 +81,11 @@ package_system-config-printer-gnome() { depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify') optdependence=('gnome-keyring: password management') - cd ${srcdir}/${pkgbase}-${pkgver} + cd "${srcdir}"/${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install # files provided by system-config-printer-common - cd ${pkgdir}/usr/share/${pkgbase} + cd "${pkgdir}"/usr/share/${pkgbase} rm config.py \ debug.py \ installpackage.py \ @@ -98,8 +98,8 @@ package_system-config-printer-gnome() { statereason.py \ XmlHelper.py \ pysmb.py - rm -r ${pkgdir}/etc/dbus-1/ - rm -r ${pkgdir}/etc/cupshelpers/ - rm -r ${pkgdir}/etc/udev/ - rm -r ${pkgdir}/usr/lib/ + rm -r "${pkgdir}"/etc/dbus-1/ + rm -r "${pkgdir}"/etc/cupshelpers/ + rm -r "${pkgdir}"/etc/udev/ + rm -r "${pkgdir}"/usr/lib/ } diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD index 4180ba36c..c1c867847 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49162 2011-06-12 18:11:21Z lcarlier $ +# $Id: PKGBUILD 49477 2011-06-17 12:30:44Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -10,9 +10,9 @@ _git=true #_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110612 + pkgver=7.10.99.git20110616 else - pkgver=7.10.2 + pkgver=7.10.3 fi pkgrel=1 @@ -22,12 +22,12 @@ makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf8 url="http://mesa3d.sourceforge.net" license=('custom') if [ "${_git}" = "true" ]; then - # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a00dd974699e369b1eb292103fbde8bc6adfb87 - source=('ftp://ftp.archlinux.org/other/mesa/mesa-9a00dd974699e369b1eb292103fbde8bc6adfb87.tar.bz2') - md5sums=('77b10baeba21268d2a65440f99f97c12') + # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe + source=('ftp://ftp.archlinux.org/other/mesa/mesa-fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe.tar.bz2') + md5sums=('f9cf11f9fd8f5d2092536fc48fad922f') else - source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch) - md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4') + source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip" nouveau-fix-header.patch) + md5sums=('614d063ecd170940d9ae7b355d365d59' '67c87b77cc2236b52a3b47dad3fbb5d4') fi build() { @@ -68,11 +68,12 @@ build() { --enable-gles2 \ --enable-egl \ --enable-texture-float \ + --enable-shared-dricore \ --enable-32-bit \ --libdir=/usr/lib32 # --enable-gallium-svga \ - # --enable-texture-float (enable floating-point textures and renderbuffers) - http://www.phoronix.com/scan.php?page=news_item&px=OTMzMg - # --enable-shared-dricore - http://bugs.gentoo.org/show_bug.cgi?id=357177 + # --enable-shared-dricore - link DRI modules with shared core DRI routines[default=disabled] http://bugs.gentoo.org/show_bug.cgi?id=357177 + # --enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no] else ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ @@ -110,6 +111,10 @@ package_lib32-libgl() { install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions" bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/" + if [ "${_git}" = "true" ]; then + bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/" + bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/" + fi if [ "${_git}" = "true" ]; then make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install diff --git a/multilib/lib32-llvm/PKGBUILD b/multilib/lib32-llvm/PKGBUILD new file mode 100644 index 000000000..ff7f4f050 --- /dev/null +++ b/multilib/lib32-llvm/PKGBUILD @@ -0,0 +1,153 @@ +# $Id: PKGBUILD 47129 2011-05-17 14:00:02Z lcarlier $ +# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Sebastian Nowicki <sebnow@gmail.com> +# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> +# Contributor: Tobias Kieslich <tobias@justdreams.de> +# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> +# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> +# Contributor: Roberto Alsina <ralsina@kde.org> +# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> + +pkgname=('lib32-llvm') +pkgver=2.9 +_gcc_ver=4.6.0 +pkgrel=1 +arch=('x86_64') +url="http://llvm.org/" +license=('custom:University of Illinois/NCSA Open Source License') +makedepends=('gcc-libs-multilib' 'lib32-libffi' 'python2' "gcc-multilib=$_gcc_ver") +source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tgz + http://llvm.org/releases/$pkgver/clang-$pkgver.tgz + ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz + clang-plugin-loader-registry.patch + cindexer-clang-path.patch + clang-toolchains-gcc-versions.patch + clang-pure64.patch + enable-lto.patch) +md5sums=('793138412d2af2c7c7f54615f8943771' + '634de18d04b7a4ded19ec4c17d23cfca' + '70e23a3dc2b38ecb2bb4d2c48f47295d' + '02c23b4aaca3445b8bf39fddb2f9906e' + '87a7162dbe99e9ffce6c40bd09f5f4f0' + '8da236120a9a287a977b575b8b905c93' + '225ee6b531f8327f34f344a18cb4ec81' + '8f7582d7440e4a8342c3aea9ec714fb4') + +build() { + cd "$srcdir/llvm-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + # Fix symbolic links from OCaml bindings to LLVM libraries + sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml + + # Fix installation directories, ./configure doesn't seem to set them right + sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ + -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \ + -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ + Makefile.config.in + + # Fix insecure rpath (http://bugs.archlinux.org/task/14017) + sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules + + # Get the correct list of symbols to export + # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html + patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch" + + # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) + #patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" + + # Add GCC 4.6.0 to GccVersions (FS#23631) + #patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" + + # Adjust lib paths + #patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" + + # Make -flto work + # Use gold instead of default linker, and always use the plugin + #patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" + + # Apply strip option to configure + _optimized_switch="enable" + [[ $(check_option strip) == n ]] && _optimized_switch="disable" + + # Include location of libffi headers in CPPFLAGS + export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" + + # TODO: Uncomment when clang works with GCC 4.6+ + #_cxx_headers="/usr/include/c++/$_gcc_ver" + #if [[ ! -d $_cxx_headers ]]; then + # error "Couldn't find the C++ headers, PKGBUILD needs fixing!" + # return 1 + #fi + _cxx_headers="/usr/include/c++/clang-$pkgver" + + _32bit_headers="" + if [[ $CARCH == x86_64 ]]; then + # Important for multilib + _32bit_headers="32" + fi + + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib32/llvm \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-libffi \ + --enable-targets=all \ + --disable-expensive-checks \ + --disable-debug-runtime \ + --disable-assertions \ + --with-binutils-include=/usr/include \ + --with-cxx-include-root=$_cxx_headers \ + --with-cxx-include-arch=$CHOST \ + --with-cxx-include-32bit-dir=$_32bit_headers \ + --$_optimized_switch-optimized + + make REQUIRES_RTTI=1 +} + +package() { + pkgdesc="Low Level Virtual Machine (32 bits version)" + depends=('perl' 'lib32-libffi' 'llvm') + + cd "$srcdir/llvm-$pkgver" + + # We move the clang directory out of the tree so it won't get installed and + # then we bring it back in for the clang package + # mv tools/clang "$srcdir" + # -j1 is due to race conditions during the installation of the OCaml bindings + make -j1 DESTDIR="$pkgdir" install + # mv "$srcdir/clang" tools + + # OCaml bindings go to a separate package + # rm -rf "$srcdir"/{ocaml,ocamldoc} + # mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir" + + # Remove duplicate files installed by the OCaml bindings + # rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz} + + # Fix permissions of static libs + chmod -x "$pkgdir"/usr/lib32/llvm/*.a + + # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) + #sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config" + sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/llvm:' "$pkgdir/usr/bin/llvm-config" + mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm/llvm-config" + # Get rid of example Hello transformation + rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.* + + # Symlink the gold plugin where clang expects it + ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so" + + # Add ld.so.conf.d entry + install -d "$pkgdir/etc/ld.so.conf.d" + echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf" + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}} +} diff --git a/multilib/lib32-llvm/cindexer-clang-path.patch b/multilib/lib32-llvm/cindexer-clang-path.patch new file mode 100644 index 000000000..ddaab690e --- /dev/null +++ b/multilib/lib32-llvm/cindexer-clang-path.patch @@ -0,0 +1,10 @@ +--- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 ++++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 +@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP + + // We now have the CIndex directory, locate clang relative to it. + LibClangPath.eraseComponent(); ++ LibClangPath.eraseComponent(); + #endif + + LibClangPath.appendComponent("clang"); diff --git a/multilib/lib32-llvm/clang-plugin-loader-registry.patch b/multilib/lib32-llvm/clang-plugin-loader-registry.patch new file mode 100644 index 000000000..f46eb9fce --- /dev/null +++ b/multilib/lib32-llvm/clang-plugin-loader-registry.patch @@ -0,0 +1,11 @@ +diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map +--- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200 ++++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300 +@@ -2,6 +2,7 @@ + global: main; + __progname; + environ; ++ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE; + + local: *; + }; diff --git a/multilib/lib32-llvm/clang-pure64.patch b/multilib/lib32-llvm/clang-pure64.patch new file mode 100644 index 000000000..da6178519 --- /dev/null +++ b/multilib/lib32-llvm/clang-pure64.patch @@ -0,0 +1,38 @@ +Index: lib/Driver/Tools.cpp +=================================================================== +--- lib/Driver/Tools.cpp (revision 123373) ++++ lib/Driver/Tools.cpp (working copy) +@@ -3306,7 +3306,7 @@ + else if (ToolChain.getArch() == llvm::Triple::arm) + CmdArgs.push_back("/lib/ld-linux.so.3"); + else +- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); ++ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); + } + + CmdArgs.push_back("-o"); +Index: lib/Driver/ToolChains.cpp +=================================================================== +--- lib/Driver/ToolChains.cpp (revision 123373) ++++ lib/Driver/ToolChains.cpp (working copy) +@@ -1317,18 +1317,10 @@ + if (Arch == llvm::Triple::x86) + Suffix64 = "/64"; + +- std::string Lib32 = "lib"; +- +- bool Exists; +- if (!llvm::sys::fs::exists("/lib32", Exists) && Exists) +- Lib32 = "lib32"; +- ++ std::string Lib32 = "lib32"; + std::string Lib64 = "lib"; +- bool Symlink; +- if (!llvm::sys::fs::exists("/lib64", Exists) && Exists && +- (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink)) +- Lib64 = "lib64"; + ++ bool Exists; + std::string GccTriple = ""; + if (Arch == llvm::Triple::arm) { + if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) && diff --git a/multilib/lib32-llvm/clang-toolchains-gcc-versions.patch b/multilib/lib32-llvm/clang-toolchains-gcc-versions.patch new file mode 100644 index 000000000..2e527300d --- /dev/null +++ b/multilib/lib32-llvm/clang-toolchains-gcc-versions.patch @@ -0,0 +1,12 @@ +diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp +--- clang-2.9.orig/lib/Driver/ToolChains.cpp 2011-03-21 23:29:27.000000000 +0200 ++++ clang-2.9/lib/Driver/ToolChains.cpp 2011-04-08 00:03:34.000000000 +0300 +@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const + GccTriple = "i586-suse-linux"; + } + +- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", ++ const char* GccVersions[] = {"4.6.0", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", + "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2", + "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1", + "4.2"}; diff --git a/multilib/lib32-llvm/enable-lto.patch b/multilib/lib32-llvm/enable-lto.patch new file mode 100644 index 000000000..40d93104a --- /dev/null +++ b/multilib/lib32-llvm/enable-lto.patch @@ -0,0 +1,36 @@ +Index: lib/Driver/ToolChains.cpp +=================================================================== +--- lib/Driver/ToolChains.cpp (revision 123373) ++++ lib/Driver/ToolChains.cpp (working copy) +@@ -1398,11 +1398,11 @@ + Lib = Lib64; + } + +- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); ++ llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold"); + if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) + Linker = LinkerPath.str(); + else +- Linker = GetProgramPath("ld"); ++ Linker = GetProgramPath("ld.gold"); + + LinuxDistro Distro = DetectLinuxDistro(Arch); + +Index: lib/Driver/Tools.cpp +=================================================================== +--- lib/Driver/Tools.cpp (revision 123373) ++++ lib/Driver/Tools.cpp (working copy) +@@ -3412,11 +3412,11 @@ + } + } + +- if (Args.hasArg(options::OPT_use_gold_plugin)) { ++ // if (Args.hasArg(options::OPT_use_gold_plugin)) { + CmdArgs.push_back("-plugin"); + std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; + CmdArgs.push_back(Args.MakeArgString(Plugin)); +- } ++ // } + + C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs)); + } diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD index 489fd3703..b787a2a8b 100644 --- a/multilib/lib32-mesa/PKGBUILD +++ b/multilib/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44674 2011-04-10 20:53:16Z lcarlier $ +# $Id: PKGBUILD 49474 2011-06-17 12:06:33Z lcarlier $ # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -10,24 +10,24 @@ pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dr _git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.0.git20110215 + pkgver=7.10.99.git20110616 else - pkgver=7.10.2 + pkgver=7.10.3 fi -pkgrel=2 +pkgrel=1 arch=(x86_64) -makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' -'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev') +makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' +'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev') # 'lib32-llvm' url="http://mesa3d.sourceforge.net" license=('custom') if [ "${_git}" = "true" ]; then - # mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866 - source=('ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2') - md5sums=('f0d9daab4aaaacfd3b756dcb23b268af') + # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe + source=('ftp://ftp.archlinux.org/other/mesa/mesa-fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe.tar.bz2') + md5sums=('f9cf11f9fd8f5d2092536fc48fad922f') else - source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch) - md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4') + source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.zip" nouveau-fix-header.patch) + md5sums=('614d063ecd170940d9ae7b355d365d59' '67c87b77cc2236b52a3b47dad3fbb5d4') fi build() { @@ -37,31 +37,43 @@ build() { if [ "${_git}" = "true" ]; then cd ${srcdir}/mesa-* + # for our llvm-config for 32 bit :( + export PATH="/usr/lib32/llvm:$PATH" + # fix linking with llvmpipe driver + sed -i -e 's:LD=g++:LD=g++ -m32:' src/gallium/drivers/llvmpipe/Makefile autoreconf -vfi else cd "${srcdir}/Mesa-${pkgver}" fi - patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" + if [ "${_git}" != "true" ]; then + patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" + fi if [ "${_git}" = "true" ]; then ./autogen.sh --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --enable-gallium-radeon \ + --enable-gallium-r300 \ --enable-gallium-r600 \ --enable-gallium-nouveau \ + --enable-gallium-llvm \ + --enable-gallium-egl \ --enable-gallium-swrast \ --enable-glx-tls \ --with-driver=dri \ --enable-xcb \ - --with-state-trackers=dri,glx \ + --with-state-trackers=dri,glx,egl \ --disable-glut \ --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --disable-gallium-egl \ + --enable-texture-float \ + --enable-shared-dricore \ --enable-32-bit \ --libdir=/usr/lib32 + # --enable-gallium-svga \ + # --enable-shared-dricore - link DRI modules with shared core DRI routines[default=disabled] http://bugs.gentoo.org/show_bug.cgi?id=357177 + # --enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no] else ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ @@ -86,7 +98,7 @@ build() { } package_lib32-libgl() { - depends=('lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' 'libgl') + depends=('lib32-libdrm>=2.4.25' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' 'libgl') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)" if [ "${_git}" = "true" ]; then @@ -99,6 +111,10 @@ package_lib32-libgl() { install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions" bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/" + if [ "${_git}" = "true" ]; then + bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/" + bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/" + fi if [ "${_git}" = "true" ]; then make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install @@ -139,15 +155,18 @@ package_lib32-libegl() { if [ "${_git}" = "true" ]; then cd ${srcdir}/mesa-* + make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install else cd "${srcdir}/Mesa-${pkgver}" fi install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/egl" install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/" - bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/" + if [ "${_git}" != "true" ]; then + install -m755 -d "${pkgdir}/usr/lib32/egl" + bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/" + fi bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/" install -m755 -d "${pkgdir}/usr/share/licenses/libegl" @@ -155,7 +174,7 @@ package_lib32-libegl() { } package_lib32-mesa() { - depends=('lib32-libgl' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'mesa') + depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-libdrm>=2.4.25' 'lib32-gcc-libs>=4.5' 'mesa') pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" if [ "${_git}" = "true" ]; then @@ -180,7 +199,7 @@ package_lib32-mesa() { package_lib32-ati-dri() { depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" + pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" conflicts=('xf86-video-ati<6.9.0-6') if [ "${_git}" = "true" ]; then diff --git a/staging/iproute2/PKGBUILD b/staging/iproute2/PKGBUILD new file mode 100644 index 000000000..57089f2c0 --- /dev/null +++ b/staging/iproute2/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 127646 2011-06-17 12:59:11Z stephane $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=iproute2 +pkgver=2.6.38 +pkgrel=4 +pkgdesc="IP Routing Utilities" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.linux-foundation.org/en/Net:Iproute2" +depends=('perl') +makedepends=('linux-atm') +optdepends=('linux-atm: ATM support') +provides=('iproute') +conflicts=('iproute') +replaces=('iproute') +options=('!makeflags') +backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ + 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') +source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2 + 'iproute2-fhs.patch') +sha1sums=('e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a' + '2416b11252364d7a6c742eabb4a6924a75637a46') + +build() { + cd $srcdir/iproute2-${pkgver} + + # set correct fhs structure + patch -Np1 -i ${srcdir}/iproute2-fhs.patch + + ./configure + + make +} + +package() { + cd $srcdir/iproute2-${pkgver} + + make DESTDIR=$pkgdir install + + # allow loopback to be started before /usr is mounted, this may not be supported in the future + mkdir -p ${pkgdir}/sbin + mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip + ln -s /sbin/ip ${pkgdir}/usr/sbin/ip + + # libnetlink isn't installed, install it FS#19385 + install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h + install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a +} diff --git a/staging/iproute2/iproute2-fhs.patch b/staging/iproute2/iproute2-fhs.patch new file mode 100644 index 000000000..2608414db --- /dev/null +++ b/staging/iproute2/iproute2-fhs.patch @@ -0,0 +1,84 @@ +diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile +--- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100 ++++ iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100 +@@ -1,11 +1,12 @@ + DESTDIR=/usr/ + ROOTDIR=$(DESTDIR) + LIBDIR=/usr/lib/ +-SBINDIR=/sbin ++SBINDIR=/usr/sbin + CONFDIR=/etc/iproute2 +-DOCDIR=/share/doc/iproute2 +-MANDIR=/share/man ++DOCDIR=/usr/share/doc/iproute2 ++MANDIR=/usr/share/man + ARPDDIR=/var/lib/arpd ++SHAREDIR=/usr/share + + # Path to db_185.h include + DBM_INCLUDE:=$(ROOTDIR)/usr/include +diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c +--- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100 ++++ iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100 +@@ -24,8 +24,8 @@ + #include "utils.h" + #include "tc_util.h" + +-#ifndef LIBDIR +-#define LIBDIR "/usr/lib/" ++#ifndef SHAREDIR ++#define SHAREDIR "/usr/share" + #endif + + const char *get_tc_lib(void) +@@ -34,7 +34,7 @@ + + lib_dir = getenv("TC_LIB_DIR"); + if (!lib_dir) +- lib_dir = LIBDIR "/tc/"; ++ lib_dir = SHAREDIR "/tc/"; + + return lib_dir; + } +diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile +--- iproute2.old/netem/Makefile 2010-08-06 11:30:48.640940183 +0200 ++++ iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200 +@@ -20,9 +20,9 @@ + $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm + + install: all +- mkdir -p $(DESTDIR)$(LIBDIR)/tc ++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc + for i in $(DISTDATA); \ +- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ ++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \ + done + + clean: +diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile +--- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200 ++++ iproute2-2.6.35/tc/Makefile 2010-08-06 11:49:36.977473380 +0200 +@@ -99,18 +99,11 @@ + $(AR) rcs $@ $(TCLIB) + + install: all +- mkdir -p $(MODDESTDIR) +- install -m 0755 tc $(DESTDIR)$(SBINDIR) +- for i in $(TCSO); \ +- do install -m 755 $$i $(MODDESTDIR); \ +- done +- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ +- if [ -f $(MODDESTDIR)/m_xt.so ]; \ +- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \ +- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \ +- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \ +- fi; \ +- fi ++ mkdir -p $(DESTDIR)$(LIBDIR)/tc ++ install -m 0755 tc $(DESTDIR)$(SBINDIR) ++ for i in $(TCSO); \ ++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ ++ done + + clean: + rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ diff --git a/staging/libsasl/PKGBUILD b/staging/libsasl/PKGBUILD new file mode 100644 index 000000000..0a92c6a7a --- /dev/null +++ b/staging/libsasl/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 127649 2011-06-17 13:03:28Z stephane $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libsasl +pkgver=2.1.23 +pkgrel=6 +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') +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') +md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' + 'e27ddff076342e7a3041c4759817d04b' + '0658201497aad359c0d66b0ab8032859') + +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 + ./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 +} + +package() { + cd "${srcdir}/cyrus-sasl-${pkgver}" + for dir in include lib sasldb plugins utils; do + pushd ${dir} || return 1 + make DESTDIR="${pkgdir}" install + popd + done + + # install license + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/staging/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch b/staging/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch new file mode 100644 index 000000000..f7bf44b79 --- /dev/null +++ b/staging/libsasl/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/staging/libsasl/cyrus-sasl-db.patch b/staging/libsasl/cyrus-sasl-db.patch new file mode 100644 index 000000000..08758ab85 --- /dev/null +++ b/staging/libsasl/cyrus-sasl-db.patch @@ -0,0 +1,34 @@ +diff -urN aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 cyrus-sasl-2.1.22/cmulocal/berkdb.m4 +--- aaa/cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2005-04-26 21:14:07.000000000 +0200 ++++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2006-10-02 20:36:17.137852392 +0200 +@@ -213,7 +213,7 @@ + fi + + saved_LIBS=$LIBS +- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db + do + LIBS="$saved_LIBS -l$dbname" + AC_TRY_LINK([#include <db.h>], +--- cyrus-sasl-2.1.23/sasldb/db_berkeley.c.orig 2009-04-28 17:09:18.000000000 +0200 ++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2010-05-18 21:02:20.418940098 +0200 +@@ -100,7 +100,7 @@ + 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); +--- cyrus-sasl-2.1.23/utils/dbconverter-2.c.orig 2003-02-13 20:56:17.000000000 +0100 ++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2010-05-18 21:11:09.982932556 +0200 +@@ -214,7 +214,7 @@ + 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/staging/perl/ChangeLog b/staging/perl/ChangeLog new file mode 100644 index 000000000..fd53c2560 --- /dev/null +++ b/staging/perl/ChangeLog @@ -0,0 +1,61 @@ +2011-06-16 Angel Velasquez <angvp@archlinux.org> + * Fixed #FS24660 + * Rebuilt against db 5.2.28 + +2011-05-16 Angel Velasquez <angvp@archlinux.org> + * perl 5.14.0 + * Removed patch for h2ph warning from 5.12.3 + * Removed provides array, you can use corelist -v 5.14.0 to know the + modules included with the perl core, through Module::CoreList (thx j3nnn1 + for the tip) + +2010-11-07 kevin <kevin@archlinux.org> + + * perl 5.12.2-1 + - Using /usr/bin/*_perl for script directories + +2010-11-06 kevin <kevin@archlinux.org> + + - Removed otherlibdirs directive from Configure + - Removed /usr/*/perl5/site_perl/5.10.1 from INC + - Finally removed legacy dirs /usr/lib/perl5/current and + /usr/lib/perl5/site_perl/current from @INC + +2010-05-23 kevin <kevin@archlinux.org> + + * perl 5.12.1-2 + - Francois updated the provides array. + +2010-05-23 kevin <kevin@archlinux.org> + + * perl 5.12.1-1 + +2010-05-16 kevin <kevin@archlinux.org> + + * perl 5.12.0-2 + +2010-05-12 kevin <kevin@archlinux.org> + + - FS#19411. Removed the for loop in perlbin.sh which didn't work on zsh. + This makes the loop variables unnecessary so the script no longer + pollutes the user's environment. + - FS#19427. Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support + user built modules. + +2010-05-09 kevin <kevin@archlinux.org> + + * perl 5.12.0-1 + - Modified perlbin.sh to only add existing dirs to PATH. Fixes FS#17402, + path points to non-existant directories + +2010-05-07 kevin <kevin@archlinux.org> + + - Added this changelog. + - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC. + This removes the duplicates and versioned directory entries. + - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix + Fix FS#13808, binaries don't follow FHS. + - Stopped using versioned directories in sitelib and sitearch. + + +# vim: set ft=changelog ts=4 sw=4 et: diff --git a/staging/perl/PKGBUILD b/staging/perl/PKGBUILD new file mode 100644 index 000000000..bb4053b20 --- /dev/null +++ b/staging/perl/PKGBUILD @@ -0,0 +1,94 @@ +# $Id: PKGBUILD 127616 2011-06-17 07:01:46Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: kevin <kevin.archlinux.org> +# Contributor: judd <jvinet.zeroflux.org> +# Contributor: francois <francois.archlinux.org> +pkgname=perl +pkgver=5.14.0 +pkgrel=3 +pkgdesc="A highly capable, feature-rich programming language" +arch=(i686 x86_64) +license=('GPL' 'PerlArtistic') +url="http://www.perl.org" +groups=('base') +depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') +changelog=ChangeLog +source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh) +install=perl.install +options=('!makeflags' '!purge') +md5sums=('e7457deea78330c5f8eebb2fd2a45479' + 'f86eb0dba1638ca6d1c8fff1b06c2a71') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + if [ "${CARCH}" = "x86_64" ]; then + # for x86_64 + arch_opts="-Dcccdlflags='-fPIC'" + else + # for i686 + arch_opts="" + fi + ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ + -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ + -Dprivlib=/usr/share/perl5/core_perl \ + -Darchlib=/usr/lib/perl5/core_perl \ + -Dsitelib=/usr/share/perl5/site_perl \ + -Dsitearch=/usr/lib/perl5/site_perl \ + -Dvendorlib=/usr/share/perl5/vendor_perl \ + -Dvendorarch=/usr/lib/perl5/vendor_perl \ + -Dscriptdir=/usr/bin/core_perl \ + -Dsitescript=/usr/bin/site_perl \ + -Dvendorscript=/usr/bin/vendor_perl \ + -Dinc_version_list=none \ + -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} + make +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install + + ### Perl Settings ### + # Change man page extensions for site and vendor module builds. + # Use archlinux email address instead of my own. + sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \ + -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \ + -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \ + -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl + + ### CPAN Settings ### + # Set CPAN default config to use the site directories. + sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \ + -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \ + -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm + + ### CPANPLUS Settings ### + # Set CPANPLUS default config to use the site directories. + sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \ + -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ + -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm + + # Profile script so set paths to perl scripts. + install -D -m755 ${srcdir}/perlbin.sh \ + ${pkgdir}/etc/profile.d/perlbin.sh + + (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) + (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) + grep -Rl "${pkgdir}" ${pkgdir}/usr | \ + xargs sed -i "s^${pkgdir}^^g" + + # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/ + # (FS#16488) + rm -f $pkgdir/usr/share/perl5/core_perl/*.pod + for d in $pkgdir/usr/share/perl5/core_perl/*; do + if [ -d $d -a $(basename $d) != "pod" ]; then + find $d -name *.pod -delete + fi + done + find $pkgdir/usr/lib -name *.pod -delete + find $pkgdir -name .packlist -delete + # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660) + install -dv ${pkgdir}/etc/ld.so.conf.d + echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf +} + diff --git a/staging/perl/fix-h2ph-and-tests.patch b/staging/perl/fix-h2ph-and-tests.patch new file mode 100644 index 000000000..a2d176ec6 --- /dev/null +++ b/staging/perl/fix-h2ph-and-tests.patch @@ -0,0 +1,104 @@ +From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001 +From: Robin Barker <rmbarker@cpan.org> +Date: Thu, 22 Apr 2010 11:51:20 +0100 +Subject: [PATCH 1/1] Fix h2ph and test + +--- + lib/h2ph.t | 12 ++++++++++-- + utils/h2ph.PL | 28 +++++++++++++++++++++++----- + 2 files changed, 33 insertions(+), 7 deletions(-) + +diff --git a/lib/h2ph.t b/lib/h2ph.t +index 27dd7b9..8d62d46 100644 +--- a/lib/h2ph.t ++++ b/lib/h2ph.t +@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) { + exit 0; + } + +-plan(4); ++plan(5); + + # quickly compare two text files + sub txt_compare { +@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht', + stderr => 1 ); + like( $result, qr/syntax OK$/, "output compiles"); + ++$result = runperl( progfile => '_h2ph_pre.ph', ++ switches => ['-c'], ++ stderr => 1 ); ++like( $result, qr/syntax OK$/, "preamble compiles"); ++ + $result = runperl( switches => ["-w"], +- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);'); ++ stderr => 1, ++ prog => <<'PROG' ); ++$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht); ++PROG + is( $result, '', "output free of warnings" ); + + # cleanup +diff --git a/utils/h2ph.PL b/utils/h2ph.PL +index 8f56db4..1255807 100644 +--- a/utils/h2ph.PL ++++ b/utils/h2ph.PL +@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) { + exit $Exit; + + sub expr { +- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out. ++ if (/\b__asm__\b/) { # freak out ++ $new = '"(assembly code)"'; ++ return ++ } + my $joined_args; + if(keys(%curargs)) { + $joined_args = join('|', keys(%curargs)); +@@ -770,7 +773,7 @@ sub inc_dirs + sub build_preamble_if_necessary + { + # Increment $VERSION every time this function is modified: +- my $VERSION = 2; ++ my $VERSION = 3; + my $preamble = "$Dest_dir/_h2ph_pre.ph"; + + # Can we skip building the preamble file? +@@ -798,7 +801,16 @@ sub build_preamble_if_necessary + # parenthesized value: d=(v) + $define{$_} = $1; + } +- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { ++ if (/^(\w+)\((\w)\)$/) { ++ my($macro, $arg) = ($1, $2); ++ my $def = $define{$_}; ++ $def =~ s/$arg/\$\{$arg\}/g; ++ print PREAMBLE <<DEFINE; ++unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } } ++ ++DEFINE ++ } elsif ++ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) { + # float: + print PREAMBLE + "unless (defined &$_) { sub $_() { $1 } }\n\n"; +@@ -807,8 +819,14 @@ sub build_preamble_if_necessary + print PREAMBLE + "unless (defined &$_) { sub $_() { $1 } }\n\n"; + } elsif ($define{$_} =~ /^\w+$/) { +- print PREAMBLE +- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n"; ++ my $def = $define{$_}; ++ if ($isatype{$def}) { ++ print PREAMBLE ++ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n"; ++ } else { ++ print PREAMBLE ++ "unless (defined &$_) { sub $_() { &$def } }\n\n"; ++ } + } else { + print PREAMBLE + "unless (defined &$_) { sub $_() { \"", +-- +1.6.5.2.74.g610f9.dirty + diff --git a/staging/perl/perl.install b/staging/perl/perl.install new file mode 100644 index 000000000..3f7d58f23 --- /dev/null +++ b/staging/perl/perl.install @@ -0,0 +1,18 @@ +# arg 1: the new package version +post_install() { + for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do + [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver + [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver + [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver + done + return 0 +} + +post_upgrade() { + echo '- The directories /usr/lib/perl5/current, /usr/lib/perl5/site_perl/current,' + echo ' /usr/lib/perl5/site_perl/5.10.1, and /usr/share/perl5/site_perl/5.10.1' + echo ' have been removed from @INC.' + + echo '- The script/binary directories are now /usr/bin/*_perl instead of' + echo ' /usr/lib/perl5/*_perl/bin which will be eventually removed.' +} diff --git a/staging/perl/perlbin.sh b/staging/perl/perlbin.sh new file mode 100755 index 000000000..09811a8b4 --- /dev/null +++ b/staging/perl/perlbin.sh @@ -0,0 +1,23 @@ +# Set path to perl scriptdirs if they exist +# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts +# Added /usr/bin/*_perl dirs for scripts +# Remove /usr/lib/perl5/*_perl/bin in next release + +[ -d /usr/bin/site_perl ] && + PATH=$PATH:/usr/bin/site_perl +[ -d /usr/lib/perl5/site_perl/bin ] && + PATH=$PATH:/usr/lib/perl5/site_perl/bin + +[ -d /usr/bin/vendor_perl ] && + PATH=$PATH:/usr/bin/vendor_perl +[ -d /usr/lib/perl5/vendor_perl/bin ] && + PATH=$PATH:/usr/lib/perl5/vendor_perl/bin + +[ -d /usr/bin/core_perl ] && + PATH=$PATH:/usr/bin/core_perl + +export PATH + +# If you have modules in non-standard directories you can add them here. +#export PERLLIB=dir1:dir2 + diff --git a/testing/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD new file mode 100644 index 000000000..3da2fec8d --- /dev/null +++ b/testing/mdadm/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 127622 2011-06-17 07:48:12Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> +pkgname=mdadm +pkgver=3.2.2 +pkgrel=1 +pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" +arch=(i686 x86_64) +license=('GPL') +url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/" +groups=('base') +conflicts=('mkinitcpio<0.5.99') +depends=('glibc') +backup=('etc/mdadm.conf') +source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 + mdadm + mdadm.conf + mdadm_install + mdadm_hook + disable-werror.patch) +install=mdadm.install +replaces=('raidtools') +md5sums=('12ee2fbf3beddb60601fb7a4c4905651' + '6df172c8f77b280018cf87eb3d313f29' + '00cbed931db4f15b6ce49e3e7d433966' + '53f58d4a8f6e23c452d67007186262e3' + '36f7cc564ed3267888d90208e0eb7adc' + '4ad87b74a4bc9a34621280abe0e0c3e4') + +build() { + cd $srcdir/$pkgname-$pkgver + patch -Np0 -i ../disable-werror.patch + make CXFLAGS="$CFLAGS" +} + +package() { + cd $srcdir/$pkgname-$pkgver + make INSTALL=/bin/install DESTDIR=$pkgdir install + install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf + install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm + install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm + install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm + # symlink for backward compatibility + ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid +} diff --git a/testing/mdadm/disable-werror.patch b/testing/mdadm/disable-werror.patch new file mode 100644 index 000000000..50a33f19d --- /dev/null +++ b/testing/mdadm/disable-werror.patch @@ -0,0 +1,11 @@ +--- Makefile.old 2011-06-17 09:38:03.269238332 +0200 ++++ Makefile 2011-06-17 09:38:14.122398837 +0200 +@@ -42,7 +42,7 @@ + + CC = $(CROSS_COMPILE)gcc + CXFLAGS = -ggdb +-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter ++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + ifdef WARN_UNUSED + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O + endif diff --git a/testing/mdadm/mdadm b/testing/mdadm/mdadm new file mode 100755 index 000000000..e196f3642 --- /dev/null +++ b/testing/mdadm/mdadm @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /sbin/mdadm` +case "$1" in + start) + stat_busy "Starting mdadm RAID Monitor" + if [ -z "$PID" ]; then + /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon mdadm + stat_done + fi + ;; + stop) + stat_busy "Stopping mdadm RAID Monitor" + [ ! -z "$PID" ] && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon mdadm + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/mdadm/mdadm.conf b/testing/mdadm/mdadm.conf new file mode 100644 index 000000000..57bd4c683 --- /dev/null +++ b/testing/mdadm/mdadm.conf @@ -0,0 +1,67 @@ +# mdadm configuration file +# +# mdadm will function properly without the use of a configuration file, +# but this file is useful for keeping track of arrays and member disks. +# In general, a mdadm.conf file is created, and updated, after arrays +# are created. This is the opposite behavior of /etc/raidtab which is +# created prior to array construction. +# +# +# the config file takes two types of lines: +# +# DEVICE lines specify a list of devices of where to look for +# potential member disks +# +# ARRAY lines specify information about how to identify arrays so +# so that they can be activated +# + + +# You can have more than one device line and use wild cards. The first +# example includes SCSI the first partition of SCSI disks /dev/sdb, +# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second +# line looks for array slices on IDE disks. +# +#DEVICE /dev/sd[bcdjkl]1 +#DEVICE /dev/hda1 /dev/hdb1 +# +# The designation "partitions" will scan all partitions found in +# /proc/partitions +DEVICE partitions + + +# ARRAY lines specify an array to assemble and a method of identification. +# Arrays can currently be identified by using a UUID, superblock minor number, +# or a listing of devices. +# +# super-minor is usually the minor number of the metadevice +# UUID is the Universally Unique Identifier for the array +# Each can be obtained using +# +# mdadm -D <md> +# +# To capture the UUIDs for all your RAID arrays to this file, run these: +# to get a list of running arrays: +# # mdadm -D --scan >>/etc/mdadm.conf +# to get a list from superblocks: +# # mdadm -E --scan >>/etc/mdadm.conf +# +#ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371 +#ARRAY /dev/md1 super-minor=1 +#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1 +# +# ARRAY lines can also specify a "spare-group" for each array. mdadm --monitor +# will then move a spare between arrays in a spare-group if one array has a +# failed drive but no spare +#ARRAY /dev/md4 uuid=b23f3c6d:aec43a9f:fd65db85:369432df spare-group=group1 +#ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977 spare-group=group1 +# + + +# When used in --follow (aka --monitor) mode, mdadm needs a +# mail address and/or a program. To start mdadm's monitor mode, add +# "mdadm" to your DAEMONS array in /etc/rc.conf +# +# If the lines are not found, mdadm will exit quietly +#MAILADDR root@mydomain.tld +#PROGRAM /usr/sbin/handle-mdadm-events diff --git a/testing/mdadm/mdadm.install b/testing/mdadm/mdadm.install new file mode 100644 index 000000000..e8404c260 --- /dev/null +++ b/testing/mdadm/mdadm.install @@ -0,0 +1,10 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_upgrade() { + if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then + echo "Attention mdadm update:" + echo "raid_partitions hook has been replaced by the more powerfull mdadm hook." + echo "Please update your /etc/mkinitcpio.conf accordingly." + fi +} diff --git a/testing/mdadm/mdadm_hook b/testing/mdadm/mdadm_hook new file mode 100755 index 000000000..1d217a5a8 --- /dev/null +++ b/testing/mdadm/mdadm_hook @@ -0,0 +1,42 @@ +# vim: set ft=sh: +run_hook () +{ + input="$(cat /proc/cmdline)" + mdconfig="/etc/mdadm.conf" + # for partitionable raid, we need to load md_mod first! + modprobe md_mod 2>/dev/null + # If md is specified on commandline, create config file from those parameters. + if [ "$(echo $input | grep "md=")" ]; then + #Create initial mdadm.conf + # scan all devices in /proc/partitions + echo DEVICE partitions > $mdconfig + for i in $input; do + case $i in + # raid + md=[0-9]*,/*) + device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device devices=$array" >> $mdconfig + ;; + # partitionable raid + md=d[0-9]*,/*) + device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device devices=$array" >> $mdconfig + ;; + # raid UUID + md=[0-9]*,[0-9,a-z]*) + device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + ;; + # partitionable raid UUID + md=d[0-9]*,[0-9,a-z]*) + device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + ;; + esac + done + fi +} diff --git a/testing/mdadm/mdadm_install b/testing/mdadm/mdadm_install new file mode 100644 index 000000000..59f4bc67b --- /dev/null +++ b/testing/mdadm/mdadm_install @@ -0,0 +1,46 @@ +# vim: set ft=sh: + +install () +{ + MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " + BINARIES="" + FILES="" + SCRIPT="mdadm" + # check if a custom mdadm.conf exists + if grep -q ^ARRAY /etc/mdadm.conf; then + echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." + add_file "/etc/mdadm.conf" + fi + add_binary "/sbin/mdadm" + add_file "/lib/udev/rules.d/64-md-raid.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for any raid root device, + and assembles the raid device when run. + + If arrays are defined in /etc/mdadm.conf, the file will be used instead + of command line assembling. + + Command Line Setup: + - for raid arrays with persistent superblocks: + md=<md device no.>,dev0,dev1,...,devn + md=<md device no.>,uuid + - for partitionable raid arrays with persistent superblocks: + md=d<md device no.>,dev0,dev1,...,devn + md=d<md device no.>,uuid + + Parameters: + - <md device no.> = the number of the md device: + 0 means md0, 1 means md1, ... + - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 + or 0900878d:f95f6057:c39a36e9:55efa60a + Examples: + - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 + This will setup 2 md partitionable arrays. + - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 + This will setup 2 md arrays with persistent superblocks. +HELPEOF +} diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index fafd58ac6..8471be373 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127571 2011-06-16 16:50:52Z andyrtr $ +# $Id: PKGBUILD 127627 2011-06-17 09:07:14Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -13,7 +13,7 @@ if [ "${_git}" = "true" ]; then else pkgver=7.10.3 fi -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake' 'llvm') @@ -106,6 +106,9 @@ fi install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" + bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/" + bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/" + cd src/mesa/drivers/dri #make -C swrast DESTDIR="${pkgdir}" install diff --git a/testing/perl/ChangeLog b/testing/perl/ChangeLog index f6c2500df..fd53c2560 100644 --- a/testing/perl/ChangeLog +++ b/testing/perl/ChangeLog @@ -1,3 +1,7 @@ +2011-06-16 Angel Velasquez <angvp@archlinux.org> + * Fixed #FS24660 + * Rebuilt against db 5.2.28 + 2011-05-16 Angel Velasquez <angvp@archlinux.org> * perl 5.14.0 * Removed patch for h2ph warning from 5.12.3 diff --git a/testing/perl/PKGBUILD b/testing/perl/PKGBUILD index aabf4dbc0..b00377dc1 100644 --- a/testing/perl/PKGBUILD +++ b/testing/perl/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 124529 2011-05-22 19:14:50Z angvp $ +# $Id: PKGBUILD 127611 2011-06-17 06:29:52Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> # Contributor: francois <francois.archlinux.org> pkgname=perl pkgver=5.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') url="http://www.perl.org" groups=('base') -depends=('gdbm' 'db>=4.8' 'coreutils' 'glibc' 'sh') +depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') changelog=ChangeLog source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 perlbin.sh) install=perl.install @@ -87,5 +87,8 @@ package() { done find $pkgdir/usr/lib -name *.pod -delete find $pkgdir -name .packlist -delete + # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660) + install -dv ${pkgdir}/etc/ld.so.conf.d + echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf } |