security/gsasl: Update to 2.0.0

Changes:	https://gitlab.com/gsasl/gsasl/-/blob/master/NEWS

9 files changed, 73 insertions, 76 deletions

diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 6ce3b8982b0d..6f73c49d57f4 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -1,7 +1,7 @@
 # Created by: ijliao
 
 PORTNAME=	gsasl
-PORTVERSION=	1.10.0
+PORTVERSION=	2.0.0
 CATEGORIES=	security
 MASTER_SITES=	GNU
 
@@ -23,11 +23,15 @@ INFO=		gsasl
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
+DOCS_USES=		makeinfo
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
+post-build-DOCS-on:
+	cd ${WRKSRC}/doc && ${MAKE_CMD} gsasl.html
+
 post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/gsasl.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/gsasl/distinfo b/security/gsasl/distinfo
index c6a2c9fdbfd7..dda3b367b0af 100644
--- a/security/gsasl/distinfo
+++ b/security/gsasl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609953867
-SHA256 (gsasl-1.10.0.tar.gz) = 85bcbd8ee6095ade7870263a28ebcb8832f541ea7393975494926015c07568d3
-SIZE (gsasl-1.10.0.tar.gz) = 5946076
+TIMESTAMP = 1655829818
+SHA256 (gsasl-2.0.0.tar.gz) = c5a8ae625d06fcada29c4aa89747012e90b24b0c02d7c81d338784066070026e
+SIZE (gsasl-2.0.0.tar.gz) = 3274625
diff --git a/security/gsasl/files/patch-Makefile.in b/security/gsasl/files/patch-Makefile.in
index 1bfb1756bf12..30a7bb8158e9 100644
--- a/security/gsasl/files/patch-Makefile.in
+++ b/security/gsasl/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2021-01-01 16:32:52 UTC
+--- Makefile.in.orig	2022-06-20 15:57:22 UTC
 +++ Makefile.in
-@@ -1580,7 +1580,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
+@@ -1855,7 +1855,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-gssapi-impl=no
+ ACLOCAL_AMFLAGS = -I m4 -I lib/m4
 -SUBDIRS = lib po gl src examples tests doc gltests
 +SUBDIRS = po gl src examples tests doc gltests # lib
- EXTRA_DIST = cfg.mk maint.mk .clcopying
- ACLOCAL_AMFLAGS = -I m4
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-obsolete --with-gssapi-impl=no
+ 
+ # git-version-gen
+ EXTRA_DIST = cfg.mk maint.mk build-aux/git2cl m4/gnulib-cache.m4 \
diff --git a/security/gsasl/files/patch-doc-Makefile.in b/security/gsasl/files/patch-doc-Makefile.in
index 4c552fcd0787..95f71c00b060 100644
--- a/security/gsasl/files/patch-doc-Makefile.in
+++ b/security/gsasl/files/patch-doc-Makefile.in
@@ -1,27 +1,25 @@
---- doc/Makefile.in.orig	2021-01-01 16:35:59 UTC
+--- doc/Makefile.in.orig	2022-06-20 15:56:39 UTC
 +++ doc/Makefile.in
-@@ -219,7 +219,7 @@ CONFIG_CLEAN_VPATH_FILES =
+@@ -223,7 +223,7 @@ CONFIG_CLEAN_VPATH_FILES =
  PROGRAMS = $(noinst_PROGRAMS)
  print_errors_SOURCES = print-errors.c
  print_errors_OBJECTS = print-errors.$(OBJEXT)
 -print_errors_DEPENDENCIES = ../lib/src/libgsasl.la
-+print_errors_DEPENDENCIES = 
++print_errors_DEPENDENCIES =
  AM_V_lt = $(am__v_lt_@AM_V@)
  am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
-@@ -1673,7 +1673,7 @@ gsasl_TEXINFOS = fdl-1.3.texi $(gdoc_TEXINFOS) \
+@@ -1941,13 +1941,13 @@ gsasl_TEXINFOS = fdl-1.3.texi $(gdoc_TEXINFOS) \
  	gsasl-api-error-labels.texi
  
- AM_CPPFLAGS = -I$(top_srcdir)/lib/src
+ AM_CPPFLAGS = -I$(top_builddir)/lib/src -I$(top_srcdir)/lib/src
 -print_errors_LDADD = ../lib/src/libgsasl.la
 +print_errors_LDADD = -lgsasl
