← Back to branch summary

~ubuntu-branches/ubuntu/feisty/apache2/feisty

« back to all changes in this revision

Viewing changes to debian/patches/022_fix_apr-util_link

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Barth
  • Date: 2006-12-09 21:05:45 UTC
  • mfrom: (0.6.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20061209210545-h70s0xaqc2v8vqr2
Tags: 2.2.3-3.2
http://bugs.debian.org/396265
* Non-maintainer upload.
* 043_ajp_connection_reuse: Patch from upstream Bugzilla, fixing a critical
  issue with regard to connection reuse in mod_proxy_ajp.
  Closes: #396265

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/022_fix_apr-util_link
1
 
diff -ruN -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/srclib/apr-util/build/apu-conf.m4 build-tree/apache2/srclib/apr-util/build/apu-conf.m4
2
 
--- build-tree.orig/apache2/srclib/apr-util/build/apu-conf.m4   2003-08-28 18:29:07.000000000 +0100
3
 
+++ build-tree/apache2/srclib/apr-util/build/apu-conf.m4        2004-07-29 16:38:38.000000000 +0100
4
 
@@ -23,6 +23,7 @@
5
 
   APR_LIBS="`$apr_config --link-libtool --libs`"
6
 
   APR_SO_EXT="`$apr_config --apr-so-ext`"
7
 
   APR_LIB_TARGET="`$apr_config --apr-lib-target`"
8
 
+  apr_ld_flags="`$apr_config --link-ld`"
9
 
 
10
 
   AC_SUBST(APR_INCLUDES)
11
 
   AC_SUBST(APR_LIBS)
12
 
@@ -31,6 +32,7 @@
13
 
   APR_SOURCE_DIR="`$apr_config --srcdir`"
14
 
   AC_SUBST(APR_BUILD_DIR)
15
 
   AC_SUBST(APR_SOURCE_DIR)
16
 
+  APR_ADDTO(APRUTILL_LDFLAGS,[$apr_ld_flags])
17
 
 ])
18
 
 
19
 
 
20
 
diff -ruN -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/srclib/apr-util/Makefile.in build-tree/apache2/srclib/apr-util/Makefile.in
21
 
--- build-tree.orig/apache2/srclib/apr-util/Makefile.in 2004-08-02 17:14:25.278232168 +0100
22
 
+++ build-tree/apache2/srclib/apr-util/Makefile.in      2004-08-02 17:13:39.577179784 +0100
23
 
@@ -12,6 +12,7 @@
24
 
 
25
 
 INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
26
 
 APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
27
 
+APRUTILL_LDFLAGS = @APRUTILL_LDFLAGS@
28
 
 APRUTIL_LIBS = @APRUTIL_LIBS@
29
 
 
30
 
 TARGET_LIB = lib@APRUTIL_LIBNAME@.la
31
 
@@ -83,7 +84,7 @@
32
 
 
33
 
 $(TARGET_LIB):
34
 
        @objects="`find $(SUBDIRS) -name expat -prune -o -name 'gen_uri_delims.@so_ext@' -prune -o -name '*.@so_ext@' -print`"; \
35
 
-           tmpcmd="$(LINK) @lib_target@ @EXTRA_OS_LINK@"; \
36
 
+           tmpcmd="$(LINK) $(APRUTILL_LDFLAGS) @lib_target@ @EXTRA_OS_LINK@ "; \
37
 
            echo $$tmpcmd; \
38
 
            $$tmpcmd && touch $@
39
 
 
40
 
diff -ruN -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/srclib/apr-util/configure.in build-tree/apache2/srclib/apr-util/configure.in
41
 
--- build-tree.orig/apache2/srclib/apr-util/configure.in        2003-12-07 09:59:54.000000000 +0000
42
 
+++ build-tree/apache2/srclib/apr-util/configure.in     2004-08-02 18:03:13.000000000 +0100
43
 
@@ -149,6 +149,7 @@
44
 
 AC_SUBST(APRUTIL_PRIV_INCLUDES)
45
 
 AC_SUBST(APRUTIL_INCLUDES)
46
 
 AC_SUBST(APRUTIL_LDFLAGS)
47
 
+AC_SUBST(APRUTILL_LDFLAGS)
48
 
 AC_SUBST(APRUTIL_LIBS)
49
 
 AC_SUBST(LDFLAGS)
50