[pkgsrc/trunk]: pkgsrc/mail/dkim-milter Update to 2.4.4

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/dkim-milter Update to 2.4.4
From: adrianp <adrianp%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:48:21 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/dcb465591ff0
branches:  trunk
changeset: 538777:dcb465591ff0
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Tue Feb 19 13:23:06 2008 +0000

description:
Update to 2.4.4

* LIBDKIM: Fix bug #SF1867839: 64-bit portability in rfc2822.c.
  Patch from Geoff Adams.
* Update for latest Authentication-Results: header draft.
* Take advantage of some more features that were introduced with
  milter v2 in sendmail 8.14.0:
* Report "hardfail" instead of "fail" on authentication failures,
  in compliance with the Authentication-Results: draft.
* Fix use of "UseSSPDeny" to include handling of unsigned messages.
* Replace "gentxt.csh" with more robust "dkim-genkey" utility.

And *lots* more (the package in pkgsrc was 2 years+ old)

See RELEASE_NOTES for all the details

diffstat:

 mail/dkim-milter/MESSAGE              |   9 +++
 mail/dkim-milter/Makefile             |  69 +++++++++++++++++++---------
 mail/dkim-milter/PLIST                |  18 +++++-
 mail/dkim-milter/distinfo             |  12 ++--
 mail/dkim-milter/files/dkim-filter.sh |  40 ++++++++++++++++
 mail/dkim-milter/files/dkim-milter.sh |  27 -----------
 mail/dkim-milter/options.mk           |  15 ------
 mail/dkim-milter/patches/patch-aa     |  83 +++++++++++++++++++++-------------
 mail/dkim-milter/patches/patch-ab     |  14 -----
 mail/dkim-milter/patches/patch-ac     |  33 -------------
 10 files changed, 165 insertions(+), 155 deletions(-)

diffs (truncated from 404 to 300 lines):

diff -r fd80623cf994 -r dcb465591ff0 mail/dkim-milter/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dkim-milter/MESSAGE  Tue Feb 19 13:23:06 2008 +0000
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2008/02/19 13:23:06 adrianp Exp $
+
+Note that there is a difference between "dkim-filter" and "dkim-milter".
+"dkim-milter" is a package containing a library, a filter and some tools to
+be used in testing your DKIM installation.  "dkim-filter" is the filter
+program contained in the "dkim-milter" package.
+
+===========================================================================
diff -r fd80623cf994 -r dcb465591ff0 mail/dkim-milter/Makefile
--- a/mail/dkim-milter/Makefile Tue Feb 19 12:09:11 2008 +0000
+++ b/mail/dkim-milter/Makefile Tue Feb 19 13:23:06 2008 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2008/01/18 05:08:22 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2008/02/19 13:23:06 adrianp Exp $
 
-DISTNAME=      dkim-milter-0.1.1
-PKGREVISION=   1
+DISTNAME=      dkim-milter-2.4.4
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
 
@@ -10,47 +9,73 @@
 COMMENT=       Open source DKIM filter software from Sendmail, Inc
 
 BUILDLINK_API_DEPENDS.libmilter+=      libmilter>=8.13.0
+BUILDLINK_API_DEPENDS.openssl+=                openssl>=0.9.8
 
 LICENSE=               sendmail-open-source-license
 
 MAKE_ENV+=             M4=${M4:Q}
-RCD_SCRIPTS=           dkim-milter
+RCD_SCRIPTS=           dkim-filter
 USE_BUILTIN.libmilter= no
 USE_TOOLS+=            gm4
+PKG_OPTIONS_VAR=       PKG_OPTIONS.dkim-milter
+PKG_SUPPORTED_OPTIONS= inet6
+EGDIR=                 ${PREFIX}/share/examples/dkim-milter
+FILES_SUBST+=          DKIM_USER=${DKIM_USER:Q} DKIM_GROUP=${DKIM_GROUP:Q}
+BUILD_DEFS+=           VARBASE DKIM_USER DKIM_GROUP
+
+DKIM_USER?=            dkim
+DKIM_GROUP?=           dkim
+PKG_GROUPS=            ${DKIM_USER}
+PKG_USERS=             ${DKIM_USER}:${DKIM_GROUP}
+PKG_GROUPS_VARS+=      DKIM_GROUP
+PKG_USERS_VARS+=       DKIM_USER
+OWN_DIRS_PERMS+=       ${VARBASE}/run/dkim-filter \
+                       ${DKIM_USER} ${DKIM_GROUP} 0750
+
+.include "../../mk/bsd.options.mk"
 
 SUBST_CLASSES+=                libs
 SUBST_STAGE.libs=      pre-configure
