[pkgsrc/trunk]: pkgsrc/mail/qmail-qfilter Apply patch (submitted upstream) to...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4720421a11da
branches:  trunk
changeset: 641757:4720421a11da
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Nov 17 02:56:04 2014 +0000

description:
Apply patch (submitted upstream) to set QMAILPPID for filters to
know grandparent PID. With this change, I can correlate rejections
from my homegrown badrcptto-alike filter with qmail-smtpd sessions.
While here, add LICENSE and otherwise placate pkglint.

Bump PKGREVISION.

diffstat:

 mail/qmail-qfilter/Makefile                      |   6 +++---
 mail/qmail-qfilter/distinfo                      |   5 +++--
 mail/qmail-qfilter/patches/patch-aa              |   4 +++-
 mail/qmail-qfilter/patches/patch-qmail-qfilter.c |  20 ++++++++++++++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)

diffs (77 lines):

diff -r b0011a21d76e -r 4720421a11da mail/qmail-qfilter/Makefile
--- a/mail/qmail-qfilter/Makefile       Sun Nov 16 20:15:34 2014 +0000
+++ b/mail/qmail-qfilter/Makefile       Mon Nov 17 02:56:04 2014 +0000
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.21 2014/10/09 14:06:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2014/11/17 02:56:04 schmonz Exp $
 #
 
 DISTNAME=              qmail-qfilter-2.1
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            mail
 MASTER_SITES=          ${HOMEPAGE}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              http://untroubled.org/qmail-qfilter/
 COMMENT=               Multi-filter front end for qmail-queue
+LICENSE=               gnu-gpl-v2
 
 DEPENDS+=              qmail>=1.03nb9:../../mail/qmail
 
@@ -37,7 +38,6 @@
 .include "../../mk/bsd.prefs.mk"
 
 post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/qmail-qfilter
        for i in ${REPLACE_PERL}; do                                    \
                ${INSTALL_SCRIPT} ${WRKSRC}/$${i}                       \
                        ${DESTDIR}${PREFIX}/share/examples/qmail-qfilter; \
diff -r b0011a21d76e -r 4720421a11da mail/qmail-qfilter/distinfo
--- a/mail/qmail-qfilter/distinfo       Sun Nov 16 20:15:34 2014 +0000
+++ b/mail/qmail-qfilter/distinfo       Mon Nov 17 02:56:04 2014 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/08/02 02:36:17 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2014/11/17 02:56:04 schmonz Exp $
 
 SHA1 (qmail-qfilter-2.1.tar.gz) = 5ac595a9b6f7c14efa1bca3621fa16abfc382fc0
 RMD160 (qmail-qfilter-2.1.tar.gz) = 4336fef69e7f5216d11b4ee71110b7c9504d3970
 Size (qmail-qfilter-2.1.tar.gz) = 22242 bytes
-SHA1 (patch-aa) = c4c2a94d032f16c7d663d8813d18ae1f40aecd96
+SHA1 (patch-aa) = c328833d52e25f33d89a03711948b45e031c090d
+SHA1 (patch-qmail-qfilter.c) = adfe0c1b1369874c21049f3df401fd83366616e6
diff -r b0011a21d76e -r 4720421a11da mail/qmail-qfilter/patches/patch-aa
--- a/mail/qmail-qfilter/patches/patch-aa       Sun Nov 16 20:15:34 2014 +0000
+++ b/mail/qmail-qfilter/patches/patch-aa       Mon Nov 17 02:56:04 2014 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2006/08/02 02:36:17 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2014/11/17 02:56:04 schmonz Exp $
+
+Dynamic linking fixes.
 
 --- Makefile.orig      2005-08-12 19:40:51.000000000 -0400
 +++ Makefile
diff -r b0011a21d76e -r 4720421a11da mail/qmail-qfilter/patches/patch-qmail-qfilter.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/qmail-qfilter/patches/patch-qmail-qfilter.c  Mon Nov 17 02:56:04 2014 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-qmail-qfilter.c,v 1.1 2014/11/17 02:56:04 schmonz Exp $
+
+Apply patch (submitted upstream) to set QMAILPPID for filters to
+know grandparent PID.
+
+With this change, my homegrown badrcptto-alike filter can log
+rejections in the same format as Paul Jarc's realrcptto, thereby
+allowing me to correlate each rejection with a qmail-smtpd session.
+
+--- qmail-qfilter.c.orig       2005-08-12 23:40:51.000000000 +0000
++++ qmail-qfilter.c
+@@ -332,6 +332,8 @@ int main(int argc, char* argv[])
+   if ((qqargv[0] = getenv("QQF_QMAILQUEUE")) == 0)
+     qqargv[0] = QMAIL_QUEUE;
+ 
++  mysetenvu("QMAILPPID", getppid());
++
+   copy_fd(0, 0, &msg_len);
+   copy_fd(1, ENVIN, &env_len);
+   parse_envelope();