[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 29-Nov-2009 19:43:47
Branch: HEAD Handle: 2009112918434700
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.3.1 20091121 -> 20091129
Summary:
RevisionChanges Path
1.207 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.206 -r1.207 php.spec
--- openpkg-src/php/php.spec 21 Nov 2009 09:28:30 - 1.206
+++ openpkg-src/php/php.spec 29 Nov 2009 18:43:47 - 1.207
@@ -23,7 +23,7 @@
# package versions
%define V_php 5.3.1
-%define V_php_suhosin_p 5.3.0-0.9.8-BETA-1
+%define V_php_suhosin_p 5.3.1-0.9.8
%define V_php_suhosin_e 0.9.29
%define V_php_kolab 5.2.8
%define V_php_pecl_memcache 2.2.5
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20091121
+Release: 20091129
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 21-Nov-2009 10:28:30
Branch: HEAD Handle: 2009112109283000
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.3.0 -> 5.3.1
Summary:
RevisionChanges Path
1.206 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.205 -r1.206 php.spec
--- openpkg-src/php/php.spec 2 Oct 2009 20:41:35 - 1.205
+++ openpkg-src/php/php.spec 21 Nov 2009 09:28:30 - 1.206
@@ -22,7 +22,7 @@
##
# package versions
-%define V_php 5.3.0
+%define V_php 5.3.1
%define V_php_suhosin_p 5.3.0-0.9.8-BETA-1
%define V_php_suhosin_e 0.9.29
%define V_php_kolab 5.2.8
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20091002
+Release: 20091121
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 02-Oct-2009 22:41:35
Branch: HEAD Handle: 2009100221413500
Modified files:
openpkg-src/php php.spec
Log:
allow tokenizer extension to be enabled
Summary:
RevisionChanges Path
1.205 +7 -1 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.204 -r1.205 php.spec
--- openpkg-src/php/php.spec 9 Sep 2009 12:01:27 - 1.204
+++ openpkg-src/php/php.spec 2 Oct 2009 20:41:35 - 1.205
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20090909
+Release: 20091002
# package options
%option with_suhosin no
@@ -61,6 +61,7 @@
%option with_imap no
%option with_imap_annotateno
%option with_json no
+%option with_tokenizerno
%option with_mbregex no
%option with_mbstring no
%option with_mcrypt no
@@ -482,6 +483,11 @@
%else
--disable-json \
%endif
+%if "%{with_tokenizer}" == "yes"
+--enable-tokenizer \
+%else
+--disable-tokenizer \
+%endif
%if "%{with_xml}" == "yes"
--enable-xml \
--enable-libxml \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 09-Sep-2009 14:01:29
Branch: HEAD Handle: 2009090913012700
Modified files:
openpkg-src/php php.spec
Log:
add SOAP support
Summary:
RevisionChanges Path
1.204 +9 -1 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.203 -r1.204 php.spec
--- openpkg-src/php/php.spec 16 Aug 2009 15:42:24 - 1.203
+++ openpkg-src/php/php.spec 9 Sep 2009 12:01:27 - 1.204
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20090816
+Release: 20090909
# package options
%option with_suhosin no
@@ -79,6 +79,7 @@
%option with_session no
%option with_simplexmlno
%option with_snmp no
+%option with_soap no
%option with_sqlite no
%option with_ssl no
%option with_tidy no
@@ -119,6 +120,10 @@
%undefine with_xml
%define with_xml yes
%endif
+%if "%{with_soap}" == "yes"
+%undefine with_xml
+%define with_xml yes
+%endif
%if "%{with_pgsql}" == "yes"
%undefine with_ssl
%define with_ssl yes
@@ -497,6 +502,9 @@
%if "%{with_wddx}" == "yes"
--enable-wddx \
%endif
+%if "%{with_soap}" == "yes"
+--enable-soap \
+%endif
%if "%{with_bc}" == "yes"
--enable-bcmath \
%endif
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 16-Aug-2009 17:42:24
Branch: HEAD Handle: 2009081616422400
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.3.0 20090815 -> 20090816
Summary:
RevisionChanges Path
1.203 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.202 -r1.203 php.spec
--- openpkg-src/php/php.spec 15 Aug 2009 10:11:14 - 1.202
+++ openpkg-src/php/php.spec 16 Aug 2009 15:42:24 - 1.203
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.3.0
%define V_php_suhosin_p 5.3.0-0.9.8-BETA-1
-%define V_php_suhosin_e 0.9.28
+%define V_php_suhosin_e 0.9.29
%define V_php_kolab 5.2.8
%define V_php_pecl_memcache 2.2.5
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20090815
+Release: 20090816
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 15-Aug-2009 12:11:14
Branch: HEAD Handle: 200908151400
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.3.0 20090701 -> 20090815
Summary:
RevisionChanges Path
1.202 +3 -3 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.201 -r1.202 php.spec
--- openpkg-src/php/php.spec 1 Jul 2009 08:13:01 - 1.201
+++ openpkg-src/php/php.spec 15 Aug 2009 10:11:14 - 1.202
@@ -23,8 +23,8 @@
# package versions
%define V_php 5.3.0
-%define V_php_suhosin_p 5.2.10-0.9.7
-%define V_php_suhosin_e 0.9.27
+%define V_php_suhosin_p 5.3.0-0.9.8-BETA-1
+%define V_php_suhosin_e 0.9.28
%define V_php_kolab 5.2.8
%define V_php_pecl_memcache 2.2.5
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20090701
+Release: 20090815
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 30-Jun-2009 21:02:06
Branch: HEAD Handle: 2009063020020600
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.2.10 -> 5.3.0
Summary:
RevisionChanges Path
1.200 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.199 -r1.200 php.spec
--- openpkg-src/php/php.spec 25 Jun 2009 07:07:34 - 1.199
+++ openpkg-src/php/php.spec 30 Jun 2009 19:02:06 - 1.200
@@ -22,7 +22,7 @@
##
# package versions
-%define V_php 5.2.10
+%define V_php 5.3.0
%define V_php_suhosin_p 5.2.10-0.9.7
%define V_php_suhosin_e 0.9.27
%define V_php_kolab 5.2.8
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20090625
+Release: 20090630
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 25-Jun-2009 09:07:34
Branch: HEAD Handle: 2009062508073400
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.10 20090619 -> 20090625
Summary:
RevisionChanges Path
1.199 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.198 -r1.199 php.spec
--- openpkg-src/php/php.spec 19 Jun 2009 17:43:51 - 1.198
+++ openpkg-src/php/php.spec 25 Jun 2009 07:07:34 - 1.199
@@ -23,7 +23,7 @@
# package versions
%define V_php 5.2.10
-%define V_php_suhosin_p 5.2.9-0.9.7
+%define V_php_suhosin_p 5.2.10-0.9.7
%define V_php_suhosin_e 0.9.27
%define V_php_kolab 5.2.8
%define V_php_pecl_memcache 2.2.5
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20090619
+Release: 20090625
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 19-Jun-2009 19:43:51
Branch: HEAD Handle: 2009061918435100
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.2.9 -> 5.2.10
Summary:
RevisionChanges Path
1.198 +6 -6 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.197 -r1.198 php.spec
--- openpkg-src/php/php.spec 18 Apr 2009 13:14:15 - 1.197
+++ openpkg-src/php/php.spec 19 Jun 2009 17:43:51 - 1.198
@@ -22,7 +22,7 @@
##
# package versions
-%define V_php 5.2.9
+%define V_php 5.2.10
%define V_php_suhosin_p 5.2.9-0.9.7
%define V_php_suhosin_e 0.9.27
%define V_php_kolab 5.2.8
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20090306
+Release: 20090619
# package options
%option with_suhosin no
@@ -65,7 +65,7 @@
%option with_mbregex no
%option with_mbstring no
%option with_mcrypt no
-%option with_mhashno
+%option with_hash no
%option with_mm no
%option with_mysqlno
%option with_oci8 no
@@ -231,7 +231,7 @@
BuildPreReq: curl
PreReq: curl
%endif
-%if "%{with_mhash}" == "yes"
+%if "%{with_hash}" == "yes"
BuildPreReq: mhash
PreReq: mhash
%endif
@@ -503,8 +503,8 @@
%if "%{with_bc}" == "yes"
--enable-bcmath \
%endif
-%if "%{with_mhash}" == "yes"
---with-mhash=%{l_prefix} \
+%if "%{with_hash}" == "yes"
+--with-hash=%{l_prefix} \
%endif
%if "%{with_mcrypt}" == "yes"
--with-mcrypt=%{l_prefix} \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 06-Mar-2009 08:19:11
Branch: HEAD Handle: 2009030607191100
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.9 20090228 -> 20090306
Summary:
RevisionChanges Path
1.196 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.195 -r1.196 php.spec
--- openpkg-src/php/php.spec 28 Feb 2009 09:07:50 - 1.195
+++ openpkg-src/php/php.spec 6 Mar 2009 07:19:11 - 1.196
@@ -23,7 +23,7 @@
# package versions
%define V_php 5.2.9
-%define V_php_suhosin_p 5.2.8-0.9.6.3
+%define V_php_suhosin_p 5.2.9-0.9.7
%define V_php_suhosin_e 0.9.27
%define V_php_kolab 5.2.8
%define V_php_pecl_memcache 2.2.5
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20090228
+Release: 20090306
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 28-Feb-2009 10:07:50
Branch: HEAD Handle: 2009022809075000
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.9 20090227 -> 20090228
Summary:
RevisionChanges Path
1.195 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.194 -r1.195 php.spec
--- openpkg-src/php/php.spec 27 Feb 2009 19:56:44 - 1.194
+++ openpkg-src/php/php.spec 28 Feb 2009 09:07:50 - 1.195
@@ -26,7 +26,7 @@
%define V_php_suhosin_p 5.2.8-0.9.6.3
%define V_php_suhosin_e 0.9.27
%define V_php_kolab 5.2.8
-%define V_php_pecl_memcache 2.2.4
+%define V_php_pecl_memcache 2.2.5
# package information
Name: php
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20090227
+Release: 20090228
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Feb-2009 20:56:44
Branch: HEAD Handle: 2009022719564400
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.2.8 -> 5.2.9
Summary:
RevisionChanges Path
1.194 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.193 -r1.194 php.spec
--- openpkg-src/php/php.spec 22 Dec 2008 18:15:55 - 1.193
+++ openpkg-src/php/php.spec 27 Feb 2009 19:56:44 - 1.194
@@ -22,7 +22,7 @@
##
# package versions
-%define V_php 5.2.8
+%define V_php 5.2.9
%define V_php_suhosin_p 5.2.8-0.9.6.3
%define V_php_suhosin_e 0.9.27
%define V_php_kolab 5.2.8
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20081222
+Release: 20090227
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 22-Dec-2008 19:15:56
Branch: HEAD Handle: 2008122218155500
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.8 20081215 -> 20081222
Summary:
RevisionChanges Path
1.193 +3 -3 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.192 -r1.193 php.spec
--- openpkg-src/php/php.spec 15 Dec 2008 16:33:04 - 1.192
+++ openpkg-src/php/php.spec 22 Dec 2008 18:15:55 - 1.193
@@ -25,7 +25,7 @@
%define V_php 5.2.8
%define V_php_suhosin_p 5.2.8-0.9.6.3
%define V_php_suhosin_e 0.9.27
-%define V_php_kolab 5.2.6
+%define V_php_kolab 5.2.8
%define V_php_pecl_memcache 2.2.4
# package information
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20081215
+Release: 20081222
# package options
%option with_suhosin no
@@ -134,7 +134,7 @@
Source2: php.ini
Source3: http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
Patch0:
http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
-Patch1:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
+Patch1:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php_kolab}_Annotations.patch
# build information
Prefix: %{l_prefix}
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 15-Dec-2008 17:33:05
Branch: HEAD Handle: 2008121516330400
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.8 20081212 -> 20081215
Summary:
RevisionChanges Path
1.192 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.191 -r1.192 php.spec
--- openpkg-src/php/php.spec 12 Dec 2008 18:42:56 - 1.191
+++ openpkg-src/php/php.spec 15 Dec 2008 16:33:04 - 1.192
@@ -23,7 +23,7 @@
# package versions
%define V_php 5.2.8
-%define V_php_suhosin_p 5.2.7-0.9.6.3
+%define V_php_suhosin_p 5.2.8-0.9.6.3
%define V_php_suhosin_e 0.9.27
%define V_php_kolab 5.2.6
%define V_php_pecl_memcache 2.2.4
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20081212
+Release: 20081215
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 12-Dec-2008 19:42:56
Branch: HEAD Handle: 2008121218425600
Modified files:
openpkg-src/php php.spec
Log:
add ZIP support
Summary:
RevisionChanges Path
1.191 +6 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.190 -r1.191 php.spec
--- openpkg-src/php/php.spec 9 Dec 2008 07:30:28 - 1.190
+++ openpkg-src/php/php.spec 12 Dec 2008 18:42:56 - 1.191
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20081209
+Release: 20081212
# package options
%option with_suhosin no
@@ -89,6 +89,7 @@
%option with_xml no
%option with_xslt no
%option with_zlib no
+%option with_zip no
%option with_pecl_memcacheno
# fixing implicit extension dependencies and correlations
@@ -110,7 +111,7 @@
%undefine with_imap
%define with_imap yes
%endif
-%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" ==
"yes" || "%{with_pecl_memcache}" == "yes"
+%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" ==
"yes" || "%{with_zip}" == "yes" || "%{with_pecl_memcache}" == "yes"
%undefine with_zlib
%define with_zlib yes
%endif
@@ -562,6 +563,9 @@
%else
--without-tidy \
%endif
+%if "%{with_zip}" == "yes"
+--enable-zip \
+%endif
%if "%{with_pecl_memcache}" == "yes"
--enable-memcache \
%endif
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 09-Dec-2008 08:30:29
Branch: HEAD Handle: 2008120907302800
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.2.7 -> 5.2.8
Summary:
RevisionChanges Path
1.190 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.189 -r1.190 php.spec
--- openpkg-src/php/php.spec 4 Dec 2008 20:20:23 - 1.189
+++ openpkg-src/php/php.spec 9 Dec 2008 07:30:28 - 1.190
@@ -22,7 +22,7 @@
##
# package versions
-%define V_php 5.2.7
+%define V_php 5.2.8
%define V_php_suhosin_p 5.2.7-0.9.6.3
%define V_php_suhosin_e 0.9.27
%define V_php_kolab 5.2.6
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20081204
+Release: 20081209
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 04-Dec-2008 21:20:24
Branch: HEAD Handle: 2008120420202300
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.2.6 -> 5.2.7
Summary:
RevisionChanges Path
1.189 +3 -3 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.188 -r1.189 php.spec
--- openpkg-src/php/php.spec 12 Sep 2008 09:19:54 - 1.188
+++ openpkg-src/php/php.spec 4 Dec 2008 20:20:23 - 1.189
@@ -22,8 +22,8 @@
##
# package versions
-%define V_php 5.2.6
-%define V_php_suhosin_p 5.2.6-0.9.6.2
+%define V_php 5.2.7
+%define V_php_suhosin_p 5.2.7-0.9.6.3
%define V_php_suhosin_e 0.9.27
%define V_php_kolab 5.2.6
%define V_php_pecl_memcache 2.2.4
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20080912
+Release: 20081204
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 12-Sep-2008 11:19:54
Branch: HEAD Handle: 2008091210195400
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.6 20080823 -> 20080912
Summary:
RevisionChanges Path
1.188 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.187 -r1.188 php.spec
--- openpkg-src/php/php.spec 23 Aug 2008 20:59:28 - 1.187
+++ openpkg-src/php/php.spec 12 Sep 2008 09:19:54 - 1.188
@@ -26,7 +26,7 @@
%define V_php_suhosin_p 5.2.6-0.9.6.2
%define V_php_suhosin_e 0.9.27
%define V_php_kolab 5.2.6
-%define V_php_pecl_memcache 2.2.3
+%define V_php_pecl_memcache 2.2.4
# package information
Name: php
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20080823
+Release: 20080912
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 23-Aug-2008 22:59:28 Branch: HEAD Handle: 2008082321592800 Modified files: openpkg-src/php php.spec Log: modifying package: php-5.2.6 20080823 again Summary: RevisionChanges Path 1.187 +1 -1 openpkg-src/php/php.spec patch -p0 <<'@@ .' Index: openpkg-src/php/php.spec $ cvs diff -u -r1.186 -r1.187 php.spec --- openpkg-src/php/php.spec 23 Aug 2008 07:24:05 - 1.186 +++ openpkg-src/php/php.spec 23 Aug 2008 20:59:28 - 1.187 @@ -24,7 +24,7 @@ # package versions %define V_php 5.2.6 %define V_php_suhosin_p 5.2.6-0.9.6.2 -%define V_php_suhosin_e 0.9.26 +%define V_php_suhosin_e 0.9.27 %define V_php_kolab 5.2.6 %define V_php_pecl_memcache 2.2.3 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 23-Aug-2008 09:24:05
Branch: HEAD Handle: 2008082308240500
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.6 20080807 -> 20080823
Summary:
RevisionChanges Path
1.186 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.185 -r1.186 php.spec
--- openpkg-src/php/php.spec 7 Aug 2008 07:14:26 - 1.185
+++ openpkg-src/php/php.spec 23 Aug 2008 07:24:05 - 1.186
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.2.6
%define V_php_suhosin_p 5.2.6-0.9.6.2
-%define V_php_suhosin_e 0.9.25
+%define V_php_suhosin_e 0.9.26
%define V_php_kolab 5.2.6
%define V_php_pecl_memcache 2.2.3
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20080807
+Release: 20080823
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 07-Aug-2008 09:14:26
Branch: HEAD Handle: 2008080708142600
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.6 20080514 -> 20080807
Summary:
RevisionChanges Path
1.185 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.184 -r1.185 php.spec
--- openpkg-src/php/php.spec 14 May 2008 10:38:59 - 1.184
+++ openpkg-src/php/php.spec 7 Aug 2008 07:14:26 - 1.185
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.2.6
%define V_php_suhosin_p 5.2.6-0.9.6.2
-%define V_php_suhosin_e 0.9.24
+%define V_php_suhosin_e 0.9.25
%define V_php_kolab 5.2.6
%define V_php_pecl_memcache 2.2.3
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20080514
+Release: 20080807
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 11-May-2008 10:31:29
Branch: HEAD Handle: 2008051109312600
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.6 20080510 -> 20080511
Summary:
RevisionChanges Path
1.183 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.182 -r1.183 php.spec
--- openpkg-src/php/php.spec 10 May 2008 19:12:09 - 1.182
+++ openpkg-src/php/php.spec 11 May 2008 08:31:26 - 1.183
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.2.6
%define V_php_suhosin_p 5.2.6-0.9.6.2
-%define V_php_suhosin_e 0.9.23
+%define V_php_suhosin_e 0.9.24
%define V_php_kolab 5.2.6
%define V_php_pecl_memcache 2.2.3
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20080510
+Release: 20080511
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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-May-2008 21:12:09
Branch: HEAD Handle: 2008051020120900
Modified files:
openpkg-src/php php.spec
Log:
fix DOM/XML/XSLT dependencies
Summary:
RevisionChanges Path
1.182 +9 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.181 -r1.182 php.spec
--- openpkg-src/php/php.spec 3 May 2008 08:16:06 - 1.181
+++ openpkg-src/php/php.spec 10 May 2008 19:12:09 - 1.182
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20080503
+Release: 20080510
# package options
%option with_suhosin no
@@ -113,6 +113,14 @@
%undefine with_zlib
%define with_zlib yes
%endif
+%if "%{with_xslt}" == "yes"
+%undefine with_dom
+%define with_dom yes
+%endif
+%if "%{with_dom}" == "yes"
+%undefine with_xml
+%define with_xml yes
+%endif
%if "%{with_pgsql}" == "yes"
%undefine with_ssl
%define with_ssl yes
@@ -484,7 +492,6 @@
%endif
%if "%{with_dom}" == "yes"
--enable-dom \
---with-libxml-dir=%{l_prefix} \
%else
--disable-dom \
%endif
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 03-May-2008 10:16:06
Branch: HEAD Handle: 2008050309160600
Modified files:
openpkg-src/php php.spec
Log:
hardened PHP patch is no longer upgraded and available for PHP 5.2 so
kick it out at all
Summary:
RevisionChanges Path
1.181 +4 -19 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.180 -r1.181 php.spec
--- openpkg-src/php/php.spec 3 May 2008 07:54:16 - 1.180
+++ openpkg-src/php/php.spec 3 May 2008 08:16:06 - 1.181
@@ -25,7 +25,6 @@
%define V_php 5.2.6
%define V_php_suhosin_p 5.2.6-0.9.6.2
%define V_php_suhosin_e 0.9.23
-%define V_php_hardened5.1.6-0.4.15
%define V_php_kolab 5.2.6
%define V_php_pecl_memcache 2.2.3
@@ -44,7 +43,6 @@
# package options
%option with_suhosin no
-%option with_hardened no
%option with_bc no
%option with_bdb no
%option with_bzip2no
@@ -119,19 +117,14 @@
%undefine with_ssl
%define with_ssl yes
%endif
-%if "%{with_suhosin}" == "yes" && "%{with_hardened}" == "yes"
-%undefine with_hardened
-%define with_hardened no
-%endif
# list of sources
Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.bz2
Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tgz
Source2: php.ini
Source3: http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
-Patch0:
http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
-Patch1:
http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
-Patch2:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
+Patch0:
http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
+Patch1:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
# build information
Prefix: %{l_prefix}
@@ -289,11 +282,6 @@
url = http://www.php.net/downloads.php
regex = php-(5\.\d+\.\d+)\.tar\.(bz2|gz)
}
-prog php:hardened = {
-version = %{V_php_hardened}
-url = http://www.hardened-php.net/downloads.13.html
-regex = hardening-patch-(5\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
-}
prog php:suhosin-patch = {
version = %{V_php_suhosin_p}
url = http://www.hardened-php.net/suhosin/download.html
@@ -317,12 +305,9 @@
%prep
%setup -q
-%if "%{with_hardened}" == "yes"
-%patch -p1 -P 0
-%endif
%if "%{with_suhosin}" == "yes"
%setup -q -T -D -a 1
-%patch -p1 -P 1
+%patch -p1
mv suhosin-%{V_php_suhosin_e} ext/suhosin
rm -f package.xml
%endif
@@ -342,7 +327,7 @@
configure \
ext/gd/config.m4
%if "%{with_imap_annotate}" == "yes"
-sed <%{PATCH2} -e '/php-5.2.1\/ext\/imap\/php_imap.c.orig/,/^[^\+]/d' |
%{l_patch} -p1
+sed <%{PATCH1} -e '/php-5.2.1\/ext\/imap\/php_imap.c.orig/,/^[^\+]/d' |
%{l_patch} -p1
%endif
%build
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 03-May-2008 09:54:17
Branch: HEAD Handle: 2008050308541600
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.6 20080502 -> 20080503
Summary:
RevisionChanges Path
1.180 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.179 -r1.180 php.spec
--- openpkg-src/php/php.spec 2 May 2008 06:46:38 - 1.179
+++ openpkg-src/php/php.spec 3 May 2008 07:54:16 - 1.180
@@ -26,7 +26,7 @@
%define V_php_suhosin_p 5.2.6-0.9.6.2
%define V_php_suhosin_e 0.9.23
%define V_php_hardened5.1.6-0.4.15
-%define V_php_kolab 5.2.5
+%define V_php_kolab 5.2.6
%define V_php_pecl_memcache 2.2.3
# package information
@@ -40,7 +40,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20080502
+Release: 20080503
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 02-May-2008 08:46:39
Branch: HEAD Handle: 2008050207463800
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.2.5 -> 5.2.6
Summary:
RevisionChanges Path
1.179 +3 -3 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.178 -r1.179 php.spec
--- openpkg-src/php/php.spec 16 Apr 2008 10:21:52 - 1.178
+++ openpkg-src/php/php.spec 2 May 2008 06:46:38 - 1.179
@@ -22,8 +22,8 @@
##
# package versions
-%define V_php 5.2.5
-%define V_php_suhosin_p 5.2.5-0.9.6.2
+%define V_php 5.2.6
+%define V_php_suhosin_p 5.2.6-0.9.6.2
%define V_php_suhosin_e 0.9.23
%define V_php_hardened5.1.6-0.4.15
%define V_php_kolab 5.2.5
@@ -40,7 +40,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20080416
+Release: 20080502
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 16-Apr-2008 12:21:58
Branch: HEAD Handle: 2008041611215200
Modified files:
openpkg-src/php php.spec
Log:
add JSON support (new in PHP 5.2)
Summary:
RevisionChanges Path
1.178 +7 -1 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.177 -r1.178 php.spec
--- openpkg-src/php/php.spec 27 Mar 2008 11:46:02 - 1.177
+++ openpkg-src/php/php.spec 16 Apr 2008 10:21:52 - 1.178
@@ -40,7 +40,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20080327
+Release: 20080416
# package options
%option with_suhosin no
@@ -63,6 +63,7 @@
%option with_iconvno
%option with_imap no
%option with_imap_annotateno
+%option with_json no
%option with_mbregex no
%option with_mbstring no
%option with_mcrypt no
@@ -479,6 +480,11 @@
--with-imap=%{l_prefix} \
--with-imap-ssl=%{l_prefix} \
%endif
+%if "%{with_json}" == "yes"
+--enable-json \
+%else
+--disable-json \
+%endif
%if "%{with_xml}" == "yes"
--enable-xml \
--enable-libxml \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 14-Jan-2008 19:39:30
Branch: HEAD Handle: 2008011418392900
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.5 20080101 -> 20080114
Summary:
RevisionChanges Path
1.173 +4 -4 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.172 -r1.173 php.spec
--- openpkg-src/php/php.spec 1 Jan 2008 15:02:39 - 1.172
+++ openpkg-src/php/php.spec 14 Jan 2008 18:39:29 - 1.173
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.2.5
%define V_php_suhosin_p 5.2.5-0.9.6.2
-%define V_php_suhosin_e 0.9.22
+%define V_php_suhosin_e 0.9.23
%define V_php_hardened5.1.6-0.4.15
%define V_php_kolab 5.2.5
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20080101
+Release: 20080114
# package options
%option with_suhosin no
@@ -121,10 +121,10 @@
# list of sources
Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
-Source1:
http://www.hardened-php.net/suhosin/_media/suhosin-%{V_php_suhosin_e}.tgz
+Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tgz
Source2: php.ini
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
+Patch1:
http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
Patch2:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
# build information
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 21-Dec-2007 23:17:08
Branch: HEAD Handle: 2007122122170700
Modified files:
openpkg-src/php php.spec
Log:
'mm' is just a sub-part of the 'session' extension and 'session' even
could be used without 'mm', so (re)introduce 'with_session' option
Summary:
RevisionChanges Path
1.171 +9 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.170 -r1.171 php.spec
--- openpkg-src/php/php.spec 9 Dec 2007 10:38:06 - 1.170
+++ openpkg-src/php/php.spec 21 Dec 2007 22:17:07 - 1.171
@@ -40,7 +40,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20071209
+Release: 20071221
# package options
%option with_suhosin no
@@ -77,6 +77,7 @@
%option with_pear no
%option with_pgsqlno
%option with_sendmail no
+%option with_session no
%option with_simplexmlno
%option with_snmp no
%option with_sqlite no
@@ -88,6 +89,10 @@
%option with_zlib no
# fixing implicit extension dependencies and correlations
+%if "%{with_mm}" == "yes"
+%undefine with_session
+%define with_session yes
+%endif
%if "%{with_pear}" == "yes"
%undefine with_xml
%define with_xml yes
@@ -424,9 +429,11 @@
%if "%{with_openldap}" == "yes"
--with-ldap=%{l_prefix} \
%endif
+%if "%{with_session}" == "yes"
+--enable-session \
+%endif
%if "%{with_mm}" == "yes"
--with-mm=%{l_prefix} \
---enable-session \
%endif
%if "%{with_pcre}" == "yes"
--with-pcre-regex=%{l_prefix} \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 09-Dec-2007 11:38:06
Branch: HEAD Handle: 2007120910380600
Modified files:
openpkg-src/php php.spec
Log:
fix tracking
Summary:
RevisionChanges Path
1.170 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.169 -r1.170 php.spec
--- openpkg-src/php/php.spec 6 Dec 2007 08:50:40 - 1.169
+++ openpkg-src/php/php.spec 9 Dec 2007 10:38:06 - 1.170
@@ -40,7 +40,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20071206
+Release: 20071209
# package options
%option with_suhosin no
@@ -289,7 +289,7 @@
prog 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
+regex = php-(\d+(\.\d+)+)/
}
%prep
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Kolab Konsortium via Gunnar
Wro$
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Dec-2007 09:50:40
Branch: HEAD Handle: 2007120608504000
Modified files:
openpkg-src/php php.spec
Log:
Fixed upstream patch location.
Summary:
RevisionChanges Path
1.169 +3 -3 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.168 -r1.169 php.spec
--- openpkg-src/php/php.spec 2 Dec 2007 08:19:27 - 1.168
+++ openpkg-src/php/php.spec 6 Dec 2007 08:50:40 - 1.169
@@ -27,7 +27,7 @@
%define V_php_suhosin_p 5.2.5-0.9.6.2
%define V_php_suhosin_e 0.9.22
%define V_php_hardened5.1.6-0.4.15
-%define V_php_kolab 5.2.4
+%define V_php_kolab 5.2.5
# package information
Name: php
@@ -40,7 +40,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20071202
+Release: 20071206
# package options
%option with_suhosin no
@@ -121,7 +121,7 @@
Source2: php.ini
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_kolab}_Annotations.patch
+Patch2:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
# build information
Prefix: %{l_prefix}
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 02-Dec-2007 09:19:31
Branch: HEAD Handle: 2007120208192700
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.5 20071130 -> 20071202
Summary:
RevisionChanges Path
1.168 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.167 -r1.168 php.spec
--- openpkg-src/php/php.spec 30 Nov 2007 15:51:29 - 1.167
+++ openpkg-src/php/php.spec 2 Dec 2007 08:19:27 - 1.168
@@ -25,7 +25,7 @@
# package versions
%define V_php 5.2.5
%define V_php_suhosin_p 5.2.5-0.9.6.2
-%define V_php_suhosin_e 0.9.21
+%define V_php_suhosin_e 0.9.22
%define V_php_hardened5.1.6-0.4.15
%define V_php_kolab 5.2.4
@@ -40,7 +40,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20071130
+Release: 20071202
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 30-Nov-2007 16:51:29
Branch: HEAD Handle: 2007113015512900
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.5 20071112 -> 20071130
Summary:
RevisionChanges Path
1.167 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.166 -r1.167 php.spec
--- openpkg-src/php/php.spec 12 Nov 2007 15:12:45 - 1.166
+++ openpkg-src/php/php.spec 30 Nov 2007 15:51:29 - 1.167
@@ -25,7 +25,7 @@
# package versions
%define V_php 5.2.5
%define V_php_suhosin_p 5.2.5-0.9.6.2
-%define V_php_suhosin_e 0.9.20
+%define V_php_suhosin_e 0.9.21
%define V_php_hardened5.1.6-0.4.15
%define V_php_kolab 5.2.4
@@ -40,7 +40,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20071112
+Release: 20071130
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 12-Nov-2007 16:12:46
Branch: HEAD Handle: 2007111215124500
Modified files:
openpkg-src/php php.spec
Log:
upgrade patch
Summary:
RevisionChanges Path
1.166 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.165 -r1.166 php.spec
--- openpkg-src/php/php.spec 10 Nov 2007 08:50:17 - 1.165
+++ openpkg-src/php/php.spec 12 Nov 2007 15:12:45 - 1.166
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.2.5
-%define V_php_suhosin_p 5.2.4-0.9.6.2
+%define V_php_suhosin_p 5.2.5-0.9.6.2
%define V_php_suhosin_e 0.9.20
%define V_php_hardened5.1.6-0.4.15
%define V_php_kolab 5.2.4
@@ -40,7 +40,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20071110
+Release: 20071112
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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:50:18
Branch: HEAD Handle: 2007111008501700
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.2.4 -> 5.2.5
Summary:
RevisionChanges Path
1.165 +12 -7 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.164 -r1.165 php.spec
--- openpkg-src/php/php.spec 12 Oct 2007 11:28:23 - 1.164
+++ openpkg-src/php/php.spec 10 Nov 2007 08:50:17 - 1.165
@@ -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_hardened5.1.6-0.4.15
+%define V_php_kolab 5.2.4
# package information
Name: php
@@ -39,7 +40,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20071012
+Release: 20071110
# package options
%option with_suhosin no
@@ -120,7 +121,7 @@
Source2: php.ini
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}
@@ -285,6 +286,11 @@
url = http://www.hardened-php.net/suhosin/download.html
regex = suhosin-(\d+(\.\d+)+)\.tgz
}
+prog 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
@@ -401,9 +407,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} \
@@ -515,8 +521,7 @@
--enable-cli \
--enable-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
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Kolab Konsortium via Gunnar
Wro$
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Oct-2007 13:28:24
Branch: HEAD Handle: 2007101212282300
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.4 20071010 -> 20071012
Summary:
RevisionChanges Path
1.164 +1 -1 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.163 -r1.164 php.spec
--- openpkg-src/php/php.spec 10 Oct 2007 15:32:09 - 1.163
+++ openpkg-src/php/php.spec 12 Oct 2007 11:28:23 - 1.164
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20071010
+Release: 20071012
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Kolab Konsortium via Gunnar
Wro$
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Oct-2007 17:32:09
Branch: HEAD Handle: 2007101016320900
Modified files:
openpkg-src/php php.spec
Log:
Fixed the location of the PHP Kolab patch.
Summary:
RevisionChanges Path
1.163 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.162 -r1.163 php.spec
--- openpkg-src/php/php.spec 13 Sep 2007 14:42:05 - 1.162
+++ openpkg-src/php/php.spec 10 Oct 2007 15:32:09 - 1.163
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070913
+Release: 20071010
# package options
%option with_suhosin no
@@ -120,7 +120,7 @@
Source2: php.ini
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://projects.pardus.de/kolab/browser/ebuilds-2.1/dev-lang/php/files/php-5.2.2-kolab.patch?format=raw
+Patch2:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/KOLAB_php_%{V_php}_Annotations.patch
# build information
Prefix: %{l_prefix}
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 13-Sep-2007 16:42:06
Branch: HEAD Handle: 2007091315420500
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.4 20070831 -> 20070913
Summary:
RevisionChanges Path
1.162 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.161 -r1.162 php.spec
--- openpkg-src/php/php.spec 31 Aug 2007 07:37:25 - 1.161
+++ openpkg-src/php/php.spec 13 Sep 2007 14:42:05 - 1.162
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.2.4
-%define V_php_suhosin_p 5.2.3-0.9.6.2
+%define V_php_suhosin_p 5.2.4-0.9.6.2
%define V_php_suhosin_e 0.9.20
%define V_php_hardened5.1.6-0.4.15
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070831
+Release: 20070913
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 31-Aug-2007 09:37:27
Branch: HEAD Handle: 2007083108372500
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.2.3 -> 5.2.4
Summary:
RevisionChanges Path
1.161 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.160 -r1.161 php.spec
--- openpkg-src/php/php.spec 24 Aug 2007 17:49:50 - 1.160
+++ openpkg-src/php/php.spec 31 Aug 2007 07:37:25 - 1.161
@@ -23,7 +23,7 @@
##
# package versions
-%define V_php 5.2.3
+%define V_php 5.2.4
%define V_php_suhosin_p 5.2.3-0.9.6.2
%define V_php_suhosin_e 0.9.20
%define V_php_hardened5.1.6-0.4.15
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070824
+Release: 20070831
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 24-Jul-2007 13:01:54
Branch: HEAD Handle: 2007072412015400
Modified files:
openpkg-src/php php.spec
Log:
MTA should be required under with_sendmail=yes only
Summary:
RevisionChanges Path
1.159 +1 -1 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.158 -r1.159 php.spec
--- openpkg-src/php/php.spec 24 Jul 2007 10:20:06 - 1.158
+++ openpkg-src/php/php.spec 24 Jul 2007 11:01:54 - 1.159
@@ -125,7 +125,7 @@
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20050615, gcc, flex, bison
-PreReq: OpenPKG, openpkg >= 20050615, MTA
+PreReq: OpenPKG, openpkg >= 20050615
%if "%{with_suhosin}" == "yes"
BuildPreReq: autoconf
%endif
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 01-Jun-2007 22:45:13
Branch: HEAD Handle: 2007060121451200
Modified files:
openpkg-src/php php.spec
Log:
install CGI under cgi/php and not cgi/php-cgi and simplify the
installation procedure now that the upstream vendor has already fixed
it
Summary:
RevisionChanges Path
1.157 +3 -13 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.156 -r1.157 php.spec
--- openpkg-src/php/php.spec 1 Jun 2007 17:25:57 - 1.156
+++ openpkg-src/php/php.spec 1 Jun 2007 20:45:12 - 1.157
@@ -518,21 +518,11 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT
-# install CLI version
-# ("make install" incorrectly installs the CGI version into bin/php!)
-%{l_shtool} mkdir -f -p -m 755 \
-$RPM_BUILD_ROOT%{l_prefix}/bin \
-$RPM_BUILD_ROOT%{l_prefix}/man/man1
-%{l_shtool} install -c -s -m 755 \
-sapi/cli/php $RPM_BUILD_ROOT%{l_prefix}/bin/
-%{l_shtool} install -c -m 644 \
-sapi/cli/php.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
-
-# (re)install CGI version
+# move CGI executale
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/cgi
-%{l_shtool} install -c -s -m 755 \
-sapi/cgi/php-cgi $RPM_BUILD_ROOT%{l_prefix}/cgi/
+mv $RPM_BUILD_ROOT%{l_prefix}/bin/php-cgi \
+$RPM_BUILD_ROOT%{l_prefix}/cgi/php
# install default configuration file
%{l_shtool} mkdir -f -p -m 755 \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 01-Jun-2007 19:25:57 Branch: HEAD Handle: 2007060118255700 Modified files: openpkg-src/php php.spec Log: modifying package: php-5.2.3 20070601 again Summary: RevisionChanges Path 1.156 +1 -1 openpkg-src/php/php.spec patch -p0 <<'@@ .' Index: openpkg-src/php/php.spec $ cvs diff -u -r1.155 -r1.156 php.spec --- openpkg-src/php/php.spec 1 Jun 2007 09:52:00 - 1.155 +++ openpkg-src/php/php.spec 1 Jun 2007 17:25:57 - 1.156 @@ -24,7 +24,7 @@ # package versions %define V_php 5.2.3 -%define V_php_suhosin_p 5.2.2-0.9.6.2 +%define V_php_suhosin_p 5.2.3-0.9.6.2 %define V_php_suhosin_e 0.9.20 %define V_php_hardened5.1.6-0.4.15 @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Jun-2007 11:52:00
Branch: HEAD Handle: 200706011052
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.2.2 -> 5.2.3
Summary:
RevisionChanges Path
1.155 +3 -3 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.154 -r1.155 php.spec
--- openpkg-src/php/php.spec 31 May 2007 13:23:00 - 1.154
+++ openpkg-src/php/php.spec 1 Jun 2007 09:52:00 - 1.155
@@ -23,7 +23,7 @@
##
# package versions
-%define V_php 5.2.2
+%define V_php 5.2.3
%define V_php_suhosin_p 5.2.2-0.9.6.2
%define V_php_suhosin_e 0.9.20
%define V_php_hardened5.1.6-0.4.15
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070531
+Release: 20070601
# package options
%option with_suhosin no
@@ -532,7 +532,7 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/cgi
%{l_shtool} install -c -s -m 755 \
-sapi/cgi/php $RPM_BUILD_ROOT%{l_prefix}/cgi/
+sapi/cgi/php-cgi $RPM_BUILD_ROOT%{l_prefix}/cgi/
# install default configuration file
%{l_shtool} mkdir -f -p -m 755 \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 20-May-2007 08:58:29
Branch: HEAD Handle: 2007052007582900
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.2 20070507 -> 20070520
Summary:
RevisionChanges Path
1.153 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.152 -r1.153 php.spec
--- openpkg-src/php/php.spec 7 May 2007 15:43:56 - 1.152
+++ openpkg-src/php/php.spec 20 May 2007 06:58:29 - 1.153
@@ -25,7 +25,7 @@
# package versions
%define V_php 5.2.2
%define V_php_suhosin_p 5.2.2-0.9.6.2
-%define V_php_suhosin_e 0.9.19
+%define V_php_suhosin_e 0.9.20
%define V_php_hardened5.1.6-0.4.15
# package information
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070507
+Release: 20070520
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 07-May-2007 17:43:57
Branch: HEAD Handle: 2007050716435600
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.2 20070504 -> 20070507
Summary:
RevisionChanges Path
1.152 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.151 -r1.152 php.spec
--- openpkg-src/php/php.spec 4 May 2007 06:11:59 - 1.151
+++ openpkg-src/php/php.spec 7 May 2007 15:43:56 - 1.152
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.2.2
-%define V_php_suhosin_p 5.2.1-0.9.6.2
+%define V_php_suhosin_p 5.2.2-0.9.6.2
%define V_php_suhosin_e 0.9.19
%define V_php_hardened5.1.6-0.4.15
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070504
+Release: 20070507
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 04-May-2007 08:12:00
Branch: HEAD Handle: 2007050407115900
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.2.1 -> 5.2.2
Summary:
RevisionChanges Path
1.151 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.150 -r1.151 php.spec
--- openpkg-src/php/php.spec 1 May 2007 18:13:01 - 1.150
+++ openpkg-src/php/php.spec 4 May 2007 06:11:59 - 1.151
@@ -23,7 +23,7 @@
##
# package versions
-%define V_php 5.2.1
+%define V_php 5.2.2
%define V_php_suhosin_p 5.2.1-0.9.6.2
%define V_php_suhosin_e 0.9.19
%define V_php_hardened5.1.6-0.4.15
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070501
+Release: 20070504
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 01-May-2007 20:13:01
Branch: HEAD Handle: 2007050119130100
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.1 20070416 -> 20070501
Summary:
RevisionChanges Path
1.150 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.149 -r1.150 php.spec
--- openpkg-src/php/php.spec 16 Apr 2007 19:59:47 - 1.149
+++ openpkg-src/php/php.spec 1 May 2007 18:13:01 - 1.150
@@ -25,7 +25,7 @@
# package versions
%define V_php 5.2.1
%define V_php_suhosin_p 5.2.1-0.9.6.2
-%define V_php_suhosin_e 0.9.18
+%define V_php_suhosin_e 0.9.19
%define V_php_hardened5.1.6-0.4.15
# package information
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070416
+Release: 20070501
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 06-Mar-2007 18:07:38
Branch: HEAD Handle: 2007030617073800
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.1 20070305 -> 20070306
Summary:
RevisionChanges Path
1.147 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.146 -r1.147 php.spec
--- openpkg-src/php/php.spec 5 Mar 2007 06:33:37 - 1.146
+++ openpkg-src/php/php.spec 6 Mar 2007 17:07:38 - 1.147
@@ -25,7 +25,7 @@
# package versions
%define V_php 5.2.1
%define V_php_suhosin_p 5.2.1-0.9.6.2
-%define V_php_suhosin_e 0.9.17
+%define V_php_suhosin_e 0.9.18
%define V_php_hardened5.1.6-0.4.15
# package information
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070305
+Release: 20070306
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 05-Mar-2007 07:33:37
Branch: HEAD Handle: 2007030506333700
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.1 20070224 -> 20070305
Summary:
RevisionChanges Path
1.146 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.145 -r1.146 php.spec
--- openpkg-src/php/php.spec 24 Feb 2007 08:44:00 - 1.145
+++ openpkg-src/php/php.spec 5 Mar 2007 06:33:37 - 1.146
@@ -25,7 +25,7 @@
# package versions
%define V_php 5.2.1
%define V_php_suhosin_p 5.2.1-0.9.6.2
-%define V_php_suhosin_e 0.9.16
+%define V_php_suhosin_e 0.9.17
%define V_php_hardened5.1.6-0.4.15
# package information
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070224
+Release: 20070305
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 24-Feb-2007 09:44:00
Branch: HEAD Handle: 200702240844
Modified files:
openpkg-src/php php.spec
Log:
GCC 4.1 under Solaris 10 with optimization turned on incorrectly
builds PHP (it segfaults in at least 'phpinfo(INFO_MODULES);'), so
disable optimizations there at all
Summary:
RevisionChanges Path
1.145 +5 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.144 -r1.145 php.spec
--- openpkg-src/php/php.spec 23 Feb 2007 14:37:58 - 1.144
+++ openpkg-src/php/php.spec 24 Feb 2007 08:44:00 - 1.145
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070223
+Release: 20070224
# package options
%option with_suhosin no
@@ -291,7 +291,10 @@
%build
# configure package
-cflags="%{l_cflags -O}"
+case "%{l_platform -t}" in
+*-sunos5.10 ) cflags="%{l_cflags}";;
+* ) cflags="%{l_cflags -O}" ;;
+esac
cppflags="%{l_cppflags}"
ldflags="%{l_ldflags}"
libs=""
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 23-Feb-2007 15:37:58
Branch: HEAD Handle: 2007022314375800
Modified files:
openpkg-src/php php.spec
Log:
option --with-sqlite is for the ancient, deprecated and buggy SQLite
2.x. This should be not promoted at all any longer. Option
--with-pdo-sqlite is for the current SQLite 3.x in conjunction with
PHP's PDO framework. This should be the only one we promote at this
time.
Summary:
RevisionChanges Path
1.144 +3 -3 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.143 -r1.144 php.spec
--- openpkg-src/php/php.spec 8 Feb 2007 20:51:43 - 1.143
+++ openpkg-src/php/php.spec 23 Feb 2007 14:37:58 - 1.144
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20070208
+Release: 20070223
# package options
%option with_suhosin no
@@ -340,11 +340,11 @@
%if "%{with_calendar}" == "yes"
--enable-calendar \
%endif
+--without-sqlite \
%if "%{with_sqlite}" == "yes"
---with-sqlite=%{l_prefix} \
--with-pdo-sqlite=%{l_prefix} \
%else
---without-sqlite \
+--without-pdo-sqlite \
%endif
%if "%{with_mysql}" == "yes"
--with-mysql=%{l_prefix} \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 08-Feb-2007 09:32:51
Branch: HEAD Handle: 2007020808325100
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.2.0 -> 5.2.1
Summary:
RevisionChanges Path
1.142 +3 -3 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.141 -r1.142 php.spec
--- openpkg-src/php/php.spec 1 Jan 2007 17:41:02 - 1.141
+++ openpkg-src/php/php.spec 8 Feb 2007 08:32:51 - 1.142
@@ -23,8 +23,8 @@
##
# package versions
-%define V_php 5.2.0
-%define V_php_suhosin_p 5.2.0-0.9.6.2
+%define V_php 5.2.1
+%define V_php_suhosin_p 5.2.1-0.9.6.2
%define V_php_suhosin_e 0.9.16
%define V_php_hardened5.1.6-0.4.15
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20061203
+Release: 20070208
# package options
%option with_suhosin no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 03-Dec-2006 11:50:56
Branch: HEAD Handle: 2006120310505600
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.0 20061129 -> 20061203
Summary:
RevisionChanges Path
1.140 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.139 -r1.140 php.spec
--- openpkg-src/php/php.spec 29 Nov 2006 07:59:19 - 1.139
+++ openpkg-src/php/php.spec 3 Dec 2006 10:50:56 - 1.140
@@ -25,7 +25,7 @@
# package versions
%define V_php 5.2.0
%define V_php_suhosin_p 5.2.0-0.9.6.2
-%define V_php_suhosin_e 0.9.15
+%define V_php_suhosin_e 0.9.16
%define V_php_hardened5.1.6-0.4.15
# package information
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20061129
+Release: 20061203
# package options
%option with_suhosin no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 29-Nov-2006 08:59:19
Branch: HEAD Handle: 2006112907591900
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.0 20061122 -> 20061129
Summary:
RevisionChanges Path
1.139 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.138 -r1.139 php.spec
--- openpkg-src/php/php.spec 22 Nov 2006 17:10:07 - 1.138
+++ openpkg-src/php/php.spec 29 Nov 2006 07:59:19 - 1.139
@@ -25,7 +25,7 @@
# package versions
%define V_php 5.2.0
%define V_php_suhosin_p 5.2.0-0.9.6.2
-%define V_php_suhosin_e 0.9.14
+%define V_php_suhosin_e 0.9.15
%define V_php_hardened5.1.6-0.4.15
# package information
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20061122
+Release: 20061129
# package options
%option with_suhosin no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 22-Nov-2006 18:10:07 Branch: HEAD Handle: 2006112217100700 Modified files: openpkg-src/php php.spec Log: modifying package: php-5.2.0 20061122 again Summary: RevisionChanges Path 1.138 +1 -1 openpkg-src/php/php.spec patch -p0 <<'@@ .' Index: openpkg-src/php/php.spec $ cvs diff -u -r1.137 -r1.138 php.spec --- openpkg-src/php/php.spec 22 Nov 2006 08:49:46 - 1.137 +++ openpkg-src/php/php.spec 22 Nov 2006 17:10:07 - 1.138 @@ -25,7 +25,7 @@ # package versions %define V_php 5.2.0 %define V_php_suhosin_p 5.2.0-0.9.6.2 -%define V_php_suhosin_e 0.9.13 +%define V_php_suhosin_e 0.9.14 %define V_php_hardened5.1.6-0.4.15 # package information @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 22-Nov-2006 09:49:46
Branch: HEAD Handle: 2006112208494600
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.2.0 20061115 -> 20061122
Summary:
RevisionChanges Path
1.137 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.136 -r1.137 php.spec
--- openpkg-src/php/php.spec 15 Nov 2006 14:02:31 - 1.136
+++ openpkg-src/php/php.spec 22 Nov 2006 08:49:46 - 1.137
@@ -25,7 +25,7 @@
# package versions
%define V_php 5.2.0
%define V_php_suhosin_p 5.2.0-0.9.6.2
-%define V_php_suhosin_e 0.9.12
+%define V_php_suhosin_e 0.9.13
%define V_php_hardened5.1.6-0.4.15
# package information
@@ -39,7 +39,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20061115
+Release: 20061122
# package options
%option with_suhosin no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 15-Nov-2006 15:02:33
Branch: HEAD Handle: 2006111514023100
Modified files:
openpkg-src/php php.spec
Log:
add optional support for the PHP Suhosin patch & extension from the
Hardened PHP project
Summary:
RevisionChanges Path
1.136 +39 -5 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.135 -r1.136 php.spec
--- openpkg-src/php/php.spec 8 Nov 2006 08:36:30 - 1.135
+++ openpkg-src/php/php.spec 15 Nov 2006 14:02:31 - 1.136
@@ -24,6 +24,8 @@
# package versions
%define V_php 5.2.0
+%define V_php_suhosin_p 5.2.0-0.9.6.2
+%define V_php_suhosin_e 0.9.12
%define V_php_hardened5.1.6-0.4.15
# package information
@@ -37,9 +39,11 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20061108
+Release: 20061115
# package options
+%option with_suhosin no
+%option with_hardened no
%option with_bc no
%option with_bdb no
%option with_bzip2no
@@ -54,7 +58,6 @@
%option with_gd no
%option with_gdbm no
%option with_gettext no
-%option with_hardened no
%option with_iconvno
%option with_imap no
%option with_mbregex no
@@ -99,18 +102,27 @@
%undefine with_ssl
%define with_ssl yes
%endif
+%if "%{with_suhosin}" == "yes" && "%{with_hardened}" == "yes"
+%undefine with_hardened
+%define with_hardened no
+%endif
# list of sources
Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
-Source1: php.ini
+Source1:
http://www.hardened-php.net/suhosin/_media/suhosin-%{V_php_suhosin_e}.tgz
+Source2: php.ini
Patch0:
http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
-Patch1: php.patch
+Patch1:
http://www.hardened-php.net/suhosin/_media/suhosin-patch-%{V_php_suhosin_p}.patch.gz
+Patch2: php.patch
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20050615, gcc, flex, bison
PreReq: OpenPKG, openpkg >= 20050615, MTA
+%if "%{with_suhosin}" == "yes"
+BuildPreReq: autoconf
+%endif
%if "%{with_sqlite}" == "yes"
BuildPreReq: sqlite
PreReq: sqlite
@@ -248,13 +260,32 @@
url = http://www.hardened-php.net/downloads.13.html
regex = hardening-patch-(5\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
}
+prog php:suhosin-patch = {
+version = %{V_php_suhosin_p}
+url = http://www.hardened-php.net/suhosin/download.html
+regex = suhosin-patch-(5\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
+}
+prog php:suhosin-ext = {
+version = %{V_php_suhosin_e}
+url = http://www.hardened-php.net/suhosin/download.html
+regex = suhosin-(\d+(\.\d+)+)\.tgz
+}
%prep
%setup -q
%if "%{with_hardened}" == "yes"
%patch -p1 -P 0
%endif
-%patch -p0 -P 1
+%if "%{with_suhosin}" == "yes"
+%setup -q -T -D -a 1
+%patch -p1 -P 1
+mv suhosin-%{V_php_suhosin_e} ext/suhosin
+rm -f package.xml
+export PHP_AUTOCONF=autoconf-213
+./buildconf --copy --force
+$PHP_AUTOCONF
+%endif
+%patch -p0 -P 2
%{l_shtool} subst \
-e 's;\(/include\)/freetype2;\1;' \
configure \
@@ -305,6 +336,9 @@
--libdir=%{l_prefix}/lib/php \
--disable-all \
--enable-pdo \
+%if "%{with_suhosin}" == "yes"
+--enable-suhosin \
+%endif
%if "%{with_calendar}" == "yes"
--enable-calendar \
%endif
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 09-Sep-2006 09:43:43
Branch: HEAD Handle: 2006090908434300
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.1.6 20060908 -> 20060909
Summary:
RevisionChanges Path
1.131 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.130 -r1.131 php.spec
--- openpkg-src/php/php.spec 8 Sep 2006 06:07:51 - 1.130
+++ openpkg-src/php/php.spec 9 Sep 2006 07:43:43 - 1.131
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.1.6
-%define V_php_hardened5.1.5-0.4.15
+%define V_php_hardened5.1.6-0.4.15
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20060908
+Release: 20060909
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 08-Sep-2006 08:07:52
Branch: HEAD Handle: 2006090807075100
Modified files:
openpkg-src/php php.spec
Log:
upgrade PHP hardened patch
Summary:
RevisionChanges Path
1.130 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.129 -r1.130 php.spec
--- openpkg-src/php/php.spec 25 Aug 2006 06:48:06 - 1.129
+++ openpkg-src/php/php.spec 8 Sep 2006 06:07:51 - 1.130
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.1.6
-%define V_php_hardened5.1.5-0.4.14
+%define V_php_hardened5.1.5-0.4.15
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20060825
+Release: 20060908
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 25-Aug-2006 08:48:07
Branch: HEAD Handle: 2006082507480600
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.1.5 -> 5.1.6
Summary:
RevisionChanges Path
1.129 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.128 -r1.129 php.spec
--- openpkg-src/php/php.spec 18 Aug 2006 16:18:51 - 1.128
+++ openpkg-src/php/php.spec 25 Aug 2006 06:48:06 - 1.129
@@ -23,7 +23,7 @@
##
# package versions
-%define V_php 5.1.5
+%define V_php 5.1.6
%define V_php_hardened5.1.5-0.4.14
# package information
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20060818
+Release: 20060825
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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 18:18:51
Branch: HEAD Handle: 2006081817185100
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 5.1.4 -> 5.1.5
Summary:
RevisionChanges Path
1.128 +3 -3 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.127 -r1.128 php.spec
--- openpkg-src/php/php.spec 11 Aug 2006 15:38:05 - 1.127
+++ openpkg-src/php/php.spec 18 Aug 2006 16:18:51 - 1.128
@@ -23,8 +23,8 @@
##
# package versions
-%define V_php 5.1.4
-%define V_php_hardened5.1.4-0.4.14
+%define V_php 5.1.5
+%define V_php_hardened5.1.5-0.4.14
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20060811
+Release: 20060818
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 11-Aug-2006 17:38:06
Branch: HEAD Handle: 2006081116380500
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.1.4 20060807 -> 20060811
Summary:
RevisionChanges Path
1.127 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.126 -r1.127 php.spec
--- openpkg-src/php/php.spec 7 Aug 2006 17:50:10 - 1.126
+++ openpkg-src/php/php.spec 11 Aug 2006 15:38:05 - 1.127
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.1.4
-%define V_php_hardened5.1.4-0.4.13
+%define V_php_hardened5.1.4-0.4.14
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20060807
+Release: 20060811
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 07-Aug-2006 19:50:10
Branch: HEAD Handle: 2006080718501000
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.1.4 20060720 -> 20060807
Summary:
RevisionChanges Path
1.126 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.125 -r1.126 php.spec
--- openpkg-src/php/php.spec 20 Jul 2006 15:08:52 - 1.125
+++ openpkg-src/php/php.spec 7 Aug 2006 17:50:10 - 1.126
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.1.4
-%define V_php_hardened5.1.4-0.4.12
+%define V_php_hardened5.1.4-0.4.13
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20060720
+Release: 20060807
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 20-Jul-2006 17:08:52
Branch: HEAD Handle: 2006072016085200
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-5.1.4 20060528 -> 20060720
Summary:
RevisionChanges Path
1.125 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.124 -r1.125 php.spec
--- openpkg-src/php/php.spec 28 May 2006 11:58:19 - 1.124
+++ openpkg-src/php/php.spec 20 Jul 2006 15:08:52 - 1.125
@@ -24,7 +24,7 @@
# package versions
%define V_php 5.1.4
-%define V_php_hardened5.1.4-0.4.11
+%define V_php_hardened5.1.4-0.4.12
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20060528
+Release: 20060720
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 28-May-2006 13:58:20
Branch: HEAD Handle: 2006052812581900
Modified files:
openpkg-src/php php.spec
Log:
sort options and add back with_debug option to be in sync with php4
package again as close as possible
Summary:
RevisionChanges Path
1.124 +34 -28 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.123 -r1.124 php.spec
--- openpkg-src/php/php.spec 28 May 2006 09:45:57 - 1.123
+++ openpkg-src/php/php.spec 28 May 2006 11:58:19 - 1.124
@@ -40,44 +40,45 @@
Release: 20060528
# package options
-%option with_calendar no
-%option with_sqlite no
-%option with_mysqlno
-%option with_pgsqlno
-%option with_gd no
+%option with_bc no
%option with_bdb no
-%option with_zlib no
%option with_bzip2no
-%option with_ssl no
-%option with_openldap no
-%option with_openldapsasl no
-%option with_mm no
-%option with_pcre no
-%option with_ftp no
-%option with_oci8 no
+%option with_calendar no
+%option with_curl no
+%option with_debugno
+%option with_dom no
+%option with_exif no
%option with_fastcgi no
%option with_freetype no
+%option with_ftp no
+%option with_gd no
+%option with_gdbm no
%option with_gettext no
%option with_hardened no
+%option with_iconvno
%option with_imap no
-%option with_xml no
-%option with_xslt no
-%option with_dom no
-%option with_bc no
-%option with_curl no
-%option with_mhashno
-%option with_mcrypt no
-%option with_wddx no
-%option with_gdbm no
-%option with_versioning no
-%option with_snmp no
-%option with_odbc no
%option with_mbregex no
%option with_mbstring no
-%option with_exif no
-%option with_iconvno
-%option with_sendmail no
+%option with_mcrypt no
+%option with_mhashno
+%option with_mm no
+%option with_mysqlno
+%option with_oci8 no
+%option with_odbc no
+%option with_openldap no
+%option with_openldapsasl no
+%option with_pcre no
%option with_pear no
+%option with_pgsqlno
+%option with_sendmail no
+%option with_snmp no
+%option with_sqlite no
+%option with_ssl no
+%option with_versioning no
+%option with_wddx no
+%option with_xml no
+%option with_xslt no
+%option with_zlib no
# fixing implicit extension dependencies and correlations
%if "%{with_pear}" == "yes"
@@ -340,6 +341,11 @@
%if "%{with_bdb}" == "yes"
--with-db4=%{l_prefix} \
%endif
+%if "%{with_debug}" == "yes"
+--with-debug=yes \
+%else
+--with-debug=no \
+%endif
%if "%{with_zlib}" == "yes"
--with-zlib=%{l_prefix} \
--with-zlib-dir=%{l_prefix} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 14-May-2006 09:44:02
Branch: HEAD Handle: 200605140844
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-4.4.2 20060503 -> 20060514
Summary:
RevisionChanges Path
1.122 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.121 -r1.122 php.spec
--- openpkg-src/php/php.spec 3 May 2006 07:52:14 - 1.121
+++ openpkg-src/php/php.spec 14 May 2006 07:44:00 - 1.122
@@ -24,7 +24,7 @@
# package component versions
%define V_php 4.4.2
-%define V_php_hardened4.4.2-0.4.9
+%define V_php_hardened4.4.2-0.4.11
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20060503
+Release: 20060514
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 03-May-2006 09:52:15
Branch: HEAD Handle: 2006050308521400
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-4.4.2 20060222 -> 20060503
Summary:
RevisionChanges Path
1.121 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.120 -r1.121 php.spec
--- openpkg-src/php/php.spec 22 Feb 2006 19:15:08 - 1.120
+++ openpkg-src/php/php.spec 3 May 2006 07:52:14 - 1.121
@@ -24,7 +24,7 @@
# package component versions
%define V_php 4.4.2
-%define V_php_hardened4.4.2-0.4.8
+%define V_php_hardened4.4.2-0.4.9
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20060222
+Release: 20060503
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 22-Feb-2006 20:15:09
Branch: HEAD Handle: 2006022219150800
Modified files:
openpkg-src/php php.spec
Log:
enable FastCGI support
Summary:
RevisionChanges Path
1.120 +7 -1 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.119 -r1.120 php.spec
--- openpkg-src/php/php.spec 19 Jan 2006 06:33:04 - 1.119
+++ openpkg-src/php/php.spec 22 Feb 2006 19:15:08 - 1.120
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20060119
+Release: 20060222
# package options
%option with_bc no
@@ -48,6 +48,7 @@
%option with_debugno
%option with_dom no
%option with_exif no
+%option with_fastcgi no
%option with_freetype no
%option with_ftp no
%option with_gdbm no
@@ -330,6 +331,11 @@
--with-jpeg-dir=%{l_prefix} \
--with-png-dir=%{l_prefix} \
%endif
+%if "%{with_fastcgi}" == "yes"
+ --enable-fastcgi \
+%else
+ --disable-fastcgi \
+%endif
%if "%{with_freetype}" == "yes"
--enable-gd-imgstrttf \
--enable-gd-native-ttf \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 19-Jan-2006 07:33:05
Branch: HEAD Handle: 2006011906330400
Modified files:
openpkg-src/php php.spec
Log:
upgrade PHP hardening patch
Summary:
RevisionChanges Path
1.119 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.118 -r1.119 php.spec
--- openpkg-src/php/php.spec 13 Jan 2006 19:02:44 - 1.118
+++ openpkg-src/php/php.spec 19 Jan 2006 06:33:04 - 1.119
@@ -24,7 +24,7 @@
# package component versions
%define V_php 4.4.2
-%define V_php_hardened4.4.1-0.4.8
+%define V_php_hardened4.4.2-0.4.8
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20060113
+Release: 20060119
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 13-Jan-2006 20:02:45
Branch: HEAD Handle: 2006011319024400
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 4.4.1 -> 4.4.2
Summary:
RevisionChanges Path
1.118 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.117 -r1.118 php.spec
--- openpkg-src/php/php.spec 1 Jan 2006 13:20:34 - 1.117
+++ openpkg-src/php/php.spec 13 Jan 2006 19:02:44 - 1.118
@@ -23,7 +23,7 @@
##
# package component versions
-%define V_php 4.4.1
+%define V_php 4.4.2
%define V_php_hardened4.4.1-0.4.8
# package information
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20051129
+Release: 20060113
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 29-Nov-2005 16:38:50
Branch: HEAD Handle: 2005112915385000
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-4.4.1 20051126 -> 20051129
Summary:
RevisionChanges Path
1.116 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.115 -r1.116 php.spec
--- openpkg-src/php/php.spec 26 Nov 2005 08:09:20 - 1.115
+++ openpkg-src/php/php.spec 29 Nov 2005 15:38:50 - 1.116
@@ -24,7 +24,7 @@
# package component versions
%define V_php 4.4.1
-%define V_php_hardened4.4.1-0.4.6
+%define V_php_hardened4.4.1-0.4.8
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20051126
+Release: 20051129
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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:09:20
Branch: HEAD Handle: 2005112608092000
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-4.4.1 20051103 -> 20051126
Summary:
RevisionChanges Path
1.115 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.114 -r1.115 php.spec
--- openpkg-src/php/php.spec 3 Nov 2005 07:15:33 - 1.114
+++ openpkg-src/php/php.spec 26 Nov 2005 08:09:20 - 1.115
@@ -24,7 +24,7 @@
# package component versions
%define V_php 4.4.1
-%define V_php_hardened4.4.1-0.4.5
+%define V_php_hardened4.4.1-0.4.6
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20051103
+Release: 20051126
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 03-Nov-2005 08:15:33
Branch: HEAD Handle: 2005110307153300
Modified files:
openpkg-src/php php.spec
Log:
fix tracking of hardening patch and upgrade to latest version
Summary:
RevisionChanges Path
1.114 +5 -5 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.113 -r1.114 php.spec
--- openpkg-src/php/php.spec 31 Oct 2005 18:58:08 - 1.113
+++ openpkg-src/php/php.spec 3 Nov 2005 07:15:33 - 1.114
@@ -24,7 +24,7 @@
# package component versions
%define V_php 4.4.1
-%define V_php_hardened4.3.11-0.2.7
+%define V_php_hardened4.4.1-0.4.5
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20051031
+Release: 20051103
# package options
%option with_bc no
@@ -102,7 +102,7 @@
# list of sources
Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
Source1: php.ini
-Patch0:
http://www.hardened-php.net/hardened-php-%{V_php_hardened}.patch.gz
+Patch0:
http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
Patch1: php.patch
# build information
@@ -244,8 +244,8 @@
}
prog php:hardened = {
version = %{V_php_hardened}
-url = http://www.hardened-php.net/download.php
-regex = hardened-php-(4\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
+url = http://www.hardened-php.net/downloads.13.html
+regex = hardening-patch-(4\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
}
%prep
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 04-Oct-2005 22:12:21
Branch: HEAD Handle: 2005100421122100
Modified files:
openpkg-src/php php.spec
Log:
remove obsolete security fix as PHP 4.4.0 already contains the (fixed)
GNU shtool 2.0.2
Summary:
RevisionChanges Path
1.112 +0 -1 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.111 -r1.112 php.spec
--- openpkg-src/php/php.spec 4 Oct 2005 19:54:54 - 1.111
+++ openpkg-src/php/php.spec 4 Oct 2005 20:12:21 - 1.112
@@ -261,7 +261,6 @@
%{l_shtool} subst \
%{l_value -s l_prefix l_rpm l_rpmtool} \
scripts/phpize.in
-cp %{l_shtool} ./build/shtool
%build
# configure package
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 11-Jul-2005 19:43:04
Branch: HEAD Handle: 2005071118430400
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 4.3.11 -> 4.4.0
Summary:
RevisionChanges Path
1.110 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.109 -r1.110 php.spec
--- openpkg-src/php/php.spec 15 Jun 2005 14:01:29 - 1.109
+++ openpkg-src/php/php.spec 11 Jul 2005 17:43:04 - 1.110
@@ -23,7 +23,7 @@
##
# package component versions
-%define V_php 4.3.11
+%define V_php 4.4.0
%define V_php_hardened4.3.11-0.2.7
# package information
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20050615
+Release: 20050711
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 07-Apr-2005 13:01:17
Branch: HEAD Handle: 2005040712011700
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-4.3.11 20050405 -> 20050407
Summary:
RevisionChanges Path
1.108 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.107 -r1.108 php.spec
--- openpkg-src/php/php.spec 5 Apr 2005 17:20:49 - 1.107
+++ openpkg-src/php/php.spec 7 Apr 2005 11:01:17 - 1.108
@@ -24,7 +24,7 @@
# package component versions
%define V_php 4.3.11
-%define V_php_hardened4.3.11-0.2.6
+%define V_php_hardened4.3.11-0.2.7
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20050405
+Release: 20050407
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 05-Apr-2005 19:20:49
Branch: HEAD Handle: 2005040518204900
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-4.3.11 20050401 -> 20050405
Summary:
RevisionChanges Path
1.107 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.106 -r1.107 php.spec
--- openpkg-src/php/php.spec 1 Apr 2005 06:19:31 - 1.106
+++ openpkg-src/php/php.spec 5 Apr 2005 17:20:49 - 1.107
@@ -24,7 +24,7 @@
# package component versions
%define V_php 4.3.11
-%define V_php_hardened4.3.10-0.2.6
+%define V_php_hardened4.3.11-0.2.6
# package information
Name: php
@@ -37,7 +37,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20050401
+Release: 20050405
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
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: 01-Mar-2005 09:28:21
Branch: HEAD Handle: 2005030108282000
Modified files:
openpkg-src/php php.spec
Log:
synchronize gd/pdflib support with 'apache' package
Summary:
RevisionChanges Path
1.104 +7 -7 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.103 -r1.104 php.spec
--- openpkg-src/php/php.spec 6 Feb 2005 13:41:53 - 1.103
+++ openpkg-src/php/php.spec 1 Mar 2005 08:28:20 - 1.104
@@ -38,7 +38,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20050206
+Release: 20050301
# package options
%option with_bc no
@@ -91,7 +91,7 @@
%undefine with_gd
%define with_gdyes
%endif
-%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" ==
"yes"
+%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_pdflib}" ==
"yes" || "%{with_dom}" == "yes"
%undefine with_zlib
%define with_zlib yes
%endif
@@ -128,8 +128,8 @@
PreReq: db
%endif
%if "%{with_pdflib}" == "yes"
-BuildPreReq: pdflib
-PreReq: pdflib
+BuildPreReq: pdflib, jpeg, png
+PreReq: pdflib, jpeg, png
%endif
%if "%{with_zlib}" == "yes"
BuildPreReq: zlib
@@ -272,7 +272,7 @@
%if "%{with_gdbm}" == "yes"
libs="$libs -lndbm -lgdbm"
%endif
-%if "%{with_gd}" == "yes" && "%{with_pdflib}" != "yes"
+%if "%{with_gd}" == "yes" || "%{with_pdflib}" == "yes"
libs="$libs -lpng -lz"
%endif
%if "%{with_gettext}" == "yes"
@@ -328,11 +328,9 @@
%endif
%if "%{with_gd}" == "yes"
--with-gd=%{l_prefix} \
-%if "%{with_pdflib}" != "yes"
--with-jpeg-dir=%{l_prefix} \
--with-png-dir=%{l_prefix} \
%endif
-%endif
%if "%{with_freetype}" == "yes"
--enable-gd-imgstrttf \
--enable-gd-native-ttf \
@@ -355,6 +353,8 @@
%endif
%if "%{with_pdflib}" == "yes"
--with-pdflib=%{l_prefix} \
+--with-jpeg-dir=%{l_prefix} \
+--with-png-dir=%{l_prefix} \
%endif
%if "%{with_ssl}" == "yes" || "%{with_openldap}" == "yes"
--with-openssl=%{l_prefix} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Dec-2004 15:19:02
Branch: HEAD Handle: 2004122314190200
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-4.3.10 20041218 -> 20041223
Summary:
RevisionChanges Path
1.100 +2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.99 -r1.100 php.spec
--- openpkg-src/php/php.spec 18 Dec 2004 21:42:05 - 1.99
+++ openpkg-src/php/php.spec 23 Dec 2004 14:19:02 - 1.100
@@ -25,7 +25,7 @@
# package component versions
%define V_php 4.3.10
-%define V_php_hardened4.3.10-0.2.5
+%define V_php_hardened4.3.10-0.2.6
# package information
Name: php
@@ -38,7 +38,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20041218
+Release: 20041223
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Dec-2004 22:42:05
Branch: HEAD Handle: 2004121821420500
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-4.3.10 20041215 -> 20041218
Summary:
RevisionChanges Path
1.99+2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.98 -r1.99 php.spec
--- openpkg-src/php/php.spec 15 Dec 2004 18:58:42 - 1.98
+++ openpkg-src/php/php.spec 18 Dec 2004 21:42:05 - 1.99
@@ -25,7 +25,7 @@
# package component versions
%define V_php 4.3.10
-%define V_php_hardened4.3.10-0.2.4
+%define V_php_hardened4.3.10-0.2.5
# package information
Name: php
@@ -38,7 +38,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20041215
+Release: 20041218
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Dec-2004 19:58:42
Branch: HEAD Handle: 2004121518584200
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 4.3.9 -> 4.3.10
Summary:
RevisionChanges Path
1.98+3 -3 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.97 -r1.98 php.spec
--- openpkg-src/php/php.spec 30 Nov 2004 21:07:09 - 1.97
+++ openpkg-src/php/php.spec 15 Dec 2004 18:58:42 - 1.98
@@ -24,8 +24,8 @@
##
# package component versions
-%define V_php 4.3.9
-%define V_php_hardened4.3.9-0.2.3
+%define V_php 4.3.10
+%define V_php_hardened4.3.10-0.2.4
# package information
Name: php
@@ -38,7 +38,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20041130
+Release: 20041215
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Oct-2004 19:32:37
Branch: HEAD Handle: 2004102618323600
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-4.3.9 20040924 -> 20041026
Summary:
RevisionChanges Path
1.95+2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.94 -r1.95 php.spec
--- openpkg-src/php/php.spec 24 Sep 2004 08:57:39 - 1.94
+++ openpkg-src/php/php.spec 26 Oct 2004 17:32:36 - 1.95
@@ -25,7 +25,7 @@
# package component versions
%define V_php 4.3.9
-%define V_php_hardened4.3.8-0.2.2
+%define V_php_hardened4.3.9-0.2.3
# package information
Name: php
@@ -38,7 +38,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20040924
+Release: 20041026
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Sep-2004 10:57:40
Branch: HEAD Handle: 2004092409573900
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 4.3.8 -> 4.3.9
Summary:
RevisionChanges Path
1.94+5 -5 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.93 -r1.94 php.spec
--- openpkg-src/php/php.spec 20 Sep 2004 16:17:35 - 1.93
+++ openpkg-src/php/php.spec 24 Sep 2004 08:57:39 - 1.94
@@ -24,8 +24,8 @@
##
# package component versions
-%define V_php 4.3.8
-%define V_php_hardened0.2.2
+%define V_php 4.3.9
+%define V_php_hardened4.3.8-0.2.2
# package information
Name: php
@@ -38,7 +38,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20040920
+Release: 20040924
# package options
%option with_bc no
@@ -103,7 +103,7 @@
# list of sources
Source0: http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
Source1: php.ini
-Patch0:
http://www.hardened-php.net/hardened-php-%{V_php}-%{V_php_hardened}.patch.gz
+Patch0: http://www.hardened-php.net/hardened-php-%{V_php_hardened}.patch.gz
Patch1: php.patch
# build information
@@ -245,7 +245,7 @@
prog php:hardened = {
version = %{V_php_hardened}
url = http://www.hardened-php.net/download.php
-regex = hardened-php-%{V_php}-(\d+(\.\d+)+)\.patch\.gz
+regex = hardened-php-(4\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
}
%prep
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Sep-2004 13:38:18
Branch: HEAD Handle: 2004091112381700
Modified files:
openpkg-src/php php.spec
Log:
fix regex
Summary:
RevisionChanges Path
1.92+2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.91 -r1.92 php.spec
--- openpkg-src/php/php.spec 31 Aug 2004 10:49:39 - 1.91
+++ openpkg-src/php/php.spec 11 Sep 2004 11:38:17 - 1.92
@@ -38,7 +38,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20040831
+Release: 20040911
# package options
%option with_bc no
@@ -245,7 +245,7 @@
prog php:hardened = {
version = %{V_php_hardened}
url = http://www.hardened-php.net/download.php
-regex = hardened-php-%{V_php}-(\d+(\.\d+)+).patch.gz
+regex = hardened-php-%{V_php}-(\d+(\.\d+)+)\.patch\.gz
}
%prep
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Aug-2004 12:49:39
Branch: HEAD Handle: 2004083111493900
Modified files:
openpkg-src/php php.spec
Log:
simplify condition syntax
Summary:
RevisionChanges Path
1.91+2 -4 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.90 -r1.91 php.spec
--- openpkg-src/php/php.spec 30 Aug 2004 17:21:36 - 1.90
+++ openpkg-src/php/php.spec 31 Aug 2004 10:49:39 - 1.91
@@ -38,7 +38,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20040830
+Release: 20040831
# package options
%option with_bc no
@@ -271,11 +271,9 @@
%if "%{with_gdbm}" == "yes"
libs="$libs -lndbm -lgdbm"
%endif
-%if "%{with_gd}" == "yes"
-%if "%{with_pdflib}" != "yes"
+%if "%{with_gd}" == "yes" && "%{with_pdflib}" != "yes"
libs="$libs -lpng -lz"
%endif
-%endif
%if "%{with_gettext}" == "yes"
libs="$libs -liconv"
%endif
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Jul-2004 07:53:07
Branch: HEAD Handle: 2004071606530700
Modified files:
openpkg-src/php php.spec
Log:
modifying package: php-4.3.8 20040714 -> 20040716
Summary:
RevisionChanges Path
1.87+2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.86 -r1.87 php.spec
--- openpkg-src/php/php.spec 14 Jul 2004 17:16:10 - 1.86
+++ openpkg-src/php/php.spec 16 Jul 2004 05:53:07 - 1.87
@@ -25,7 +25,7 @@
# package component versions
%define V_php 4.3.8
-%define V_php_hardened0.2.1
+%define V_php_hardened0.2.2
# package information
Name: php
@@ -38,7 +38,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20040714
+Release: 20040716
# package options
%option with_bc no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 14-Jul-2004 19:16:11 Branch: HEAD Handle: 2004071418161000 Modified files: openpkg-src/php php.spec Log: modifying package: php-4.3.8 20040714 again Summary: RevisionChanges Path 1.86+1 -1 openpkg-src/php/php.spec patch -p0 <<'@@ .' Index: openpkg-src/php/php.spec $ cvs diff -u -r1.85 -r1.86 php.spec --- openpkg-src/php/php.spec 14 Jul 2004 07:58:34 - 1.85 +++ openpkg-src/php/php.spec 14 Jul 2004 17:16:10 - 1.86 @@ -25,7 +25,7 @@ # package component versions %define V_php 4.3.8 -%define V_php_hardened0.2.0 +%define V_php_hardened0.2.1 # package information Name: php @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Jul-2004 09:58:34
Branch: HEAD Handle: 2004071408583400
Modified files:
openpkg-src/php php.spec
Log:
upgrading package: php 4.3.7 -> 4.3.8
Summary:
RevisionChanges Path
1.85+4 -4 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.84 -r1.85 php.spec
--- openpkg-src/php/php.spec 11 Jun 2004 08:40:05 - 1.84
+++ openpkg-src/php/php.spec 14 Jul 2004 07:58:34 - 1.85
@@ -24,8 +24,8 @@
##
# package component versions
-%define V_php 4.3.7
-%define V_php_hardened0.1.2
+%define V_php 4.3.8
+%define V_php_hardened0.2.0
# package information
Name: php
@@ -38,7 +38,7 @@
Group:Language
License: PHP
Version: %{V_php}
-Release: 20040611
+Release: 20040714
# package options
%option with_bc no
@@ -239,7 +239,7 @@
prog php = {
version = %{V_php}
url = http://www.php.net/downloads.php
-regex = php-(\d+\.\d+\.\d+)\.tar\.gz
+regex = php-(4\.\d+\.\d+)\.tar\.gz
}
prog php:hardened = {
version = %{V_php_hardened}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/php/ php.spec
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 10:34:15
Branch: HEAD Handle: 2004060409341500
Modified files:
openpkg-src/php php.spec
Log:
added Hardened PHP as option
Summary:
RevisionChanges Path
1.83+57 -43 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.82 -r1.83 php.spec
--- openpkg-src/php/php.spec 3 Jun 2004 18:32:04 - 1.82
+++ openpkg-src/php/php.spec 4 Jun 2004 08:34:15 - 1.83
@@ -23,6 +23,10 @@
## SUCH DAMAGE.
##
+# package component versions
+%define V_php 4.3.7
+%define V_php_hardened0.1.2
+
# package information
Name: php
Summary: Personal HomePage (PHP)
@@ -33,49 +37,50 @@
Class:BASE
Group:Language
License: PHP
-Version: 4.3.7
-Release: 20040603
+Version: %{V_php}
+Release: 20040604
# package options
-%option with_calendar no
-%option with_mysql no
-%option with_pgsql no
-%option with_gdno
-%option with_bdb no
-%option with_debug no
-%option with_pdflibno
-%option with_zlib no
-%option with_bzip2 no
-%option with_ssl no
-%option with_openldap no
-%option with_openldapsasl no
-%option with_mmno
-%option with_pcre no
-%option with_ftp no
-%option with_java no
-%option with_oci7 no
-%option with_oci8 no
-%option with_freetype no
-%option with_gettext no
-%option with_imap no
-%option with_xml no
-%option with_dom no
-%option with_bcno
-%option with_transsid no
-%option with_curl no
-%option with_mhash no
-%option with_mcryptno
-%option with_wddx no
-%option with_gdbm no
-%option with_versioningno
-%option with_snmp no
-%option with_odbc no
-%option with_mbregex no
-%option with_mbstring no
-%option with_exif no
-%option with_iconv no
-%option with_sendmail no
-%option with_pear no
+%option with_bc no
+%option with_bdb no
+%option with_bzip2no
+%option with_calendar no
+%option with_curl no
+%option with_debugno
+%option with_dom no
+%option with_exif no
+%option with_freetype no
+%option with_ftp no
+%option with_gdbm no
+%option with_gd no
+%option with_gettext no
+%option with_hardened no
+%option with_iconvno
+%option with_imap no
+%option with_java no
+%option with_mbregex no
+%option with_mbstring no
+%option with_mcrypt no
+%option with_mhashno
+%option with_mm no
+%option with_mysqlno
+%option with_oci7 no
+%option with_oci8 no
+%option with_odbc no
+%option with_openldap no
+%option with_openldapsasl no
+%option with_pcre no
+%option with_pdflib no
+%option with_pear no
+%option with_pgsqlno
+%option with_sendmail no
+%option with_snmp no
+%option with_ssl no
+%option with_transsid no
+%option with_versioning no
+%option with_wddx no
+%option with_xml no
+%option with_zlib no
# fixing implicit extension dependencies and correlations
%if "%{with_pear}" == "yes"
@@ -96,7 +101,8 @@
%endif
# list of so
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 03-Jun-2004 20:32:04 Branch: HEAD Handle: 2004060319320400 Modified files: openpkg-src/php php.spec Log: upgrading package: php 4.3.6 -> 4.3.7 Summary: RevisionChanges Path 1.82+2 -2 openpkg-src/php/php.spec patch -p0 <<'@@ .' Index: openpkg-src/php/php.spec $ cvs diff -u -r1.81 -r1.82 php.spec --- openpkg-src/php/php.spec 24 May 2004 13:59:11 - 1.81 +++ openpkg-src/php/php.spec 3 Jun 2004 18:32:04 - 1.82 @@ -33,8 +33,8 @@ Class:BASE Group:Language License: PHP -Version: 4.3.6 -Release: 20040524 +Version: 4.3.7 +Release: 20040603 # package options %option with_calendar no @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-May-2004 15:59:12
Branch: HEAD Handle: 2004052414591100
Modified files:
openpkg-src/php php.spec
Log:
align with OCI8 hacks in Apache package
Summary:
RevisionChanges Path
1.81+10 -1 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.80 -r1.81 php.spec
--- openpkg-src/php/php.spec 25 Apr 2004 18:36:13 - 1.80
+++ openpkg-src/php/php.spec 24 May 2004 13:59:11 - 1.81
@@ -34,7 +34,7 @@
Group:Language
License: PHP
Version: 4.3.6
-Release: 20040425
+Release: 20040524
# package options
%option with_calendar no
@@ -269,6 +269,14 @@
%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
export ORACLE_HOME
+oracle_libdir="`%{l_prefix}/etc/rc --query oracle_libdir`"
+case "$oracle_libdir" in
+*/lib32 )
+%{l_shtool} subst \
+-e 's;OCI8_DIR/lib;OCI8_DIR/lib32;' \
+configure
+;;
+esac
%endif
CC="%{l_cc}" \
CFLAGS="$cflags" \
@@ -351,6 +359,7 @@
%endif
%if "%{with_oci8}" == "yes"
--with-oci8 \
+--enable-sigchld \
%endif
%if "%{with_gettext}" == "yes"
--with-gettext=%{l_prefix} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/php/ php.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Apr-2004 20:36:13
Branch: HEAD Handle: 2004042519361300
Modified files:
openpkg-src/php php.spec
Log:
fix download URL
Summary:
RevisionChanges Path
1.80+2 -2 openpkg-src/php/php.spec
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
$ cvs diff -u -r1.79 -r1.80 php.spec
--- openpkg-src/php/php.spec 21 Apr 2004 18:18:51 - 1.79
+++ openpkg-src/php/php.spec 25 Apr 2004 18:36:13 - 1.80
@@ -34,7 +34,7 @@
Group:Language
License: PHP
Version: 4.3.6
-Release: 20040421
+Release: 20040425
# package options
%option with_calendar no
@@ -96,7 +96,7 @@
%endif
# list of sources
-Source0: http://www.php.net/distributions/php-%{version}.tar.gz
+Source0: http://static.php.net/www.php.net/distributions/php-%{version}.tar.gz
# build information
Prefix: %{l_prefix}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
