From 434d713861b70f6c6563d6ee50a8e64f14c970d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 15 Feb 2018 16:58:00 +0000 Subject: gentoo resync : 15.02.2018 --- dev-php/PEAR-Crypt_CHAP/Manifest | 3 +- .../PEAR-Crypt_CHAP-1.5.0-r1.ebuild | 25 --------- .../PEAR-Crypt_CHAP-1.5.0-r2.ebuild | 26 +++++++++ .../files/CHAP-1.5.0-constructor.patch | 65 ++++++++++++++++++++++ 4 files changed, 93 insertions(+), 26 deletions(-) delete mode 100644 dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r1.ebuild create mode 100644 dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild create mode 100644 dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch (limited to 'dev-php/PEAR-Crypt_CHAP') diff --git a/dev-php/PEAR-Crypt_CHAP/Manifest b/dev-php/PEAR-Crypt_CHAP/Manifest index cdce1a03ca8f..dae3495d57cd 100644 --- a/dev-php/PEAR-Crypt_CHAP/Manifest +++ b/dev-php/PEAR-Crypt_CHAP/Manifest @@ -1,4 +1,5 @@ +AUX CHAP-1.5.0-constructor.patch 1273 BLAKE2B 84e35031521587383a843c78f49df567cdaf3fd81360454797993881e272a4d5e7816073cc774e7d7c47e6c30cebaa70521c5b391f28cbc081c96d5d90a207df SHA512 2053c12f4416654b614176ff06565032df25e3db970eaeb02e327ceb986c53adfd6b9c4285d5b81525ad8f93e548794fc81ee3da31ad4ebe1ea0e707f9e47369 DIST Crypt_CHAP-1.5.0.tgz 5549 BLAKE2B 7b79e311d36a7c59b4838f5d0bfda1a39792519f53e036fb2f500130cd9265280fb2e2fb31683d95dee283875fe738746b19c78fc80fa0fd965e19f431d032ac SHA512 44cdfdf0bc857b3992c2635945374033112d972cdefeac8a45810f5b79a6a532de67fc5e9a06f2ec4b3ce4df62e300451d0f4078b4f8ecc9805dca5c08f6aa95 -EBUILD PEAR-Crypt_CHAP-1.5.0-r1.ebuild 523 BLAKE2B b264c855a10df6726a4bf80bc32e647ca9efa06161fe19bf8bb0033363bffae0f34ae52a9b1532494b05f9da4eef812eccd83c1017ef5c2ab2133912a42c20d8 SHA512 1fddcdb2e2936835b364fdc43d2fae01e4f46cc56c6ea0459f2968406cb2c3fd5acceb2c073a79a8dc4490e29b87e6e08c4abd364ecdce223337ee81cfef29dc +EBUILD PEAR-Crypt_CHAP-1.5.0-r2.ebuild 578 BLAKE2B 397e14424dd7d9700eb56e68430d88266480a14b4ece8f33d84f5f817d9469d1c4c896f5f141b87899b7e8c2adea204cb7b12133d3f073893bef4a818b98aa2a SHA512 d571ec79d93bea2af048fe988a66b43a1833b97abc75526fbd4954e45725185307ebde18f491009ebe9a10bab5d5a490c291b82f2232e2f578f67b9401728440 EBUILD PEAR-Crypt_CHAP-1.5.0.ebuild 502 BLAKE2B 914123179113a9e307e561f5671c80cd21860a80128b84225a243ad6b232ada1c8e3922030655d879c707bb6aa79d8db326c7b87c79a98cbec0a03c406c9462f SHA512 71aadc63de5776543fdb9f43c6e0ae5fe1a75c3128460c3759e7805d3349711821a587c61ed0097b714103c9713d5903e21e9ba7ff5e89ce23d17bee08874344 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r1.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r1.ebuild deleted file mode 100644 index f924f90e41a2..000000000000 --- a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="Generating CHAP packets" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="test" -RDEPEND="dev-lang/php:*[crypt,hash]" -DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )" - -src_install() { - php-pear-r2_src_install - insinto /usr/share/php/Crypt - doins CHAP.php -} - -src_test() { - pear run-tests tests/Crypt_CHAP.phpt || die -} diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild new file mode 100644 index 000000000000..b07a5c6270e9 --- /dev/null +++ b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit php-pear-r2 + +DESCRIPTION="Generating CHAP packets" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="test" +RDEPEND="dev-lang/php:*[crypt,hash]" +DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )" +PATCHES=( "${FILESDIR}/CHAP-1.5.0-constructor.patch" ) + +src_install() { + php-pear-r2_src_install + insinto /usr/share/php/Crypt + doins CHAP.php +} + +src_test() { + pear run-tests tests/Crypt_CHAP.phpt || die +} diff --git a/dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch b/dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch new file mode 100644 index 000000000000..6fa92898e106 --- /dev/null +++ b/dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch @@ -0,0 +1,65 @@ +diff -aurN a/CHAP.php b/CHAP.php +--- a/CHAP.php 1970-01-01 04:13:08.000000000 -0500 ++++ b/CHAP.php 2018-02-13 13:04:49.812389739 -0500 +@@ -78,7 +78,19 @@ + * @var integer + */ + var $chapid = 1; +- ++ ++ /** ++ * Constructor ++ * ++ * Generates a random challenge ++ * @return void ++ */ ++ function __construct() ++ { ++ parent::__construct(); ++ $this->generateChallenge(); ++ } ++ + /** + * Constructor + * +@@ -160,7 +172,19 @@ + * @var bool + */ + var $flags = 1; +- ++ ++ /** ++ * Constructor ++ * ++ * Loads the hash extension ++ * @return void ++ */ ++ function __construct() ++ { ++ parent::__construct(); ++ $this->loadExtension('hash'); ++ } ++ + /** + * Constructor + * +@@ -412,6 +436,19 @@ + /** + * Constructor + * ++ * Generates the 16 Bytes peer and authentication challenge ++ * @return void ++ */ ++ function __construct() ++ { ++ parent::__construct(); ++ $this->generateChallenge('peerChallenge', 16); ++ $this->generateChallenge('authChallenge', 16); ++ } ++ ++ /** ++ * Constructor ++ * + * Generates the 16 Bytes peer and authentication challenge + * @return void + */ -- cgit v1.2.3