1 |
mrness 07/10/10 16:01:45 |
2 |
|
3 |
Modified: dkim-milter-2.3.0-gentoo.patch dkim-filter.init |
4 |
Added: dkim-milter-2.3.0-diffheaders.patch |
5 |
digest-dkim-milter-2.3.0-r2 |
6 |
Removed: dkim-gettxt.sh digest-dkim-milter-2.2.1 |
7 |
dkim-filter.conf digest-dkim-milter-2.3.0 |
8 |
site.config.m4 digest-dkim-milter-2.3.0-r1 |
9 |
Log: |
10 |
Add diffheaders support and rename approx-regex useflag in diffheaders (#195334). Add pkg_config for creating cryptographic keys needed by this package. More code cleanups. |
11 |
(Portage version: 2.1.2.12) |
12 |
|
13 |
Revision Changes Path |
14 |
1.2 mail-filter/dkim-milter/files/dkim-milter-2.3.0-gentoo.patch |
15 |
|
16 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.3.0-gentoo.patch?rev=1.2&view=markup |
17 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.3.0-gentoo.patch?rev=1.2&content-type=text/plain |
18 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.3.0-gentoo.patch?r1=1.1&r2=1.2 |
19 |
|
20 |
Index: dkim-milter-2.3.0-gentoo.patch |
21 |
=================================================================== |
22 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.3.0-gentoo.patch,v |
23 |
retrieving revision 1.1 |
24 |
retrieving revision 1.2 |
25 |
diff -u -r1.1 -r1.2 |
26 |
--- dkim-milter-2.3.0-gentoo.patch 9 Oct 2007 20:25:32 -0000 1.1 |
27 |
+++ dkim-milter-2.3.0-gentoo.patch 10 Oct 2007 16:01:44 -0000 1.2 |
28 |
@@ -1,7 +1,15 @@ |
29 |
diff -Nru dkim-milter-2.3.0.orig/devtools/Site/site.config.m4 dkim-milter-2.3.0/devtools/Site/site.config.m4 |
30 |
---- dkim-milter-2.3.0.orig/devtools/Site/site.config.m4 2007-10-09 18:48:08.000000000 +0300 |
31 |
-+++ dkim-milter-2.3.0/devtools/Site/site.config.m4 2007-10-09 18:48:36.000000000 +0300 |
32 |
-@@ -11,13 +11,13 @@ |
33 |
+--- dkim-milter-2.3.0.orig/devtools/Site/site.config.m4 2007-10-10 06:35:16.000000000 +0300 |
34 |
++++ dkim-milter-2.3.0/devtools/Site/site.config.m4 2007-10-10 06:38:32.000000000 +0300 |
35 |
+@@ -6,18 +6,21 @@ |
36 |
+ dnl values described in devtools/README by setting your preferred values |
37 |
+ dnl in this file. |
38 |
+ |
39 |
++dnl man build is broken |
40 |
++define(`confNO_MAN_BUILD',`') |
41 |
++ |
42 |
+ dnl Debug binary |
43 |
+ dnl |
44 |
dnl If you are encountering coredumps and want to be able to analyze them |
45 |
dnl using something like "gdb", enable this next line by deleting the "dnl" |
46 |
dnl at the front of it. |
47 |
@@ -17,7 +25,7 @@ |
48 |
dnl |
49 |
dnl libar normally uses res_init() or res_ninit() to load the contents |
50 |
dnl of resolv.conf for its use. If neither of these work on your system |
51 |
-@@ -82,7 +82,7 @@ |
52 |
+@@ -82,7 +85,7 @@ |
53 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_REQUIRED_HEADERS ') |
54 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ') |
55 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_SIGN_HEADERS ') |
56 |
@@ -25,3 +33,118 @@ |
57 |
+APPENDDEF(`confENVDEF', `-D_FFR_STATS ') |
58 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ') |
59 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ') |
60 |
+ |
61 |
+diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter-2.3.0/dkim-filter/dkim-filter.conf.sample |
62 |
+--- dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample 2007-09-21 01:06:01.000000000 +0300 |
63 |
++++ dkim-milter-2.3.0/dkim-filter/dkim-filter.conf.sample 2007-10-10 14:28:16.000000000 +0300 |
64 |
+@@ -1,8 +1,6 @@ |
65 |
+ ## |
66 |
+ ## dkim-filter.conf -- configuration file for DKIM filter |
67 |
+ ## |
68 |
+-## $Id: dkim-milter-2.3.0-gentoo.patch,v 1.2 2007/10/10 16:01:44 mrness Exp $ |
69 |
+-## |
70 |
+ |
71 |
+ ## AlwaysSignHeaders header-list |
72 |
+ ## default (none) |
73 |
+@@ -20,13 +18,6 @@ |
74 |
+ |
75 |
+ # AutoRestart No |
76 |
+ |
77 |
+-## Background { yes | no } |
78 |
+-## default "yes" |
79 |
+-## |
80 |
+-## Indicate whether or not the filter should run in the background. |
81 |
+- |
82 |
+-# Background Yes |
83 |
+- |
84 |
+ ## BodyLengths { yes | no } |
85 |
+ ## default "no" |
86 |
+ ## |
87 |
+@@ -74,7 +65,7 @@ |
88 |
+ ## Specify for which domain(s) signing should be done. No default; must |
89 |
+ ## be specified for signing. |
90 |
+ |
91 |
+-Domain example.com |
92 |
++Domain my-domain.com |
93 |
+ |
94 |
+ ## ExternalIgnoreList filename |
95 |
+ ## |
96 |
+@@ -89,7 +80,7 @@ |
97 |
+ ## Specifies the path to the private key to use when signing. Ignored if |
98 |
+ ## Keylist is set. No default; must be specified for signing. |
99 |
+ |
100 |
+-KeyFile /var/db/dkim/example.private |
101 |
++KeyFile /etc/mail/dkim-filter/my-selector-name.private |
102 |
+ |
103 |
+ ## KeyList filename |
104 |
+ ## |
105 |
+@@ -106,7 +97,7 @@ |
106 |
+ ## as the beginning of a comment. See dkim-filter.conf(5) for more |
107 |
+ ## information. |
108 |
+ |
109 |
+-# KeyList /var/db/dkim/keylist |
110 |
++# KeyList /etc/mail/dkim-filter/keylist |
111 |
+ |
112 |
+ ## InternalHosts filename |
113 |
+ ## |
114 |
+@@ -114,7 +105,7 @@ |
115 |
+ ## hosts from which mail should be signed rather than verified. |
116 |
+ ## Automatically contains 127.0.0.1. See man page for file format. |
117 |
+ |
118 |
+-# InternalHosts filename |
119 |
++# InternalHosts /etc/mail/dkim-filter/internalhosts |
120 |
+ |
121 |
+ ## MacroList macro[=value][,...] |
122 |
+ ## |
123 |
+@@ -177,22 +168,6 @@ |
124 |
+ |
125 |
+ # PeerList filename |
126 |
+ |
127 |
+-## PidFile filename |
128 |
+-## |
129 |
+-## Name of the file where the filter should write its pid before beginning |
130 |
+-## normal operations. |
131 |
+- |
132 |
+-# PidFile filename |
133 |
+- |
134 |
+-## POPDBFile filename |
135 |
+-## |
136 |
+-## Names a database which should be checked for "POP before SMTP" records |
137 |
+-## as a form of authentication of users who may be sending mail through |
138 |
+-## the MTA for signing. Requires special compilation of the filter. |
139 |
+-## See dkim-filter.conf(5) for more information. |
140 |
+- |
141 |
+-# POPDBFile filename |
142 |
+- |
143 |
+ ## Quarantine { yes | no } |
144 |
+ ## default "no" |
145 |
+ ## |
146 |
+@@ -267,7 +242,7 @@ |
147 |
+ ## inet:port to listen on all interfaces |
148 |
+ ## local:/path/to/socket to listen on a UNIX domain socket |
149 |
+ |
150 |
+-Socket inet:port@localhost |
151 |
++Socket local:/var/run/dkim-filter/dkim-filter.sock |
152 |
+ |
153 |
+ ## SubDomains { yes | no } |
154 |
+ ## default "no" |
155 |
+@@ -296,7 +271,7 @@ |
156 |
+ ## Change to user "userid" before starting normal operation? May include |
157 |
+ ## a group ID as well, separated from the userid by a colon. |
158 |
+ |
159 |
+-# UserID userid |
160 |
++UserID milter |
161 |
+ |
162 |
+ ## UseSSPDeny { yes | no } |
163 |
+ ## default "no" |
164 |
+@@ -314,3 +289,10 @@ |
165 |
+ ## messages it has processed. |
166 |
+ |
167 |
+ # X-Header No |
168 |
++ |
169 |
++## Statistics filename |
170 |
++## |
171 |
++## Names a file to which useful statistics will be saved. |
172 |
++## See man dkim-stats page |
173 |
++ |
174 |
++Statistics /var/run/dkim-filter/dkim-filter.stats |
175 |
|
176 |
|
177 |
|
178 |
1.3 mail-filter/dkim-milter/files/dkim-filter.init |
179 |
|
180 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init?rev=1.3&view=markup |
181 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init?rev=1.3&content-type=text/plain |
182 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init?r1=1.2&r2=1.3 |
183 |
|
184 |
Index: dkim-filter.init |
185 |
=================================================================== |
186 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init,v |
187 |
retrieving revision 1.2 |
188 |
retrieving revision 1.3 |
189 |
diff -u -r1.2 -r1.3 |
190 |
--- dkim-filter.init 8 Oct 2007 08:43:36 -0000 1.2 |
191 |
+++ dkim-filter.init 10 Oct 2007 16:01:44 -0000 1.3 |
192 |
@@ -1,101 +1,47 @@ |
193 |
#!/sbin/runscript |
194 |
# Copyright 1999-2006 Gentoo Foundation |
195 |
# Distributed under the terms of the GNU General Public License v2 |
196 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init,v 1.2 2007/10/08 08:43:36 dragonheart Exp $ |
197 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init,v 1.3 2007/10/10 16:01:44 mrness Exp $ |
198 |
+ |
199 |
+CONFFILE=/etc/mail/dkim-filter/${SVCNAME}.conf |
200 |
+PIDFILE=/var/run/dkim-filter/${SVCNAME}.pid |
201 |
|
202 |
depend() { |
203 |
- # need net |
204 |
use dns logger net |
205 |
} |
206 |
|
207 |
-warn_msg() { |
208 |
- echo |
209 |
- ewarn "$1 parameter is not set!" |
210 |
- ewarn "dkim-filter starts with" |
211 |
- ewarn "$1=${!1}" |
212 |
- ewarn "please set it in /etc/conf.d/dkim-filter" |
213 |
- echo |
214 |
-} |
215 |
- |
216 |
-die_msg() { |
217 |
- echo |
218 |
- eerror "please set paramter $1 in" |
219 |
- eerror "/etc/conf.d/dkim-filter then start again" |
220 |
- echo |
221 |
-} |
222 |
- |
223 |
check_cfg() { |
224 |
|
225 |
- if [[ ! -f /etc/conf.d/dkim-filter ]] ; then |
226 |
- eerror "/etc/conf.d/dkim-filter is missing" |
227 |
- return 1 |
228 |
- fi |
229 |
- |
230 |
- if [[ -z "${DKIM_FILTER_OPTS}" ]] ; then |
231 |
- die_msg DKIM_FILTER_OPTS |
232 |
- return 1 |
233 |
- fi |
234 |
- |
235 |
- if [[ -z "${SELECTOR}" ]] ; then |
236 |
- die_msg SELECTOR |
237 |
+ if [ ! -f "${CONFFILE}" ] ; then |
238 |
+ eerror "Configuration file ${CONFFILE} is missing" |
239 |
return 1 |
240 |
fi |
241 |
|
242 |
- if [[ -z "${KEYPATH}" ]] ; then |
243 |
- die_msg KEYPATH |
244 |
+ if egrep -q '^[[:space:]]*Background[[:space:]]+no' "${CONFFILE}" ; then |
245 |
+ eerror "${SVCNAME} service cannot run with Background key set to yes!" |
246 |
return 1 |
247 |
fi |
248 |
|
249 |
- if [[ ! -f "${KEYPATH}" ]] ; then |
250 |
- echo |
251 |
- eerror "run dkim-gentxt.sh to generate a private key first" |
252 |
- eerror "then set KEYPATH in /etc/conf.d/dkim-filter to" |
253 |
- eerror "the location of your private key" |
254 |
- echo |
255 |
+ if egrep -q '^[[:space:]]*PidFile[[:space:]]' "${CONFFILE}"; then |
256 |
+ eerror "Please remove PidFile key from your configuration file!" |
257 |
+ eerror "${SVCNAME} is automatically configured to use ${PIDFILE} as pid file." |
258 |
return 1 |
259 |
fi |
260 |
- |
261 |
- if [[ -z "${SOCKETSPEC}" ]] ; then |
262 |
- SOCKETSPEC="inet:8026@localhost" |
263 |
- warn_msg SOCKETSPEC |
264 |
- fi |
265 |
- |
266 |
- if [[ -z "${DOMAIN}" ]] ; then |
267 |
- DOMAIN=$(domainname) |
268 |
- warn_msg DOMAIN |
269 |
- fi |
270 |
- |
271 |
- if [[ -z "${CANON}" ]] ; then |
272 |
- CANON="relaxed/simple" |
273 |
- warn_msg CANON |
274 |
- fi |
275 |
- |
276 |
- if [[ -z "${USER}" ]] ; then |
277 |
- USER="milter" |
278 |
- warn_msg USER |
279 |
- fi |
280 |
- |
281 |
- if [[ -z "${SIGNALG}" ]] ; then |
282 |
- SIGNALG="rsa-sha1" |
283 |
- warn_msg SIGNALG |
284 |
- fi |
285 |
- |
286 |
- if [[ -z "${PIDFILE}" ]] ; then |
287 |
- PIDFILE="/var/run/dkim-filter/dkim-filter.pid" |
288 |
- warn_msg PIDFILE |
289 |
- fi |
290 |
} |
291 |
|
292 |
start() { |
293 |
check_cfg || return 1 |
294 |
- ebegin "Starting DKIM Filter" |
295 |
- start-stop-daemon --start --quiet --background \ |
296 |
- --exec /usr/bin/dkim-filter -- ${DKIM_FILTER_OPTS} |
297 |
+ local SOCKFILE=$(sed -nr -e 's/^[[:space:]]*Socket[[:space:]]+((local)|(unix))://p' "${CONFFILE}") |
298 |
+ |
299 |
+ ebegin "Starting DKIM filter" |
300 |
+ start-stop-daemon --start --pidfile "${PIDFILE}" \ |
301 |
+ --exec /usr/bin/dkim-filter -- -x "${CONFFILE}" -P "${PIDFILE}" && \ |
302 |
+ [ -z "${SOCKFILE}" ] || chmod a+rwx "${SOCKFILE}" |
303 |
eend $? |
304 |
} |
305 |
|
306 |
stop() { |
307 |
- ebegin "Stopping DKIM Filter" |
308 |
- start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" |
309 |
+ ebegin "Stopping DKIM filter" |
310 |
+ start-stop-daemon --stop --pidfile "${PIDFILE}" |
311 |
eend $? |
312 |
} |
313 |
|
314 |
|
315 |
|
316 |
1.1 mail-filter/dkim-milter/files/dkim-milter-2.3.0-diffheaders.patch |
317 |
|
318 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.3.0-diffheaders.patch?rev=1.1&view=markup |
319 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.3.0-diffheaders.patch?rev=1.1&content-type=text/plain |
320 |
|
321 |
Index: dkim-milter-2.3.0-diffheaders.patch |
322 |
=================================================================== |
323 |
diff -Nru dkim-milter-2.3.0.orig/devtools/Site/site.config.m4 dkim-milter-2.3.0/devtools/Site/site.config.m4 |
324 |
--- dkim-milter-2.3.0.orig/devtools/Site/site.config.m4 2007-10-10 18:10:18.000000000 +0300 |
325 |
+++ dkim-milter-2.3.0/devtools/Site/site.config.m4 2007-10-10 18:18:35.000000000 +0300 |
326 |
@@ -66,9 +66,10 @@ |
327 |
dnl to have the "tre" library and its header files installed. If necessary, |
328 |
dnl enable these lines by deleting "dnl" from the front of them and edit |
329 |
dnl paths as needed. |
330 |
-dnl APPENDDEF(`confINCDIRS', `-I/usr/local/include ') |
331 |
+APPENDDEF(`confENVDEF',`-DTRE_APPROX ') |
332 |
+APPENDDEF(`confINCDIRS', `-I/usr/include/tre ') |
333 |
dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/lib ') |
334 |
-dnl APPENDDEF(`confLIBS', `-ltre ') |
335 |
+APPENDDEF(`confLIBS', `-ltre ') |
336 |
|
337 |
dnl Code For Future Release (FFRs): |
338 |
dnl |
339 |
@@ -80,7 +81,7 @@ |
340 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_ANTICIPATE_SENDMAIL_MUNGE ') |
341 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_CAPTURE_UNKNOWN_ERRORS ') |
342 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_DNS_UPGRADE ') |
343 |
-dnl APPENDDEF(`confENVDEF', `-D_FFR_DIFFHEADERS ') |
344 |
+APPENDDEF(`confENVDEF', `-D_FFR_DIFFHEADERS ') |
345 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_QUERY_CACHE ') |
346 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_REQUIRED_HEADERS ') |
347 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ') |
348 |
|
349 |
|
350 |
|
351 |
1.1 mail-filter/dkim-milter/files/digest-dkim-milter-2.3.0-r2 |
352 |
|
353 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/digest-dkim-milter-2.3.0-r2?rev=1.1&view=markup |
354 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/digest-dkim-milter-2.3.0-r2?rev=1.1&content-type=text/plain |
355 |
|
356 |
Index: digest-dkim-milter-2.3.0-r2 |
357 |
=================================================================== |
358 |
MD5 1e94c20b97a28661f609c64ce0068a3e dkim-milter-2.3.0.tar.gz 576570 |
359 |
RMD160 db1c2f839888f1291491ef18674c483341971321 dkim-milter-2.3.0.tar.gz 576570 |
360 |
SHA256 8fbbbb549db97f481e65f6cde9b71c86179140b8a199dcbe148a4a32fb4e4c50 dkim-milter-2.3.0.tar.gz 576570 |
361 |
|
362 |
|
363 |
|
364 |
-- |
365 |
gentoo-commits@g.o mailing list |