[gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-otr/files/, x11-plugins/pidgin-otr/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-otr/files/, x11-plugins/pidgin-otr/

[Sam James]

commit:     7e36f7bacb49a0668048fc86cde0b52d571a42a8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  4 19:49:55 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct  4 19:49:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e36f7ba

x11-plugins/pidgin-otr: don't redefine _FORTIFY_SOURCE

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

 ...gin-otr-4.0.2-dont-clobber-fortify-source.patch | 21 ++++++++++
 x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r3.ebuild  | 45 ++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.2-dont-clobber-fortify-source.patch b/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.2-dont-clobber-fortify-source.patch
new file mode 100644
index 000000000000..e630185cc45f
--- /dev/null
+++ b/x11-plugins/pidgin-otr/files/pidgin-otr-4.0.2-dont-clobber-fortify-source.patch
@@ -0,0 +1,21 @@
+Don't clobber our toolchain defaults.
+
+https://bugs.gentoo.org/898526
+--- a/configure.ac
++++ b/configure.ac
+@@ -141,7 +141,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
+@@ -166,4 +166,6 @@ 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 po/Makefile.in])

diff --git a/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r3.ebuild b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r3.ebuild
new file mode 100644
index 000000000000..f1d7ce738b0f
--- /dev/null
+++ b/x11-plugins/pidgin-otr/pidgin-otr-4.0.2-r3.ebuild
@@ -0,0 +1,45 @@
+# 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="http://www.cypherpunks.ca/otr/"
+SRC_URI="http://www.cypherpunks.ca/otr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/libgcrypt:0
+	net-im/pidgin[gtk]
+	>=net-libs/libotr-4.0.0
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}"
+# autoconf-archive for F_S patch
+BDEPEND="
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.2-dont-clobber-fortify-source.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}