sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79238 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 79238 by Arwed von Merkatz for review
Date: Sat, 13 May 2006 19:30:01 +0100 (BST)

Change 79238 by arwed_von_merkatz@arwed-Otherland on 2006/05/13 19:27:38

updated to 2.0.55 for bug #10817

Affected files ...

... //sgl/grimoires/stable/0.3/http/apache2/04_all_ssl_makefile.patch#2 delete
...
//sgl/grimoires/stable/0.3/http/apache2/05_httpd-2.0.54_openssl-0.9.8.patch#2
delete
... //sgl/grimoires/stable/0.3/http/apache2/06_CAN-2005-2700.patch#2 delete
... //sgl/grimoires/stable/0.3/http/apache2/BUILD#2 integrate
... //sgl/grimoires/stable/0.3/http/apache2/CONFIGURE#2 integrate
... //sgl/grimoires/stable/0.3/http/apache2/DETAILS#2 integrate
... //sgl/grimoires/stable/0.3/http/apache2/HISTORY#2 integrate
... //sgl/grimoires/stable/0.3/http/apache2/PRE_BUILD#2 integrate
... //sgl/grimoires/stable/0.3/http/apache2/byterange.patch#2 delete

Differences ...

==== //sgl/grimoires/stable/0.3/http/apache2/BUILD#2 (xtext) ====

@@ -9,6 +9,6 @@
--localstatedir=$INSTALL_ROOT/var \
--mandir=$INSTALL_ROOT/usr/share/man \
--enable-layout=GNU \
- --enable-modules=most,max \
+ --enable-modules=most \
$OPTS &&
make

==== //sgl/grimoires/stable/0.3/http/apache2/CONFIGURE#2 (xtext) ====

@@ -92,6 +92,10 @@
# (eg. for mod_auth, $NAME would be "auth").

local TARGET=$( echo $OUTPUT | cut -d' ' -f1 )
+ if [ "${TARGET:0:1}" != "m" ]
+ then
+ TARGET=${TARGET:1}
+ fi
local NAME

for MODULE in $MODULELIST

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

@@ -1,10 +1,10 @@
SPELL=apache2
- VERSION=2.0.54
+ VERSION=2.0.55
+ SOURCE_HASH='sha1:da1e215a7e9f1ccc507ba906fefb7c2076ad1b9d'
SOURCE=httpd-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/httpd-$VERSION
SOURCE_URL[0]=$APACHE_URL/httpd/$SOURCE
SOURCE_URL[1]=http://www.apache.org/dist/httpd/$SOURCE
- MD5[0]='2c01d71b0714c7b518b7b0ff230a2fdc'
WEB_SITE=http://www.apache.org/
ENTERED=20020422
UPDATED=20050923

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

@@ -1,3 +1,14 @@
+2005-10-20 Jason Flatt <jflatt AT sourcemage.org>
+ * PRE_BUILD: Removed unnecessary patches.
+
+2005-10-16 Sergey Lipnevich <sergey AT sourcemage.org>
+ * DETAILS: upgrade to 2.0.55.
+
+2005-10-13 Jason Flatt <jflatt AT sourcemage.org>
+ * BUILD: Removed invalid ./configure option.
+ * CONFIGURE: Work around problem with spurious tab being adding during
+ configure process.
+
2005-09-23 Thomas Houssin <Thomas.Houssin AT sourcemage.org>
* 06_CAN_2005_2700.patch: added
* PRE_BUILD: apply patch, security fix for CAN_2005_2700

==== //sgl/grimoires/stable/0.3/http/apache2/PRE_BUILD#2 (xtext) ====

@@ -1,9 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -p1 < $SCRIPT_DIRECTORY/buildconf.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/byterange.patch &&
patch -p1 < $SCRIPT_DIRECTORY/03_all_redhat_xfsz.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/01_all_gentoo_ipv6.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/04_all_ssl_makefile.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/05_httpd-2.0.54_openssl-0.9.8.patch &&
-patch -p3 < $SCRIPT_DIRECTORY/06_CAN-2005-2700.patch
+patch -p1 < $SCRIPT_DIRECTORY/01_all_gentoo_ipv6.patch

[SM-Commit] PERFORCE change 79238 by Arwed von Merkatz for review, Perforce Review Daemon, 05/13/2006