← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/005_apxs

  • 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/005_apxs
1
 
--- build-tree.orig/apache2/support/apxs.in     2003-04-05 11:07:55.000000000 +0200
2
 
+++ build-tree/apache2/support/apxs.in  2003-04-05 11:21:58.000000000 +0200
3
 
@@ -228,7 +228,7 @@
4
 
 my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
5
 
 $httpd = eval qq("$httpd");
6
 
 $httpd = eval qq("$httpd");
7
 
-my $envvars = get_vars("sbindir") . "/envvars";
8
 
+my $envvars = "$CFG_SYSCONFDIR" . "/envvars";
9
 
 $envvars = eval qq("$envvars");
10
 
 $envvars = eval qq("$envvars");
11
 
 
12
 
@@ -376,9 +376,7 @@
13
 
     exit(1);
14
 
 }
15
 
 
16
 
-my $libtool = `$apr_bindir/apr-config --installbuilddir`;
17
 
-chomp($libtool);
18
 
-$libtool = "$libtool/libtool";
19
 
+my $libtool = "/usr/bin/libtool";
20
 
 
21
 
 my $apr_includedir = `$apr_bindir/apr-config --includes`;
22
 
 chomp($apr_includedir);