CVS commit: pkgsrc/mail/opensmtpd-filter-dkimsign

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Sep 21 12:22:53 UTC 2023

Modified Files:
        pkgsrc/mail/opensmtpd-filter-dkimsign: Makefile distinfo
        pkgsrc/mail/opensmtpd-filter-dkimsign/patches: patch-Makefile.gnu
Added Files:
        pkgsrc/mail/opensmtpd-filter-dkimsign/patches: patch-main.c

Log Message:
opensmtpd-filter-dkimsign: fix compiler warnings and bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/opensmtpd-filter-dkimsign/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/opensmtpd-filter-dkimsign/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/opensmtpd-filter-dkimsign/patches/patch-Makefile.gnu
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/opensmtpd-filter-dkimsign/patches/patch-main.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/opensmtpd-filter-dkimsign/Makefile
diff -u pkgsrc/mail/opensmtpd-filter-dkimsign/Makefile:1.3 pkgsrc/mail/opensmtpd-filter-dkimsign/Makefile:1.4
--- pkgsrc/mail/opensmtpd-filter-dkimsign/Makefile:1.3  Tue Sep  5 13:25:17 2023
+++ pkgsrc/mail/opensmtpd-filter-dkimsign/Makefile      Thu Sep 21 12:22:52 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2023/09/05 13:25:17 vins Exp $
+# $NetBSD: Makefile,v 1.4 2023/09/21 12:22:52 vins Exp $
 
 DISTNAME=      filter-dkimsign-0.6
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S|^|opensmtpd-|}
 CATEGORIES=    mail
 MASTER_SITES=  https://imperialat.at/releases/

Index: pkgsrc/mail/opensmtpd-filter-dkimsign/distinfo
diff -u pkgsrc/mail/opensmtpd-filter-dkimsign/distinfo:1.1 pkgsrc/mail/opensmtpd-filter-dkimsign/distinfo:1.2
--- pkgsrc/mail/opensmtpd-filter-dkimsign/distinfo:1.1  Sun Sep  3 13:00:42 2023
+++ pkgsrc/mail/opensmtpd-filter-dkimsign/distinfo      Thu Sep 21 12:22:52 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2023/09/03 13:00:42 vins Exp $
+$NetBSD: distinfo,v 1.2 2023/09/21 12:22:52 vins Exp $
 
 BLAKE2s (filter-dkimsign-0.6.tar.gz) = 3cd58fa566252d49330a500c7a81af9a4e479faa083fb09fd972326df588aaab
 SHA512 (filter-dkimsign-0.6.tar.gz) = 1efab386a020c6a3cbf6059ce0feea539fa62be0990fd8538c4b152fa0c302d7bfffa7c7bb74643c25e47c20250f600f1371d2725dc3178ad103ce585530c0ce
 Size (filter-dkimsign-0.6.tar.gz) = 24163 bytes
-SHA1 (patch-Makefile.gnu) = aafeedae76d938ed769442059d16848bfa0c4de5
+SHA1 (patch-Makefile.gnu) = fddd7dba3e3b99acfb7564fa7ea9ca4e008fd004
+SHA1 (patch-main.c) = 5969e54052f419315c4c07b50560d43973b3042e
 SHA1 (patch-openbsd-compat_explicit__bzero.c) = 77f4725a1bf4b8fc7f4040755e9f0b61db6b19e6

Index: pkgsrc/mail/opensmtpd-filter-dkimsign/patches/patch-Makefile.gnu
diff -u pkgsrc/mail/opensmtpd-filter-dkimsign/patches/patch-Makefile.gnu:1.1 pkgsrc/mail/opensmtpd-filter-dkimsign/patches/patch-Makefile.gnu:1.2
--- pkgsrc/mail/opensmtpd-filter-dkimsign/patches/patch-Makefile.gnu:1.1        Sun Sep  3 13:00:43 2023
+++ pkgsrc/mail/opensmtpd-filter-dkimsign/patches/patch-Makefile.gnu    Thu Sep 21 12:22:52 2023
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile.gnu,v 1.1 2023/09/03 13:00:43 vins Exp $
+$NetBSD: patch-Makefile.gnu,v 1.2 2023/09/21 12:22:52 vins Exp $
 
-Portability fixes for pkgsc.
+Portability fixes for pkgsrc.
 
 --- Makefile.gnu.orig  2021-06-02 10:12:42.000000000 +0000
 +++ Makefile.gnu

Added files:

Index: pkgsrc/mail/opensmtpd-filter-dkimsign/patches/patch-main.c
diff -u /dev/null pkgsrc/mail/opensmtpd-filter-dkimsign/patches/patch-main.c:1.1
--- /dev/null   Thu Sep 21 12:22:53 2023
+++ pkgsrc/mail/opensmtpd-filter-dkimsign/patches/patch-main.c  Thu Sep 21 12:22:52 2023
@@ -0,0 +1,47 @@
+$NetBSD: patch-main.c,v 1.1 2023/09/21 12:22:52 vins Exp $
+
+Address signedness mismatch warnings.
+
+--- main.c.orig        2022-01-27 21:56:05.000000000 +0000
++++ main.c
+@@ -594,6 +594,7 @@ dkim_sign(struct osmtpd_ctx *ctx)
+       ssize_t i;
+       size_t linelen = 0;
+       char *tmp, *tmp2;
++      unsigned char *utmp;
+       unsigned int digestsz;
+ 
+       if (addtime || addexpire)
+@@ -717,18 +718,18 @@ dkim_sign(struct osmtpd_ctx *ctx)
+               }
+ #endif
+       }
+-      if ((tmp = malloc(linelen)) == NULL) {
++      if ((utmp = malloc(linelen)) == NULL) {
+               dkim_err(message, "Can't allocate space for signature");
+               goto fail;
+       }
+       if (!sephash) {
+-              if (EVP_DigestSignFinal(message->dctx, tmp, &linelen) != 1) {
++              if (EVP_DigestSignFinal(message->dctx, utmp, &linelen) != 1) {
+                       dkim_errx(message, "Failed to finalize signature");
+                       goto fail;
+               }
+ #ifdef HAVE_ED25519
+       } else {
+-              if (EVP_DigestSign(message->dctx, tmp, &linelen, bdigest,
++              if (EVP_DigestSign(message->dctx, utmp, &linelen, bdigest,
+                   digestsz) != 1) {
+                       dkim_errx(message, "Failed to finalize signature");
+                       goto fail;
+@@ -739,8 +740,8 @@ dkim_sign(struct osmtpd_ctx *ctx)
+               dkim_err(message, "Can't create DKIM signature");
+               goto fail;
+       }
+-      EVP_EncodeBlock(b, tmp, linelen);
+-      free(tmp);
++      EVP_EncodeBlock(b, utmp, linelen);
++      free(utmp);
+       dkim_signature_printf(message, "%s\r\n", b);
+       free(b);
+       dkim_signature_normalize(message);