gentoo auto-resync : 29:12:2022 - 02:14:02

4 files changed, 145 insertions, 0 deletions

diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 31ac45a1b635..19456ef188c6 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,6 +1,9 @@
 AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c97fd25874ecf0ec65228643c1a5d54558a22970ec2e6d532d37269fdb8a7359eb02c990b2c221591c8ececa3f17c6642c47516 SHA512 c6a482433af9a44e597ace4e92b6d5faf1c7aa6deaab7e474f4158769c31e4cf203f21d4697e071d29104b6b78ae06f353becc5da6aa1276ae9a3e39506a2af9
+AUX texinfo-7.0.1-info-groff-crash.patch 1668 BLAKE2B 8ef2d58d49dcd2372557f012237b4d8f3b4b6cbbe8a73745409868955458910647943eaf6bce67dbc659c959fdb8885c5f4bc2b9f521d4206a1c2788a0b2acde SHA512 4afded892571f4772b8ba9dcdd0fab9a9de6a119450f4dd6ce9031ca85612f0d5e0b39646da41d595563d9944bcb75872eb2530fc5266f928f171e4e95d6afbc
+AUX texinfo-7.0.1-lto-type-mismatch.patch 1154 BLAKE2B 852f3c217ee856747534410f8776dc7dc206d4bcfd1197cfe4b08a2ecc914710a588b33c54d226f01e8e7b8a4f64397946d11eaa8114197169382a521f574e14 SHA512 6dd8701ebe4065fffdbc63fb2f08baf9918c0716e06740864aa9b43bb0e0731d748471c5e93a6287004b7314e97d17f459220673d72373fd5f70ddc77539ec19
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
 DIST texinfo-7.0.1.tar.xz 4890348 BLAKE2B 9d61722e7ff8a71e05770552050cc861d778b9faa95f801e40d4353601a5692f01ad8e794dfb0e7b5b29efa2c701de4a76505732a806b0303b5c1fe0599816f1 SHA512 8e1616341fbbfe0cd90bd1b0452874c75b99d88dffe5f88c53fdc32f00d67c07c15c6c774b241e1f7507f0347314737e533854939c3be6334ca9feb9cd049009
 EBUILD texinfo-6.8.ebuild 1717 BLAKE2B 0ce639bd82dac4bcc580415852c093773954c2f33a811133fcb4ee8361e30935b40ba2796bfe807f848bbebe3acf5985fb549f11dfc6d90dbcb397ab0fc959ea SHA512 017f861563fe14381776c7fb62b79b8a99059e63d0f752a4b8dc71559ba57c6c56307ef751bea42b01c1afd3ebfface75c108be260f920f1a1fc6e3ffd72c40f
