Mon Jun 9 03:23:59 UTC 2014

9 files changed, 216 insertions, 31 deletions

diff --git a/community/perl-libapreq2/PKGBUILD b/community/perl-libapreq2/PKGBUILD
index 6dcfe780e..92651064f 100644
--- a/community/perl-libapreq2/PKGBUILD
+++ b/community/perl-libapreq2/PKGBUILD
@@ -1,25 +1,33 @@
-# $Id: PKGBUILD 111527 2014-05-19 16:10:27Z anatolik $
+# $Id: PKGBUILD 112822 2014-06-08 16:40:00Z anatolik $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 
 pkgname=perl-libapreq2
 pkgver=2.13
-pkgrel=6
+pkgrel=7
 pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data."
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/libapreq2"
+options=('!emptydirs')
 depends=('mod_perl' 'apr-util')
 makedepends=('perl-extutils-xsbuilder')
 license=("GPL")
-source=(http://search.cpan.org/CPAN/authors/id/I/IS/ISAAC/libapreq2-$pkgver.tar.gz)
-md5sums=('c11fb0861aa84dcc6cd0f0798b045eee')
+source=(http://search.cpan.org/CPAN/authors/id/I/IS/ISAAC/libapreq2-$pkgver.tar.gz
+        link-in-apr-shared-objects.patch)
+md5sums=('c11fb0861aa84dcc6cd0f0798b045eee'
+         '4cee6d940e95aeb47dd503b8e8a1c7dd')
+
+prepare() {
+  cd $srcdir/libapreq2-$pkgver
+  patch -p1 < ../link-in-apr-shared-objects.patch
+}
 
 build() {
   cd  $srcdir/libapreq2-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/sbin/apxs
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/bin/apxs --with-mm-opts="INSTALLDIRS=vendor"
   find . -type f -name Makefile -exec sed -i 's#-ldb-5.1#-ldb-5.2#' {} \;
   sed -i 's#-ldb-5.1#-ldb-5.2#' apreq2-config
-  make
+  make LD_RUN_PATH="/usr/lib"  # build sets RPATH to non-sanitized path, force correct rpath
 }
 
 package(){
diff --git a/community/perl-libapreq2/link-in-apr-shared-objects.patch b/community/perl-libapreq2/link-in-apr-shared-objects.patch
new file mode 100644
index 000000000..8a84a1589
--- /dev/null
+++ b/community/perl-libapreq2/link-in-apr-shared-objects.patch
@@ -0,0 +1,28 @@
+Don't try to regenerate Makefiles at installation time, as this will forget
+to link against the internal copy of libapreq2-dev, which will cause problems
+when trying to load the module outside Apache.
+
+Index: libapreq2-2.12/glue/Makefile.am
+===================================================================
+--- libapreq2-2.12.orig/glue/Makefile.am
++++ libapreq2-2.12/glue/Makefile.am
+@@ -15,7 +15,6 @@ perl_test: perl/Makefile
+ 	cd perl; $(MAKE) test
+ 
+ perl_install:
+-	cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
+ 	cd perl; $(MAKE) install
+ 
+ perl_clean:
+Index: libapreq2-2.12/glue/Makefile.in
+===================================================================
+--- libapreq2-2.12.orig/glue/Makefile.in
++++ libapreq2-2.12/glue/Makefile.in
+@@ -265,7 +265,6 @@ perl_test: perl/Makefile
+ 	cd perl; $(MAKE) test
+ 
+ perl_install:
+-	cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
+ 	cd perl; $(MAKE) install
+ 
+ perl_clean:
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 5d3568fbd..d1ffa3a75 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 112558 2014-06-03 15:21:40Z foutrelis $
+# $Id: PKGBUILD 112853 2014-06-08 21:54:55Z foutrelis $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.3.12
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/core/systemd/0001-fsck-disable-l-option-for-now.patch b/core/systemd/0001-fsck-disable-l-option-for-now.patch
new file mode 100644
index 000000000..050d06dec
--- /dev/null
+++ b/core/systemd/0001-fsck-disable-l-option-for-now.patch
@@ -0,0 +1,58 @@
+From c343be283b7152554bac0c02493a4e1759c163f7 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay@vrfy.org>
+Date: Wed, 4 Jun 2014 11:14:48 +0200
+Subject: [PATCH] fsck: disable "-l" option for now
+
+  https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
+---
+ TODO            |  4 +++-
+ src/fsck/fsck.c | 13 ++++++++++++-
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/TODO b/TODO
+index 8169a57..fb118f1 100644
+--- a/TODO
++++ b/TODO
+@@ -1,4 +1,7 @@
+ Bugfixes:
++* Re-enable "fsck -l" when it is ready:
++   https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
++
+ * Should systemctl status \* work on all unit types, not just .service?
+ 
+ * enabling an instance unit creates a pointless link, and
+@@ -20,7 +23,6 @@ Bugfixes:
+   See the comment in sd_bus_unref() for more..
+ 
+ External:
+-
+ * Fedora: when installing fedora with yum --installroot /var/run is a directory, not a symlink
+    https://bugzilla.redhat.com/show_bug.cgi?id=975864
+ 
+diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
+index 56cb52d..cb2f573 100644
+--- a/src/fsck/fsck.c
++++ b/src/fsck/fsck.c
+@@ -319,7 +319,18 @@ int main(int argc, char *argv[]) {
+         cmdline[i++] = "/sbin/fsck";
+         cmdline[i++] =  arg_repair;
+         cmdline[i++] = "-T";
+-        cmdline[i++] = "-l";
++
++        /*
++         * Disable locking which conflict with udev's event
++         * ownershipi, until util-linux moves the flock
++         * synchronization file which prevents multiple fsck running
++         * on the same rotationg media, from the disk device
++         * node to a privately owned regular file.
++         *
++         * https://bugs.freedesktop.org/show_bug.cgi?id=79576#c5
++         *
++         * cmdline[i++] = "-l";
++         */
+ 
+         if (!root_directory)
+                 cmdline[i++] = "-M";
+-- 
+2.0.0
+
diff --git a/core/systemd/0001-networkd-link-intialize-mac-address.patch b/core/systemd/0001-networkd-link-intialize-mac-address.patch
new file mode 100644
index 000000000..b0d8254e9
--- /dev/null
+++ b/core/systemd/0001-networkd-link-intialize-mac-address.patch
@@ -0,0 +1,33 @@
+From 2ae6cda520f5c925ba313b8e83ea8b58bc00112c Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Wed, 4 Jun 2014 21:29:08 +0200
+Subject: [PATCH] networkd: link - intialize mac address
+
+Otherwise .netwrok matching on MAC address will not work.
+
+Based on patch by Dave Reisner, and bug originally reported by Max Pray.
+
+Conflicts:
+	src/network/networkd-link.c
+---
+ src/network/networkd-link.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
+index 6677b94..9afb871 100644
+--- a/src/network/networkd-link.c
++++ b/src/network/networkd-link.c
+@@ -75,6 +75,10 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) {
+         if (!link->ifname)
+                 return -ENOMEM;
+ 
++        r = sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &link->mac);
++        if (r < 0)
++                return r;
++
+         r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64,
+                      link->ifindex);
+         if (r < 0)
+-- 
+2.0.0
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index cfa48bbc9..78ca21668 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=213
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -16,24 +16,29 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
-        '0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch')
+        '0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch'
+        '0001-fsck-disable-l-option-for-now.patch'
+        '0001-networkd-link-intialize-mac-address.patch')
 md5sums=('06496edcf86ddf6d8c12d72ba78e735d'
          '29245f7a240bfba66e2b1783b63b6b40'
          '66cca7318e13eaf37c5b7db2efa69846'
          'bde43090d4ac0ef048e3eaee8202a407'
-         '5f8ad7126970855614c7fa34b317728d')
+         '5f8ad7126970855614c7fa34b317728d'
+         '888cf85a92dd28bcf80e18539fef3915'
+         '3d53d3bcd85ca0b2ff9f4e79d012808d')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
   patch -Np1 <"$srcdir/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch"
