libksba: updated to 1.4.0

Noteworthy changes in version 1.4.0
-----------------------------------
 * Supports ECDSA and EdDSA certificate creation and parsing.
 * Supports ECDH enveloped data.
 * Supports ECDSA and EdDSA signed data.
 * Supports rsaPSS signature verification.
 * Supports standard file descriptors in ksba_reader_read.
 * New configure flag --disable-doc.
 * Improves supports for reproducible builds.
 * Allows for optional elements in keyinfo objects.
 * Updates the config and M4 scripts to the latest version.
 * Fixes error detection in the CMS parser.
 * Fixes memory leak in ksba_cms_identify.
 * Fixes build warnings on macOS.
 * Uses --disable-new-dtags if LD_LIBRARY_PATH is defined.
 * New constants KSBA_VERSION and KSBA_VERSION_NUMBER.
 * New API to make creation of DER objects easy.
 * Interface changes relative to the 1.3.5 release:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 KSBA_VERSION                     NEW.
 KSBA_VERSION_NUMBER              NEW.
 KSBA_CT_SPC_IND_DATA_CTX         NEW.
 KSBA_CLASS_*                     NEW.
 KSBA_TYPE_*                      NEW.
 ksba_der_t                       NEW.
 ksba_der_release                 NEW.
 ksba_der_builder_new             NEW.
 ksba_der_builder_reset           NEW.
 ksba_der_add_ptr                 NEW.
 ksba_der_add_val                 NEW.
 ksba_der_add_int                 NEW.
 ksba_der_add_oid                 NEW.
 ksba_der_add_bts                 NEW.
 ksba_der_add_der                 NEW.
 ksba_der_add_tag                 NEW.
 ksba_der_add_end                 NEW.
 ksba_der_builder_get             NEW.

5 files changed, 11 insertions, 91 deletions

diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index 6f2e1ab13c8..3c0d16cd374 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.34 2017/05/30 22:40:17 gdt Exp $
+# $NetBSD: Makefile,v 1.35 2020/08/03 15:30:06 adam Exp $
 
-DISTNAME=	libksba-1.3.5
-PKGREVISION=	1
+DISTNAME=	libksba-1.4.0
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libksba/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://www.gnupg.org/(fr)/related_software/libksba/index.html
+HOMEPAGE=	https://www.gnupg.org/related_software/libksba/index.html
 COMMENT=	X.509 library
 LICENSE=	gnu-lgpl-v3 AND gnu-gpl-v2
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
+PKGCONFIG_OVERRIDE=	src/ksba.pc.in
 INFO_FILES=		yes
 
 TEST_TARGET=		check
diff --git a/security/libksba/PLIST b/security/libksba/PLIST
index 98f5de6dc2f..1b5cfda1329 100644
--- a/security/libksba/PLIST
+++ b/security/libksba/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2006/03/31 23:56:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/08/03 15:30:06 adam Exp $
 bin/ksba-config
 include/ksba.h
 info/ksba.info
 lib/libksba.la
+lib/pkgconfig/ksba.pc
 share/aclocal/ksba.m4
diff --git a/security/libksba/distinfo b/security/libksba/distinfo
index fd723b1d6db..ae8804868e1 100644
--- a/security/libksba/distinfo
+++ b/security/libksba/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.22 2017/05/30 22:40:17 gdt Exp $
+$NetBSD: distinfo,v 1.23 2020/08/03 15:30:06 adam Exp $
 
-SHA1 (libksba-1.3.5.tar.bz2) = a98385734a0c3f5b713198e8d6e6e4aeb0b76fde
-RMD160 (libksba-1.3.5.tar.bz2) = ee7c752196ae89ce798007b076e8eb695d6c4ea9
-SHA512 (libksba-1.3.5.tar.bz2) = 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
-Size (libksba-1.3.5.tar.bz2) = 620649 bytes
+SHA1 (libksba-1.4.0.tar.bz2) = 3b524585ddd456c486a8134ba318a394e356f9a2
+RMD160 (libksba-1.4.0.tar.bz2) = ba9579c3ca9a4c5df8e7a0d5681150de2d790f81
+SHA512 (libksba-1.4.0.tar.bz2) = 7c1666017ebfa50b5663153dead1e019e0ee342c4f44ee8f644fc749e82dcc983237ef0f557de9de3f7908dc90405d967a4db2e36e04fe0d5a09edf49f8a0c8d
+Size (libksba-1.4.0.tar.bz2) = 651319 bytes
 SHA1 (patch-aa) = f2e63361afb95d5469153efaecebcb8719938d58
