From b83be14ee639c4365e04b8a9510fb353f7a24d0e Mon Sep 17 00:00:00 2001 From: Torsten Zuehlsdorff Date: Fri, 7 Dec 2018 07:50:31 +0000 Subject: [PATCH] lang/php73: Upgrade from RC6 to 7.3.0 Changelog: http://www.php.net/ChangeLog-7.php#7.3.0 --- lang/php73/Makefile | 4 +-- lang/php73/distinfo | 6 ++-- mail/php73-imap/files/patch-php__imap.c | 40 ------------------------- mail/php73-imap/files/patch-php__imap.h | 10 ------- 4 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 mail/php73-imap/files/patch-php__imap.c delete mode 100644 mail/php73-imap/files/patch-php__imap.h diff --git a/lang/php73/Makefile b/lang/php73/Makefile index d83d78cb426a..4f4cdede7adb 100644 --- a/lang/php73/Makefile +++ b/lang/php73/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= php73 -DISTVERSION= 7.3.0RC6 +DISTVERSION= 7.3.0 PORTREVISION?= 0 CATEGORIES?= lang devel www -MASTER_SITES= https://downloads.php.net/~cmb/ +MASTER_SITES= PHP/distributions DISTNAME= php-${DISTVERSION} MAINTAINER= tz@FreeBSD.org diff --git a/lang/php73/distinfo b/lang/php73/distinfo index 770ad09ed89f..e3fad3f35afd 100644 --- a/lang/php73/distinfo +++ b/lang/php73/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542968426 -SHA256 (php-7.3.0RC6.tar.xz) = 8120b5830e24d5fabc96da693ab924852e6c2a95829ad994d6a5107c69787848 -SIZE (php-7.3.0RC6.tar.xz) = 11918172 +TIMESTAMP = 1544005190 +SHA256 (php-7.3.0.tar.xz) = 7d195cad55af8b288c3919c67023a14ff870a73e3acc2165a6d17a4850a560b5 +SIZE (php-7.3.0.tar.xz) = 11928820 diff --git a/mail/php73-imap/files/patch-php__imap.c b/mail/php73-imap/files/patch-php__imap.c deleted file mode 100644 index faa12adafa16..000000000000 --- a/mail/php73-imap/files/patch-php__imap.c +++ /dev/null @@ -1,40 +0,0 @@ ---- php_imap.c.orig 2018-09-11 22:12:36 UTC -+++ php_imap.c -@@ -562,6 +562,15 @@ static const zend_module_dep imap_deps[] - }; - /* }}} */ - -+ -+/* {{{ PHP_INI -+ */ -+PHP_INI_BEGIN() -+STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) -+PHP_INI_END() -+/* }}} */ -+ -+ - /* {{{ imap_module_entry - */ - zend_module_entry imap_module_entry = { -@@ -835,6 +844,8 @@ PHP_MINIT_FUNCTION(imap) - { - unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; - -+ REGISTER_INI_ENTRIES(); -+ - #ifndef PHP_WIN32 - mail_link(&unixdriver); /* link in the unix driver */ - mail_link(&mhdriver); /* link in the mh driver */ -@@ -1052,6 +1063,12 @@ PHP_MINIT_FUNCTION(imap) - GC_TEXTS texts - */ - -+ if (!IMAPG(enable_rsh)) { -+ /* disable SSH and RSH, see https://bugs.php.net/bug.php?id=77153 */ -+ mail_parameters (NIL, SET_RSHTIMEOUT, 0); -+ mail_parameters (NIL, SET_SSHTIMEOUT, 0); -+ } -+ - le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); - return SUCCESS; - } diff --git a/mail/php73-imap/files/patch-php__imap.h b/mail/php73-imap/files/patch-php__imap.h deleted file mode 100644 index f27f888f2ee7..000000000000 --- a/mail/php73-imap/files/patch-php__imap.h +++ /dev/null @@ -1,10 +0,0 @@ ---- php_imap.h.orig 2018-09-11 22:12:36 UTC -+++ php_imap.h -@@ -214,6 +214,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) - #endif - /* php_stream for php_mail_gets() */ - php_stream *gets_stream; -+ zend_bool enable_rsh; - ZEND_END_MODULE_GLOBALS(imap) - - #ifdef ZTS