[gentoo-commits] gentoo-x86 commit in app-text/dictd/files/1.10.11: site.info colorit.conf dictd.initd dict.conf dictd.conf dictd.confd

[Peter Volkov (pva)]

pva         08/09/12 19:20:58

  Added:                site.info colorit.conf dictd.initd dict.conf
                        dictd.conf dictd.confd
  Log:
  Fixed inability to stop dictd, bug #236451, thank David B. Ferguson for report and fix. Cleaned up ebuild. Install again colorit and provide config file (back to bug #107376). Create initd user and make initrc script to work with permissions on its own (back to bug #90657). Took some patches from debian most important of which backports upstream fix for first connection denied problem. Removed old.
  (Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686)

Revision  Changes    Path
1.1                  app-text/dictd/files/1.10.11/site.info

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/site.info?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/site.info?rev=1.1&content-type=text/plain

Index: site.info
===================================================================
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.




1.1                  app-text/dictd/files/1.10.11/colorit.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/colorit.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/colorit.conf?rev=1.1&content-type=text/plain

Index: colorit.conf
===================================================================
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)  



1.1                  app-text/dictd/files/1.10.11/dictd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/dictd.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/dictd.initd?rev=1.1&content-type=text/plain

Index: dictd.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.10.11/dictd.initd,v 1.1 2008/09/12 19:20:57 pva Exp $

prepconfig() {
	local TMPCONF INDEXFILES CNT DNAME DICT
	if [ ! -e "${DICTDCONF}" ]; then
		eerror "Config file ${DICTDCONF} not found."
		return 1
	fi

	# if no dictionaries, skip startup.
	# The new way of doing this is to scan /usr/lib/dict and tweek the conf
	einfo "Scanning for dictionaries..."
	if [ ! -d "${DLIBDIR}" ]; then
		eerror "${DLIBDIR} doesn't exist, no dictionaries found."
		return 1
	fi
	pushd ${DLIBDIR} >/dev/null
	INDEXFILES=$(ls *.index)
	if [ -z "${INDEXFILES}" ]; then
		eerror "No dictionaries found at ${DLIBDIR}."
		eerror "Please, emerge at least one of app-dicts/dictd-* dictionaries."
		return 1
	fi

	TMPCONF=$(mktemp -t dictd.conf.XXXXXXXXXX)
	cat ${DICTDCONF} | sed -e '/^#LASTLINE/,$d' > ${TMPCONF}
	echo "#LASTLINE" >> ${TMPCONF}

	CNT=0
	for i in "${INDEXFILES}"; do
		DNAME=$(echo $i | sed -e 's/[.]index$//')
		#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
			ewarn "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}"
	chown 0:dictd "${DICTDCONF}"
	chmod g+r "${DICTDCONF}"
	einfo "Done, ${CNT} dictionaries found."
}

depend() {
	need localmount
}

start() {
	prepconfig || return 1
	ebegin "Starting dictd"
	start-stop-daemon --start --quiet --exec /usr/sbin/dictd -- ${DICTD_OPTS}
	eend $?
}

stop() {
	ebegin "Stopping dictd"
	start-stop-daemon --stop --quiet --exec /usr/sbin/dictd
	eend $?
}



1.1                  app-text/dictd/files/1.10.11/dict.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/dict.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/dict.conf?rev=1.1&content-type=text/plain

Index: dict.conf
===================================================================
# 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



1.1                  app-text/dictd/files/1.10.11/dictd.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/dictd.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/dictd.conf?rev=1.1&content-type=text/plain

Index: dictd.conf
===================================================================
# dictd configuration file

global {
	# Informational message
	site site.info
}

# who's allowed. You might want to change this.
access {
  allow *
}

# Dictionaries are listed below. During dictd startup the initrc script will
# scan ${DLIBDIR} (see /etc/conf.d/dictd) and adds all of the dictionaries it
# finds here. 
# 
# NOTE: Initrc script will wipe everything below #LASTLINE and replace it with
# what it finds. So add all of your things above. If this is a problem, report
# bug at https://bugs.gentoo.org, please.
#
# Do not remove next line!
#LASTLINE



1.1                  app-text/dictd/files/1.10.11/dictd.confd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/dictd.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/1.10.11/dictd.confd?rev=1.1&content-type=text/plain

Index: dictd.confd
===================================================================
# If have problems starting dictd in an UTF-8 locale, add an appropriate
# --locale switch to DICTD_OPTS, e. g. "--locale=en_US.utf8"
DICTD_OPTS="-s "
DICTDCONF=/etc/dict/dictd.conf
DLIBDIR=/usr/lib/dict