Wed May 30 00:02:27 UTC 2012

8 files changed, 126 insertions, 11 deletions

diff --git a/testing/libpipeline/PKGBUILD b/testing/libpipeline/PKGBUILD
new file mode 100644
index 000000000..b8d6ea75e
--- /dev/null
+++ b/testing/libpipeline/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 160037 2012-05-28 11:30:14Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=libpipeline
+pkgver=1.2.1
+pkgrel=1
+pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way"
+arch=('i686' 'x86_64')
+url="http://libpipeline.nongnu.org/"
+license=('GPL')
+depends=('glibc')
+options=('!libtool')
+source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz)
+md5sums=('20896c919eca4acb3d2f13012fb7ba02')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/testing/lighttpd/PKGBUILD b/testing/lighttpd/PKGBUILD
index 90702eaa0..1d0748828 100644
--- a/testing/lighttpd/PKGBUILD
+++ b/testing/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160014 2012-05-28 01:48:30Z pierre $
+# $Id: PKGBUILD 160045 2012-05-28 14:12:38Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.30
-pkgrel=4
+pkgrel=6
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -24,14 +24,14 @@ sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b'
             'dacfa1d748e5ac38c2d51d8310acad76d85ba5c1fe02a93534cf032400429257'
             '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77'
             'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa'
-            'ce214a5fdf81085c35cce0faa2e2b5712a70ba15896ef5fa90e6d674d5bdcd89'
-            'd6c302d190b53c85f69b48ce7ca15cab5f6a097af5f3af495bd3dc3ef52a5776')
+            '758275bd8d17115394caabc46e1bbbad01934b20ea957c7984d0b6ba78c4fd40'
+            '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
 
 	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/lighttpd/modules \
+		--libdir=/usr/lib/lighttpd/ \
 		--sysconfdir=/etc/lighttpd \
 		--with-mysql \
 		--with-ldap \
@@ -60,7 +60,7 @@ package() {
 	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
 	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
 	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
-	install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/etc/tmpfiles.d/lighttpd.tmpfiles
+	install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/lighttpd.conf
 	install -D -m644 ${srcdir}/lighttpd.service ${pkgdir}/usr/lib/systemd/system/lighttpd.service
 
 	pushd doc/config >/dev/null
diff --git a/testing/lighttpd/lighttpd.service b/testing/lighttpd/lighttpd.service
index af427063e..b80db7695 100644
--- a/testing/lighttpd/lighttpd.service
+++ b/testing/lighttpd/lighttpd.service
@@ -3,6 +3,7 @@ Description=A secure, fast, compliant and very flexible web-server
 After=syslog.target network.target
 
 [Service]
+PrivateTmp=true
 ExecStart=/usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf
 ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGINT
diff --git a/testing/lighttpd/lighttpd.tmpfiles b/testing/lighttpd/lighttpd.tmpfiles
index cb72b68c8..eb1a7699e 100644
--- a/testing/lighttpd/lighttpd.tmpfiles
+++ b/testing/lighttpd/lighttpd.tmpfiles
@@ -1 +1,2 @@
-d /var/run/lighttpd 755 http http
+d /var/run/lighttpd 755 http http -
+d /var/cache/lighttpd 755 http http 10d
diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD
index ca2263548..d5e0a7e03 100644
--- a/testing/php/PKGBUILD
+++ b/testing/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160010 2012-05-28 00:42:52Z pierre $
+# $Id: PKGBUILD 160031 2012-05-28 10:36:59Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -22,7 +22,7 @@ pkgname=('php'
          'php-tidy'
          'php-xsl')
 pkgver=5.4.3
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -39,7 +39,7 @@ md5sums=('51f9488bf8682399b802c48656315cac'
          '61837f1e9b50d7fdf4c8d1f81fa153f7'
          '59b3a25f9eb3afc02f1adf9ee699808c'
          'a2af49da239122eb45744f4446752050'
-         '9a330bbfb162848572a3d9dc0e051956'
+         '84d0a4caf8d735279cf4500d1772e2a5'
          'e808f39a075dd53cd8da70d984d0e166')
 
 build() {
@@ -242,7 +242,7 @@ package_php-fpm() {
 	install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
 	install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm
 	install -d -m755 ${pkgdir}/etc/php/fpm.d
-	install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/etc/tmpfiles.d/php-fpm.tmpfiles
+	install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf
 	install -D -m644 ${srcdir}/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php-fpm.service
 }
 
diff --git a/testing/php/php-fpm.service b/testing/php/php-fpm.service
index 2fd30113c..3ef95a83a 100644
--- a/testing/php/php-fpm.service
+++ b/testing/php/php-fpm.service
@@ -5,6 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=forking
 PIDFile=/var/run/php-fpm/php-fpm.pid
+PrivateTmp=true
 ExecStart=/usr/sbin/php-fpm
 ExecReload=/bin/kill -USR2 $MAINPID
 
diff --git a/testing/pixman/PKGBUILD b/testing/pixman/PKGBUILD
new file mode 100644
index 000000000..6f90efbc8
--- /dev/null
+++ b/testing/pixman/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 160035 2012-05-28 11:24:39Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+
+pkgname=pixman
+pkgver=0.26.0
+pkgrel=1
+pkgdesc="The pixel-manipulation library for X and cairo"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org"
+license=('custom')
+depends=('glibc')
+options=('!libtool')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
+        test_failures_on_x86-32.diff)
+sha1sums=('d772cf794ec5da0966eba3cb360919a0a5e0d23f'
+          '24a688271d5cf2c4137a147deaa2975122c01aa8')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/test_failures_on_x86-32.diff
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/testing/pixman/test_failures_on_x86-32.diff b/testing/pixman/test_failures_on_x86-32.diff
new file mode 100644
index 000000000..6e333c03a
--- /dev/null
+++ b/testing/pixman/test_failures_on_x86-32.diff
@@ -0,0 +1,46 @@
+From da6193b1fcc1dfab27f4c36917864f2f2c41cf3e Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 27 May 2012 17:01:57 +0000
+Subject: mmx: add missing _mm_empty calls
+
+Fixes spurious test failures on x86-32.
+---
+diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
+index bb125bf..6e292c6 100644
+--- a/pixman/pixman-mmx.c
++++ b/pixman/pixman-mmx.c
+@@ -2232,6 +2232,8 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp,
+ 	    w--;
+ 	}
+     }
++
++    _mm_empty ();
+ }
+ 
+ static void
+@@ -3542,6 +3544,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask)
+ 	w--;
+     }
+ 
++    _mm_empty ();
+     return iter->buffer;
+ }
+ 
+@@ -3585,6 +3588,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask)
+ 	w--;
+     }
+ 
++    _mm_empty ();
+     return iter->buffer;
+ }
+ 
+@@ -3630,6 +3634,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask)
+ 	w--;
+     }
+ 
++    _mm_empty ();
+     return iter->buffer;
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe