[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-pam/
commit: d09f389970a1a1f1dca74e62b4cb7d5e88a02ceb Author: Brian Evans gentoo org> AuthorDate: Thu Jan 20 16:10:40 2022 + Commit: Brian Evans gentoo org> CommitDate: Thu Jan 20 16:21:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09f3899 dev-php/pecl-pam: Version bump for 2.2.4 Signed-off-by: Brian Evans gentoo.org> dev-php/pecl-pam/Manifest | 1 + dev-php/pecl-pam/pecl-pam-2.2.4.ebuild | 35 ++ 2 files changed, 36 insertions(+) diff --git a/dev-php/pecl-pam/Manifest b/dev-php/pecl-pam/Manifest index 2c4833e6bb65..1b2d7809e20e 100644 --- a/dev-php/pecl-pam/Manifest +++ b/dev-php/pecl-pam/Manifest @@ -1 +1,2 @@ DIST pam-2.2.3.tgz 9422 BLAKE2B 4d10ad40bdfbaa54225723a46a78dbe1609d89cf75d0ca73345e3346fb437a5500e451357b3b0bbcce88c13f8a54dec5b39e9c0741a6e89c0b3936cbb05da91a SHA512 1adc72b1517e224f36f960134d3444d36e6fa5a6868ce4bc1b87edbbfb09406910774061988300094ebf637ee54c5f5a43e0c42c8e2ab78c81a0910063d48c51 +DIST pam-2.2.4.tgz 9500 BLAKE2B fca0bf17c8eb38344f3ae5b47b395caf1a6d0d5f2ad83446a39d62b101492b06ae9cd8834ca63ad6f5e445de3c31a8616ac8180ce7510b0b4220b29e7cb04297 SHA512 fa0dac46cc61a590de4ece925a68e6fbece8c77a00dc48766635190b2f32888cee501d7f798c51890983ee643e15e3514360a0b12d0b56d8a2294ea3fe6acd7e diff --git a/dev-php/pecl-pam/pecl-pam-2.2.4.ebuild b/dev-php/pecl-pam/pecl-pam-2.2.4.ebuild new file mode 100644 index ..4a809c31272d --- /dev/null +++ b/dev-php/pecl-pam/pecl-pam-2.2.4.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PHP_EXT_NAME="pam" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS=( --with-pam=/usr ) +DOCS=( README ) + +USE_PHP="php7-3 php7-4 php8-0 php8-1" + +inherit php-ext-pecl-r3 pam + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="This extension provides PAM (Pluggable Authentication Modules) integration" +LICENSE="PHP-3.01" +SLOT="0" +IUSE="" + +DEPEND="sys-libs/pam" +RDEPEND="${DEPEND}" + +src_prepare() { + #Fix DOS line endings + sed -i 's/\r$//' -- pam.c || die + php-ext-source-r3_src_prepare +} + +src_install() { + pamd_mimic_system php auth account password + php-ext-pecl-r3_src_install +}
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-pam/, dev-php/pecl-pam/files/
commit: 953d60646be3ce87060e8b18e127d432876ae226 Author: Brian Evans gentoo org> AuthorDate: Tue Nov 23 15:28:05 2021 + Commit: Brian Evans gentoo org> CommitDate: Tue Nov 23 16:15:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=953d6064 dev-php/pecl-pam: Drop old Signed-off-by: Brian Evans gentoo.org> dev-php/pecl-pam/Manifest | 1 - dev-php/pecl-pam/files/1.0.3-php7.patch | 118 -- dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild | 41 --- 3 files changed, 160 deletions(-) diff --git a/dev-php/pecl-pam/Manifest b/dev-php/pecl-pam/Manifest index 7da8caaeff39..2c4833e6bb65 100644 --- a/dev-php/pecl-pam/Manifest +++ b/dev-php/pecl-pam/Manifest @@ -1,2 +1 @@ -DIST pam-1.0.3.tgz 6671 BLAKE2B f416fd0e47d3fda6a1d86e44a7ca17fc9a0428f976f18e2b663a2fd1e09b790cd069ca16d930d6dca6554762ca59bda987929e52365ed813949c1a93291c1dcc SHA512 3580582f1456b31be30a713cadaaca106527f2d4f3f12032b5d3617cc361aaf49539a9db3dd27221ce40320187abaac0f6ad4e23cdfe5eaa94436e3eaef3fb9c DIST pam-2.2.3.tgz 9422 BLAKE2B 4d10ad40bdfbaa54225723a46a78dbe1609d89cf75d0ca73345e3346fb437a5500e451357b3b0bbcce88c13f8a54dec5b39e9c0741a6e89c0b3936cbb05da91a SHA512 1adc72b1517e224f36f960134d3444d36e6fa5a6868ce4bc1b87edbbfb09406910774061988300094ebf637ee54c5f5a43e0c42c8e2ab78c81a0910063d48c51 diff --git a/dev-php/pecl-pam/files/1.0.3-php7.patch b/dev-php/pecl-pam/files/1.0.3-php7.patch deleted file mode 100644 index d56fffb08d38.. --- a/dev-php/pecl-pam/files/1.0.3-php7.patch +++ /dev/null @@ -1,118 +0,0 @@ a/pam.c2016-12-01 14:29:27.453904230 -0500 -+++ b/pam.c2016-12-01 14:27:26.496109755 -0500 -@@ -227,8 +227,13 @@ - PHP_FUNCTION(pam_auth) - { - char *username, *password; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t username_len, password_len; -+ zval *status = NULL, *server, *remote_addr; -+#else - int username_len, password_len; - zval *status = NULL, **server, **remote_addr; -+#endif - zend_bool checkacctmgmt = 1; - - pam_auth_t userinfo = {NULL, NULL}; -@@ -248,22 +253,37 @@ - if (status) { - spprintf(_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start"); - zval_dtor(status); -+#if PHP_MAJOR_VERSION >= 7 -+ ZVAL_STRING(status, error_msg); -+ efree(error_msg); -+#else - ZVAL_STRING(status, error_msg, 0); -+#endif - } - RETURN_FALSE; - } - -+#if PHP_MAJOR_VERSION >= 7 -+ if ((remote_addr = zend_hash_str_find(Z_ARR(PG(http_globals)[TRACK_VARS_SERVER]), "REMOTE_ADDR", sizeof("REMOTE_ADDR")-1)) != NULL && Z_TYPE_P(remote_addr) == IS_STRING) { -+ pam_set_item(pamh, PAM_RHOST, Z_STRVAL_P(remote_addr)); -+#else - if (zend_hash_find((symbol_table), "_SERVER", sizeof("_SERVER"), (void **)) == SUCCESS && Z_TYPE_PP(server) == IS_ARRAY) { - if (zend_hash_find(Z_ARRVAL_PP(server), "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **)_addr) == SUCCESS && Z_TYPE_PP(remote_addr) == IS_STRING) { - pam_set_item(pamh, PAM_RHOST, Z_STRVAL_PP(remote_addr)); - } -+#endif - } - - if ((result = pam_authenticate(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) { - if (status) { - spprintf(_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate"); - zval_dtor(status); -+#if PHP_MAJOR_VERSION >= 7 -+ ZVAL_STRING(status, error_msg); -+ efree(error_msg); -+#else - ZVAL_STRING(status, error_msg, 0); -+#endif - } - pam_end(pamh, PAM_SUCCESS); - RETURN_FALSE; -@@ -274,7 +294,12 @@ - if (status) { - spprintf(_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_acct_mgmt"); - zval_dtor(status); -+#if PHP_MAJOR_VERSION >= 7 -+ ZVAL_STRING(status, error_msg); -+ efree(error_msg); -+#else - ZVAL_STRING(status, error_msg, 0); -+#endif - } - pam_end(pamh, PAM_SUCCESS); - RETURN_FALSE; -@@ -291,7 +316,11 @@ - PHP_FUNCTION(pam_chpass) - { - char *username, *oldpass, *newpass; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t username_len, oldpass_len, newpass_len; -+#else - int username_len, oldpass_len, newpass_len; -+#endif - zval *status = NULL; - - pam_chpass_t userinfo = {NULL, NULL, NULL, 0}; -@@ -312,7 +341,12 @@ - if (status) { - spprintf(_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start"); - zval_dtor(status); -+#if
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-pam/
commit: bf4502f929743764aaef07bc342cd6ee5f22c9c5 Author: Brian Evans gentoo org> AuthorDate: Tue Nov 23 15:27:07 2021 + Commit: Brian Evans gentoo org> CommitDate: Tue Nov 23 16:15:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf4502f9 dev-php/pecl-pam: Add 8.1 target Signed-off-by: Brian Evans gentoo.org> dev-php/pecl-pam/pecl-pam-2.2.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild index 54ba34e572c7..58d800d7f8fa 100644 --- a/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild +++ b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild @@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no" PHP_EXT_ECONF_ARGS=( --with-pam=/usr ) DOCS=( README ) -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php7-3 php7-4 php8-0 php8-1" inherit php-ext-pecl-r3 pam
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-pam/
commit: 04dcd21238674ea64d9cda3bef10c068b6d17175 Author: Brian Evans gentoo org> AuthorDate: Fri Aug 27 14:14:27 2021 + Commit: Brian Evans gentoo org> CommitDate: Fri Aug 27 14:16:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04dcd212 dev-php/pecl-pam: Version bump for 2.2.3 Signed-off-by: Brian Evans gentoo.org> dev-php/pecl-pam/Manifest | 1 + dev-php/pecl-pam/pecl-pam-2.2.3.ebuild | 35 ++ 2 files changed, 36 insertions(+) diff --git a/dev-php/pecl-pam/Manifest b/dev-php/pecl-pam/Manifest index e4605a375aa..7da8caaeff3 100644 --- a/dev-php/pecl-pam/Manifest +++ b/dev-php/pecl-pam/Manifest @@ -1 +1,2 @@ DIST pam-1.0.3.tgz 6671 BLAKE2B f416fd0e47d3fda6a1d86e44a7ca17fc9a0428f976f18e2b663a2fd1e09b790cd069ca16d930d6dca6554762ca59bda987929e52365ed813949c1a93291c1dcc SHA512 3580582f1456b31be30a713cadaaca106527f2d4f3f12032b5d3617cc361aaf49539a9db3dd27221ce40320187abaac0f6ad4e23cdfe5eaa94436e3eaef3fb9c +DIST pam-2.2.3.tgz 9422 BLAKE2B 4d10ad40bdfbaa54225723a46a78dbe1609d89cf75d0ca73345e3346fb437a5500e451357b3b0bbcce88c13f8a54dec5b39e9c0741a6e89c0b3936cbb05da91a SHA512 1adc72b1517e224f36f960134d3444d36e6fa5a6868ce4bc1b87edbbfb09406910774061988300094ebf637ee54c5f5a43e0c42c8e2ab78c81a0910063d48c51 diff --git a/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild new file mode 100644 index 000..54ba34e572c --- /dev/null +++ b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_NAME="pam" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS=( --with-pam=/usr ) +DOCS=( README ) + +USE_PHP="php7-3 php7-4 php8-0" + +inherit php-ext-pecl-r3 pam + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="This extension provides PAM (Pluggable Authentication Modules) integration" +LICENSE="PHP-3.01" +SLOT="0" +IUSE="" + +DEPEND="sys-libs/pam" +RDEPEND="${DEPEND}" + +src_prepare() { + #Fix DOS line endings + sed -i 's/\r$//' -- pam.c || die + php-ext-source-r3_src_prepare +} + +src_install() { + pamd_mimic_system php auth account password + php-ext-pecl-r3_src_install +}
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-pam/
commit: eadd8de8dc5ef6781f9d0b6452c272cd2b05f458 Author: Brian Evans gentoo org> AuthorDate: Thu Jan 28 16:28:00 2021 + Commit: Brian Evans gentoo org> CommitDate: Thu Jan 28 16:29:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eadd8de8 dev-php/pecl-pam: Drop unreachable targets Signed-off-by: Brian Evans gentoo.org> dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild index 233b87e332c..5827d6ef1d2 100644 --- a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild +++ b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -8,7 +8,7 @@ PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS=( README ) -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4" inherit php-ext-pecl-r3 pam
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-pam/
commit: 3c99501301c6f3515d6199a8314955f5b55d4cc6 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Nov 29 13:24:25 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Nov 29 13:24:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c995013 dev-php/pecl-pam: add PHP 7.4 support Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Thomas Deutschmann gentoo.org> dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild index b01c985412f..233b87e332c 100644 --- a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild +++ b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild @@ -8,7 +8,7 @@ PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS=( README ) -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4" inherit php-ext-pecl-r3 pam
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-pam/
commit: b79b80b6899957afacc4a390fd53daba2a10d715 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Jun 7 12:57:26 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Jun 7 14:07:58 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79b80b6 dev-php/pecl-pam: add PHP 7.3 support Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Thomas Deutschmann gentoo.org> dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild index db57bd50876..b01c985412f 100644 --- a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild +++ b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" PHP_EXT_NAME="pam" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS=( README ) -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 pam
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-pam/
commit: 141f6c633358e1f7fef2445484ff20c2880cc9a1 Author: Brian Evans gentoo org> AuthorDate: Tue Mar 27 16:50:12 2018 + Commit: Brian Evans gentoo org> CommitDate: Tue Mar 27 18:19:09 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=141f6c63 dev-php/pecl-pam: Revbump to add php7-1 and php7-2 support Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../{pecl-pam-1.0.3-r2.ebuild => pecl-pam-1.0.3-r3.ebuild} | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dev-php/pecl-pam/pecl-pam-1.0.3-r2.ebuild b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild similarity index 80% rename from dev-php/pecl-pam/pecl-pam-1.0.3-r2.ebuild rename to dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild index dcd2afeb776..db57bd50876 100644 --- a/dev-php/pecl-pam/pecl-pam-1.0.3-r2.ebuild +++ b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS=( README ) -USE_PHP="php5-6 php7-0" +USE_PHP="php5-6 php7-0 php7-1 php7-2" inherit php-ext-pecl-r3 pam @@ -26,10 +26,7 @@ PATCHES=( "${FILESDIR}/${PV}-php7.patch" ) src_prepare() { #Fix DOS line endings - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - sed -i 's/\r$//' -- pam.c || die - done + sed -i 's/\r$//' -- pam.c || die php-ext-source-r3_src_prepare }
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-pam/
commit: 208d91d4065ea4a510162a837fc4114f93c77365 Author: Brian Evans gentoo org> AuthorDate: Thu Dec 1 19:52:52 2016 + Commit: Brian Evans gentoo org> CommitDate: Thu Dec 1 19:53:34 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=208d91d4 dev-php/pecl-pam: Drop old Package-Manager: portage-2.3.2 dev-php/pecl-pam/pecl-pam-1.0.3-r1.ebuild | 34 --- 1 file changed, 34 deletions(-) diff --git a/dev-php/pecl-pam/pecl-pam-1.0.3-r1.ebuild b/dev-php/pecl-pam/pecl-pam-1.0.3-r1.ebuild deleted file mode 100644 index 1830941.. --- a/dev-php/pecl-pam/pecl-pam-1.0.3-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PHP_EXT_NAME="pam" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS="README" - -USE_PHP="php5-6 php5-5 php5-4" - -inherit php-ext-pecl-r2 pam - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="This extension provides PAM (Pluggable Authentication Modules) integration" -LICENSE="PHP-2.02" -SLOT="0" -IUSE="debug" - -DEPEND="sys-libs/pam" -RDEPEND="${DEPEND}" - -src_configure() { - my_conf="--with-pam=/usr $(use_enable debug)" - php-ext-source-r2_src_configure -} - -src_install() { - pamd_mimic_system php auth account password - php-ext-pecl-r2_src_install -}
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-pam/files/, dev-php/pecl-pam/
commit: 8f113e301d3d56ef3c9623c40014000a102db15c Author: Brian Evans gentoo org> AuthorDate: Thu Dec 1 19:51:56 2016 + Commit: Brian Evans gentoo org> CommitDate: Thu Dec 1 19:53:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f113e30 dev-php/pecl-pam: Revision bump to support PHP 7 and drop 5.4 and 5.5 PHP 7 patch created by me as it was rather trivial changes Package-Manager: portage-2.3.2 dev-php/pecl-pam/files/1.0.3-php7.patch | 118 ++ dev-php/pecl-pam/pecl-pam-1.0.3-r2.ebuild | 45 2 files changed, 163 insertions(+) diff --git a/dev-php/pecl-pam/files/1.0.3-php7.patch b/dev-php/pecl-pam/files/1.0.3-php7.patch new file mode 100644 index ..d56fffb --- /dev/null +++ b/dev-php/pecl-pam/files/1.0.3-php7.patch @@ -0,0 +1,118 @@ +--- a/pam.c2016-12-01 14:29:27.453904230 -0500 b/pam.c2016-12-01 14:27:26.496109755 -0500 +@@ -227,8 +227,13 @@ + PHP_FUNCTION(pam_auth) + { + char *username, *password; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t username_len, password_len; ++ zval *status = NULL, *server, *remote_addr; ++#else + int username_len, password_len; + zval *status = NULL, **server, **remote_addr; ++#endif + zend_bool checkacctmgmt = 1; + + pam_auth_t userinfo = {NULL, NULL}; +@@ -248,22 +253,37 @@ + if (status) { + spprintf(_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start"); + zval_dtor(status); ++#if PHP_MAJOR_VERSION >= 7 ++ ZVAL_STRING(status, error_msg); ++ efree(error_msg); ++#else + ZVAL_STRING(status, error_msg, 0); ++#endif + } + RETURN_FALSE; + } + ++#if PHP_MAJOR_VERSION >= 7 ++ if ((remote_addr = zend_hash_str_find(Z_ARR(PG(http_globals)[TRACK_VARS_SERVER]), "REMOTE_ADDR", sizeof("REMOTE_ADDR")-1)) != NULL && Z_TYPE_P(remote_addr) == IS_STRING) { ++ pam_set_item(pamh, PAM_RHOST, Z_STRVAL_P(remote_addr)); ++#else + if (zend_hash_find((symbol_table), "_SERVER", sizeof("_SERVER"), (void **)) == SUCCESS && Z_TYPE_PP(server) == IS_ARRAY) { + if (zend_hash_find(Z_ARRVAL_PP(server), "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **)_addr) == SUCCESS && Z_TYPE_PP(remote_addr) == IS_STRING) { + pam_set_item(pamh, PAM_RHOST, Z_STRVAL_PP(remote_addr)); + } ++#endif + } + + if ((result = pam_authenticate(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) { + if (status) { + spprintf(_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate"); + zval_dtor(status); ++#if PHP_MAJOR_VERSION >= 7 ++ ZVAL_STRING(status, error_msg); ++ efree(error_msg); ++#else + ZVAL_STRING(status, error_msg, 0); ++#endif + } + pam_end(pamh, PAM_SUCCESS); + RETURN_FALSE; +@@ -274,7 +294,12 @@ + if (status) { + spprintf(_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_acct_mgmt"); + zval_dtor(status); ++#if PHP_MAJOR_VERSION >= 7 ++ ZVAL_STRING(status, error_msg); ++ efree(error_msg); ++#else + ZVAL_STRING(status, error_msg, 0); ++#endif + } + pam_end(pamh, PAM_SUCCESS); + RETURN_FALSE; +@@ -291,7 +316,11 @@ + PHP_FUNCTION(pam_chpass) + { + char *username, *oldpass, *newpass; ++#if PHP_MAJOR_VERSION >= 7 ++ size_t username_len, oldpass_len, newpass_len; ++#else + int username_len, oldpass_len, newpass_len; ++#endif + zval *status = NULL; + + pam_chpass_t userinfo = {NULL, NULL, NULL, 0}; +@@ -312,7 +341,12 @@ + if (status) { + spprintf(_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start"); + zval_dtor(status); ++#if PHP_MAJOR_VERSION >= 7 ++ ZVAL_STRING(status, error_msg); ++ efree(error_msg); ++#else + ZVAL_STRING(status, error_msg, 0); ++#endif + } + RETURN_FALSE; + } +@@ -321,7 +355,12 @@ + if (status) { + spprintf(_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate"); + zval_dtor(status); ++#if PHP_MAJOR_VERSION >= 7 ++ ZVAL_STRING(status, error_msg); ++ efree(error_msg); ++#else + ZVAL_STRING(status, error_msg, 0); ++#endif + } + pam_end(pamh, PAM_SUCCESS); + RETURN_FALSE; +@@