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

Fix a nasty bug in the new php-4.4.1 release. Some php applications

Browse Source 
are badly broken without this patch. (e.g. squirrelmail and phpadsnew)

Fix from php cvs. (BugID #35067)

http://bugs.php.net/bug.php?id=35067
http://marc.theaimsgroup.com/?l=php-cvs&m=113095430113617&w=2

ok robert@
This commit is contained in:
bernd 2005-11-07 21:33:58 +00:00
parent 1b612625c9
commit a99421ea2d
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/php4/core/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.30 2005/11/01 11:09:31 mbalmer Exp $
# $OpenBSD: Makefile,v 1.31 2005/11/07 21:33:58 bernd Exp $
MULTI_PACKAGES= -pear
SUBPACKAGE?=
COMMENT= "server-side HTML-embedded scripting language"
COMMENT-pear= "base classes for common PHP tasks"
PKGNAME= php4-core-${V}
FULLPKGNAME-pear= php4-pear-${V}
PKGNAME= php4-core-${V}p0
FULLPKGNAME-pear= php4-pear-${V}p0
CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
--without-mysql \

12
www/php4/extensions/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.47 2005/11/01 11:09:31 mbalmer Exp $
# $OpenBSD: Makefile,v 1.48 2005/11/07 21:33:58 bernd Exp $
FULLPKGNAME= php4-extensions-${V}
FULLPKGNAME= php4-extensions-${V}p0
COMMENT= "informational package about PHP4 extensions"
MULTI_PACKAGES=
@ -48,7 +48,7 @@ CONFIGURE_ARGS+= --without-curl
.else
MULTI_PACKAGES+= -curl
COMMENT-curl= "curl URL library extensions for php4"
FULLPKGNAME-curl= php4-curl-${V}
FULLPKGNAME-curl= php4-curl-${V}p0
CONFIGURE_ARGS+= --with-curl=shared,${LOCALBASE}
CURL_DEPENDS= curl.2::net/curl
CURL_WANTLIB= crypto ssl z
@ -127,10 +127,10 @@ CONFIGURE_ARGS+= --with-xpm-dir=${X11BASE}
. if !defined(PACKAGING) || ${SUBPACKAGE} == "-gd"
WANTLIB+= X11 Xpm
. endif
FULLPKGNAME-gd= php4-gd-${V}p3
FULLPKGNAME-gd= php4-gd-${V}p4
.else
CONFIGURE_ARGS+= --without-xpm-dir
FULLPKGNAME-gd= php4-gd-${V}p3-no_x11
FULLPKGNAME-gd= php4-gd-${V}p4-no_x11
.endif
.endif
@ -309,7 +309,7 @@ XSLT_WANTLIB= iconv
.for i in ${MULTI_PACKAGES}
.if !defined(FULLPKGNAME${i})
FULLPKGNAME${i}= php4${i}-${V}
FULLPKGNAME${i}= php4${i}-${V}p0
.endif
.endfor

14
www/php4/patches/patch-ext_standard_basic_functions_c Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-ext_standard_basic_functions_c,v 1.1 2005/11/07 21:33:58 bernd Exp $
--- ext/standard/basic_functions.c.orig Mon Nov 7 17:07:59 2005
+++ ext/standard/basic_functions.c Mon Nov 7 17:08:25 2005
@@ -802,8 +802,8 @@ function_entry basic_functions[] = {
PHP_FE(prev, first_arg_force_ref)
PHP_FE(next, first_arg_force_ref)
PHP_FE(reset, first_arg_force_ref)
- PHP_FE(current, NULL)
- PHP_FE(key, NULL)
+ PHP_FE(current, first_arg_force_ref)
+ PHP_FE(key, first_arg_force_ref)
PHP_FE(min, NULL)
PHP_FE(max, NULL)
PHP_FE(in_array, NULL)