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

upgrade to php-5.0.5;

Browse Source
This commit is contained in:
robert 2005-09-14 15:44:19 +00:00
parent 5be9930990
commit fff05e246c
10 changed files with 47 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/php5/Makefile.inc
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.4 2005/04/04 21:13:21 robert Exp $
# $OpenBSD: Makefile.inc,v 1.5 2005/09/14 15:44:19 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.0.4
V= 5.0.5
DISTNAME= php-${V}
CATEGORIES= www lang

4
www/php5/core/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.9 2005/08/31 22:13:43 robert Exp $
# $OpenBSD: Makefile,v 1.10 2005/09/14 15:44:19 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}p0
PKGNAME= php5-core-${V}
FULLPKGNAME-pear= php5-pear-${V}
CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \

8
www/php5/core/patches/patch-scripts_Makefile_frag
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-scripts_Makefile_frag,v 1.1.1.1 2004/10/02 12:36:49 robert Exp $
--- scripts/Makefile.frag.orig Mon Jul 26 23:03:47 2004
+++ scripts/Makefile.frag Mon Jul 26 23:04:07 2004
$OpenBSD: patch-scripts_Makefile_frag,v 1.2 2005/09/14 15:44:19 robert Exp $
--- scripts/Makefile.frag.orig Tue Jun 7 23:57:06 2005
+++ scripts/Makefile.frag Wed Sep 14 16:48:56 2005
@@ -3,8 +3,8 @@
# Build environment install
#
-phpincludedir = $(includedir)/php
-phpbuilddir = $(prefix)/lib/php/build
-phpbuilddir = $(libdir)/build
+phpincludedir = $(peardir)/include
+phpbuilddir = $(peardir)/build

15
www/php5/core/patches/patch-scripts_phpize_in
View File

@ -1,16 +1,17 @@
$OpenBSD: patch-scripts_phpize_in,v 1.1 2004/11/24 13:15:09 alek Exp $
--- scripts/phpize.in.orig Thu Nov 18 21:27:27 2004
+++ scripts/phpize.in Thu Nov 18 21:33:09 2004
@@ -1,9 +1,9 @@
$OpenBSD: patch-scripts_phpize_in,v 1.2 2005/09/14 15:44:19 robert Exp $
--- scripts/phpize.in.orig Wed Jun 15 19:19:41 2005
+++ scripts/phpize.in Wed Sep 14 16:50:39 2005
@@ -1,10 +1,10 @@
#!/bin/sh
# Variable declaration
-prefix='@prefix@'
-phpdir="$prefix/lib/php/build"
-includedir="$prefix/include/php"
+prefix=OPENBSD_PEAR_ROOT
exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
-includedir="`eval echo @includedir@`/php"
+phpdir="$prefix/build"
+includedir="$prefix/include"
builddir="`pwd`"
FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool"
FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"

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

@ -1,13 +1,14 @@
@comment $OpenBSD: PLIST,v 1.3 2004/11/24 17:37:49 robert Exp $
@comment $OpenBSD: PLIST,v 1.4 2005/09/14 15:44:19 robert Exp $
@conflict php4-core-*
%%SHARED%%
bin/pear
bin/php
bin/php-config
bin/phpextdist
bin/phpize
lib/php/
@man man/man1/php-config.1
@man man/man1/php.1
@man man/man1/phpize.1
sbin/phpxs
share/examples/php5/
share/examples/php5/php.ini-dist

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-pear,v 1.4 2005/04/04 21:13:22 robert Exp $
@comment $OpenBSD: PLIST-pear,v 1.5 2005/09/14 15:44:19 robert Exp $
@conflict php4-pear-*
pear/
pear/build/
@ -206,7 +206,6 @@ pear/include/include/
pear/include/main/
pear/include/main/SAPI.h
pear/include/main/build-defs.h
pear/include/main/config.nw.h
pear/include/main/config.w32.h
pear/include/main/fopen_wrappers.h
pear/include/main/internal_functions_registry.h

