pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q1]: pkgsrc Pullup ticket 457 - requested by Takahiro Kambe
details: https://anonhg.NetBSD.org/pkgsrc/rev/7661d877f33b
branches: pkgsrc-2005Q1
changeset: 490986:7661d877f33b
user: salo <salo%pkgsrc.org@localhost>
date: Fri Apr 22 14:17:32 2005 +0000
description:
Pullup ticket 457 - requested by Takahiro Kambe
security update for php4
Revisions pulled up:
- pkgsrc/graphics/php-gd/Makefile 1.7
- pkgsrc/mail/php-imap/Makefile 1.5-1.7
- pkgsrc/net/pear-Net_SMTP/Makefile 1.3
- pkgsrc/net/pear-Net_SMTP/buildlink3.mk removed
- pkgsrc/net/pear-Net_SMTP/builtin.mk removed
- pkgsrc/net/pear-Net_SMTP/distinfo 1.2
- pkgsrc/net/pear-Net_Socket/Makefile 1.4
- pkgsrc/net/pear-Net_Socket/buildlink3.mk removed
- pkgsrc/net/pear-Net_Socket/builtin.mk removed
- pkgsrc/www/php-curl/Makefile 1.5
- pkgsrc/www/php4/Makefile 1.42
- pkgsrc/www/php4/Makefile.common 1.47
- pkgsrc/www/php4/PLIST 1.12
- pkgsrc/www/php4/buildlink3.mk 1.6
- pkgsrc/www/php4/distinfo 1.39-1.40
- pkgsrc/www/php4/patches/patch-ab removed
- pkgsrc/www/php4/patches/patch-aj 1.9
- pkgsrc/www/php4/patches/patch-ak 1.4
- pkgsrc/www/php4/patches/patch-am removed
- pkgsrc/www/pear-HTML_Common/Makefile 1.9
- pkgsrc/www/pear-HTTP_Request/Makefile 1.4
Module Name: pkgsrc
Committed By: jdolecek
Date: Mon Apr 11 20:02:57 UTC 2005
Modified Files:
pkgsrc/doc: CHANGES
pkgsrc/graphics/php-gd: Makefile
pkgsrc/www/php-curl: Makefile
pkgsrc/www/php4: Makefile Makefile.common PLIST buildlink3.mk distinfo
pkgsrc/www/php4/patches: patch-aj
Removed Files:
pkgsrc/www/php4/patches: patch-am
Log Message:
Update php4 to 4.3.11.
This is a maintenance release that in addition to over 70 non-critical
bug fixes addresses several security issues inside the exif and
fbsql extensions as well as the unserialize(), swf_definepoly()
and getimagesize() functions. All Users of PHP are strongly
encouraged to upgrade to this release.
Bugfix release
* Crash in bzopen() if supplied path to non-existent file.
* DOM crashing when attribute appended to Document.
* unserialize() float problem on non-English locales.
* Crash in msg_send() when non-string is stored without being
serialized.
* Possible infinite loop in imap_mail_compose().
* Fixed crash in chunk_split(), when chunklen > strlen.
* session_set_save_handler crashes PHP when supplied non-existent
object ref.
* Memory leak in zend_language_scanner.c.
* Compile failures of zend_strtod.c.
* Fixed crash in overloaded objects & overload() function.
* cURL functions bypass open_basedir.
PHP4 also doesn't bundle PEAR Net_Socket and Net_SMTP anymore now.
---
Module Name: pkgsrc
Committed By: jdolecek
Date: Mon Apr 11 20:03:58 UTC 2005
Removed Files:
pkgsrc/www/php4/patches: patch-ab
Log Message:
doesn't appear to be needed anymore
---
Module Name: pkgsrc
Committed By: jdolecek
Date: Mon Apr 11 20:06:36 UTC 2005
Modified Files:
pkgsrc/net/pear-Net_SMTP: distinfo
Log Message:
regen with RMD160 hash
---
Module Name: pkgsrc
Committed By: jdolecek
Date: Mon Apr 11 20:08:43 UTC 2005
Modified Files:
pkgsrc/net/pear-Net_SMTP: Makefile
pkgsrc/net/pear-Net_Socket: Makefile
pkgsrc/www/pear-HTML_Common: Makefile
pkgsrc/www/pear-HTTP_Request: Makefile
Removed Files:
pkgsrc/net/pear-Net_SMTP: buildlink3.mk builtin.mk
pkgsrc/net/pear-Net_Socket: buildlink3.mk builtin.mk
Log Message:
Net_Socket and Net_SMTP were unbundled from PHP4 in 4.3.11, g/c
the related conditionals and buildlink logic, and convert to
standard DEPENDS
---
Module Name: pkgsrc
Committed By: kim
Date: Fri Apr 15 22:38:16 UTC 2005
Modified Files:
pkgsrc/mail/php-imap: Makefile
Log Message:
I'm not sure why I need to set PHP_OPENSSL for OpenSSL to be found,
but now the package builds again.
---
Module Name: pkgsrc
Committed By: jdolecek
Date: Sat Apr 16 07:37:31 UTC 2005
Modified Files:
pkgsrc/mail/php-imap: Makefile
Log Message:
g/c LIBS setting
---
Module Name: pkgsrc
Committed By: kim
Date: Wed Apr 20 12:03:25 UTC 2005
Modified Files:
pkgsrc/mail/php-imap: Makefile
Log Message:
Explain setting PHP_OPENSSL (from Stoned Elipot)
---
Module Name: pkgsrc
Committed By: salo
Date: Thu Apr 21 23:47:47 UTC 2005
Modified Files:
pkgsrc/www/php4: distinfo
pkgsrc/www/php4/patches: patch-ak
Log Message:
Apply cleanly after update to 4.3.11
diffstat:
graphics/php-gd/Makefile | 4 +-
mail/php-imap/Makefile | 10 +-
net/pear-Net_SMTP/Makefile | 11 +-
net/pear-Net_SMTP/buildlink3.mk | 25 ----
net/pear-Net_SMTP/builtin.mk | 13 --
net/pear-Net_SMTP/distinfo | 3 +-
net/pear-Net_Socket/Makefile | 9 +-
net/pear-Net_Socket/buildlink3.mk | 25 ----
net/pear-Net_Socket/builtin.mk | 18 ---
www/pear-HTML_Common/Makefile | 7 +-
www/pear-HTTP_Request/Makefile | 7 +-
www/php-curl/Makefile | 4 +-
www/php4/Makefile | 4 +-
www/php4/Makefile.common | 4 +-
www/php4/PLIST | 211 +++++++++++++------------------------
www/php4/buildlink3.mk | 7 +-
www/php4/distinfo | 14 +-
www/php4/patches/patch-ab | 41 -------
www/php4/patches/patch-aj | 20 +-
www/php4/patches/patch-ak | 10 +-
www/php4/patches/patch-am | 16 --
21 files changed, 127 insertions(+), 336 deletions(-)
diffs (truncated from 717 to 300 lines):
diff -r 850a6e49c97c -r 7661d877f33b graphics/php-gd/Makefile
--- a/graphics/php-gd/Makefile Fri Apr 22 07:22:51 2005 +0000
+++ b/graphics/php-gd/Makefile Fri Apr 22 14:17:32 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/11/23 19:46:14 jdolecek Exp $
+# $NetBSD: Makefile,v 1.6.4.1 2005/04/22 14:17:32 salo Exp $
MODNAME= gd
-PKGREVISION= 1
+PKGREVISION= # empty
CATEGORIES+= graphics
COMMENT= PHP extension for GD graphics library
diff -r 850a6e49c97c -r 7661d877f33b mail/php-imap/Makefile
--- a/mail/php-imap/Makefile Fri Apr 22 07:22:51 2005 +0000
+++ b/mail/php-imap/Makefile Fri Apr 22 14:17:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/11/05 17:11:40 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2005/04/22 14:17:33 salo Exp $
MODNAME= imap
PKGREVISION= # empty
@@ -11,9 +11,15 @@
CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.imap-uw}
CONFIGURE_ARGS+= --with-${MODNAME}-ssl=${SSLBASE}
CONFIGURE_ARGS+= --with-${MODNAME}-linkage
+
CONFIGURE_ENV+= ac_cv_lib_pam_pam_start=no
-LIBS+= -lssl -lcrypto
+# Imap extension's config.m4 calls m4 macro PHP_SETUP_OPENSSL() which
+# expects PHP_ARG_WITH(openssl, ...) being called beforehand so that
+# PHP_OPENSSL is set. For a self contained extension build like for
+# this package this is not the case of course.
+
+CONFIGURE_ENV+= PHP_OPENSSL=${SSLBASE}
.include "../../mail/imap-uw/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff -r 850a6e49c97c -r 7661d877f33b net/pear-Net_SMTP/Makefile
--- a/net/pear-Net_SMTP/Makefile Fri Apr 22 07:22:51 2005 +0000
+++ b/net/pear-Net_SMTP/Makefile Fri Apr 22 14:17:32 2005 +0000
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2004/11/28 10:21:48 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2.4.1 2005/04/22 14:17:32 salo Exp $
DISTNAME= Net_SMTP-1.2.6
+PKGREVISION= 1
CATEGORIES+= net mail
MAINTAINER= jdolecek%NetBSD.org@localhost
COMMENT= PHP classes to provide SMTP Interface
-.include "../../lang/php/pear.mk"
+DEPENDS+= pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket
-# used to be bundled before PHP 5.x
-.if ${_PHP_VERSION} < 5
-PKG_SKIP_REASON= "${PKGBASE} is part of PHP${_PHP_VERSION}"
-.endif
-
+.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 850a6e49c97c -r 7661d877f33b net/pear-Net_SMTP/buildlink3.mk
--- a/net/pear-Net_SMTP/buildlink3.mk Fri Apr 22 07:22:51 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/11/27 13:01:16 jdolecek Exp $
-#
-# Net_SMTP was bundled with PHP 4.x, but has been pushed to pear
-# in PHP 5.x. If we build for PHP4, use the bundled version, otherwise
-# force dependance and install of this package.
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-NETSOCKET_BUILDLINK3_MK:= ${NETSOCKET_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= pear-netsmtp
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npear-netsmtp}
-BUILDLINK_PACKAGES+= pear-netsmtp
-
-.if !empty(NETSOCKET_BUILDLINK3_MK:M+)
-
-BUILDLINK_DEPENDS.pear-netsmtp+= pear-Net_SMTP>=1.2.6
-BUILDLINK_PKGSRCDIR.pear-netsmtp?= ../../net/pear-Net_SMTP
-BUILDLINK_DEPMETHOD.pear-netsmtp?= full
-
-.endif # NETSOCKET_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 850a6e49c97c -r 7661d877f33b net/pear-Net_SMTP/builtin.mk
--- a/net/pear-Net_SMTP/builtin.mk Fri Apr 22 07:22:51 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2004/11/27 13:01:16 jdolecek Exp $
-
-.include "../../lang/php/phpversion.mk"
-
-.if ${_PHP_VERSION} < 5
-IS_BUILTIN.pear-netsmtp= yes
-.else
-IS_BUILTIN.pear-netsmtp= no
-.endif
-
-USE_BUILTIN.pear-netsmtp?= ${IS_BUILTIN.pear-netsmtp}
-
-BUILDLINK_VARS+= IS_BUILTIN.netsmtp
diff -r 850a6e49c97c -r 7661d877f33b net/pear-Net_SMTP/distinfo
--- a/net/pear-Net_SMTP/distinfo Fri Apr 22 07:22:51 2005 +0000
+++ b/net/pear-Net_SMTP/distinfo Fri Apr 22 14:17:32 2005 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/11/27 13:01:16 jdolecek Exp $
+$NetBSD: distinfo,v 1.1.1.1.4.1 2005/04/22 14:17:32 salo Exp $
SHA1 (pear/Net_SMTP-1.2.6.tgz) = 9dbad39e13c1ce1e3bcd48086726235f33a16229
+RMD160 (pear/Net_SMTP-1.2.6.tgz) = b215c3720acbe3dd48f2d179e1a48188b7693ff6
Size (pear/Net_SMTP-1.2.6.tgz) = 9106 bytes
diff -r 850a6e49c97c -r 7661d877f33b net/pear-Net_Socket/Makefile
--- a/net/pear-Net_Socket/Makefile Fri Apr 22 07:22:51 2005 +0000
+++ b/net/pear-Net_Socket/Makefile Fri Apr 22 14:17:32 2005 +0000
@@ -1,16 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2004/11/28 10:21:48 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2005/04/22 14:17:32 salo Exp $
DISTNAME= Net_Socket-1.0.2
+PKGREVISION= 1
CATEGORIES+= net
MAINTAINER= jdolecek%NetBSD.org@localhost
COMMENT= PHP classes to provide Network Socket Interface
.include "../../lang/php/pear.mk"
-
-# used to be bundled before PHP 5.x
-.if ${_PHP_VERSION} < 5
-PKG_SKIP_REASON= "${PKGBASE} is part of PHP${_PHP_VERSION}"
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff -r 850a6e49c97c -r 7661d877f33b net/pear-Net_Socket/buildlink3.mk
--- a/net/pear-Net_Socket/buildlink3.mk Fri Apr 22 07:22:51 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/11/02 21:52:13 kristerw Exp $
-#
-# Net_Socket was bundled with PHP 4.x, but has been pushed to pear
-# in PHP 5.x. If we build for PHP4, use the bundled version, otherwise
-# force dependance and install of this package.
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-NETSOCKET_BUILDLINK3_MK:= ${NETSOCKET_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= pear-netsocket
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npear-netsocket}
-BUILDLINK_PACKAGES+= pear-netsocket
-
-.if !empty(NETSOCKET_BUILDLINK3_MK:M+)
-
-BUILDLINK_DEPENDS.pear-netsocket+= pear-Net_Socket>=1.0.1
-BUILDLINK_PKGSRCDIR.pear-netsocket?= ../../net/pear-Net_Socket
-BUILDLINK_DEPMETHOD.pear-netsocket?= full
-
-.endif # NETSOCKET_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 850a6e49c97c -r 7661d877f33b net/pear-Net_Socket/builtin.mk
--- a/net/pear-Net_Socket/builtin.mk Fri Apr 22 07:22:51 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: builtin.mk,v 1.3 2004/11/27 14:16:39 jdolecek Exp $
-
-.include "../../lang/php/phpversion.mk"
-
-.if ${_PHP_VERSION} <= 4
-IS_BUILTIN.pear-netsocket= yes
-. if defined(PEAR_NETSOCKET_VERSION_REQD) \
- && !empty(PEAR_NETSOCKET_VERSION_REQD:M1.0.2)
-# need Net_Socket 1.0.2
-DEPENDS+= php>=4.3.9nb2:../../www/php4
-. endif
-.else
-IS_BUILTIN.pear-netsocket= no
-.endif
-
-USE_BUILTIN.pear-netsocket?= ${IS_BUILTIN.pear-netsocket}
-
-BUILDLINK_VARS+= IS_BUILTIN.pear-netsocket
diff -r 850a6e49c97c -r 7661d877f33b www/pear-HTML_Common/Makefile
--- a/www/pear-HTML_Common/Makefile Fri Apr 22 07:22:51 2005 +0000
+++ b/www/pear-HTML_Common/Makefile Fri Apr 22 14:17:32 2005 +0000
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2004/11/27 13:34:37 jdolecek Exp $
+# $NetBSD: Makefile,v 1.8.4.1 2005/04/22 14:17:33 salo Exp $
DISTNAME= HTML_Common-1.2.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MAINTAINER= jdolecek%NetBSD.org@localhost
COMMENT= Base PHP class for other HTML classes
-# This package is base HTML package
-PEAR_DIRRM_BASEDIR= yes
-
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 850a6e49c97c -r 7661d877f33b www/pear-HTTP_Request/Makefile
--- a/www/pear-HTTP_Request/Makefile Fri Apr 22 07:22:51 2005 +0000
+++ b/www/pear-HTTP_Request/Makefile Fri Apr 22 14:17:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/11/27 14:23:55 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3.4.1 2005/04/22 14:17:33 salo Exp $
DISTNAME= HTTP_Request-1.2.3
#CATEGORIES+= www
@@ -7,10 +7,7 @@
COMMENT= PHP classes to provides an easy way to perform HTTP requests
DEPENDS+= pear-Net_URL>=1.0.12:../../net/pear-Net_URL
+DEPENDS+= pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket
-# need Net_Socket 1.0.2 or later
-PEAR_NETSOCKET_VERSION_REQD= 1.0.2
-
-.include "../../net/pear-Net_Socket/buildlink3.mk"
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 850a6e49c97c -r 7661d877f33b www/php-curl/Makefile
--- a/www/php-curl/Makefile Fri Apr 22 07:22:51 2005 +0000
+++ b/www/php-curl/Makefile Fri Apr 22 14:17:32 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/01/03 15:59:12 wiz Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2005/04/22 14:17:32 salo Exp $
MODNAME= curl
-PKGREVISION= 1
+PKGREVISION= # empty
CATEGORIES+= www
COMMENT= PHP extension for curl functions
diff -r 850a6e49c97c -r 7661d877f33b www/php4/Makefile
--- a/www/php4/Makefile Fri Apr 22 07:22:51 2005 +0000
+++ b/www/php4/Makefile Fri Apr 22 14:17:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2004/12/17 07:40:45 jdolecek Exp $
+# $NetBSD: Makefile,v 1.41.4.1 2005/04/22 14:17:33 salo Exp $
PKGNAME= php-${PHP_BASE_VERS}
CATEGORIES+= lang
@@ -39,7 +39,7 @@
# some of the bundled Pear extensions have newer versions, which fix
# some known bugs
PEAR_CMD= ${PREFIX}/bin/pear
-UPGRADE_PKG= Net_Socket-1.0.2
+UPGRADE_PKG=
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php
diff -r 850a6e49c97c -r 7661d877f33b www/php4/Makefile.common
--- a/www/php4/Makefile.common Fri Apr 22 07:22:51 2005 +0000
+++ b/www/php4/Makefile.common Fri Apr 22 14:17:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2004/12/18 16:01:42 jdolecek Exp $
+# $NetBSD: Makefile.common,v 1.46.4.1 2005/04/22 14:17:33 salo Exp $
DISTNAME?= php-${PHP_DIST_VERS}
CATEGORIES+= www php4
@@ -15,7 +15,7 @@
# PHP_DIST_VERS version number on the php distfile
# PHP_BASE_VERS pkgsrc-mangled version number (convert pl -> .)
#
-PHP_DIST_VERS= 4.3.10
+PHP_DIST_VERS= 4.3.11
PHP_BASE_VERS= ${PHP_DIST_VERS}
DISTFILES?= ${PHP_DISTFILE}
diff -r 850a6e49c97c -r 7661d877f33b www/php4/PLIST
--- a/www/php4/PLIST Fri Apr 22 07:22:51 2005 +0000
+++ b/www/php4/PLIST Fri Apr 22 14:17:32 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/12/17 00:36:09 tron Exp $
+@comment $NetBSD: PLIST,v 1.11.4.1 2005/04/22 14:17:33 salo Exp $
bin/pear
bin/php
bin/php-config
@@ -132,6 +132,7 @@
include/php/ext/xml/expat/asciitab.h
include/php/ext/xml/expat/xmltok_impl.h
include/php/ext/xml/php_xml.h
+include/php/ext/mbstring/libmbfl/mbfl/eaw_table.h
include/php/ext/mbstring/libmbfl/mbfl/mbfl_string.h
include/php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
include/php/ext/mbstring/libmbfl/mbfl/mbfl_language.h
@@ -192,139 +193,82 @@
Home |
Main Index |
Thread Index |
Old Index