OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Jul-2006 08:10:37
Branch: OPENPKG_2_STABLE Handle: 2006072807103600
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/apache apache.patch apache.spec
Log:
upgrading package: apache 1.3.36 -> 1.3.37
Summary:
Revision Changes Path
1.22.2.1 +13 -13 openpkg-src/apache/apache.patch
1.335.2.3 +3 -3 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.22 -r1.22.2.1 apache.patch
--- openpkg-src/apache/apache.patch 17 May 2006 19:44:32 -0000 1.22
+++ openpkg-src/apache/apache.patch 28 Jul 2006 06:10:36 -0000 1.22.2.1
@@ -1,7 +1,7 @@
-Index: apache_1.3.36/configure
---- apache_1.3.36/configure.orig 2006-04-21 20:40:11 +0200
-+++ apache_1.3.36/configure 2006-04-30 19:30:09 +0200
-@@ -1174,10 +1174,10 @@
+Index: apache_1.3.37/configure
+--- apache_1.3.37/configure.orig 2006-07-12 10:16:05 +0200
++++ apache_1.3.37/configure 2006-07-28 08:07:56 +0200
+@@ -1175,10 +1175,10 @@
## or we cannot support the case where the relative
## path is just the emtpy one, i.e. ""]
##
@@ -16,10 +16,10 @@
##
## check and debug
-Index: apache_1.3.36/src/Configure
---- apache_1.3.36/src/Configure.orig 2005-10-14 01:36:04 +0200
-+++ apache_1.3.36/src/Configure 2006-04-30 19:30:09 +0200
-@@ -1157,14 +1157,20 @@
+Index: apache_1.3.37/src/Configure
+--- apache_1.3.37/src/Configure.orig 2006-07-12 10:16:05 +0200
++++ apache_1.3.37/src/Configure 2006-07-28 08:07:56 +0200
+@@ -1158,14 +1158,20 @@
SHLIB_SUFFIX_DEPTH=0
;;
*-solaris2*)
@@ -46,7 +46,7 @@
SHLIB_SUFFIX_DEPTH=1
;;
*-sunos4*)
-@@ -1873,27 +1879,12 @@
+@@ -1874,27 +1880,12 @@
# set the default, based on whether expat-lite is bundled. if it is present,
# then we can always include expat.
if [ "x$RULE_EXPAT" = "xdefault" ]; then
@@ -77,10 +77,10 @@
fi
####################################################################
-Index: apache_1.3.36/src/main/util_script.c
---- apache_1.3.36/src/main/util_script.c.orig 2006-04-21 20:40:11
+0200
-+++ apache_1.3.36/src/main/util_script.c 2006-04-30 19:30:09 +0200
-@@ -203,6 +203,7 @@
+Index: apache_1.3.37/src/main/util_script.c
+--- apache_1.3.37/src/main/util_script.c.orig 2006-07-12 10:16:05
+0200
++++ apache_1.3.37/src/main/util_script.c 2006-07-28 08:07:56 +0200
+@@ -204,6 +204,7 @@
}
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.335.2.2 -r1.335.2.3 apache.spec
--- openpkg-src/apache/apache.spec 27 Jun 2006 14:45:22 -0000
1.335.2.2
+++ openpkg-src/apache/apache.spec 28 Jul 2006 06:10:36 -0000
1.335.2.3
@@ -32,11 +32,11 @@
## go with the macro mechanism. But do not try to repeat this!
# package component versions
-%define V_apache 1.3.36
+%define V_apache 1.3.37
%define V_mod_ssl 2.8.27-1.3.36
%define V_mod_perl 1.29
%define V_mod_php 5.1.4
-%define V_mod_php_hardened 5.1.4-0.4.11
+%define V_mod_php_hardened 5.1.4-0.4.12
%define V_mod_dav 1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 2.20060627
+Release: 2.20060728
# package options (suexec related)
%option with_suexec yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
