1 |
commit: 0ae4edb1f51585b30d13f1f61243b98e83b9aa95 |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 5 15:03:11 2017 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 5 15:04:34 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae4edb1 |
7 |
|
8 |
dev-perl/Net-LDAPapi: Bump to version 3.0.5 |
9 |
|
10 |
- Reinstate tests, adding basic compilation tests, and making it more |
11 |
viable for consumers/testers to attempt test execution without needing |
12 |
to patch ebuilds. |
13 |
- Rework patches to be git-am-able. |
14 |
- Use DIST_EXAMPLES feature |
15 |
|
16 |
Upstream: |
17 |
- Fix cookie handling with MMR configuration |
18 |
- Fix ASN1 encoding of sync cookie |
19 |
|
20 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
21 |
|
22 |
dev-perl/Net-LDAPapi/Manifest | 3 +- |
23 |
dev-perl/Net-LDAPapi/Net-LDAPapi-3.0.5.ebuild | 64 ++++++++++++++++++++++ |
24 |
.../Net-LDAPapi-3.0.5-ldap_result-no_error.patch | 28 ++++++++++ |
25 |
.../files/Net-LDAPapi-3.0.5-test-env.patch | 53 ++++++++++++++++++ |
26 |
4 files changed, 147 insertions(+), 1 deletion(-) |
27 |
|
28 |
diff --git a/dev-perl/Net-LDAPapi/Manifest b/dev-perl/Net-LDAPapi/Manifest |
29 |
index f40f07d3ce9..bb8fab1efeb 100644 |
30 |
--- a/dev-perl/Net-LDAPapi/Manifest |
31 |
+++ b/dev-perl/Net-LDAPapi/Manifest |
32 |
@@ -1 +1,2 @@ |
33 |
-DIST Net-LDAPapi-3.0.4.tar.gz 66972 SHA256 99874f6fe1cd1540c267bb33cb28c2f93881d8644bcc09e6e0fc2c039dd774a3 SHA512 9e2153c9f50a8fba1c8e52493c147a9db7e88015fa48739d4762a4cbc1711c24472b031a6c077d46d38285146ff389f07d9f2908016b0e2c07b76aa75ef2d2ca WHIRLPOOL 7dcf54b8ca3dbcb6a6b66f3658e6e589b047bc3961261d0fdcd23488ae0131a7a84fcf4d500dd67088e9737eb1d13c1306c1bfcd2fcc8ca85d7ef106dc597c94 |
34 |
+DIST Net-LDAPapi-3.0.4.tar.gz 66972 BLAKE2B 58fc7f4a949dfbd5a795234c9a16a157232238ce27f3157761c704965f3d7521f8ef5671af4b5bbd15050eda4464230697917817270cf77dacbeb49598a6a551 SHA512 9e2153c9f50a8fba1c8e52493c147a9db7e88015fa48739d4762a4cbc1711c24472b031a6c077d46d38285146ff389f07d9f2908016b0e2c07b76aa75ef2d2ca |
35 |
+DIST Net-LDAPapi-3.0.5.tar.gz 67814 BLAKE2B 2f35000e23ba17016837cd4a0cbe86be5d25254d8a34dd39c8c82cbc5a1979bb56b5b8a37af81cf1e8f12326709e252181e441d051ca0b18314408348d1435be SHA512 f3a6f4bb2e182ca93de2aa6c7a80bf20d64152fec5c4bda54efb91ec2a9be52939922993b79a2cdd248be3b83e605fc9ca3e6020f2cfb49b85256361edb512bd |
36 |
|
37 |
diff --git a/dev-perl/Net-LDAPapi/Net-LDAPapi-3.0.5.ebuild b/dev-perl/Net-LDAPapi/Net-LDAPapi-3.0.5.ebuild |
38 |
new file mode 100644 |
39 |
index 00000000000..aa72e67283f |
40 |
--- /dev/null |
41 |
+++ b/dev-perl/Net-LDAPapi/Net-LDAPapi-3.0.5.ebuild |
42 |
@@ -0,0 +1,64 @@ |
43 |
+# Copyright 1999-2017 Gentoo Foundation |
44 |
+# Distributed under the terms of the GNU General Public License v2 |
45 |
+ |
46 |
+EAPI=6 |
47 |
+ |
48 |
+DIST_AUTHOR=MISHIKAL |
49 |
+DIST_EXAMPLES=( "examples/*" ) |
50 |
+inherit multilib perl-module |
51 |
+ |
52 |
+DESCRIPTION="Perl5 Module Supporting LDAP API" |
53 |
+HOMEPAGE="https://sourceforge.net/projects/net-ldapapi/ |
54 |
+ http://search.cpan.org/~mishikal/Net-LDAPapi/" |
55 |
+SLOT="0" |
56 |
+KEYWORDS="~amd64 ~x86" |
57 |
+IUSE="" |
58 |
+# LICENSE is given on the corresponding sourceforge project and matches the |
59 |
+# default cpan/perl license |
60 |
+ |
61 |
+RDEPEND="net-nds/openldap[sasl] |
62 |
+ dev-libs/cyrus-sasl |
63 |
+ >=dev-perl/Convert-ASN1-0.190.0" |
64 |
+DEPEND="${RDEPEND} |
65 |
+ virtual/perl-ExtUtils-MakeMaker" |
66 |
+ |
67 |
+PATCHES=( |
68 |
+ "${FILESDIR}/${P}-ldap_result-no_error.patch" |
69 |
+ "${FILESDIR}/${P}-test-env.patch" |
70 |
+) |
71 |
+ |
72 |
+src_configure() { |
73 |
+ myconf="-sdk OpenLDAP -lib_path /usr/$(get_libdir) -include_path /usr/include" |
74 |
+ perl-module_src_configure |
75 |
+} |
76 |
+ |
77 |
+src_install() { |
78 |
+ mydoc="Credits Todo" |
79 |
+ perl-module_src_install |
80 |
+} |
81 |
+ |
82 |
+src_test() { |
83 |
+ local MODULES=( |
84 |
+ "Net::LDAPapi ${DIST_VERSION}" |
85 |
+ ) |
86 |
+ local failed=() |
87 |
+ for dep in "${MODULES[@]}"; do |
88 |
+ ebegin "Compile testing ${dep}" |
89 |
+ perl -Mblib="${S}" -M"${dep} ()" -e1 |
90 |
+ eend $? || failed+=( "$dep" ) |
91 |
+ done |
92 |
+ if [[ ${failed[@]} ]]; then |
93 |
+ echo |
94 |
+ eerror "One or more modules failed compile:"; |
95 |
+ for dep in "${failed[@]}"; do |
96 |
+ eerror " ${dep}" |
97 |
+ done |
98 |
+ die "Failing due to module compilation errors"; |
99 |
+ fi |
100 |
+ if [[ -n "${LDAP_TEST_HOST}" ]]; then |
101 |
+ perl-module_src_test |
102 |
+ else |
103 |
+ elog "Comprehensive testing disabled without LDAP_TEST_HOST set. For details, see:" |
104 |
+ elog "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}" |
105 |
+ fi |
106 |
+} |
107 |
|
108 |
diff --git a/dev-perl/Net-LDAPapi/files/Net-LDAPapi-3.0.5-ldap_result-no_error.patch b/dev-perl/Net-LDAPapi/files/Net-LDAPapi-3.0.5-ldap_result-no_error.patch |
109 |
new file mode 100644 |
110 |
index 00000000000..e8f8d915db1 |
111 |
--- /dev/null |
112 |
+++ b/dev-perl/Net-LDAPapi/files/Net-LDAPapi-3.0.5-ldap_result-no_error.patch |
113 |
@@ -0,0 +1,28 @@ |
114 |
+From 56f9ac5e45e63789012ae61c752f7aa7a3141da3 Mon Sep 17 00:00:00 2001 |
115 |
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <dev-zero@g.o> |
116 |
+Date: Thu, 10 Jun 2010 01:06:23 +1200 |
117 |
+Subject: Stop treating results from ldap_results as normal ldap return values |
118 |
+ |
119 |
+Don't to treat results from ldap_results as normal ldap return |
120 |
+values in 'sub error' ( as in 3.0.2 ) |
121 |
+--- |
122 |
+ LDAPapi.pm | 2 +- |
123 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
124 |
+ |
125 |
+diff --git a/LDAPapi.pm b/LDAPapi.pm |
126 |
+index 8fa91ce..fda4b12 100644 |
127 |
+--- a/LDAPapi.pm |
128 |
++++ b/LDAPapi.pm |
129 |
+@@ -1453,8 +1453,8 @@ sub result |
130 |
+ $self->{"result"} = $result; |
131 |
+ $self->{"status"} = $status; |
132 |
+ |
133 |
+- $self->errorize($status); |
134 |
+ if( $status == -1 || $status == 0 ) { |
135 |
++ $self->errorize($status); |
136 |
+ return undef; |
137 |
+ } |
138 |
+ |
139 |
+-- |
140 |
+2.14.3 |
141 |
+ |
142 |
|
143 |
diff --git a/dev-perl/Net-LDAPapi/files/Net-LDAPapi-3.0.5-test-env.patch b/dev-perl/Net-LDAPapi/files/Net-LDAPapi-3.0.5-test-env.patch |
144 |
new file mode 100644 |
145 |
index 00000000000..946ec8ee74c |
146 |
--- /dev/null |
147 |
+++ b/dev-perl/Net-LDAPapi/files/Net-LDAPapi-3.0.5-test-env.patch |
148 |
@@ -0,0 +1,53 @@ |
149 |
+From 10ad8990c92f2b4c4f4d550e0b42fb083aa90f84 Mon Sep 17 00:00:00 2001 |
150 |
+From: Kent Fredric <kentnl@g.o> |
151 |
+Date: Wed, 6 Dec 2017 03:43:22 +1300 |
152 |
+Subject: Use ENV settings for LDAP tests |
153 |
+ |
154 |
+This absolves the need for users to patch sources just to configure |
155 |
+a test server. |
156 |
+--- |
157 |
+ test.pl | 26 ++++++++++++++------------ |
158 |
+ 1 file changed, 14 insertions(+), 12 deletions(-) |
159 |
+ |
160 |
+diff --git a/test.pl b/test.pl |
161 |
+index 7deb1a6..1a0871b 100644 |
162 |
+--- a/test.pl |
163 |
++++ b/test.pl |
164 |
+@@ -18,20 +18,22 @@ print "modinit - ok\n"; |
165 |
+ ## Change these values for test to work... |
166 |
+ ## |
167 |
+ |
168 |
+-print "\nEnter LDAP Server: "; |
169 |
+-chomp($ldap_host = <>); |
170 |
+-print "Enter port: "; |
171 |
+-chomp($ldap_port = <>); |
172 |
+-print "Enter Search Filter (ex. uid=abc123): "; |
173 |
+-chomp($filter = <>); |
174 |
+-print "Enter LDAP Search Base (ex. o=Org, c=US): "; |
175 |
+-chomp($BASEDN = <>); |
176 |
+-print "\n"; |
177 |
+- |
178 |
+-if (!$ldap_host) |
179 |
++if (!$ENV{LDAP_TEST_HOST}) |
180 |
+ { |
181 |
+- die "Please edit \$BASEDN, \$filter and \$ldap_host in test.pl.\n"; |
182 |
++ die "LDAP_TEST_HOST not set"; |
183 |
+ } |
184 |
++$ldap_host = $ENV{LDAP_TEST_HOST}; |
185 |
++$ldap_port = $ENV{LDAP_TEST_PORT}; |
186 |
++$filter = $ENV{LDAP_TEST_FILTER}; |
187 |
++$BASEDN = $ENV{LDAP_TEST_BASEDN}; |
188 |
++ |
189 |
++printf "\nLDAP Server: %s", $ldap_host; |
190 |
++printf "\nLDAP port: %s", $ldap_port; |
191 |
++printf "\nSearch Filter (ex. uid=abc123): %s", $filter; |
192 |
++printf "\nLDAP Search Base (ex. o=Org, c=US): %s", $BASEDN; |
193 |
++print "\n"; |
194 |
++ |
195 |
++ |
196 |
+ |
197 |
+ ## |
198 |
+ ## Initialize LDAP Connection |
199 |
+-- |
200 |
+2.14.3 |
201 |
+ |