Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (0bd3887405600c48df135ecbdd2936d79b856b1a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (0bd3887405600c48df135ecbdd2936d79b856b1a)
  • Date: Fri, 30 Nov 2007 01:43:29 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

http/apache2/HISTORY | 2 ++
http/apache2/PRE_BUILD | 3 +++
http/apache2/buildconf.patch | 12 ++++++++++++
3 files changed, 17 insertions(+)

New commits:
commit 0bd3887405600c48df135ecbdd2936d79b856b1a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

apache2: Finish fixing Bug #13989 (necessary patch removed)

diff --git a/http/apache2/HISTORY b/http/apache2/HISTORY
index 274fb0f..4ff4933 100644
--- a/http/apache2/HISTORY
+++ b/http/apache2/HISTORY
@@ -1,6 +1,8 @@
2007-11-29 Eric Sandall <sandalle AT 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 AT vabo.cz>
* DETAILS: 2.0.61, SECURITY_PATCH=2
diff --git a/http/apache2/PRE_BUILD b/http/apache2/PRE_BUILD
new file mode 100755
index 0000000..b69b7fe
--- /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 0000000..427a438
--- /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, "



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (0bd3887405600c48df135ecbdd2936d79b856b1a), Eric Sandall, 11/30/2007

Archive powered by MHonArc 2.6.24.

Top of Page