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

update to php-5.2.8 and fix the no_suhosin flavor

Browse Source
This commit is contained in:
robert 2008-12-09 21:52:31 +00:00
parent 9c867a8963
commit 7d054e79d4
6 changed files with 64 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
www/php5/Makefile.inc
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile.inc,v 1.21 2008/10/07 14:01:42 sthen Exp $ # $OpenBSD: Makefile.inc,v 1.22 2008/12/09 21:52:31 robert Exp $
# This port currently only works with archs supporting dynamic loading # This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's. # and has Apache that supports DSO's.
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
V= 5.2.6 V= 5.2.8
SUHOSIN_V= 0.9.20 SUHOSIN_V= 0.9.27
SUHOSIN_P_V= 0.9.6.2 SUHOSIN_P_V= 0.9.6.3
DISTNAME?= php-${V} DISTNAME?= php-${V}
CATEGORIES= www lang CATEGORIES= www lang
@ -18,7 +18,8 @@ MASTER_SITES= http://us2.php.net/distributions/ \
http://se.php.net/distributions/ \ http://se.php.net/distributions/ \
http://no.php.net/distributions/ \ http://no.php.net/distributions/ \
http://uk.php.net/distributions/ http://uk.php.net/distributions/
MASTER_SITES0= http://download.suhosin.org/ MASTER_SITES0= http://blade2k.humppa.hu/ \
http://download.suhosin.org/
# UPGRADERS: please read BOTH the PHP and Zend licenses # UPGRADERS: please read BOTH the PHP and Zend licenses
# and make sure they are safe before an upgrade # and make sure they are safe before an upgrade
@ -72,10 +73,13 @@ PSEUDO_FLAVORS+= no_suhosin
FLAVOR?= FLAVOR?=
.if ${FLAVOR:L:Mno_suhosin} .if ${FLAVOR:L:Mno_suhosin}
SUPDISTFILES= suhosin-${SUHOSIN_V}.tgz:0 \ SUPDISTFILES= suhosin-${SUHOSIN_V}.tgz:0 \
suhosin-patch-${V}-${SUHOSIN_P_V}.patch.gz:0 suhosin-unoffical-patch-${V}-${SUHOSIN_P_V}.patch.gz:0
.else .else
DISTFILES+= suhosin-${SUHOSIN_V}.tgz:0 DISTFILES+= suhosin-${SUHOSIN_V}.tgz:0
PATCHFILES= suhosin-patch-${V}-${SUHOSIN_P_V}.patch.gz:0 PATCHFILES= suhosin-unoffical-patch-${V}-${SUHOSIN_P_V}.patch.gz:0
PATCH_DIST_STRIP= -p1 PATCH_DIST_STRIP= -p1
CONFIGURE_ARGS+= --enable-suhosin CONFIGURE_ARGS+= --enable-suhosin
post-patch:
mv ${WRKDIR}/suhosin-${SUHOSIN_V} ${WRKSRC}/ext/suhosin
.endif .endif

7
www/php5/core/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.38 2008/08/21 15:51:51 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.39 2008/12/09 21:52:31 robert Exp $
COMMENT-main= server-side HTML-embedded scripting language COMMENT-main= server-side HTML-embedded scripting language
COMMENT-fastcgi=stand-alone FastCGI version of PHP COMMENT-fastcgi=stand-alone FastCGI version of PHP
PKGNAME= php5-core-${V} PKGNAME= php5-core-${V}
PKGNAME-main= php5-core-${V}p0 PKGNAME-main= php5-core-${V}
PKGNAME-fastcgi=php5-fastcgi-${V} PKGNAME-fastcgi=php5-fastcgi-${V}
DISTFILES= php-${V}.tar.gz DISTFILES= php-${V}.tar.gz
@ -53,9 +53,6 @@ pre-fake:
INSTALL_TARGET= install-headers install-build install-programs INSTALL_TARGET= install-headers install-build install-programs
DESTDIRNAME= INSTALL_ROOT DESTDIRNAME= INSTALL_ROOT
post-patch:
mv ${WRKDIR}/suhosin-${SUHOSIN_V} ${WRKSRC}/ext/suhosin
pre-configure: pre-configure:
@perl -pi -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g" \ @perl -pi -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g" \
${WRKSRC}/scripts/phpize.in \ ${WRKSRC}/scripts/phpize.in \

4
www/php5/core/pkg/PLIST-fastcgi
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-fastcgi,v 1.1 2007/04/01 21:37:27 robert Exp $ @comment $OpenBSD: PLIST-fastcgi,v 1.2 2008/12/09 21:52:31 robert Exp $
bin/php-fastcgi @bin bin/php-fastcgi

