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:30:27
Branch: HEAD Handle: 2005110307302700
Modified files:
openpkg-src/php5 php5.spec
Log:
add PHP hardening patch also to PHP 5
Summary:
Revision Changes Path
1.38 +22 -5 openpkg-src/php5/php5.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/php5/php5.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 php5.spec
--- openpkg-src/php5/php5.spec 4 Oct 2005 20:10:00 -0000 1.37
+++ openpkg-src/php5/php5.spec 3 Nov 2005 07:30:27 -0000 1.38
@@ -22,6 +22,10 @@
## SUCH DAMAGE.
##
+# package versions
+%define V_php 5.0.5
+%define V_php_hardened 5.0.5-0.4.5
+
# package information
Name: php5
Summary: Personal HomePage (PHP)
@@ -32,8 +36,8 @@
Class: PLUS
Group: Language
License: PHP
-Version: 5.0.5
-Release: 20051004
+Version: %{V_php}
+Release: 20051103
# package options
%option with_calendar no
@@ -53,6 +57,7 @@
%option with_oci8 no
%option with_freetype no
%option with_gettext no
+%option with_hardened no
%option with_imap no
%option with_xml no
%option with_xslt no
@@ -94,9 +99,10 @@
%endif
# list of sources
-Source0:
http://static.php.net/www.php.net/distributions/php-%{version}.tar.gz
+Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
Source1: php.ini
Patch0: php5.patch
+Patch1:
http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
# build information
Prefix: %{l_prefix}
@@ -227,14 +233,25 @@
%track
prog php5 = {
- version = %{version}
+ version = %{V_php}
url = http://www.php.net/downloads.php
regex = php-(5.\d+\.\d+)\.tar\.gz
}
+ prog php5:hardened = {
+ version = %{V_php_hardened}
+ url = http://www.hardened-php.net/downloads.13.html
+ regex = hardening-patch-(5\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
+ }
%prep
%setup -q -n php-%{version}
- %patch -p0
+ # php5.patch is currently already part of the hardening patch, so
+ # once it is taken over into the PHP distribution remove the %else
clause.
+%if "%{with_hardened}" == "yes"
+ %patch -p1 -P 1
+%else
+ %patch -p0 -P 0
+%endif
%{l_shtool} subst \
-e 's;\(/include\)/freetype2;\1;' \
configure \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
