Attachment #199926 for bug #233847

View | Details | Raw Unified | Return to bug 233847
Collapse All | Expand All

Lines 2-8 Link Here

(-)lang/php56/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= php56	4	PORTNAME= php56
5	PORTVERSION= 5.6.38	5	PORTVERSION= 5.6.39
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES?= lang devel www	7	CATEGORIES?= lang devel www
8	MASTER_SITES= PHP/distributions	8	MASTER_SITES= PHP/distributions

Lines 1-5 Link Here

(-)lang/php56/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1537790285	1	TIMESTAMP = 1544173545
2	SHA256 (php-5.6.38.tar.xz) = c2fac47dc6316bd230f0ea91d8a5498af122fb6a3eb43f796c9ea5f59b04aa1e	2	SHA256 (php-5.6.39.tar.xz) = 8147576001a832ff3d03cb2980caa2d6b584a10624f87ac459fcd3948c6e4a10
3	SIZE (php-5.6.38.tar.xz) = 12467408	3	SIZE (php-5.6.39.tar.xz) = 12467096
4	SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed	4	SHA256 (php-5.5.x-mail-header.patch) = f510672c4bf2c228e4d8c7837e16a82169de82139dcf33fafce51e9e55a1b9ed
5	SIZE (php-5.5.x-mail-header.patch) = 4426	5	SIZE (php-5.5.x-mail-header.patch) = 4426

Lines 2-8 Link Here

(-)mail/php56-imap/Makefile (-1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	CATEGORIES= mail	4	CATEGORIES= mail
5	PORTREVISION= 1
6		5
7	MASTERDIR= ${.CURDIR}/../../lang/php56	6	MASTERDIR= ${.CURDIR}/../../lang/php56
8		7




--- 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,[ ])




--- 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;
 }

Removed Link Here

(-)mail/php56-imap/files/patch-php__imap.h (-10 lines)
1	--- php_imap.h.orig 2018-09-11 22:12:36 UTC
2	+++ php_imap.h
3	@@ -214,6 +214,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap)
4	#endif
5	/* php_stream for php_mail_gets() */
6	php_stream *gets_stream;
7	+ zend_bool enable_rsh;
8	ZEND_END_MODULE_GLOBALS(imap)
9
10	#ifdef ZTS

Lines 5-11 CATEGORIES= security Link Here

(-)security/php56-openssl/Makefile (-1 lines)
5		5
6	MASTERDIR= ${.CURDIR}/../../lang/php56	6	MASTERDIR= ${.CURDIR}/../../lang/php56
7		7
8	PORTREVISION= 1
9	PKGNAMESUFFIX= -openssl	8	PKGNAMESUFFIX= -openssl
10		9
11	.include "${MASTERDIR}/Makefile"	10	.include "${MASTERDIR}/Makefile"

Return to bug 233847

Removed Link Here

(-)mail/php56-imap/files/patch-config.m4 (-42 lines)
1	--- config.m4.orig 2018-09-11 22:12:36 UTC
2	+++ config.m4
3	@@ -103,6 +103,8 @@ PHP_ARG_WITH(kerberos,for IMAP Kerberos
4	PHP_ARG_WITH(imap-ssl,for IMAP SSL support,
5	[ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no)
6
7	+PHP_ARG_WITH(pcre-dir, pcre install prefix,
8	+[ --with-pcre-dir IMAP: pcre install prefix], no, no)
9
10	if test "$PHP_IMAP" != "no"; then
11	PHP_SUBST(IMAP_SHARED_LIBADD)
12	@@ -119,6 +121,30 @@ if test "$PHP_IMAP" != "no"; then
13	fi
14	done
15
16	+ dnl This is PECL build, check if bundled PCRE library is used
17	+ old_CPPFLAGS=$CPPFLAGS
18	+ CPPFLAGS=$INCLUDES
19	+ AC_EGREP_CPP(yes,[
20	+#include <main/php_config.h>
21	+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
22	+yes
23	+#endif
24	+ ],[
25	+ PHP_PCRE_REGEX=yes
26	+ ],[
27	+ AC_EGREP_CPP(yes,[
28	+#include <main/php_config.h>
29	+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
30	+yes
31	+#endif
32	+ ],[
33	+ PHP_PCRE_REGEX=pecl
34	+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
35	+ ],[
36	+ PHP_PCRE_REGEX=no
37	+ ])
38	+ ])
39	+
40	dnl Check for c-client version 2004
41	AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
42	AC_DEFINE(HAVE_IMAP2004,1,[ ])

Removed Link Here

(-)mail/php56-imap/files/patch-php__imap.c (-40 lines)
1	--- php_imap.c.orig 2018-09-11 22:12:36 UTC
2	+++ php_imap.c
3	@@ -562,6 +562,15 @@ static const zend_module_dep imap_deps[]
4	};
5	/* }}} */
6
7	+
8	+/* {{{ PHP_INI
9	+ */
10	+PHP_INI_BEGIN()
11	+STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals)
12	+PHP_INI_END()
13	+/* }}} */
14	+
15	+
16	/* {{{ imap_module_entry
17	*/
18	zend_module_entry imap_module_entry = {
19	@@ -835,6 +844,8 @@ PHP_MINIT_FUNCTION(imap)
20	{
21	unsigned long sa_all = SA_MESSAGES \| SA_RECENT \| SA_UNSEEN \| SA_UIDNEXT \| SA_UIDVALIDITY;
22
23	+ REGISTER_INI_ENTRIES();
24	+
25	#ifndef PHP_WIN32
26	mail_link(&unixdriver); /* link in the unix driver */
27	mail_link(&mhdriver); /* link in the mh driver */
28	@@ -1052,6 +1063,12 @@ PHP_MINIT_FUNCTION(imap)
29	GC_TEXTS texts
30	*/
31
32	+ if (!IMAPG(enable_rsh)) {
33	+ /* disable SSH and RSH, see https://bugs.php.net/bug.php?id=77153 */
34	+ mail_parameters (NIL, SET_RSHTIMEOUT, 0);
35	+ mail_parameters (NIL, SET_SSHTIMEOUT, 0);
36	+ }
37	+
38	le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number);
39	return SUCCESS;
40	}