From 2ad83698f491571860f4c255588b34822d946218ea3bd2fcb44bede1aa5515df Mon Sep 17 00:00:00 2001 From: andrea florio Date: Mon, 30 May 2011 17:40:07 +0000 Subject: [PATCH] Accepting request 72124 from openSUSE:Factory:Contrib please review, contrib cleanup OBS-URL: https://build.opensuse.org/request/show/72124 OBS-URL: https://build.opensuse.org/package/show/Education/dictd?expand=0&rev=1 --- .gitattributes | 23 +++++ .gitignore | 1 + colorit.conf | 32 +++++++ dictd-1.11.1.patch | 34 ++++++++ dictd-1.11.1.tar.bz2 | 3 + dictd.changes | 200 +++++++++++++++++++++++++++++++++++++++++++ dictd.init | 149 ++++++++++++++++++++++++++++++++ dictd.spec | 140 ++++++++++++++++++++++++++++++ libmaa-1.1.1.patch | 8 ++ libmaa-1.1.1.tar.bz2 | 3 + 10 files changed, 593 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 colorit.conf create mode 100644 dictd-1.11.1.patch create mode 100644 dictd-1.11.1.tar.bz2 create mode 100644 dictd.changes create mode 100644 dictd.init create mode 100644 dictd.spec create mode 100644 libmaa-1.1.1.patch create mode 100644 libmaa-1.1.1.tar.bz2 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/colorit.conf b/colorit.conf new file mode 100644 index 0000000..e66cde4 --- /dev/null +++ b/colorit.conf @@ -0,0 +1,32 @@ +dnl /etc/dictd/colorit.conf vim:ft=m4 +dnl +dnl Sample configuration file for colorit(1) program +dnl +divert(-1) +dnl +dnl Define some useful color variables +dnl +define(`black', `0') +define(`red', `1') +define(`green', `2') +define(`brown', `3') +define(`blue', `4') +define(`magenta', `5') +define(`cyan', `6') +define(`white', `7') +dnl +dnl Mark macro arguments: regexp foreground-color [background-color] +dnl +define(`mark', ``mark "$1"'' `ifelse(`$#', `3', ``"\033[3$2;4$3m"'', ``"\033[3$2m"'')' `"\033[m"') +dnl +divert +mark(`^From.*$',red,cyan) +mark(`^ [^ ]+',green) +mark(`^ *Note:',red) +mark(`{[^{]+}',green) +mark(`^ *\[[^\[]+\]', cyan) +mark(`^[ ]*(adj|n|v|adv)? *[0-9]+[\.:]',cyan) +mark(`^ *\([a-z]+\)',cyan) +mark(`(Syn|Ant|syn|ant):', blue, white) +mark(` (t|i|a|adj|adv|n|v)\. ',cyan) +mark(` (t|i|a|adj|adv|n|v)\.$',cyan) diff --git a/dictd-1.11.1.patch b/dictd-1.11.1.patch new file mode 100644 index 0000000..c894ab5 --- /dev/null +++ b/dictd-1.11.1.patch @@ -0,0 +1,34 @@ +Index: Makefile.in +=================================================================== +--- Makefile.in.orig ++++ Makefile.in +@@ -33,8 +33,9 @@ VPATH= @srcdir@:. + prefix= @prefix@ + subdirs= @allsubdirs@ # doc -- use rfc2229 instead + exec_prefix= @exec_prefix@ +-man1_prefix= @mandir@/man1 +-man8_prefix= @mandir@/man8 ++mandir= @mandir@ ++man1_prefix= $(mandir)/man1 ++man8_prefix= $(mandir)/man8 + bindir= @bindir@ + libdir= @libdir@ + libexecdir= @libexecdir@ +Index: md5.h +=================================================================== +--- md5.h.orig ++++ 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 ++typedef uint32_t uint32; + + struct MD5Context { + uint32 buf[4]; diff --git a/dictd-1.11.1.tar.bz2 b/dictd-1.11.1.tar.bz2 new file mode 100644 index 0000000..626694f --- /dev/null +++ b/dictd-1.11.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82a15a86f16779044af18333beacab68eba254b3c1dd2779a830e34ab201fecc +size 328064 diff --git a/dictd.changes b/dictd.changes new file mode 100644 index 0000000..0e10c25 --- /dev/null +++ b/dictd.changes @@ -0,0 +1,200 @@ +------------------------------------------------------------------- +Mon Mar 2 12:44:09 CET 2009 - prusnak@suse.cz + +- updated to 1.11.1 + * fixed installing plugins + * DICTFMT sorts entries in 00-database-alphabet entry + lexicographically, that is now this order doesn't depend on + sizeof(long) + * DICTFMT: 'dictfmt -I' never worked + +------------------------------------------------------------------- +Fri Feb 6 11:29:08 CET 2009 - prusnak@suse.cz + +- file /var/log/dictd is now pre-created [bnc#461234] + +------------------------------------------------------------------- +Tue Nov 4 16:54:47 CET 2008 - prusnak@suse.cz + +- add missing colorit.conf [bnc#441256] + +------------------------------------------------------------------- +Thu Aug 14 14:20:47 CEST 2008 - prusnak@suse.cz + +- small cleanup of spec file +- fixed preun/postun scripts + +------------------------------------------------------------------- +Mon Apr 7 20:36:05 CEST 2008 - zpetrova@suse.cz + +- update to version 1.10.11 + - fixed many compiler warnings/failures. + - dictd: while processing MATCH command unicity of only first + column of .index was checked, but not fourth column-> fixed. + - timestamp log marker (log_option "timestamp") is changed + from :T: to :t: + - dictfmt: maximum length of headwords was limited to hardcoded + constant. Now arrays are reallocated. + - dict: new -F|--flush option for flushing stdout after each + definition/match + - colorit: bashism fixed: 'echo -en' -> more portable 'printf'. + +------------------------------------------------------------------- +Sun Feb 17 23:43:34 CET 2008 - zpetrova@suse.cz + +- update to version 1.10.10: + - dictd: added support for utf-8 symbols other than BMP + - dict, dictl, colorit do not support paging to a special program, + i.e. --pager|-P option. As of this version everything is output + to stdout only. '-P -' option is allowed. +- fixed compiler warning (bug #361613) + +------------------------------------------------------------------- +Thu Jul 12 20:24:18 CEST 2007 - zpetrova@suse.cz + +- update to version 1.10.9: +- added new keywords limit_{time,matches,definitions,queries} to + dictd to prevent DOS attacks. +- support for the case-sensitive search. +- Two new search strategies, 'first' and 'last'. +- dict -f now enables formatted output for further processing + by other utilities. +- clean up configure.in and Makefile.in + +------------------------------------------------------------------- +Thu Mar 29 19:11:22 CEST 2007 - dmueller@suse.de + +- update BuildRequires + +------------------------------------------------------------------- +Fri Jul 7 15:19:11 CEST 2006 - zpetrova@suse.cz + +- update to version 1.10.6 + +------------------------------------------------------------------- +Wed Jun 28 11:03:56 CEST 2006 - zpetrova@suse.cz + +- update to version 1.10.5 +- added configure --enable_dictorg (#169995) + +------------------------------------------------------------------- +Wed Jan 25 21:35:28 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue Jan 17 03:01:16 CET 2006 - zpetrova@suse.cz + +- fixed build. + +------------------------------------------------------------------- +Mon Jan 16 11:40:50 CET 2006 - zpetrova@suse.cz + +- update to version 1.10.4 + +------------------------------------------------------------------- +Thu Apr 21 14:29:44 CEST 2005 - zpetrova@suse.cz + +- dictd-gcc4.patch: make dictd compilable with gcc-4.0 + +------------------------------------------------------------------- +Mon Apr 26 01:20:06 CEST 2004 - ro@suse.de + +- added missing return value (unreached code) + +------------------------------------------------------------------- +Sun Jan 11 11:22:17 CET 2004 - adrian@suse.de + +- add %defattr + +------------------------------------------------------------------- +Thu May 22 16:28:35 CEST 2003 - coolo@suse.de + +- use BuildRoot + +------------------------------------------------------------------- +Wed Nov 13 01:46:04 CET 2002 - ro@suse.de + +- fix for current bison (end all rules with ";") + +------------------------------------------------------------------- +Tue Sep 17 17:34:28 CEST 2002 - ro@suse.de + +- removed bogus self-provides + +------------------------------------------------------------------- +Mon Aug 19 19:07:40 CEST 2002 - mmj@suse.de + +- Correct PreReq + +------------------------------------------------------------------- +Thu Apr 25 20:07:37 CEST 2002 - uwedr@suse.de + +- Removed dictd.conf from specfile. It was not used and examples are + in /usr/share/doc/packages/dictd anyway. + +------------------------------------------------------------------- +Tue Apr 23 21:03:36 CEST 2002 - schwab@suse.de + +- Fix for 64 bit platforms. +- Use RPM_OPT_FLAGS. + +------------------------------------------------------------------- +Mon Jan 14 17:42:18 CET 2002 - ro@suse.de + +- removed START_DICTD + +------------------------------------------------------------------- +Wed Dec 12 15:20:12 CET 2001 - uwedr@suse.de + +- Added some hints in dictd.conf how to install local dictionaris +- Logging to /var/log/dictd (see startup in /etc/init.d/dictd) + +------------------------------------------------------------------- +Wed Jun 6 17:09:21 CEST 2001 - ro@suse.de + +- mark used files as Source + +------------------------------------------------------------------- +Wed May 30 17:20:19 CEST 2001 - uwedr@suse.de + +- improved spec file (#7139): + no more --with-qt and some paths corrected +- new rc.config variable START_DICTD and init script added, so the + server dictd can be started now (if /etc/dictd.conf is configured + properly and at least one dictionary is installed) + +------------------------------------------------------------------- +Sat Dec 9 18:28:40 MET 2000 - nashif@suse.de + +- sorted + +------------------------------------------------------------------- +Tue Feb 15 14:27:36 CET 2000 - ro@suse.de + +- man to /usr/share using macro + +------------------------------------------------------------------- +Tue Feb 15 12:20:36 CET 2000 - aj@suse.de + +- Removed prototypes for SunOS/Solaris. + +------------------------------------------------------------------- +Fri Sep 17 11:28:09 MEST 1999 - kettner@suse.de + +- Reinserted old # Commandline: line. + +------------------------------------------------------------------- +Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de + +- ran old prepare_spec on spec file to switch to new prepare_spec. + +------------------------------------------------------------------- +Wed Apr 28 01:55:46 MEST 1999 - ro@suse.de + +- fixed: dict.c: stdout is not constant + +------------------------------------------------------------------- +Fri Apr 9 16:35:20 MEST 1999 - kettner@suse.de + +- Created spec file from dictd-1.4.9.tar.gz using autospec script diff --git a/dictd.init b/dictd.init new file mode 100644 index 0000000..45b9e83 --- /dev/null +++ b/dictd.init @@ -0,0 +1,149 @@ +#! /bin/sh +# Copyright (c) 1995-2001 SuSE GmbH Nuernberg, Germany. +# +# Author: Uwe Drechsel +# +# init.d/dictd +# +# and symbolic its link +# +# /sbin/rcdictd +# +### BEGIN INIT INFO +# Provides: dictd +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Description: Start dictd server to provide dictionaries +### END INIT INFO + +DICTD_BIN=/usr/sbin/dictd +test -x $DICTD_BIN || exit 5 + +# Shell functions sourced from /etc/rc.status: +# rc_check check and set local and overall rc status +# rc_status check and set local and overall rc status +# rc_status -v ditto but be verbose in local rc status +# rc_status -v -r ditto and clear the local rc status +# rc_failed set local and overall rc status to failed +# rc_failed set local and overall rc status to +# rc_reset clear local rc status (overall remains) +# rc_exit exit appropriate to overall rc status +. /etc/rc.status + +# First reset status of this service +rc_reset + +# Return values acc. to LSB for all commands but status: +# 0 - success +# 1 - generic or unspecified error +# 2 - invalid or excess argument(s) +# 3 - unimplemented feature (e.g. "reload") +# 4 - insufficient privilege +# 5 - program is not installed +# 6 - program is not configured +# 7 - program is not running +# +# Note that starting an already running service, stopping +# or restarting a not-running service as well as the restart +# with force-reload (in case signalling is not supported) are +# considered a success. + +case "$1" in + start) + echo -n "Starting DICTD" + ## Start daemon with startproc(8). If this fails + ## the echo return value is set appropriate. + + # NOTE: startproc return 0, even if service is + # already running to match LSB spec. + startproc $DICTD_BIN -L /var/log/dictd + + # Remember status and be verbose + rc_status -v + ;; + stop) + echo -n "Shutting down DICTD" + ## Stop daemon with killproc(8) and if this fails + ## set echo the echo return value. + + killproc -TERM $DICTD_BIN + + # Remember status and be verbose + rc_status -v + ;; + try-restart) + ## Stop the service and if this succeeds (i.e. the + ## service was running before), start it again. + ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) + $0 status >/dev/null && $0 restart + + # Remember status and be quiet + rc_status + ;; + restart) + ## Stop the service and regardless of whether it was + ## running or not, start it again. + $0 stop + $0 start + + # Remember status and be quiet + rc_status + ;; + force-reload) + ## Signal the daemon to reload its config. Most daemons + ## do this on signal 1 (SIGHUP). + ## If it does not support it, restart. + + echo -n "Reload service dictd" + ## if it supports it: + killproc -HUP $DICTD_BIN + #touch /var/run/dictd.pid + rc_status -v + + ## Otherwise: + #$0 stop && $0 start + #rc_status + ;; + reload) + ## Like force-reload, but if daemon does not support + ## signalling, do nothing (!) + + # If it supports signalling: + echo -n "Reload service dictd" + killproc -HUP $DICTD_BIN + #touch /var/run/dictd.pid + rc_status -v + + ## Otherwise if it does not support reload: + #rc_failed 3 + #rc_status -v + ;; + status) + echo -n "Checking for dictd: " + ## Check status with checkproc(8), if process is running + ## checkproc will return with exit status 0. + + # Status has a slightly different for the status command: + # 0 - service running + # 1 - service dead, but /var/run/ pid file exists + # 2 - service dead, but /var/lock/ lock file exists + # 3 - service not running + + # NOTE: checkproc returns LSB compliant status values. + checkproc $DICTD_BIN + rc_status -v + ;; + probe) + ## Optional: Probe for the necessity of a reload, + ## give out the argument which is required for a reload. + + test /etc/dictd/dictd.conf -nt /var/run/dictd.pid && echo reload + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" + exit 1 + ;; +esac +rc_exit diff --git a/dictd.spec b/dictd.spec new file mode 100644 index 0000000..2a4d283 --- /dev/null +++ b/dictd.spec @@ -0,0 +1,140 @@ +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +%define maa_ver 1.1.1 + +Name: dictd +Version: 1.11.1 +Release: 1 +License: GPLv2+ +Summary: Electronic Online Dictionaries +Url: http://www.dict.org +Group: Productivity/Office/Dictionary +Source0: %{name}-%{version}.tar.bz2 +Source1: libmaa-%{maa_ver}.tar.bz2 +Source2: dictd.init +Source3: colorit.conf +Patch0: %{name}-%{version}.patch +Patch1: libmaa-%{maa_ver}.patch +BuildRequires: bison +BuildRequires: flex +BuildRequires: pam-devel +BuildRequires: zlib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(pre): %insserv_prereq %fillup_prereq + +%define separate_maa 0 + +%description +This package contains two programs. With dict, you have access to +powerful electronic dictionaries on the Internet. With dictd, you can +set up your own dictionary. To look up, for example, the word 'grunt', +just type "dict grunt" at a command line. See the man pages of dict and +dictd for details. + +%if %{separate_maa} +%package -n libmaa1 +Version: %{maa_ver} +Summary: Library providing many low-level data structures +Group: System/Libraries/C and C++ + +%description -n libmaa1 +The libmaa library provides many low-level data structures which are +helpful for writing compilers, including hash tables, sets, lists, +debugging support, and memory management. Although libmaa was designed +and implemented as a foundation for the kheperalong, the data structures +are generally applicable to a wide range of programming problems. + +The memory management routines are especially helpful for improving the +performance of memory-intensive applications. + +%package -n libmaa-devel +Version: %{maa_ver} +Summary: Development files for libmaa +Group: Development/Libraries/C and C++ +Requires: libmaa1 = %{maa_ver} + +%description -n libmaa-devel +Development files for libmaa +%endif + +%prep +%setup -q -a 1 +%patch0 +cd libmaa-%{maa_ver} +%patch1 + +%build +cd libmaa-%{maa_ver} +%configure \ + --enable-dictorg +make %{?_smp_mflags} +cd .. +export CFLAGS="%{optflags} -Ilibmaa-%{maa_ver}" +export LDFLAGS="$LDFLAGS -L./libmaa-%{maa_ver}/.libs" +%configure +make %{?_smp_mflags} + + +%install +%make_install +install -D -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/dictd +install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/colorit.conf +ln -sf /etc/init.d/dictd %{buildroot}%{_sbindir}/rcdictd +%if %{separate_maa} +cd libmaa-%{maa_ver} +%make_install +rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_libdir}/*.a +%endif + +%clean +rm -rf %{buildroot} + +%post +%fillup_and_insserv dictd +touch %{_localstatedir}/log/dictd +chown nobody:nogroup %{_localstatedir}/log/dictd +chmod 644 %{_localstatedir}/log/dictd + +%preun +%stop_on_removal dictd + +%postun +%restart_on_update dictd +%insserv_cleanup +rm -rf %{_localstatedir}/log/dictd + +%if %{separate_maa} +%post -n libmaa1 -p /sbin/ldconfig + +%postun -n libmaa1 -p /sbin/ldconfig +%endif + +%files +%defattr(-,root,root) +%doc ANNOUNCE COPYING ChangeLog NEWS README TODO example* +%doc doc/dicf.ms doc/rfc.ms doc/rfc2229.txt doc/security.doc +%{_bindir}/* +%{_sbindir}/* +%{_mandir}/man1/* +%{_mandir}/man8/* +%config(noreplace) %{_sysconfdir}/colorit.conf +%config %{_sysconfdir}/init.d/dictd +%{_includedir}/dict* + +%if %{separate_maa} + +%files -n libmaa1 +%defattr(-,root,root) +%{_libdir}/*.so.* + +%files -n libmaa-devel +%defattr(-,root,root) +%{_includedir}/maa* +%{_libdir}/*.so + +%endif + +%changelog diff --git a/libmaa-1.1.1.patch b/libmaa-1.1.1.patch new file mode 100644 index 0000000..3dfe236 --- /dev/null +++ b/libmaa-1.1.1.patch @@ -0,0 +1,8 @@ +--- doc/extract.pl ++++ doc/extract.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # This file is -*- perl -*- source. + # Created: Wed Jan 4 13:04:37 1995 by faith@cs.unc.edu + # Revised: Mon Dec 9 15:22:26 1996 by faith@cs.unc.edu diff --git a/libmaa-1.1.1.tar.bz2 b/libmaa-1.1.1.tar.bz2 new file mode 100644 index 0000000..a44b3b8 --- /dev/null +++ b/libmaa-1.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1db2f2b7f36ff286d0fcf938b1f8ac474c91125aba995e0dadfdc2ef47332b9 +size 248451