cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to version 5.1.6 and replace the hardened patchset with

Browse Source 
the suhosin patchset;

kill the hardened flavor because we are going to use suhosin
patchet by default;
This commit is contained in:
robert 2006-10-21 11:44:10 +00:00
parent 42eb0bd76f
commit ab667c1beb
33 changed files with 89 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/php5/Makefile
View File

@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.2 2006/05/09 14:15:40 robert Exp $
# $OpenBSD: Makefile,v 1.3 2006/10/21 11:44:10 robert Exp $
SUBDIR += core
SUBDIR += core,hardened
SUBDIR += extensions
SUBDIR += extensions,hardened
SUBDIR += extensions,no_x11
.include <bsd.port.subdir.mk>

17
www/php5/Makefile.inc
View File

@ -1,11 +1,12 @@
# $OpenBSD: Makefile.inc,v 1.11 2006/07/18 21:44:40 alek Exp $
# $OpenBSD: Makefile.inc,v 1.12 2006/10/21 11:44:10 robert Exp $
# This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's.
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
V= 5.1.4
V= 5.1.6
PEAR_V= 20060428
SUHOSIN_V= 0.9.5
DISTNAME?= php-${V}
CATEGORIES= www lang
@ -67,15 +68,5 @@ REGRESS_FLAGS= NO_INTERACTION=1
CHECKSUM_FILE= ${.CURDIR}/../distinfo
PATCH_LIST= ${.CURDIR}/../patches/patch-* \
patch-*
# the hardened flavor is used by both core and extensions
FLAVORS+= hardened
FLAVOR?=
HARDENED_V= 0.4.9
.if ${FLAVOR:L:Mhardened}
PATCHFILES= hardening-patch-${V}-${HARDENED_V}.patch.gz:1
PATCHFILES= suhosin-patch-${V}-${SUHOSIN_V}.patch.gz:1
PATCH_DIST_STRIP= -p1
.else
SUPDISTFILES= hardening-patch-${V}-${HARDENED_V}.patch.gz:1
.endif

6
www/php5/core/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.17 2006/08/04 00:10:42 espie Exp $
# $OpenBSD: Makefile,v 1.18 2006/10/21 11:44:10 robert Exp $
MULTI_PACKAGES= -pear
SUBPACKAGE?=
COMMENT= "server-side HTML-embedded scripting language"
COMMENT-pear= "base classes for common PHP tasks"
PKGNAME= php5-core-${V}p1
FULLPKGNAME-pear= php5-pear-${V}p0
PKGNAME= php5-core-${V}
FULLPKGNAME-pear= php5-pear-${V}
DISTFILES= php-${V}.tar.gz \
pear-${PEAR_V}.tar.gz:0

8
www/php5/core/pkg/DESCR
View File

@ -8,3 +8,11 @@ raw network sockets and interact using other protocols.
This package installs a stand-alone binary which can be used for
command-line scripts, as well as an Apache module.
By default this port uses the suhosin patch.
The suhosin patch adds security hardening features to PHP
to protect your servers on the one hand against a number of
well known problems in PHP applications and on the other hand
against potential unknown vulnerabilities within those
applications or the PHP core itself.
http://www.hardened-php.net/suhosin/index.html

3
www/php5/core/pkg/PLIST
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.7 2006/05/09 14:15:40 robert Exp $
@comment $OpenBSD: PLIST,v 1.8 2006/10/21 11:44:10 robert Exp $
@conflict php4-core-*
@pkgpath www/php5/core,hardened
%%SHARED%%
bin/pear
bin/peardev

