[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (8aef6dc8e62f71e8a64d580aa3a792f1429a12f0)

Ladislav Hagara scm at sourcemage.org
Mon Sep 10 18:10:35 EDT 2007


GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara at unob.cz>:

 http/apache/BUILD       |    3 ---
 http/apache/DETAILS     |   10 +++++-----
 http/apache/HISTORY     |    4 ++++
 http/apache/db-4.1.diff |   16 ----------------
 4 files changed, 9 insertions(+), 24 deletions(-)

New commits:
commit 8aef6dc8e62f71e8a64d580aa3a792f1429a12f0
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    apache 1.3.39, SECURITY_PATCH=2

diff --git a/http/apache/BUILD b/http/apache/BUILD
index 7f212ab..210aa41 100755
--- a/http/apache/BUILD
+++ b/http/apache/BUILD
@@ -1,6 +1,3 @@
-# Berkeley DB 4.1 requires an extra parameter in `open'
-#patch -p1 < $SCRIPT_DIRECTORY/db-4.1.diff &&
-
 ./configure  --prefix=/usr                     \
              --sysconfdir=/etc/httpd           \
              --localstatedir=/var              \
diff --git a/http/apache/DETAILS b/http/apache/DETAILS
index a35d340..3db6e7f 100755
--- a/http/apache/DETAILS
+++ b/http/apache/DETAILS
@@ -1,13 +1,13 @@
            SPELL=apache
-         VERSION=1.3.37
-     SOURCE_HASH=sha512:471b83d7701c42bf21dff0b7dac242ed519c8517dddebc78b148ee2dbfdb6e9ad244c00a290294427c4ebdfbce19b01f30c0fdc32a4ac6f5b8cf473d69e377a8
-  SECURITY_PATCH=1
+         VERSION=1.3.39
+     SOURCE_HASH=sha512:fdffb3ed167d7beae0162f341c36cbb5f0a9be63c898442534b217e0ce7c5f87dffe6a9223873fc336848261ea3424a7e692c3de1b4a4cf9ae43e9f75d8827d9
+  SECURITY_PATCH=2
           SOURCE=${SPELL}_$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
-   SOURCE_URL[0]=http://www.wmwweb.com/apache/httpd/$SOURCE
+   SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
+   SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
         WEB_SITE=http://httpd.apache.org/
          ENTERED=20010922
-         UPDATED=20040515
       LICENSE[0]=APACHE
         KEYWORDS="http"
            SHORT="Apache HTTP Server"
diff --git a/http/apache/HISTORY b/http/apache/HISTORY
index b8ee298..0415b58 100644
--- a/http/apache/HISTORY
+++ b/http/apache/HISTORY
@@ -1,3 +1,7 @@
+2007-09-10 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.3.39, SECURITY_PATCH=2, updated SOURCE_URLs
+	  CVE-2006-5752, CVE-2007-3304
+
 2006-09-29 Arjan Bouter <abouter at sourcemage.org>
 	* CONFLICTS: added apache22
 
diff --git a/http/apache/db-4.1.diff b/http/apache/db-4.1.diff
deleted file mode 100644
index 1c25fde..0000000
--- a/http/apache/db-4.1.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -purN apache_1.3.27/src/modules/standard/mod_auth_db.c apache/src/modules/standard/mod_auth_db.c
---- apache_1.3.27/src/modules/standard/mod_auth_db.c	2002-09-04 10:29:13.000000000 -0400
-+++ apache/src/modules/standard/mod_auth_db.c	2003-06-29 12:35:28.000000000 -0400
-@@ -172,7 +172,11 @@ static char *get_db_pw(request_rec *r, c
- 
- #if defined(DB3) || defined(DB4)
-     if (   db_create(&f, NULL, 0) != 0 
--        || f->open(f, auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
-+        || f->open(f, 
-+#if defined(DB4)
-+                   NULL,
-+#endif
-+                   auth_dbpwfile, NULL, DB_HASH, DB_RDONLY, 0664) != 0) {
- #elif defined(DB2)
-     if (db_open(auth_dbpwfile, DB_HASH, DB_RDONLY, 0664, NULL, NULL, &f) != 0) {
- #else



More information about the SM-Commit mailing list