add postfix queue ID patch workaround.

cosmetic clean up.
(Portage version: 2.1.1_pre2-r6)

5 files changed, 40 insertions, 15 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/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)