6
www/php5/core/pkg/PLIST-main
View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.7 2008/03/20 23:06:53 sthen Exp $ @comment $OpenBSD: PLIST-main,v 1.8 2008/12/09 21:52:31 robert Exp $
@conflict php4-core-* @conflict php4-core-*
@pkgpath www/php5/core @pkgpath www/php5/core
@pkgpath www/php5/core,hardened @pkgpath www/php5/core,hardened
%%SHARED%% %%SHARED%%
bin/php @bin bin/php
bin/php-config bin/php-config
bin/phpize bin/phpize
lib/php/ lib/php/
@ -123,6 +123,7 @@ share/php5/include/ext/hash/php_hash_whirlpool.h
share/php5/include/ext/iconv/ share/php5/include/ext/iconv/
share/php5/include/ext/iconv/php_have_bsd_iconv.h share/php5/include/ext/iconv/php_have_bsd_iconv.h
share/php5/include/ext/iconv/php_have_glibc_iconv.h share/php5/include/ext/iconv/php_have_glibc_iconv.h
share/php5/include/ext/iconv/php_have_ibm_iconv.h
share/php5/include/ext/iconv/php_have_iconv.h share/php5/include/ext/iconv/php_have_iconv.h
share/php5/include/ext/iconv/php_have_libiconv.h share/php5/include/ext/iconv/php_have_libiconv.h
share/php5/include/ext/iconv/php_iconv.h share/php5/include/ext/iconv/php_iconv.h
@ -138,7 +139,6 @@ share/php5/include/ext/pcre/pcrelib/pcre.h
share/php5/include/ext/pcre/pcrelib/pcre_internal.h share/php5/include/ext/pcre/pcrelib/pcre_internal.h
share/php5/include/ext/pcre/pcrelib/pcreposix.h share/php5/include/ext/pcre/pcrelib/pcreposix.h
share/php5/include/ext/pcre/pcrelib/ucp.h share/php5/include/ext/pcre/pcrelib/ucp.h
share/php5/include/ext/pcre/pcrelib/ucpinternal.h
share/php5/include/ext/pcre/pcrelib/ucptable.h share/php5/include/ext/pcre/pcrelib/ucptable.h
share/php5/include/ext/pcre/php_pcre.h share/php5/include/ext/pcre/php_pcre.h
share/php5/include/ext/pdo/ share/php5/include/ext/pdo/

30
www/php5/distinfo
View File

