[Pkg-apache-commits] r906 - in /trunk/apr: changelog control libapr1.symbols patches/00list patches/025_libtool_2.x_fixes.dpatch rules symbols.common symbols.with-sendfile symbols.without-sendfile

ryan52-guest at alioth.debian.org ryan52-guest at alioth.debian.org
Sat May 2 07:14:03 UTC 2009 

Author: ryan52-guest
Date: Sat May  2 07:14:02 2009
New Revision: 906

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=906
Log:
* change the -dbg package's section to debug
* Fix building with newer libtool, thanks to John Wright for the patch
  (Closes: #526346)
* use a symbols file without apr_socket_sendfile on kfreebsd based
  architectures, fixing FTBFS (Closes: #520857)
* support nocheck in DEB_BUILD_OPTIONS
* Debian Policy 3.8.1

Added:
    trunk/apr/libapr1.symbols   (with props)
    trunk/apr/patches/025_libtool_2.x_fixes.dpatch
    trunk/apr/symbols.common   (contents, props changed)
      - copied, changed from r905, trunk/apr/libapr1.symbols
    trunk/apr/symbols.with-sendfile
    trunk/apr/symbols.without-sendfile
Modified:
    trunk/apr/changelog
    trunk/apr/control
    trunk/apr/patches/00list
    trunk/apr/rules

Modified: trunk/apr/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/changelog?rev=906&op=diff
==============================================================================
--- trunk/apr/changelog (original)
+++ trunk/apr/changelog Sat May  2 07:14:02 2009
@@ -1,3 +1,15 @@
+apr (1.3.3-4) UNRELEASED; urgency=low
+
+  * change the -dbg package's section to debug
+  * Fix building with newer libtool, thanks to John Wright for the patch
+    (Closes: #526346)
+  * use a symbols file without apr_socket_sendfile on kfreebsd based
+    architectures, fixing FTBFS (Closes: #520857)
+  * support nocheck in DEB_BUILD_OPTIONS
+  * Debian Policy 3.8.1
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Sat, 02 May 2009 00:09:22 -0700
+
 apr (1.3.3-3) unstable; urgency=low
 
   * Reduce stack size for the 'testatomic' test since it may otherwise run out

Modified: trunk/apr/control
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/control?rev=906&op=diff
==============================================================================
--- trunk/apr/control (original)
+++ trunk/apr/control Sat May  2 07:14:02 2009
@@ -4,7 +4,7 @@
 Maintainer: Debian Apache Maintainers <debian-apache at lists.debian.org>
 Uploaders: Tollef Fog Heen <tfheen at debian.org>, Peter Samuelson <peter at p12n.org>, Stefan Fritsch <sf at debian.org>, Ryan Niebur <ryanryan52 at gmail.com>
 Build-Depends: debhelper (>> 5.0.0), autoconf, autotools-dev, dpatch, mawk, uuid-dev, doxygen, netbase, net-tools, libtool, python
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache/trunk/apr
 Vcs-svn: svn://svn.debian.org/pkg-apache/trunk/apr
 Homepage: http://apr.apache.org/
@@ -33,7 +33,7 @@
 
 Package: libapr1-dbg
 Architecture: any
-Section: libdevel
+Section: debug
 Priority: extra
 Depends: libapr1 (= ${binary:Version})
 Description: The Apache Portable Runtime Library - Debugging Symbols

Added: trunk/apr/libapr1.symbols
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/libapr1.symbols?rev=906&op=file
==============================================================================
--- trunk/apr/libapr1.symbols (added)
+++ trunk/apr/libapr1.symbols Sat May  2 07:14:02 2009
@@ -1,0 +1,2 @@
+here for the purpose of tricking debhelper...bwahahahaha.
+

Propchange: trunk/apr/libapr1.symbols
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: trunk/apr/patches/00list
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/patches/00list?rev=906&op=diff
==============================================================================
--- trunk/apr/patches/00list (original)
+++ trunk/apr/patches/00list Sat May  2 07:14:02 2009
@@ -6,3 +6,4 @@
 022_hurd_path_max.dpatch
 023_fix_doxygen.dpatch
 024_hppa_flock_EWOULDBLOCK_weirdness.dpatch
+025_libtool_2.x_fixes.dpatch

Added: trunk/apr/patches/025_libtool_2.x_fixes.dpatch
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/patches/025_libtool_2.x_fixes.dpatch?rev=906&op=file
==============================================================================
--- trunk/apr/patches/025_libtool_2.x_fixes.dpatch (added)
+++ trunk/apr/patches/025_libtool_2.x_fixes.dpatch Sat May  2 07:14:02 2009
@@ -1,0 +1,173 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 025_libtool_2.x_fixes.dpatch by  <jsw at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update build system to work with libtool 2.x
+## DP:
+## DP: This corresponds to upstream revisions:
+## DP:   733052
+## DP:   742752
+## DP:   748902
+## DP:   757363
+ at DPATCH@
+
+diff --git a/build/buildcheck.sh b/build/buildcheck.sh
+index 62fe931..c236810 100755
+--- a/build/buildcheck.sh
++++ b/build/buildcheck.sh
+@@ -38,7 +38,7 @@ fi
+ # output is multiline from 1.5 onwards
+ 
+ # Require libtool 1.4 or newer
+-libtool=`build/PrintPath glibtool libtool libtool15 libtool14`
++libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
+ lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
+ if test -z "$lt_pversion"; then
+ echo "buildconf: libtool not found."
+diff --git a/buildconf b/buildconf
+index bc0e9fd..11554ed 100755
+--- a/buildconf
++++ b/buildconf
+@@ -23,7 +23,7 @@
+ #
+ build/buildcheck.sh || exit 1
+ 
+-libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize`
++libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize15 libtoolize14 libtoolize`
+ if [ "x$libtoolize" = "x" ]; then
+     echo "libtoolize not found in path"
+     exit 1
+@@ -35,17 +35,20 @@ fi
+ # Note: APR supplies its own config.guess and config.sub -- we do not
+ #       rely on libtool's versions
+ #
+-echo "Copying libtool helper files ..."
++echo "buildconf: copying libtool helper files using $libtoolize"
+ 
+ # Remove any libtool files so one can switch between libtool 1.3
+ # and libtool 1.4 by simply rerunning the buildconf script.
+-(cd build ; rm -f ltconfig ltmain.sh libtool.m4)
+-
+-$libtoolize --copy --automake
+-
+-if [ -f libtool.m4 ]; then 
+-   ltfile=`pwd`/libtool.m4
+-else
++(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4)
++
++lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
++lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
++IFS=.; set $lt_version; IFS=' '
++if test "$1" = "1"; then
++  $libtoolize --copy --automake
++  if [ -f libtool.m4 ]; then 
++    ltfile=`pwd`/libtool.m4
++  else
+    ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
+                    < $libtoolize`"
+    ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`}
+@@ -54,21 +57,21 @@ else
+      ltpath=`dirname $libtoolize`
+      ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+    fi
+-fi
+-  
+-if [ ! -f $ltfile ]; then
++  fi
++  if [ ! -f $ltfile ]; then
+     echo "$ltfile not found"
+     exit 1
++  fi
++  # Do we need this anymore?
++  echo "buildconf: Using libtool.m4 at ${ltfile}."
++  cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+ fi
+-
+-echo "buildconf: Using libtool.m4 at ${ltfile}."
+-
+-cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+-
+-# libtool.m4 from 1.6 requires ltsugar.m4
+-if [ -f ltsugar.m4 ]; then
+-   rm -f build/ltsugar.m4
+-   mv ltsugar.m4 build/ltsugar.m4
++if test "$1" = "2"; then
++  $libtoolize --copy
++  # Wouldn't it just be better to define top_builddir??
++  mv build/libtool.m4 build/libtool.m4.$$
++  cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
++  rm build/libtool.m4.$$
+ fi
+ 
+ # Clean up any leftovers
+@@ -77,22 +80,22 @@ rm -f aclocal.m4 libtool.m4
+ #
+ # Generate the autoconf header and ./configure
+ #
+-echo "Creating include/arch/unix/apr_private.h.in ..."
++echo "buildconf: creating include/arch/unix/apr_private.h.in ..."
+ ${AUTOHEADER:-autoheader}
+ 
+-echo "Creating configure ..."
++echo "buildconf: creating configure ..."
+ ### do some work to toss config.cache?
+ ${AUTOCONF:-autoconf}
+ 
+ # Remove autoconf 2.5x's cache directory
+ rm -rf autom4te*.cache
+ 
+-echo "Generating 'make' outputs ..."
++echo "buildconf: generating 'make' outputs ..."
+ build/gen-build.py make
+ 
+ # Create RPM Spec file
+ if [ -f `which cut` ]; then
+-  echo rebuilding rpm spec file
++  echo "buildconf: rebuilding rpm spec file"
+   ( REVISION=`build/get-version.sh all include/apr_version.h APR`
+     VERSION=`echo $REVISION | cut -d- -s -f1`
+     RELEASE=`echo $REVISION | cut -d- -s -f2`
+diff --git a/configure.in b/configure.in
+index 46b4b32..2ac1439 100644
+--- a/configure.in
++++ b/configure.in
+@@ -9,6 +9,7 @@ AC_PREREQ(2.50)
+ AC_INIT(build/apr_common.m4)
+ AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
+ AC_CONFIG_AUX_DIR(build)
++AC_CONFIG_MACRO_DIR(build)
+ 
+ dnl 
+ dnl Include our own M4 macros along with those for libtool
+@@ -20,6 +21,10 @@ sinclude(build/apr_win32.m4)
+ sinclude(build/apr_hints.m4)
+ sinclude(build/libtool.m4)
+ sinclude(build/ltsugar.m4)
++sinclude(build/argz.m4)
++sinclude(build/ltoptions.m4)
++sinclude(build/ltversion.m4)
++sinclude(build/lt~obsolete.m4)
+ 
+ dnl Hard-coded inclusion at the tail end of apr_private.h:
+ AH_BOTTOM([
+@@ -117,6 +122,8 @@ dnl can only be used once within a configure script, so this prevents a
+ dnl preload section from invoking the macro to get compiler info.
+ AC_PROG_CC
+ 
++AC_PROG_SED
++
+ dnl Preload
+ APR_PRELOAD
+ 
+@@ -160,6 +167,11 @@ echo "performing libtool configuration..."
+ AC_ARG_ENABLE(experimental-libtool,[  --enable-experimental-libtool Use experimental custom libtool],
+   [experimental_libtool=$enableval],[experimental_libtool=no])
+ 
++dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL
++if test "x$Xsed" = "x"; then
++  Xsed="$SED -e 1s/^X//"
++fi
++
+ case $host in
+ *-os2*)
+     # Use a custom-made libtool replacement

Modified: trunk/apr/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/rules?rev=906&op=diff
==============================================================================
--- trunk/apr/rules (original)
+++ trunk/apr/rules Sat May  2 07:14:02 2009
@@ -41,7 +41,7 @@
   MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-ifeq (,$(findstring notest,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring notest,$(DEB_BUILD_OPTIONS))$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	TEST_TARGET = test
 else
 	TEST_TARGET =
@@ -106,6 +106,8 @@
 
 binary-indep: build install
 
+WITH_OR_WITHOUT_SENDFILE=$(shell dpkg --print-architecture | grep -q kfreebsd && echo without || echo with)
+
 binary-arch: build install
 	dh_testdir
 	dh_testroot
@@ -117,7 +119,7 @@
 	dh_strip --dbg-package=libapr1-dbg
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs
+	dh_makeshlibs -- -Idebian/symbols.$(WITH_OR_WITHOUT_SENDFILE)-sendfile
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

Copied: trunk/apr/symbols.common (from r905, trunk/apr/libapr1.symbols)
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/symbols.common?rev=906&op=diff
==============================================================================
--- trunk/apr/libapr1.symbols (original)
+++ trunk/apr/symbols.common Sat May  2 07:14:02 2009
@@ -354,7 +354,6 @@
  apr_socket_recv at Base 1.2.7
  apr_socket_recvfrom at Base 1.2.7
  apr_socket_send at Base 1.2.7
- apr_socket_sendfile at Base 1.2.7
  apr_socket_sendto at Base 1.2.7
  apr_socket_sendv at Base 1.2.7
  apr_socket_shutdown at Base 1.2.7

Propchange: trunk/apr/symbols.common
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: trunk/apr/symbols.with-sendfile
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/symbols.with-sendfile?rev=906&op=file
==============================================================================
--- trunk/apr/symbols.with-sendfile (added)
+++ trunk/apr/symbols.with-sendfile Sat May  2 07:14:02 2009
@@ -1,0 +1,2 @@
+#include "symbols.common"
+ apr_socket_sendfile at Base 1.2.7

Added: trunk/apr/symbols.without-sendfile
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apr/symbols.without-sendfile?rev=906&op=file
==============================================================================
--- trunk/apr/symbols.without-sendfile (added)
+++ trunk/apr/symbols.without-sendfile Sat May  2 07:14:02 2009
@@ -1,0 +1,1 @@
+#include "symbols.common"

More information about the Pkg-apache-commits mailing list