[pkgsrc/trunk]: pkgsrc Unfortunately PHP has several openssl hooks, which are...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bbcbcab86905
branches:  trunk
changeset: 500448:bbcbcab86905
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sat Oct 08 16:49:35 2005 +0000

description:
Unfortunately PHP has several openssl hooks, which are only enabled
when the base PHP is compiled with openssl extension (e.g. ssl://, tls://
stream support, and couple others). These don't work when SSL support
is loaded via extension.

For this reason, make openssl extension unconditionally built-in
into the main PHP package, and g/c security/php-openssl.

diffstat:

 doc/CHANGES                        |   3 ++-
 lang/php5/MESSAGE                  |   7 +++++++
 lang/php5/Makefile                 |   4 ++--
 lang/php5/Makefile.php             |  11 ++++-------
 meta-pkgs/php4-extensions/Makefile |   5 ++---
 meta-pkgs/php5-extensions/Makefile |   5 ++---
 security/Makefile                  |   3 +--
 security/php-openssl/DESCR         |   2 --
 security/php-openssl/Makefile      |  20 --------------------
 www/ap-php/Makefile                |   4 ++--
 www/php4/MESSAGE                   |   5 ++++-
 www/php4/Makefile                  |   4 ++--
 www/php4/Makefile.php              |   3 ++-
 13 files changed, 30 insertions(+), 46 deletions(-)

diffs (220 lines):

diff -r d6292b58ae48 -r bbcbcab86905 doc/CHANGES
--- a/doc/CHANGES       Sat Oct 08 16:05:48 2005 +0000
+++ b/doc/CHANGES       Sat Oct 08 16:49:35 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11374 2005/10/08 16:05:48 jdolecek Exp $
+$NetBSD: CHANGES,v 1.11375 2005/10/08 16:49:35 jdolecek Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -4341,3 +4341,4 @@
        Updated print/dvipdfmx to 0.0.0.20031116nb3 [hira 2005-10-08]
        Added net/php-xmlrpc 4.4.0 [jdolecek 2005-10-08]
        Added net/php-xmlrpc 5.0.5 [jdolecek 2005-10-08]
+       Removed security/php-openssl [jdolecek 2005-10-08]
diff -r d6292b58ae48 -r bbcbcab86905 lang/php5/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php5/MESSAGE Sat Oct 08 16:49:35 2005 +0000
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.3 2005/10/08 16:50:23 jdolecek Exp $
+
+Note php-openssl has been removed as separate package as of 5.0.5nb1, the
+main PHP5 package has them built-in now.
+===========================================================================
+
diff -r d6292b58ae48 -r bbcbcab86905 lang/php5/Makefile
--- a/lang/php5/Makefile        Sat Oct 08 16:05:48 2005 +0000
+++ b/lang/php5/Makefile        Sat Oct 08 16:49:35 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/09/08 18:49:01 jdolecek Exp $
+# $NetBSD: Makefile,v 1.17 2005/10/08 16:49:35 jdolecek Exp $
 #
 
 PKGNAME=               php-${PHP_BASE_VERS}
-PKGREVISION=           # empty
+PKGREVISION=           1
 CATEGORIES=            lang
 
 HOMEPAGE=              http://www.php.net/
diff -r d6292b58ae48 -r bbcbcab86905 lang/php5/Makefile.php
--- a/lang/php5/Makefile.php    Sat Oct 08 16:05:48 2005 +0000
+++ b/lang/php5/Makefile.php    Sat Oct 08 16:49:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.7 2005/09/04 20:13:59 jlam Exp $
+# $NetBSD: Makefile.php,v 1.8 2005/10/08 16:49:35 jdolecek Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -34,8 +34,10 @@
 CONFIGURE_ARGS+=       --with-libxml-dir=${PREFIX}
 .include "../../textproc/libxml2/buildlink3.mk"
 