@ -1,15 +1,15 @@
MD5 (php-5.2.6.tar.gz) = FyD5XybFBjOPDbo6UZBrvQ== MD5 (php-5.2.8.tar.gz) = 50jKzjz+y2b7bempRfmOKg==
MD5 (suhosin-0.9.20.tgz) = lmAz5ZnBHZd/sokkx+8PoQ== MD5 (suhosin-0.9.27.tgz) = mq4CvC0rz5uL2XzSL1aouA==
MD5 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 8uyYY0GjFMJxJZ2+TZQIWA== MD5 (suhosin-unoffical-patch-5.2.8-0.9.6.3.patch.gz) = 1FXD3VtlIEbbrClRpY9k+g==
RMD160 (php-5.2.6.tar.gz) = lKtjgfwIDLA56WsUIhQTSsL6dNg= RMD160 (php-5.2.8.tar.gz) = cYiM0lZA+LNXEBBev0owM7TdHOI=
RMD160 (suhosin-0.9.20.tgz) = Hz9arHOEKj4ouXisiXX28kODfEE= RMD160 (suhosin-0.9.27.tgz) = Rr9H2vDasFNZ2mL96Kdrp8Q7Pbw=
RMD160 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 9eXm2IuRUGpJmI47fzccimK2V6s= RMD160 (suhosin-unoffical-patch-5.2.8-0.9.6.3.patch.gz) = nIoJcudeGtiHuUD1euxNh36TZL0=
SHA1 (php-5.2.6.tar.gz) = VAWMc+taMU6ysxklR38pjYmLUgo= SHA1 (php-5.2.8.tar.gz) = pNzQ4S0nyp9CQFjJW0HCa5AT0Es=
SHA1 (suhosin-0.9.20.tgz) = xVwLIF3nl0h10B5sEWqGw6n0WKk= SHA1 (suhosin-0.9.27.tgz) = MDO9OEDHV4YXnPgkD2PZe19qzL8=
SHA1 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = sZ/Li6peMLRTPGYpUIg8KeGFwfU= SHA1 (suhosin-unoffical-patch-5.2.8-0.9.6.3.patch.gz) = sfEt2FZ3jnNIN4GRFNJ4rao8/gU=
SHA256 (php-5.2.6.tar.gz) = jqbdMBCyYNgM9BYZNj0NNZPd2Xw6PgnyKYFmNfziMUk= SHA256 (php-5.2.8.tar.gz) = d1TUrQdcyi+4Vfm7AXoYAnd1y/HbZ3U8HXCqrqHAPpw=
SHA256 (suhosin-0.9.20.tgz) = DIEgkU2LCfByVJ8kLiN6VUB4Ubf2P622RkGqR42AxwI= SHA256 (suhosin-0.9.27.tgz) = z1TZZY2hM6xS3lkap8KWsbL+KcuP7JR1axFYN13+VUo=
SHA256 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 39roA3eObtaFTqOtKUi7/tv//Foy28daZXuZCSqcxeQ= SHA256 (suhosin-unoffical-patch-5.2.8-0.9.6.3.patch.gz) = heYmL1MBTjk5d9Hv7S06fmhnZ6B/lrFLLD8Sb2lK7kY=
SIZE (php-5.2.6.tar.gz) = 12046184 SIZE (php-5.2.8.tar.gz) = 12427411
SIZE (suhosin-0.9.20.tgz) = 112548 SIZE (suhosin-0.9.27.tgz) = 115936
SIZE (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 22986 SIZE (suhosin-unoffical-patch-5.2.8-0.9.6.3.patch.gz) = 23125

68
www/php5/patches/patch-configure_in
View File

@ -1,46 +1,39 @@
$OpenBSD: patch-configure_in,v 1.11 2008/04/05 05:45:19 sturm Exp $ --- configure.in.orig Tue Dec 9 22:04:42 2008
--- configure.in.orig Wed Sep 5 10:38:41 2007 +++ configure.in Tue Dec 9 22:07:03 2008
+++ configure.in Wed Sep 5 10:39:20 2007 @@ -354,8 +354,8 @@
+@@ -325,13 +325,13 @@ AC_CHECK_LIB(m, sin)
+ dnl Check for resolver routines.
+ dnl Check for resolver routines. dnl Need to check for both res_search and __res_search
+ dnl Need to check for both res_search and __res_search -dnl in -lc, -lbind, -lresolv and -lsocket
+-dnl in -lc, -lbind, -lresolv and -lsocket -PHP_CHECK_FUNC(res_search, resolv, bind, socket)
+-PHP_CHECK_FUNC(res_search, resolv, bind, socket) +dnl in -lc, -lresolv and -lsocket
++dnl in -lc, -lresolv and -lsocket +PHP_CHECK_FUNC(res_search, resolv, socket)
++PHP_CHECK_FUNC(res_search, resolv, socket)
+ dnl Check for inet_aton and dn_skipname
+ dnl Check for inet_aton and dn_skipname dnl in -lc, -lbind and -lresolv
+-dnl in -lc, -lbind and -lresolv @@ -931,7 +931,7 @@
+-PHP_CHECK_FUNC(inet_aton, resolv, bind)
+-PHP_CHECK_FUNC(dn_skipname, resolv, bind)
++dnl in -lc and -lresolv
++PHP_CHECK_FUNC(inet_aton, resolv)
++PHP_CHECK_FUNC(dn_skipname, resolv)
+
+
+ dnl Then headers.
@@ -893,7 +893,7 @@ enable_static=yes
case $php_build_target in case $php_build_target in
program|static) program|static)
- standard_libtool_flag='-prefer-non-pic -static' - standard_libtool_flag='-prefer-non-pic -static'
+ standard_libtool_flag='' + standard_libtool_flag=''
if test -z "$PHP_MODULES"; then if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
enable_shared=no enable_shared=no
fi fi
@@ -901,8 +901,8 @@ program|static) @@ -940,10 +940,10 @@
shared)
enable_static=no enable_static=no
case $with_pic in case $with_pic in
- yes) standard_libtool_flag='-prefer-pic';; yes)
- no) standard_libtool_flag='-prefer-non-pic';; - standard_libtool_flag='-prefer-pic'
+ yes) standard_libtool_flag='';; + standard_libtool_flag=''
+ no) standard_libtool_flag='';; ;;
no)
- standard_libtool_flag='-prefer-non-pic'
+ standard_libtool_flag=''
;;
esac esac
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
;; @@ -1136,7 +1136,7 @@
@@ -1095,7 +1095,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
EXPANDED_DATADIR=$datadir EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@ -49,16 +42,17 @@ $OpenBSD: patch-configure_in,v 1.11 2008/04/05 05:45:19 sturm Exp $
exec_prefix=$old_exec_prefix exec_prefix=$old_exec_prefix
libdir=$old_libdir libdir=$old_libdir
@@ -1278,7 +1278,7 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" @@ -1344,7 +1344,8 @@
INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
CXXFLAGS="$CXXFLAGS $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET)" -all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET)"
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET)" +all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET)"
+
install_targets="$install_modules install-build install-headers install-programs $install_pear" install_targets="$install_modules install-build install-headers install-programs $install_pear"
case $PHP_SAPI in case $PHP_SAPI in
@@ -1322,7 +1322,7 @@ esac @@ -1388,7 +1389,7 @@
PHP_ADD_SOURCES(Zend, \ PHP_ADD_SOURCES(Zend, \
zend_language_parser.c zend_language_scanner.c \ zend_language_parser.c zend_language_scanner.c \
zend_ini_parser.c zend_ini_scanner.c \ zend_ini_parser.c zend_ini_scanner.c \
@ -67,7 +61,7 @@ $OpenBSD: patch-configure_in,v 1.11 2008/04/05 05:45:19 sturm Exp $
zend_execute_API.c zend_highlight.c zend_llist.c \ zend_execute_API.c zend_highlight.c zend_llist.c \
zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \ zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \ zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
@@ -1344,6 +1344,7 @@ else @@ -1409,6 +1410,7 @@
fi fi
PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag) PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag)