diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2014-01-12 22:58:46 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2014-01-12 22:58:46 +0100 |
| commit | f0003f26e04ec237881b89f099d072e060d8ffbc (patch) | |
| tree | d7e927b37ea0af9941c152a6aa51f8ecf8afbe90 | |
| parent | 8c6a4f9c28a3a7c89c2843d694237e5e3ad7173e (diff) | |
| download | apache2-f0003f26e04ec237881b89f099d072e060d8ffbc.tar.gz | |
avoid future problems with patched config.m4's
as in LP #1251939
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/find_config_m4_LP1251939 | 31 |
2 files changed, 38 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 519168fe..47f89c7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apache2 (2.4.7-2) UNRELEASED; urgency=medium + + * Patch the build system to avoid problems with patched config.m4's + as in LP #1251939 in the future. + + -- Stefan Fritsch <sf@debian.org> Sun, 12 Jan 2014 22:56:52 +0100 + apache2 (2.4.7-1) unstable; urgency=low New upstream version diff --git a/debian/patches/find_config_m4_LP1251939 b/debian/patches/find_config_m4_LP1251939 new file mode 100644 index 00000000..38c957e1 --- /dev/null +++ b/debian/patches/find_config_m4_LP1251939 @@ -0,0 +1,31 @@ +LP: #1251939 + +commit 60f2545f1858415d31dcf0bb625262216c7821cd +Author: Stefan Fritsch <sf@apache.org> +Date: Sat Nov 16 23:49:04 2013 +0000 + + Explicitly list in which directories to look for config*.m4 files. + + If some distributor patches a config*.m4 file with quilt, that will + place a copy of the original file in .pc/ . Doing a naive "find ." + will then cause both the original and the patched m4 file to be included, + causing havoc later on. + + PR: 55787 + + + git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542615 13f79535-47bb-0310-9956-ffa450edef68 + +Index: apache2/build/config-stubs +=================================================================== +--- apache2.orig/build/config-stubs ++++ apache2/build/config-stubs +@@ -15,7 +15,7 @@ + # config files without a number are sorted before those with a number. + # + +-configfiles=`find . -name "config*.m4" | \ ++configfiles=`find os server modules support -name "config*.m4" | \ + sed 's#\(.*/config\)\(.*\).m4#\20 \1\2.m4#' | \ + sort | \ + sed 's#.* ##'` |