Changed the init script to better accommodate for UTF-8 locales and dictionaries and added a note about this to confd.

Package-Manager: portage-2.1.3.7

4 files changed, 32 insertions, 15 deletions

diff --git a/app-text/dictd/ChangeLog b/app-text/dictd/ChangeLog
index 7e8b15eeb4eb..bd6b15a1b27c 100644
--- a/app-text/dictd/ChangeLog
+++ b/app-text/dictd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/dictd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.38 2007/08/25 16:52:10 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.39 2007/09/02 12:16:07 philantrop Exp $
+
+  02 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> files/1.10.9/dictd,
+  files/1.10.9/dictd.confd:
+  Changed the init script to better accommodate for UTF-8 locales and
+  dictionaries and added a note about this to confd.
 
   25 Aug 2007; Steve Dibb <beandog@gentoo.org> dictd-1.9.14.ebuild:
   amd64 stable
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 6e4965858d70..fd445cf9fb7c 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -1,19 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.10.9/dict.conf 243 RMD160 5adc267e57f7a4e526d2b6d7ef43ed712d1e6a19 SHA1 acaad0d56fc7fa4f3cc48152ad13cbba265c8faa SHA256 278b6986ebbfe74396a9e287d94a2d8128a83d511df84f02093058081aa12d57
 MD5 fb72f7d8c55f84b1b37bbc8d33a8e55a files/1.10.9/dict.conf 243
 RMD160 5adc267e57f7a4e526d2b6d7ef43ed712d1e6a19 files/1.10.9/dict.conf 243
 SHA256 278b6986ebbfe74396a9e287d94a2d8128a83d511df84f02093058081aa12d57 files/1.10.9/dict.conf 243
-AUX 1.10.9/dictd 1852 RMD160 c6a155738c29607fcfd828bed5ac9c3b63faf497 SHA1 471689430f3b3050487ea9f7f36e226671d00b74 SHA256 9aafbd4dc8b8d7e1dbb136822d94d29656f48296b85986220313427df0807943
-MD5 ada611dea3b2e38154e0c763a8996dcf files/1.10.9/dictd 1852
-RMD160 c6a155738c29607fcfd828bed5ac9c3b63faf497 files/1.10.9/dictd 1852
-SHA256 9aafbd4dc8b8d7e1dbb136822d94d29656f48296b85986220313427df0807943 files/1.10.9/dictd 1852
+AUX 1.10.9/dictd 1841 RMD160 53e45ab00f48e6064b21deec906d7ae0aa31fe02 SHA1 fab59d4456ffe4d13e0006364c78994e8f716fa3 SHA256 af89ca3e18800ff6c0889d363061617578e2dfdad0bdce7585edf91ec194ff60
+MD5 1454dbf469be73a06b6cfbbffff47aec files/1.10.9/dictd 1841
+RMD160 53e45ab00f48e6064b21deec906d7ae0aa31fe02 files/1.10.9/dictd 1841
+SHA256 af89ca3e18800ff6c0889d363061617578e2dfdad0bdce7585edf91ec194ff60 files/1.10.9/dictd 1841
 AUX 1.10.9/dictd.conf 582 RMD160 40e0724067b6e51c70c3a57cad31016d4f9c4055 SHA1 2d0aeb8c0bdb1653080c1c2689fe10e0a70e0dc5 SHA256 3c3bd8186c94cf15759927a9baf98813d4ebe1b38b809894fe15a8dfad2d91dc
 MD5 29e0686779cd346f649e2ebc1ecdd502 files/1.10.9/dictd.conf 582
 RMD160 40e0724067b6e51c70c3a57cad31016d4f9c4055 files/1.10.9/dictd.conf 582
 SHA256 3c3bd8186c94cf15759927a9baf98813d4ebe1b38b809894fe15a8dfad2d91dc files/1.10.9/dictd.conf 582
-AUX 1.10.9/dictd.confd 233 RMD160 4110acab970a7e011732e642d92b69b6c87909ae SHA1 6e758c4c0f1774dc592b512570c0c9cb13ba4474 SHA256 56981622520c7ce8fc962b676da2d845202313b5c66231529fd165f6b4f88651
-MD5 ebb07502950cf62a99fbaf4b81c06dc3 files/1.10.9/dictd.confd 233
-RMD160 4110acab970a7e011732e642d92b69b6c87909ae files/1.10.9/dictd.confd 233
-SHA256 56981622520c7ce8fc962b676da2d845202313b5c66231529fd165f6b4f88651 files/1.10.9/dictd.confd 233
+AUX 1.10.9/dictd.confd 370 RMD160 91711286732ed4ff0461ff87d56a19e8c5cf4494 SHA1 80246a38bedc5fb1b2b7db71803eaa650be6937c SHA256 165d4a8a96d70b878d397a2f011d0521e46ac16781a63751a1e0b84791d52565
+MD5 1b7adec2299adc7fdcc2de9690f45952 files/1.10.9/dictd.confd 370
+RMD160 91711286732ed4ff0461ff87d56a19e8c5cf4494 files/1.10.9/dictd.confd 370
+SHA256 165d4a8a96d70b878d397a2f011d0521e46ac16781a63751a1e0b84791d52565 files/1.10.9/dictd.confd 370
 AUX 1.10.9/site.info 235 RMD160 3bee51beb2ad856a6de1941764158f558c124733 SHA1 5de46179c02e3cf7a6f5360e5399b089db30878d SHA256 cb55e7aaedef73665996f015a07e97e45cd3771775e291d798bf163b0052c0a2
 MD5 b8cabf913876e544d919c7f20ff8db9e files/1.10.9/site.info 235
 RMD160 3bee51beb2ad856a6de1941764158f558c124733 files/1.10.9/site.info 235
@@ -78,10 +81,10 @@ EBUILD dictd-1.9.14.ebuild 1234 RMD160 75f7b45fb35c7ae0a576714a7769d18b5f7f31e8
 MD5 7580797095e669175daa94b713e9159d dictd-1.9.14.ebuild 1234
 RMD160 75f7b45fb35c7ae0a576714a7769d18b5f7f31e8 dictd-1.9.14.ebuild 1234
 SHA256 b1dbd72b4613e9024432d0a07df822e409ac2782e594c19c731d79ffc02f3eea dictd-1.9.14.ebuild 1234
-MISC ChangeLog 6073 RMD160 282fa8857f5b3fa69f4d4474f531c00834e99af5 SHA1 6e3c5ff19f9d1d379e5189b3de4ef5b905c77030 SHA256 083b7c487b72178a80ea6db41694d67fb71017fa002882c0936f8e800793024f
-MD5 84e95105e967d43ce1b40818fe154e83 ChangeLog 6073
-RMD160 282fa8857f5b3fa69f4d4474f531c00834e99af5 ChangeLog 6073
-SHA256 083b7c487b72178a80ea6db41694d67fb71017fa002882c0936f8e800793024f ChangeLog 6073
+MISC ChangeLog 6303 RMD160 fad2a169ece56558650df4fab5e4fe0d653fe49e SHA1 1378b92764d01e18a00674a619799bde50ed7d69 SHA256 af314b6cc805d1df788e265babef9462c7463d9f5eeba58461232f407906173e
+MD5 097c8a3799432f5c82af388236ded754 ChangeLog 6303
+RMD160 fad2a169ece56558650df4fab5e4fe0d653fe49e ChangeLog 6303
+SHA256 af314b6cc805d1df788e265babef9462c7463d9f5eeba58461232f407906173e ChangeLog 6303
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
 MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 metadata.xml 162
@@ -98,3 +101,10 @@ SHA256 6d550ea4c3b1372fbf4613e8a453bb661d9ed1af49450144d70b4b2d569a9d16 files/di
 MD5 694abd9a2cfe74deda6f5d5f785bdda1 files/digest-dictd-1.9.14 238
 RMD160 2af575d829751ebb229122c3f873241d7f56b1be files/digest-dictd-1.9.14 238
 SHA256 a822e8ece3d2b758bf2f7366ffcdbc6fffbcb6477e75eba20644581eb0e491d0 files/digest-dictd-1.9.14 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG2qmNCkvF58q80IkRAlh7AKCLLi4yeaJG0Zdqj47cYmOVgIijPwCfR5wE
+kEVVah9n4VLcykaxsK39Jr8=
+=a/4x
+-----END PGP SIGNATURE-----
diff --git a/app-text/dictd/files/1.10.9/dictd b/app-text/dictd/files/1.10.9/dictd
index 5f21c9808a7d..dfb4499eae02 100644
--- a/app-text/dictd/files/1.10.9/dictd
+++ b/app-text/dictd/files/1.10.9/dictd
@@ -1,7 +1,7 @@
 #!/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.9/dictd,v 1.1 2007/08/18 01:15:54 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.10.9/dictd,v 1.2 2007/09/02 12:16:07 philantrop Exp $
 
 # NB: Config is in /etc/conf.d/dictd
 
@@ -64,7 +64,7 @@ depend() {
 start() {
 	ebegin "Starting dictd"
 	prepconfig || return 1
-	start-stop-daemon --start --quiet --exec /usr/sbin/dictd -- --locale=C $EARGS
+	start-stop-daemon --start --quiet --exec /usr/sbin/dictd -- $EARGS
 	eend $?
 }
 
diff --git a/app-text/dictd/files/1.10.9/dictd.confd b/app-text/dictd/files/1.10.9/dictd.confd
index f34f7609a1f9..ce35be86ac17 100644
--- a/app-text/dictd/files/1.10.9/dictd.confd
+++ b/app-text/dictd/files/1.10.9/dictd.confd
@@ -1,5 +1,7 @@
 # Config file for /etc/init.d/dictd
 
+# Should you have problems starting dictd in an UTF-8 locale, add an appropriate
+# --locale switch to EARGS, e. g. "--locale=en_US.utf8"
 EARGS="-s "
 DICTDCONF=/etc/dict/dictd.conf
 # Set DICTDCONF_MOD if you have a custom umask. cf. bug 90657 on bugs.gentoo.org