SECURITY:

update to 5.0.3;

add libstdc++ to WANTLIB;
use {.CURDIR} for PATCH_LIST and CHECKSUM_FILE from jolan@
This commit is contained in:
robert 2004-12-20 20:59:44 +00:00
parent e63f85d2eb
commit ccc9a723f2
6 changed files with 50 additions and 37 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.1.1.1 2004/10/02 11:32:35 robert Exp $
# $OpenBSD: Makefile.inc,v 1.2 2004/12/20 20:59:44 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.2
V= 5.0.3
DISTNAME= php-${V}
CATEGORIES= www lang
@ -63,6 +63,6 @@ CONFIGURE_ARGS+= --with-openssl \
REGRESS_TARGET= test
REGRESS_FLAGS= NO_INTERACTION=1
CHECKSUM_FILE?= ${PORTSDIR}/www/php5/distinfo
PATCH_LIST= ${PORTSDIR}/www/php5/patches/patch-* \
CHECKSUM_FILE= ${.CURDIR}/../distinfo
PATCH_LIST= ${.CURDIR}/../patches/patch-* \
patch-*

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2004/12/11 13:29:22 alek Exp $
# $OpenBSD: Makefile,v 1.6 2004/12/20 20:59:44 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
PKGNAME= php5-core-${V}
FULLPKGNAME-pear= php5-pear-${V}
CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
@ -42,7 +42,7 @@ PHP_VERSION= ${V}
PHPXS_SUBST+= -e 's,${i},${${i}},'
.endfor
WANTLIB= c crypto des m ssl z
WANTLIB= c crypto des m ssl stdc++ z
.if defined(PACKAGING) && !empty(SUBPACKAGE)
PREFIX= ${CHROOT_DIR}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-pear,v 1.1.1.1 2004/10/02 12:36:50 robert Exp $
@comment $OpenBSD: PLIST-pear,v 1.2 2004/12/20 20:59:44 robert Exp $
pear/
pear/build/
pear/build/Makefile.global
@ -75,11 +75,21 @@ pear/include/Zend/zend_reflection_api.h
pear/include/Zend/zend_stack.h
pear/include/Zend/zend_static_allocator.h
pear/include/Zend/zend_stream.h
pear/include/Zend/zend_strtod.h
pear/include/Zend/zend_ts_hash.h
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/libxml/
pear/include/ext/libxml/php_libxml.h
pear/include/ext/mbstring/
@ -163,6 +173,7 @@ pear/include/ext/xml/
pear/include/ext/xml/expat/
pear/include/ext/xml/expat_compat.h
pear/include/ext/xml/php_xml.h
pear/include/include/
pear/include/main/
pear/include/main/SAPI.h
pear/include/main/build-defs.h
@ -245,6 +256,7 @@ pear/lib/PEAR/Config.php
pear/lib/PEAR/Dependency.php
pear/lib/PEAR/Downloader.php
pear/lib/PEAR/ErrorStack.php
pear/lib/PEAR/Exception.php
pear/lib/PEAR/Frontend/
pear/lib/PEAR/Frontend/CLI.php
pear/lib/PEAR/Installer.php

View File

@ -1,3 +1,3 @@
MD5 (php-5.0.2.tar.gz) = 5467327e0cab6de76a90266933322b59
RMD160 (php-5.0.2.tar.gz) = 71bd044e3de3946099da35dc680eae88ea709920
SHA1 (php-5.0.2.tar.gz) = 63ac32e110958f2cb5b70cd8bd6760a31b7106dd
MD5 (php-5.0.3.tar.gz) = bf89557056ce34d502e20e24071616c7
RMD160 (php-5.0.3.tar.gz) = f002dc137af6cfd8c8f3a4bb6d4948fef6662694
SHA1 (php-5.0.3.tar.gz) = bf1b5db0d3144caad3a74d8eefc3d15f9cb08bfd

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-php_ini-dist,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
--- php.ini-dist.orig Tue Aug 10 02:44:23 2004
+++ php.ini-dist Wed Aug 25 16:38:35 2004
$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 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
@ -31,11 +31,10 @@ $OpenBSD: patch-php_ini-dist,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
@@ -523,76 +520,6 @@
; fgets() and file() will work regardless of the source of the file.
@@ -524,74 +521,6 @@
; auto_detect_line_endings = Off
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
@ -73,7 +72,6 @@ $OpenBSD: patch-php_ini-dist,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
-;extension=php_filepro.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_iconv.dll
-;extension=php_ifx.dll
-;extension=php_iisfunc.dll
-;extension=php_imap.dll
@ -108,7 +106,7 @@ $OpenBSD: patch-php_ini-dist,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
@@ -604,13 +531,6 @@
@@ -603,14 +532,6 @@
define_syslog_variables = Off
[mail function]
@ -119,13 +117,17 @@ $OpenBSD: patch-php_ini-dist,v 1.1.1.1 2004/10/02 11:32:38 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 =
@@ -1195,3 +1115,54 @@
; Local Variables:
; tab-width: 4
; End:
; Force the addition of the specified parameters to be passed as extra parameters
@@ -1191,6 +1112,54 @@
; instead of original one.
soap.wsdl_cache_ttl=86400
-; Local Variables:
-; tab-width: 4
-; End:
+
+;;;;;;;;;;;;;;;;;;;;;;
+; Dynamic Extensions ;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-php_ini-recommended,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
--- php.ini-recommended.orig Wed Jun 23 10:18:42 2004
+++ php.ini-recommended Tue Jul 27 01:24:10 2004
@@ -437,10 +437,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 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@ -13,7 +13,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.1.1.1 2004/10/02 11:32:38 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
@@ -454,7 +451,7 @@
@@ -505,7 +502,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
@ -22,7 +22,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.1.1.1 2004/10/02 11:32:38 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
@@ -512,7 +509,7 @@
@@ -563,7 +560,7 @@
;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@ -31,11 +31,10 @@ $OpenBSD: patch-php_ini-recommended,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
@@ -530,76 +527,6 @@
; fgets() and file() will work regardless of the source of the file.
@@ -582,74 +579,6 @@
; auto_detect_line_endings = Off
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
@ -73,7 +72,6 @@ $OpenBSD: patch-php_ini-recommended,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
-;extension=php_filepro.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_iconv.dll
-;extension=php_ifx.dll
-;extension=php_iisfunc.dll
-;extension=php_imap.dll
@ -108,7 +106,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
@@ -611,13 +538,6 @@
@@ -661,13 +590,6 @@
define_syslog_variables = Off
[mail function]
@ -122,13 +120,14 @@ $OpenBSD: patch-php_ini-recommended,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
@@ -1191,6 +1111,53 @@
@@ -1249,6 +1171,54 @@
; instead of original one.
soap.wsdl_cache_ttl=86400
-; Local Variables:
-; tab-width: 4
-; End:
+
+;;;;;;;;;;;;;;;;;;;;;;
+; Dynamic Extensions ;
+;;;;;;;;;;;;;;;;;;;;;;
@ -138,7 +137,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.1.1.1 2004/10/02 11:32:38 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.
+