Attachment 199926 Details for Bug 233847 – patch

[patch] patch

php-5.6.39.patch (text/plain), 4.79 KB, created by Pascal Christen on 2018-12-07 09:34:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Christen

Created: 2018-12-07 09:34:01 UTC

Size: 4.79 KB

patch

obsolete

>diff --git a/lang/php56/Makefile b/lang/php56/Makefile
>index 10948923e6af..b6654f7665b5 100644
>--- lang/php56/Makefile
>+++ lang/php56/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	php56
>-PORTVERSION=	5.6.38
>+PORTVERSION=	5.6.39
> PORTREVISION?=	0
> CATEGORIES?=	lang devel www
> MASTER_SITES=	PHP/distributions
>diff --git a/lang/php56/distinfo b/lang/php56/distinfo
>index 8f129e812e8e..5c67862ae19a 100644
>--- lang/php56/distinfo
>+++ lang/php56/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1537790285
>-SHA256 (php-5.6.38.tar.xz) = c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e
>-SIZE (php-5.6.38.tar.xz) = 12467408
>+TIMESTAMP = 1544173545
>+SHA256 (php-5.6.39.tar.xz) = 8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10
>+SIZE (php-5.6.39.tar.xz) = 12467096
> SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed
> SIZE (php-5.5.x-mail-header.patch) = 4426
>diff --git a/mail/php56-imap/Makefile b/mail/php56-imap/Makefile
>index 6bc1c55c249e..fb2e5394f3e0 100644
>--- mail/php56-imap/Makefile
>+++ mail/php56-imap/Makefile
>@@ -2,7 +2,6 @@
> # $FreeBSD$
> 
> CATEGORIES=	mail
>-PORTREVISION=	1
> 
> MASTERDIR=	${.CURDIR}/../../lang/php56
> 
>diff --git a/mail/php56-imap/files/patch-config.m4 b/mail/php56-imap/files/patch-config.m4
>deleted file mode 100644
>index c4ddcf2bb90e..000000000000
>--- mail/php56-imap/files/patch-config.m4
>+++ /dev/null
>@@ -1,42 +0,0 @@
>---- config.m4.orig	2018-09-11 22:12:36 UTC
>-+++ config.m4
>-@@ -103,6 +103,8 @@ PHP_ARG_WITH(kerberos,for IMAP Kerberos 
>- PHP_ARG_WITH(imap-ssl,for IMAP SSL support,
>- [  --with-imap-ssl[=DIR]     IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no)
>- 
>-+PHP_ARG_WITH(pcre-dir, pcre install prefix,
>-+[  --with-pcre-dir           IMAP: pcre install prefix], no, no)
>- 
>- if test "$PHP_IMAP" != "no"; then  
>-     PHP_SUBST(IMAP_SHARED_LIBADD)
>-@@ -119,6 +121,30 @@ if test "$PHP_IMAP" != "no"; then  
>-       fi
>-     done
>- 
>-+  dnl This is PECL build, check if bundled PCRE library is used
>-+  old_CPPFLAGS=$CPPFLAGS
>-+  CPPFLAGS=$INCLUDES
>-+  AC_EGREP_CPP(yes,[
>-+#include <main/php_config.h>
>-+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
>-+yes
>-+#endif
>-+  ],[
>-+    PHP_PCRE_REGEX=yes
>-+  ],[
>-+    AC_EGREP_CPP(yes,[
>-+#include <main/php_config.h>
>-+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
>-+yes
>-+#endif
>-+    ],[
>-+      PHP_PCRE_REGEX=pecl
>-+      PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
>-+    ],[
>-+      PHP_PCRE_REGEX=no
>-+    ])
>-+  ])
>-+
>-     dnl Check for c-client version 2004
>-     AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
>-       AC_DEFINE(HAVE_IMAP2004,1,[ ])
>diff --git a/mail/php56-imap/files/patch-php__imap.c b/mail/php56-imap/files/patch-php__imap.c
>deleted file mode 100644
>index faa12adafa16..000000000000
>--- mail/php56-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/php56-imap/files/patch-php__imap.h b/mail/php56-imap/files/patch-php__imap.h
>deleted file mode 100644
>index f27f888f2ee7..000000000000
>--- mail/php56-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
>diff --git a/security/php56-openssl/Makefile b/security/php56-openssl/Makefile
>index 0ce585246dcd..66530318ade6 100644
>--- security/php56-openssl/Makefile
>+++ security/php56-openssl/Makefile
>@@ -5,7 +5,6 @@ CATEGORIES=     security
> 
> MASTERDIR=     ${.CURDIR}/../../lang/php56
> 
>-PORTREVISION=  1
> PKGNAMESUFFIX= -openssl
> 
> .include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 233847: 199926