-SUBST_FILES.libs=      dkim-filter/Makefile.m4 libdk/Makefile.m4
-SUBST_SED.libs=                -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' \
-                       -e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g' \
-                       -e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g' \
-                       -e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g'
-SUBST_MESSAGE.libs=    Fixing makefile references.
+SUBST_FILES.libs=      ${WRKSRC}/devtools/Site/site.config.m4
+SUBST_FILES.libs+=     dkim-filter/dkim-filter.conf.5 dkim-filter/dkim-stats.8
+SUBST_SED.libs=                -e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g'
+SUBST_SED.libs+=       -e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g'
+SUBST_SED.libs+=       -e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g'
+SUBST_SED.libs+=       -e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g'
+SUBST_SED.libs+=       -e 's|@PREFIX@|${PREFIX}|g'
+SUBST_SED.libs+=       -e 's|@PKGMANDIR@|${PKGMANDIR}|g'
+SUBST_SED.libs+=       -e 's|/etc/mail|${PKG_SYSCONFDIR}|g'
+SUBST_SED.libs+=       -e 's|.I /etc/dkim-filter.conf|.I ${PKG_SYSCONFDIR}/dkim-filter.conf|g'
+.if !empty(PKG_OPTIONS:Minet6)
+SUBST_SED.libs+=       -e 's|@INET6@||'
+.else
+SUBST_SED.libs+=       -e 's|@INET6@|dnl|'
+.endif
+SUBST_MESSAGE.libs=    Fixing Makefile references and man pages.
 
-INSTALLATION_DIRS=     ${PKGMANDIR}/man8 sbin share/doc/dkim-milter
+CONF_FILES=            ${EGDIR}/dkim-filter.conf.sample \
+                       ${PKG_SYSCONFDIR}/dkim-filter.conf
+
+INSTALLATION_DIRS=     share/doc/dkim-milter ${EGDIR}
 
 post-extract:
-       ${LN} -s FreeBSD ${WRKSRC}/devtools/OS/DragonFly
+       ${CP} ${WRKSRC}/site.config.m4.dist \
+               ${WRKSRC}/devtools/Site/site.config.m4
 
 do-build:
-       @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Build)
-
-post-build:
-       ${SED} -e 's|dkim-filter|dkim-milter|g' \
-               ${WRKSRC}/dkim-filter/dkim-filter.8 \
-               >${WRKSRC}/dkim-filter/dkim-milter.8
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build
 
 do-install:
