| 1 |
commit: e10c9e11e5a0b20366ee97618916b59497df830a |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 15 08:10:02 2023 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 15 08:10:51 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e10c9e11 |
| 7 |
|
| 8 |
dev-tcltk/tls: disable FORTIFY & fix warnings |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/894302 |
| 11 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-tcltk/tls/files/tls-1.7.22-gcc11.patch | 38 ++++++++++++++++++++++ |
| 14 |
.../{tls-1.7.22.ebuild => tls-1.7.22-r1.ebuild} | 8 +++-- |
| 15 |
2 files changed, 44 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-tcltk/tls/files/tls-1.7.22-gcc11.patch b/dev-tcltk/tls/files/tls-1.7.22-gcc11.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..be58d47a2640 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-tcltk/tls/files/tls-1.7.22-gcc11.patch |
| 22 |
@@ -0,0 +1,38 @@ |
| 23 |
+--- a/tlsBIO.c 2023-03-15 08:36:55.452468839 +0100 |
| 24 |
++++ b/tlsBIO.c 2023-03-15 08:37:20.480074701 +0100 |
| 25 |
+@@ -232,8 +232,12 @@ |
| 26 |
+ case BIO_CTRL_RESET: |
| 27 |
+ dprintf("Got BIO_CTRL_RESET"); |
| 28 |
+ num = 0; |
| 29 |
++ ret = 0; |
| 30 |
++ break; |
| 31 |
+ case BIO_C_FILE_SEEK: |
| 32 |
+ dprintf("Got BIO_C_FILE_SEEK"); |
| 33 |
++ ret = 0; |
| 34 |
++ break; |
| 35 |
+ case BIO_C_FILE_TELL: |
| 36 |
+ dprintf("Got BIO_C_FILE_TELL"); |
| 37 |
+ ret = 0; |
| 38 |
+--- a/tls.c 2023-03-15 08:39:52.491651551 +0100 |
| 39 |
++++ b/tls.c 2023-03-15 08:41:44.543863094 +0100 |
| 40 |
+@@ -1424,7 +1424,8 @@ |
| 41 |
+ channelName = Tcl_GetStringFromObj(objv[2], NULL); |
| 42 |
+ break; |
| 43 |
+ } |
| 44 |
+- /* else fall... */ |
| 45 |
++ Tcl_WrongNumArgs(interp, 1, objv, "?-local? channel"); |
| 46 |
++ return TCL_ERROR; |
| 47 |
+ default: |
| 48 |
+ Tcl_WrongNumArgs(interp, 1, objv, "?-local? channel"); |
| 49 |
+ return TCL_ERROR; |
| 50 |
+--- a/aclocal.m4 2023-03-15 09:05:11.853965135 +0100 |
| 51 |
++++ b/aclocal.m4 2023-03-15 09:05:49.134383835 +0100 |
| 52 |
+@@ -689,7 +689,7 @@ |
| 53 |
+ TCLTLS_SSL_LIBS="-L$openssldir -lssl -lcrypto" |
| 54 |
+ openssldir="`AS_DIRNAME(["$openssldir"])`" |
| 55 |
+ else |
| 56 |
+- TCLTLS_SSL_LIBS="-L$openssldir/lib -lssl -lcrypto" |
| 57 |
++ TCLTLS_SSL_LIBS="-lssl -lcrypto" |
| 58 |
+ fi |
| 59 |
+ TCLTLS_SSL_CFLAGS="-I$openssldir/include" |
| 60 |
+ TCLTLS_SSL_CPPFLAGS="-I$openssldir/include" |
| 61 |
|
| 62 |
diff --git a/dev-tcltk/tls/tls-1.7.22.ebuild b/dev-tcltk/tls/tls-1.7.22-r1.ebuild |
| 63 |
similarity index 87% |
| 64 |
rename from dev-tcltk/tls/tls-1.7.22.ebuild |
| 65 |
rename to dev-tcltk/tls/tls-1.7.22-r1.ebuild |
| 66 |
index 53f983e10292..a0bb6f7c4f51 100644 |
| 67 |
--- a/dev-tcltk/tls/tls-1.7.22.ebuild |
| 68 |
+++ b/dev-tcltk/tls/tls-1.7.22-r1.ebuild |
| 69 |
@@ -1,4 +1,4 @@ |
| 70 |
-# Copyright 1999-2022 Gentoo Authors |
| 71 |
+# Copyright 1999-2023 Gentoo Authors |
| 72 |
# Distributed under the terms of the GNU General Public License v2 |
| 73 |
|
| 74 |
EAPI=6 |
| 75 |
@@ -26,7 +26,10 @@ RESTRICT="test" |
| 76 |
|
| 77 |
S="${WORKDIR}/${MY_P}" |
| 78 |
|
| 79 |
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch ) |
| 80 |
+PATCHES=( |
| 81 |
+ "${FILESDIR}"/${P}-ldflags.patch |
| 82 |
+ "${FILESDIR}"/${P}-gcc11.patch |
| 83 |
+) |
| 84 |
|
| 85 |
src_prepare() { |
| 86 |
default |
| 87 |
@@ -35,6 +38,7 @@ src_prepare() { |
| 88 |
|
| 89 |
src_configure() { |
| 90 |
econf \ |
| 91 |
+ --disable-hardening \ |
| 92 |
--with-ssl-dir="${EPREFIX}/usr" \ |
| 93 |
--with-tcl="${EPREFIX}/usr/$(get_libdir)" |
| 94 |
} |
Archives