+EBUILD texinfo-7.0.1-r1.ebuild 1865 BLAKE2B 29598b7002b2cc2137031d4013b471943533fb559cc278d61590d1a7f4245019dbdc489640dfaf5bc3702e1c515615d64f0ebe176f373b31109bf0f41d32a94b SHA512 5f9abfc3c799e4e26b94a323bbf6a969f7c6eff5793a91e2c8b4cad50b21e79060cf8478c6df67c7a821fc8054feda66a0329a94aa56e4dedda80930c0b202c1
 EBUILD texinfo-7.0.1.ebuild 1765 BLAKE2B e3f5a92d0a214945414813167e2e35848cefb8f6359e71c01e75bf2e0a0663073aa0b847ba2afd31fee544dcf0adfcb19467ace9b066834d5888d5f0fa8a6c07 SHA512 94bd17b16fe0aee5f511750dcdeb937813f9fac837585edb63eab2ac2505eb265311ce4366b487f1254693449d20e89be35881f3c1b12d7ffbca109030a31683
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch b/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch
new file mode 100644
index 000000000000..d215ae719ccb
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-7.0.1-info-groff-crash.patch
@@ -0,0 +1,44 @@
+https://git.savannah.gnu.org/cgit/texinfo.git/commit/?h=release/7.0&id=86185e7cedafd011376d0efb6f7e028231dbf641
+
+From 86185e7cedafd011376d0efb6f7e028231dbf641 Mon Sep 17 00:00:00 2001
+From: Gavin Smith <gavinsmith0123@gmail.com>
+Date: Mon, 12 Dec 2022 18:40:01 +0000
+Subject: =?UTF-8?q?*=20info/util.c=20(text=5Fbuffer=5Ficonv):=20Correctly?=
+ =?UTF-8?q?=20update=20arguments=20for=20iconv=20in=20loop.=20=20Crash=20f?=
+ =?UTF-8?q?or=20"info=20groff"=20reported=20by=20Jakub=20Wilk=20via=20Hilm?=
+ =?UTF-8?q?ar=20Preu=C3=9Fe=20<hille42@web.de>.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+--- a/info/util.c
++++ b/info/util.c
+@@ -350,11 +350,11 @@ text_buffer_iconv (struct text_buffer *buf, iconv_t iconv_state,
+   size_t iconv_ret;
+   size_t extra_alloc = 1;
+ 
+-  outptr = text_buffer_base (buf) + text_buffer_off (buf);
+-  out_bytes_left = text_buffer_space_left (buf);
+-
+   while (1)
+     {
++      outptr = text_buffer_base (buf) + text_buffer_off (buf);
++      out_bytes_left = text_buffer_space_left (buf);
++
+       iconv_ret = iconv (iconv_state, inbuf, inbytesleft,
+                          &outptr, &out_bytes_left);
+       if (iconv_ret != (size_t) -1)
+@@ -362,10 +362,7 @@ text_buffer_iconv (struct text_buffer *buf, iconv_t iconv_state,
+ 
+       /* If we ran out of space, allocate more and try again. */
+       if (errno == E2BIG)
+-        {
+-          text_buffer_alloc (buf, (extra_alloc *= 4));
+-          out_bytes_left = text_buffer_space_left (buf);
+-        }
++        text_buffer_alloc (buf, (extra_alloc *= 4));
+       else
+         break; /* let calling code deal with it */
+     }
+-- 
+cgit v1.1
diff --git a/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch b/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch
new file mode 100644
index 000000000000..a8906195480e
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-7.0.1-lto-type-mismatch.patch
@@ -0,0 +1,31 @@
+https://git.savannah.gnu.org/cgit/texinfo.git/patch/?id=952b333db85f88fb51c7e051b15063d95cf7dfc8
+https://lists.gnu.org/archive/html/bug-texinfo/2022-12/msg00034.html
+https://bugs.gentoo.org/863713
+
+From 952b333db85f88fb51c7e051b15063d95cf7dfc8 Mon Sep 17 00:00:00 2001
+From: Gavin Smith <gavinsmith0123@gmail.com>
+Date: Sat, 10 Dec 2022 01:10:38 +0000
+Subject: =?UTF-8?q?*=20install-info/install-info.c=20(error):=20Declare=20?=
+ =?UTF-8?q?as=20static=20to=20avoid=20clash=20with=20error=20function=20fr?=
+ =?UTF-8?q?om=20glibc,=20called=20from=20gnulib.=20Report=20from=20Sam=20J?=
+ =?UTF-8?q?ames=20<sam@gentoo.org>=20and=20suggested=20solution=20from=20A?=
+ =?UTF-8?q?rsen=20Arsenovi=C4=87=20<arsen@aarsen.me>.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+--- a/install-info/install-info.c
++++ b/install-info/install-info.c
+@@ -214,7 +214,9 @@ vdiag (const char *fmt, const char *diagtype, va_list ap)
+   putc ('\n', stderr);
+ }
+ 
+-void
++/* declare as static to avoid clash with glibc error function, called from
++   gnulib. */
++static void
+ error (const char *fmt, ...)
+ {
+   va_list ap;
+-- 
+cgit v1.1
diff --git a/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
new file mode 100644
index 000000000000..ac7dbea1ee77
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-7.0.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: if your package uses the texi2dvi utility, it must depend on the
+# virtual/texi2dvi package to pull in all the right deps.  The tool is not
+# usable out-of-the-box because it requires the large tex packages.
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="https://www.gnu.org/software/texinfo/"
+
+if [[ $(ver_cut 3) -ge 90 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="nls +standalone static"
+
+RDEPEND="
+	!=app-text/tetex-2*
+	>=sys-libs/ncurses-5.2-r2:=
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	standalone? ( >=dev-lang/perl-5.8.1 )
+	!standalone?  ( >=dev-lang/perl-5.8.1:= )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-lto-type-mismatch.patch
+	"${FILESDIR}"/${P}-info-groff-crash.patch
+)
+
+src_prepare() {
+	default
+
+	if use prefix ; then
+		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
+		touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1
+	fi
+}
+
+src_configure() {
+	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions
+	# bug #622576
+	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}"
+	local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
+
+	use static && append-ldflags -static
+
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		$(use_enable nls)
+		$(use_enable !standalone perl-xs)
+	)
+
+	econf "${myeconfargs[@]}"
+}