+CONFIGURE_ARGS+=       --with-openssl
+.include "../../security/openssl/buildlink3.mk"
+
 PKG_OPTIONS_VAR=               PKG_OPTIONS.${PKGNAME:C/-[^-]*$//}
-PKG_SUPPORTED_OPTIONS+=        ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -44,8 +46,3 @@
 .else
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-openssl
-.endif
diff -r d6292b58ae48 -r bbcbcab86905 meta-pkgs/php4-extensions/Makefile
--- a/meta-pkgs/php4-extensions/Makefile        Sat Oct 08 16:05:48 2005 +0000
+++ b/meta-pkgs/php4-extensions/Makefile        Sat Oct 08 16:49:35 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/10/08 16:05:48 jdolecek Exp $
+# $NetBSD: Makefile,v 1.13 2005/10/08 16:49:35 jdolecek Exp $
 
 DISTNAME=      php-extensions-4.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    meta-pkgs www php4
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -38,7 +38,6 @@
 DEPENDS+=      php-mssql-4.4.*:../../databases/php-mssql
 DEPENDS+=      php-mysql-4.4.*:../../databases/php-mysql
 DEPENDS+=      php-odbc-4.4.*:../../databases/php-odbc
-DEPENDS+=      php-openssl-4.4.*:../../security/php-openssl
 DEPENDS+=      php-pcntl-4.4.*:../../devel/php-pcntl
 DEPENDS+=      php-pdflib-4.4.*:../../print/php-pdflib
 DEPENDS+=      php-pgsql-4.4.*:../../databases/php-pgsql
diff -r d6292b58ae48 -r bbcbcab86905 meta-pkgs/php5-extensions/Makefile
--- a/meta-pkgs/php5-extensions/Makefile        Sat Oct 08 16:05:48 2005 +0000
+++ b/meta-pkgs/php5-extensions/Makefile        Sat Oct 08 16:49:35 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/10/08 16:05:48 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12 2005/10/08 16:49:35 jdolecek Exp $
 
 DISTNAME=      php-extensions-5.0
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    meta-pkgs www php5
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -38,7 +38,6 @@
 DEPENDS+=      php-mssql-5.0.*:../../databases/php-mssql
 DEPENDS+=      php-mysql-5.0.*:../../databases/php-mysql
 DEPENDS+=      php-odbc-5.0.*:../../databases/php-odbc
-DEPENDS+=      php-openssl-5.0.*:../../security/php-openssl
 DEPENDS+=      php-pcntl-5.0.*:../../devel/php-pcntl
 DEPENDS+=      php-pdflib-5.0.*:../../print/php-pdflib
 DEPENDS+=      php-pgsql-5.0.*:../../databases/php-pgsql
diff -r d6292b58ae48 -r bbcbcab86905 security/Makefile
--- a/security/Makefile Sat Oct 08 16:05:48 2005 +0000
+++ b/security/Makefile Sat Oct 08 16:49:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.245 2005/09/03 22:47:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.246 2005/10/08 16:49:35 jdolecek Exp $
 #
 
 COMMENT=       Security tools
@@ -173,7 +173,6 @@
 SUBDIR+=       pgpenvelope
 SUBDIR+=       php-mcrypt
 SUBDIR+=       php-mhash
-SUBDIR+=       php-openssl
 SUBDIR+=       pinentry
 SUBDIR+=       pinepgp
 SUBDIR+=       pks
diff -r d6292b58ae48 -r bbcbcab86905 security/php-openssl/DESCR
--- a/security/php-openssl/DESCR        Sat Oct 08 16:05:48 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides access to the OpenSSL library.
diff -r d6292b58ae48 -r bbcbcab86905 security/php-openssl/Makefile
--- a/security/php-openssl/Makefile     Sat Oct 08 16:05:48 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:17 tv Exp $
-
-MODNAME=               openssl
-CATEGORIES+=           security
-PKGREVISION=           # empty
-COMMENT=               PHP extension for the OpenSSL library
-
-
-CONFIGURE_ARGS+=       --with-${MODNAME}=shared,${BUILDLINK_PREFIX.openssl}
-
-# the config test for -lssl fails to link in -lcrypto; just force it
-# to succeed
-CONFIGURE_ENV+=                ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
-
-post-extract:
-       cd ${WRKSRC} && ln -s config0.m4 config.m4
-
-.include "../../lang/php/ext.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r d6292b58ae48 -r bbcbcab86905 www/ap-php/Makefile
--- a/www/ap-php/Makefile       Sat Oct 08 16:05:48 2005 +0000
+++ b/www/ap-php/Makefile       Sat Oct 08 16:49:35 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/10/07 16:51:41 jdolecek Exp $
+# $NetBSD: Makefile,v 1.5 2005/10/08 16:49:36 jdolecek Exp $
 #
 
 PKGNAME=               ap-php-${PHP_BASE_VERS}
-PKGREVISION=           1
+PKGREVISION=           2
 COMMENT=               Apache (${PKG_APACHE}) module for ${PKG_PHP}
 
 APACHE_MODULE=         YES
diff -r d6292b58ae48 -r bbcbcab86905 www/php4/MESSAGE
--- a/www/php4/MESSAGE  Sat Oct 08 16:05:48 2005 +0000
+++ b/www/php4/MESSAGE  Sat Oct 08 16:49:35 2005 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.8 2004/12/16 17:42:14 jdolecek Exp $
+$NetBSD: MESSAGE,v 1.9 2005/10/08 16:49:35 jdolecek Exp $
 
 To process PHP scripts, you will need a PHP-enabled HTTP server.  You may
 either configure the HTTP server to use PHP as a CGI program, or install a
@@ -12,4 +12,7 @@
 
 Note that php4-pcre, php4-session and php4-xml are no longer
 separate packages since 4.3.3, the main PHP4 package has them built-in now.
+
+Note php-openssl has been removed as separate package as of 4.4.0nb2, the
+main PHP4 package has them built-in now.
 ===========================================================================
diff -r d6292b58ae48 -r bbcbcab86905 www/php4/Makefile
--- a/www/php4/Makefile Sat Oct 08 16:05:48 2005 +0000
+++ b/www/php4/Makefile Sat Oct 08 16:49:35 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2005/10/05 15:59:47 tron Exp $
+# $NetBSD: Makefile,v 1.54 2005/10/08 16:49:35 jdolecek Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES+=           lang
 COMMENT=               HTML-embedded scripting language
 
diff -r d6292b58ae48 -r bbcbcab86905 www/php4/Makefile.php
--- a/www/php4/Makefile.php     Sat Oct 08 16:05:48 2005 +0000
+++ b/www/php4/Makefile.php     Sat Oct 08 16:49:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.23 2005/09/04 20:13:59 jlam Exp $
+# $NetBSD: Makefile.php,v 1.24 2005/10/08 16:49:35 jdolecek Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -40,6 +40,7 @@
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PKGNAME:C/-[^-]*$//}
 PKG_SUPPORTED_OPTIONS+=        ssl
+PKG_SUGGESTED_OPTIONS+=        ssl
 
 .include "../../mk/bsd.options.mk"