xmlsec1: Update to 1.2.33

Changelog:
Not available in summary form.

5 files changed, 30 insertions, 73 deletions

diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index 91f0ace22da..9e956c56e0a 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2021/12/08 16:02:36 adam Exp $
+# $NetBSD: Makefile,v 1.39 2022/03/04 13:55:13 ryoon Exp $
 #
 
-DISTNAME=		xmlsec1-1.2.25
-PKGREVISION=		5
+DISTNAME=		xmlsec1-1.2.33
 CATEGORIES=		security
 MASTER_SITES=		https://www.aleksey.com/xmlsec/download/
 
@@ -16,11 +15,11 @@ USE_TOOLS+=		pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/xmlsec-gcrypt.pc.in
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/xmlsec-gnutls.pc.in
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/xmlsec-nss.pc.in
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/xmlsec-openssl.pc.in
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/xmlsec.pc.in
+PKGCONFIG_OVERRIDE+=	xmlsec-gcrypt.pc.in
+PKGCONFIG_OVERRIDE+=	xmlsec-gnutls.pc.in
+PKGCONFIG_OVERRIDE+=	xmlsec-nss.pc.in
+PKGCONFIG_OVERRIDE+=	xmlsec-openssl.pc.in
+PKGCONFIG_OVERRIDE+=	xmlsec.pc.in
 
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--without-gnutls
diff --git a/security/xmlsec1/PLIST b/security/xmlsec1/PLIST
index 00a54f686f0..5ac023d9d85 100644
--- a/security/xmlsec1/PLIST
+++ b/security/xmlsec1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2018/01/30 13:25:19 mef Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/03/04 13:55:13 ryoon Exp $
 bin/xmlsec1
 bin/xmlsec1-config
 include/xmlsec1/xmlsec/app.h
@@ -28,7 +28,6 @@ include/xmlsec1/xmlsec/openssl/symbols.h
 include/xmlsec1/xmlsec/openssl/x509.h
 include/xmlsec1/xmlsec/parser.h
 include/xmlsec1/xmlsec/private.h
-include/xmlsec1/xmlsec/private/xslt.h
 include/xmlsec1/xmlsec/strings.h
 include/xmlsec1/xmlsec/templates.h
 include/xmlsec1/xmlsec/transforms.h
@@ -97,6 +96,12 @@ share/doc/xmlsec1/api/xmlsec-keysdata.html
 share/doc/xmlsec1/api/xmlsec-keysmngr.html
 share/doc/xmlsec1/api/xmlsec-list.html
 share/doc/xmlsec1/api/xmlsec-membuf.html
+share/doc/xmlsec1/api/xmlsec-msccng-ref.html
+share/doc/xmlsec1/api/xmlsec-mscng-app.html
+share/doc/xmlsec1/api/xmlsec-mscng-certkeys.html
+share/doc/xmlsec1/api/xmlsec-mscng-crypto.html
+share/doc/xmlsec1/api/xmlsec-mscng-keysstore.html
+share/doc/xmlsec1/api/xmlsec-mscng-x509.html
 share/doc/xmlsec1/api/xmlsec-mscrypto-app.html
 share/doc/xmlsec1/api/xmlsec-mscrypto-certkeys.html
 share/doc/xmlsec1/api/xmlsec-mscrypto-crypto.html
diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo
index fbb92e08ff9..15a1fe4b1e0 100644
--- a/security/xmlsec1/distinfo
+++ b/security/xmlsec1/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2021/10/26 11:18:06 nia Exp $
+$NetBSD: distinfo,v 1.21 2022/03/04 13:55:13 ryoon Exp $
 
-BLAKE2s (xmlsec1-1.2.25.tar.gz) = 311751d83c9ab25456a52a82979d69d94119fdc5e70a11e12a0ffc5a8cd050cb
-SHA512 (xmlsec1-1.2.25.tar.gz) = ac61547a1cbf9016d7f75be3dc5249d6bc8a526bc51715e53ede13f056c1c72c57433a6be200c886000a25826c3e473954ded3ae988f25d37ac4ef4d777c66a6
-Size (xmlsec1-1.2.25.tar.gz) = 1839160 bytes
-SHA1 (patch-ab) = 917f2ffa1968994e6cc23e797c2d03e3ccbe3a81
-SHA1 (patch-ac) = eac6b9be709e316ea635109a0c366546a83cb1f6
+BLAKE2s (xmlsec1-1.2.33.tar.gz) = 1257ba28b777cd23b4e30dab85739ffb0e1e221169526ad82f3eae8a1c0c1043
+SHA512 (xmlsec1-1.2.33.tar.gz) = 6354554b5cdc0a1389f6991efeac919bea912330b36d3be3d3496d61331e9edd2771786d50d2571a439f62ccfc3bd32be0a50bb5a037c4993aac076ad94b46e8
+Size (xmlsec1-1.2.33.tar.gz) = 1991955 bytes
+SHA1 (patch-ab) = bf40dafa893b5d6d73bdd2af5c8c4d1d1143e061
+SHA1 (patch-ac) = db0e4e2f38358fc2e347f0117899f127c94861a7
diff --git a/security/xmlsec1/patches/patch-ab b/security/xmlsec1/patches/patch-ab
index 85ad71f7c6c..f8181aa3836 100644
--- a/security/xmlsec1/patches/patch-ab
+++ b/security/xmlsec1/patches/patch-ab
@@ -1,11 +1,10 @@
-$NetBSD: patch-ab,v 1.8 2018/01/30 13:25:19 mef Exp $
+$NetBSD: patch-ab,v 1.9 2022/03/04 13:55:13 ryoon Exp $
 