-       cd ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \  . | ${TR} \/ -` && \
-               ${INSTALL_PROGRAM} dkim-filter/dkim-filter ${PREFIX}/sbin/dkim-milter
-       ${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-milter.8 ${PREFIX}/${PKGMANDIR}/man8/
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build install
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/dkim-filter/dkim-filter.conf.sample ${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dkim-milter
        ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/dkim-milter
        ${INSTALL_DATA} ${WRKSRC}/KNOWNBUGS ${PREFIX}/share/doc/dkim-milter
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dkim-milter
        ${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${PREFIX}/share/doc/dkim-milter
 
-.include "options.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mail/libmilter/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r fd80623cf994 -r dcb465591ff0 mail/dkim-milter/PLIST
--- a/mail/dkim-milter/PLIST    Tue Feb 19 12:09:11 2008 +0000
+++ b/mail/dkim-milter/PLIST    Tue Feb 19 13:23:06 2008 +0000
@@ -1,10 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-man/man8/dkim-milter.8
-sbin/dkim-milter
+@comment $NetBSD: PLIST,v 1.2 2008/02/19 13:23:06 adrianp Exp $
+bin/dkim-filter
+bin/dkim-genkey
+bin/dkim-testkey
+bin/dkim-testssp
+man/man5/dkim-filter.conf.5
+man/man8/dkim-filter.8
+man/man8/dkim-genkey.8
+man/man8/dkim-stats.8
+man/man8/dkim-testkey.8
+man/man8/dkim-testssp.8
 share/doc/dkim-milter/FEATURES
 share/doc/dkim-milter/INSTALL
 share/doc/dkim-milter/KNOWNBUGS
 share/doc/dkim-milter/README
 share/doc/dkim-milter/RELEASE_NOTES
-share/examples/rc.d/dkim-milter
+share/examples/dkim-milter/dkim-filter.conf.sample
+share/examples/rc.d/dkim-filter
 @dirrm share/doc/dkim-milter
+@dirrm share/examples/dkim-milter
diff -r fd80623cf994 -r dcb465591ff0 mail/dkim-milter/distinfo
--- a/mail/dkim-milter/distinfo Tue Feb 19 12:09:11 2008 +0000
+++ b/mail/dkim-milter/distinfo Tue Feb 19 13:23:06 2008 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/01/08 18:20:30 joerg Exp $
+$NetBSD: distinfo,v 1.3 2008/02/19 13:23:06 adrianp Exp $
 
-SHA1 (dkim-milter-0.1.1.tar.gz) = 6bfb5a3b7530864e09ed55b343fd747c78ddb2fa
-RMD160 (dkim-milter-0.1.1.tar.gz) = c8fae0456b8418ebeafdf6a5be22a86415b74578
-Size (dkim-milter-0.1.1.tar.gz) = 312318 bytes
-SHA1 (patch-aa) = 1d20c660bba8f6a754ca343434daf021559b41bd
-SHA1 (patch-ab) = f254cbee630fb18fc7f18daffd689753eb9dd467
-SHA1 (patch-ac) = 403e565640e3a67f26f04d9df5bb0833305d308a
+SHA1 (dkim-milter-2.4.4.tar.gz) = 0e945bdca7b70d6b1478ce3e0171f8023de50df2
+RMD160 (dkim-milter-2.4.4.tar.gz) = 744d167f86ad09b0f3856567f812787d18f40349
+Size (dkim-milter-2.4.4.tar.gz) = 617230 bytes
+SHA1 (patch-aa) = edf63a6c5376cb8fefbcd40ab46f944462eb94ab
diff -r fd80623cf994 -r dcb465591ff0 mail/dkim-milter/files/dkim-filter.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dkim-milter/files/dkim-filter.sh     Tue Feb 19 13:23:06 2008 +0000
@@ -0,0 +1,40 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: dkim-filter.sh,v 1.1 2008/02/19 13:23:06 adrianp Exp $
+#
+# PROVIDE: dkimfilter
+# REQUIRE: DAEMON
+# BEFORE: mail
+
+if [ -f /etc/rc.subr ]; then
+       . /etc/rc.subr
+fi
+
+name="dkimfilter"
+rcvar=$name
+command="@PREFIX@/bin/dkim-filter"
+pidfile="@VARBASE@/run/dkim-filter/${name}.pid"
+command_args="-P ${pidfile} -l -p @VARBASE@/run/dkim-filter/${name}.sock -x @PKG_SYSCONFDIR@/dkim-filter.conf -u @DKIM_USER@:@DKIM_GROUP@"
+required_files="@PKG_SYSCONFDIR@/dkim-filter.conf"
+start_precmd="dkimfilter_precmd"
+
+dkimfilter_precmd()
+{
+       if [ ! -d @VARBASE@/run/dkim-filter ]; then
+               @MKDIR@ @VARBASE@/run/dkim-filter
+               @CHMOD@ 0750 @VARBASE@/run/dkim-filter
+               @CHOWN@ @DKIM_USER@:@DKIM_GROUP@ @VARBASE@/run/dkim-filter
+       fi
+
+       if [ -f @VARBASE@/run/dkim-filter/${name}.sock ]; then
+               @RM@ -f @VARBASE@/run/dkim-filter/${name}.sock
+       fi
+}
+
+if [ -f /etc/rc.subr ]; then
+        load_rc_config $name
+       run_rc_command "$1"
+else
+       echo -n " ${name}"
+       ${command} ${dkimfilter_flags} ${command_args}
+fi
diff -r fd80623cf994 -r dcb465591ff0 mail/dkim-milter/files/dkim-milter.sh
--- a/mail/dkim-milter/files/dkim-milter.sh     Tue Feb 19 12:09:11 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dkim-milter.sh,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-#
-# PROVIDE: dkimmilter
-# REQUIRE: DAEMON
-# BEFORE: mail
-
-dkimmilter_flags="-h -l -p /var/run/dkimmilter.sock"
-
-if [ -f /etc/rc.subr ]; then
-       . /etc/rc.subr
-fi
-
-name="dkimmilter"
-rcvar=$name
-command="@PREFIX@/sbin/dkim-milter"
-pidfile="/var/run/${name}.pid"
-command_args="-P ${pidfile}"
-
-if [ -f /etc/rc.subr ]; then
-        load_rc_config $name
-       run_rc_command "$1"
-else
-       echo -n " ${name}"
-       ${command} ${dkimmilter_flags} ${command_args}
-fi
diff -r fd80623cf994 -r dcb465591ff0 mail/dkim-milter/options.mk
--- a/mail/dkim-milter/options.mk       Tue Feb 19 12:09:11 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.dk-milter
-PKG_SUPPORTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-SUBST_SED.libs+=       -e 's|@INET6@||'
-.else
-SUBST_SED.libs+=       -e 's|@INET6@|dnl|'
-.endif
diff -r fd80623cf994 -r dcb465591ff0 mail/dkim-milter/patches/patch-aa
--- a/mail/dkim-milter/patches/patch-aa Tue Feb 19 12:09:11 2008 +0000
+++ b/mail/dkim-milter/patches/patch-aa Tue Feb 19 13:23:06 2008 +0000
@@ -1,37 +1,54 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2008/02/19 13:23:06 adrianp Exp $
 
---- dkim-filter/Makefile.m4.orig       2005-09-28 13:27:11.000000000 +0200
-+++ dkim-filter/Makefile.m4
-@@ -4,10 +4,10 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
- define(`confMT', `TRUE')
- define(`confREQUIRE_LIBSM', `true')
- 
--APPENDDEF(`confLIBS', `-lssl -lcrypto')
-+APPENDDEF(`confLIBS', `-lssl -lcrypto @PTHREAD_LDFLAGS@ ')
- dnl Enable and edit these paths as needed:
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')
--dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib ')
-+APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include -I@PTHREAD@/include ')
-+APPENDDEF(`confLIBDIRS', `-L@SSLBASE@/lib -L@PTHREAD@/lib ')
+--- devtools/Site/site.config.m4.orig  2008-02-16 12:17:49.000000000 +0000
++++ devtools/Site/site.config.m4
+@@ -87,6 +87,14 @@ dnl have v0.9.8 or later for SHA256 supp
+ dnl lines by deleting "dnl" from the front of them and edit paths as needed.
+ dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')
+ dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib ')
++APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include ')
++APPENDDEF(`confLIBDIRS', `-L@SSLBASE@/lib ')
++
++dnl pthread support
++dnl
++APPENDDEF(`confLIBS', `@PTHREAD_LDFLAGS@ ')
++APPENDDEF(`confINCDIRS', `-I@PTHREAD@/include ')
++APPENDDEF(`confLIBDIRS', `-L@PTHREAD@/lib ')
  
- dnl To use the asynchronous resolver library provided, enable this line:
- dnl bldPUSH_SMLIB(`ar')
-@@ -19,15 +19,15 @@ bldPUSH_SMLIB(`sm')
- 
- dnl Enable these next line if needed to specify the locations of libmilter.a
- dnl and the libmilter include files:
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/sendmail/include')
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated x11/gtksourceview to 2.1.2
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/gtksourceview Update to 2.1.2.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated x11/gtksourceview to 2.1.2
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/gtksourceview Update to 2.1.2.
Indexes:
Home | Main Index | Thread Index | Old Index