* [gentoo-commits] gentoo-x86 commit in app-text/dictd/files: dictd-1.10.11-dictd.8-man.patch dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch dictd-1.10.11-dictl-translit.patch dictd-1.10.11-dictl-konwert.patch dictd-1.10.11-dictd.c-alen-init.patch dictd-1.10.11-colorit-nopp-fix.patch
@ 2008-09-12 19:20 Peter Volkov (pva)
0 siblings, 0 replies; only message in thread
From: Peter Volkov (pva) @ 2008-09-12 19:20 UTC (permalink / raw
To: gentoo-commits
pva 08/09/12 19:20:57
Added: dictd-1.10.11-dictd.8-man.patch
dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch
dictd-1.10.11-dictl-translit.patch
dictd-1.10.11-dictl-konwert.patch
dictd-1.10.11-dictd.c-alen-init.patch
dictd-1.10.11-colorit-nopp-fix.patch
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/dictd-1.10.11-dictd.8-man.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-dictd.8-man.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-dictd.8-man.patch?rev=1.1&content-type=text/plain
Index: dictd-1.10.11-dictd.8-man.patch
===================================================================
Use @SYSCONFDIR@ instead of /etc/
Index: dictd/dictd.8.in
===================================================================
--- dictd.orig/dictd.8.in 2008-01-25 21:25:49.000000000 +0100
+++ dictd/dictd.8.in 2008-01-25 21:26:42.000000000 +0100
@@ -120,7 +120,7 @@
.TP
.BI \-c " file\fR or " \-\-config " file"
Specify configuration file. The default is
-.I /etc/dictd.conf
+.I @SYSCONFDIR@/dictd.conf
, but may be changed in the
.I defs.h
file at compile time (DICTD_CONFIG_FILE).
@@ -283,7 +283,7 @@
.TP
.B Introduction
The configuration file defaults to
-.I /etc/dictd.conf
+.I @SYSCONFDIR@/dictd.conf
but can be specified on the command line with the
.B \-c
option (see above).
1.1 app-text/dictd/files/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch?rev=1.1&content-type=text/plain
Index: dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch
===================================================================
Patch for #454819: FTBFS with GCC 4.3: missing #includes
Index: dictd/dictdplugin_popen.cpp
===================================================================
--- dictd.orig/dictdplugin_popen.cpp 2008-01-20 21:58:30.000000000 +0100
+++ dictd/dictdplugin_popen.cpp 2008-01-20 21:59:06.000000000 +0100
@@ -43,6 +43,7 @@
#include <stdio.h>
#include <errno.h>
#include <string>
+#include <climits>
#include <unistd.h>
#include <sstream>
#include <list>
1.1 app-text/dictd/files/dictd-1.10.11-dictl-translit.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-dictl-translit.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-dictl-translit.patch?rev=1.1&content-type=text/plain
Index: dictd-1.10.11-dictl-translit.patch
===================================================================
Patch for #378792: dictl should use iconv's //translit suffix
Index: dictd/dictl.in
===================================================================
--- dictd.orig/dictl.in 2008-01-21 22:28:01.000000000 +0100
+++ dictd/dictl.in 2008-01-21 22:28:20.000000000 +0100
@@ -23,7 +23,7 @@
if test "$DICTL_USE_ICONV"; then
# `iconv --help' gives more options than `man iconv' (on my SuSE 9.0 system at least)
# the -c makes iconv omit invalid characters from output
- iconv -c -f $1 -t $2
+ iconv -c -f $1 -t $2//TRANSLIT
elif test "$DICTL_USE_KONWERT"; then
sedexpr='
/(CP)?(437|8(5[0257]|6[0-69]|74))/ { s//cp\2/; q }
1.1 app-text/dictd/files/dictd-1.10.11-dictl-konwert.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-dictl-konwert.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-dictl-konwert.patch?rev=1.1&content-type=text/plain
Index: dictd-1.10.11-dictl-konwert.patch
===================================================================
Patch for #401666: dictl: doesn't work with DICTL_USE_KONWERT
Index: dictd/dictl.in
===================================================================
--- dictd.orig/dictl.in 2008-01-20 17:58:41.000000000 +0100
+++ dictd/dictl.in 2008-01-20 18:02:40.000000000 +0100
@@ -24,11 +24,25 @@
# `iconv --help' gives more options than `man iconv' (on my SuSE 9.0 system at least)
# the -c makes iconv omit invalid characters from output
iconv -c -f $1 -t $2
- else if test "$DICTL_USE_KONWERT"; then
- konwert $1-$2
+ elif test "$DICTL_USE_KONWERT"; then
+ sedexpr='
+ /(CP)?(437|8(5[0257]|6[0-69]|74))/ { s//cp\2/; q }
+ /8859_([1-9])/ { s//iso\1/; q }
+ /ANSI_X3.4(-19(68|86))?/ { s//ascii/; q }
+ /(US-)?ASCII/ { s//ascii/; q }
+ /(CP|WINDOWS-)(125[0-8])/ { s//cp\1/; q }
+ /ISO([-_]?8859-|8859)([1-9]|1[01345])/ { s//iso\2/; q }
+ /KOI8-?R/ { s//koi8r/; q }
+ /KOI8-?U/ { s//koi8u/; q }
+ /UTF-?8/ { s//utf8/; q }
+ /VISCII/ { s//viscii/; q }
+ /.*/ { s///; q }'
+ from=`echo "$1" | tr a-z A-Z | sed -r -e "$sedexpr"`
+ to=`echo "$2" | tr a-z A-Z | sed -r -e "$sedexpr"`
+ konwert "$from-$to"
else
recode -f $1..$2
- fi fi
+ fi
}
#####################################
1.1 app-text/dictd/files/dictd-1.10.11-dictd.c-alen-init.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-dictd.c-alen-init.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-dictd.c-alen-init.patch?rev=1.1&content-type=text/plain
Index: dictd-1.10.11-dictd.c-alen-init.patch
===================================================================
Fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1941358&group_id=605&atid=100605
Index: dictd/dictd.c
===================================================================
--- dictd.orig/dictd.c 2008-04-13 16:15:58.000000000 +0200
+++ dictd/dictd.c 2008-04-13 16:16:17.000000000 +0200
@@ -1455,7 +1455,7 @@
struct sockaddr_in csin;
int c;
time_t startTime;
- socklen_t alen = 0;
+ socklen_t alen = sizeof(csin);
int detach = 1;
int forceStartup = 0;
int i;
1.1 app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch?rev=1.1&content-type=text/plain
Index: dictd-1.10.11-colorit-nopp-fix.patch
===================================================================
Made 'colorit -pp -' work
Index: dictd/colorit.in
===================================================================
--- dictd.orig/colorit.in 2008-01-23 23:38:35.000000000 +0100
+++ dictd/colorit.in 2008-01-23 23:39:25.000000000 +0100
@@ -167,6 +167,7 @@
function process_config (){
if (pp == ""){
+ pipe = "cat < \"" config_file "\""
while (0 < (ret = (pipe | getline))){
process_config_line()
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-09-12 19:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-12 19:20 [gentoo-commits] gentoo-x86 commit in app-text/dictd/files: dictd-1.10.11-dictd.8-man.patch dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch dictd-1.10.11-dictl-translit.patch dictd-1.10.11-dictl-konwert.patch dictd-1.10.11-dictd.c-alen-init.patch dictd-1.10.11-colorit-nopp-fix.patch Peter Volkov (pva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox