gentoo auto-resync : 24:06:2023 - 07:26:21

3 files changed, 151 insertions, 0 deletions

diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 39a39e737636..5d6ace7fb0e3 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -8,8 +8,10 @@ AUX dictd-1.10.11-colorit-nopp-fix.patch 244 BLAKE2B d93eddba872d67b2b5ce0ab9e4d
 AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
 AUX dictd-1.13.0-lex.patch 483 BLAKE2B 354204f57951b0870ed430754ef3ddb4a86296180d5b8fda9638074e225e1ca22b1f96e9e05bbf9394d8707138edea762d8eca66f1de791f82884e39830f0e18 SHA512 def5a8ffd8c7f5a0318d7f012ec49c5f9589f68e6a47472f5cfb31f04e0dd739635f78d5ee0ccadaa0970e0134d4a5a65bc0ac069e9036358983fdf6e43e1bd1
 AUX dictd-1.13.0-libtool.patch 1127 BLAKE2B 7d4a567378ed95d657ccb4ef8bcab398acd5c6e3ebe84b1420583c5149d77ebd19f60525710f2d4c30072662f7bf8d2c6878c640e55a40ca4cbee10e80ecabe1 SHA512 df15178fb32954fea341b6ed9298e7a4abcf78907fdbb5c30176d221ee14c4e6a3df51af18602bb7a6def485c0df8e88d4efd63dad2627e8d996b4fb126535fc
+AUX dictd-1.13.0-stack-smashing.patch 340 BLAKE2B b16d995ec253dcc483826a14140505c20b6726b753a2cb2caff41f805ae669d0ebfd05aa269b2f319476bc07c4d3f972572355ab90497aafa0dfb97b4a59f27b SHA512 9a184bcfa8fc87c074b83644aaf73f91ed4babfeeb3970947c671f709cf19a8924b1a00b19f4f8d1446221293ae9de3ea24fe3b1fd9bbf8e17180e6212725472
 AUX dictd-1.13.0-version.patch 1552 BLAKE2B 4feb49c424b42963fdde075a2afbb981a1ca222afa14f7be8000ce885c0a760e5374198d77eb20a18a77b7a8e1501bf2ddc65c622d4f13eb271f43cc72f9e59c SHA512 68215aeb6140e856e2b135c5a2052b17906e55fd94b9014eab8b15a4c8417d8fa1cbe41153847ea585558985765949549ee32d10e8e342c3cc13d3275d0d3f6f
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
 EBUILD dictd-1.13.0-r5.ebuild 3281 BLAKE2B 2e1c905779e1eab376f6ab137af56fbb93d60db490a0c97ac16e95dc6bd78c5b6e7d61831dba6c1982c88e782692dc96d69a11bcc13db569aac8a18c27fb78ab SHA512 9a194eb28efb57952418e466bb3c1bc9bd96e145a2e36f577cfe27f276acb6c5dc8e50cdf5953b5dc623a6e368e95320b635d50f6605c90657a64986b5accb9e
+EBUILD dictd-1.13.0-r6.ebuild 3405 BLAKE2B 8eb2d4c5987ab1a0293c7cc0d6adad4905b0d0d656509e40912260e582b48309ae4329c01370abe1f7df269ad68a30900f7769332fa992d052bdd5b82bf85071 SHA512 01055358da72c5a5a73f1f57438217b1b42b19a14d003963c188b010b620e2a86e4cb1e2aeb1be7b68d599a4c347d3f37ab3fe4c98edcd3b2c1244da73ef042d
 MISC metadata.xml 485 BLAKE2B 93a8e21c6d8d2cd4660347b82669638689e4e0f15dcd8ee4323fcf7ec6faa65547449fd0c0f697e5793a566dc9413055998c92de568c6f00c9ee60973f28b6ff SHA512 9b028d0441c1753c77a9166e21cdd45bede983d877288092f5b52e6a610795360308889fc31e40a3b1c91a298d93bd3cfb957b34436a9a23ccc224f7207752a2
