Bug#656104: opu: package apr/1.2.12-5+lenny5

[Stefan Fritsch <sf@sfritsch.de>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: opu

As discussed with adsb, apr needs a sourceful update to bring the arches
back in sync. Changelog:

apr (1.2.12-5+lenny5) oldstable; urgency=low

* Disable robust pthread mutexes on alpha, arm, and armel. This fixes
  build problems on buildds running newer Linux kernels.

We already do the same in squeeze/sid. Debdiff is attached.

Please review.
Cheers,
Stefan

diff -u apr-1.2.12/debian/rules apr-1.2.12/debian/rules
--- apr-1.2.12/debian/rules
+++ apr-1.2.12/debian/rules
@@ -25,6 +25,14 @@
 
 CONFFLAGS += ac_cv_prog_AWK=mawk apr_cv_sctp=no
 
+# apr_cv_mutex_robust_shared causes hangs in procmutex test on arm* and alpha
+ifneq (,$(findstring arm,$(DEB_BUILD_ARCH)))
+  CONFFLAGS += apr_cv_mutex_robust_shared=no
+endif
+ifneq (,$(findstring alpha,$(DEB_BUILD_ARCH)))
+  CONFFLAGS += apr_cv_mutex_robust_shared=no
+endif
+
 # Enable debug builds
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
diff -u apr-1.2.12/debian/changelog apr-1.2.12/debian/changelog
--- apr-1.2.12/debian/changelog
+++ apr-1.2.12/debian/changelog
@@ -1,3 +1,10 @@
+apr (1.2.12-5+lenny5) oldstable; urgency=low
+
+  * Disable robust pthread mutexes on alpha, arm, and armel. This fixes build
+    problems on buildds running newer Linux kernels.
+
+ -- Stefan Fritsch <sf@debian.org>  Mon, 16 Jan 2012 15:45:55 +0100
+
 apr (1.2.12-5+lenny4) oldstable-security; urgency=low
 
   * Fix regression introduced by fix for CVE-2011-0419: