add postfix queue ID patch workaround.

cosmetic clean up.
Package-Manager: portage-2.1.1_pre2-r6

6 files changed, 63 insertions, 34 deletions

diff --git a/mail-filter/dk-milter/ChangeLog b/mail-filter/dk-milter/ChangeLog
index 958e7d466201..728cd8091935 100644
--- a/mail-filter/dk-milter/ChangeLog
+++ b/mail-filter/dk-milter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/dk-filter
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/ChangeLog,v 1.5 2006/07/16 01:04:18 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/ChangeLog,v 1.6 2006/07/18 00:55:38 langthang Exp $
+
+  18 Jul 2006; Tuấn Văn <langthang@gentoo.org>
+  +files/dk-milter-0.4.1-queueID.patch, files/dk-filter.conf,
+  files/dk-filter.init, dk-milter-0.4.1.ebuild:
+  add postfix queue ID patch workaround.
+  cosmetic clean up.
 
   16 Jul 2006; Tuấn Văn <langthang@gentoo.org> dk-milter-0.4.1.ebuild:
   add man pages.
diff --git a/mail-filter/dk-milter/Manifest b/mail-filter/dk-milter/Manifest
index be94f5933dc3..2185c52dabb2 100644
--- a/mail-filter/dk-milter/Manifest
+++ b/mail-filter/dk-milter/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX dk-filter.conf 349 RMD160 6069fc39b2fd4779bac5a49ff58a00e9831c031a SHA1 232da654f424e67e9a6fd35c0212e4170788d01e SHA256 7b05fb7b4e3df1103cda9eac74b26316185b5dd56d7316178cc64fca8d50f414
-MD5 87689f70892d0e0f2131d48c7ffae026 files/dk-filter.conf 349
-RMD160 6069fc39b2fd4779bac5a49ff58a00e9831c031a files/dk-filter.conf 349
-SHA256 7b05fb7b4e3df1103cda9eac74b26316185b5dd56d7316178cc64fca8d50f414 files/dk-filter.conf 349
-AUX dk-filter.init 558 RMD160 08fc21c9c1ef0b9ae4155936ed3667529279605e SHA1 c584fb241d0ca1dd84cb69b76ce4850c2e7ba1b2 SHA256 7b1de59ad1ba12ba46cb80a5185546daaea7be426576459e1e27054d0c85c84a
-MD5 9757e8231749f8d70ef25d651609db96 files/dk-filter.init 558
-RMD160 08fc21c9c1ef0b9ae4155936ed3667529279605e files/dk-filter.init 558
-SHA256 7b1de59ad1ba12ba46cb80a5185546daaea7be426576459e1e27054d0c85c84a files/dk-filter.init 558
+AUX dk-filter.conf 348 RMD160 9baf59301425d75deb21f3b4942a537e3fefed58 SHA1 0e616884c2a48682faae77bd681560acdceb5c78 SHA256 4cb330d1e58034b372fab33727287f7352c66e211f53ad9911381f453637e70c
+MD5 45034b9900e8c80c690ec3b8979c66c8 files/dk-filter.conf 348
+RMD160 9baf59301425d75deb21f3b4942a537e3fefed58 files/dk-filter.conf 348
+SHA256 4cb330d1e58034b372fab33727287f7352c66e211f53ad9911381f453637e70c files/dk-filter.conf 348
+AUX dk-filter.init 558 RMD160 682ead5f1d84cd98b1d558fa00ced822b05800d9 SHA1 35ced94347f2b02170936d257ec183d01748fa6f SHA256 476680b18b84ce8b0aa5713d117181de697914cde6753bfef2d06b1c0addd9ec
+MD5 85db92d2ce24075f6cf1d0cc611c2c0e files/dk-filter.init 558
+RMD160 682ead5f1d84cd98b1d558fa00ced822b05800d9 files/dk-filter.init 558
+SHA256 476680b18b84ce8b0aa5713d117181de697914cde6753bfef2d06b1c0addd9ec files/dk-filter.init 558
+AUX dk-milter-0.4.1-queueID.patch 547 RMD160 a189b7098a47b7fc8451a29c99ec49cfcf16fbed SHA1 ba7227a8529220093752952f16db5c8714bb90cd SHA256 b0ef0f941644dc8c02bcaf845ba51112b08e2f605a5f7b9dc07d1930c8d59fe2
+MD5 bdc8199b16d38d4b48a3e9f7a62f15e7 files/dk-milter-0.4.1-queueID.patch 547
+RMD160 a189b7098a47b7fc8451a29c99ec49cfcf16fbed files/dk-milter-0.4.1-queueID.patch 547
+SHA256 b0ef0f941644dc8c02bcaf845ba51112b08e2f605a5f7b9dc07d1930c8d59fe2 files/dk-milter-0.4.1-queueID.patch 547
 AUX gentxt.sh 1484 RMD160 1c33d806702341be3e28a1c1ea81693e7aa1bd68 SHA1 4393133609b34d1e97e26d51284d95196ce0adcb SHA256 0d0d6b1d813a58ddcc7d0700d58ca9f57d351792687ee88b511dbff8d66b2985
 MD5 53ea44bf7e888c970a6740c561fd9112 files/gentxt.sh 1484
 RMD160 1c33d806702341be3e28a1c1ea81693e7aa1bd68 files/gentxt.sh 1484
@@ -18,14 +22,14 @@ MD5 daafe563fbfe874bb0d92c1ac2698735 files/site.config.m4 94
 RMD160 d9de9bfcaaf69bb39f0597e3b59e0195e513559e files/site.config.m4 94
 SHA256 4e177b598ebc524febfcabf0a1da37df8d3d7e4d0d51051476cdde4bee3b5b93 files/site.config.m4 94
 DIST dk-milter-0.4.1.tar.gz 313092 RMD160 fc75a6884b91466e97fd4830107baa43777f768b SHA1 aec7e89dabe88fd277708bbb95bc02d48c305d79 SHA256 51f19981cbd1f4fea343982912a92cee7e2e302b7b48fe1703430afa414bcfb1
-EBUILD dk-milter-0.4.1.ebuild 1716 RMD160 1d311cb08e14828216cb657c0b3e72d652ad0d17 SHA1 8e02a3a2560853dc85f63af9b41eee507542bb21 SHA256 0449e958a035060658ab97583a63d5ec9b7697f7e13521970e0bf528769eedf8
-MD5 0d98e5e839a240b837086579b024b449 dk-milter-0.4.1.ebuild 1716
-RMD160 1d311cb08e14828216cb657c0b3e72d652ad0d17 dk-milter-0.4.1.ebuild 1716
-SHA256 0449e958a035060658ab97583a63d5ec9b7697f7e13521970e0bf528769eedf8 dk-milter-0.4.1.ebuild 1716
-MISC ChangeLog 848 RMD160 9e796b6689ab09664812ed3999ef7e4e512ba16a SHA1 9c42a18c7bd2f327fc9584708e1a8095b941f4e4 SHA256 dc37398468f0aecba17cb224c50c468ccdc4dfc8abf65007882f94477dd38a5f
-MD5 3013ceabba774908b83d456e0a968cad ChangeLog 848
-RMD160 9e796b6689ab09664812ed3999ef7e4e512ba16a ChangeLog 848
-SHA256 dc37398468f0aecba17cb224c50c468ccdc4dfc8abf65007882f94477dd38a5f ChangeLog 848
+EBUILD dk-milter-0.4.1.ebuild 1773 RMD160 9139c45c7d8988e36765a67bc6e1765624dc7394 SHA1 d153175dae14c167e58865ad4a7230ca97e91ed7 SHA256 099ede631aa5a8200363732e7c5f9f585c3b0a71748f93fb1472f4a198daa961
+MD5 5d57c07c0aa5971286e38a8f5a712252 dk-milter-0.4.1.ebuild 1773
+RMD160 9139c45c7d8988e36765a67bc6e1765624dc7394 dk-milter-0.4.1.ebuild 1773
+SHA256 099ede631aa5a8200363732e7c5f9f585c3b0a71748f93fb1472f4a198daa961 dk-milter-0.4.1.ebuild 1773
+MISC ChangeLog 1071 RMD160 fed1c564b3a01a8493c3702b3ca377bed70d06ab SHA1 2ad1d1492b19a2159b7657c7e2d91301a6f45932 SHA256 7af1a162a5c62cc838f204a294a1260eccf756e524ff78bd61384059c0ef7758
+MD5 15bf8385d2a9879f8cc39089c2f6c2a5 ChangeLog 1071
+RMD160 fed1c564b3a01a8493c3702b3ca377bed70d06ab ChangeLog 1071
+SHA256 7af1a162a5c62cc838f204a294a1260eccf756e524ff78bd61384059c0ef7758 ChangeLog 1071
 MISC metadata.xml 221 RMD160 3f13d342b35e471ab3bc6d5b6a491918688ea452 SHA1 1e4ce4ec962e1bae402fdce6f17a1729e1efb4e2 SHA256 9d7907404731a8635f1fb42c8901da3d996aa936fd23e67159a38cf48bb90e0f
 MD5 f1c604a8eaa7929364a593541a1d0efe metadata.xml 221
 RMD160 3f13d342b35e471ab3bc6d5b6a491918688ea452 metadata.xml 221
@@ -36,7 +40,7 @@ SHA256 c0900a35c0e5850dab80dc2fce630a792b9dea6116f7cd3232f4b842fa8107e0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEuZCq5FrxP71izLARAtwtAKCOPJ/tDzy+kg+5QvsLh2pKLoM96QCgmzH5
-0FleQt8o9x25C/UbO3c5CZc=
-=6fql
+iD8DBQFEvDGf5FrxP71izLARApIPAKCciReF0vFhGOViaKtiiBetSVyjigCdGCsM
+ycIX3sMABHIxQs9lbZX/vVQ=
+=Ih/j
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dk-milter/dk-milter-0.4.1.ebuild b/mail-filter/dk-milter/dk-milter-0.4.1.ebuild
index 2f3d1eb95c23..e024e48e2ef6 100644
--- a/mail-filter/dk-milter/dk-milter-0.4.1.ebuild
+++ b/mail-filter/dk-milter/dk-milter-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/dk-milter-0.4.1.ebuild,v 1.5 2006/07/16 01:04:18 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/dk-milter-0.4.1.ebuild,v 1.6 2006/07/18 00:55:38 langthang Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="dev-libs/openssl
+	>=sys-libs/db-3.2
 	mail-filter/libmilter"
 
 S=${WORKDIR}/${P}
@@ -30,7 +31,10 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A}
+	unpack "${A}" && cd "${S}"
+
+	# Postfix queue ID patch. See MILTER_README.html#workarounds
+	epatch "${FILESDIR}"/${P}-queueID.patch
 
 	confCCOPTS="${CFLAGS}"
 	conf_libmilter_INCDIRS="-I/usr/include/libmilter"
@@ -49,14 +53,13 @@ src_install() {
 	fowners milter:milter /etc/mail/dk-filter
 	fperms 700 /etc/mail/dk-filter
 
-	dodir /usr/bin /usr/lib
-	dodir /usr/share/man/man{3,8}
-	for dir in dk-filter  libar  libdk  libsm; do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			install -C "${OBJDIR}"/${dir} \
+	dodir /usr/bin /usr/share/man/man8
+
+	make DESTDIR=${D} MANROOT=/usr/share/man/man \
+		install -C "${OBJDIR}"/dk-filter \
 			|| die "make install failed"
-	done
-	doman dk-filter/dk-filter.8 libar/ar.3
+
+	doman dk-filter/dk-filter.8
 	dobin "$FILESDIR"/gentxt.sh || die "dobin failed"
 
 	newinitd "${FILESDIR}/dk-filter.init" dk-filter \
diff --git a/mail-filter/dk-milter/files/dk-filter.conf b/mail-filter/dk-milter/files/dk-filter.conf
index 6d7045064812..9b34f1a02b92 100644
--- a/mail-filter/dk-milter/files/dk-filter.conf
+++ b/mail-filter/dk-milter/files/dk-filter.conf
@@ -1,10 +1,10 @@
 # Additional options for the Domain Key Milter
-# see dk-milter(8) for more information.
+# see dk-filter(8) for more information.
 DK_FILTER_OPTS=""
 SOCKETSPEC="inet:8025@localhost"
 DOMAIN="example.com"
 SELECTOR="domainkey"
-KEYPATH="/etc/mail/domainkeys/$SELECTOR.private"
+KEYPATH="/etc/mail/dk-filter/$SELECTOR.private"
 USER="milter"
 CANON="nofws"
 DK_FILTER_OPTS="-u milter -l -p $SOCKETSPEC -c $CANON -d $DOMAIN -s $KEYPATH -S $SELECTOR"
diff --git a/mail-filter/dk-milter/files/dk-filter.init b/mail-filter/dk-milter/files/dk-filter.init
index 6d735b970cbb..85b50b842f3f 100755
--- a/mail-filter/dk-milter/files/dk-filter.init
+++ b/mail-filter/dk-milter/files/dk-filter.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/files/dk-filter.init,v 1.1 2006/07/15 21:54:34 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dk-milter/files/dk-filter.init,v 1.2 2006/07/18 00:55:38 langthang Exp $
 
 depend() {
 	# need net
@@ -9,14 +9,14 @@ depend() {
 }
 
 start() {
-	ebegin "Starting Domain Key Milter"
+	ebegin "Starting DomainKeys Filter"
 	start-stop-daemon --start --quiet --background \
 		--exec /usr/bin/dk-filter -- ${DK_FILTER_OPTS}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping Domain Key Milter"
+	ebegin "Stopping DomainKeys Filter"
 	start-stop-daemon --stop --quiet --name dk-filter
 	eend $?
 }
diff --git a/mail-filter/dk-milter/files/dk-milter-0.4.1-queueID.patch b/mail-filter/dk-milter/files/dk-milter-0.4.1-queueID.patch
new file mode 100644
index 000000000000..9ab2e4c2ace3
--- /dev/null
+++ b/mail-filter/dk-milter/files/dk-milter-0.4.1-queueID.patch
@@ -0,0 +1,16 @@
+--- dk-filter/dk-filter.c.orig	2006-07-17 16:33:44.000000000 -0700
++++ dk-filter/dk-filter.c	2006-07-17 16:35:45.000000000 -0700
+@@ -2076,6 +2076,13 @@
+ 	dfc = cc->cctx_msg;
+ 	assert(dfc != NULL);
+ 
++	/* Determine the job ID for logging. */
++	if (dfc->mctx_jobid == 0 || strcmp(dfc->mctx_jobid, JOBIDUNKNOWN) == 0) {
++		char *jobid = smfi_getsymval(ctx, "i");
++		if (jobid != 0)
++			dfc->mctx_jobid = jobid;
++	}
++
+ 	/* get hostname; used in the X header and in new MIME boundaries */
+ 	hostname = smfi_getsymval(ctx, "j");
+ 	if (hostname == NULL)