| 1 |
commit: 10631c412bbc9d66b666bf178f860a9b848d9880 |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 3 13:22:51 2018 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 3 13:23:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=10631c41 |
| 7 |
|
| 8 |
dev-libs/openssl: use Configure perl from PATH |
| 9 |
|
| 10 |
With stacked-prefix, EPREFIX/usr/bin/perl may not exist. |
| 11 |
But PATH should be fine anyway to find perl, no? |
| 12 |
Bug: https://bugs.gentoo.org/658572 |
| 13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 14 |
Manifest-Sign-Key: 0x29FB0E9EC719EE20 |
| 15 |
|
| 16 |
dev-libs/openssl/Manifest | 19 +++++++++++++++++++ |
| 17 |
dev-libs/openssl/openssl-1.0.2n.ebuild | 2 +- |
| 18 |
dev-libs/openssl/openssl-1.0.2o-r6.ebuild | 2 +- |
| 19 |
dev-libs/openssl/openssl-1.1.0g-r2.ebuild | 3 +-- |
| 20 |
dev-libs/openssl/openssl-1.1.0h-r2.ebuild | 3 +-- |
| 21 |
5 files changed, 23 insertions(+), 6 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest |
| 24 |
index 46a8fc4213..b123749d72 100644 |
| 25 |
--- a/dev-libs/openssl/Manifest |
| 26 |
+++ b/dev-libs/openssl/Manifest |
| 27 |
@@ -1,3 +1,6 @@ |
| 28 |
+-----BEGIN PGP SIGNED MESSAGE----- |
| 29 |
+Hash: SHA256 |
| 30 |
+ |
| 31 |
DIST openssl-1.0.2-patches-1.0.tar.xz 11572 BLAKE2B bdb9d2b8388f1aadf3a9274133aa8f86b0029fae1ce86d005baa39a7347657f8d4d84395b54e8ccd67944356ee197dfb527f843b4f146e305533e2ad5450721d SHA512 15234ade359a0acf001cf10c7a7fc05f54603a44c67831529c2a6eda03342f9ba1cf40664ac782b5b73c50b23ec5649fb48ccff2aea8f0df2ef634959c47e3e9 |
| 32 |
DIST openssl-1.0.2-patches-1.4.tar.xz 12864 BLAKE2B ace6a782ef97b61af44988f978d089adffb06894617f9d66d3fce664c04d360b2774e1dd38c2171151fa93fe92428d405674bc2d452d520f10da426f95d09aee SHA512 d152af2841f1bf11c7f2a5ebba9a2b903fb4bcdef0468c56af0f9cc8c020adbf4490ac1a62f5bae8cbe18e379934fa997bfda1c2d49ec62365c07a0c0515a72d |
| 33 |
DIST openssl-1.0.2n.tar.gz 5375802 BLAKE2B 2e04f8c3d5e2296859b8474d7e100e270f53f18a26c6d37a4cf5e01cd14f44d24d334b4e705da05d77c33b5dc91cffea0feea9f7c83c77ba16c9b6d5f5085894 SHA512 144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687 |
| 34 |
@@ -15,3 +18,19 @@ DIST openssl-1.1.0h.tar.gz 5422717 BLAKE2B 11de1468855c0bb1836fb346c8efdfedd0613 |
| 35 |
DIST openssl-1.1.0h_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879 |
| 36 |
DIST openssl-1.1.0h_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae |
| 37 |
DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 |
| 38 |
+-----BEGIN PGP SIGNATURE----- |
| 39 |
+ |
| 40 |
+iQIzBAEBCAAdFiEEqGPdSmYcJzzTeG67KfsOnscZ7iAFAls7eKsACgkQKfsOnscZ |
| 41 |
+7iDNCg//dj3LXeThnGum2VyJyGrciAj10QNB43ksE+7X3TOjpWU/rheLaLpj7XAN |
| 42 |
++SNeVWBYVPKeEHYR0qDEG4lBqi8FaqM3bPQ0ZNwS7mlDL62t1FvujrhzZjBr+xfo |
| 43 |
+Pd94GJG4bV/ll8IDDAkKKmFMV9nLU0ek1KDCXX+gR8+YAgY4S4YhCNWhHSJXYyxO |
| 44 |
+Zi33cPKT8gf2DM1wcHkONoStsM2JZUOUUhCAnAxH39v2/ushwjeZgNNw1w6ae1pI |
| 45 |
+IELqHlvGCYfXz1xZFWpqbyq4HzEotJIuMM2YJcfFYo/Bdoeb3Nwj8kEpnvCJ9BnA |
| 46 |
+1a8w8E4r6SK2JLLlCGDxg82uA5QaHil829NYlFX+pV4p0F7LzOJwwo0MQCTJnKFZ |
| 47 |
+4dLamG6bSy0c3S/Wqr57hvsrK+UF3yUVuV4rHM9BSPHzt0OW4y6mFiO3KxaU+/Le |
| 48 |
+k9xargIz+HrQbbzU0Oj/zvYcbtbL6kRJL+nmjSOTl6QAwqn2JCKr0d2idrpain2n |
| 49 |
+rHxlfXqB8+SjlU9FKPZ6xD1Cn4CewedjsLY8SI2UtOt9aqHnaA4JQCL9cWRX6EKW |
| 50 |
+iHjalWFOtO/9cTMrUk47lBJdfDaaCkMyun2qnWSuF0n5za56rPzMk6QYhgsx8/NW |
| 51 |
+wJ3nc35oc7mN6/3Q+11RJ3C7i8mJPW5CT48a4l/ybLIym/rzo6Q= |
| 52 |
+=S5JQ |
| 53 |
+-----END PGP SIGNATURE----- |
| 54 |
|
| 55 |
diff --git a/dev-libs/openssl/openssl-1.0.2n.ebuild b/dev-libs/openssl/openssl-1.0.2n.ebuild |
| 56 |
index b797b4284c..bf7e07e097 100644 |
| 57 |
--- a/dev-libs/openssl/openssl-1.0.2n.ebuild |
| 58 |
+++ b/dev-libs/openssl/openssl-1.0.2n.ebuild |
| 59 |
@@ -98,7 +98,7 @@ src_prepare() { |
| 60 |
append-flags $(test-flags-CC -Wa,--noexecstack) |
| 61 |
append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
| 62 |
|
| 63 |
- sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 |
| 64 |
+ sed -i '1s,^:$,#!'"$(type -P perl)"',' Configure #141906 |
| 65 |
# The config script does stupid stuff to prompt the user. Kill it. |
| 66 |
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
| 67 |
./config --test-sanity || die "I AM NOT SANE" |
| 68 |
|
| 69 |
diff --git a/dev-libs/openssl/openssl-1.0.2o-r6.ebuild b/dev-libs/openssl/openssl-1.0.2o-r6.ebuild |
| 70 |
index e53b9ac004..abda3fe827 100644 |
| 71 |
--- a/dev-libs/openssl/openssl-1.0.2o-r6.ebuild |
| 72 |
+++ b/dev-libs/openssl/openssl-1.0.2o-r6.ebuild |
| 73 |
@@ -141,7 +141,7 @@ src_prepare() { |
| 74 |
append-flags $(test-flags-CC -Wa,--noexecstack) |
| 75 |
append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
| 76 |
|
| 77 |
- sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 |
| 78 |
+ sed -i '1s,^:$,#!'"$(type -P perl)"',' Configure #141906 |
| 79 |
# The config script does stupid stuff to prompt the user. Kill it. |
| 80 |
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die |
| 81 |
./config --test-sanity || die "I AM NOT SANE" |
| 82 |
|
| 83 |
diff --git a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild b/dev-libs/openssl/openssl-1.1.0g-r2.ebuild |
| 84 |
index 6401834253..1d02605858 100644 |
| 85 |
--- a/dev-libs/openssl/openssl-1.1.0g-r2.ebuild |
| 86 |
+++ b/dev-libs/openssl/openssl-1.1.0g-r2.ebuild |
| 87 |
@@ -121,10 +121,9 @@ src_prepare() { |
| 88 |
append-flags $(test-flags-CC -Wa,--noexecstack) |
| 89 |
append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
| 90 |
|
| 91 |
- use prefix-chain || |
| 92 |
# Prefixify Configure shebang (#141906) |
| 93 |
sed \ |
| 94 |
- -e "1s,/usr/bin/env,${EPREFIX}&," \ |
| 95 |
+ -e "1s,/usr/bin/env,$(type -P env)," \ |
| 96 |
-i Configure || die |
| 97 |
# Remove test target when FEATURES=test isn't set |
| 98 |
if ! use test ; then |
| 99 |
|
| 100 |
diff --git a/dev-libs/openssl/openssl-1.1.0h-r2.ebuild b/dev-libs/openssl/openssl-1.1.0h-r2.ebuild |
| 101 |
index 077eca955c..dbd701f3c0 100644 |
| 102 |
--- a/dev-libs/openssl/openssl-1.1.0h-r2.ebuild |
| 103 |
+++ b/dev-libs/openssl/openssl-1.1.0h-r2.ebuild |
| 104 |
@@ -123,10 +123,9 @@ src_prepare() { |
| 105 |
append-flags $(test-flags-CC -Wa,--noexecstack) |
| 106 |
append-cppflags -DOPENSSL_NO_BUF_FREELISTS |
| 107 |
|
| 108 |
- use prefix-chain || |
| 109 |
# Prefixify Configure shebang (#141906) |
| 110 |
sed \ |
| 111 |
- -e "1s,/usr/bin/env,${EPREFIX}&," \ |
| 112 |
+ -e "1s,/usr/bin/env,$(type -P env)," \ |
| 113 |
-i Configure || die |
| 114 |
# Remove test target when FEATURES=test isn't set |
| 115 |
if ! use test ; then |
Archives