| 1 |
mrness 09/02/28 14:20:42 |
| 2 |
|
| 3 |
Added: dkim-milter-2.8.2-mkdir.patch |
| 4 |
dkim-milter-2.8.2-gentoo.patch |
| 5 |
dkim-milter-2.8.2-exit-on-error.patch |
| 6 |
dkim-milter-2.8.2-test115.patch |
| 7 |
Log: |
| 8 |
Install libdkim.a library and API documentation. |
| 9 |
(Portage version: 2.1.6.4/cvs/Linux 2.6.25-gentoo-r6 x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 mail-filter/dkim-milter/files/dkim-milter-2.8.2-mkdir.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.8.2-mkdir.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.8.2-mkdir.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: dkim-milter-2.8.2-mkdir.patch |
| 18 |
=================================================================== |
| 19 |
diff -Nru dkim-milter-2.8.2.orig/devtools/M4/UNIX/executable.m4 dkim-milter-2.8.2/devtools/M4/UNIX/executable.m4 |
| 20 |
--- dkim-milter-2.8.2.orig/devtools/M4/UNIX/executable.m4 2006-10-06 05:44:44.000000000 +0000 |
| 21 |
+++ dkim-milter-2.8.2/devtools/M4/UNIX/executable.m4 2009-02-28 11:26:08.000000000 +0000 |
| 22 |
@@ -30,12 +30,12 @@ |
| 23 |
|
| 24 |
ifdef(`bldNO_INSTALL', , |
| 25 |
`install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP') |
| 26 |
- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ') |
| 27 |
- ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR} |
| 28 |
+ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ') |
| 29 |
+ ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" |
| 30 |
ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')') |
| 31 |
|
| 32 |
strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT |
| 33 |
- ${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT |
| 34 |
+ ${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT" |
| 35 |
|
| 36 |
bldCURRENT_PRODUCT-clean: |
| 37 |
rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES} |
| 38 |
diff -Nru dkim-milter-2.8.2.orig/devtools/M4/UNIX/library.m4 dkim-milter-2.8.2/devtools/M4/UNIX/library.m4 |
| 39 |
--- dkim-milter-2.8.2.orig/devtools/M4/UNIX/library.m4 2006-09-05 22:56:53.000000000 +0000 |
| 40 |
+++ dkim-milter-2.8.2/devtools/M4/UNIX/library.m4 2009-02-28 11:26:38.000000000 +0000 |
| 41 |
@@ -27,8 +27,8 @@ |
| 42 |
ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') |
| 43 |
|
| 44 |
install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a |
| 45 |
-ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ') |
| 46 |
- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}') |
| 47 |
+ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ') |
| 48 |
+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') |
| 49 |
|
| 50 |
bldCURRENT_PRODUCT-clean: |
| 51 |
rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES} |
| 52 |
diff -Nru dkim-milter-2.8.2.orig/devtools/M4/UNIX/manpage.m4 dkim-milter-2.8.2/devtools/M4/UNIX/manpage.m4 |
| 53 |
--- dkim-milter-2.8.2.orig/devtools/M4/UNIX/manpage.m4 2006-09-07 22:13:07.000000000 +0000 |
| 54 |
+++ dkim-milter-2.8.2/devtools/M4/UNIX/manpage.m4 2009-02-28 11:24:28.000000000 +0000 |
| 55 |
@@ -68,11 +68,11 @@ |
| 56 |
ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl') |
| 57 |
define(`bldMAN_INSTALL_CMD', |
| 58 |
`ifdef(`confDONT_INSTALL_CATMAN', `dnl', |
| 59 |
-` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ') |
| 60 |
- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'') |
| 61 |
+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ') |
| 62 |
+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''") |
| 63 |
ifdef(`confINSTALL_RAWMAN', |
| 64 |
-` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ') |
| 65 |
- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')' |
| 66 |
+` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ') |
| 67 |
+ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')' |
| 68 |
)dnl |
| 69 |
bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES') |
| 70 |
ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl') |
| 71 |
diff -Nru dkim-milter-2.8.2.orig/devtools/M4/UNIX/sharedlib.m4 dkim-milter-2.8.2/devtools/M4/UNIX/sharedlib.m4 |
| 72 |
--- dkim-milter-2.8.2.orig/devtools/M4/UNIX/sharedlib.m4 2009-01-22 02:18:32.000000000 +0000 |
| 73 |
+++ dkim-milter-2.8.2/devtools/M4/UNIX/sharedlib.m4 2009-02-28 11:27:56.000000000 +0000 |
| 74 |
@@ -53,10 +53,10 @@ |
| 75 |
ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') |
| 76 |
|
| 77 |
install-`'bldCURRENT_PRODUCT: ${SHAREDLIB} |
| 78 |
- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${SHAREDLIBDIR} ]; then confMKDIR -p ${DESTDIR}${SHAREDLIBDIR}; else :; fi ') |
| 79 |
- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${SHAREDLIB} ${DESTDIR}${SHAREDLIBDIR} |
| 80 |
- ifelse(bldOS, `AIX', `${AR} ${AROPTS} ${DESTDIR}${SHAREDLIBDIR}bldCURRENT_PRODUCT.a ${SHAREDLIB}', `rm -f ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK} |
| 81 |
- ${LN} ${LNOPTS} ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB} ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}') |
| 82 |
+ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${SHAREDLIBDIR}" ]; then confMKDIR -p "${DESTDIR}${SHAREDLIBDIR}"; else :; fi ') |
| 83 |
+ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${SHAREDLIB} "${DESTDIR}${SHAREDLIBDIR}" |
| 84 |
+ ifelse(bldOS, `AIX', `${AR} ${AROPTS} "${DESTDIR}${SHAREDLIBDIR}bldCURRENT_PRODUCT.a ${SHAREDLIB}"', `rm -f "${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}" |
| 85 |
+ ${LN} ${LNOPTS} ${SHAREDLIB} "${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}"') |
| 86 |
|
| 87 |
bldCURRENT_PRODUCT-clean: |
| 88 |
rm -f ${OBJS} ${SHAREDLIB} bldCURRENT_PRODUCT.a ${MANPAGES} ifelse(bldOS, `AIX', `shr.o', `bldCURRENT_PRODUCT${SHAREDLIB_EXT}') |
| 89 |
diff -Nru dkim-milter-2.8.2.orig/dkim-filter/Makefile.m4 dkim-milter-2.8.2/dkim-filter/Makefile.m4 |
| 90 |
--- dkim-milter-2.8.2.orig/dkim-filter/Makefile.m4 2009-02-09 19:53:09.000000000 +0000 |
| 91 |
+++ dkim-milter-2.8.2/dkim-filter/Makefile.m4 2009-02-28 11:28:16.000000000 +0000 |
| 92 |
@@ -74,7 +74,8 @@ |
| 93 |
divert(bldTARGETS_SECTION) |
| 94 |
|
| 95 |
install-genkey: |
| 96 |
- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/dkim-filter/dkim-genkey.sh ${DESTDIR}${UBINDIR}/dkim-genkey |
| 97 |
+ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${UBINDIR}" ]; then confMKDIR -p "${DESTDIR}${UBINDIR}"; else :; fi ') |
| 98 |
+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/dkim-filter/dkim-genkey.sh "${DESTDIR}${UBINDIR}/dkim-genkey" |
| 99 |
|
| 100 |
divert(0) |
| 101 |
bldPRODUCT_END |
| 102 |
diff -Nru dkim-milter-2.8.2.orig/libdkim/Makefile.m4 dkim-milter-2.8.2/libdkim/Makefile.m4 |
| 103 |
--- dkim-milter-2.8.2.orig/libdkim/Makefile.m4 2009-01-15 19:12:47.000000000 +0000 |
| 104 |
+++ dkim-milter-2.8.2/libdkim/Makefile.m4 2009-02-28 11:28:30.000000000 +0000 |
| 105 |
@@ -42,7 +42,8 @@ |
| 106 |
divert(bldTARGETS_SECTION) |
| 107 |
|
| 108 |
install-dkim-includes: |
| 109 |
- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/libdkim/dkim.h ${DESTDIR}${INCLUDEDIR}/dkim.h |
| 110 |
+ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${INCLUDEDIR}" ]; then confMKDIR -p "${DESTDIR}${INCLUDEDIR}"; else :; fi ') |
| 111 |
+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 ${SRCDIR}/libdkim/dkim.h "${DESTDIR}${INCLUDEDIR}/dkim.h" |
| 112 |
bldPRODUCT_END |
| 113 |
|
| 114 |
define(`confCHECK_LIBS', `libdkim.a')dnl |
| 115 |
|
| 116 |
|
| 117 |
|
| 118 |
1.1 mail-filter/dkim-milter/files/dkim-milter-2.8.2-gentoo.patch |
| 119 |
|
| 120 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.8.2-gentoo.patch?rev=1.1&view=markup |
| 121 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.8.2-gentoo.patch?rev=1.1&content-type=text/plain |
| 122 |
|
| 123 |
Index: dkim-milter-2.8.2-gentoo.patch |
| 124 |
=================================================================== |
| 125 |
diff -Nru dkim-milter-2.8.2.orig/devtools/Site/site.config.m4 dkim-milter-2.8.2/devtools/Site/site.config.m4 |
| 126 |
--- dkim-milter-2.8.2.orig/devtools/Site/site.config.m4 2009-02-28 13:58:13.000000000 +0000 |
| 127 |
+++ dkim-milter-2.8.2/devtools/Site/site.config.m4 2009-02-28 14:00:02.000000000 +0000 |
| 128 |
@@ -11,7 +11,13 @@ |
| 129 |
dnl If you are encountering coredumps and want to be able to analyze them |
| 130 |
dnl using something like "gdb", enable this next line by deleting the "dnl" |
| 131 |
dnl at the front of it. |
| 132 |
-dnl define(`confOPTIMIZE', `-g') |
| 133 |
+define(`confOPTIMIZE', `@@CFLAGS@@') |
| 134 |
+define(`confENVDEF', `@@ENVDEF@@') |
| 135 |
+define(`confMKDIR', `mkdir') |
| 136 |
+define(`confLIBDIR', `@@LIBDIR@@') |
| 137 |
+define(`confSHAREDLIBDIR', `@@LIBDIR@@') |
| 138 |
+dnl man build is broken |
| 139 |
+define(`confNO_MAN_BUILD',`') |
| 140 |
|
| 141 |
dnl Shared library for libdkim |
| 142 |
dnl |
| 143 |
@@ -26,7 +32,7 @@ |
| 144 |
dnl the package, enable this next line by deleting the "dnl" at the front |
| 145 |
dnl of it. This is done automatically if you've requested the shared |
| 146 |
dnl library. |
| 147 |
-dnl define(`bld_LIBDKIM_INSTALL', `true') |
| 148 |
+define(`bld_LIBDKIM_INSTALL', `true') |
| 149 |
|
| 150 |
dnl Use native strlcat()/strlcpy() functions |
| 151 |
dnl |
| 152 |
@@ -53,7 +59,7 @@ |
| 153 |
dnl |
| 154 |
dnl If you want to use the provided asynchronous resolver library, enable this |
| 155 |
dnl next line by deleting the "dnl" at the front of it. |
| 156 |
-dnl define(`bld_USE_ARLIB', `true') |
| 157 |
+define(`bld_USE_ARLIB', `true') |
| 158 |
dnl |
| 159 |
dnl libar normally uses res_init() or res_ninit() to load the contents |
| 160 |
dnl of resolv.conf for its use. If neither of these work on your system |
| 161 |
@@ -94,7 +100,7 @@ |
| 162 |
dnl it has seen, rather than relying on the DNS server to provide caching, |
| 163 |
dnl enable this next line by deleting the "dnl" at the front of it. Also |
| 164 |
dnl see the section below called "BerkeleyDB". |
| 165 |
-dnl APPENDDEF(`confENVDEF', `-DQUERY_CACHE ') |
| 166 |
+APPENDDEF(`confENVDEF', `-DQUERY_CACHE ') |
| 167 |
|
| 168 |
dnl BerkeleyDB -- Berkeley DB ("Sleepycat") database |
| 169 |
dnl |
| 170 |
@@ -107,7 +113,7 @@ |
| 171 |
dnl by deleting "dnl" from the front of them: |
| 172 |
dnl APPENDDEF(`confINCDIRS', `-I/usr/local/BerkeleyDB/include ') |
| 173 |
dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/BerkeleyDB/lib ') |
| 174 |
-dnl APPENDDEF(`confLIBS', `-ldb ') |
| 175 |
+APPENDDEF(`confLIBS', `-ldb ') |
| 176 |
|
| 177 |
dnl OpenSSL -- cryptography library |
| 178 |
dnl |
| 179 |
@@ -146,7 +152,7 @@ |
| 180 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_REPORT_INTERVALS ') |
| 181 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ') |
| 182 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECTOR_HEADER ') |
| 183 |
-dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ') |
| 184 |
+APPENDDEF(`confENVDEF', `-D_FFR_STATS ') |
| 185 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ') |
| 186 |
dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ') |
| 187 |
|
| 188 |
diff -Nru dkim-milter-2.8.2.orig/dkim-filter/dkim-filter.conf.sample dkim-milter-2.8.2/dkim-filter/dkim-filter.conf.sample |
| 189 |
--- dkim-milter-2.8.2.orig/dkim-filter/dkim-filter.conf.sample 2008-12-27 05:21:56.000000000 +0000 |
| 190 |
+++ dkim-milter-2.8.2/dkim-filter/dkim-filter.conf.sample 2009-02-28 13:59:15.000000000 +0000 |
| 191 |
@@ -90,13 +90,6 @@ |
| 192 |
|
| 193 |
# AutoRestartRate n/tu |
| 194 |
|
| 195 |
-## Background { yes | no } |
| 196 |
-## default "yes" |
| 197 |
-## |
| 198 |
-## Indicate whether or not the filter should run in the background. |
| 199 |
- |
| 200 |
-# Background Yes |
| 201 |
- |
| 202 |
## BaseDirectory path |
| 203 |
## default (none) |
| 204 |
## |
| 205 |
@@ -193,7 +186,7 @@ |
| 206 |
## hosts from which mail should be signed rather than verified. |
| 207 |
## Automatically contains 127.0.0.1. See man page for file format. |
| 208 |
|
| 209 |
-# InternalHosts filename |
| 210 |
+# InternalHosts /etc/mail/dkim-filter/internalhosts |
| 211 |
|
| 212 |
## KeepTemporaryFiles { yes | no } |
| 213 |
## default "no" |
| 214 |
@@ -209,7 +202,7 @@ |
| 215 |
## Specifies the path to the private key to use when signing. Ignored if |
| 216 |
## Keylist is set. No default; must be specified for signing. |
| 217 |
|
| 218 |
-KeyFile /var/db/dkim/example.private |
| 219 |
+KeyFile /etc/mail/dkim-filter/my-selector-name.private |
| 220 |
|
| 221 |
## KeyList filename |
| 222 |
## |
| 223 |
@@ -226,7 +219,7 @@ |
| 224 |
## as the beginning of a comment. See dkim-filter.conf(5) for more |
| 225 |
## information. |
| 226 |
|
| 227 |
-# KeyList /var/db/dkim/keylist |
| 228 |
+# KeyList /etc/mail/dkim-filter/keylist |
| 229 |
|
| 230 |
## LocalADSP filename |
| 231 |
## |
| 232 |
@@ -350,24 +343,6 @@ |
| 233 |
## page for file format. |
| 234 |
|
| 235 |
# PeerList filename |
| 236 |
- |
| 237 |
-## PidFile filename |
| 238 |
-## |
| 239 |
-## Name of the file where the filter should write its pid before beginning |
| 240 |
-## normal operations. |
| 241 |
- |
| 242 |
-# PidFile filename |
| 243 |
- |
| 244 |
-## POPDBFile filename |
| 245 |
-## |
| 246 |
-## Names a database which should be checked for "POP before SMTP" records |
| 247 |
-## as a form of authentication of users who may be sending mail through |
| 248 |
-## the MTA for signing. Requires special compilation of the filter. |
| 249 |
-## See dkim-filter.conf(5) for more information. |
| 250 |
- |
| 251 |
-# POPDBFile filename |
| 252 |
- |
| 253 |
-## Quarantine { yes | no } |
| 254 |
## default "no" |
| 255 |
## |
| 256 |
## Indicates whether or not the filter should arrange to quarantine mail |
| 257 |
@@ -486,7 +461,7 @@ |
| 258 |
## inet:port to listen on all interfaces |
| 259 |
## local:/path/to/socket to listen on a UNIX domain socket |
| 260 |
|
| 261 |
-Socket inet:port@localhost |
| 262 |
+Socket local:/var/run/dkim-filter/dkim-filter.sock |
| 263 |
|
| 264 |
## StrictTestMode { yes | no } |
| 265 |
## default "no" |
| 266 |
@@ -553,7 +528,7 @@ |
| 267 |
## The system has its own default which will be used (usually 022). |
| 268 |
## See the umask(2) man page for more information. |
| 269 |
|
| 270 |
-# UMask 022 |
| 271 |
+UMask 002 |
| 272 |
|
| 273 |
## Userid userid |
| 274 |
## default (none) |
| 275 |
@@ -561,7 +536,7 @@ |
| 276 |
## Change to user "userid" before starting normal operation? May include |
| 277 |
## a group ID as well, separated from the userid by a colon. |
| 278 |
|
| 279 |
-# UserID userid |
| 280 |
+UserID milter |
| 281 |
|
| 282 |
## X-Header { yes | no } |
| 283 |
## default "no" |
| 284 |
@@ -570,3 +545,12 @@ |
| 285 |
## messages it has processed. |
| 286 |
|
| 287 |
# X-Header No |
| 288 |
+# |
| 289 |
+ |
| 290 |
+## Statistics filename |
| 291 |
+## |
| 292 |
+## Names a file to which useful statistics will be saved. |
| 293 |
+## See man dkim-stats page |
| 294 |
+ |
| 295 |
+Statistics /var/run/dkim-filter/dkim-filter.stats |
| 296 |
+ |
| 297 |
|
| 298 |
|
| 299 |
|
| 300 |
1.1 mail-filter/dkim-milter/files/dkim-milter-2.8.2-exit-on-error.patch |
| 301 |
|
| 302 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.8.2-exit-on-error.patch?rev=1.1&view=markup |
| 303 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.8.2-exit-on-error.patch?rev=1.1&content-type=text/plain |
| 304 |
|
| 305 |
Index: dkim-milter-2.8.2-exit-on-error.patch |
| 306 |
=================================================================== |
| 307 |
diff -Nru dkim-milter-2.8.2.orig/Makefile dkim-milter-2.8.2/Makefile |
| 308 |
--- dkim-milter-2.8.2.orig/Makefile 2005-05-20 21:58:50.000000000 +0000 |
| 309 |
+++ dkim-milter-2.8.2/Makefile 2009-02-28 10:28:31.000000000 +0000 |
| 310 |
@@ -9,35 +9,35 @@ |
| 311 |
@for x in $(SUBDIRS); \ |
| 312 |
do \ |
| 313 |
(cd $$x; echo Making $@ in:; pwd; \ |
| 314 |
- $(SHELL) $(BUILD) $(OPTIONS)); \ |
| 315 |
+ $(SHELL) $(BUILD) $(OPTIONS)) || exit; \ |
| 316 |
done |
| 317 |
|
| 318 |
clean: FRC |
| 319 |
@for x in $(SUBDIRS); \ |
| 320 |
do \ |
| 321 |
(cd $$x; echo Making $@ in:; pwd; \ |
| 322 |
- $(SHELL) $(BUILD) $(OPTIONS) $@); \ |
| 323 |
+ $(SHELL) $(BUILD) $(OPTIONS) $@) || exit; \ |
| 324 |
done |
| 325 |
|
| 326 |
install: FRC |
| 327 |
@for x in $(SUBDIRS); \ |
| 328 |
do \ |
| 329 |
(cd $$x; echo Making $@ in:; pwd; \ |
| 330 |
- $(SHELL) $(BUILD) $(OPTIONS) $@); \ |
| 331 |
+ $(SHELL) $(BUILD) $(OPTIONS) $@) || exit; \ |
| 332 |
done |
| 333 |
|
| 334 |
install-docs: FRC |
| 335 |
@for x in $(SUBDIRS); \ |
| 336 |
do \ |
| 337 |
(cd $$x; echo Making $@ in:; pwd; \ |
| 338 |
- $(SHELL) $(BUILD) $(OPTIONS) $@); \ |
| 339 |
+ $(SHELL) $(BUILD) $(OPTIONS) $@) || exit; \ |
| 340 |
done |
| 341 |
|
| 342 |
fresh: FRC |
| 343 |
@for x in $(SUBDIRS); \ |
| 344 |
do \ |
| 345 |
(cd $$x; echo Making $@ in:; pwd; \ |
| 346 |
- $(SHELL) $(BUILD) $(OPTIONS) -c); \ |
| 347 |
+ $(SHELL) $(BUILD) $(OPTIONS) -c) || exit; \ |
| 348 |
done |
| 349 |
|
| 350 |
$(SUBDIRS): FRC |
| 351 |
|
| 352 |
|
| 353 |
|
| 354 |
1.1 mail-filter/dkim-milter/files/dkim-milter-2.8.2-test115.patch |
| 355 |
|
| 356 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.8.2-test115.patch?rev=1.1&view=markup |
| 357 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.8.2-test115.patch?rev=1.1&content-type=text/plain |
| 358 |
|
| 359 |
Index: dkim-milter-2.8.2-test115.patch |
| 360 |
=================================================================== |
| 361 |
diff -Nru dkim-milter-2.8.2.orig/libdkim/t-test115.c dkim-milter-2.8.2/libdkim/t-test115.c |
| 362 |
--- dkim-milter-2.8.2.orig/libdkim/t-test115.c 2009-02-28 10:55:46.000000000 +0000 |
| 363 |
+++ dkim-milter-2.8.2/libdkim/t-test115.c 2009-02-28 10:55:29.000000000 +0000 |
| 364 |
@@ -144,7 +144,7 @@ |
| 365 |
assert(status == DKIM_STAT_OK); |
| 366 |
|
| 367 |
status = dkim_eoh(dkim); |
| 368 |
- assert(status == DKIM_STAT_NORESOURCE); /* XXX -- fix this! */ |
| 369 |
+ assert(status == DKIM_STAT_OK); |
| 370 |
|
| 371 |
status = dkim_getsiglist(dkim, &sigs, &nsigs); |
| 372 |
assert(status == DKIM_STAT_OK); |
| 373 |
@@ -161,7 +161,7 @@ |
| 374 |
assert(dkim_sig_geterror(sigs[4]) == DKIM_SIGERROR_KEYTYPEUNKNOWN); |
| 375 |
assert(dkim_sig_geterror(sigs[5]) == DKIM_SIGERROR_DNSSYNTAX); |
| 376 |
assert(dkim_sig_geterror(sigs[6]) == DKIM_SIGERROR_KEYREVOKED); |
| 377 |
- assert(dkim_sig_geterror(sigs[7]) == DKIM_SIGERROR_UNKNOWN); |
| 378 |
+ assert(dkim_sig_geterror(sigs[7]) == DKIM_SIGERROR_KEYDECODE); |
| 379 |
|
| 380 |
status = dkim_free(dkim); |
| 381 |
assert(status == DKIM_STAT_OK); |
Archives