8
www/php5/distinfo
View File

@ -1,4 +1,4 @@
MD5 (php-5.0.4.tar.gz) = 8edf259bcfab4cfc890a4bb4e7c3649f
RMD160 (php-5.0.4.tar.gz) = 444bee84db7d16fb35b0f88cf9ffae8d6f192802
SHA1 (php-5.0.4.tar.gz) = 156409e7e84964565c38494c9193283b442cb34c
SIZE (php-5.0.4.tar.gz) = 5839214
MD5 (php-5.0.5.tar.gz) = ae36a2aa35cfaa58bdc5b9a525e6f451
RMD160 (php-5.0.5.tar.gz) = f94cd33d13a298b5b5d2389a2d2b2079fe231fce
SHA1 (php-5.0.5.tar.gz) = 031ac2b1f56f4f6b20b17206a52627790b51f3bb
SIZE (php-5.0.5.tar.gz) = 6082082

55
www/php5/patches/patch-ext_pcre_pcrelib_pcre_c
View File

@ -1,55 +0,0 @@
$OpenBSD: patch-ext_pcre_pcrelib_pcre_c,v 1.1 2005/08/31 22:13:43 robert Exp $
--- ext/pcre/pcrelib/pcre.c.orig Fri May 27 20:12:42 2005
+++ ext/pcre/pcrelib/pcre.c Mon Aug 29 00:33:37 2005
@@ -1245,14 +1245,30 @@
int min = 0;
int max = -1;
+/* Read the minimum value and do a paranoid check: a negative value indicates
+an integer overflow. */
+
while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
+if (min < 0 || min > 65535)
+ {
+ *errorptr = ERR5;
+ return p;
+ }
+/* Read the maximum value if there is one, and again do a paranoid on its size.
+Also, max must not be less than min. */
+
if (*p == '}') max = min; else
{
if (*(++p) != '}')
{
max = 0;
while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
+ if (max < 0 || max > 65535)
+ {
+ *errorptr = ERR5;
+ return p;
+ }
if (max < min)
{
*errorptr = ERR4;
@@ -1261,16 +1277,11 @@
}
}
-/* Do paranoid checks, then fill in the required variables, and pass back the
-pointer to the terminating '}'. */
+/* Fill in the required variables, and pass back the pointer to the terminating
+'}'. */
-if (min > 65535 || max > 65535)
- *errorptr = ERR5;
-else
- {
- *minp = min;
- *maxp = max;
- }
+*minp = min;
+*maxp = max;
return p;
}

