diff options
| author | Eric Sandall | 2007-11-29 23:48:45 -0800 |
|---|---|---|
| committer | Eric Sandall | 2007-12-05 21:01:30 -0800 |
| commit | 6508227a2779c0ad774e310ae562a9e90d1b4b43 (patch) | |
| tree | d7fe6cdb0ca29337f0050daa9efb95b2f606e559 | |
| parent | 72e2a07799757b0228ca19a8b2cb2725051ca2e0 (diff) | |
apache2: Finish fixing Bug #13989 (necessary patch removed)
| -rw-r--r-- | http/apache2/HISTORY | 6 | ||||
| -rwxr-xr-x | http/apache2/PRE_BUILD | 3 | ||||
| -rw-r--r-- | http/apache2/buildconf.patch | 12 |
3 files changed, 21 insertions, 0 deletions
diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY index 6abdb039e8..4ff4933554 100644 --- a/http/apache2/HISTORY +++ b/http/apache2/HISTORY @@ -1,3 +1,9 @@ +2007-11-29 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: Use upstream apache.gpg + Cleaned up extra spaces in long description + * buildconf.patch: Re-apply patch (finish Bug #13989) + * PRE_BUILD: Apply buildconf.patch again (Bug #13989) + 2007-09-10 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.0.61, SECURITY_PATCH=2 CVE-2007-3847, CVE-2007-1863, CVE-2006-5752, CVE-2007-3304 diff --git a/http/apache2/PRE_BUILD b/http/apache2/PRE_BUILD new file mode 100755 index 0000000000..b69b7feade --- /dev/null +++ b/http/apache2/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +patch -p1 < $SCRIPT_DIRECTORY/buildconf.patch diff --git a/http/apache2/buildconf.patch b/http/apache2/buildconf.patch new file mode 100644 index 0000000000..427a438187 --- /dev/null +++ b/http/apache2/buildconf.patch @@ -0,0 +1,12 @@ +diff -urN httpd-2.0.58/buildconf httpd/buildconf +--- httpd-2.0.58/buildconf 2006-04-24 13:12:21.000000000 -0400 ++++ httpd/buildconf 2006-05-15 22:28:32.000000000 -0400 +@@ -67,7 +67,7 @@ + should_exit=1 + fi + +-if [ ! -f "$apu_src_dir/Makefile.in" ]; then ++if [ ! -f "$apu_src_dir/build/apu-conf.m4" ]; then + echo "" + echo "You don't have a copy of the apr-util source in $apu_src_dir. " + echo "Please get one the source using the following instructions, " |