OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Jun-2004 09:25:42
Branch: HEAD Handle: 2004060408254200
Modified files:
openpkg-src/apache apache.spec
Log:
added Hardened PHP as option
Summary:
Revision Changes Path
1.231 +12 -1 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.230 -r1.231 apache.spec
--- openpkg-src/apache/apache.spec 3 Jun 2004 18:32:15 -0000 1.230
+++ openpkg-src/apache/apache.spec 4 Jun 2004 07:25:42 -0000 1.231
@@ -37,6 +37,7 @@
%define V_mod_ssl 2.8.18-1.3.31
%define V_mod_perl 1.29
%define V_mod_php 4.3.7
+%define V_mod_php_hardened 0.1.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
@@ -65,7 +66,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040603
+Release: 20040604
# package options (suexec related)
%option with_suexec yes
@@ -102,6 +103,7 @@
# package options (optional PHP4 specific settings; requires "with_mod_php")
# please note the lack of an PEAR option since PEAR is provided by the 'php'
package
+%option with_mod_php_hardened no
%option with_mod_php_calendar no
%option with_mod_php_mysql no
%option with_mod_php_pgsql no
@@ -205,6 +207,7 @@
Source26: apache.sh
Patch0: apache.patch
Patch1: apache.patch.modowa
+Patch2:
http://www.hardened-php.net/hardened-php-%{V_mod_php}-%{V_mod_php_hardened}.patch.gz
# build information
Prefix: %{l_prefix}
@@ -423,6 +426,11 @@
url = http://www.php.net/downloads.php
regex = php-(\d+\.\d+\.\d+)\.tar\.gz
}
+ 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
+ }
prog apache:mod_relocate = {
version = %{V_mod_relocate}
url = http://software.tangent.org/download/
@@ -482,6 +490,9 @@
configure \
ext/gd/config.m4
) || exit $?
+%if "%{with_mod_php_hardened}" == "yes"
+ %patch -p0 -P 2
+%endif
%endif
%if "%{with_mod_dav}" == "yes"
%setup -q -T -D -a 4
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
