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

upgrade to 4.4.0;

Browse Source 
This release also includes PEAR XML-RPC version 1.3.1 which
fixes a security vulnerability.
For more information, please visit:
http://www.vuxml.org/openbsd/b9d96cbe-f2d2-11d9-82d5-00065bd5b0b6.html
This commit is contained in:
robert 2005-07-12 15:49:27 +00:00
parent 88f0026c01
commit a26d36e9a4
9 changed files with 63 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/php4/Makefile.inc
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.30 2005/04/04 21:11:41 robert Exp $
# $OpenBSD: Makefile.inc,v 1.31 2005/07/12 15:49:27 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= 4.3.11
V= 4.4.0
DISTNAME= php-${V}
CATEGORIES= www lang

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

@ -1,12 +1,12 @@
$OpenBSD: patch-scripts_Makefile_frag,v 1.1 2003/05/23 20:06:22 avsm Exp $
--- scripts/Makefile.frag.orig Fri May 23 19:42:56 2003
+++ scripts/Makefile.frag Fri May 23 19:43:29 2003
$OpenBSD: patch-scripts_Makefile_frag,v 1.2 2005/07/12 15:49:27 robert Exp $
--- scripts/Makefile.frag.orig Wed Jun 8 12:34:41 2005
+++ scripts/Makefile.frag Tue Jul 12 13:41:33 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

18
www/php4/core/patches/patch-scripts_phpize_in
View File

@ -1,15 +1,17 @@
$OpenBSD: patch-scripts_phpize_in,v 1.1 2004/11/24 19:03:15 robert Exp $
--- scripts/phpize.in.orig Wed Nov 24 19:22:33 2004
+++ scripts/phpize.in Wed Nov 24 19:23:02 2004
@@ -1,8 +1,8 @@
#! /bin/sh
$OpenBSD: patch-scripts_phpize_in,v 1.2 2005/07/12 15:49:27 robert Exp $
--- scripts/phpize.in.orig Wed Jun 15 19:13:52 2005
+++ scripts/phpize.in Tue Jul 12 13:43:25 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/php4/core/pkg/PLIST
View File

@ -1,13 +1,14 @@
@comment $OpenBSD: PLIST,v 1.10 2004/11/24 19:03:15 robert Exp $
@comment $OpenBSD: PLIST,v 1.11 2005/07/12 15:49:27 robert Exp $
@conflict php5-core-*
bin/pear
bin/php
bin/php-config
bin/phpextdist
bin/phpize
lib/php/
lib/php/libphp4.so
@man man/man1/php-config.1
@man man/man1/php.1
@man man/man1/phpize.1
sbin/phpxs
share/examples/php4/
share/examples/php4/php.ini-dist

13
www/php4/core/pkg/PLIST-pear
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-pear,v 1.14 2005/04/04 21:11:42 robert Exp $
@comment $OpenBSD: PLIST-pear,v 1.15 2005/07/12 15:49:27 robert Exp $
@conflict php5-pear-*
pear/
pear/build/
@ -82,6 +82,15 @@ pear/include/Zend/zend_types.h
pear/include/Zend/zend_variables.h
pear/include/acconfig.h
pear/include/ext/
pear/include/ext/iconv/
pear/include/ext/iconv/php_have_bsd_iconv.h
pear/include/ext/iconv/php_have_glibc_iconv.h
pear/include/ext/iconv/php_have_iconv.h
pear/include/ext/iconv/php_have_libiconv.h
pear/include/ext/iconv/php_iconv.h
pear/include/ext/iconv/php_iconv_supports_errno.h
pear/include/ext/iconv/php_php_iconv_h_path.h
pear/include/ext/iconv/php_php_iconv_impl.h
pear/include/ext/mbstring/
pear/include/ext/mbstring/libmbfl/
pear/include/ext/mbstring/libmbfl/mbfl/
@ -185,6 +194,8 @@ pear/include/ext/xml/expat/xmlrole.h
pear/include/ext/xml/expat/xmltok.h
pear/include/ext/xml/expat/xmltok_impl.h
pear/include/ext/xml/php_xml.h
pear/include/include/
pear/include/include/php_sab_info.h
pear/include/main/
pear/include/main/SAPI.h
pear/include/main/build-defs.h

8
www/php4/distinfo
View File

@ -1,4 +1,4 @@
MD5 (php-4.3.11.tar.gz) = 5de2ba1aababb5868d55ea43cf3bebef
RMD160 (php-4.3.11.tar.gz) = c52b17e1645b5eeccacde1cb9af6ba88f5139fa8
SHA1 (php-4.3.11.tar.gz) = 0974c78de325404b36ff113729fe7b9244f82210
SIZE (php-4.3.11.tar.gz) = 4875262
MD5 (php-4.4.0.tar.gz) = 4c12d241216e4ca2f2ce2cb7ee5de48b
RMD160 (php-4.4.0.tar.gz) = ea0c21c144ba4ce012f9b4dbe5c4e47de75dd19a
SHA1 (php-4.4.0.tar.gz) = 7407db7a488e0ac16ff8a91413f1ddd942a13e77
SIZE (php-4.4.0.tar.gz) = 4972107