5
www/php5/core/pkg/PLIST-pear
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-pear,v 1.8 2006/05/09 14:15:40 robert Exp $
@comment $OpenBSD: PLIST-pear,v 1.9 2006/10/21 11:44:10 robert Exp $
@conflict php4-pear-*
pear/
pear/build/
@ -243,6 +243,9 @@ pear/include/main/streams/php_stream_plain_wrapper.h
pear/include/main/streams/php_stream_transport.h
pear/include/main/streams/php_stream_userspace.h
pear/include/main/streams/php_streams_int.h
pear/include/main/suhosin_globals.h
pear/include/main/suhosin_logo.h
pear/include/main/suhosin_patch.h
pear/include/main/win95nt.h
pear/include/regex/
pear/include/regex/cclass.h

16
www/php5/distinfo
View File

@ -1,12 +1,12 @@
MD5 (hardening-patch-5.1.4-0.4.9.patch.gz) = 12eb5eb043afcae99e7da668a6bd411d
MD5 (pear-20060428.tar.gz) = 28ab6f44a90cbcb5dd9ed0aef32d2fa9
MD5 (php-5.1.4.tar.gz) = 7c846aa09ec1fe0f54a57c8ba030d9f8
RMD160 (hardening-patch-5.1.4-0.4.9.patch.gz) = b02533b8e9b56d81233c0eb783bd36e0e5adf082
MD5 (php-5.1.6.tar.gz) = 04d6166552289eaeff771f5ec953b065
MD5 (suhosin-patch-5.1.6-0.9.5.patch.gz) = a34ef9819a1681ed03e61d1423c5b9e1
RMD160 (pear-20060428.tar.gz) = 34bac3122dfc8218efdce0ea7df046da031e72e7
RMD160 (php-5.1.4.tar.gz) = e8f42a9c6a2554c9b0c4ef9d7843b26d278ae592
SHA1 (hardening-patch-5.1.4-0.4.9.patch.gz) = b20f67186d87f03ba34ce9f65e20967dc24e79f8
RMD160 (php-5.1.6.tar.gz) = 89aeed0b88368f4e93bd7bdacdd94ce47eebe115
RMD160 (suhosin-patch-5.1.6-0.9.5.patch.gz) = 38420c6cb6f381cd763a9463e3c35706a7518f09
SHA1 (pear-20060428.tar.gz) = 09713b3052904c1c45acba015dc067ddad0136cb
SHA1 (php-5.1.4.tar.gz) = cfabe187fa1cd9c51a9e1ce8d61b6bc9f43d0016
SIZE (hardening-patch-5.1.4-0.4.9.patch.gz) = 57671
SHA1 (php-5.1.6.tar.gz) = e6f9df1db989e694dac6e1e190c5022f75c6a9cc
SHA1 (suhosin-patch-5.1.6-0.9.5.patch.gz) = 7863e0b2cfb433ba4f82c5ad4aa27d73a47e920d
SIZE (pear-20060428.tar.gz) = 619353
SIZE (php-5.1.4.tar.gz) = 8109575
SIZE (php-5.1.6.tar.gz) = 8187896
SIZE (suhosin-patch-5.1.6-0.9.5.patch.gz) = 23141

11
www/php5/extensions/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2006/09/18 09:04:03 espie Exp $
# $OpenBSD: Makefile,v 1.25 2006/10/21 11:44:10 robert Exp $
FULLPKGNAME= php5-extensions-${V}
COMMENT= "informational package about PHP5 extensions"
@ -14,11 +14,7 @@ FLAVOR?=
WANTLIB= stdc++ m
.if ${FLAVOR:L:Mhardened}
RUN_DEPENDS= :php5-core-${V}-hardened:www/php5/core,hardened
.else
RUN_DEPENDS= :php5-core-${V}-!hardened:www/php5/core
.endif
RUN_DEPENDS= :php5-core-${V}:www/php5/core
.if !defined(PACKAGING)
MODULES= devel/gettext
.endif
@ -325,9 +321,6 @@ FULLPKGNAME-xsl= php5-xsl-${V}
. if !defined(FULLPKGNAME${i})
FULLPKGNAME${i}= php5${i}-${V}
. endif
. if ${FLAVOR:L:Mhardened}
FULLPKGNAME${i}:= ${FULLPKGNAME${i}}-hardened
. endif
.endfor
.if defined(PACKAGING) && !empty(SUBPACKAGE)

