pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q3]: pkgsrc/www/php4 Pullup ticket 890 - requested by Taka...
details: https://anonhg.NetBSD.org/pkgsrc/rev/384a154ec08e
branches: pkgsrc-2005Q3
changeset: 499656:384a154ec08e
user: salo <salo%pkgsrc.org@localhost>
date: Fri Nov 04 08:07:02 2005 +0000
description:
Pullup ticket 890 - requested by Takahiro Kambe
security update for php4
Revisions pulled up:
- pkgsrc/www/php4/Makefile 1.55, 1.56
- pkgsrc/www/php4/Makefile.common 1.50
- pkgsrc/www/php4/PLIST 1.14
- pkgsrc/www/php4/distinfo 1.47, 1.48
- pkgsrc/www/php4/patches/patch-ab removed
Module Name: pkgsrc
Committed By: jdolecek
Date: Tue Nov 1 23:12:15 UTC 2005
Modified Files:
pkgsrc/www/php4: Makefile Makefile.common Makefile.php distinfo
Removed Files:
pkgsrc/www/php4/patches: patch-ab
Log Message:
Update php to 4.4.1. Besides incorporating XML_RPC-1.4.0 and fopen wrappers
security fix, this fixes serious security problems regarding overwriting
of the GLOBALS array.
All users of PHP 4.3 and 4.4 sare encouradged to update to this version.
The --with-regex=system bug with re_magic has been fixed too, so re-enabling
use of --with-regex=system for all operating systems again
---
Module Name: pkgsrc
Committed By: tron
Date: Wed Nov 2 09:47:23 UTC 2005
Modified Files:
pkgsrc/www/php4: distinfo
Log Message:
Remove "XML_RPC-1.4.0.tgz". It is part of PHP 4.4.1 and therefore no
longer downloaded manually.
---
Module Name: pkgsrc
Committed By: tron
Date: Wed Nov 2 10:48:01 UTC 2005
Modified Files:
pkgsrc/www/php4: Makefile PLIST
Log Message:
Remove obsolete file "include/php/main/config.nw.h" from package list,
bump revision.
diffstat:
www/php4/Makefile | 12 +-----------
www/php4/Makefile.common | 4 ++--
www/php4/PLIST | 3 +--
www/php4/distinfo | 12 ++++--------
www/php4/patches/patch-ab | 15 ---------------
5 files changed, 8 insertions(+), 38 deletions(-)
diffs (108 lines):
diff -r 18f7c131ef42 -r 384a154ec08e www/php4/Makefile
--- a/www/php4/Makefile Thu Nov 03 22:22:07 2005 +0000
+++ b/www/php4/Makefile Fri Nov 04 08:07:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52.2.1 2005/10/05 20:39:15 salo Exp $
+# $NetBSD: Makefile,v 1.52.2.2 2005/11/04 08:07:02 salo Exp $
PKGNAME= php-${PHP_BASE_VERS}
PKGREVISION= 1
@@ -21,11 +21,6 @@
CGIDIR= ${PREFIX}/libexec/cgi-bin
EGDIR= ${PREFIX}/share/examples/php
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-XMLRPC_DISTFILE= XML_RPC-1.4.0.tgz
-SITES_${XMLRPC_DISTFILE}= http://pear.php.net/get/
-DISTFILES= ${EXTRACT_ONLY} ${XMLRPC_DISTFILE}
-
# On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that
# certain symbols from the C++ implementation (__get_eh_context, etc.)
# referenced by DSOs written in C++ will resolve correctly. We need to
@@ -46,11 +41,6 @@
USE_TOOLS+= gzcat
-post-extract:
- ${RM} -f ${WRKSRC}/pear/packages/XML_RPC-1.3.1.tar
- ${GZCAT} ${DISTDIR}/${XMLRPC_DISTFILE} \
- >${WRKSRC}/pear/packages/${XMLRPC_DISTFILE:S/.tgz/.tar/}
-
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php
${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php.1
diff -r 18f7c131ef42 -r 384a154ec08e www/php4/Makefile.common
--- a/www/php4/Makefile.common Thu Nov 03 22:22:07 2005 +0000
+++ b/www/php4/Makefile.common Fri Nov 04 08:07:02 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2005/08/17 19:58:34 tron Exp $
+# $NetBSD: Makefile.common,v 1.49.2.1 2005/11/04 08:07:02 salo Exp $
DISTNAME?= php-${PHP_DIST_VERS}
CATEGORIES+= www php4
@@ -18,7 +18,7 @@
# PHP_DIST_VERS version number on the php distfile
# PHP_BASE_VERS pkgsrc-mangled version number (convert pl -> .)
#
-PHP_DIST_VERS= 4.4.0
+PHP_DIST_VERS= 4.4.1
PHP_BASE_VERS= ${PHP_DIST_VERS}
DISTFILES?= ${PHP_DISTFILE}
diff -r 18f7c131ef42 -r 384a154ec08e www/php4/PLIST
--- a/www/php4/PLIST Thu Nov 03 22:22:07 2005 +0000
+++ b/www/php4/PLIST Fri Nov 04 08:07:02 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/08/17 19:58:34 tron Exp $
+@comment $NetBSD: PLIST,v 1.13.2.1 2005/11/04 08:07:02 salo Exp $
bin/pear
bin/php
bin/php-config
@@ -183,7 +183,6 @@
include/php/main/internal_functions_registry.h
include/php/main/fopen_wrappers.h
include/php/main/config.w32.h
-include/php/main/config.nw.h
include/php/main/build-defs.h
include/php/main/win95nt.h
include/php/main/php_embed.h
diff -r 18f7c131ef42 -r 384a154ec08e www/php4/distinfo
--- a/www/php4/distinfo Thu Nov 03 22:22:07 2005 +0000
+++ b/www/php4/distinfo Fri Nov 04 08:07:02 2005 +0000
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.43.2.1 2005/10/05 20:39:15 salo Exp $
+$NetBSD: distinfo,v 1.43.2.2 2005/11/04 08:07:02 salo Exp $
-SHA1 (php-4.4.0.tar.bz2) = 5e0afe6e5f8c751f880a50ad4fa1716f0242ef37
-RMD160 (php-4.4.0.tar.bz2) = 4792e78b6f2f3e3347a1ac945b48efaccedf4542
-Size (php-4.4.0.tar.bz2) = 4086074 bytes
-SHA1 (XML_RPC-1.4.0.tgz) = 461f0b70675a37f524043d19078e9c0502dd13ac
-RMD160 (XML_RPC-1.4.0.tgz) = 8647565c7fa973ac800683d91c32d781fce9437c
-Size (XML_RPC-1.4.0.tgz) = 26776 bytes
+SHA1 (php-4.4.1.tar.bz2) = 61fe43719c707e1163eaaab33b65907733e34a1f
+RMD160 (php-4.4.1.tar.bz2) = fb7f5b90d05a2efa8f0122740e2c27a29f28574e
+Size (php-4.4.1.tar.bz2) = 4157749 bytes
SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
-SHA1 (patch-ab) = deaceb8d997af26fe051eb94d5b9a3f4307ffaea
SHA1 (patch-ad) = 9ca5d2f59bfeea77a98cd0e727546d11669114cd
SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
diff -r 18f7c131ef42 -r 384a154ec08e www/php4/patches/patch-ab
--- a/www/php4/patches/patch-ab Thu Nov 03 22:22:07 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.17.4.1 2005/10/05 20:39:15 salo Exp $
-
---- main/fopen_wrappers.c.orig 2005-02-02 23:44:07.000000000 +0000
-+++ main/fopen_wrappers.c 2005-10-05 16:52:55.000000000 +0100
-@@ -120,8 +120,8 @@
- /* Handler for basedirs that end with a / */
- resolved_basedir_len = strlen(resolved_basedir);
- if (basedir[strlen(basedir) - 1] == PHP_DIR_SEPARATOR) {
-- if (resolved_basedir[resolved_basedir_len - 1] == '/') {
-- resolved_basedir[resolved_basedir_len - 1] = PHP_DIR_SEPARATOR;
-+ if (resolved_basedir[resolved_basedir_len - 1] != PHP_DIR_SEPARATOR) {
-+ resolved_basedir[resolved_basedir_len] = PHP_DIR_SEPARATOR;
- resolved_basedir[++resolved_basedir_len] = '\0';
- }
- }
Home |
Main Index |
Thread Index |
Old Index