OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Sep-2004 11:04:40
Branch: HEAD Handle: 2004092410044000
Modified files:
openpkg-src/apache apache.spec
Log:
modifying package: apache-1.3.31 20040923 -> 20040924
Summary:
Revision Changes Path
1.261 +7 -7 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.260 -r1.261 apache.spec
--- openpkg-src/apache/apache.spec 23 Sep 2004 18:14:24 -0000 1.260
+++ openpkg-src/apache/apache.spec 24 Sep 2004 09:04:40 -0000 1.261
@@ -36,8 +36,8 @@
%define V_apache 1.3.31
%define V_mod_ssl 2.8.19-1.3.31
%define V_mod_perl 1.29
-%define V_mod_php 4.3.8
-%define V_mod_php_hardened 0.2.2
+%define V_mod_php 4.3.9
+%define V_mod_php_hardened 4.3.8-0.2.2
%define V_mod_dav 1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -66,7 +66,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040923
+Release: 20040924
# package options (suexec related)
%option with_suexec yes
@@ -212,7 +212,7 @@
Patch0: apache.patch
Patch1: apache.patch.modowa
Patch2: apache.patch.php
-Patch3:
http://www.hardened-php.net/hardened-php-%{V_mod_php}-%{V_mod_php_hardened}.patch.gz
+Patch3:
http://www.hardened-php.net/hardened-php-%{V_mod_php_hardened}.patch.gz
# build information
Prefix: %{l_prefix}
@@ -446,7 +446,7 @@
prog apache:mod_php_hardened = {
version = %{V_mod_php_hardened}
url = http://www.hardened-php.net/download.php
- regex = hardened-php-%{V_mod_php}-(\d+(\.\d+)+)\.patch\.gz
+ regex = hardened-php-(4\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
}
prog apache:mod_relocate = {
version = %{V_mod_relocate}
@@ -518,10 +518,10 @@
ext/mssql/php_mssql.h
%endif
%patch -p0 -P 2
- ) || exit $?
%if "%{with_mod_php_hardened}" == "yes"
- %patch -p0 -P 3
+ %patch -p1 -P 3
%endif
+ ) || exit $?
%endif
%if "%{with_mod_dav}" == "yes"
%setup -q -T -D -a 4
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
