- fixed bug in the svc-dictd file. The automagic dictionary detection stuff

  I worte had a bug.  Caused dictd to respawn like a madman.

6 files changed, 119 insertions, 0 deletions

diff --git a/app-text/dictd/files/1.5.5-r2/dict.conf b/app-text/dictd/files/1.5.5-r2/dict.conf
new file mode 100644
index 000000000000..e06c3d296ec3
--- /dev/null
+++ b/app-text/dictd/files/1.5.5-r2/dict.conf
@@ -0,0 +1,6 @@
+# This is the configuration file for dict.
+# Usually all you will ever need here is the server keywords.
+# Refer to the dict manpage for other options.
+# It will only check the second server if the first fails
+server localhost
+server dict.org
diff --git a/app-text/dictd/files/1.5.5-r2/dictd-run b/app-text/dictd/files/1.5.5-r2/dictd-run
new file mode 100755
index 000000000000..94572da5456a
--- /dev/null
+++ b/app-text/dictd/files/1.5.5-r2/dictd-run
@@ -0,0 +1,3 @@
+#!/bin/sh
+# We abuse some debugging features here to get the desired behavior
+exec dictd -s -d nodetach < /dev/null > /dev/null 2>&1
diff --git a/app-text/dictd/files/1.5.5-r2/dictd.conf b/app-text/dictd/files/1.5.5-r2/dictd.conf
new file mode 100644
index 000000000000..4cded974f973
--- /dev/null
+++ b/app-text/dictd/files/1.5.5-r2/dictd.conf
@@ -0,0 +1,22 @@
+# dictd configuration file.
+# whipped up by michael conrad tilstra <michael@gentoo.org>
+
+# Informational message
+site site.info
+
+# who's allowed.  You might want to change this.
+access {
+  allow *
+}
+
+# Dictionaries are listed below.
+# The initrc script scans /usr/lib/dict and adds all of the dictionaries
+# it finds here.  
+# 
+# The initrc script will delete everything after the the last line and
+# replace it with what it finds.  So add all of your things above.
+# 
+# If this is a problem for people, contact me and
+# we can work out a different method.
+#
+#LASTLINE
diff --git a/app-text/dictd/files/1.5.5-r2/site.info b/app-text/dictd/files/1.5.5-r2/site.info
new file mode 100644
index 000000000000..23bfdeb61102
--- /dev/null
+++ b/app-text/dictd/files/1.5.5-r2/site.info
@@ -0,0 +1,6 @@
+Welcome to your dictionary server dictd!
+
+This is an example site information file.  It should contain information
+about any restricted databases and how users can obtain access.  If may
+also contain other random data as you see fit.
+
diff --git a/app-text/dictd/files/1.5.5-r2/svc-dictd b/app-text/dictd/files/1.5.5-r2/svc-dictd
new file mode 100755
index 000000000000..3a21ac5e43ad
--- /dev/null
+++ b/app-text/dictd/files/1.5.5-r2/svc-dictd
@@ -0,0 +1,81 @@
+#!/bin/sh
+#RCUPDATE:3 4:75:This line is required for script management
+
+. /etc/rc.d/config/functions
+
+SERVICE=dictd
+opts="start stop"
+
+
+DICTDCONF=/etc/dict/dictd.conf
+TMPCONF=/etc/dict/dictd.conf.$$
+prepconfig() {
+	if [ ! -e ${DICTDCONF} ]
+	then
+		eerror "dictd not started.  Config file not found."
+		exit 1
+	fi
+	# if no dictionaries, skip startup.
+
+# The new way of doing this is to scan /usr/lib/dict and tweek the conf
+	DLIBDIR=/usr/lib/dict 
+
+	einfo "Scanning for dictionaries..."
+	if [ ! -d "${DLIBDIR}" ]; then
+		eerror "${DLIBDIR} doesn't exist, no dictionaries found."
+		exit 1
+	fi
+	pushd ${DLIBDIR} >/dev/null
+	INDEXFILES=`ls *.index`
+	if [ -z "$INDEXFILES" ]; then
+		eerror "No dictionaries installed."
+		exit 1
+	fi
+
+	cat $DICTDCONF | sed -e '/^#LASTLINE/,$d' > $TMPCONF
+	echo "#LASTLINE" >> $TMPCONF
+
+	CNT=0
+	for i in $INDEXFILES
+	do
+		DNAME=`echo $i | awk -F . '{print $1;}'`
+		#two possible names for a matching dictionary, check which is there.
+		if [ -f ${DNAME}.dict.dz ]; then
+			DICT=${DNAME}.dict.dz
+		elif [ -f ${DNAME}.dict ];then
+			DICT=${DNAME}.dict
+		else
+			einfo "Index $i has no matching dictionaray..."
+		fi
+
+		#ok, go an index, and a dixtionary, append.
+		echo "database $DNAME { data \"${DLIBDIR}/${DICT}\"" >> $TMPCONF
+		echo "         index \"${DLIBDIR}/$i\" }" >> $TMPCONF
+
+		CNT=`expr $CNT + 1`
+	done
+	popd >/dev/null
+	mv ${TMPCONF} ${DICTDCONF}
+	einfo "Done, $CNT dictionary indexes found."
+}
+
+start() {
+    ebegin "Starting supervised ${SERVICE}"
+    prepconfig
+	ln -sf ../services/${SERVICE} ${SVCDIR}/control/${SERVICE}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping supervised ${SERVICE}"
+   	if [ -e ${SVCDIR}/control/${SERVICE} ]
+	then
+		/usr/bin/svc -dx ${SVCDIR}/control/${SERVICE}
+		rm ${SVCDIR}/control/${SERVICE}
+	fi
+	eend $?
+}
+
+doservice ${@}
+
+#vim:sw=4:ts=4:ai
diff --git a/app-text/dictd/files/digest-dictd-1.5.5-r2 b/app-text/dictd/files/digest-dictd-1.5.5-r2
new file mode 100644
index 000000000000..875329fc7519
--- /dev/null
+++ b/app-text/dictd/files/digest-dictd-1.5.5-r2
@@ -0,0 +1 @@
+MD5 67307b6e5d0337f354b275c377506c63 dictd-1.5.5.tar.gz