Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AA3A284EAE for ; Sat, 26 Aug 2023 14:57:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id KYNx5eTi5qb0 for ; Sat, 26 Aug 2023 14:57:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id F27A684E55 for ; Sat, 26 Aug 2023 14:57:22 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EA3C7FBDB; Sat, 26 Aug 2023 14:57:22 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1693061842164700" MIME-Version: 1.0 Date: Sat, 26 Aug 2023 14:57:22 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2023Q2] pkgsrc/textproc/cjose To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20230826145722.EA3C7FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1693061842164700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Sat Aug 26 14:57:22 UTC 2023 Modified Files: pkgsrc/textproc/cjose [pkgsrc-2023Q2]: Makefile distinfo Added Files: pkgsrc/textproc/cjose/patches [pkgsrc-2023Q2]: patch-src_concatkdf.c Log Message: Pullup ticket #6794 - requested by bouyer textproc/cjose: build fix for OpenSSL 3 Revisions pulled up: - textproc/cjose/Makefile 1.4-1.5 - textproc/cjose/distinfo 1.4-1.5 - textproc/cjose/patches/patch-src_concatkdf.c 1.1-1.2 --- Module Name: pkgsrc Committed By: bouyer Date: Tue Aug 22 10:45:03 UTC 2023 Added Files: pkgsrc/textproc/cjose/patches: patch-src_concatkdf.c Log Message: Switch from unmaintained github repo cisco/cjose/ to OpenIDC/cjose/ and update to 0.6.2.2, fixing build on netbsd-10 (and probably HEAD) after openssl upgrade. Changes are mostly build and bug fixes; support for newer openssl version and ciphers. --- Module Name: pkgsrc Committed By: bouyer Date: Tue Aug 22 10:50:00 UTC 2023 Modified Files: pkgsrc/textproc/cjose: Makefile distinfo Log Message: Switch from unmaintained github repo cisco/cjose/ to OpenIDC/cjose/ and update to 0.6.2.2, fixing build on netbsd-10 (and probably HEAD) after openssl upgrade. Changes are mostly build and bug fixes; support for newer openssl version and ciphers. --- Module Name: pkgsrc Committed By: wiz Date: Tue Aug 22 11:50:03 UTC 2023 Modified Files: pkgsrc/textproc/cjose: Makefile distinfo pkgsrc/textproc/cjose/patches: patch-src_concatkdf.c Log Message: cjose: clean up To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.28.1 pkgsrc/textproc/cjose/Makefile cvs rdiff -u -r1.3 -r1.3.14.1 pkgsrc/textproc/cjose/distinfo cvs rdiff -u -r0 -r1.2.2.2 \ 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. --_----------=_1693061842164700 Content-Disposition: inline Content-Length: 2451 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/cjose/Makefile diff -u pkgsrc/textproc/cjose/Makefile:1.3 pkgsrc/textproc/cjose/Makefile:1.3.28.1 --- pkgsrc/textproc/cjose/Makefile:1.3 Sat Jan 18 21:48:26 2020 +++ pkgsrc/textproc/cjose/Makefile Sat Aug 26 14:57:22 2023 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2020/01/18 21:48:26 jperkin Exp $ +# $NetBSD: Makefile,v 1.3.28.1 2023/08/26 14:57:22 bsiegert Exp $ -DISTNAME= cjose-0.6.1 -PKGREVISION= 1 +DISTNAME= cjose-0.6.2.2 CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_GITHUB:=cisco/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenIDC/} +GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/cisco/cjose/ Index: pkgsrc/textproc/cjose/distinfo diff -u pkgsrc/textproc/cjose/distinfo:1.3 pkgsrc/textproc/cjose/distinfo:1.3.14.1 --- pkgsrc/textproc/cjose/distinfo:1.3 Tue Oct 26 11:21:47 2021 +++ pkgsrc/textproc/cjose/distinfo Sat Aug 26 14:57:22 2023 @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.3 2021/10/26 11:21:47 nia Exp $ +$NetBSD: distinfo,v 1.3.14.1 2023/08/26 14:57:22 bsiegert Exp $ -BLAKE2s (cjose-0.6.1.tar.gz) = 84b0ecf6349b5c38f90b4bb4017b7e13508b5e30a51869877d08b964d31b0e85 -SHA512 (cjose-0.6.1.tar.gz) = 7ae67a6d19591b3d19b888270ec0ca17df399bea117e42686fc1de39b3741ed9a8816f96d33d090687c49c3123cdc95430a781835a525a02d22561ebf5aaa653 -Size (cjose-0.6.1.tar.gz) = 1586963 bytes +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 Added files: Index: pkgsrc/textproc/cjose/patches/patch-src_concatkdf.c diff -u /dev/null pkgsrc/textproc/cjose/patches/patch-src_concatkdf.c:1.2.2.2 --- /dev/null Sat Aug 26 14:57:22 2023 +++ pkgsrc/textproc/cjose/patches/patch-src_concatkdf.c Sat Aug 26 14:57:22 2023 @@ -0,0 +1,19 @@ +$NetBSD$ + +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 + #else + #include ++#ifdef __NetBSD__ ++#include ++#else + #include + #endif ++#endif + #include + #include + #include --_----------=_1693061842164700--