← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/010_more_fhs_compliancy

  • 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/010_more_fhs_compliancy
1
 
--- build-tree/apache2/include/ap_config_layout.h.in.orig       2005-06-15 00:06:51.000000000 +1000
2
 
+++ build-tree/apache2/include/ap_config_layout.h.in    2005-10-23 14:02:43.000000000 +1000
3
 
@@ -55,5 +55,6 @@
4
 
 #define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@"
5
 
 #define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@"
6
 
 #define DEFAULT_REL_PROXYCACHEDIR "@rel_proxycachedir@"
7
 
+#define DEFAULT_PIDLOG "/var/run/apache2.pid"
8
 
 
9
 
 #endif /* AP_CONFIG_LAYOUT_H */
10
 
diff -ruN -x Makefile.in -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/config.layout build-tree/apache2/config.layout
11
 
--- build-tree.orig/apache2/config.layout       2002-07-16 19:29:59.000000000 +0100
12
 
+++ build-tree/apache2/config.layout    2003-05-07 13:28:20.000000000 +0100
13
 
@@ -314,11 +314,11 @@
14
 
     manualdir:     ${htdocsdir}/manual
15
 
     cgidir:        ${prefix}/usr/lib/cgi-bin
16
 
     includedir:    ${exec_prefix}/include/apache2
17
 
-    localstatedir: ${prefix}/var/run
18
 
-    runtimedir:    ${prefix}/var/run
19
 
+    localstatedir: ${prefix}/var/lock/apache2
20
 
+    runtimedir:    ${prefix}/var/run/apache2
21
 
     logfiledir:    ${prefix}/var/log/apache2
22
 
     proxycachedir: ${prefix}/var/cache/apache2/proxy
23
 
     infodir:       ${exec_prefix}/share/info
24
 
-    installbuilddir: ${prefix}/etc/apache2/build
25
 
+    installbuilddir: ${prefix}/usr/share/apache2/build
26
 
     errordir:      ${datadir}/error
27
 
 </Layout>
28
 
diff -ruN -x Makefile.in -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/srclib/apr/config.layout build-tree/apache2/srclib/apr/config.layout
29
 
--- build-tree.orig/apache2/srclib/apr/config.layout    2003-01-07 21:06:50.000000000 +0000
30
 
+++ build-tree/apache2/srclib/apr/config.layout 2003-07-14 21:43:22.000000000 +0100
31
 
@@ -228,4 +228,5 @@
32
 
     runtimedir:    ${prefix}/var/run
33
 
     infodir:       ${exec_prefix}/share/info
34
 
     libsuffix:    -${APR_MAJOR_VERSION}
35
 
+    installbuilddir: ${prefix}/usr/share/apache2/build
36
 
 </Layout>
37
 
diff -ruN -x Makefile.in -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/srclib/apr-util/config.layout build-tree/apache2/srclib/apr-util/config.layout
38
 
--- build-tree.orig/apache2/srclib/apr-util/config.layout       2003-01-07 21:13:09.000000000 +0000
39
 
+++ build-tree/apache2/srclib/apr-util/config.layout    2003-07-14 21:43:46.000000000 +0100
40
 
@@ -228,4 +228,5 @@
41
 
     runtimedir:    ${prefix}/var/run
42
 
     infodir:       ${exec_prefix}/share/info
43
 
     libsuffix     -${APRUTIL_MAJOR_VERSION}
44
 
+    installbuilddir: ${prefix}/usr/share/apache2/build
45
 
 </Layout>