gentoo auto-resync : 09:10:2023 - 06:05:11

6 files changed, 206 insertions, 7 deletions

diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index d34f1a080bfe..df2f5aa3f2e1 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -10,8 +10,11 @@ AUX dictd-1.13.0-lex.patch 483 BLAKE2B 354204f57951b0870ed430754ef3ddb4a86296180
 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-1.13.1-version.patch 1552 BLAKE2B d8aa3aa6fe35d9f0540304e710f89fa17b15c2d9a06bf68f902754abec495771f78eb3fee7f31b9fc70800f6d6d02567b56161cd00bbae785a3426fbdb312aeb SHA512 facbfa11c20ecb20f54f83ba17298c3699088261b3d91b8f25607a4117b889e6b6d83e58634637f4718c1fa20deb552fea3c47b13ebb1a0322751fd000a6cc69
 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 3463 BLAKE2B ad12bec5ce7d5ca67bf860d917f40aa55abdc8bfc7b7a66f99e2a02e57b03a01b30fbe4cc28d7f1e763d4a6831f698cb0e1d00db022a760c4d4fa9945568d456 SHA512 88597279e50a8ad9a878309ce0bb7f729f20fe031389105644e454f3ecef7106c5ff14acbca63c6966396cdde7617a14d1e2c6a546013c896f50c9deefc50294
-MISC metadata.xml 485 BLAKE2B 93a8e21c6d8d2cd4660347b82669638689e4e0f15dcd8ee4323fcf7ec6faa65547449fd0c0f697e5793a566dc9413055998c92de568c6f00c9ee60973f28b6ff SHA512 9b028d0441c1753c77a9166e21cdd45bede983d877288092f5b52e6a610795360308889fc31e40a3b1c91a298d93bd3cfb957b34436a9a23ccc224f7207752a2
+DIST dictd-1.13.1.tar.gz 395619 BLAKE2B 83caad8570e752575bf5fe39a41e4a7d564f3a255d4e4cb234661a56ed645dfb155bef8a89d4ecfebfefb2f03d4ab808c00f1c4eacaae883761e28817138526b SHA512 31a2e67feaa672e773b86d16ecb9f41fdcd2d5f907759cc110261af30147b3972a2c7d742b4d61b67eb3b8c84c08e179106b9a30e998a425c9b437ec933b03ea
+EBUILD dictd-1.13.0-r7.ebuild 3283 BLAKE2B b7f945eca5ee659e7d6219406a1d34686e16c0b93e4aabb08190c06c4a80c47032582c7697893b7eb7eaa77030ef76c3acf061c4733869b3cbb3a8d13309a599 SHA512 04e905ccf443be57a6067ac7b54f6a55a1d0f1819e17d291ec2b76a8764761c4a035c63e55127f56e0ae35a0a4a9cfbb6cd61774719c4e5ee84dcc92bb4d566e
+EBUILD dictd-1.13.0-r8.ebuild 3463 BLAKE2B 674242ef74682c2cb8d2af522774699dc419e0e9ba5bdb7a168cc6d87f7ceff934fe2b71e28d8cfc813b6fb50e7b0e65337eb0d3a547071dfb95da0ddd5056ef SHA512 1bc31b059db8d3372a6a4cf02333803ecb736b9ae1d353fcc64d17ef08f9e8a41417145a5553f5a5be5c40bc48d827a4fd7e01cd2267c94cfdf64270443a1eff
+EBUILD dictd-1.13.1.ebuild 3446 BLAKE2B 59b9858f45e78515dd9f7c19513d018e28d577cce1ca4a8fef04216aaed4ee2e536959cc28f88ab1988beaed389fabd45d424c7436c296e78177c1da9695c2c5 SHA512 4db57ddab84e5c930c955f708c48a07207b595cee730458a8081e6257e439124f777ab6f6a5d5f82ed0e1237c0e19b1f0e91cfa34fc3575cb04f77e119c77771
+MISC metadata.xml 538 BLAKE2B f31bab8d05820823703f2f1badb35fb302b8414a51b3faac819ba73d157ad1a66a36bf1801b39b6299d1b0ea2fb1a50da7e3361fd3e0893745696ce402cd4f24 SHA512 23d472f38c2513d8b6624288b1d51d370ca3a929d0a9503a4aa9d9543b0c704d564b23164ccadd9ef0cedcd1f05ad68dd08305577f2b7e6486f8fc82ca7356ff
diff --git a/app-text/dictd/dictd-1.13.0-r5.ebuild b/app-text/dictd/dictd-1.13.0-r7.ebuild
index 7c120fcfd342..b7384cef7736 100644
--- a/app-text/dictd/dictd-1.13.0-r5.ebuild
+++ b/app-text/dictd/dictd-1.13.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ RDEPEND="
 	acct-group/dictd
 	acct-user/dictd
 	>=sys-apps/coreutils-6.10
