Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Peter Volkov (pva)" <pva@g.o>
To: gentoo-commits@l.g.o
Subject: [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
Date: Fri, 12 Sep 2008 19:21:00
Message-Id: E1KeECP-0003dn-Bx@stork.gentoo.org
1 pva 08/09/12 19:20:57
2
3 Added: dictd-1.10.11-dictd.8-man.patch
4 dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch
5 dictd-1.10.11-dictl-translit.patch
6 dictd-1.10.11-dictl-konwert.patch
7 dictd-1.10.11-dictd.c-alen-init.patch
8 dictd-1.10.11-colorit-nopp-fix.patch
9 Log:
10 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.
11 (Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686)
12
13 Revision Changes Path
14 1.1 app-text/dictd/files/dictd-1.10.11-dictd.8-man.patch
15
16 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
17 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
18
19 Index: dictd-1.10.11-dictd.8-man.patch
20 ===================================================================
21 Use @SYSCONFDIR@ instead of /etc/
22
23 Index: dictd/dictd.8.in
24 ===================================================================
25 --- dictd.orig/dictd.8.in 2008-01-25 21:25:49.000000000 +0100
26 +++ dictd/dictd.8.in 2008-01-25 21:26:42.000000000 +0100
27 @@ -120,7 +120,7 @@
28 .TP
29 .BI \-c " file\fR or " \-\-config " file"
30 Specify configuration file. The default is
31 -.I /etc/dictd.conf
32 +.I @SYSCONFDIR@/dictd.conf
33 , but may be changed in the
34 .I defs.h
35 file at compile time (DICTD_CONFIG_FILE).
36 @@ -283,7 +283,7 @@
37 .TP
38 .B Introduction
39 The configuration file defaults to
40 -.I /etc/dictd.conf
41 +.I @SYSCONFDIR@/dictd.conf
42 but can be specified on the command line with the
43 .B \-c
44 option (see above).
45
46
47
48 1.1 app-text/dictd/files/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch
49
50 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
51 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
52
53 Index: dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch
54 ===================================================================
55 Patch for #454819: FTBFS with GCC 4.3: missing #includes
56
57
58 Index: dictd/dictdplugin_popen.cpp
59 ===================================================================
60 --- dictd.orig/dictdplugin_popen.cpp 2008-01-20 21:58:30.000000000 +0100
61 +++ dictd/dictdplugin_popen.cpp 2008-01-20 21:59:06.000000000 +0100
62 @@ -43,6 +43,7 @@
63 #include <stdio.h>
64 #include <errno.h>
65 #include <string>
66 +#include <climits>
67 #include <unistd.h>
68 #include <sstream>
69 #include <list>
70
71
72
73 1.1 app-text/dictd/files/dictd-1.10.11-dictl-translit.patch
74
75 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
76 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
77
78 Index: dictd-1.10.11-dictl-translit.patch
79 ===================================================================
80 Patch for #378792: dictl should use iconv's //translit suffix
81
82
83 Index: dictd/dictl.in
84 ===================================================================
85 --- dictd.orig/dictl.in 2008-01-21 22:28:01.000000000 +0100
86 +++ dictd/dictl.in 2008-01-21 22:28:20.000000000 +0100
87 @@ -23,7 +23,7 @@
88 if test "$DICTL_USE_ICONV"; then
89 # `iconv --help' gives more options than `man iconv' (on my SuSE 9.0 system at least)
90 # the -c makes iconv omit invalid characters from output
91 - iconv -c -f $1 -t $2
92 + iconv -c -f $1 -t $2//TRANSLIT
93 elif test "$DICTL_USE_KONWERT"; then
94 sedexpr='
95 /(CP)?(437|8(5[0257]|6[0-69]|74))/ { s//cp\2/; q }
96
97
98
99 1.1 app-text/dictd/files/dictd-1.10.11-dictl-konwert.patch
100
101 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
102 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
103
104 Index: dictd-1.10.11-dictl-konwert.patch
105 ===================================================================
106 Patch for #401666: dictl: doesn't work with DICTL_USE_KONWERT
107
108 Index: dictd/dictl.in
109 ===================================================================
110 --- dictd.orig/dictl.in 2008-01-20 17:58:41.000000000 +0100
111 +++ dictd/dictl.in 2008-01-20 18:02:40.000000000 +0100
112 @@ -24,11 +24,25 @@
113 # `iconv --help' gives more options than `man iconv' (on my SuSE 9.0 system at least)
114 # the -c makes iconv omit invalid characters from output
115 iconv -c -f $1 -t $2
116 - else if test "$DICTL_USE_KONWERT"; then
117 - konwert $1-$2
118 + elif test "$DICTL_USE_KONWERT"; then
119 + sedexpr='
120 + /(CP)?(437|8(5[0257]|6[0-69]|74))/ { s//cp\2/; q }
121 + /8859_([1-9])/ { s//iso\1/; q }
122 + /ANSI_X3.4(-19(68|86))?/ { s//ascii/; q }
123 + /(US-)?ASCII/ { s//ascii/; q }
124 + /(CP|WINDOWS-)(125[0-8])/ { s//cp\1/; q }
125 + /ISO([-_]?8859-|8859)([1-9]|1[01345])/ { s//iso\2/; q }
126 + /KOI8-?R/ { s//koi8r/; q }
127 + /KOI8-?U/ { s//koi8u/; q }
128 + /UTF-?8/ { s//utf8/; q }
129 + /VISCII/ { s//viscii/; q }
130 + /.*/ { s///; q }'
131 + from=`echo "$1" | tr a-z A-Z | sed -r -e "$sedexpr"`
132 + to=`echo "$2" | tr a-z A-Z | sed -r -e "$sedexpr"`
133 + konwert "$from-$to"
134 else
135 recode -f $1..$2
136 - fi fi
137 + fi
138 }
139
140 #####################################
141
142
143
144 1.1 app-text/dictd/files/dictd-1.10.11-dictd.c-alen-init.patch
145
146 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
147 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
148
149 Index: dictd-1.10.11-dictd.c-alen-init.patch
150 ===================================================================
151 Fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1941358&group_id=605&atid=100605
152 Index: dictd/dictd.c
153 ===================================================================
154 --- dictd.orig/dictd.c 2008-04-13 16:15:58.000000000 +0200
155 +++ dictd/dictd.c 2008-04-13 16:16:17.000000000 +0200
156 @@ -1455,7 +1455,7 @@
157 struct sockaddr_in csin;
158 int c;
159 time_t startTime;
160 - socklen_t alen = 0;
161 + socklen_t alen = sizeof(csin);
162 int detach = 1;
163 int forceStartup = 0;
164 int i;
165
166
167
168 1.1 app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
169
170 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
171 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
172
173 Index: dictd-1.10.11-colorit-nopp-fix.patch
174 ===================================================================
175 Made 'colorit -pp -' work
176
177 Index: dictd/colorit.in
178 ===================================================================
179 --- dictd.orig/colorit.in 2008-01-23 23:38:35.000000000 +0100
180 +++ dictd/colorit.in 2008-01-23 23:39:25.000000000 +0100
181 @@ -167,6 +167,7 @@
182
183 function process_config (){
184 if (pp == ""){
185 + pipe = "cat < \"" config_file "\""
186 while (0 < (ret = (pipe | getline))){
187 process_config_line()
188 }
Report Message
Find on MARC Find on Google Groups