Mon Jun 9 03:23:59 UTC 2014

3 files changed, 44 insertions, 8 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')