diff options
| -rw-r--r-- | mail/qmail-qfilter/Makefile | 6 | ||||
| -rw-r--r-- | mail/qmail-qfilter/distinfo | 5 | ||||
| -rw-r--r-- | mail/qmail-qfilter/patches/patch-aa | 4 | ||||
| -rw-r--r-- | mail/qmail-qfilter/patches/patch-qmail-qfilter.c | 20 |
4 files changed, 29 insertions, 6 deletions
diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile index 06b5764b3ae..2ac34ba6044 100644 --- a/mail/qmail-qfilter/Makefile +++ b/mail/qmail-qfilter/Makefile @@ -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 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 @@ DJB_MAKE_TARGETS= NO .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 --git a/mail/qmail-qfilter/distinfo b/mail/qmail-qfilter/distinfo index 077a7dbd517..10f690ec384 100644 --- a/mail/qmail-qfilter/distinfo +++ b/mail/qmail-qfilter/distinfo @@ -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 --git a/mail/qmail-qfilter/patches/patch-aa b/mail/qmail-qfilter/patches/patch-aa index 27500e6156f..b1b7e51913d 100644 --- a/mail/qmail-qfilter/patches/patch-aa +++ b/mail/qmail-qfilter/patches/patch-aa @@ -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 --git a/mail/qmail-qfilter/patches/patch-qmail-qfilter.c b/mail/qmail-qfilter/patches/patch-qmail-qfilter.c new file mode 100644 index 00000000000..4d5e13ae95a --- /dev/null +++ b/mail/qmail-qfilter/patches/patch-qmail-qfilter.c @@ -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(); |