CVS commit: pkgsrc/mail/openarc

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

Module Name:    pkgsrc
Committed By:   manu
Date:           Tue Nov 18 14:02:20 UTC 2025

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

Log Message:
Fix crash on invalid input

>From upstream https://github.com/trusteddomainproject/OpenARC/pull/191


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/openarc/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/openarc/distinfo
cvs rdiff -u -r0 -r1.1 \
    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.6 pkgsrc/mail/openarc/Makefile:1.7
--- pkgsrc/mail/openarc/Makefile:1.6    Sun Aug 24 22:10:25 2025
+++ pkgsrc/mail/openarc/Makefile        Tue Nov 18 14:02:20 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2025/08/24 22:10:25 taca Exp $
+# $NetBSD: Makefile,v 1.7 2025/11/18 14:02:20 manu Exp $
 
 DISTNAME=      openarc-20180921
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=trusteddomainproject/}
 GITHUB_PROJECT=        OpenARC

Index: pkgsrc/mail/openarc/distinfo
diff -u pkgsrc/mail/openarc/distinfo:1.3 pkgsrc/mail/openarc/distinfo:1.4
--- pkgsrc/mail/openarc/distinfo:1.3    Mon Jun 16 16:17:05 2025
+++ pkgsrc/mail/openarc/distinfo        Tue Nov 18 14:02:20 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2025/06/16 16:17:05 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2025/11/18 14:02:20 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.c) = 2dc1206ce9cf0ba9f85710ce3342c05efbf89dc1

Added files:

Index: pkgsrc/mail/openarc/patches/patch-libopenarc_arc-canon.c
diff -u /dev/null pkgsrc/mail/openarc/patches/patch-libopenarc_arc-canon.c:1.1
--- /dev/null   Tue Nov 18 14:02:20 2025
+++ pkgsrc/mail/openarc/patches/patch-libopenarc_arc-canon.c    Tue Nov 18 14:02:20 2025
@@ -0,0 +1,31 @@
+$NetBSD: patch-libopenarc_arc-canon.c,v 1.1 2025/11/18 14:02:20 manu Exp $
+
+Cope with badly formed input
+
+--- 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;
+ 
+       *hdr_canon = (arc_canon_t) code;
+ 
+       token = strtok_r(NULL, "/", &last);
+-      code = arc_name_to_code(canonicalizations, token);
++      if (token == NULL)
++              return ARC_STAT_INVALID;
+ 
++      code = arc_name_to_code(canonicalizations, token);
+       if (code == -1)
+               return ARC_STAT_INVALID;
+ 
+       *body_canon = (arc_canon_t) code;