~ubuntu-branches/ubuntu/saucy/apache2/saucy

« back to all changes in this revision

Viewing changes to debian/patches/012_apxs2_sucks

  • Committer: Bazaar Package Importer
  • Author(s): Thom May
  • Date: 2004-10-13 19:46:10 UTC
  • Revision ID: james.westby@ubuntu.com-20041013194610-ccvqcz8vflh5zqrm
Tags: 2.0.50-12ubuntu4
Security Release. Patch from upstream for the following:
CAN-2004-0885SSLCypherSuite can be bypassed during renegotiation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
diff -ruN -x Makefile.in -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/support/apxs.in build-tree/apache2/support/apxs.in
 
2
--- build-tree.orig/apache2/support/apxs.in     2003-07-04 15:16:21.000000000 +0100
 
3
+++ build-tree/apache2/support/apxs.in  2003-07-04 15:16:15.000000000 +0100
 
4
@@ -331,6 +331,7 @@
 
5
     $data =~ s|%TARGET%|$CFG_TARGET|sg;
 
6
     $data =~ s|%PREFIX%|$prefix|sg;
 
7
     $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
 
8
+    $data =~ s|%DATADIR%|$datadir|sg;
 
9
 
 
10
     my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
 
11
 
 
12
@@ -694,7 +695,7 @@
 
13
 
 
14
 builddir=.
 
15
 top_srcdir=%PREFIX%
 
16
-top_builddir=%PREFIX%
 
17
+top_builddir=%DATADIR%
 
18
 include %INSTALLBUILDDIR%/special.mk
 
19
 
 
20
 #   the used tools