sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79917 by Arwed von Merkatz for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "Benoit Papillault" <benoit.papillault AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79917 by Arwed von Merkatz for review
Date: Sun, 28 May 2006 21:00:01 +0100 (BST)

Change 79917 by arwed_von_merkatz@arwed-Otherland on 2006/05/28 20:57:24

security fix to stable(-rc), bug #11859

Affected files ...

... //sgl/grimoires/stable-rc/0.4/http/apache2/DETAILS#2 integrate
... //sgl/grimoires/stable-rc/0.4/http/apache2/HISTORY#2 integrate
... //sgl/grimoires/stable-rc/0.4/http/apache2/buildconf.patch#2 integrate
... //sgl/grimoires/stable/0.3/http/apache2/DETAILS#3 integrate
... //sgl/grimoires/stable/0.3/http/apache2/HISTORY#3 integrate
... //sgl/grimoires/stable/0.3/http/apache2/buildconf.patch#2 integrate

Differences ...

==== //sgl/grimoires/stable-rc/0.4/http/apache2/DETAILS#2 (xtext) ====

@@ -1,6 +1,7 @@
SPELL=apache2
- VERSION=2.0.55
- SOURCE_HASH='sha1:da1e215a7e9f1ccc507ba906fefb7c2076ad1b9d'
+ VERSION=2.0.58
+
SOURCE_HASH='sha512:907f40feb8250e9834b972e86e27c07276562587ab0a35b7de433c9247bf82f82230fcf493f7fed9e53ae80bdb4070b9c0a1855d5b4b2b8582774b1148548583'
+ SECURITY_PATCH=1
SOURCE=httpd-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION
SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE

==== //sgl/grimoires/stable-rc/0.4/http/apache2/HISTORY#2 (text) ====

@@ -1,3 +1,6 @@
+2006-05-15 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 2.0.58.
+
2005-10-20 Jason Flatt <jflatt AT sourcemage.org>
* PRE_BUILD: Removed unnecessary patches.

==== //sgl/grimoires/stable-rc/0.4/http/apache2/buildconf.patch#2 (text) ====

@@ -1,12 +1,12 @@
-diff -Naur httpd-2.0.53.orig/buildconf httpd-2.0.53/buildconf
---- httpd-2.0.53.orig/buildconf 2005-02-07 13:07:47.183455368 -0800
-+++ httpd-2.0.53/buildconf 2005-02-07 13:09:11.810590088 -0800
-@@ -66,7 +66,7 @@
+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 [ ! -d "$apu_src_dir" -o ! -f "$apu_src_dir/Makefile.in" ]; then
-+if [ ! -d "$apu_src_dir" -o ! -f "$apu_src_dir/build/find_apu.m4" ]; then
+-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, "

==== //sgl/grimoires/stable/0.3/http/apache2/DETAILS#3 (xtext) ====

@@ -1,6 +1,7 @@
SPELL=apache2
- VERSION=2.0.55
- SOURCE_HASH='sha1:da1e215a7e9f1ccc507ba906fefb7c2076ad1b9d'
+ VERSION=2.0.58
+
SOURCE_HASH='sha512:907f40feb8250e9834b972e86e27c07276562587ab0a35b7de433c9247bf82f82230fcf493f7fed9e53ae80bdb4070b9c0a1855d5b4b2b8582774b1148548583'
+ SECURITY_PATCH=1
SOURCE=httpd-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION
SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE

==== //sgl/grimoires/stable/0.3/http/apache2/HISTORY#3 (text) ====

@@ -1,3 +1,6 @@
+2006-05-15 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 2.0.58.
+
2005-10-20 Jason Flatt <jflatt AT sourcemage.org>
* PRE_BUILD: Removed unnecessary patches.

==== //sgl/grimoires/stable/0.3/http/apache2/buildconf.patch#2 (text) ====

@@ -1,12 +1,12 @@
-diff -Naur httpd-2.0.53.orig/buildconf httpd-2.0.53/buildconf
---- httpd-2.0.53.orig/buildconf 2005-02-07 13:07:47.183455368 -0800
-+++ httpd-2.0.53/buildconf 2005-02-07 13:09:11.810590088 -0800
-@@ -66,7 +66,7 @@
+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 [ ! -d "$apu_src_dir" -o ! -f "$apu_src_dir/Makefile.in" ]; then
-+if [ ! -d "$apu_src_dir" -o ! -f "$apu_src_dir/build/find_apu.m4" ]; then
+-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] PERFORCE change 79917 by Arwed von Merkatz for review, Perforce Review Daemon, 05/28/2006