Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Nov 2018 09:26:37 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r485585 - in head/mail/php56-imap: . files
Message-ID:  <201811220926.wAM9Qblt056086@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ale
Date: Thu Nov 22 09:26:37 2018
New Revision: 485585
URL: https://svnweb.freebsd.org/changeset/ports/485585

Log:
  Disable rsh/ssh functionality in imap by default (php bug #77153).
  
  PR:		233384
  Submitted by:	joneum

Added:
  head/mail/php56-imap/files/patch-php__imap.c   (contents, props changed)
  head/mail/php56-imap/files/patch-php__imap.h   (contents, props changed)
Modified:
  head/mail/php56-imap/Makefile
  head/mail/php56-imap/files/patch-config.m4

Modified: head/mail/php56-imap/Makefile
==============================================================================
--- head/mail/php56-imap/Makefile	Thu Nov 22 09:18:32 2018	(r485584)
+++ head/mail/php56-imap/Makefile	Thu Nov 22 09:26:37 2018	(r485585)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 CATEGORIES=	mail
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../../lang/php56
 

Modified: head/mail/php56-imap/files/patch-config.m4
==============================================================================
--- head/mail/php56-imap/files/patch-config.m4	Thu Nov 22 09:18:32 2018	(r485584)
+++ head/mail/php56-imap/files/patch-config.m4	Thu Nov 22 09:26:37 2018	(r485585)
@@ -1,6 +1,6 @@
---- config.m4.orig	2010-02-07 14:06:54.000000000 +0100
-+++ config.m4	2010-03-08 11:56:24.000000000 +0100
-@@ -103,6 +103,8 @@
+--- 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)
  
@@ -9,7 +9,7 @@
  
  if test "$PHP_IMAP" != "no"; then  
      PHP_SUBST(IMAP_SHARED_LIBADD)
-@@ -119,6 +121,30 @@
+@@ -119,6 +121,30 @@ if test "$PHP_IMAP" != "no"; then  
        fi
      done
  

Added: head/mail/php56-imap/files/patch-php__imap.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/php56-imap/files/patch-php__imap.c	Thu Nov 22 09:26:37 2018	(r485585)
@@ -0,0 +1,40 @@
+--- 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;
+ }

Added: head/mail/php56-imap/files/patch-php__imap.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/php56-imap/files/patch-php__imap.h	Thu Nov 22 09:26:37 2018	(r485585)
@@ -0,0 +1,10 @@
+--- 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811220926.wAM9Qblt056086>