mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-23 16:49:10 -07:00
app-text/dictd: drop 1.13.1
Signed-off-by: Petr Vaněk <arkamar@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST dictd-1.13.1.tar.gz 395619 BLAKE2B 83caad8570e752575bf5fe39a41e4a7d564f3a255d4e4cb234661a56ed645dfb155bef8a89d4ecfebfefb2f03d4ab808c00f1c4eacaae883761e28817138526b SHA512 31a2e67feaa672e773b86d16ecb9f41fdcd2d5f907759cc110261af30147b3972a2c7d742b4d61b67eb3b8c84c08e179106b9a30e998a425c9b437ec933b03ea
|
||||
DIST dictd-1.13.3.tar.gz 390047 BLAKE2B e7d27672c9e8770a062a0dfae2c8b011b57b906477eeb779a6a3104018b50c20edf6d951a5e2561489cf86ab14f52eff80fb3aa6ce39d4da1e3008820ce57968 SHA512 41091fa3c9ae5d9b6139ea765d20f1f9f801e25e97ffb5aba6bb7e9fbddb4c2b2018d25092b341af430a80c6051db1e35a9d93d5ee8f97760006053ed30f4d58
|
||||
|
||||
@@ -1,131 +0,0 @@
|
||||
# Copyright 1999-2025 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="https://downloads.sourceforge.net/dict/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-1+ GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~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
|
||||
app-alternatives/lex
|
||||
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() {
|
||||
readme.gentoo_print_elog
|
||||
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
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
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 (
|
||||
@@ -1,59 +0,0 @@
|
||||
https://bugs.gentoo.org/818535
|
||||
|
||||
From: orbea <orbea@riseup.net>
|
||||
Date: Fri, 17 Jun 2022 16:18:40 -0700
|
||||
Subject: [PATCH] configure: Add missing LT_INIT
|
||||
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -28,6 +28,7 @@ endif
|
||||
|
||||
.SUFFIXES:
|
||||
|
||||
+top_builddir= @top_builddir@
|
||||
srcdir= @srcdir@
|
||||
VPATH= @srcdir@:.
|
||||
prefix= @prefix@
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -35,6 +35,8 @@ AC_INIT([dict],[VERSION],[dict-beta@dict.org])
|
||||
AC_CONFIG_SRCDIR([dictd.c])
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
|
||||
+LT_INIT
|
||||
+
|
||||
echo Configuring for dict
|
||||
echo .
|
||||
|
||||
@@ -70,13 +72,10 @@ echo Checking for programs
|
||||
|
||||
AC_PROG_AWK
|
||||
AC_PROG_INSTALL
|
||||
-AC_PROG_RANLIB
|
||||
AC_PROG_MAKE_SET
|
||||
AC_PROG_YACC
|
||||
AC_PROG_LEX
|
||||
|
||||
-AC_CHECK_PROG(LIBTOOL,libtool,libtool)
|
||||
-
|
||||
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
|
||||
|
||||
.SUFFIXES:
|
||||
|
||||
+top_builddir= @top_builddir@
|
||||
srcdir= @srcdir@
|
||||
VPATH= @srcdir@
|
||||
prefix= @prefix@
|
||||
@@ -1,65 +0,0 @@
|
||||
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@
|
||||
Reference in New Issue
Block a user