-SHA1 (patch-src_Makefile.in) = 484f6c02bc382b8c5647ce867f30bb2c4073580f
-SHA1 (patch-src_cms.c) = e98ae5b586e99bea440ac5fdad80549a0f8fface
diff --git a/security/libksba/patches/patch-src_Makefile.in b/security/libksba/patches/patch-src_Makefile.in
deleted file mode 100644
index 17aca98a704..00000000000
--- a/security/libksba/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2011/03/11 07:22:05 adam Exp $
-
-Pass CFLAGS and fix building e.g. with -isysroot on Mac OS X.
-
---- src/Makefile.in.orig	2011-03-11 06:59:44.000000000 +0000
-+++ src/Makefile.in
-@@ -862,7 +862,7 @@ uninstall-am: uninstall-binSCRIPTS unins
- asn1-parse.c : asn1-func.h gen-help.h
- 
- asn1-gentables: asn1-gentables.c asn1-parse.c asn1-func.c gen-help.c gen-help.h
--	$(CC_FOR_BUILD) -I$(srcdir) -DBUILD_GENTOOLS -o $@ \
-+	$(CC_FOR_BUILD) $(CFLAGS) -I$(srcdir) -DBUILD_GENTOOLS -o $@ \
- 		$(srcdir)/asn1-gentables.c \
-                 `test -f 'asn1-parse.c' || echo '$(srcdir)/'`asn1-parse.c  \
-                 $(srcdir)/asn1-func.c      \
diff --git a/security/libksba/patches/patch-src_cms.c b/security/libksba/patches/patch-src_cms.c
deleted file mode 100644
index 389568aeace..00000000000
--- a/security/libksba/patches/patch-src_cms.c
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-src_cms.c,v 1.1 2017/05/30 22:40:17 gdt Exp $
-
-Avoid dropping leading zeros in encoded session key.
-Patch by Daiki Ueno, taken from discussion on gnupg-devel:
-
-https://lists.gnupg.org/pipermail/gnupg-devel/2016-February/030825.html
-
-(Upstream has been asked to apply this patch, but so far has not.)
-
---- src/cms.c.orig	2013-03-15 19:26:38.000000000 +0000
-+++ src/cms.c
-@@ -87,6 +87,8 @@ static const char oid_signingTime[9] = "
- 
- static const char oidstr_smimeCapabilities[] = "1.2.840.113549.1.9.15";
- 
-+static const char oidstr_rsaEncryption[] = "1.2.840.113549.1.1.1";
-+
- 
- 
- /* Helper for read_and_hash_cont().  */
-@@ -1621,7 +1623,7 @@ ksba_cms_set_sig_val (ksba_cms_t cms, in
-     return gpg_error (GPG_ERR_ENOMEM);
-   if (n==3 && s[0] == 'r' && s[1] == 's' && s[2] == 'a')
-     { /* kludge to allow "rsa" to be passed as algorithm name */
--      sv->algo = xtrystrdup ("1.2.840.113549.1.1.1");
-+      sv->algo = xtrystrdup (oidstr_rsaEncryption);
-       if (!sv->algo)
-         {
-           xfree (sv);
-@@ -1674,9 +1676,10 @@ ksba_cms_set_sig_val (ksba_cms_t cms, in
-       return gpg_error (GPG_ERR_INV_SEXP);
-     }
- 
--  if (n > 1 && !*s)
-+  if (strcmp (sv->algo, oidstr_rsaEncryption) != 0 && n > 1 && !*s)
-     { /* We might have a leading zero due to the way we encode
--         MPIs - this zero should not go into the OCTECT STRING.  */
-+         MPIs - this zero should not go into the OCTECT STRING,
-+         unless it is explicitly allowed in the signature scheme.  */
-       s++;
-       n--;
-     }
-@@ -1798,7 +1801,7 @@ ksba_cms_set_enc_val (ksba_cms_t cms, in
-   xfree (cl->enc_val.algo);
-   if (n==3 && s[0] == 'r' && s[1] == 's' && s[2] == 'a')
-     { /* kludge to allow "rsa" to be passed as algorithm name */
--      cl->enc_val.algo = xtrystrdup ("1.2.840.113549.1.1.1");
-+      cl->enc_val.algo = xtrystrdup (oidstr_rsaEncryption);
-       if (!cl->enc_val.algo)
-         return gpg_error (GPG_ERR_ENOMEM);
-     }
-@@ -1831,9 +1834,10 @@ ksba_cms_set_enc_val (ksba_cms_t cms, in
-   if (!n || *s != ':')
-     return gpg_error (GPG_ERR_INV_SEXP);
-   s++;
--  if (n > 1 && !*s)
-+  if (strcmp (cl->enc_val.algo, oidstr_rsaEncryption) != 0 && n > 1 && !*s)
-     { /* We might have a leading zero due to the way we encode
--         MPIs - this zero should not go into the OCTECT STRING.  */
-+         MPIs - this zero should not go into the OCTECT STRING,
-+         unless it is explicitly allowed in the encryption scheme.  */
-       s++;
-       n--;
-     }