CVS commit: pkgsrc/textproc/cjose

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Nov 12 16:50:10 UTC 2023

Modified Files:
        pkgsrc/textproc/cjose: distinfo
Added Files:
        pkgsrc/textproc/cjose/patches: patch-concatkdf.c
Removed Files:
        pkgsrc/textproc/cjose/patches: patch-src_concatkdf.c

Log Message:
textproc/cjose: fix CVS keyword expansion in patch file


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/cjose/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/cjose/patches/patch-concatkdf.c
cvs rdiff -u -r1.2 -r0 pkgsrc/textproc/cjose/patches/patch-src_concatkdf.c

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

Modified files:

Index: pkgsrc/textproc/cjose/distinfo
diff -u pkgsrc/textproc/cjose/distinfo:1.5 pkgsrc/textproc/cjose/distinfo:1.6
--- pkgsrc/textproc/cjose/distinfo:1.5  Tue Aug 22 11:50:02 2023
+++ pkgsrc/textproc/cjose/distinfo      Sun Nov 12 16:50:10 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2023/08/22 11:50:02 wiz Exp $
+$NetBSD: distinfo,v 1.6 2023/11/12 16:50:10 rillig Exp $
 
 BLAKE2s (cjose-0.6.2.2.tar.gz) = 08f6e34b02ffe9dace8413c131db10a9e074900c684d2c44f8216beb532c30f5
 SHA512 (cjose-0.6.2.2.tar.gz) = 71a087709816f0aac060a7c5f037068e981366b1809f6ee32e39eaded02ad8be061b0e2fa5093515a8acec10c7f4aca232281004426221b4b7e5edbd203eb49c
 Size (cjose-0.6.2.2.tar.gz) = 498461 bytes
-SHA1 (patch-src_concatkdf.c) = 730001ddc2c0020f560fd8235b076cc262856edb
+SHA1 (patch-concatkdf.c) = 730001ddc2c0020f560fd8235b076cc262856edb

Added files:

Index: pkgsrc/textproc/cjose/patches/patch-concatkdf.c
diff -u /dev/null pkgsrc/textproc/cjose/patches/patch-concatkdf.c:1.1
--- /dev/null   Sun Nov 12 16:50:10 2023
+++ pkgsrc/textproc/cjose/patches/patch-concatkdf.c     Sun Nov 12 16:50:10 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-concatkdf.c,v 1.1 2023/11/12 16:50:10 rillig Exp $
+
+Fix build on NetBSD.
+
+--- src/concatkdf.c.orig       2023-08-22 12:18:03.202602223 +0200
++++ src/concatkdf.c    2023-08-22 12:17:49.008381386 +0200
+@@ -12,8 +12,12 @@
+ #include <malloc.h>
+ #else
+ #include <arpa/inet.h>
++#ifdef __NetBSD__
++#include <stdlib.h>
++#else
+ #include <alloca.h>
+ #endif
++#endif
+ #include <openssl/evp.h>
+ #include <string.h>
+ #include <cjose/base64.h>