diff options
Diffstat (limited to 'dev-tcltk/tls')
| -rw-r--r-- | dev-tcltk/tls/Manifest | 3 | ||||
| -rw-r--r-- | dev-tcltk/tls/files/tls-1.7.22-gcc11.patch | 38 | ||||
| -rw-r--r-- | dev-tcltk/tls/tls-1.7.22-r1.ebuild (renamed from dev-tcltk/tls/tls-1.7.22.ebuild) | 10 |
3 files changed, 47 insertions, 4 deletions
diff --git a/dev-tcltk/tls/Manifest b/dev-tcltk/tls/Manifest index c2c64d15bbbe..8e69f7442b88 100644 --- a/dev-tcltk/tls/Manifest +++ b/dev-tcltk/tls/Manifest @@ -1,6 +1,7 @@ +AUX tls-1.7.22-gcc11.patch 1196 BLAKE2B 376e103e7dfdbde6caefbdc8f6e59b848c75b9f98e05497fe97e0edda6804457de0b4c0b300db7e42062ba072aeb80d0b583f8996626c7e787a6c83acd45e1d5 SHA512 5b3ae0497b158501b0fe8ad8ce4cc953ba9c7a85c0f1296987a504267e750af4a5e24ca966c6714fb4efac0cb673481d8e7fa0833410edbe6e0ed4e7e387808c AUX tls-1.7.22-ldflags.patch 363 BLAKE2B b0b7fab12ed59f37ae538190b1988badb3ea3eb81ec7ba39ea2ada2712e706e3959d289406790e10ebfb3b6ab605a576c55874002f713872f5770db157805fc6 SHA512 8324a79ab059bad1db960ba320e1bfdd6cfeea7f2a52fa596dcb7ced9aec72e7e7ff72ef26226e7f33595cad86b2838b85985711420804f6209bbccc6f0a3051 DIST tcltls-1.7.16.tar.gz 166439 BLAKE2B 855b61bf21e7635fc9c53838037136586552261bb0c3b4c4a52638e99358f418a2c0d606b5fb130e32004e3a34c80afea25be16f068ffb499d6636309e4ae2a3 SHA512 f63b885dbfaec5d9ae811c126bd0ff253787effd7b053282b9ee566e9fae54df940bc058a6c3dd22e31fcb9ec6ae1b286aa40efd69c3f01f5a3014aada730ab1 DIST tcltls-1.7.22.tar.gz 165206 BLAKE2B 351a5ee6a50174db8b13c9232a617aa90480550520771004c318c063b7c9703cdf969c7d12c56c54483bce5d08a9b48c04906d2be3ef9e3de0ab74c5dac68346 SHA512 28c76a6e7333b6ed1d83234691d61c9e71a59d0a6a28182fc0f50e97cae7b54da63ac76527e3b16087f3eab0b9cfe19bad02362e485d0cf378724de534805e99 EBUILD tls-1.7.16.ebuild 889 BLAKE2B 251b09dfc5216f037ba9957a5c1d8037bca38b4fcdba102177393ae81eb078b2bc13e607930b51d99a15834ba9a13c0fc819eb6e6d7d95bbf93dd335c5af4e3c SHA512 fc32d9e16ed24fe6863ca97f24c5f6d95a77b1724e3be19f766779bb931fcf56cd80c93ed0bc749f1bc6fa22a85bcfb9cdd87e0600a803775175969c78c0c273 -EBUILD tls-1.7.22.ebuild 1025 BLAKE2B 704281955f24f4c98d156995a3b6d2dcd2ea26ccac988bec69cd8779fc5f27e8a5aa0a2822997ca7944d361ea816429832ed4238984b3bac57600e0dda6fed78 SHA512 9c7a429ab293440fa0d5e6b5c8162aed6ec7ed5356b0fb535cbb4ed2c988ee17f1a97e843d00596cb8e44aa7fec409cb48ecbac0bb5170648704213997bb89a6 +EBUILD tls-1.7.22-r1.ebuild 1082 BLAKE2B b00c14d06e1c5810b601d63b390ddae2627f8cff90f91a1d3360775d0f5761712ee4258a480994cc3583b6a11cccd3e6c55647c13fe07529da2f57f732dfb405 SHA512 6fbda4f94f495d697297cbd8d97d84f3dc5539a161f13511c4771c6b5951200a415d2fb0376ee2fa10662b8348b4e86c697f2808c0152423f2ca990f493a2cd5 MISC metadata.xml 327 BLAKE2B 993a22714fa6f672e3468a5248ce1a0ffbfeb8f1c4ceeae54f7a2e201a9f06c99bd2a3a3691cc73c1b3c9c8fede4bc5ec77eb35089483ce6b556cad3e7839c8a SHA512 131aa4f5ccd91f39bbb097ed6e6290bb4f0f1ac9273cde0a71b29a6956e38f27c8ea6d04357f630f518480beb61fab0c9592651522d82151ce5f97bf6b190033 diff --git a/dev-tcltk/tls/files/tls-1.7.22-gcc11.patch b/dev-tcltk/tls/files/tls-1.7.22-gcc11.patch new file mode 100644 index 000000000000..be58d47a2640 --- /dev/null +++ b/dev-tcltk/tls/files/tls-1.7.22-gcc11.patch @@ -0,0 +1,38 @@ +--- a/tlsBIO.c 2023-03-15 08:36:55.452468839 +0100 ++++ b/tlsBIO.c 2023-03-15 08:37:20.480074701 +0100 +@@ -232,8 +232,12 @@ + case BIO_CTRL_RESET: + dprintf("Got BIO_CTRL_RESET"); + num = 0; ++ ret = 0; ++ break; + case BIO_C_FILE_SEEK: + dprintf("Got BIO_C_FILE_SEEK"); ++ ret = 0; ++ break; + case BIO_C_FILE_TELL: + dprintf("Got BIO_C_FILE_TELL"); + ret = 0; +--- a/tls.c 2023-03-15 08:39:52.491651551 +0100 ++++ b/tls.c 2023-03-15 08:41:44.543863094 +0100 +@@ -1424,7 +1424,8 @@ + channelName = Tcl_GetStringFromObj(objv[2], NULL); + break; + } +- /* else fall... */ ++ Tcl_WrongNumArgs(interp, 1, objv, "?-local? channel"); ++ return TCL_ERROR; + default: + Tcl_WrongNumArgs(interp, 1, objv, "?-local? channel"); + return TCL_ERROR; +--- a/aclocal.m4 2023-03-15 09:05:11.853965135 +0100 ++++ b/aclocal.m4 2023-03-15 09:05:49.134383835 +0100 +@@ -689,7 +689,7 @@ + TCLTLS_SSL_LIBS="-L$openssldir -lssl -lcrypto" + openssldir="`AS_DIRNAME(["$openssldir"])`" + else +- TCLTLS_SSL_LIBS="-L$openssldir/lib -lssl -lcrypto" ++ TCLTLS_SSL_LIBS="-lssl -lcrypto" + fi + TCLTLS_SSL_CFLAGS="-I$openssldir/include" + TCLTLS_SSL_CPPFLAGS="-I$openssldir/include" diff --git a/dev-tcltk/tls/tls-1.7.22.ebuild b/dev-tcltk/tls/tls-1.7.22-r1.ebuild index 53f983e10292..a13d7493da14 100644 --- a/dev-tcltk/tls/tls-1.7.22.ebuild +++ b/dev-tcltk/tls/tls-1.7.22-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -26,7 +26,10 @@ RESTRICT="test" S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}"/${P}-ldflags.patch ) +PATCHES=( + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-gcc11.patch +) src_prepare() { default @@ -35,6 +38,7 @@ src_prepare() { src_configure() { econf \ + --disable-hardening \ --with-ssl-dir="${EPREFIX}/usr" \ --with-tcl="${EPREFIX}/usr/$(get_libdir)" } |