diff options
Diffstat (limited to 'dev-libs/openssl')
| -rw-r--r-- | dev-libs/openssl/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-1.1.1s-r1.ebuild | 17 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-3.0.7-r2.ebuild | 21 |
3 files changed, 10 insertions, 32 deletions
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index e4e8e74b2d09..ccf0c50fec63 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -16,8 +16,8 @@ DIST openssl-3.0.7.tar.gz 15107575 BLAKE2B 141881071fa62f056c514e7c653a61c59cc45 DIST openssl-3.0.7.tar.gz.asc 858 BLAKE2B bd07a6f656cce817038743caf1131ef8d7a21bf587e706e32771ad9e09cb4821d21b71171a7fe7bb6bece95e9b06cea6d723aae9de8b62049b5a8316578500be SHA512 9093a8a5a990f5f37bd95e7ca55f2371e59242be408ea7d9403bcfc9c8873c022237e13c0ec81881a20607ea46927887a895a82b6f50c6f423b4c54f9ef0cde1 EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9c2812ecc5dd5daa23ffc6dd961a4258181ac2c085798b228df5aa23fff2faf476f880406a7c0eeecde3a8391d6a11 SHA512 7aadb788732ee4dbf32ba34567c8ffc897354ac4028f26ec60fab8f099a445c494825bcaad7a5bc053a1ca3f70bfc0f9e944cce5a4051708555cae24c6c5b9a9 EBUILD openssl-1.1.1q.ebuild 10190 BLAKE2B d43cbde3d6b34a33f7937b59d0a2770290cc342ff664796bca1c546d2a70ba609d0d8f035c1cf2d8f339bcd82ab651e970a5d9ee55a2a6734a2e17b7187aff59 SHA512 47e480e4344753939cd8f64c1e7dd36eed12b8568cc18dd9691bb4d231088d2f77d1ba5fb79f2f9f3ec18b3bb8fb9c118bbb716af91d0023fe920fc968f081ee -EBUILD openssl-1.1.1s-r1.ebuild 10348 BLAKE2B 3b20a52d947cb0cc9d3641d88e470c3692056c4b2a4700355be8846f5a81ed7a0b100a000523ece223e9842d039e723d31b0c7e0bf55088b1fa88afbe2b69ebc SHA512 dafa343d898badb602dfeda6f7b3125746f9597536d42254304664a58d7047c022ac6a34d20f286de0b99206c76dfc2b86912d2bc75ba89ecc892d61ac8eecdc +EBUILD openssl-1.1.1s-r1.ebuild 10232 BLAKE2B 582d5af9bb2c50fa29f7204506b4cdc04eaf43bf2ce6363dd034e7edf82896e05178e0f4b612cd87e48e0e2ac8f0286a6fe050e66c7523677cd3c20e29af06a4 SHA512 0c41da84973c240a371183b8ddcbad8f46e59861320e91352bf425a7cde4bf83dbc5f9ebe4165ca8015862fe262408ca70ff9f4733605802a75c6e9f481ff5ef EBUILD openssl-1.1.1s.ebuild 10244 BLAKE2B 8718b01b9426b4ca51d5e4afbe531755ba1542ede77d5038f6cc9a5f42abd27c0fccb5d713afb408d6092caf8c0b774a96dadda918f07900be0c7f4f76fbd47a SHA512 72fe25bc58d23ba2a31cbf137a179ae8477a084fbf1ada28cd878fd1958dce891ee3b8fba7d31ab10e623f202b49d96779d6e03f9761c73c77c6d5d8a25dafd3 EBUILD openssl-3.0.7-r1.ebuild 9867 BLAKE2B cf5c11fb8f3629e708fe973ce4a8347ab8d04901e625e34ff55be93307ce3f5c3214a2efaaf7d475638007ab6bc21ea7b895d701a8574f877e285cc87fe020a4 SHA512 df9cc24b08cab21f607eed16aed95a82ba491d5368f29fa74296082955a612900fd3284a7bece408a95a3346a5aeb0bbb162a6d64bbd01abc8ebde75395b4f47 -EBUILD openssl-3.0.7-r2.ebuild 10126 BLAKE2B 5a78943c4b19690a960ae05b552f3175fc980099867544441918d232a0cabe7bdce7a8374ac97cf461bfcad325518d6598e9d5fbf3098e0d336e9ec33f1e1708 SHA512 e8dd7a0fab196361353e181b49ab37d42743cc55a29cfd6b0d79226fa2648400a91798e69bc6e1526f0b1c88d14e500805d952026aa356cabe6d77d9b59b57d3 +EBUILD openssl-3.0.7-r2.ebuild 9657 BLAKE2B 989d5e08c98c472f8dac360dd2beebda291496a0d48baf911dd00e6cf2d53e4c1032650ebc0d1222bc921e23760876ff41f0c1a350762eb871ea4c2b47000dad SHA512 76cbd45e2018da4a61e901bf35f56e348b7118c5d52883e45a5992c86258373b35ea37a7862001abe333d1e10f675b0d349a52b7ef66e6b316fe706c2decf7d7 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92 diff --git a/dev-libs/openssl/openssl-1.1.1s-r1.ebuild b/dev-libs/openssl/openssl-1.1.1s-r1.ebuild index e2f32f1b8861..910d8fcfbda4 100644 --- a/dev-libs/openssl/openssl-1.1.1s-r1.ebuild +++ b/dev-libs/openssl/openssl-1.1.1s-r1.ebuild @@ -132,11 +132,6 @@ src_prepare() { append-flags $(test-flags-CC -Wa,--noexecstack) - # Prefixify Configure shebang (bug #141906) - sed \ - -e "1s,/usr/bin/env,${BROOT}&," \ - -i Configure || die - # Remove test target when FEATURES=test isn't set if ! use test ; then sed \ @@ -160,12 +155,12 @@ src_prepare() { local sslout=$(./gentoo.config) einfo "Using configuration: ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" + local config="perl Configure" + [[ -z ${sslout} ]] && config="sh config -v" # The config script does stupid stuff to prompt the user. Kill it. sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - edo ./${config} ${sslout} --test-sanity || die "I AM NOT SANE" + edo ${config} ${sslout} --test-sanity multilib_copy_sources } @@ -198,8 +193,8 @@ multilib_src_configure() { local sslout=$(./gentoo.config) einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" + local config="perl Configure" + [[ -z ${sslout} ]] && config="sh config -v" # "disable-deprecated" option breaks too many consumers. # Don't set it without thorough revdeps testing. @@ -237,7 +232,7 @@ multilib_src_configure() { threads ) - CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}" + CFLAGS= LDFLAGS= edo ${config} "${myeconfargs[@]}" # Clean out hardcoded flags that openssl uses local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ diff --git a/dev-libs/openssl/openssl-3.0.7-r2.ebuild b/dev-libs/openssl/openssl-3.0.7-r2.ebuild index b32f5c40c02c..e83dd0df830b 100644 --- a/dev-libs/openssl/openssl-3.0.7-r2.ebuild +++ b/dev-libs/openssl/openssl-3.0.7-r2.ebuild @@ -148,24 +148,9 @@ src_prepare() { append-flags $(test-flags-CC -Wa,--noexecstack) - # Prefixify Configure shebang (bug #141906) - sed \ - -e "1s,/usr/bin/env,${BROOT}&," \ - -i Configure || die - - # Remove test target when FEATURES=test isn't set - if ! use test ; then - sed \ - -e '/^$config{dirs}/s@ "test",@@' \ - -i Configure || die - fi - local sslout=$(./gentoo.config) einfo "Using configuration: ${sslout:-(openssl knows best)}" - - # The config script does stupid stuff to prompt the user. Kill it. - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - ./config ${sslout} --test-sanity || die "I AM NOT SANE" + edo perl Configure ${sslout} --test-sanity multilib_copy_sources } @@ -198,8 +183,6 @@ multilib_src_configure() { local sslout=$(./gentoo.config) einfo "Using configuration: ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features local myeconfargs=( @@ -232,7 +215,7 @@ multilib_src_configure() { threads ) - CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}" + CFLAGS= LDFLAGS= edo perl Configure "${myeconfargs[@]}" # Clean out hardcoded flags that openssl uses local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ |