From 175090537d3d0a7beb1530bf5356d13d347af655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kenneth=20=C3=98strup?= Date: Tue, 1 May 2018 10:51:37 +0200 Subject: [PATCH 1/3] Added PHP Pear Auth-SASL support --- php/ng/auth-sasl.sls | 2 ++ php/ng/map.jinja | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 php/ng/auth-sasl.sls diff --git a/php/ng/auth-sasl.sls b/php/ng/auth-sasl.sls new file mode 100644 index 0000000..98f8e55 --- /dev/null +++ b/php/ng/auth-sasl.sls @@ -0,0 +1,2 @@ +{% set state = 'auth-sasl' %} +{% include "php/ng/installed.jinja" %} diff --git a/php/ng/map.jinja b/php/ng/map.jinja index 9012945..306b53b 100644 --- a/php/ng/map.jinja +++ b/php/ng/map.jinja @@ -40,6 +40,7 @@ 'json': 'php' + phpng_version + '-json', 'ldap': 'php' + phpng_version + '-ldap', 'local_bin': '/usr/local/bin', + 'auth-sasl': 'php-auth-sasl', 'mbstring': 'php' + phpng_version + '-mbstring', 'mcrypt': 'php' + phpng_version + '-mcrypt', 'memcache': 'php-memcache', @@ -361,6 +362,7 @@ 'json': 'php' + phpng_version + '-json', 'ldap': 'php' + phpng_version + '-ldap', 'local_bin': '/usr/local/bin', + 'auth-sasl': 'php-auth-sasl', 'mbstring': 'php' + phpng_version + '-mbstring', 'mcrypt': 'php' + phpng_version + '-mcrypt', 'memcache': 'php-memcache', @@ -681,6 +683,7 @@ 'json': 'php-json', 'ldap': 'php-ldap', 'local_bin': '/usr/local/bin', + 'auth-sasl': 'php-auth-sasl', 'mbstring': 'php-mbstring', 'mcrypt': 'php-mcrypt', 'memcache': 'php-memcache', @@ -1048,6 +1051,7 @@ 'json': 'php-json', 'ldap': 'php-ldap', 'local_bin': '/usr/local/bin', + 'auth-sasl': 'php-auth-sasl', 'mbstring': 'php-mbstring', 'mcrypt': 'php-mcrypt', 'memcache': 'php-memcache', @@ -1422,6 +1426,7 @@ 'json': 'php5-json', 'ldap': 'php5-ldap', 'local_bin': '/usr/local/bin', + 'auth-sasl': 'php-auth-sasl', 'mbstring': 'php5', 'mcrypt': 'php5-mcrypt', 'mdb2': 'php-mdb2', @@ -1812,6 +1817,7 @@ 'json': 'php' + phpng_version + '-json', 'ldap': 'php' + phpng_version + '-ldap', 'local_bin': '/usr/local/bin', + 'auth-sasl': 'php-auth-sasl', 'mbstring': 'php' + phpng_version + '-mbstring', 'mcrypt': 'php' + phpng_version + '-mcrypt', 'memcache': 'php-memcache', @@ -2133,6 +2139,7 @@ 'json': 'php5-json', 'ldap': 'php5-ldap', 'local_bin': '/usr/local/bin', + 'auth-sasl': 'php-auth-sasl', 'mbstring': 'php5', 'mcrypt': 'php5-mcrypt', 'mdb2': 'php-mdb2', @@ -2249,6 +2256,7 @@ 'json': 'php-common', 'ldap': 'php-ldap', 'local_bin': '/usr/local/bin', + 'auth-sasl': 'php-pear-Auth-SASL', 'mbstring': 'php-mbstring', 'mcrypt': 'php-mcrypt', 'memcache': 'php-pecl-memcache', From a3b2dcafe1593d31ac3b9deaafdd9b810731f54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kenneth=20=C3=98strup?= Date: Tue, 1 May 2018 10:35:32 +0200 Subject: [PATCH 2/3] Added support for PHP Pear Net-SMTP --- php/ng/map.jinja | 8 ++++++++ php/ng/net-smtp.sls | 2 ++ 2 files changed, 10 insertions(+) create mode 100644 php/ng/net-smtp.sls diff --git a/php/ng/map.jinja b/php/ng/map.jinja index 306b53b..7769779 100644 --- a/php/ng/map.jinja +++ b/php/ng/map.jinja @@ -49,6 +49,7 @@ 'mongodb': 'php-mongodb', 'mysql': 'php' + phpng_version + '-mysql', 'mysqlnd': 'php' + phpng_version + '-mysql', + 'net-smtp': 'php-net-smtp', 'net4': 'php-net-ipv4', 'net6': 'php-net-ipv6', 'oauth': 'php-oauth', @@ -371,6 +372,7 @@ 'mongodb': 'php-mongodb', 'mysql': 'php' + phpng_version + '-mysql', 'mysqlnd': 'php' + phpng_version + '-mysql', + 'net-smtp': 'php-net-smtp', 'net4': 'php-net-ipv4', 'net6': 'php-net-ipv6', 'oauth': 'php-oauth', @@ -691,6 +693,7 @@ 'mongodb': 'php-mongodb', 'mysql': 'php-mysql', 'mysqlnd': 'php', + 'net-smtp': 'php-net-smtp', 'net4': 'php-net-ipv4', 'net6': 'php-net-ipv6', 'oauth': 'php-oauth', @@ -1059,6 +1062,7 @@ 'mongodb': 'php-mongodb', 'mysql': 'php-mysql', 'mysqlnd': 'php', + 'net-smtp': 'php-net-smtp', 'net4': 'php-net-ipv4', 'net6': 'php-net-ipv6', 'oauth': 'php-oauth', @@ -1440,6 +1444,7 @@ }, grain='oscodename'), 'mysql': 'php5-mysql', 'mysqlnd': 'php5-mysqlnd', + 'net-smtp': 'php-net-smtp', 'net4': 'php-net-ipv4', 'net6': 'php-net-ipv6', 'oauth': 'php5-oauth', @@ -1826,6 +1831,7 @@ 'mongodb': 'php-mongodb', 'mysql': 'php' + phpng_version + '-mysql', 'mysqlnd': 'php' + phpng_version + '-mysql', + 'net-smtp': 'php-net-smtp', 'net4': 'php-net-ipv4', 'net6': 'php-net-ipv6', 'oauth': 'php-oauth', @@ -2149,6 +2155,7 @@ 'memcached': 'php5-memcached', 'mysql': 'php5-mysql', 'mysqlnd': 'php5-mysqlnd', + 'net-smtp': 'php-net-smtp', 'net4': 'php-net-ipv4', 'net6': 'php-net-ipv6', 'oauth': 'php5-oauth', @@ -2263,6 +2270,7 @@ 'memcached': 'php-pecl-memcached', 'mysql': 'php-mysql', 'mysqlnd': 'php-mysqlnd', + 'net-smtp': 'php-pear-Net-SMTP', 'net4': 'php-pear-Net-IPv4', 'oauth': 'php-pecl-oauth', 'opcache': 'php-pecl-zendopcache', diff --git a/php/ng/net-smtp.sls b/php/ng/net-smtp.sls new file mode 100644 index 0000000..3a9a970 --- /dev/null +++ b/php/ng/net-smtp.sls @@ -0,0 +1,2 @@ +{% set state = 'net-smtp' %} +{% include "php/ng/installed.jinja" %} From bb2cdc572fde08d16a6a375eeab13475e2bb2baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kenneth=20=C3=98strup?= Date: Tue, 1 May 2018 11:18:10 +0200 Subject: [PATCH 3/3] Added PHP Pear Mail support --- php/ng/mail.sls | 2 ++ php/ng/map.jinja | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 php/ng/mail.sls diff --git a/php/ng/mail.sls b/php/ng/mail.sls new file mode 100644 index 0000000..6193ef7 --- /dev/null +++ b/php/ng/mail.sls @@ -0,0 +1,2 @@ +{% set state = 'mail' %} +{% include "php/ng/installed.jinja" %} diff --git a/php/ng/map.jinja b/php/ng/map.jinja index 7769779..9a055f5 100644 --- a/php/ng/map.jinja +++ b/php/ng/map.jinja @@ -41,6 +41,7 @@ 'ldap': 'php' + phpng_version + '-ldap', 'local_bin': '/usr/local/bin', 'auth-sasl': 'php-auth-sasl', + 'mail': 'php-mail', 'mbstring': 'php' + phpng_version + '-mbstring', 'mcrypt': 'php' + phpng_version + '-mcrypt', 'memcache': 'php-memcache', @@ -364,6 +365,7 @@ 'ldap': 'php' + phpng_version + '-ldap', 'local_bin': '/usr/local/bin', 'auth-sasl': 'php-auth-sasl', + 'mail': 'php-mail', 'mbstring': 'php' + phpng_version + '-mbstring', 'mcrypt': 'php' + phpng_version + '-mcrypt', 'memcache': 'php-memcache', @@ -686,6 +688,7 @@ 'ldap': 'php-ldap', 'local_bin': '/usr/local/bin', 'auth-sasl': 'php-auth-sasl', + 'mail': 'php-mail', 'mbstring': 'php-mbstring', 'mcrypt': 'php-mcrypt', 'memcache': 'php-memcache', @@ -1055,6 +1058,7 @@ 'ldap': 'php-ldap', 'local_bin': '/usr/local/bin', 'auth-sasl': 'php-auth-sasl', + 'mail': 'php-mail', 'mbstring': 'php-mbstring', 'mcrypt': 'php-mcrypt', 'memcache': 'php-memcache', @@ -1431,6 +1435,7 @@ 'ldap': 'php5-ldap', 'local_bin': '/usr/local/bin', 'auth-sasl': 'php-auth-sasl', + 'mail': 'php-mail', 'mbstring': 'php5', 'mcrypt': 'php5-mcrypt', 'mdb2': 'php-mdb2', @@ -1823,6 +1828,7 @@ 'ldap': 'php' + phpng_version + '-ldap', 'local_bin': '/usr/local/bin', 'auth-sasl': 'php-auth-sasl', + 'mail': 'php-mail', 'mbstring': 'php' + phpng_version + '-mbstring', 'mcrypt': 'php' + phpng_version + '-mcrypt', 'memcache': 'php-memcache', @@ -2146,6 +2152,7 @@ 'ldap': 'php5-ldap', 'local_bin': '/usr/local/bin', 'auth-sasl': 'php-auth-sasl', + 'mail': 'php-mail', 'mbstring': 'php5', 'mcrypt': 'php5-mcrypt', 'mdb2': 'php-mdb2', @@ -2264,6 +2271,7 @@ 'ldap': 'php-ldap', 'local_bin': '/usr/local/bin', 'auth-sasl': 'php-pear-Auth-SASL', + 'mail': 'php-pear-Mail', 'mbstring': 'php-mbstring', 'mcrypt': 'php-mcrypt', 'memcache': 'php-pecl-memcache',