CVS commit: pkgsrc/mail/openarc

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Thu Dec 11 00:44:17 UTC 2025

Modified Files:
        pkgsrc/mail/openarc: Makefile distinfo
        pkgsrc/mail/openarc/patches: patch-libopenarc_arc-canon.c

Log Message:
Replace crash workaround submitted upstream by an already committed
fix from upstream develop branch, as suggested by maintainer in the
pull request.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/openarc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/openarc/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/openarc/patches/patch-libopenarc_arc-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/openarc/Makefile
diff -u pkgsrc/mail/openarc/Makefile:1.7 pkgsrc/mail/openarc/Makefile:1.8
--- pkgsrc/mail/openarc/Makefile:1.7    Tue Nov 18 14:02:20 2025
+++ pkgsrc/mail/openarc/Makefile        Thu Dec 11 00:44:17 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2025/11/18 14:02:20 manu Exp $
+# $NetBSD: Makefile,v 1.8 2025/12/11 00:44:17 manu Exp $
 
 DISTNAME=      openarc-20180921
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=trusteddomainproject/}
 GITHUB_PROJECT=        OpenARC

Index: pkgsrc/mail/openarc/distinfo
diff -u pkgsrc/mail/openarc/distinfo:1.4 pkgsrc/mail/openarc/distinfo:1.5
--- pkgsrc/mail/openarc/distinfo:1.4    Tue Nov 18 14:02:20 2025
+++ pkgsrc/mail/openarc/distinfo        Thu Dec 11 00:44:17 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2025/11/18 14:02:20 manu Exp $
+$NetBSD: distinfo,v 1.5 2025/12/11 00:44:17 manu Exp $
 
 BLAKE2s (openarc-20180921-355ee2a1ca85acccce494478991983b54f794f4e.tar.gz) = bea742cd9cab422b17296d3d90e5fcf025a6d59e6d02b60c2c3fbda7caa72d11
 SHA512 (openarc-20180921-355ee2a1ca85acccce494478991983b54f794f4e.tar.gz) = 
edf006b4c8312ea93f478a228a498cd00394c9ec9682cd918e15629ef77974c530033a2de466d7e3d30eefa5d0ad12514f18a914fb69ccfc4b8306ee147c917c
 Size (openarc-20180921-355ee2a1ca85acccce494478991983b54f794f4e.tar.gz) = 150982 bytes
-SHA1 (patch-libopenarc_arc-canon.c) = 17baa49aa7268ccdece21c34fd0eaeeddc3ccdca
+SHA1 (patch-libopenarc_arc-canon.c) = 7a3ed070d692f1700f3f4f1a56c77140fefabd2b
 SHA1 (patch-libopenarc_arc.c) = 2dc1206ce9cf0ba9f85710ce3342c05efbf89dc1

Index: pkgsrc/mail/openarc/patches/patch-libopenarc_arc-canon.c
diff -u pkgsrc/mail/openarc/patches/patch-libopenarc_arc-canon.c:1.1 pkgsrc/mail/openarc/patches/patch-libopenarc_arc-canon.c:1.2
--- pkgsrc/mail/openarc/patches/patch-libopenarc_arc-canon.c:1.1        Tue Nov 18 14:02:20 2025
+++ pkgsrc/mail/openarc/patches/patch-libopenarc_arc-canon.c    Thu Dec 11 00:44:17 2025
@@ -1,31 +1,41 @@
-$NetBSD: patch-libopenarc_arc-canon.c,v 1.1 2025/11/18 14:02:20 manu Exp $
+From 5a93cd6620004a774ccc968894ed341c054f1be1 Mon Sep 17 00:00:00 2001
+From: Paul Arthur <paul.arthur%flowerysong.com@localhost>
+Date: Mon, 16 Apr 2018 14:30:35 +0000
+Subject: [PATCH] Fix crash when parsing "c" tags
 
-Cope with badly formed input
+["/" sig-c-tag-alg] is optional, and even if it weren't we shouldn't
+crash when it's not present.
+---
+ libopenarc/arc-canon.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
 
---- libopenarc/arc-canon.c.orig        2025-11-07 02:15:05.538163024 +0100
-+++ libopenarc/arc-canon.c     2025-11-07 02:16:20.165199776 +0100
-@@ -2134,18 +2134,22 @@
-       if (tag[0] == '\0')
-               return ARC_STAT_INVALID;
- 
-       token = strtok_r(tag, "/", &last);
-+      if (token == NULL)
-+              return ARC_STAT_INVALID;
-+              
-       code = arc_name_to_code(canonicalizations, token);
--
-       if (code == -1)
-               return ARC_STAT_INVALID;
- 
+diff --git a/libopenarc/arc-canon.c b/libopenarc/arc-canon.c
+index b2d66b0a..aa0f1453 100644
+--- ./libopenarc/arc-canon.c.orig
++++ ./libopenarc/arc-canon.c
+@@ -2143,12 +2143,21 @@ arc_parse_canon_t(unsigned char *tag, arc_canon_t *hdr_canon,
        *hdr_canon = (arc_canon_t) code;
  
        token = strtok_r(NULL, "/", &last);
 -      code = arc_name_to_code(canonicalizations, token);
+ 
+-      if (code == -1)
+-              return ARC_STAT_INVALID;
 +      if (token == NULL)
-+              return ARC_STAT_INVALID;
++      {
++              /* Per RFC 6376, if no body canonicalization is provided the
++               * default is simple. */
++              *body_canon = ARC_CANON_SIMPLE;
++      }
++      else
++      {
++              code = arc_name_to_code(canonicalizations, token);
  
-+      code = arc_name_to_code(canonicalizations, token);
-       if (code == -1)
-               return ARC_STAT_INVALID;
+-      *body_canon = (arc_canon_t) code;
++              if (code == -1)
++                      return ARC_STAT_INVALID;
++              *body_canon = (arc_canon_t) code;
++      }
  
-       *body_canon = (arc_canon_t) code;
+       return ARC_STAT_OK;
+ }