[Pkg-apache-commits] r1334 - in /branches/squeeze-apr: changelog patches/00list patches/030_fix_ino_t_freebsd.dpatch

[sf at alioth.debian.org]

Author: sf
Date: Mon Jun 13 10:20:21 2011
New Revision: 1334

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1334
Log:
Fix apr_ino_t changing size depending on -D_FILE_OFFSET_BITS on
kfreebsd-*.

Added:
    branches/squeeze-apr/patches/030_fix_ino_t_freebsd.dpatch
Modified:
    branches/squeeze-apr/changelog
    branches/squeeze-apr/patches/00list

Modified: branches/squeeze-apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/branches/squeeze-apr/changelog?rev=1334&op=diff
==============================================================================
--- branches/squeeze-apr/changelog (original)
+++ branches/squeeze-apr/changelog Mon Jun 13 10:20:21 2011
@@ -1,3 +1,10 @@
+apr (1.4.2-6+squeeze3) stable; urgency=low
+
+  * Fix apr_ino_t changing size depending on -D_FILE_OFFSET_BITS on
+    kfreebsd-*. Closes: #616323
+
+ -- Stefan Fritsch <sf at debian.org>  Mon, 13 Jun 2011 12:15:22 +0200
+
 apr (1.4.2-6+squeeze2) stable-security; urgency=low
 
   * Fix regression introduced by fix for CVE-2011-0419:

Modified: branches/squeeze-apr/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/branches/squeeze-apr/patches/00list?rev=1334&op=diff
==============================================================================
--- branches/squeeze-apr/patches/00list (original)
+++ branches/squeeze-apr/patches/00list Mon Jun 13 10:20:21 2011
@@ -10,3 +10,4 @@
 027_apr_socket_addr_get_lifetime.dpatch
 028_fnmatch_CVE-2011-0419.dpatch
 029_fnmatch_CVE-2011-1928.dpatch
+030_fix_ino_t_freebsd.dpatch

Added: branches/squeeze-apr/patches/030_fix_ino_t_freebsd.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/branches/squeeze-apr/patches/030_fix_ino_t_freebsd.dpatch?rev=1334&op=file
==============================================================================
--- branches/squeeze-apr/patches/030_fix_ino_t_freebsd.dpatch (added)
+++ branches/squeeze-apr/patches/030_fix_ino_t_freebsd.dpatch Mon Jun 13 10:20:21 2011
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make sure apr_ino_t stays the same regardless of
+## DP: -D_FILE_OFFSET_BITS=64 or not
+## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=616323
+ at DPATCH@
+Index: configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -1726,9 +1726,13 @@
+ # ino64_t as apr_off_t is off64_t, but this can't be done now without
+ # breaking ABI.
+ ino_t_value=ino_t
+-if test "$ac_cv_sizeof_long" = "4"; then
+-    APR_CHECK_TYPES_COMPATIBLE(ino_t, unsigned long, 
+-                               ino_t_value="unsigned long")
++APR_CHECK_SIZEOF_EXTENDED(AC_INCLUDES_DEFAULT, ino_t, $ac_cv_sizeof_long)
++if test $ac_cv_sizeof_ino_t = 4; then
++    if test $ac_cv_sizeof_long = 4; then
++        ino_t_value="unsigned long"
++    else
++        ino_t_value="unsigned int"
++    fi
+ fi
+ AC_MSG_NOTICE([using $ino_t_value for ino_t])
+