CVS commit: pkgsrc/textproc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc
From: "Nikita" <nikita%netbsd.org@localhost>
Date: Mon, 30 Jan 2023 19:38:06 +0000

Module Name:    pkgsrc
Committed By:   nikita
Date:           Mon Jan 30 19:38:06 UTC 2023

Modified Files:
        pkgsrc/textproc: Makefile
Added Files:
        pkgsrc/textproc/jose: DESCR Makefile PLIST buildlink3.mk distinfo
        pkgsrc/textproc/jose/patches: patch-lib_openssl_hmac.c

Log Message:
Import textproc/jose as jose version 11

Imported from wip/jose.

Library implementing the Javascript Object Signing and Encryption (JOSE).


To generate a diff of this commit:
cvs rdiff -u -r1.1363 -r1.1364 pkgsrc/textproc/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/jose/DESCR \
    pkgsrc/textproc/jose/Makefile pkgsrc/textproc/jose/PLIST \
    pkgsrc/textproc/jose/buildlink3.mk pkgsrc/textproc/jose/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/jose/patches/patch-lib_openssl_hmac.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/Makefile
diff -u pkgsrc/textproc/Makefile:1.1363 pkgsrc/textproc/Makefile:1.1364
--- pkgsrc/textproc/Makefile:1.1363     Mon Jan 30 03:53:36 2023
+++ pkgsrc/textproc/Makefile    Mon Jan 30 19:38:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1363 2023/01/30 03:53:36 pho Exp $
+# $NetBSD: Makefile,v 1.1364 2023/01/30 19:38:05 nikita Exp $
 #
 
 COMMENT=       Text processing utilities (does not include desktop publishing)
@@ -458,6 +458,7 @@ SUBDIR+=    jdom
 SUBDIR+=       jing
 SUBDIR+=       jless
 SUBDIR+=       jo
+SUBDIR+=       jose
 SUBDIR+=       jrep
 SUBDIR+=       json-c
 SUBDIR+=       json-glib

Added files:

