OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Feb-2007 07:30:46
Branch: HEAD Handle: 2007020606304500
Modified files:
openpkg-src/apache apache.spec
Log:
with_mod_php_suhosin and with_mod_php_hardened options only make sense
within the with_mod_php scope
Summary:
Revision Changes Path
1.374 +5 -5 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.373 -r1.374 apache.spec
--- openpkg-src/apache/apache.spec 5 Feb 2007 09:52:17 -0000 1.373
+++ openpkg-src/apache/apache.spec 6 Feb 2007 06:30:45 -0000 1.374
@@ -68,7 +68,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20070205
+Release: 20070206
# package options (suexec related)
%option with_suexec yes
@@ -183,6 +183,10 @@
%undefine with_gdbm_ndbm
%define with_gdbm_ndbm yes
%endif
+%if "%{with_mod_php_suhosin}" == "yes" && "%{with_mod_php_hardened}" == "yes"
+%undefine with_mod_php_hardened
+%define with_mod_php_hardened no
+%endif
%if "%{with_mod_php_xsl}" == "yes"
%undefine with_mod_php_dom
%undefine with_mod_php_xml
@@ -194,10 +198,6 @@
%undefine with_mod_define
%define with_mod_define yes
%endif
-%if "%{with_mod_php_suhosin}" == "yes" && "%{with_mod_php_hardened}" == "yes"
-%undefine with_mod_php_hardened
-%define with_mod_php_hardened no
-%endif
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
