← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/011_fix_ap-config

  • 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/011_fix_ap-config
1
 
diff -ruN -x Makefile.in -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/srclib/apr/apr-config.in build-tree/apache2/srclib/apr/apr-config.in
2
 
--- build-tree.orig/apache2/srclib/apr/apr-config.in    2003-04-21 15:21:59.000000000 +0100
3
 
+++ build-tree/apache2/srclib/apr/apr-config.in 2003-05-29 15:01:17.000000000 +0100
4
 
@@ -59,12 +59,12 @@
5
 
 APR_DOTTED_VERSION="@APR_DOTTED_VERSION@"
6
 
 
7
 
 prefix="@prefix@"
8
 
-exec_prefix="@exec_prefix@"
9
 
-bindir="@bindir@"
10
 
-libdir="@libdir@"
11
 
-datadir="@datadir@"
12
 
-installbuilddir="@installbuilddir@"
13
 
-includedir="@includedir@"
14
 
+exec_prefix="/usr"
15
 
+bindir="/usr/bin"
16
 
+libdir="/usr/lib"
17
 
+datadir="/usr/share/apache2"
18
 
+installbuilddir="/usr/share/apache2/build"
19
 
+includedir="/usr/include/apr-0"
20
 
 
21
 
 CC="@CC@"
22
 
 CPP="@CPP@"
23
 
@@ -221,7 +221,7 @@
24
 
     ;;
25
 
     --apr-libtool)
26
 
     if test "$location" = "installed"; then
27
 
-        echo "${installbuilddir}/libtool"
28
 
+        echo "/usr/bin/libtool"
29
 
     else
30
 
         echo "$APR_BUILD_DIR/libtool"
31
 
     fi
32
 
diff -ruN -x Makefile.in -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/srclib/apr-util/apu-config.in build-tree/apache2/srclib/apr-util/apu-config.in
33
 
--- build-tree.orig/apache2/srclib/apr-util/apu-config.in       2003-03-23 03:32:57.000000000 +0000
34
 
+++ build-tree/apache2/srclib/apr-util/apu-config.in    2003-05-29 15:03:05.000000000 +0100
35
 
@@ -60,9 +60,9 @@
36
 
 
37
 
 prefix="@prefix@"
38
 
 exec_prefix="@exec_prefix@"
39
 
-bindir="@bindir@"
40
 
-libdir="@libdir@"
41
 
-includedir="@includedir@"
42
 
+bindir="/usr/bin"
43
 
+libdir="/usr/lib"
44
 
+includedir="/usr/include/apr-0"
45
 
 
46
 
 LIBS="@APRUTIL_EXPORT_LIBS@"
47
 
 INCLUDES="@APRUTIL_INCLUDES@"