Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Crypt_CHAP/files/, dev-php/PEAR-Crypt_CHAP/
Date: Tue, 13 Feb 2018 19:18:51
Message-Id: 1518549505.5b63c143676ed5d0201f703b41421e2ec6930957.grknight@gentoo
1 commit: 5b63c143676ed5d0201f703b41421e2ec6930957
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 13 18:16:31 2018 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 13 19:18:25 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b63c143
7
8 dev-php/PEAR-Crypt_CHAP: Revbump to include a fixed constructor patch
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 .../PEAR-Crypt_CHAP-1.5.0-r2.ebuild | 26 +++++++++
13 .../files/CHAP-1.5.0-constructor.patch | 65 ++++++++++++++++++++++
14 2 files changed, 91 insertions(+)
15
16 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
17 new file mode 100644
18 index 00000000000..b07a5c6270e
19 --- /dev/null
20 +++ b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild
21 @@ -0,0 +1,26 @@
22 +# Copyright 1999-2018 Gentoo Foundation
23 +# Distributed under the terms of the GNU General Public License v2
24 +
25 +EAPI=6
26 +
27 +inherit php-pear-r2
28 +
29 +DESCRIPTION="Generating CHAP packets"
30 +
31 +LICENSE="BSD"
32 +SLOT="0"
33 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
34 +IUSE="test"
35 +RDEPEND="dev-lang/php:*[crypt,hash]"
36 +DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
37 +PATCHES=( "${FILESDIR}/CHAP-1.5.0-constructor.patch" )
38 +
39 +src_install() {
40 + php-pear-r2_src_install
41 + insinto /usr/share/php/Crypt
42 + doins CHAP.php
43 +}
44 +
45 +src_test() {
46 + pear run-tests tests/Crypt_CHAP.phpt || die
47 +}
48
49 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
50 new file mode 100644
51 index 00000000000..6fa92898e10
52 --- /dev/null
53 +++ b/dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch
54 @@ -0,0 +1,65 @@
55 +diff -aurN a/CHAP.php b/CHAP.php
56 +--- a/CHAP.php 1970-01-01 04:13:08.000000000 -0500
57 ++++ b/CHAP.php 2018-02-13 13:04:49.812389739 -0500
58 +@@ -78,7 +78,19 @@
59 + * @var integer
60 + */
61 + var $chapid = 1;
62 +-
63 ++
64 ++ /**
65 ++ * Constructor
66 ++ *
67 ++ * Generates a random challenge
68 ++ * @return void
69 ++ */
70 ++ function __construct()
71 ++ {
72 ++ parent::__construct();
73 ++ $this->generateChallenge();
74 ++ }
75 ++
76 + /**
77 + * Constructor
78 + *
79 +@@ -160,7 +172,19 @@
80 + * @var bool
81 + */
82 + var $flags = 1;
83 +-
84 ++
85 ++ /**
86 ++ * Constructor
87 ++ *
88 ++ * Loads the hash extension
89 ++ * @return void
90 ++ */
91 ++ function __construct()
92 ++ {
93 ++ parent::__construct();
94 ++ $this->loadExtension('hash');
95 ++ }
96 ++
97 + /**
98 + * Constructor
99 + *
100 +@@ -412,6 +436,19 @@
101 + /**
102 + * Constructor
103 + *
104 ++ * Generates the 16 Bytes peer and authentication challenge
105 ++ * @return void
106 ++ */
107 ++ function __construct()
108 ++ {
109 ++ parent::__construct();
110 ++ $this->generateChallenge('peerChallenge', 16);
111 ++ $this->generateChallenge('authChallenge', 16);
112 ++ }
113 ++
114 ++ /**
115 ++ * Constructor
116 ++ *
117 + * Generates the 16 Bytes peer and authentication challenge
118 + * @return void
119 + */