[gentoo-commits] repo/gentoo:master commit in: app-text/dictd/files/, app-text/dictd/

[gentoo-commits] repo/gentoo:master commit in: app-text/dictd/files/, app-text/dictd/

[Sam James]

commit:     0e34436a7f13b0772e544b6c9789f4723fd18f00
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sat Jun 18 16:23:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 17:22:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e34436a

app-text/dictd: Update patch + fix QA warnings

Makes trivial changes to the libtool patch for correctness and silences
the follow QA warnings that were exposed with autoreconf.

 * QA Notice: Package triggers severe warnings which indicate that it
 *            may exhibit random runtime failures.
 * y.tab.c:1054:16: warning: implicit declaration of function ‘yylex’ [-Wimplicit-function-declaration]
 * y.tab.c:1240:7: warning: implicit declaration of function ‘yyerror’; did you mean ‘YYerror’? [-Wimplicit-function-declaration]
 * y.tab.c:1430:16: warning: implicit declaration of function ‘yylex’ [-Wimplicit-function-declaration]
 * y.tab.c:2212:7: warning: implicit declaration of function ‘yyerror’; did you mean ‘YYerror’? [-Wimplicit-function-declaration]

 * QA Notice: command not found:
 *
 * 	./config.status: line 784: 1.13.0=dummy.13.0: command not found

Bug: https://bugs.gentoo.org/852884
Fixes: https://github.com/gentoo/gentoo/pull/25948
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/25962
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...ctd-1.13.0-r4.ebuild => dictd-1.13.0-r5.ebuild} |  2 +
 app-text/dictd/files/dictd-1.13.0-lex.patch        | 28 ++++++++++
 app-text/dictd/files/dictd-1.13.0-libtool.patch    | 23 ++++----
 app-text/dictd/files/dictd-1.13.0-version.patch    | 65 ++++++++++++++++++++++
 4 files changed, 108 insertions(+), 10 deletions(-)

diff --git a/app-text/dictd/dictd-1.13.0-r4.ebuild b/app-text/dictd/dictd-1.13.0-r5.ebuild
similarity index 97%
rename from app-text/dictd/dictd-1.13.0-r4.ebuild
rename to app-text/dictd/dictd-1.13.0-r5.ebuild
index 19723217a411..77f5dd081635 100644
--- a/app-text/dictd/dictd-1.13.0-r4.ebuild
+++ b/app-text/dictd/dictd-1.13.0-r5.ebuild
@@ -45,7 +45,9 @@ DOC_CONTENTS="
 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
 )
 
 src_prepare() {

diff --git a/app-text/dictd/files/dictd-1.13.0-lex.patch b/app-text/dictd/files/dictd-1.13.0-lex.patch
new file mode 100644
index 000000000000..c69758c4805d
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-lex.patch
@@ -0,0 +1,28 @@
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 09:10:18 -0700
+Subject: [PATCH] build: Fix implicit function declarations
+
+--- a/clientparse.y
++++ b/clientparse.y
+@@ -24,6 +24,9 @@
+ #define YYERROR_VERBOSE
+ 
+ static dictServer *s;
++
++int yylex();
++void yyerror(const char *s);
+ %}
+ 
+ %union {
+--- a/servparse.y
++++ b/servparse.y
+@@ -30,6 +30,9 @@
+ 
+ static dictDatabase *db;
+ 
++int yylex();
++void yyerror(const char *s);
++
+ static int string2bool (const char *str)
+ {
+    if (

diff --git a/app-text/dictd/files/dictd-1.13.0-libtool.patch b/app-text/dictd/files/dictd-1.13.0-libtool.patch
index 808e72163c37..f687a182f60f 100644
--- a/app-text/dictd/files/dictd-1.13.0-libtool.patch
+++ b/app-text/dictd/files/dictd-1.13.0-libtool.patch
@@ -1,6 +1,5 @@
 https://bugs.gentoo.org/818535
 
-From ab4c1542d8103ef2a8dcfd8cc1ad624890258090 Mon Sep 17 00:00:00 2001
 From: orbea <orbea@riseup.net>
 Date: Fri, 17 Jun 2022 16:18:40 -0700
 Subject: [PATCH] configure: Add missing LT_INIT
@@ -26,16 +25,12 @@ Subject: [PATCH] configure: Add missing LT_INIT
  echo Configuring for dict
  echo .
  
-@@ -45,7 +47,7 @@ AC_CANONICAL_HOST
- AC_PROG_CC
- AC_PROG_CPP
- AC_PROG_CXX
--
-+AC_PROG_LIBTOOL
- AC_ISC_POSIX
+@@ -70,13 +72,10 @@ echo Checking for programs
  
- REALCC="$CC"
-@@ -75,8 +77,6 @@ AC_PROG_MAKE_SET
+ AC_PROG_AWK
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
+ AC_PROG_MAKE_SET
  AC_PROG_YACC
  AC_PROG_LEX
  
@@ -44,6 +39,14 @@ Subject: [PATCH] configure: Add missing LT_INIT
  AC_CHECK_PROGS(NROFF,gnroff nroff)
  AC_CHECK_PROGS(TROFF,groff troff)
  AC_CHECK_PROGS(COL,col cat)
+@@ -188,7 +187,6 @@ AC_SUBST(DICT_VERSION)
+ AC_SUBST(USE_PLUGIN)
+ AC_SUBST(EXEEXT)
+ AC_SUBST(allsubdirs)
+-AC_SUBST(LIBTOOL)
+ 
+ AC_SUBST(PLUGINS)
+ 
 --- a/doc/Makefile.in
 +++ b/doc/Makefile.in
 @@ -28,6 +28,7 @@ endif

diff --git a/app-text/dictd/files/dictd-1.13.0-version.patch b/app-text/dictd/files/dictd-1.13.0-version.patch
new file mode 100644
index 000000000000..fee60efe22da
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-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.0)
+-
+-
+ AC_PREREQ(2.53)
+ AC_REVISION($Revision: 1.144 $)
+ 
+-AC_INIT([dict],[VERSION],[dict-beta@dict.org])
++AC_INIT([dict],[1.13.0],[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@

[gentoo-commits] repo/gentoo:master commit in: app-text/dictd/files/, app-text/dictd/

[Sam James]

commit:     f45e8d10b4724c111fdb61446be1b4595dff99ab
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 03:34:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 03:34:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f45e8d10

app-text/dictd: fix stack smashing from silly typedef

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

 app-text/dictd/dictd-1.13.0-r6.ebuild              | 130 +++++++++++++++++++++
 .../dictd/files/dictd-1.13.0-stack-smashing.patch  |  18 +++
 2 files changed, 148 insertions(+)

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..b6118af1bde0
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.0-r6.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 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
+
+	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];