3
www/php5/extensions/pkg/PLIST-bz2
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-bz2,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-bz2,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-bz2-*
@pkgpath www/php5/extensions,-bz2,hardened
lib/php/modules/bz2.so

3
www/php5/extensions/pkg/PLIST-curl
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-curl,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-curl,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-curl-*
@pkgpath www/php5/extensions,-curl,hardened
lib/php/modules/curl.so

3
www/php5/extensions/pkg/PLIST-dba
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-dba,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-dba,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-dba-*
@pkgpath www/php5/extensions,-dba,hardened
lib/php/modules/dba.so

3
www/php5/extensions/pkg/PLIST-dbase
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-dbase,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-dbase,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-dbase-*
@pkgpath www/php5/extensions,-dbase,hardened
lib/php/modules/dbase.so

3
www/php5/extensions/pkg/PLIST-filepro
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-filepro,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-filepro,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-filepro-*
@pkgpath www/php5/extensions,-filepro,hardened
lib/php/modules/filepro.so

3
www/php5/extensions/pkg/PLIST-gd
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-gd,v 1.3 2005/03/16 21:09:22 robert Exp $
@comment $OpenBSD: PLIST-gd,v 1.4 2006/10/21 11:44:10 robert Exp $
@conflict php4-gd-*
@pkgpath www/php5/extensions,-gd,hardened
lib/php/modules/gd.so

3
www/php5/extensions/pkg/PLIST-gmp
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-gmp,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-gmp,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-gmp-*
@pkgpath www/php5/extensions,-gmp,hardened
lib/php/modules/gmp.so

3
www/php5/extensions/pkg/PLIST-imap
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-imap,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-imap,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-imap-*
@pkgpath www/php5/extensions,-imap,hardened
lib/php/modules/imap.so

3
www/php5/extensions/pkg/PLIST-ldap
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-ldap,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-ldap,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-ldap-*
@pkgpath www/php5/extensions,-ldap,hardened
lib/php/modules/ldap.so

3
www/php5/extensions/pkg/PLIST-mbstring
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-mbstring,v 1.1 2005/07/06 00:50:33 kevlo Exp $
@comment $OpenBSD: PLIST-mbstring,v 1.2 2006/10/21 11:44:10 robert Exp $
@conflict php4-mbstring-*
@pkgpath www/php5/extensions,-mbstring,hardened
lib/php/modules/mbstring.so

3
www/php5/extensions/pkg/PLIST-mcrypt
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-mcrypt,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-mcrypt,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-mcrypt-*
@pkgpath www/php5/extensions,-mcrypt,hardened
lib/php/modules/mcrypt.so

3
www/php5/extensions/pkg/PLIST-mhash
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-mhash,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-mhash,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-mhash-*
@pkgpath www/php5/extensions,-mhash,hardened
lib/php/modules/mhash.so

3
www/php5/extensions/pkg/PLIST-mysql
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-mysql,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-mysql,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-mysql-*
@pkgpath www/php5/extensions,-mysql,hardened
lib/php/modules/mysql.so

3
www/php5/extensions/pkg/PLIST-mysqli
View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST-mysqli,v 1.1 2006/05/09 14:15:40 robert Exp $
@comment $OpenBSD: PLIST-mysqli,v 1.2 2006/10/21 11:44:10 robert Exp $
@pkgpath www/php5/extensions,-mysqli,hardened
lib/php/modules/mysqli.so

3
www/php5/extensions/pkg/PLIST-ncurses
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-ncurses,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-ncurses,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-ncurses-*
@pkgpath www/php5/extensions,-ncurses,hardened
lib/php/modules/ncurses.so

3
www/php5/extensions/pkg/PLIST-odbc
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-odbc,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-odbc,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-odbc-*
@pkgpath www/php5/extensions,-odbc,hardened
lib/php/modules/odbc.so