+  patch -Np1 <"$srcdir/0001-networkd-link-intialize-mac-address.patch"
+  patch -Np1 <"$srcdir/0001-fsck-disable-l-option-for-now.patch"
 }
 
 build() {
   cd "$pkgname-$pkgver"
 
-  # LTO currently breaks the build because of libtool failures
-  CFLAGS+=' -fno-lto'
+  export NM=gcc-nm RANLIB=gcc-ranlib
 
   ./configure \
       --libexecdir=/usr/lib \
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 423ca1f4e..e6fbefd30 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 213367 2014-05-21 16:40:29Z lcarlier $
+# $Id: PKGBUILD 214387 2014-06-08 19:01:03Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
-pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=10.1.4
+pkgname=('opencl-mesa' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
+pkgver=10.2.1
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
-             'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
+             'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd'
+             'libomxil-bellagio' 'libclc' 'clang')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
         LICENSE)
-md5sums=('6fddee101f49b7409cd29994c34ddee7'
+md5sums=('093f9b5d077e5f6061dcd7b01b7aa51a'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
@@ -27,7 +28,7 @@ build() {
     --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
     --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
     --with-egl-platforms=x11,drm,wayland \
-    --with-llvm-shared-libs \
+    --enable-llvm-shared-libs \
     --enable-egl \
     --disable-gallium-egl \
     --enable-gbm \
@@ -43,9 +44,13 @@ build() {
     --enable-texture-float \
     --enable-xa \
     --enable-vdpau \
-    --enable-dri3
+    --enable-dri3 \
+    --enable-omx \
+    --enable-opencl --enable-opencl-icd \
+    --with-clang-libdir=/usr/lib
+
     # --help
-    # --disable-gallium-egl : not well maintained/expose less bug, so prefer egl_dri2 (FS#40096)
+    # --disable-gallium-egl : not well maintained/expose more bugs, so prefer egl_dri2 (FS#40096)
 
   make
 
@@ -54,9 +59,24 @@ build() {
   make DESTDIR=${srcdir}/fakeinstall install
 }
 
+package_opencl-mesa() {
+  pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
+  depends=('mesa-libgl' "mesa=${pkgver}" 'libcl' 'libclc' 'clang')
+  optdepends=('opencl-headers: headers necessary for OpenCL development')
+  
+  install -m755 -d ${pkgdir}/etc
+  mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
+  
+  install -m755 -d ${pkgdir}/usr/lib/
+  mv -v ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
+}
+
 package_ati-dri() {
   pkgdesc="Mesa drivers for AMD/ATI Radeon"
-  depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
+  depends=('mesa-libgl' 'libtxc_dxtn' 'libomxil-bellagio' "mesa=${pkgver}")
   conflicts=('xf86-video-ati<6.9.0-6')
 
   install -m755 -d ${pkgdir}/usr/lib/vdpau/
@@ -68,6 +88,9 @@ package_ati-dri() {
   install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
   mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib/gallium-pipe/
   
+  install -m755 -d ${pkgdir}/usr/lib/bellagio
+  mv -v ${srcdir}/fakeinstall/usr/lib/bellagio/libomx_{r600,radeonsi}.so ${pkgdir}/usr/lib/bellagio/
+
   install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/"
 }
@@ -85,7 +108,7 @@ package_intel-dri() {
 
 package_nouveau-dri() {
   pkgdesc="Mesa drivers for Nouveau"
-  depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
+  depends=('mesa-libgl' 'libtxc_dxtn' 'libomxil-bellagio' "mesa=${pkgver}")
 
   install -m755 -d ${pkgdir}/usr/lib/vdpau/
   mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
@@ -95,6 +118,9 @@ package_nouveau-dri() {
   
   install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
   mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/
+
+  install -m755 -d ${pkgdir}/usr/lib/bellagio
+  mv -v ${srcdir}/fakeinstall/usr/lib/bellagio/libomx_nouveau.so ${pkgdir}/usr/lib/bellagio/
   
   install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
@@ -122,12 +148,25 @@ package_mesa() {
   conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
   replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
 
-  mv -v ${srcdir}/fakeinstall/* ${pkgdir}
+  install -m755 -d ${pkgdir}/etc
+  mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc
+  
+  install -m755 -d ${pkgdir}/usr/lib/{gallium-pipe,gbm}
+  mv -v ${srcdir}/fakeinstall/usr/lib/lib{OSMesa,gbm,glapi,wayland-egl,xatracker}.so* ${pkgdir}/usr/lib/
+  mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_swrast* ${pkgdir}/usr/lib/gallium-pipe/
+  mv -v ${srcdir}/fakeinstall/usr/lib/gbm/gbm_gallium_drm* ${pkgdir}/usr/lib/gbm/
+
+  mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
+  mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
+  
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/swrast_dri* ${pkgdir}/usr/lib/xorg/modules/dri/
+  
   install -m755 -d ${pkgdir}/usr/lib/mesa
   # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
-  mv -v ${pkgdir}/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/
-  mv -v ${pkgdir}/usr/lib/libEGL.so* 	${pkgdir}/usr/lib/mesa/
-  mv -v ${pkgdir}/usr/lib/libGLES*.so*	${pkgdir}/usr/lib/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib/libEGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib/libGLES*.so*	${pkgdir}/usr/lib/mesa/
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD
index e15741009..2acbaf8dd 100644
--- a/extra/spamassassin/PKGBUILD
+++ b/extra/spamassassin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 214308 2014-06-05 18:50:41Z bluewind $
+# $Id: PKGBUILD 214376 2014-06-08 07:55:08Z fyan $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -26,7 +26,7 @@ source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkg
 md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
          'SKIP'
          'd0ce5f8a02fd74dbc83632f4aaec6185'
-         'bd27e3a54784a0a519d3abff3fa82392')
+         '0bcf0419608ec4ac200e794563620f31')
 
 prepare() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
diff --git a/extra/spamassassin/net-dns.patch b/extra/spamassassin/net-dns.patch
index 84db0c598..76d28167d 100644
--- a/extra/spamassassin/net-dns.patch
+++ b/extra/spamassassin/net-dns.patch
@@ -1,4 +1,7 @@
-Fix FS#40707 by disabling the failing version check. We don't ship versions that old anyway.
+Fix FS#40707 by
+
+- disabling the failing version check. We don't ship versions that old anyway.
+- fix nameservers fetching from Net::DNS
 
 ---
 diff -Nur a/lib/Mail/SpamAssassin/Dns.pm b/lib/Mail/SpamAssassin/Dns.pm
@@ -25,3 +28,14 @@ diff -Nur a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mail-SpamAssassin-3.4.0/lib/M
  
    return $self;
  }
+--- a/lib/Mail/SpamAssassin/DnsResolver.pm	2014-06-08 12:48:29.064230952 +0800
++++ b/lib/Mail/SpamAssassin/DnsResolver.pm	2014-06-08 12:49:06.961872678 +0800
+@@ -205,7 +205,7 @@
+     dbg("dns: servers set by config to: %s", join(', ',@ns_addr_port));
+   } elsif ($res) {  # default as provided by Net::DNS, e.g. /etc/resolv.conf
+     @ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
+-                        @{$res->{nameservers}});
++                        $res->nameservers);
+     dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_addr_port));
+   }
+   return @ns_addr_port;