[gentoo-commits] repo/gentoo:master commit in: net-libs/libotr/files/, net-libs/libotr/

[gentoo-commits] repo/gentoo:master commit in: net-libs/libotr/files/, net-libs/libotr/

[Sam James]

commit:     0bda0617c2f10663b24210f00dea77208f9f59a3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  4 15:10:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct  4 15:10:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bda0617

net-libs/libotr: don't redefine _FORTIFY_SOURCE

Closes: https://bugs.gentoo.org/895680
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libotr-4.1.1-dont-clobber-fortify-source.patch | 23 +++++++++++++
 net-libs/libotr/libotr-4.1.1-r2.ebuild             | 40 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/net-libs/libotr/files/libotr-4.1.1-dont-clobber-fortify-source.patch b/net-libs/libotr/files/libotr-4.1.1-dont-clobber-fortify-source.patch
new file mode 100644
index 000000000000..af9330b97d3a
--- /dev/null
+++ b/net-libs/libotr/files/libotr-4.1.1-dont-clobber-fortify-source.patch
@@ -0,0 +1,23 @@
+Don't clobber our toolchain defaults.
+
+https://bugs.gentoo.org/895680
+--- a/configure.ac
++++ b/configure.ac
+@@ -151,7 +151,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
+ ])], have_clang=yes, have_clang=no)
+ 
+ if test x$enable_gcc_hardening != xno; then
+-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
++    CFLAGS="$CFLAGS"
+     if test x$have_clang = xyes; then
+        OTR_CHECK_CFLAGS(-Qunused-arguments)
+     fi
+@@ -181,6 +181,8 @@ if test x$enable_linker_hardening != xno; then
+     OTR_CHECK_LDFLAGS(-z relro -z now, "$all_ldflags_for_check", "$all_libs_for_check")
+ fi
+ 
++AX_ADD_FORTIFY_SOURCE
++
+ AC_OUTPUT([Makefile src/Makefile toolkit/Makefile tests/Makefile tests/utils/Makefile libotr.pc
+            tests/utils/tap/Makefile
+            tests/unit/Makefile

diff --git a/net-libs/libotr/libotr-4.1.1-r2.ebuild b/net-libs/libotr/libotr-4.1.1-r2.ebuild
new file mode 100644
index 000000000000..d1082fa841cc
--- /dev/null
+++ b/net-libs/libotr/libotr-4.1.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
+HOMEPAGE="https://otr.cypherpunks.ca"
+SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error:=
+"
+DEPEND="${RDEPEND}"
+# autoconf-archive for F_S patch
+BDEPEND="sys-devel/autoconf-archive"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.1-fix-build-with-libgcrypt-1.10.patch"
+	"${FILESDIR}/${PN}-4.1.1-dont-clobber-fortify-source.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc UPGRADING
+
+	# no static archives, #465686
+	find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/libotr/files/, net-libs/libotr/

[Sam James]

commit:     f0ead0194a4732ad6109b934c4f6db7c1cd174df
Author:     Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Fri Apr  1 13:14:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 03:30:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ead019

net-libs/libotr: fix build with libgcrypt-1.10

Also, because of the move to EAPI 8 we no longer need to override src_configure()
to disable static libraries

Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Closes: https://github.com/gentoo/gentoo/pull/24847
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch  | 11 +++++++++++
 net-libs/libotr/libotr-4.1.1.ebuild                         | 13 ++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch b/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch
new file mode 100644
index 000000000000..1aa60f478b88
--- /dev/null
+++ b/net-libs/libotr/files/libotr-4.1.1-fix-build-with-libgcrypt-1.10.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/836572
+--- a/tests/regression/client/client.c
++++ b/tests/regression/client/client.c
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <syscall.h>
+ #include <sys/epoll.h>
++#include <sys/socket.h>
+ #include <sys/types.h>
+ #include <sys/un.h>
+ #include <unistd.h>

diff --git a/net-libs/libotr/libotr-4.1.1.ebuild b/net-libs/libotr/libotr-4.1.1.ebuild
index c4976292c2ca..aae1bbc9b0c9 100644
--- a/net-libs/libotr/libotr-4.1.1.ebuild
+++ b/net-libs/libotr/libotr-4.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="(OTR) Messaging allows you to have private conversations over instant messaging"
 HOMEPAGE="https://otr.cypherpunks.ca"
@@ -10,21 +10,20 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 RDEPEND="
 	dev-libs/libgcrypt:0=
 	dev-libs/libgpg-error:0="
 DEPEND="${RDEPEND}"
 
-src_configure() {
-	econf --disable-static
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.1-fix-build-with-libgcrypt-1.10.patch"
+)
 
 src_install() {
 	default
 	dodoc UPGRADING
 
 	# no static archives, #465686
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }