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: 10-Nov-2007 09:48:41
Branch: HEAD Handle: 2007111008484100
Modified files:
openpkg-src/apache-php apache-php.spec
Log:
upgrading package: apache-php 5.2.4 -> 5.2.5
Summary:
Revision Changes Path
1.10 +12 -7 openpkg-src/apache-php/apache-php.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-php/apache-php.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 apache-php.spec
--- openpkg-src/apache-php/apache-php.spec 15 Oct 2007 06:46:23 -0000
1.9
+++ openpkg-src/apache-php/apache-php.spec 10 Nov 2007 08:48:41 -0000
1.10
@@ -23,10 +23,11 @@
##
# package versions
-%define V_php 5.2.4
+%define V_php 5.2.5
%define V_php_suhosin_p 5.2.4-0.9.6.2
%define V_php_suhosin_e 0.9.20
%define V_php_hardened 5.1.6-0.4.15
+%define V_php_kolab 5.2.4
# package information
Name: apache-php
@@ -39,7 +40,7 @@
Group: Web
License: PHP
Version: %{V_php}
-Release: 20071015
+Release: 20071110
# package options
%option with_suhosin no
@@ -121,7 +122,7 @@
Source3: apache-php.conf
Patch0:
http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
Patch1:
http://www.hardened-php.net/suhosin/_media/suhosin-patch-%{V_php_suhosin_p}.patch.gz
-Patch2:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/KOLAB_php_%{V_php}_Annotations.patch
+Patch2:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/KOLAB_php_%{V_php_kolab}_Annotations.patch
# build information
Prefix: %{l_prefix}
@@ -286,6 +287,11 @@
url = http://www.hardened-php.net/suhosin/download.html
regex = suhosin-(\d+(\.\d+)+)\.tgz
}
+ prog apache-php:kolab = {
+ version = %{V_php_kolab}
+ url =
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/
+ regex = KOLAB_php_(\d+(\.\d+)+)_Annotations\.patch
+ }
%prep
%setup -q -n php-%{V_php}
@@ -405,9 +411,9 @@
--with-db4=%{l_prefix} \
%endif
%if "%{with_debug}" == "yes"
- --with-debug=yes \
+ --enable-debug \
%else
- --with-debug=no \
+ --disable-debug \
%endif
%if "%{with_zlib}" == "yes"
--with-zlib=%{l_prefix} \
@@ -520,8 +526,7 @@
--disable-cli \
--disable-cgi \
--enable-force-cgi-redirect \
- --enable-discard-path \
- --enable-memory-limit
+ --enable-discard-path
# build package
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