-	dev-libs/libmaa
+	dev-libs/libmaa:=
 	sys-libs/zlib
 	dbi? ( dev-db/libdbi )
 	judy? ( dev-libs/judy )
diff --git a/app-text/dictd/dictd-1.13.0-r6.ebuild b/app-text/dictd/dictd-1.13.0-r8.ebuild
index fc52f063c6d4..4f2136462d1b 100644
--- a/app-text/dictd/dictd-1.13.0-r6.ebuild
+++ b/app-text/dictd/dictd-1.13.0-r8.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="dbi judy minimal selinux test"
 RESTRICT="!test? ( test )"
 
@@ -20,7 +20,7 @@ RDEPEND="
 	acct-group/dictd
 	acct-user/dictd
 	>=sys-apps/coreutils-6.10
-	dev-libs/libmaa
+	dev-libs/libmaa:=
 	sys-libs/zlib
 	dbi? ( dev-db/libdbi )
 	judy? ( dev-libs/judy )
diff --git a/app-text/dictd/dictd-1.13.1.ebuild b/app-text/dictd/dictd-1.13.1.ebuild
new file mode 100644
index 000000000000..61884e005e19
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.1.ebuild
@@ -0,0 +1,130 @@
+# 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 selinux test"
+RESTRICT="!test? ( test )"
+
+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}"
+# <gawk-3.1.6 makes tests fail.
+BDEPEND="
+	>=sys-apps/gawk-3.1.6
+	sys-devel/flex
+	app-alternatives/yacc
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-dictd )"
+
+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 # bug #818535
+	"${FILESDIR}"/dictd-1.13.1-version.patch # bug #852884
+	"${FILESDIR}"/dictd-1.13.0-stack-smashing.patch # bug #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.1-version.patch b/app-text/dictd/files/dictd-1.13.1-version.patch
new file mode 100644
index 000000000000..c0ef4f1f594e
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.1-version.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/852884
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 10:00:21 -0700
+Subject: [PATCH] configure: Set version directly in AC_INIT
+
+This avoids a command not found error in config.status.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -20,7 +20,7 @@
+ 
+ # Add a _letter_ if you change the version number and release your own version.
+ # Numbers are for the original author(s) only.
+-DICT_VERSION=@DICT_VERSION@
++DICT_VERSION=@PACKAGE_VERSION@
+ 
+ ifneq (,)
+ This makefile requires GNU Make.
+--- a/configure.in
++++ b/configure.in
+@@ -23,14 +23,10 @@ dnl     CFLAGS and LDFLAGS should be settable on the make commandline
+ dnl             for optimization and stripping.
+ dnl     LIBOBJS is an automatically-generated list of extra objects we need
+ 
+-
+-define(VERSION, 1.13.1)
+-
+-
+ AC_PREREQ(2.53)
+ AC_REVISION($Revision: 1.144 $)
+ 
+-AC_INIT([dict],[VERSION],[dict-beta@dict.org])
++AC_INIT([dict],[1.13.1],[dict-beta@dict.org])
+ 
+ AC_CONFIG_SRCDIR([dictd.c])
+ AC_CONFIG_HEADER(config.h)
+@@ -40,8 +36,6 @@ LT_INIT
+ echo Configuring for dict
+ echo .
+ 
+-DICT_VERSION=VERSION
+-
+ AC_CANONICAL_HOST
+ 
+ AC_PROG_CC
+@@ -183,7 +177,6 @@ SBINDIR=`eval3 $sbindir`
+ LIBEXECDIR=`eval3 $libexecdir`
+ DATADIR=`eval3 $datadir`
+ 
+-AC_SUBST(DICT_VERSION)
+ AC_SUBST(USE_PLUGIN)
+ AC_SUBST(EXEEXT)
+ AC_SUBST(allsubdirs)
+--- a/dictdplugin-config.in
++++ b/dictdplugin-config.in
+@@ -24,7 +24,7 @@ while test $# -ne 0; do
+ 	    usage
+ 	    exit;;
+ 	--version)
+-	    echo @DICT_VERSION@
++	    echo @PACKAGE_VERSION@
+ 	    exit;;
+ 	--libs)
+ 	    echo -L@libdir@
diff --git a/app-text/dictd/metadata.xml b/app-text/dictd/metadata.xml
index d7d240c16242..0209b505f064 100644
--- a/app-text/dictd/metadata.xml
+++ b/app-text/dictd/metadata.xml
@@ -8,5 +8,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">dict</remote-id>
+		<remote-id type="github">cheusov/dictd</remote-id>
 	</upstream>
 </pkgmetadata>