-* portability fix
-* DragonFly also not require extra libs for OpenSSL.
+* Fix macOS shared library logic.
 
---- configure.orig	2017-09-12 22:21:59.000000000 +0900
-+++ configure	2018-01-30 22:12:07.735855706 +0900
-@@ -11373,7 +11373,7 @@ darwin* | rhapsody*)
+--- configure.orig	2021-10-25 13:06:17.000000000 +0000
++++ configure
+@@ -11415,7 +11415,7 @@ darwin* | rhapsody*)
    soname_spec='$libname$release$major$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -14,49 +13,3 @@ $NetBSD: patch-ab,v 1.8 2018/01/30 13:25:19 mef Exp $
  
    sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
    sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-@@ -12661,7 +12661,7 @@ CC=$lt_save_CC
- 
- 
- 
--if test "z$RM" == "z" ; then
-+if test "z$RM" = "z" ; then
-     # Extract the first word of "rm", so it can be a program name with args.
- set dummy rm; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -13648,7 +13648,7 @@ case "${host}" in
-         ;;
- esac
- 
--if test "z$shrext" == "z" ; then
-+if test "z$shrext" = "z" ; then
-     shrext=$shrext_cmds
- fi
- 
-@@ -14384,15 +14384,13 @@ elif test "z$with_openssl" != "z" ; then
- 	*-*-osf5*) openssl_exlibs=;;
- 	*-*-openbsd*) openssl_exlibs=;;
- 	*-*-netbsd*) openssl_exlibs=;;
-+	*-*-freebsd*|*-*-dragonfly*) openssl_exlibs=;;
-+	*-*-darwin*) openssl_exlibs=;;
- 	#FIXME: check if lib "dl" is required
- 	*)          openssl_exlibs=-ldl;;
-     esac
-     OPENSSL_CFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include"
--    if test -f "$with_openssl/lib/libcrypto${XMLSEC_SHLIBSFX}" ; then
--	OPENSSL_LIBS="-L$with_openssl/lib -lcrypto $openssl_exlibs"
--    else
--	OPENSSL_LIBS="$with_openssl/lib/libcrypto.a $openssl_exlibs"
--    fi
-+    OPENSSL_LIBS="-L$with_openssl/lib -lcrypto $openssl_exlibs"
-     OPENSSL_FOUND="yes"
- elif test "z$PKGCONFIG_FOUND" = "zyes" ; then
-     if test "z$OPENSSL_VERSION" = "z" ; then
-@@ -14754,7 +14752,7 @@ else
-     XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST openssl"
- fi
- 
-- if test "z$XMLSEC_NO_OPENSSL" == "z1"; then
-+ if test "z$XMLSEC_NO_OPENSSL" = "z1"; then
-   XMLSEC_NO_OPENSSL_TRUE=
-   XMLSEC_NO_OPENSSL_FALSE='#'
- else
diff --git a/security/xmlsec1/patches/patch-ac b/security/xmlsec1/patches/patch-ac
index 7d19bcff527..fdbc696cfaa 100644
--- a/security/xmlsec1/patches/patch-ac
+++ b/security/xmlsec1/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2014/04/03 17:00:44 drochner Exp $
+$NetBSD: patch-ac,v 1.6 2022/03/04 13:55:13 ryoon Exp $
 
 portability
 
---- tests/testrun.sh.orig	2014-04-03 16:19:41.000000000 +0000
+--- tests/testrun.sh.orig	2021-10-25 13:05:43.000000000 +0000
 +++ tests/testrun.sh
 @@ -1,7 +1,7 @@
  #!/bin/sh
@@ -14,12 +14,12 @@ portability
  
  #
  # Get command line params
-@@ -436,7 +436,7 @@ execXkmsServerRequestTest() {
+@@ -472,7 +472,7 @@ execEncTest() {
  rm -rf $tmpfile $tmpfile.2 tmpfile.3
  
  # run tests
 -source "$testfile"
 +. "$testfile"
  
- # cleanup
- rm -rf $tmpfile $tmpfile.2 tmpfile.3
+ # print results
+ echo "--- TOTAL OK: $count_success; TOTAL FAILED: $count_fail; TOTAL SKIPPED: $count_skip" >> $logfile