[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tls/files/, dev-tcltk/tls/
commit: e10c9e11e5a0b20366ee97618916b59497df830a
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Mar 15 08:10:02 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Mar 15 08:10:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e10c9e11
dev-tcltk/tls: disable FORTIFY & fix warnings
Closes: https://bugs.gentoo.org/894302
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tls/files/tls-1.7.22-gcc11.patch | 38 ++
.../{tls-1.7.22.ebuild => tls-1.7.22-r1.ebuild}| 8 +++--
2 files changed, 44 insertions(+), 2 deletions(-)
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 ..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.c2023-03-15 08:39:52.491651551 +0100
b/tls.c2023-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
similarity index 87%
rename from dev-tcltk/tls/tls-1.7.22.ebuild
rename to dev-tcltk/tls/tls-1.7.22-r1.ebuild
index 53f983e10292..a0bb6f7c4f51 100644
--- a/dev-tcltk/tls/tls-1.7.22.ebuild
+++ b/dev-tcltk/tls/tls-1.7.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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)"
}
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tls/files/, dev-tcltk/tls/
commit: f5984479313966ba68b1bc7a18e9e354ea2b5835
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Dec 25 10:23:33 2020 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Dec 25 10:23:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5984479
dev-tcltk/tls: do not strip shared files
Closes: https://bugs.gentoo.org/756106
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tls/files/tls-1.7.22-ldflags.patch | 13 +
dev-tcltk/tls/tls-1.7.22.ebuild | 9 -
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tls/files/tls-1.7.22-ldflags.patch
b/dev-tcltk/tls/files/tls-1.7.22-ldflags.patch
new file mode 100644
index 000..a5d8c083d31
--- /dev/null
+++ b/dev-tcltk/tls/files/tls-1.7.22-ldflags.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac 2020-12-25 11:05:31.312433864 +0100
b/configure.ac 2020-12-25 11:05:42.692248123 +0100
+@@ -247,10 +247,8 @@
+
+ dnl Enable a stable ABI
+ DC_SETUP_STABLE_API([${srcdir}/tcltls.vers], tcltls.syms)
+-if test "$tcltls_debug" = 'true'; then
+ WEAKENSYMS=':'
+ REMOVESYMS=':'
+-fi
+
+ dnl Produce output
+ AC_OUTPUT(Makefile pkgIndex.tcl tcltls.syms)
diff --git a/dev-tcltk/tls/tls-1.7.22.ebuild b/dev-tcltk/tls/tls-1.7.22.ebuild
index c4f7c36511d..3def4d43f9e 100644
--- a/dev-tcltk/tls/tls-1.7.22.ebuild
+++ b/dev-tcltk/tls/tls-1.7.22.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit eutils
+inherit autotools
MY_P="tcl${P}"
@@ -26,6 +26,13 @@ RESTRICT="test"
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
econf \
--with-ssl-dir="${EPREFIX}/usr" \
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tls/files/
commit: d2f9bba762fd281da9eabab3cd671bfd42ae8ef6 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Fri Sep 30 15:16:08 2016 + Commit: Amy Winston gentoo org> CommitDate: Sun Oct 2 19:58:33 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f9bba7 dev-tcltk/tls: remove unused patch Closes: #2438 dev-tcltk/tls/files/tls-1.5.0-bad-version.patch | 10 -- 1 file changed, 10 deletions(-) diff --git a/dev-tcltk/tls/files/tls-1.5.0-bad-version.patch b/dev-tcltk/tls/files/tls-1.5.0-bad-version.patch deleted file mode 100644 index a55a00c.. --- a/dev-tcltk/tls/files/tls-1.5.0-bad-version.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -ur tls1.5_org/pkgIndex.tcl.in tls1.5/pkgIndex.tcl.in tls1.5_org/pkgIndex.tcl.in 2007-04-05 23:09:11.0 +0200 -+++ tls1.5/pkgIndex.tcl.in 2007-04-05 23:09:40.0 +0200 -@@ -5,5 +5,5 @@ - #replace the original which didn't include the commands from "tls.tcl". - # - --package ifneeded tls 1.5 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]" -+package ifneeded tls 1.50 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]" -
