Index: head/mail/php70-imap/Makefile =================================================================== --- head/mail/php70-imap/Makefile (revision 485596) +++ head/mail/php70-imap/Makefile (revision 485597) @@ -1,10 +1,11 @@ # Created by: Alex Dupre # $FreeBSD$ CATEGORIES= mail +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -imap .include "${MASTERDIR}/Makefile" Index: head/mail/php70-imap/files/patch-php__imap.c =================================================================== --- head/mail/php70-imap/files/patch-php__imap.c (nonexistent) +++ head/mail/php70-imap/files/patch-php__imap.c (revision 485597) @@ -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; + } Property changes on: head/mail/php70-imap/files/patch-php__imap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/php70-imap/files/patch-php__imap.h =================================================================== --- head/mail/php70-imap/files/patch-php__imap.h (nonexistent) +++ head/mail/php70-imap/files/patch-php__imap.h (revision 485597) @@ -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 Property changes on: head/mail/php70-imap/files/patch-php__imap.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/php71-imap/Makefile =================================================================== --- head/mail/php71-imap/Makefile (revision 485596) +++ head/mail/php71-imap/Makefile (revision 485597) @@ -1,11 +1,12 @@ # $FreeBSD$ CATEGORIES= mail +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../lang/php71 PKGNAMESUFFIX= -imap TEST_TARGET= test .include "${MASTERDIR}/Makefile" Index: head/mail/php71-imap/files/patch-php__imap.c =================================================================== --- head/mail/php71-imap/files/patch-php__imap.c (nonexistent) +++ head/mail/php71-imap/files/patch-php__imap.c (revision 485597) @@ -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; + } Property changes on: head/mail/php71-imap/files/patch-php__imap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/php71-imap/files/patch-php__imap.h =================================================================== --- head/mail/php71-imap/files/patch-php__imap.h (nonexistent) +++ head/mail/php71-imap/files/patch-php__imap.h (revision 485597) @@ -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 Property changes on: head/mail/php71-imap/files/patch-php__imap.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/php72-imap/Makefile =================================================================== --- head/mail/php72-imap/Makefile (revision 485596) +++ head/mail/php72-imap/Makefile (revision 485597) @@ -1,11 +1,12 @@ # $FreeBSD$ CATEGORIES= mail +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../lang/php72 PKGNAMESUFFIX= -imap TEST_TARGET= test .include "${MASTERDIR}/Makefile" Index: head/mail/php72-imap/files/patch-php__imap.c =================================================================== --- head/mail/php72-imap/files/patch-php__imap.c (nonexistent) +++ head/mail/php72-imap/files/patch-php__imap.c (revision 485597) @@ -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; + } Property changes on: head/mail/php72-imap/files/patch-php__imap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/php72-imap/files/patch-php__imap.h =================================================================== --- head/mail/php72-imap/files/patch-php__imap.h (nonexistent) +++ head/mail/php72-imap/files/patch-php__imap.h (revision 485597) @@ -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 Property changes on: head/mail/php72-imap/files/patch-php__imap.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/php73-imap/Makefile =================================================================== --- head/mail/php73-imap/Makefile (revision 485596) +++ head/mail/php73-imap/Makefile (revision 485597) @@ -1,11 +1,12 @@ # $FreeBSD$ CATEGORIES= mail +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -imap TEST_TARGET= test .include "${MASTERDIR}/Makefile" Index: head/mail/php73-imap/files/patch-php__imap.c =================================================================== --- head/mail/php73-imap/files/patch-php__imap.c (nonexistent) +++ head/mail/php73-imap/files/patch-php__imap.c (revision 485597) @@ -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; + } Property changes on: head/mail/php73-imap/files/patch-php__imap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/php73-imap/files/patch-php__imap.h =================================================================== --- head/mail/php73-imap/files/patch-php__imap.h (nonexistent) +++ head/mail/php73-imap/files/patch-php__imap.h (revision 485597) @@ -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 Property changes on: head/mail/php73-imap/files/patch-php__imap.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property