git: 21482cabebb7 - main - guacamole: Updated to 1.5.3

From: Richard Gallamore <ultima_at_FreeBSD.org>
Date: Sun, 20 Aug 2023 01:24:41 UTC
The branch main has been updated by ultima:

URL: https://cgit.FreeBSD.org/ports/commit/?id=21482cabebb75fb08bd211136a9301fdb5aecaaa

commit 21482cabebb75fb08bd211136a9301fdb5aecaaa
Author:     Richard Gallamore <ultima@FreeBSD.org>
AuthorDate: 2023-08-20 01:23:17 +0000
Commit:     Richard Gallamore <ultima@FreeBSD.org>
CommitDate: 2023-08-20 01:23:17 +0000

    guacamole: Updated to 1.5.3
    
    Changes: https://guacamole.apache.org/releases/1.5.3/
---
 net/guacamole-server/Makefile  |  7 ++++---
 net/guacamole-server/distinfo  |  6 +++---
 net/guacamole-server/pkg-plist |  3 ++-
 www/guacamole-client/Makefile  |  3 +--
 www/guacamole-client/distinfo  | 46 +++++++++++++++++++++---------------------
 5 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index 84b2a6a87eff..7ac9f44d745a 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	guacamole-server
-DISTVERSION=	1.5.0
-PORTREVISION=	4
+DISTVERSION=	1.5.3
 CATEGORIES=	net
 MASTER_SITES=	APACHE/guacamole/${DISTVERSION}/source/
 
@@ -30,6 +29,7 @@ SHEBANG_FILES=	${WRKSRC}/src/protocols/rdp/keymaps/generate.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-guacd-conf=${ETCDIR}/guacd.conf
 INSTALL_TARGET=	install-strip
+CFLAGS+=	-Wno-error=newline-eof
 
 GUACAMOLE_HOME?=	${PREFIX}/guacamole
 USERS=		guacamole
@@ -66,7 +66,8 @@ GUACENC_CFLAGS=		-Wno-error=deprecated
 GUACLOG_CONFIGURE_ENABLE=	guaclog
 KUBERNETES_CONFIGURE_ENABLE=	kubernetes
 KUBERNETES_CONFIGURE_WITH=	pango terminal
-KUBERNETES_LIB_DEPENDS=		libwebsockets.so:net/libwebsockets
+KUBERNETES_LIB_DEPENDS=		libwebsockets.so:net/libwebsockets \
+				libharfbuzz.so:print/harfbuzz
 KUBERNETES_USE=			GNOME=pango
 NLS_USES=		gettext-runtime
 PULSEAUDIO_CONFIGURE_WITH=	pulse
diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo
index 394a47a08829..3ae5fb86181d 100644
--- a/net/guacamole-server/distinfo
+++ b/net/guacamole-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1679141585
-SHA256 (guacamole-server-1.5.0.tar.gz) = c6c09e4056f1edd88a3c425ef05043ff835da5c1c92348bbdbf5a99e512f5fd4
-SIZE (guacamole-server-1.5.0.tar.gz) = 1102862
+TIMESTAMP = 1692385645
+SHA256 (guacamole-server-1.5.3.tar.gz) = dd4eebfb79fdef23d20dc585da8952e1b46a3411ec46836895c041488cf6dbc4
+SIZE (guacamole-server-1.5.3.tar.gz) = 1105466
 SHA256 (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = fe104f8eeade04051b1ba86ecb69307dc172746b11c10892dd24ea4a8593d083
 SIZE (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = 3222
diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist
index 352e1efc5af6..c4e89e6c8034 100644
--- a/net/guacamole-server/pkg-plist
+++ b/net/guacamole-server/pkg-plist
@@ -13,6 +13,7 @@ include/guacamole/client-types.h
 include/guacamole/client.h
 include/guacamole/error-types.h
 include/guacamole/error.h
+include/guacamole/fips.h
 include/guacamole/hash.h
 include/guacamole/layer-types.h
 include/guacamole/layer.h
@@ -68,7 +69,7 @@ include/guacamole/wol.h
 lib/libguac.a
 lib/libguac.so
 lib/libguac.so.21
-lib/libguac.so.21.0.0
+lib/libguac.so.21.1.0
 lib/libguac-terminal.a
 lib/libguac-terminal.so
 lib/libguac-terminal.so.0
diff --git a/www/guacamole-client/Makefile b/www/guacamole-client/Makefile
index 35742d3de543..383f60a66689 100644
--- a/www/guacamole-client/Makefile
+++ b/www/guacamole-client/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	guacamole-client
-DISTVERSION=	1.5.0
-PORTREVISION=	1
+DISTVERSION=	1.5.3
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	guacamole/${DISTVERSIONFULL}/binary
diff --git a/www/guacamole-client/distinfo b/www/guacamole-client/distinfo
index 9e24b72c8741..6f34f526f042 100644
--- a/www/guacamole-client/distinfo
+++ b/www/guacamole-client/distinfo
@@ -1,23 +1,23 @@
-TIMESTAMP = 1677182160
-SHA256 (guacamole-client/guacamole-1.5.0.war) = 9c4e807aa70bc138f3b6cc66cc44b75daa944a015944b9ab6f780d7868498620
-SIZE (guacamole-client/guacamole-1.5.0.war) = 13381408
-SHA256 (guacamole-client/guacamole-auth-duo-1.5.0.tar.gz) = 8458e1496224dbc350eab56de2dcce92d041e3cb58979b98b4670a70514928d4
-SIZE (guacamole-client/guacamole-auth-duo-1.5.0.tar.gz) = 3585252
-SHA256 (guacamole-client/guacamole-auth-header-1.5.0.tar.gz) = 15f37da79723d8ea74bc24262cf404840c023a3b5dbe3823dbf3b1915cda9df6
-SIZE (guacamole-client/guacamole-auth-header-1.5.0.tar.gz) = 3555492
-SHA256 (guacamole-client/guacamole-auth-jdbc-1.5.0.tar.gz) = f47e066c4d3167202b9c866f63cba806f2cb0a00a5c00847e07870b124b5fb75
-SIZE (guacamole-client/guacamole-auth-jdbc-1.5.0.tar.gz) = 32322210
-SHA256 (guacamole-client/guacamole-auth-json-1.5.0.tar.gz) = b3464e6d9e2fd4559884495d5bfa450472c82b4d700393c86153a3e7c5df8e2c
-SIZE (guacamole-client/guacamole-auth-json-1.5.0.tar.gz) = 11853927
-SHA256 (guacamole-client/guacamole-auth-ldap-1.5.0.tar.gz) = 4a97a6c88f5e27920725178abd154aa709498c9d0bbcfee835be448202037497
-SIZE (guacamole-client/guacamole-auth-ldap-1.5.0.tar.gz) = 12172842
-SHA256 (guacamole-client/guacamole-auth-quickconnect-1.5.0.tar.gz) = f6702fc82cf36f8e4d3026ca23847b60df9cc2c1e22f7596c02ef5b4cd9f8d09
-SIZE (guacamole-client/guacamole-auth-quickconnect-1.5.0.tar.gz) = 3572059
-SHA256 (guacamole-client/guacamole-auth-sso-1.5.0.tar.gz) = c387da2b93224dd8e3a3b832b740e5b859d71ac4a93e95aa7edd41934112b862
-SIZE (guacamole-client/guacamole-auth-sso-1.5.0.tar.gz) = 33827739
-SHA256 (guacamole-client/guacamole-auth-totp-1.5.0.tar.gz) = c703f7c541f5a513c1588a5bedeae4461cd4135b11d6eb874ac059f48445942f
-SIZE (guacamole-client/guacamole-auth-totp-1.5.0.tar.gz) = 4822909
-SHA256 (guacamole-client/guacamole-history-recording-storage-1.5.0.tar.gz) = bdbbd43299560b775066d3be60044ad95f27f72e5a810c257d356c4a6e936130
-SIZE (guacamole-client/guacamole-history-recording-storage-1.5.0.tar.gz) = 15898
-SHA256 (guacamole-client/guacamole-vault-1.5.0.tar.gz) = 73b49e1c970e4cffbd5fe5cd8eeb8f3587d1bbf7cd6b52a3dfcfda11b00fb5af
-SIZE (guacamole-client/guacamole-vault-1.5.0.tar.gz) = 20508930
+TIMESTAMP = 1692385703
+SHA256 (guacamole-client/guacamole-1.5.3.war) = 15a34e6ed6cf6f03fe20f90f67d2d609713a89cd3cb324f89edf1e7696e6ed61
+SIZE (guacamole-client/guacamole-1.5.3.war) = 13631953
+SHA256 (guacamole-client/guacamole-auth-duo-1.5.3.tar.gz) = 561434993dc8a07b13fd7b6a5fa5f3ba5bdbe56c7273d24660178c50fa1f7c9e
+SIZE (guacamole-client/guacamole-auth-duo-1.5.3.tar.gz) = 3676186
+SHA256 (guacamole-client/guacamole-auth-header-1.5.3.tar.gz) = 6ba9128908a9feac6ea9f8bb59ae1c1f6644546c4d288412f45642ed2803414b
+SIZE (guacamole-client/guacamole-auth-header-1.5.3.tar.gz) = 3646342
+SHA256 (guacamole-client/guacamole-auth-jdbc-1.5.3.tar.gz) = ed3ba771ce48a38a0e56f029913b8051249dbebfdd32ffedbce2df0db132247f
+SIZE (guacamole-client/guacamole-auth-jdbc-1.5.3.tar.gz) = 32982901
+SHA256 (guacamole-client/guacamole-auth-json-1.5.3.tar.gz) = 745d0290c29e9ae4d9f2020e379e3a1e173509320ddc96cab10bf56099193042
+SIZE (guacamole-client/guacamole-auth-json-1.5.3.tar.gz) = 6570905
+SHA256 (guacamole-client/guacamole-auth-ldap-1.5.3.tar.gz) = 06e5bb41daa7cf21d32518b6b3a14da7534ea24fa1a411a49f0cd9ef101cba95
+SIZE (guacamole-client/guacamole-auth-ldap-1.5.3.tar.gz) = 13100655
+SHA256 (guacamole-client/guacamole-auth-quickconnect-1.5.3.tar.gz) = 0491e3b0cce2a20faece836cf353d938b7a4bc79640299275e058b42601f1b82
+SIZE (guacamole-client/guacamole-auth-quickconnect-1.5.3.tar.gz) = 3662930
+SHA256 (guacamole-client/guacamole-auth-sso-1.5.3.tar.gz) = a44565f2fbe4410d83d141ec81267d607f85b19804639ef4c319ff28a04bd294
+SIZE (guacamole-client/guacamole-auth-sso-1.5.3.tar.gz) = 34468962
+SHA256 (guacamole-client/guacamole-auth-totp-1.5.3.tar.gz) = 5ca05d5edb6f06f7c3d836db749dce3984524ac6bf113271f07abd7c2814dfce
+SIZE (guacamole-client/guacamole-auth-totp-1.5.3.tar.gz) = 4915531
+SHA256 (guacamole-client/guacamole-history-recording-storage-1.5.3.tar.gz) = 9acb43ab95932db4dab5659f7fcf81ba0d1078549efc3f1eac3bdaacc42823f8
+SIZE (guacamole-client/guacamole-history-recording-storage-1.5.3.tar.gz) = 15895
+SHA256 (guacamole-client/guacamole-vault-1.5.3.tar.gz) = f91e200beb2f6ee7969c48ffde7d90360703c2dd423c7583df4dcadf600f9f5d
+SIZE (guacamole-client/guacamole-vault-1.5.3.tar.gz) = 21141762