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: 11-Feb-2007 16:02:15
Branch: OPENPKG_2_STABLE Handle: 20070208210308237547
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/apache apache.spec
Removed files: (Branch: OPENPKG_2_STABLE)
openpkg-src/apache apache.patch.php
Log:
MFC: security fixed version with PHP 5.2.1
Summary:
Revision Changes Path
1.10 +0 -58 openpkg-src/apache/apache.patch.php
1.335.2.13 +7 -9 openpkg-src/apache/apache.spec
____________________________________________________________________________
rm -f openpkg-src/apache/apache.patch.php <<'@@ .'
Index: openpkg-src/apache/apache.patch.php
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.335.2.12 -r1.335.2.13 apache.spec
--- openpkg-src/apache/apache.spec 7 Feb 2007 20:36:25 -0000
1.335.2.12
+++ openpkg-src/apache/apache.spec 11 Feb 2007 15:02:15 -0000
1.335.2.13
@@ -46,10 +46,10 @@
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
%define V_mod_perl 1.29
-%define V_mod_php 5.2.0
+%define V_mod_php 5.2.1
%define V_mod_php_hardened 5.1.6-0.4.15
%define V_mod_php_suhosin_e 0.9.16
-%define V_mod_php_suhosin_p 5.2.0-0.9.6.2
+%define V_mod_php_suhosin_p 5.2.1-0.9.6.2
%define V_mod_relocate 1.0
%define V_mod_roaming 1.0.2
%define V_mod_security 1.9.4
@@ -68,7 +68,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 2.20070207
+Release: 2.20070211
# package options (suexec related)
%option with_suexec yes
@@ -234,9 +234,8 @@
Patch2:
http://www.hardened-php.net/hardening-patch-%{V_mod_php_hardened}.patch.gz
Patch3:
http://www.hardened-php.net/suhosin/_media/suhosin-patch-%{V_mod_php_suhosin_p}.patch.gz
Patch4: apache.patch.suphp
-Patch5: apache.patch.php
-Patch6: apache.patch.modauthkerb
-Patch7: apache.patch.modauthradius
+Patch5: apache.patch.modauthkerb
+Patch6: apache.patch.modauthradius
# build information
Prefix: %{l_prefix}
@@ -572,7 +571,6 @@
./buildconf --copy --force
$PHP_AUTOCONF
%endif
- %patch -p0 -P 5
%{l_shtool} subst \
-e 's;\(/include\)/freetype2;\1;' \
configure \
@@ -619,7 +617,7 @@
%endif
%if "%{with_mod_auth_radius}" == "yes"
%setup -q -T -D -a 15
- %patch -p0 -d mod_auth_radius-%{V_mod_auth_radius} -P 7
+ %patch -p0 -d mod_auth_radius-%{V_mod_auth_radius} -P 6
%endif
%if "%{with_mod_auth_mysql}" == "yes"
%setup -q -T -D -a 16
@@ -642,7 +640,7 @@
%endif
%if "%{with_mod_auth_kerb}" == "yes"
%setup -q -T -D -a 22
- %patch -p0 -d mod_auth_kerb-%{V_mod_auth_kerb} -P 6
+ %patch -p0 -d mod_auth_kerb-%{V_mod_auth_kerb} -P 5
%endif
%build
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
