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: 20-Sep-2006 21:36:19
Branch: OPENPKG_2_STABLE Handle: 2006092020361900
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/apache apache.patch apache.spec
Log:
MFC: recent PHP update and ODF additions
Summary:
Revision Changes Path
1.22.2.2 +29 -3 openpkg-src/apache/apache.patch
1.335.2.6 +3 -3 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.22.2.1 -r1.22.2.2 apache.patch
--- openpkg-src/apache/apache.patch 28 Jul 2006 06:10:36 -0000 1.22.2.1
+++ openpkg-src/apache/apache.patch 20 Sep 2006 19:36:19 -0000 1.22.2.2
@@ -1,6 +1,32 @@
+Index: apache_1.3.37/conf/mime.types
+--- apache_1.3.37/conf/mime.types.orig 2004-11-24 20:10:19 +0100
++++ apache_1.3.37/conf/mime.types 2006-09-10 14:51:11 +0200
+@@ -265,6 +265,22 @@
+ application/vnd.novadigm.edm
+ application/vnd.novadigm.edx
+ application/vnd.novadigm.ext
++application/vnd.oasis.opendocument.text odt
++application/vnd.oasis.opendocument.spreadsheet ods
++application/vnd.oasis.opendocument.presentation odp
++application/vnd.oasis.opendocument.graphics odg
++application/vnd.oasis.opendocument.chart odc
++application/vnd.oasis.opendocument.formula odf
++application/vnd.oasis.opendocument.image odi
++application/vnd.oasis.opendocument.text-template ott
++application/vnd.oasis.opendocument.spreadsheet-template ots
++application/vnd.oasis.opendocument.presentation-template otp
++application/vnd.oasis.opendocument.graphics-template otg
++application/vnd.oasis.opendocument.chart-template otc
++application/vnd.oasis.opendocument.formula-template oft
++application/vnd.oasis.opendocument.image-template oti
++application/vnd.oasis.opendocument.text-master odm
++application/vnd.oasis.opendocument.text-web oth
+ application/vnd.obn
+ application/vnd.osa.netdeploy
+ application/vnd.palm
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
++++ apache_1.3.37/configure 2006-09-10 14:49:50 +0200
@@ -1175,10 +1175,10 @@
## or we cannot support the case where the relative
## path is just the emtpy one, i.e. ""]
@@ -18,7 +44,7 @@
## check and debug
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
++++ apache_1.3.37/src/Configure 2006-09-10 14:49:50 +0200
@@ -1158,14 +1158,20 @@
SHLIB_SUFFIX_DEPTH=0
;;
@@ -79,7 +105,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
++++ apache_1.3.37/src/main/util_script.c 2006-09-10 14:49:50 +0200
@@ -204,6 +204,7 @@
}
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.335.2.5 -r1.335.2.6 apache.spec
--- openpkg-src/apache/apache.spec 18 Aug 2006 18:54:04 -0000
1.335.2.5
+++ openpkg-src/apache/apache.spec 20 Sep 2006 19:36:19 -0000
1.335.2.6
@@ -35,8 +35,8 @@
%define V_apache 1.3.37
%define V_mod_ssl 2.8.28-1.3.37
%define V_mod_perl 1.29
-%define V_mod_php 5.1.5
-%define V_mod_php_hardened 5.1.5-0.4.14
+%define V_mod_php 5.1.6
+%define V_mod_php_hardened 5.1.6-0.4.15
%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.20060818
+Release: 2.20060920
# package options (suexec related)
%option with_suexec yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
