Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (87b944cb4934a71e556e67957266b0047a072834)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (87b944cb4934a71e556e67957266b0047a072834)
  • Date: Sun, 2 May 2010 14:13:09 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

http/apache1/DETAILS | 10 +++++-----
http/apache1/HISTORY | 7 ++++++-
http/apache1/PRE_BUILD | 2 +-
3 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 87b944cb4934a71e556e67957266b0047a072834
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

apache1: Updated to version 1.3.42. SECURITY_PATCH++
Spell needed to be re-named with other fixes due to
spell name and source being different.

diff --git a/http/apache1/DETAILS b/http/apache1/DETAILS
index 76206df..4e1c3ff 100755
--- a/http/apache1/DETAILS
+++ b/http/apache1/DETAILS
@@ -1,10 +1,10 @@
- SPELL=apache
- VERSION=1.3.41
- SECURITY_PATCH=3
- SOURCE=${SPELL}_$VERSION.tar.gz
+ SPELL=apache1
+ VERSION=1.3.42
+ SECURITY_PATCH=4
+ SOURCE=apache_$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/apache_$VERSION
SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
SOURCE2_URL[0]=$APACHE_URL/httpd/$SOURCE2
diff --git a/http/apache1/HISTORY b/http/apache1/HISTORY
index c2c54c1..d6c15d9 100644
--- a/http/apache1/HISTORY
+++ b/http/apache1/HISTORY
@@ -1,5 +1,10 @@
+2010-05-02 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Actually rename spell so it will cast.
+ Updated to verison 1.3.42. SECURITY_PATCH++
+ * PRE_BUILD: Change to SCRIPT_DIRECTORY so patch will work
+
2010-03-23 Mark Bainter <mbainter AT sourcemage.org>
- * Renamed from apache to apache1
+ * Renamed from apache to apache1
* CONFLICTS: added apache (deprecated)

2009-09-04 Quentin Rameau <quinq AT sourcemage.org>
diff --git a/http/apache1/PRE_BUILD b/http/apache1/PRE_BUILD
index 42fa815..e44f89a 100755
--- a/http/apache1/PRE_BUILD
+++ b/http/apache1/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/apache_1.3.41_glic.patch
+patch -p1 < ${SCRIPT_DIRECTORY}/apache_1.3.41_glic.patch




Archive powered by MHonArc 2.6.24.

Top of Page