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: 26-Nov-2005 09:24:19
Branch: HEAD Handle: 2005112608241900
Modified files:
openpkg-src/php5 php5.spec
Removed files:
openpkg-src/php5 php5.patch
Log:
upgrading package: php5 5.0.5 -> 5.1.0
Summary:
Revision Changes Path
1.4 +0 -16 openpkg-src/php5/php5.patch
1.39 +7 -16 openpkg-src/php5/php5.spec
____________________________________________________________________________
rm -f openpkg-src/php5/php5.patch <<'@@ .'
Index: openpkg-src/php5/php5.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/php5/php5.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 php5.spec
--- openpkg-src/php5/php5.spec 3 Nov 2005 07:30:27 -0000 1.38
+++ openpkg-src/php5/php5.spec 26 Nov 2005 08:24:19 -0000 1.39
@@ -23,8 +23,8 @@
##
# package versions
-%define V_php 5.0.5
-%define V_php_hardened 5.0.5-0.4.5
+%define V_php 5.1.0
+%define V_php_hardened 5.1.0-0.4.6
# package information
Name: php5
@@ -37,7 +37,7 @@
Group: Language
License: PHP
Version: %{V_php}
-Release: 20051103
+Release: 20051126
# package options
%option with_calendar no
@@ -53,7 +53,6 @@
%option with_mm no
%option with_pcre no
%option with_ftp no
-%option with_oci7 no
%option with_oci8 no
%option with_freetype no
%option with_gettext no
@@ -101,8 +100,7 @@
# list of sources
Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
Source1: php.ini
-Patch0: php5.patch
-Patch1:
http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
+Patch0:
http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
# build information
Prefix: %{l_prefix}
@@ -200,7 +198,7 @@
BuildPreReq: gdbm, gdbm::with_ndbm = yes
PreReq: gdbm, gdbm::with_ndbm = yes
%endif
-%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
+%if "%{with_oci8}" == "yes"
BuildPreReq: oracle
PreReq: oracle
%endif
@@ -245,12 +243,8 @@
%prep
%setup -q -n php-%{version}
- # php5.patch is currently already part of the hardening patch, so
- # once it is taken over into the PHP distribution remove the %else
clause.
%if "%{with_hardened}" == "yes"
- %patch -p1 -P 1
-%else
- %patch -p0 -P 0
+ %patch -p1
%endif
%{l_shtool} subst \
-e 's;\(/include\)/freetype2;\1;' \
@@ -281,7 +275,7 @@
%if "%{with_bdb}" == "yes"
libs="$libs -ldb"
%endif
-%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
+%if "%{with_oci8}" == "yes"
ORACLE_HOME="`%{l_rc} --query oracle_home`"
export ORACLE_HOME
%endif
@@ -349,9 +343,6 @@
%if "%{with_ftp}" == "yes"
--enable-ftp \
%endif
-%if "%{with_oci7}" == "yes"
- --with-oracle \
-%endif
%if "%{with_oci8}" == "yes"
--with-oci8 \
%endif
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