- AM_MAKEINFOFLAGS = -I $(top_srcdir)/doc \
- 	-I $(top_builddir)/doc -I $(top_srcdir)/examples
- 
-@@ -1681,7 +1681,7 @@ TEXI2DVI = texi2dvi $(AM_MAKEINFOFLAGS)
- AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) \
- 	--no-split --number-sections --css-include=texinfo.css
+ AM_MAKEINFOFLAGS = -I $(top_srcdir)/examples \
+ 	-I $(top_srcdir)/doc -I $(top_builddir)/doc
  
+ TEXI2DVI = texi2dvi $(AM_MAKEINFOFLAGS)
+ AM_MAKEINFOHTMLFLAGS = --no-split $(AM_MAKEINFOFLAGS)
 -dist_man_MANS = gsasl.1 $(gdoc_MANS)
 +dist_man_MANS = gsasl.1
  MAINTAINERCLEANFILES = $(dist_man_MANS)
diff --git a/security/gsasl/files/patch-examples-Makefile.in b/security/gsasl/files/patch-examples-Makefile.in
index 6e9b8efc20ea..ae48e55b775e 100644
--- a/security/gsasl/files/patch-examples-Makefile.in
+++ b/security/gsasl/files/patch-examples-Makefile.in
@@ -1,59 +1,70 @@
---- examples/Makefile.in.orig	2021-01-01 16:32:53 UTC
+--- examples/Makefile.in.orig	2022-06-20 15:55:14 UTC
 +++ examples/Makefile.in
-@@ -223,7 +223,7 @@ PROGRAMS = $(noinst_PROGRAMS)
+@@ -227,8 +227,8 @@ PROGRAMS = $(noinst_PROGRAMS)
  client_SOURCES = client.c
  client_OBJECTS = client.$(OBJEXT)
  client_LDADD = $(LDADD)
 -client_DEPENDENCIES = $(top_builddir)/lib/src/libgsasl.la \
+-	$(top_builddir)/lib/gl/liblgl.la $(top_builddir)/gl/libgl.la
 +client_DEPENDENCIES = \
- 	$(top_builddir)/gl/libgl.la
++	$(top_builddir)/gl/libgl.la
  AM_V_lt = $(am__v_lt_@AM_V@)
  am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-@@ -232,32 +232,32 @@ am__v_lt_1 = 
+ am__v_lt_0 = --silent
+@@ -236,33 +236,33 @@ am__v_lt_1 = 
  client_callback_SOURCES = client-callback.c
  client_callback_OBJECTS = client-callback.$(OBJEXT)
  client_callback_LDADD = $(LDADD)
 -client_callback_DEPENDENCIES = $(top_builddir)/lib/src/libgsasl.la \
+-	$(top_builddir)/lib/gl/liblgl.la $(top_builddir)/gl/libgl.la
 +client_callback_DEPENDENCIES = \
- 	$(top_builddir)/gl/libgl.la
++	$(top_builddir)/gl/libgl.la
  client_mech_SOURCES = client-mech.c
  client_mech_OBJECTS = client-mech.$(OBJEXT)
  client_mech_LDADD = $(LDADD)
 -client_mech_DEPENDENCIES = $(top_builddir)/lib/src/libgsasl.la \
+-	$(top_builddir)/lib/gl/liblgl.la $(top_builddir)/gl/libgl.la
 +client_mech_DEPENDENCIES = \
- 	$(top_builddir)/gl/libgl.la
++	$(top_builddir)/gl/libgl.la
  client_serverfirst_SOURCES = client-serverfirst.c
  client_serverfirst_OBJECTS = client-serverfirst.$(OBJEXT)
  client_serverfirst_LDADD = $(LDADD)
 -client_serverfirst_DEPENDENCIES = $(top_builddir)/lib/src/libgsasl.la \
+-	$(top_builddir)/lib/gl/liblgl.la $(top_builddir)/gl/libgl.la
 +client_serverfirst_DEPENDENCIES = \
- 	$(top_builddir)/gl/libgl.la
++	$(top_builddir)/gl/libgl.la
  client_xmpp_saml20_SOURCES = client-xmpp-saml20.c
  client_xmpp_saml20_OBJECTS = client-xmpp-saml20.$(OBJEXT)
  client_xmpp_saml20_LDADD = $(LDADD)
 -client_xmpp_saml20_DEPENDENCIES = $(top_builddir)/lib/src/libgsasl.la \
+-	$(top_builddir)/lib/gl/liblgl.la $(top_builddir)/gl/libgl.la
 +client_xmpp_saml20_DEPENDENCIES = \
