[Bug 675488] Re: Please merge apr 1.4.2-6 (main) from debian unstable (main)

[Bhavani Shankar]

Hello lorenzo,

I have a small doubt,

looking at the debian changelog wont you think the changes are same? In
which case this could be a sync

because

1. looking at the diffstat

bhavani at flyingmonster:~$ diff -ruN apr-1.4.2/ /home/bhavani/development/apr-1.4.2/ | diffstat
 changelog                                       |   24 +++++++++++++-----
 control                                         |    5 +--
 patches/00list                                  |    2 -
 patches/027_apr_socket_addr_get_lifetime.dpatch |   32 ++++++++++++++++++++++++
 patches/030_thumb2.dpatch                       |   29 ---------------------
 rules                                           |   25 ++++++++++++++++++
 6 files changed, 77 insertions(+), 40 deletions(-)

You will find that there is insertion of code in rules file so,

2. a close look at the diff attached between the present ubuntu version
and present debian version we see the below chunk of code in rules file

+# apr_cv_mutex_robust_shared causes hangs in procmutex test on armel and alpha
+# let's just disable this for squeeze
+ifneq (,$(findstring armel,$(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
+

and is there any difference in working of the above code chunk versus
the ubuntu patch?

What do you think?

regards

** Patch added: "the diff between the present ubuntu version and present debian version"
   https://bugs.launchpad.net/ubuntu/+source/apr/+bug/675488/+attachment/1738388/+files/apr.diff

-- 
Please merge apr 1.4.2-6 (main) from debian unstable (main)
https://bugs.launchpad.net/bugs/675488
You received this bug notification because you are a member of Ubuntu
Sponsors Team, which is a direct subscriber.

Status in “apr” package in Ubuntu: New

Bug description:
apr (1.4.2-6) unstable; urgency=low

   * Also disable robust pthread mutexes on alpha, to fix hang in the test
     suite on Linux 2.6.32.

 -- Stefan Fritsch <sf at debian.org>  Mon, 30 Aug 2010 23:42:23 +0200

apr (1.4.2-5) unstable; urgency=medium

   * Fix FTBFS on armel: Disable robust pthread mutexes on armel, as they
     cause a hang in the test suite on Linux 2.6.32.

 -- Stefan Fritsch <sf at debian.org>  Sun, 29 Aug 2010 22:00:11 +0200

apr (1.4.2-4) unstable; urgency=low

   * Fix building with libtool 1.x. Closes: #575380
   * Fix pool life-time issue with apr_socket_addr_get(), resulting in a memory
     leak in Apache mod_proxy.
   * Under Linux, if configure does not detect POSIX semaphores due to /dev/shm
     not being mounted, abort the build. Closes: #591286

 -- Stefan Fritsch <sf at debian.org>  Tue, 17 Aug 2010 23:16:56 +0200