1 |
commit: 21e52ef28c4eeab96f2146bafcdb40dc6e1a74b1 |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 19 20:25:33 2017 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 19 20:29:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e52ef2 |
7 |
|
8 |
dev-perl/Crypt-SSLeay: Fix for '.' in @INC re bug #615126 |
9 |
|
10 |
Hand-spun patch because the alternatives appearing upstream are frankly |
11 |
nuts and combine 2 types of wrong to do things that nobody needs to do. |
12 |
|
13 |
Bug: https://bugs.gentoo.org/615126 |
14 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
15 |
|
16 |
.../Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild | 2 +- |
17 |
.../Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild | 3 ++- |
18 |
.../files/Crypt-SSLeay-0.720.0-no-dot-inc.patch | 27 ++++++++++++++++++++++ |
19 |
3 files changed, 30 insertions(+), 2 deletions(-) |
20 |
|
21 |
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild |
22 |
index c73f9942ad0..74a59504087 100644 |
23 |
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild |
24 |
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild |
25 |
@@ -34,7 +34,7 @@ PDEPEND=" |
26 |
dev-perl/libwww-perl |
27 |
>=dev-perl/LWP-Protocol-https-6.20.0 |
28 |
" |
29 |
- |
30 |
+PATCHES=("${FILESDIR}/${P}-no-dot-inc.patch") |
31 |
export OPTIMIZE="${CFLAGS}" |
32 |
#myconf="--lib=${EPREFIX}/usr" |
33 |
|
34 |
|
35 |
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild |
36 |
index 05331fb8687..73bfd20fbcf 100644 |
37 |
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild |
38 |
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r2.ebuild |
39 |
@@ -36,4 +36,5 @@ PDEPEND=" |
40 |
>=dev-perl/LWP-Protocol-https-6.20.0 |
41 |
" |
42 |
|
43 |
-PATCHES=( "${FILESDIR}"/${PN}-0.720.0-no-ssl3.patch ) |
44 |
+PATCHES=( "${FILESDIR}"/${PN}-0.720.0-no-ssl3.patch |
45 |
+ "${FILESDIR}/${P}-no-dot-inc.patch" ) |
46 |
|
47 |
diff --git a/dev-perl/Crypt-SSLeay/files/Crypt-SSLeay-0.720.0-no-dot-inc.patch b/dev-perl/Crypt-SSLeay/files/Crypt-SSLeay-0.720.0-no-dot-inc.patch |
48 |
new file mode 100644 |
49 |
index 00000000000..9ea1c6b8f6d |
50 |
--- /dev/null |
51 |
+++ b/dev-perl/Crypt-SSLeay/files/Crypt-SSLeay-0.720.0-no-dot-inc.patch |
52 |
@@ -0,0 +1,27 @@ |
53 |
+From: Kent Fredric <kentfredric@×××××.com> |
54 |
+Date: Tue, 20 Jun 2017 08:04:39 +1200 |
55 |
+Subject: [PATCH] Remove need for '.' in @INC |
56 |
+ |
57 |
+https://github.com/nanis/Crypt-SSLeay/pull/7 |
58 |
+ |
59 |
+--- |
60 |
+ Makefile.PL | 3 ++- |
61 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
62 |
+ |
63 |
+diff --git a/Makefile.PL b/Makefile.PL |
64 |
+index fcc3a7d..937789a 100644 |
65 |
+--- a/Makefile.PL |
66 |
++++ b/Makefile.PL |
67 |
+@@ -8,7 +8,8 @@ use Getopt::Long qw( GetOptionsFromArray ); |
68 |
+ use Path::Class; |
69 |
+ use Try::Tiny; |
70 |
+ |
71 |
+-use inc::IO::Interactive::Tiny; |
72 |
++use lib 'inc'; |
73 |
++use IO::Interactive::Tiny; |
74 |
+ |
75 |
+ caller |
76 |
+ or run(\@ARGV, [qw{ssl crypto ssl32 ssleay32 eay32 libeay32 z}]); |
77 |
+-- |
78 |
+2.13.1 |
79 |
+ |