CVS commit: pkgsrc/mail/opendkim

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 16 19:12:19 UTC 2022

Modified Files:
        pkgsrc/mail/opendkim: Makefile distinfo
        pkgsrc/mail/opendkim/patches: patch-libopendkim_dkim-canon.c

Log Message:
opendkim: Fix SunOS build and pkglint.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/mail/opendkim/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/opendkim/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/opendkim/patches/patch-libopendkim_dkim-canon.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/opendkim/Makefile
diff -u pkgsrc/mail/opendkim/Makefile:1.35 pkgsrc/mail/opendkim/Makefile:1.36
--- pkgsrc/mail/opendkim/Makefile:1.35  Mon May 24 19:52:43 2021
+++ pkgsrc/mail/opendkim/Makefile       Mon May 16 19:12:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2021/05/24 19:52:43 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2022/05/16 19:12:19 jperkin Exp $
 
 DISTNAME=      opendkim-2.10.3
 PKGREVISION=   8
@@ -11,11 +11,13 @@ COMMENT=    Open source DKIM library, MTA f
 LICENSE=       sendmail-open-source-license
 
 USE_LIBTOOL=           yes
-USE_TOOLS+=             autoconf automake autoreconf
+USE_TOOLS+=            autoconf automake autoreconf
 USE_TOOLS+=            pkg-config perl:run
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
+LDFLAGS.SunOS+=        -lsocket -lnsl
+
 REPLACE_PERL+= opendkim/opendkim-genkey.in
 
 FILES_SUBST+=  DKIM_USER=${DKIM_USER} DKIM_GROUP=${DKIM_GROUP}
@@ -48,7 +50,6 @@ pre-configure:
 PLIST_SRC+=            ${PKGDIR}/PLIST
 
 .include "../../security/openssl/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libmilter+=      libmilter>=8.13.0
 .include "../../mail/libmilter/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/opendkim/distinfo
diff -u pkgsrc/mail/opendkim/distinfo:1.23 pkgsrc/mail/opendkim/distinfo:1.24
--- pkgsrc/mail/opendkim/distinfo:1.23  Tue Oct 26 10:54:11 2021
+++ pkgsrc/mail/opendkim/distinfo       Mon May 16 19:12:19 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2021/10/26 10:54:11 nia Exp $
+$NetBSD: distinfo,v 1.24 2022/05/16 19:12:19 jperkin Exp $
 
 BLAKE2s (opendkim-2.10.3.tar.gz) = b790b2fdcffd16372460f0d686845019c85d21e3530202792c5d601801030dc7
 SHA512 (opendkim-2.10.3.tar.gz) = 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
 Size (opendkim-2.10.3.tar.gz) = 1210224 bytes
 SHA1 (patch-configure.ac) = c9ae182ed2c5c2ec3018fe4c6066ed7fa0d3686f
-SHA1 (patch-libopendkim_dkim-canon.c) = 82dc322f86981feddc2ad0100b33ce1eca7435d6
+SHA1 (patch-libopendkim_dkim-canon.c) = 3d15386a114639f2479505bc3b12c1de67dbb18a
 SHA1 (patch-opendkim_opendkim-crypto.c) = d7d08fda3dba5bf9cb834123218b1e89b78878e5

Index: pkgsrc/mail/opendkim/patches/patch-libopendkim_dkim-canon.c
diff -u pkgsrc/mail/opendkim/patches/patch-libopendkim_dkim-canon.c:1.1 pkgsrc/mail/opendkim/patches/patch-libopendkim_dkim-canon.c:1.2
--- pkgsrc/mail/opendkim/patches/patch-libopendkim_dkim-canon.c:1.1     Fri Mar 19 09:50:21 2021
+++ pkgsrc/mail/opendkim/patches/patch-libopendkim_dkim-canon.c Mon May 16 19:12:19 2022
@@ -1,4 +1,8 @@
-$NetBSD: patch-libopendkim_dkim-canon.c,v 1.1 2021/03/19 09:50:21 manu Exp $
+$NetBSD: patch-libopendkim_dkim-canon.c,v 1.2 2022/05/16 19:12:19 jperkin Exp $
+
+Fix DKIM canonization of headers formatted as Name:\r\n\tValue
+
+Submitted upstream as https://github.com/trusteddomainproject/OpenDKIM/pull/119
 
 --- libopendkim/dkim-canon.c.orig      2021-03-18 09:50:14.195951232 +0100
 +++ libopendkim/dkim-canon.c   2021-03-19 09:49:52.141301747 +0100