diff --git a/app-text/dictd/dictd-1.13.0-r6.ebuild b/app-text/dictd/dictd-1.13.0-r6.ebuild
new file mode 100644
index 000000000000..24de03a69b3b
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.0-r6.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="Dictionary Client/Server for the DICT protocol"
+HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+LICENSE="GPL-1+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="dbi judy minimal test"
+RESTRICT="!test? ( test )"
+
+# <gawk-3.1.6 makes tests fail.
+RDEPEND="
+	acct-group/dictd
+	acct-user/dictd
+	>=sys-apps/coreutils-6.10
+	dev-libs/libmaa
+	sys-libs/zlib
+	dbi? ( dev-db/libdbi )
+	judy? ( dev-libs/judy )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-apps/gawk-3.1.6
+	sys-devel/flex
+	app-alternatives/yacc
+	test? ( !~sys-apps/gawk-4.2.1 )
+"
+
+DOC_CONTENTS="
+	To start and use ${PN} you need to emerge at least one dictionary from
+	the app-dicts category with the package name starting with 'dictd-'.
+	To install all available dictionaries, emerge app-dicts/dictd-dicts.
+	${PN} will NOT start without at least one dictionary.\n
+	\nIf you are running systemd, you will need to review the instructions
+	explained in /etc/dict/dictd.conf comments.
+"
+
+PATCHES=(
+	"${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
+	"${FILESDIR}"/dictd-1.12.0-build.patch
+	"${FILESDIR}"/dictd-1.13.0-lex.patch
+	"${FILESDIR}"/dictd-1.13.0-libtool.patch # 818535
+	"${FILESDIR}"/dictd-1.13.0-version.patch # 852884
+	"${FILESDIR}"/dictd-1.13.0-stack-smashing.patch # 908998
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's:configure.in:configure.ac:' Makefile.in || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with dbi plugin-dbi) \
+		$(use_with judy plugin-judy) \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--sysconfdir="${EPREFIX}"/etc/dict
+}
+
+src_compile() {
+	# -j1 for bug #743292
+
+	if use minimal; then
+		emake -j1 dictfmt dictzip dictzip
+	else
+		emake -j1
+	fi
+}
+
+src_test() {
+	use minimal && return 0 # All tests are for dictd which we don't build...
+
+	if [[ ${EUID} -eq 0 ]]; then
+		# If dictd is run as root user (-userpriv) it drops its privileges to
+		# dictd user and group. Give dictd group write access to test directory.
+		chown :dictd "${WORKDIR}" "${S}/test" || die
+		chmod 770 "${WORKDIR}" "${S}/test" || die
+	fi
+
+	emake -j1 test
+}
+
+src_install() {
+	if use minimal; then
+		emake -j1 DESTDIR="${ED}" install.dictzip install.dict install.dictfmt
+	else
+		default
+
+		# Don't install rfc2229.txt because it is non-free
+		dodoc doc/{dicf.ms,rfc.ms,rfc.sh}
+		dodoc doc/{security.doc,toc.ms}
+		dodoc -r examples
+
+		# conf files. For dict.conf see below.
+		insinto /etc/dict
+		for f in dictd.conf site.info colorit.conf; do
+			doins "${FILESDIR}/1.10.11/${f}"
+		done
+
+		# startups for dictd
+		newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd
+		newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd
+		systemd_dounit "${FILESDIR}"/${PN}.service
+	fi
+
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+
+	insinto /etc/dict
+	doins "${FILESDIR}"/1.10.11/dict.conf
+
+	dodoc ANNOUNCE NEWS README TODO
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if has_version sys-apps/systemd; then
+		ewarn "The default location for dicts has changed! If you've modified your"
+		ewarn "systemd units locally to point into /usr/lib/dict, please update it"
+		ewarn "to point at /usr/share/dict now."
+	fi
+}
diff --git a/app-text/dictd/files/dictd-1.13.0-stack-smashing.patch b/app-text/dictd/files/dictd-1.13.0-stack-smashing.patch
new file mode 100644
index 000000000000..e5747a6680af
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-stack-smashing.patch
@@ -0,0 +1,18 @@
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=611203
+https://bugs.gentoo.org/908998
+--- a/md5.h
++++ b/md5.h
+@@ -1,11 +1,8 @@
+ #ifndef MD5_H
+ #define MD5_H
+ 
+-#ifdef __alpha
+-typedef unsigned int uint32;
+-#else
+-typedef unsigned long uint32;
+-#endif
++#include <stdint.h>
++typedef uint32_t uint32;
+ 
+ struct MD5Context {
+ 	uint32 buf[4];