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: 18-Aug-2006 20:54:05
Branch: OPENPKG_2_STABLE Handle: 2006081819540400
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/apache apache.spec rc.apache
Log:
MFC: latest fixes plus scurity fixed PHP
Summary:
Revision Changes Path
1.335.2.5 +3 -3 openpkg-src/apache/apache.spec
1.21.2.1 +2 -1 openpkg-src/apache/rc.apache
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.335.2.4 -r1.335.2.5 apache.spec
--- openpkg-src/apache/apache.spec 1 Aug 2006 07:22:07 -0000
1.335.2.4
+++ openpkg-src/apache/apache.spec 18 Aug 2006 18:54:04 -0000
1.335.2.5
@@ -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.4
-%define V_mod_php_hardened 5.1.4-0.4.12
+%define V_mod_php 5.1.5
+%define V_mod_php_hardened 5.1.5-0.4.14
%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.20060801
+Release: 2.20060818
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/rc.apache
============================================================================
$ cvs diff -u -r1.21 -r1.21.2.1 rc.apache
--- openpkg-src/apache/rc.apache 5 Dec 2005 18:52:54 -0000 1.21
+++ openpkg-src/apache/rc.apache 18 Aug 2006 18:54:04 -0000 1.21.2.1
@@ -43,7 +43,8 @@
%start -u @l_susr@
rcService apache enable yes || exit 0
rcService apache active yes && exit 0
- ( [ -e @l_prefix@/etc/apache/apache.sh ] && \
+ ( cd @l_prefix@/var/apache/run
+ [ -e @l_prefix@/etc/apache/apache.sh ] && \
. @l_prefix@/etc/apache/apache.sh
@l_prefix@/sbin/apache
) || exit $?
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
