gentoo auto-resync : 27:02:2024 - 05:40:23

4 files changed, 85 insertions, 0 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ad9a0ce48e69..ca75e68fd4ae 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index 6885fc4d22ed..45466809ef22 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -1,5 +1,7 @@
 AUX gcal-4.1-configure-clang16.patch 1136 BLAKE2B 452f8c93aa71db4ee732c7412469eaa22d150225d43f3490ff7857f085ded3ca7a5220156f71369e530955c4167e621da0e8d3fc09ff28a382b0aca55a585c0b SHA512 2b3b2d677f98e8fecba6914c36b8f2479b35186b55e10b77f4c8b26b1fd6701617a4928ba21ab7d96e760bd9fbaeaedcf30e5d91bf3fc7ad010584169e117307
+AUX gcal-4.1-fortify.patch 623 BLAKE2B 2c06bd5a8bce14f4527fcadcbe7423d978b388e946a5bfb3e8b5dbc6520ba27d16a6292659e26ad8cbbebd2463fc5333cf9c88335b6b9082631c74f24bc8c214 SHA512 04307fba03baaea87e3499724e63d87d2197d6694a8ea89f0b23b16a99948a2df6c9e9cf0d5993819aac665750ba0000cbcef24aee2ba19ede5532c657feede0
 AUX gcal-4.1-glibc228.patch 3267 BLAKE2B b754919136da6652ef2f44bfbf9f9b0be839b89a35b23d028a4ca0cbb6101297066c862b2139ac424b276caf59dd12473d0194ca5b49f42c5bfcdfea2b37d3e1 SHA512 e1d54483561ac5b9473bcc42702b015a196fcde100dd2098dfd07642b7a5ee28887ef259296e98d7a46f18781e2b6a9c89424ebfe65b8ce601457b4f75af08af
 DIST gcal-4.1.tar.xz 1658948 BLAKE2B 980b509923d7e3afbd391f1129a77e647f61e09d68aec29490bc16041260e56082097732f015260515036a4560bee18391c8f6aaa5eaff69740f18a37a44d8f2 SHA512 24b9ee87c3dbfd3231b2017fd0a3030cc5b7c7fde032ea1fcf816b0f10dc40d808c646aa8ece86651da4f3928fecf35f84f4c68c0bfdb8cf63e3ecc189d2074d
 EBUILD gcal-4.1-r1.ebuild 1039 BLAKE2B 813b1606ba3bc4f48aad3cab902191ac9df5faf56ec96dee242a5ce9096eb34c94128127216764e7a0aaeba562f278a05507d3a24df9e53d699400c23d966932 SHA512 0edd5b429035e6cbe4c19547fb4591037fe2f15fa63911ea396976f19d74fc8d83333250541e0a72f459e77f4932f6116a71bb7a96464270df130e3f79558498
+EBUILD gcal-4.1-r2.ebuild 1300 BLAKE2B c75acd3d207703564c554a9bc08ec2662bbc8390de2fdfa58061bc1b037f45954d4f39e835c44e843c70fe60a86d6d1074931f8c032cdfe33553b5a3ee095ff5 SHA512 bb6278771c89c85ec7655758fdbfde82ead6d918cc68226d0971fed329e049afd3b8dab1093ad4bbcbbbe59182bffe873732829608d244cdce89194d90e6e9e0
 MISC metadata.xml 1096 BLAKE2B 2d86ba9f428f52f8a716c2a7e5719b647fe4217a7c037d9681885524f0dde1216cf237f2c89df955425a3ccbf0a23f9f16266da53cfa6801efeb537b0a5028aa SHA512 a665d4af51626778e22513885711a95907624a2ef4ce383a4493f8132335790e4bc7bccb75fd319217aa297c28eaf9db8ab04b14f22fefe80820a5ec0a2b0bc4
diff --git a/app-misc/gcal/files/gcal-4.1-fortify.patch b/app-misc/gcal/files/gcal-4.1-fortify.patch
new file mode 100644
index 000000000000..bc3b3a693af9
--- /dev/null
+++ b/app-misc/gcal/files/gcal-4.1-fortify.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/925560
+https://git.savannah.gnu.org/cgit/gcal.git/commit/?id=a9d49b3e6535ebf2b5a0b4051e95bb5dc0c27fdb
+
+From a9d49b3e6535ebf2b5a0b4051e95bb5dc0c27fdb Mon Sep 17 00:00:00 2001
+From: Oleg Derevenetz <oleg-derevenetz@yandex.ru>
+Date: Sun, 29 Nov 2020 17:42:07 +0100
+Subject: src/utils.c: fix segfault
+
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -1354,7 +1354,7 @@ month_name (month)
+ 
+ 
+ 	  len = (int) strlen (s) - 1;
+-	  mayname = (char *) my_malloc (len,
++	  mayname = (char *) my_malloc (len + 2,
+ 					ERR_NO_MEMORY_AVAILABLE,
+ 					__FILE__, ((long) __LINE__) - 2L,
+ 					"mayname", 0);
+-- 
+cgit v1.1
diff --git a/app-misc/gcal/gcal-4.1-r2.ebuild b/app-misc/gcal/gcal-4.1-r2.ebuild
new file mode 100644
index 000000000000..829867ea2dc9
--- /dev/null
+++ b/app-misc/gcal/gcal-4.1-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Calendar - a replacement for cal"
+HOMEPAGE="https://www.gnu.org/software/gcal/"
+SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ncurses nls unicode"
+
+RDEPEND="nls? ( virtual/libintl )
+	unicode? ( dev-libs/libunistring:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	nls? ( >=sys-devel/gettext-0.17 )
+"
+
+DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}/${P}-glibc228.patch"
+	"${FILESDIR}/${PN}-4.1-configure-clang16.patch"
+	"${FILESDIR}/${P}-fortify.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop once ${PN}-4.1-configure-clang16.patch merged
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	append-cppflags -D_GNU_SOURCE
+
+	use unicode && append-libs -lunistring
+
+	econf \
+		--disable-rpath \
+		$(use_enable nls) \
+		$(use_enable ncurses term) \
+		$(use_enable unicode)
+}
+
+src_test() {
+	default
+
+	# Do basic smoke tests to help catch issues like bug #925560
+	# where trivial 'gcal' invocation crashed w/ _F_S=3.
+	local bin
+	for bin in gcal2txt tcal txt2gcal gcal ; do
+		src/${bin} || die
+	done
+}