3
www/php5/extensions/pkg/PLIST-pgsql
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-pgsql,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-pgsql,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-pgsql-*
@pkgpath www/php5/extensions,-pgsql,hardened
lib/php/modules/pgsql.so

3
www/php5/extensions/pkg/PLIST-shmop
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-shmop,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-shmop,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-shmop-*
@pkgpath www/php5/extensions,-shmop,hardened
lib/php/modules/shmop.so

3
www/php5/extensions/pkg/PLIST-snmp
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-snmp,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-snmp,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-snmp-*
@pkgpath www/php5/extensions,-snmp,hardened
lib/php/modules/snmp.so

3
www/php5/extensions/pkg/PLIST-soap
View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST-soap,v 1.1 2005/06/06 17:25:33 robert Exp $
@comment $OpenBSD: PLIST-soap,v 1.2 2006/10/21 11:44:10 robert Exp $
@pkgpath www/php5/extensions,-soap,hardened
lib/php/modules/soap.so

3
www/php5/extensions/pkg/PLIST-sqlite
View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST-sqlite,v 1.1 2004/10/18 15:58:53 robert Exp $
@comment $OpenBSD: PLIST-sqlite,v 1.2 2006/10/21 11:44:10 robert Exp $
@pkgpath www/php5/extensions,-sqlite,hardened
lib/php/modules/sqlite.so

4
www/php5/extensions/pkg/PLIST-sybase_ct
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST-sybase_ct,v 1.2 2004/12/21 12:15:02 espie Exp $
@conflict php4-sybase_ct-*
@comment $OpenBSD: PLIST-sybase_ct,v 1.3 2006/10/21 11:44:10 robert Exp $
@pkgpath www/php5/extensions,-sybase,hardened
lib/php/modules/sybase_ct.so

3
www/php5/extensions/pkg/PLIST-xmlrpc
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-xmlrpc,v 1.2 2004/12/21 12:15:02 espie Exp $
@comment $OpenBSD: PLIST-xmlrpc,v 1.3 2006/10/21 11:44:10 robert Exp $
@conflict php4-xmlrpc-*
@pkgpath www/php5/extensions,-xmlrpc,hardened
lib/php/modules/xmlrpc.so

3
www/php5/extensions/pkg/PLIST-xsl
View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST-xsl,v 1.1 2005/05/12 19:09:15 robert Exp $
@comment $OpenBSD: PLIST-xsl,v 1.2 2006/10/21 11:44:10 robert Exp $
@pkgpath www/php5/extensions,-xsl,hardened
lib/php/modules/xsl.so

18
www/php5/patches/patch-main_php_open_temporary_file_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-main_php_open_temporary_file_c,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $
--- main/php_open_temporary_file.c.orig Mon Jul 26 23:14:59 2004
+++ main/php_open_temporary_file.c Mon Jul 26 23:15:13 2004
@@ -130,7 +130,7 @@
$OpenBSD: patch-main_php_open_temporary_file_c,v 1.2 2006/10/21 11:44:10 robert Exp $
--- main/php_open_temporary_file.c.orig Wed May 24 01:22:26 2006
+++ main/php_open_temporary_file.c Fri Aug 18 21:15:57 2006
@@ -120,7 +120,7 @@
trailing_slash = "/";
}
- (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", path, trailing_slash, pfx);
+ (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXXXXXX", path, trailing_slash, pfx);
#ifdef PHP_WIN32
if (GetTempFileName(path, pfx, 0, opened_path)) {
- if (spprintf(&opened_path, 0, "%s%s%sXXXXXX", path, trailing_slash, pfx) >= MAXPATHLEN) {
+ if (spprintf(&opened_path, 0, "%s%s%sXXXXXXXXXX", path, trailing_slash, pfx) >= MAXPATHLEN) {
efree(opened_path);
return -1;
}