Wed May 2 00:01:22 UTC 2012

8 files changed, 132 insertions, 27 deletions

diff --git a/testing/cairo/PKGBUILD b/testing/cairo/PKGBUILD
index 15b7ee36f..b24c6bf25 100644
--- a/testing/cairo/PKGBUILD
+++ b/testing/cairo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157259 2012-04-26 17:36:30Z andyrtr $
+# $Id: PKGBUILD 157981 2012-04-30 14:18:17Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-_gitdate=20120426
-_gitver=957a9cc619965178a8927d114fe852034fc2385c
-pkgver=1.12.0.20120426
+#_gitdate=20120426
+#_gitver=957a9cc619965178a8927d114fe852034fc2385c
+pkgver=1.12.2
 pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
@@ -17,23 +17,23 @@ optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
-source=(#http://cairographics.org/releases/$pkgname-$pkgver.tar.gz
-        $pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz 
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
+        #$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz 
         cairo-1.10.0-buggy_gradients.patch
         #git_fixes.patch 
 )
-md5sums=('0495ca6aab85f4936112635baba1bf85'
+md5sums=('87649eb75789739d517c743e94879e51'
          '9b323790dab003e228c6955633cb888e')
 
 build() {
-  #cd "$srcdir/$pkgname-$pkgver"
-  cd ${srcdir}/${pkgname}-${_gitver}
+  cd "$srcdir/$pkgname-$pkgver"
+  #cd ${srcdir}/${pkgname}-${_gitver}
   patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
   # status is 2012-04-26 last commit: image: Fix typo in _blit_spans()
   #patch -Np1 -i ${srcdir}/git_fixes.patch
-  #autoreconf -vfi
-  #./configure --prefix=/usr \
-  ./autogen.sh --prefix=/usr \
+  autoreconf -vfi
+  #./autogen.sh --prefix=/usr \
+  ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--disable-static \
@@ -51,7 +51,7 @@ build() {
 #}
 
 package() {
-  #cd "$srcdir/$pkgname-$pkgver"
-  cd $srcdir/$pkgname-${_gitver}
+  cd "$srcdir/$pkgname-$pkgver"
+  #cd $srcdir/$pkgname-${_gitver}
   make DESTDIR="$pkgdir" install
 }
diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD
index 37ce623dc..cfca8de86 100644
--- a/testing/lvm2/PKGBUILD
+++ b/testing/lvm2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156515 2012-04-20 02:14:32Z eric $
+# $Id: PKGBUILD 157920 2012-04-30 05:18:44Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.95
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -23,7 +23,8 @@ sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
 build() {
   cd "${srcdir}/LVM2.${pkgver}"
   unset LDFLAGS
-  ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var \
+  ./configure --exec_prefix=/ --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \
+    --libdir=/usr/lib --localstatedir=/var --with-udev-prefix=/usr --with-dmeventd-path=/sbin \
     --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
     --enable-udev_sync --enable-udev_rules
   make
diff --git a/testing/nss_ldap/PKGBUILD b/testing/nss_ldap/PKGBUILD
new file mode 100644
index 000000000..120501e13
--- /dev/null
+++ b/testing/nss_ldap/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 157987 2012-04-30 16:15:04Z tomegun $
+# Maintainer:
+# Contributor: Comete <la_comete@tiscali.fr>
+
+pkgname=nss_ldap
+pkgver=265
+pkgrel=4
+pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories."
+arch=('i686' 'x86_64')
+url="http://www.padl.com/OSS/nss_ldap.html"
+license=('LGPL')
+depends=('libldap' 'krb5')
+backup=("etc/nss_ldap.conf")
+source=("http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz")
+md5sums=('c1cb02d1a85538cf16bca6f6a562abe4')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure \
+       --prefix=/usr \
+       --with-ldap-conf-file=/etc/nss_ldap.conf \
+       --with-ldap=openldap \
+       --sysconfdir=/etc \
+       --mandir=/usr/share/man \
+       --enable-schema-mapping \
+       --enable-rfc2307bis \
+       --enable-configurable-krb5-ccname-gssapi
+  env PATH=`pwd`:"$PATH" make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  # buildsystem is trying to be clever and hardcodes symlinks in /usr$(libdir)
+  rm -rf "${pkgdir}/usr/usr"
+}
diff --git a/testing/openmpi/PKGBUILD b/testing/openmpi/PKGBUILD
index 4b462b7b7..78bf33ab0 100644
--- a/testing/openmpi/PKGBUILD
+++ b/testing/openmpi/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 154489 2012-03-29 09:52:47Z stephane $
+# $Id: PKGBUILD 157996 2012-04-30 21:40:03Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=openmpi
 pkgver=1.5.5
-pkgrel=1
+pkgrel=3
 pkgdesc="High performance message passing library (MPI)"
 arch=('i686' 'x86_64')
 url="http://www.open-mpi.org"
 license=('custom')
-depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc')
+depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
 makedepends=('inetutils')
 options=(!libtool)
 source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2
@@ -20,6 +20,9 @@ build() {
 
    # Fix fakeroot problem (FS#28644)
    patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch
+   
+   # Make sure we use the system ltdl librariry rather than the ones in the tarball
+   rm -r opal/libltdl
 
    ./configure --prefix=/usr \
                --sysconfdir=/etc/${pkgname} \
@@ -34,7 +37,7 @@ build() {
                --enable-pretty-print-stacktrace \
                --without-slurm \
                --with-hwloc=/usr \
-               --with-libltdl=/usr \
+               --with-libltdl=/usr  \
                FC=/usr/bin/gfortran \
                LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
 
@@ -48,7 +51,7 @@ package() {
    # FS#28583
    install -d -m 755 "${pkgdir}"/usr/lib/pkgconfig
    for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do
-      ln -sf /usr/lib/openmpi/pkgconfig/$i "${pkgdir}"/usr/lib/pkgconfig/
+      ln -sf /usr/lib/openmpi/pkgconfig/${i} "${pkgdir}"/usr/lib/pkgconfig/
    done
 
    # Openmpi's otfinfo conflicts with the one from texlive
diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD
index 4a6ef06b3..ec1a68163 100644
--- a/testing/udev/PKGBUILD
+++ b/testing/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 155920 2012-04-09 13:23:41Z tomegun $
+# $Id: PKGBUILD 157979 2012-04-30 12:31:14Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=udev
 pkgver=182
-pkgrel=1
+pkgrel=2
 pkgdesc="The userspace dev tools (udev)"
 depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl')
 install=udev.install
@@ -52,9 +52,6 @@ package() {
 
   # udevd moved, symlink to make life easy for restarting udevd manually
   ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd
-  # and for users of the old /lib location (to go away soon)
-  mkdir -p ${pkgdir}/lib/udev
-  ln -s ../../usr/lib/udev/udevd ${pkgdir}/lib/udev/udevd
 
   # the path to udevadm is hardcoded in some places
   install -d ${pkgdir}/sbin
diff --git a/testing/usbmuxd/PKGBUILD b/testing/usbmuxd/PKGBUILD
new file mode 100644
index 000000000..b0f74f8e2
--- /dev/null
+++ b/testing/usbmuxd/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 158000 2012-04-30 22:27:24Z tomegun $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Gabriel Martinez < reitaka at gmail dot com >
+
+pkgname=usbmuxd
+pkgver=1.0.7
+pkgrel=3
+pkgdesc="USB Multiplex Daemon"
+url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
+arch=('i686' 'x86_64')
+license=('GPL2' 'GPL3' 'LGPL2.1')
+depends=('libusb>=1.0.8')
+makedepends=('cmake')
+install=usbmuxd.install
+source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        usbmuxd-udevuser.patch)
+md5sums=('6f431541f3177fa06aa6df9ceecb2da0'
+         '8526f24f4ad16cd6b2a7321c0b59592c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch"
+  mkdir build
+  cd build
+  cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  make DESTDIR="${pkgdir}" install
+
+  # fix udev dir being hardcoded
+  mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
+  rmdir "${pkgdir}/lib"
+}
diff --git a/testing/usbmuxd/usbmuxd-udevuser.patch b/testing/usbmuxd/usbmuxd-udevuser.patch
new file mode 100644
index 000000000..51c8f3d3a
--- /dev/null
+++ b/testing/usbmuxd/usbmuxd-udevuser.patch
@@ -0,0 +1,12 @@
+diff -Nur usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in usbmuxd-1.0.7/udev/85-usbmuxd.rules.in
+--- usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in	2011-08-04 15:28:32.751579507 +0000
++++ usbmuxd-1.0.7/udev/85-usbmuxd.rules.in	2011-08-04 15:36:20.139265124 +0000
+@@ -1,7 +1,7 @@
+ # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
+ 
+ # Forces iDevices to the last USB configuration and runs usbmuxd
+-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
++ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux"
+ 
+ # Exit usbmuxd when the last device is removed
+ ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x"
diff --git a/testing/usbmuxd/usbmuxd.install b/testing/usbmuxd/usbmuxd.install
new file mode 100644
index 000000000..1a4859674
--- /dev/null
+++ b/testing/usbmuxd/usbmuxd.install
@@ -0,0 +1,19 @@
+post_install() {
+    groupadd -g 140 usbmux &>/dev/null
+    useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
+    passwd -l usbmux &>/dev/null
+}
+
+post_upgrade() {
+    getent group usbmux >/dev/null 2>&1 || groupadd -g 140 usbmux &>/dev/null
+    getent passwd usbmux >/dev/null 2>&1 || useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
+}
+
+post_remove() {
+    if getent passwd usbmux >/dev/null 2>&1; then
+        userdel usbmux
+    fi
+    if getent group usbmux >/dev/null 2>&1; then
+        groupdel usbmux
+    fi
+}