- 	$(top_builddir)/gl/libgl.la
++	$(top_builddir)/gl/libgl.la
  server_xmpp_saml20_SOURCES = server-xmpp-saml20.c
  server_xmpp_saml20_OBJECTS = server-xmpp-saml20.$(OBJEXT)
  server_xmpp_saml20_LDADD = $(LDADD)
 -server_xmpp_saml20_DEPENDENCIES = $(top_builddir)/lib/src/libgsasl.la \
+-	$(top_builddir)/lib/gl/liblgl.la $(top_builddir)/gl/libgl.la
 +server_xmpp_saml20_DEPENDENCIES = \
- 	$(top_builddir)/gl/libgl.la
++	$(top_builddir)/gl/libgl.la
  smtp_server_SOURCES = smtp-server.c
  smtp_server_OBJECTS = smtp-server.$(OBJEXT)
  smtp_server_LDADD = $(LDADD)
 -smtp_server_DEPENDENCIES = $(top_builddir)/lib/src/libgsasl.la \
+-	$(top_builddir)/lib/gl/liblgl.la $(top_builddir)/gl/libgl.la
 +smtp_server_DEPENDENCIES = \
- 	$(top_builddir)/gl/libgl.la
++	$(top_builddir)/gl/libgl.la
  AM_V_P = $(am__v_P_@AM_V@)
  am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-@@ -1626,7 +1626,7 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) $(WEASY_CF
+ am__v_P_0 = false
+@@ -1901,8 +1901,8 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) $(WEASY_CF
  AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl \
  	-I$(top_srcdir)/lib/src -I$(top_builddir)/lib/src
  
--LDADD = $(top_builddir)/lib/src/libgsasl.la $(top_builddir)/gl/libgl.la
-+LDADD = -lgsasl $(top_builddir)/gl/libgl.la
+-LDADD = $(top_builddir)/lib/src/libgsasl.la \
+-	$(top_builddir)/lib/gl/liblgl.la $(top_builddir)/gl/libgl.la
++LDADD = -lgsasl \
++	$(LOCALBASE)/lib/liblgl.a $(top_builddir)/gl/libgl.la
+ 
  EXTRA_DIST = README
  all: all-recursive
- 
diff --git a/security/gsasl/files/patch-examples-openid20-Makefile.in b/security/gsasl/files/patch-examples-openid20-Makefile.in
index 7e0fa84654fa..43088b10d8ea 100644
--- a/security/gsasl/files/patch-examples-openid20-Makefile.in
+++ b/security/gsasl/files/patch-examples-openid20-Makefile.in
@@ -1,6 +1,6 @@
---- examples/openid20/Makefile.in.orig	2021-01-01 16:32:53 UTC
+--- examples/openid20/Makefile.in.orig	2022-06-20 15:55:14 UTC
 +++ examples/openid20/Makefile.in
-@@ -219,7 +219,6 @@ smtp_server_openid20_SOURCES = smtp-server-openid20.c
+@@ -223,7 +223,6 @@ smtp_server_openid20_SOURCES = smtp-server-openid20.c
  smtp_server_openid20_OBJECTS = smtp-server-openid20.$(OBJEXT)
  smtp_server_openid20_LDADD = $(LDADD)
  smtp_server_openid20_DEPENDENCIES =  \
@@ -8,7 +8,7 @@
  	$(top_builddir)/gl/libgl.la
  AM_V_lt = $(am__v_lt_@AM_V@)
  am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-@@ -1543,7 +1542,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl 
+@@ -1818,7 +1817,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl 
  	-I$(top_srcdir)/lib/src -I$(top_builddir)/lib/src
  
  AM_LDFLAGS = -no-install
diff --git a/security/gsasl/files/patch-examples-saml20-Makefile.in b/security/gsasl/files/patch-examples-saml20-Makefile.in
index 97ef28724cc5..75d55cb66fa6 100644
--- a/security/gsasl/files/patch-examples-saml20-Makefile.in
+++ b/security/gsasl/files/patch-examples-saml20-Makefile.in
@@ -1,28 +1,20 @@
---- examples/saml20/Makefile.in.orig	2021-01-01 16:32:53 UTC
+--- examples/saml20/Makefile.in.orig	2022-06-20 15:55:15 UTC
 +++ examples/saml20/Makefile.in
-@@ -221,7 +221,6 @@ gsasl_saml20_request_OBJECTS = gsasl-saml20-request.$(
- gsasl_saml20_request_LDADD = $(LDADD)
- am__DEPENDENCIES_1 =
- gsasl_saml20_request_DEPENDENCIES =  \
--	$(top_builddir)/lib/src/libgsasl.la \
- 	$(top_builddir)/gl/libgl.la $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-@@ -230,7 +229,7 @@ am__v_lt_1 = 
+@@ -222,7 +222,7 @@ PROGRAMS = $(noinst_PROGRAMS)
  smtp_server_saml20_SOURCES = smtp-server-saml20.c
  smtp_server_saml20_OBJECTS = smtp-server-saml20.$(OBJEXT)
  smtp_server_saml20_LDADD = $(LDADD)
 -smtp_server_saml20_DEPENDENCIES = $(top_builddir)/lib/src/libgsasl.la \
 +smtp_server_saml20_DEPENDENCIES = \
- 	$(top_builddir)/gl/libgl.la $(am__DEPENDENCIES_1)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-@@ -1552,7 +1551,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl 
- 	$(LASSO_CFLAGS)
+ 	$(top_builddir)/gl/libgl.la
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -1817,7 +1817,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl 
+ 	-I$(top_srcdir)/lib/src -I$(top_builddir)/lib/src
  
  AM_LDFLAGS = -no-install
--LDADD = $(top_builddir)/lib/src/libgsasl.la $(top_builddir)/gl/libgl.la \
-+LDADD = -lgsasl $(top_builddir)/gl/libgl.la \
- 	$(LASSO_LIBS)
- 
+-LDADD = $(top_builddir)/lib/src/libgsasl.la $(top_builddir)/gl/libgl.la
++LDADD = -lgsasl $(top_builddir)/gl/libgl.la
  EXTRA_DIST = README gsasl-saml20-sp.php sp-metadata.xml sp-key.pem \
+ 	sp-crt.pem openidp.feide.no/idp-metadata.xml \
+ 	idp.protectnetwork.org/idp-metadata.xml gsasl-saml20-request.c
diff --git a/security/gsasl/files/patch-po-LINGUAS b/security/gsasl/files/patch-po-LINGUAS
deleted file mode 100644
index ef9b7596846c..000000000000
--- a/security/gsasl/files/patch-po-LINGUAS
+++ /dev/null
@@ -1,8 +0,0 @@
---- po/LINGUAS.orig	2021-01-01 16:43:20 UTC
-+++ po/LINGUAS
-@@ -1,5 +1,3 @@
--en@boldquot
--en@quot
- da
- de
- eo
diff --git a/security/gsasl/files/patch-src-Makefile.in b/security/gsasl/files/patch-src-Makefile.in
index b5384e9be781..687761e9abcd 100644
--- a/security/gsasl/files/patch-src-Makefile.in
+++ b/security/gsasl/files/patch-src-Makefile.in
@@ -1,20 +1,20 @@
---- src/Makefile.in.orig	2021-01-01 16:32:54 UTC
+--- src/Makefile.in.orig	2022-06-20 15:55:18 UTC
 +++ src/Makefile.in
-@@ -234,7 +234,7 @@ am_gsasl_OBJECTS = gsasl.$(OBJEXT) imap.$(OBJEXT) smtp
+@@ -238,7 +238,7 @@ am_gsasl_OBJECTS = gsasl.$(OBJEXT) imap.$(OBJEXT) smtp
  	callbacks.$(OBJEXT)
  gsasl_OBJECTS = $(am_gsasl_OBJECTS)
  am__DEPENDENCIES_1 =
--gsasl_DEPENDENCIES = ../lib/src/libgsasl.la ../gl/libgl.la \
-+gsasl_DEPENDENCIES = ../gl/libgl.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-gsasl_DEPENDENCIES = ../lib/src/libgsasl.la ../lib/gl/liblgl.la \
++gsasl_DEPENDENCIES = \
+ 	../gl/libgl.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libgsasl_cmd.la
  AM_V_P = $(am__v_P_@AM_V@)
-@@ -1560,7 +1560,7 @@ gsasl_SOURCES = gsasl.c \
+@@ -1835,7 +1835,7 @@ gsasl_SOURCES = gsasl.c \
  	imap.c imap.h smtp.c smtp.h \
  	callbacks.h callbacks.c internal.h
  
--gsasl_LDADD = ../lib/src/libgsasl.la ../gl/libgl.la \
-+gsasl_LDADD = -lgsasl ../gl/libgl.la \
+-gsasl_LDADD = ../lib/src/libgsasl.la ../lib/gl/liblgl.la ../gl/libgl.la \
++gsasl_LDADD = -lgsasl $(LOCALBASE)/lib/liblgl.a ../gl/libgl.la \
  	$(LTLIBREADLINE) $(LTLIBGNUTLS) $(LIBSOCKET) $(LTLIBINTL) \
  	libgsasl_cmd.la