Index: pkgsrc/textproc/jose/DESCR
diff -u /dev/null pkgsrc/textproc/jose/DESCR:1.1
--- /dev/null   Mon Jan 30 19:38:06 2023
+++ pkgsrc/textproc/jose/DESCR  Mon Jan 30 19:38:06 2023
@@ -0,0 +1 @@
+Library implementing the Javascript Object Signing and Encryption (JOSE).
Index: pkgsrc/textproc/jose/Makefile
diff -u /dev/null pkgsrc/textproc/jose/Makefile:1.1
--- /dev/null   Mon Jan 30 19:38:06 2023
+++ pkgsrc/textproc/jose/Makefile       Mon Jan 30 19:38:06 2023
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2023/01/30 19:38:06 nikita Exp $
+
+DISTNAME=      jose-11
+CATEGORIES=    textproc
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=latchset/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/latchset/jose/
+COMMENT=       C implementation of JOSE
+LICENSE=       apache-2.0
+
+USE_TOOLS+=    pkg-config cmake
+
+BUILD_DEPENDS+=        ninja-build-[0-9]*:../../devel/ninja-build
+BUILD_DEPENDS+=        asciidoc-[0-9]*:../../textproc/asciidoc
+
+post-install:
+       ${RM} -rf ${DESTDIR}/usr/pkg/share/licenses/jose
+
+.include "../../devel/meson/build.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/jose/PLIST
diff -u /dev/null pkgsrc/textproc/jose/PLIST:1.1
--- /dev/null   Mon Jan 30 19:38:06 2023
+++ pkgsrc/textproc/jose/PLIST  Mon Jan 30 19:38:06 2023
@@ -0,0 +1,38 @@
+@comment $NetBSD: PLIST,v 1.1 2023/01/30 19:38:06 nikita Exp $
+bin/jose
+include/jose/b64.h
+include/jose/cfg.h
+include/jose/io.h
+include/jose/jose.h
+include/jose/jwe.h
+include/jose/jwk.h
+include/jose/jws.h
+include/jose/openssl.h
+lib/libjose.so
+lib/libjose.so.0
+lib/libjose.so.0.0.0
+lib/pkgconfig/jose.pc
+man/man1/jose-alg.1
+man/man1/jose-b64-dec.1
+man/man1/jose-b64-enc.1
+man/man1/jose-fmt.1
+man/man1/jose-jwe-dec.1
+man/man1/jose-jwe-enc.1
+man/man1/jose-jwe-fmt.1
+man/man1/jose-jwk-eql.1
+man/man1/jose-jwk-exc.1
+man/man1/jose-jwk-gen.1
+man/man1/jose-jwk-pub.1
+man/man1/jose-jwk-thp.1
+man/man1/jose-jwk-use.1
+man/man1/jose-jws-fmt.1
+man/man1/jose-jws-sig.1
+man/man1/jose-jws-ver.1
+man/man1/jose.1
+man/man3/jose_b64.3
+man/man3/jose_cfg.3
+man/man3/jose_io.3
+man/man3/jose_io_t.3
+man/man3/jose_jwe.3
+man/man3/jose_jwk.3
+man/man3/jose_jws.3
Index: pkgsrc/textproc/jose/buildlink3.mk
diff -u /dev/null pkgsrc/textproc/jose/buildlink3.mk:1.1
--- /dev/null   Mon Jan 30 19:38:06 2023
+++ pkgsrc/textproc/jose/buildlink3.mk  Mon Jan 30 19:38:06 2023
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2023/01/30 19:38:06 nikita Exp $
+
+BUILDLINK_TREE+=       jose
+
+.if !defined(JOSE_BUILDLINK3_MK)
+JOSE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.jose+=   jose>=11
+BUILDLINK_ABI_DEPENDS.jose+=   jose>=11
+BUILDLINK_PKGSRCDIR.jose?=     ../../textproc/jose
+
+.include "../../textproc/jansson/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.endif # JOSE_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -jose
Index: pkgsrc/textproc/jose/distinfo
diff -u /dev/null pkgsrc/textproc/jose/distinfo:1.1
--- /dev/null   Mon Jan 30 19:38:06 2023
+++ pkgsrc/textproc/jose/distinfo       Mon Jan 30 19:38:06 2023
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2023/01/30 19:38:06 nikita Exp $
+
+BLAKE2s (jose-11.tar.gz) = c6762bd2eabd26c513b2fdd1a31739c348acfdaffbdd7e11e785dceb0b4b687a
+SHA512 (jose-11.tar.gz) = ffe09000837f79cefa549734d13c5d5d51042a42a055867241777ccbff3a127bac86a6155638fdf5ee52aad3598829e19724fd4e7de541117ed9b1c77c2ce457
+Size (jose-11.tar.gz) = 841374 bytes
+SHA1 (patch-lib_openssl_hmac.c) = 09cc79373b7881c01abf06b367e3ec96c3042c65

Index: pkgsrc/textproc/jose/patches/patch-lib_openssl_hmac.c
diff -u /dev/null pkgsrc/textproc/jose/patches/patch-lib_openssl_hmac.c:1.1
--- /dev/null   Mon Jan 30 19:38:06 2023
+++ pkgsrc/textproc/jose/patches/patch-lib_openssl_hmac.c       Mon Jan 30 19:38:06 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-lib_openssl_hmac.c,v 1.1 2023/01/30 19:38:06 nikita Exp $
+
+The function hmac in hmac.c conflicts with hmac from stdlib on NetBSD.
+
+--- lib/openssl/hmac.c.orig    2022-06-20 21:21:38.997255017 +0200
++++ lib/openssl/hmac.c 2022-06-20 21:22:08.635313366 +0200
+@@ -95,7 +95,7 @@
+ }
+ 
+ static HMAC_CTX *
+-hmac(const jose_hook_alg_t *alg, jose_cfg_t *cfg,
++jhmac(const jose_hook_alg_t *alg, jose_cfg_t *cfg,
+      const json_t *sig, const json_t *jwk)
+ {
+     uint8_t key[KEYMAX] = {};
+@@ -251,7 +251,7 @@
+ 
+     i->obj = json_incref(jws);
+     i->sig = json_incref(sig);
+-    i->hctx = hmac(alg, cfg, sig, jwk);
++    i->hctx = jhmac(alg, cfg, sig, jwk);
+     if (!i->obj || !i->sig || !i->hctx)
+         return NULL;
+ 
+@@ -275,7 +275,7 @@
+     io->free = io_free;
+ 
+     i->sig = json_incref((json_t *) sig);
+-    i->hctx = hmac(alg, cfg, sig, jwk);
++    i->hctx = jhmac(alg, cfg, sig, jwk);
+     if (!i->sig || !i->hctx)
+         return NULL;
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index