24
www/php5/patches/patch-php_ini-dist
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-php_ini-dist,v 1.2 2004/12/20 20:59:44 robert Exp $
--- php.ini-dist.orig Sun Nov 28 14:22:11 2004
+++ php.ini-dist Sat Dec 18 19:30:46 2004
@@ -430,10 +430,7 @@
$OpenBSD: patch-php_ini-dist,v 1.3 2005/09/14 15:44:19 robert Exp $
--- php.ini-dist.orig Thu May 5 14:33:56 2005
+++ php.ini-dist Wed Sep 14 16:43:30 2005
@@ -437,10 +437,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@ -13,7 +13,7 @@ $OpenBSD: patch-php_ini-dist,v 1.2 2004/12/20 20:59:44 robert Exp $
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
@@ -447,7 +444,7 @@
@@ -454,7 +451,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
@ -22,7 +22,7 @@ $OpenBSD: patch-php_ini-dist,v 1.2 2004/12/20 20:59:44 robert Exp $
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -505,7 +502,7 @@
@@ -515,7 +512,7 @@
;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@ -31,7 +31,7 @@ $OpenBSD: patch-php_ini-dist,v 1.2 2004/12/20 20:59:44 robert Exp $
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
@@ -524,74 +521,6 @@
@@ -534,74 +531,6 @@
; auto_detect_line_endings = Off
@ -61,6 +61,7 @@ $OpenBSD: patch-php_ini-dist,v 1.2 2004/12/20 20:59:44 robert Exp $
-;Note that ODBC support is built in, so no dll is needed for it.
-;
-
-;extension=php_mbstring.dll
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_curl.dll
@ -78,7 +79,6 @@ $OpenBSD: patch-php_ini-dist,v 1.2 2004/12/20 20:59:44 robert Exp $
-;extension=php_interbase.dll
-;extension=php_java.dll
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
@ -106,7 +106,7 @@ $OpenBSD: patch-php_ini-dist,v 1.2 2004/12/20 20:59:44 robert Exp $
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
@@ -603,14 +532,6 @@
@@ -613,13 +542,6 @@
define_syslog_variables = Off
[mail function]
@ -117,18 +117,16 @@ $OpenBSD: patch-php_ini-dist,v 1.2 2004/12/20 20:59:44 robert Exp $
-; For Win32 only.
-;sendmail_from = me@example.com
-
-; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
; Force the addition of the specified parameters to be passed as extra parameters
@@ -1191,6 +1112,54 @@
@@ -1197,6 +1119,53 @@
; instead of original one.
soap.wsdl_cache_ttl=86400
-; Local Variables:
-; tab-width: 4
-; End:
+
+;;;;;;;;;;;;;;;;;;;;;;
+; Dynamic Extensions ;
+;;;;;;;;;;;;;;;;;;;;;;

24
www/php5/patches/patch-php_ini-recommended
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-php_ini-recommended,v 1.2 2004/12/20 20:59:44 robert Exp $
--- php.ini-recommended.orig Sun Nov 28 14:22:11 2004
+++ php.ini-recommended Sat Dec 18 19:30:37 2004
@@ -488,10 +488,7 @@
$OpenBSD: patch-php_ini-recommended,v 1.3 2005/09/14 15:44:19 robert Exp $
--- php.ini-recommended.orig Wed Sep 14 16:40:29 2005
+++ php.ini-recommended Wed Sep 14 16:46:06 2005
@@ -495,10 +495,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@ -13,7 +13,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.2 2004/12/20 20:59:44 robert Exp $
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
@@ -505,7 +502,7 @@
@@ -512,7 +509,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
@ -22,7 +22,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.2 2004/12/20 20:59:44 robert Exp $
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -563,7 +560,7 @@
@@ -573,7 +570,7 @@
;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@ -31,10 +31,11 @@ $OpenBSD: patch-php_ini-recommended,v 1.2 2004/12/20 20:59:44 robert Exp $
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
@@ -582,74 +579,6 @@
@@ -591,75 +588,6 @@
; fgets() and file() will work regardless of the source of the file.
; auto_detect_line_endings = Off
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
@ -61,6 +62,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.2 2004/12/20 20:59:44 robert Exp $
-;Note that ODBC support is built in, so no dll is needed for it.
-;
-
-;extension=php_mbstring.dll
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_curl.dll
@ -78,7 +80,6 @@ $OpenBSD: patch-php_ini-recommended,v 1.2 2004/12/20 20:59:44 robert Exp $
-;extension=php_interbase.dll
-;extension=php_java.dll
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
@ -106,7 +107,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.2 2004/12/20 20:59:44 robert Exp $
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
@@ -661,13 +590,6 @@
@@ -671,13 +599,6 @@
define_syslog_variables = Off
[mail function]
@ -120,14 +121,13 @@ $OpenBSD: patch-php_ini-recommended,v 1.2 2004/12/20 20:59:44 robert Exp $
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
@@ -1249,6 +1171,54 @@
@@ -1255,6 +1176,53 @@
; instead of original one.
soap.wsdl_cache_ttl=86400
-; Local Variables:
-; tab-width: 4
-; End:
+
+;;;;;;;;;;;;;;;;;;;;;;
+; Dynamic Extensions ;
+;;;;;;;;;;;;;;;;;;;;;;