From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- net-nds/phpldapadmin/Manifest | 6 +- .../files/phpldapadmin-fix-php5.5-support.patch | 152 --------------------- net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild | 48 ------- net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild | 44 ------ net-nds/phpldapadmin/phpldapadmin-1.2.5.ebuild | 51 +++++++ 5 files changed, 53 insertions(+), 248 deletions(-) delete mode 100644 net-nds/phpldapadmin/files/phpldapadmin-fix-php5.5-support.patch delete mode 100644 net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild delete mode 100644 net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild create mode 100644 net-nds/phpldapadmin/phpldapadmin-1.2.5.ebuild (limited to 'net-nds/phpldapadmin') diff --git a/net-nds/phpldapadmin/Manifest b/net-nds/phpldapadmin/Manifest index 48241bc07797..64cbfc8a6fcc 100644 --- a/net-nds/phpldapadmin/Manifest +++ b/net-nds/phpldapadmin/Manifest @@ -1,7 +1,5 @@ AUX phpldapadmin-1.2.1.1-fix-magic-quotes.patch 829 BLAKE2B 833f2d7b8934b9547ce26c5ed8b63f67ef1a6d416f19fcd1455696b47385d7ee313107f698ef513cb027a9ab92580bf0cf1c246ba4b1f54d97c984eb4e5bc79d SHA512 64830cc864dbbe3d0aa72d0e1165b787287430f3ea7507c8e9df2115b03df73944c63a4e9c09a7f8c9a11d41f48327ee26c204ede3bae2209b0f47076d5587b3 -AUX phpldapadmin-fix-php5.5-support.patch 5157 BLAKE2B 03bd6922b201445be6aba3695e8a162a1716b234d0f314f221dbbd6bdd6c731ec01b7f0c84821c29d6f2ab6f45a6b68c5d5dabe11a649fc26d648f020a74d184 SHA512 c0f990fea6e8f312d36f7eea754d3f4f1c2356a5e233c5df82fa1ce4b194d160ad40ce2ef85441f6686feecffae831770591e44cc67982bee63e870464da7f7b AUX postinstall2-en.txt 131 BLAKE2B 7ace4170aa9f57f1eb89319f11cee249be8bbec50dad798c0be22616d31a01a3cfeb6057485c8656318c0330c3d9b4ffb1d343978742618edfc6bbf9789807e8 SHA512 f465adc204ef40675848e39e37bab3f2eb5054549e3b787953793ece683df84a52373d23383601b3c53c6b98bf8f1de83c6d83be117be9c00da7058763709d6b -DIST phpldapadmin-1.2.3.tgz 1115707 BLAKE2B 85f11713134f7af65a40cb2cab619590bdea9dfc23d2bfdec0b0837772f166f5b8cd61125b753167726abf109a5e5ac8607dc75a750299c61f895638c2d3b98a SHA512 58a57ca577586685ebd0d7fde7e299b8945d1693018c7803e19239b79f4b9d72a4d207d53c9f284268e32398108038efafcdb434e634619bfe87db3524d267b6 -EBUILD phpldapadmin-1.2.3-r1.ebuild 1355 BLAKE2B 0eb44b95e94244b5ae785c5ea7428068af025d439e56a96658f87897e3a1da2b90380c52787e764bc68fbb0f5e42e007c0d51739b15bdb8d5cc41b2df936588e SHA512 70d01949439b7d4374b247be934fb66ad78bd898e119932166dc9ebe0aa6a705ff36709098a4ce3bfae3bea6ddaa4bc17344c073c8aaf84483297ade272394c8 -EBUILD phpldapadmin-1.2.3.ebuild 1112 BLAKE2B 9e749edddaa9927317709e507eb8669434f119239f8c0b0e3101718e44312e2ed40416d9602389be179185f349bc7944409fe54950cae7346abb121fe76e9791 SHA512 08f6c6fb6bdbad3dc80b36d4544a7ff1aa2a49f1ef884287787b71f33afbf53569f035f0d92370e2541eac1e5c95cecd37797f9788eae2e0ebb695ab60ea7589 +DIST phpldapadmin-1.2.5.tar.gz 1117335 BLAKE2B 00d82434dbdadf1f90f5f356ad644d7cfa078cc0696d7cf64e36bc49baf2a5f29bd62fbcd265d9771e713bdd19d4e5708e77e1229199b6712874f982f9b067b0 SHA512 53cf5a8fb3ae3e5fc3c2ab6d23fb9cf731f1d39e122db6531e87461610f13e4bc1c9e8d4fcf7abd2ee5697022a068a9e23d8e039ba79a12929faeb6265920701 +EBUILD phpldapadmin-1.2.5.ebuild 1199 BLAKE2B 58ce16b374b868e16f1ef89629c9475f13f47b9908d1d9ca95f1ef2ddd4bdf1d4bc6641e9708d6607a3059c6483bc6209ac9d946ae03a348f857d953cf311189 SHA512 e2013af12d6e74d8c00f1cb8fe7a7650ce51edf9e92a7d25e94d027316227e6d34e1488a4d526ddfeded961884888740ee518b6b4d11283d3e92ca22cd716ef0 MISC metadata.xml 593 BLAKE2B fbf89c9834ec8fc07ec9512ee6e3aa3fa13c9665f82a7e773b61ba974132badda5f5c7abccd2c2c63047b9e6e7d237a404b3c0c04d7fbd43a65d2612ce7ec6b7 SHA512 76e19473a162674546562e71b893a1f4a076bae09998b7ad4136421d60c33b2c64ae32fd2d618128417b56437fc6ed1ae823f4642c8c4facd81a36e72a2451b3 diff --git a/net-nds/phpldapadmin/files/phpldapadmin-fix-php5.5-support.patch b/net-nds/phpldapadmin/files/phpldapadmin-fix-php5.5-support.patch deleted file mode 100644 index df6a7c163758..000000000000 --- a/net-nds/phpldapadmin/files/phpldapadmin-fix-php5.5-support.patch +++ /dev/null @@ -1,152 +0,0 @@ -commit 7e53dab990748c546b79f0610c3a7a58431e9ebc -Author: Michael Laccetti -Date: Thu Aug 29 09:13:56 2013 -0400 - - Fixed two issues to get phpLdapAdmin to work under PHP 5.5.x - 1) password_hash is an actual function, so renamed instances to password_hash_custom (HT: https://sourceforge.net/mailarchive/message.php?msg_id=31302386) - 2) Fixed the preg_replace to preg_replace_callback to use the /e/ functionality in the officially endorsed fashion - -diff --git a/lib/PageRender.php b/lib/PageRender.php -index 7d86a54..eed5d5f 100644 ---- a/lib/PageRender.php -+++ b/lib/PageRender.php -@@ -287,7 +287,7 @@ class PageRender extends Visitor { - break; - - default: -- $vals[$i] = password_hash($passwordvalue,$enc); -+ $vals[$i] = password_hash_custom($passwordvalue,$enc); - } - - $vals = array_unique($vals); -@@ -957,7 +957,7 @@ class PageRender extends Visitor { - if (trim($val)) - $enc_type = get_enc_type($val); - else -- $enc_type = $server->getValue('appearance','password_hash'); -+ $enc_type = $server->getValue('appearance','password_hash_custom'); - - $obfuscate_password = obfuscate_password_display($enc_type); - -@@ -982,7 +982,7 @@ class PageRender extends Visitor { - if (trim($val)) - $enc_type = get_enc_type($val); - else -- $enc_type = $server->getValue('appearance','password_hash'); -+ $enc_type = $server->getValue('appearance','password_hash_custom'); - - echo '
'; - -diff --git a/lib/ds_ldap.php b/lib/ds_ldap.php -index c346660..7532539 100644 ---- a/lib/ds_ldap.php -+++ b/lib/ds_ldap.php -@@ -1116,13 +1116,24 @@ class ldap extends DS { - - if (is_array($dn)) { - $a = array(); -- foreach ($dn as $key => $rdn) -- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn); -+ foreach ($dn as $key => $rdn) { -+ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', -+ function ($m) { -+ return ''.chr(hexdec('\\1')).''; -+ }, -+ $rdn -+ ); -+ } - - return $a; - - } else -- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn); -+ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', -+ function ($m) { -+ return ''.chr(hexdec('\\1')).''; -+ }, -+ $dn -+ ); - } - - public function getRootDSE($method=null) { -diff --git a/lib/ds_ldap_pla.php b/lib/ds_ldap_pla.php -index 7ece393..6b0990e 100644 ---- a/lib/ds_ldap_pla.php -+++ b/lib/ds_ldap_pla.php -@@ -16,7 +16,7 @@ class ldap_pla extends ldap { - function __construct($index) { - parent::__construct($index); - -- $this->default->appearance['password_hash'] = array( -+ $this->default->appearance['password_hash_custom'] = array( - 'desc'=>'Default HASH to use for passwords', - 'default'=>'md5'); - -diff --git a/lib/functions.php b/lib/functions.php -index 56d8bf3..5ac3caf 100644 ---- a/lib/functions.php -+++ b/lib/functions.php -@@ -2127,7 +2127,7 @@ function password_types() { - * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear. - * @return string The hashed password. - */ --function password_hash($password_clear,$enc_type) { -+function password_hash_custom($password_clear,$enc_type) { - if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) - debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs); - -@@ -2318,7 +2318,7 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword - - # SHA crypted passwords - case 'sha': -- if (strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0) -+ if (strcasecmp(password_hash_custom($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0) - return true; - else - return false; -@@ -2327,7 +2327,7 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword - - # MD5 crypted passwords - case 'md5': -- if( strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0) -+ if( strcasecmp(password_hash_custom($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0) - return true; - else - return false; -@@ -2392,7 +2392,7 @@ function password_check($cryptedpassword,$plainpassword,$attribute='userpassword - - # SHA512 crypted passwords - case 'sha512': -- if (strcasecmp(password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0) -+ if (strcasecmp(password_hash_custom($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0) - return true; - else - return false; -@@ -2564,13 +2564,24 @@ function dn_unescape($dn) { - if (is_array($dn)) { - $a = array(); - -- foreach ($dn as $key => $rdn) -- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn); -+ foreach ($dn as $key => $rdn) { -+ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', -+ function ($m) { -+ return ''.chr(hexdec('\\1')).''; -+ }, -+ $rdn -+ ); -+ } - - return $a; - - } else { -- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn); -+ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', -+ function ($m) { -+ return ''.chr(hexdec('\\1')).''; -+ }, -+ $dn -+ ); - } - } - diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild deleted file mode 100644 index 786fde03497b..000000000000 --- a/net-nds/phpldapadmin/phpldapadmin-1.2.3-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils webapp - -DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server" -HOMEPAGE="http://phpldapadmin.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="" - -RDEPEND="dev-lang/php[hash,ldap,session,xml,nls] - >=dev-lang/php-5.3 - virtual/httpd-php" - -need_httpd_cgi - -src_prepare() { - mv config/config.php.example config/config.php - epatch "${FILESDIR}/${PN}-1.2.1.1-fix-magic-quotes.patch" - # http://phpldapadmin.git.sourceforge.net/git/gitweb.cgi?p=phpldapadmin/phpldapadmin;a=commit;h=7dc8d57d6952fe681cb9e8818df7f103220457bd - - epatch "${FILESDIR}/${PN}-fix-php5.5-support.patch" - # https://sourceforge.net/u/nihilisticz/phpldapadmin/ci/7e53dab990748c546b79f0610c3a7a58431e9ebc/ - # This patch has been requested to be merged, but there's no recent activity by upstream -} - -src_install() { - webapp_src_preinst - - dodoc INSTALL - - # Restrict config file access - bug 280836 - chown root:apache "config/config.php" - chmod 640 "config/config.php" - - insinto "${MY_HTDOCSDIR}" - doins -r * - - webapp_configfile "${MY_HTDOCSDIR}/config/config.php" - webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt - - webapp_src_install -} diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild deleted file mode 100644 index 4dcabc71b146..000000000000 --- a/net-nds/phpldapadmin/phpldapadmin-1.2.3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils webapp - -DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server" -HOMEPAGE="http://phpldapadmin.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="" - -RDEPEND="dev-lang/php[hash,ldap,session,xml,nls] - >=dev-lang/php-5.3 - virtual/httpd-php" - -need_httpd_cgi - -src_prepare() { - mv config/config.php.example config/config.php - epatch "${FILESDIR}/${PN}-1.2.1.1-fix-magic-quotes.patch" - # http://phpldapadmin.git.sourceforge.net/git/gitweb.cgi?p=phpldapadmin/phpldapadmin;a=commit;h=7dc8d57d6952fe681cb9e8818df7f103220457bd -} - -src_install() { - webapp_src_preinst - - dodoc INSTALL - - # Restrict config file access - bug 280836 - chown root:apache "config/config.php" - chmod 640 "config/config.php" - - insinto "${MY_HTDOCSDIR}" - doins -r * - - webapp_configfile "${MY_HTDOCSDIR}/config/config.php" - webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt - - webapp_src_install -} diff --git a/net-nds/phpldapadmin/phpldapadmin-1.2.5.ebuild b/net-nds/phpldapadmin/phpldapadmin-1.2.5.ebuild new file mode 100644 index 000000000000..d2eb59891db2 --- /dev/null +++ b/net-nds/phpldapadmin/phpldapadmin-1.2.5.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit webapp + +MY_PN="phpLDAPadmin" +DESCRIPTION="phpLDAPadmin is a web-based tool for managing all aspects of your LDAP server" +HOMEPAGE="http://phpldapadmin.sourceforge.net" +SRC_URI="https://github.com/leenooks/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" +IUSE="" + +RDEPEND=" + >=dev-lang/php-5.5[hash(+),ldap,session,xml,nls] + virtual/httpd-php +" +S="${WORKDIR}/${MY_PN}-${PV}" + +# http://phpldapadmin.git.sourceforge.net/git/gitweb.cgi?p=phpldapadmin/phpldapadmin;a=commit;h=7dc8d57d6952fe681cb9e8818df7f103220457bd +PATCHES=( + "${FILESDIR}/${PN}-1.2.1.1-fix-magic-quotes.patch" +) + +need_httpd_cgi + +src_prepare() { + mv config/config.php.example config/config.php + default +} + +src_install() { + webapp_src_preinst + + dodoc INSTALL.md + + # Restrict config file access - bug 280836 + chown root:apache "config/config.php" + chmod 640 "config/config.php" + + insinto "${MY_HTDOCSDIR}" + doins -r * + + webapp_configfile "${MY_HTDOCSDIR}/config/config.php" + webapp_postinst_txt en "${FILESDIR}"/postinstall2-en.txt + + webapp_src_install +} -- cgit v1.2.3