4
www/php4/extensions/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2005/06/20 16:11:11 robert Exp $
# $OpenBSD: Makefile,v 1.44 2005/07/12 15:49:27 robert Exp $
FULLPKGNAME= php4-extensions-${V}
COMMENT= "informational package about PHP4 extensions"
@ -308,7 +308,7 @@ XSLT_WANTLIB= iconv
.for i in ${MULTI_PACKAGES}
.if !defined(FULLPKGNAME${i})
FULLPKGNAME${i}= php4${i}-${V}p0
FULLPKGNAME${i}= php4${i}-${V}
.endif
.endfor

16
www/php4/patches/patch-php_ini-dist
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-php_ini-dist,v 1.15 2005/04/18 18:56:01 robert Exp $
--- php.ini-dist.orig Mon Feb 14 09:26:10 2005
+++ php.ini-dist Mon Apr 18 20:52:00 2005
$OpenBSD: patch-php_ini-dist,v 1.16 2005/07/12 15:49:27 robert Exp $
--- php.ini-dist.orig Thu Apr 28 15:14:45 2005
+++ php.ini-dist Tue Jul 12 13:34:41 2005
@@ -408,10 +408,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
@ -22,7 +22,7 @@ $OpenBSD: patch-php_ini-dist,v 1.15 2005/04/18 18:56:01 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
@@ -491,7 +488,7 @@
@@ -494,7 +491,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.15 2005/04/18 18:56:01 robert Exp $
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
@@ -510,77 +507,6 @@
@@ -513,77 +510,6 @@
; auto_detect_line_endings = Off
@ -60,6 +60,7 @@ $OpenBSD: patch-php_ini-dist,v 1.15 2005/04/18 18:56:01 robert Exp $
-;Windows Extensions
-;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
-;
-;extension=php_mbstring.dll
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_crack.dll
@ -82,7 +83,6 @@ $OpenBSD: patch-php_ini-dist,v 1.15 2005/04/18 18:56:01 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
@ -109,7 +109,7 @@ $OpenBSD: patch-php_ini-dist,v 1.15 2005/04/18 18:56:01 robert Exp $
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
@@ -592,13 +518,6 @@
@@ -595,13 +521,6 @@
define_syslog_variables = Off
[mail function]
@ -123,7 +123,7 @@ $OpenBSD: patch-php_ini-dist,v 1.15 2005/04/18 18:56:01 robert Exp $
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
@@ -1112,3 +1031,56 @@
@@ -1115,3 +1034,56 @@
; Local Variables:
; tab-width: 4
; End:

39
www/php4/patches/patch-php_ini-recommended
View File

@ -1,19 +1,18 @@
$OpenBSD: patch-php_ini-recommended,v 1.12 2004/07/05 00:00:34 robert Exp $
--- php.ini-recommended.orig Mon May 17 18:31:14 2004
+++ php.ini-recommended Mon Jul 5 01:56:46 2004
@@ -423,11 +423,8 @@
$OpenBSD: patch-php_ini-recommended,v 1.13 2005/07/12 15:49:27 robert Exp $
--- php.ini-recommended.orig Thu Apr 28 15:14:46 2005
+++ php.ini-recommended Tue Jul 12 13:38:48 2005
@@ -423,10 +423,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
+include_path = ".:OPENBSD_INCLUDE_PATH"
;
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-
+include_path = ".:OPENBSD_INCLUDE_PATH"
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
; if you are running php as a CGI under any web server (other than IIS)
@@ -440,7 +437,7 @@
user_dir =
@ -23,7 +22,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.12 2004/07/05 00:00:34 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
@@ -506,7 +503,7 @@
@@ -509,7 +506,7 @@
;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@ -32,7 +31,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.12 2004/07/05 00:00:34 robert Exp $
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
@@ -525,77 +522,6 @@
@@ -528,77 +525,6 @@
; auto_detect_line_endings = Off
@ -61,6 +60,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.12 2004/07/05 00:00:34 robert Exp $
-;Windows Extensions
-;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
-;
-;extension=php_mbstring.dll
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_crack.dll
@ -83,7 +83,6 @@ $OpenBSD: patch-php_ini-recommended,v 1.12 2004/07/05 00:00:34 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
@ -110,27 +109,25 @@ $OpenBSD: patch-php_ini-recommended,v 1.12 2004/07/05 00:00:34 robert Exp $
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
@@ -607,13 +533,7 @@
@@ -610,13 +536,6 @@
define_syslog_variables = Off
[mail function]
-; For Win32 only.
-SMTP = localhost
-smtp_port = 25
-
-; For Win32 only.
-;sendmail_from = me@example.com
-
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
@@ -1111,6 +1031,55 @@
;exif.decode_jis_motorola = JIS
;exif.decode_jis_intel = JIS
-; Local Variables:
-; tab-width: 4
-; End:
@@ -1113,3 +1032,56 @@
; Local Variables:
; tab-width: 4
; End:
+
+;;;;;;;;;;;;;;;;;;;;;;
+; Dynamic Extensions ;
+;;;;;;;;;;;;;;;;;;;;;;
@ -140,7 +137,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.12 2004/07/05 00:00:34 robert Exp $
+;
+; extension=modulename.so
+;
+; Note that it should be the name of the module only; no directory information
+; Note that it should be the name of the module only; no directory information
+; needs to go here. Specify the location of the extension with the
+; extension_dir directive above.
+