Date: Thu, 11 Jan 2024 04:03:39 GMT From: Richard Gallamore <ultima@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e12105436281 - main - guacamole: Update to 1.5.4 Message-ID: <202401110403.40B43ddb059258@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ultima: URL: https://cgit.FreeBSD.org/ports/commit/?id=e12105436281dc3eb31765886625c666df12e755 commit e12105436281dc3eb31765886625c666df12e755 Author: Richard Gallamore <ultima@FreeBSD.org> AuthorDate: 2024-01-11 03:59:05 +0000 Commit: Richard Gallamore <ultima@FreeBSD.org> CommitDate: 2024-01-11 03:59:05 +0000 guacamole: Update to 1.5.4 Changes: https://guacamole.apache.org/releases/1.5.4/ --- net/guacamole-server/Makefile | 2 +- net/guacamole-server/distinfo | 6 +-- net/guacamole-server/files/patch-configure.ac | 25 ++++++++++++ .../files/patch-src_libguac_Makefile.am | 10 +++++ net/guacamole-server/pkg-plist | 9 +++-- www/guacamole-client/Makefile | 2 +- www/guacamole-client/distinfo | 46 +++++++++++----------- 7 files changed, 69 insertions(+), 31 deletions(-) diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile index 7ac9f44d745a..a535326b108f 100644 --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -1,5 +1,5 @@ PORTNAME= guacamole-server -DISTVERSION= 1.5.3 +DISTVERSION= 1.5.4 CATEGORIES= net MASTER_SITES= APACHE/guacamole/${DISTVERSION}/source/ diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo index 3ae5fb86181d..707209358a51 100644 --- a/net/guacamole-server/distinfo +++ b/net/guacamole-server/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1692385645 -SHA256 (guacamole-server-1.5.3.tar.gz) = dd4eebfb79fdef23d20dc585da8952e1b46a3411ec46836895c041488cf6dbc4 -SIZE (guacamole-server-1.5.3.tar.gz) = 1105466 +TIMESTAMP = 1704918080 +SHA256 (guacamole-server-1.5.4.tar.gz) = 4c0add552b1fc387c23a35c430155e01f2dfcf9daa0f96fbf805d0ace756729e +SIZE (guacamole-server-1.5.4.tar.gz) = 1126881 SHA256 (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = fe104f8eeade04051b1ba86ecb69307dc172746b11c10892dd24ea4a8593d083 SIZE (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = 3222 diff --git a/net/guacamole-server/files/patch-configure.ac b/net/guacamole-server/files/patch-configure.ac new file mode 100644 index 000000000000..6cdc27a80700 --- /dev/null +++ b/net/guacamole-server/files/patch-configure.ac @@ -0,0 +1,25 @@ +--- configure.ac.orig 2024-01-11 03:31:49 UTC ++++ configure.ac +@@ -68,6 +68,14 @@ AC_CHECK_LIB([pthread], [pthread_create], [PTHREAD_LIB + AC_DEFINE([HAVE_LIBPTHREAD],, + [Whether libpthread was found])]) + ++# librt ++AC_CHECK_FUNC([timer_create], [AC_MSG_RESULT([timer_create was found without librt.])], ++ [AC_CHECK_LIB([rt], [timer_create], ++ [AC_MSG_RESULT([timer_create was found in librt.]) ++ RT_LIBS=-lrt], ++ [AC_MSG_ERROR([timer_create could not be found.])]) ++ ]) ++ + # Include libdl for dlopen() if necessary + AC_CHECK_LIB([dl], [dlopen], + [DL_LIBS=-ldl], +@@ -128,6 +136,7 @@ AC_SUBST(MATH_LIBS) + AC_SUBST(PNG_LIBS) + AC_SUBST(JPEG_LIBS) + AC_SUBST(CAIRO_LIBS) ++AC_SUBST(RT_LIBS) + AC_SUBST(PTHREAD_LIBS) + AC_SUBST(UUID_LIBS) + AC_SUBST(CUNIT_LIBS) diff --git a/net/guacamole-server/files/patch-src_libguac_Makefile.am b/net/guacamole-server/files/patch-src_libguac_Makefile.am new file mode 100644 index 000000000000..aa5873bb604e --- /dev/null +++ b/net/guacamole-server/files/patch-src_libguac_Makefile.am @@ -0,0 +1,10 @@ +--- src/libguac/Makefile.am.orig 2024-01-11 03:33:47 UTC ++++ src/libguac/Makefile.am +@@ -167,6 +167,7 @@ libguac_la_LDFLAGS = \ + @JPEG_LIBS@ \ + @PNG_LIBS@ \ + @PTHREAD_LIBS@ \ ++ @RT_LIBS@ \ + @SSL_LIBS@ \ + @UUID_LIBS@ \ + @VORBIS_LIBS@ \ diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist index c4e89e6c8034..7c95757c7ff5 100644 --- a/net/guacamole-server/pkg-plist +++ b/net/guacamole-server/pkg-plist @@ -17,6 +17,7 @@ include/guacamole/fips.h include/guacamole/hash.h include/guacamole/layer-types.h include/guacamole/layer.h +include/guacamole/mem.h include/guacamole/object-types.h include/guacamole/object.h include/guacamole/parser-constants.h @@ -26,10 +27,12 @@ include/guacamole/plugin-constants.h include/guacamole/plugin.h include/guacamole/pool-types.h include/guacamole/pool.h +include/guacamole/private/mem.h include/guacamole/protocol-constants.h include/guacamole/protocol-types.h include/guacamole/protocol.h include/guacamole/recording.h +include/guacamole/rwlock.h include/guacamole/socket-constants.h include/guacamole/socket-fntypes.h %%SSL%%include/guacamole/socket-ssl.h @@ -68,12 +71,12 @@ include/guacamole/wol.h %%VNC%%lib/libguac-client-vnc.so.0.0.0 lib/libguac.a lib/libguac.so -lib/libguac.so.21 -lib/libguac.so.21.1.0 +lib/libguac.so.23 +lib/libguac.so.23.0.0 lib/libguac-terminal.a lib/libguac-terminal.so lib/libguac-terminal.so.0 -lib/libguac-terminal.so.0.0.0 +lib/libguac-terminal.so.0.1.0 %%GUACENC%%man/man1/guacenc.1.gz %%GUACLOG%%man/man1/guaclog.1.gz man/man5/guacd.conf.5.gz diff --git a/www/guacamole-client/Makefile b/www/guacamole-client/Makefile index 383f60a66689..51dc54b9acc7 100644 --- a/www/guacamole-client/Makefile +++ b/www/guacamole-client/Makefile @@ -1,5 +1,5 @@ PORTNAME= guacamole-client -DISTVERSION= 1.5.3 +DISTVERSION= 1.5.4 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 6f34f526f042..51de89e5333a 100644 --- a/www/guacamole-client/distinfo +++ b/www/guacamole-client/distinfo @@ -1,23 +1,23 @@ -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 +TIMESTAMP = 1704918122 +SHA256 (guacamole-client/guacamole-1.5.4.war) = 5728b563911bd64bce0a0b81c74ea8ccb2190d1785bff34030fc6885a8273d3e +SIZE (guacamole-client/guacamole-1.5.4.war) = 13734589 +SHA256 (guacamole-client/guacamole-auth-duo-1.5.4.tar.gz) = eb0cd4c361b91710f3c03fe9e7c74799c48d8b7c105d4f3e7deb2dc6049a309e +SIZE (guacamole-client/guacamole-auth-duo-1.5.4.tar.gz) = 3679857 +SHA256 (guacamole-client/guacamole-auth-header-1.5.4.tar.gz) = 7a0adc0daa19ec69a0244f491222c62124b02f81f40aa91e9a94d06a2635d038 +SIZE (guacamole-client/guacamole-auth-header-1.5.4.tar.gz) = 3650061 +SHA256 (guacamole-client/guacamole-auth-jdbc-1.5.4.tar.gz) = f45736b28eb6647b7eb0d2b48331e12e5a432661f61115b63d1a05a5bd20244d +SIZE (guacamole-client/guacamole-auth-jdbc-1.5.4.tar.gz) = 32963118 +SHA256 (guacamole-client/guacamole-auth-json-1.5.4.tar.gz) = 25db39d87d449740ce47c26983f82521642486d6996beed4deef4dd64dc60ddd +SIZE (guacamole-client/guacamole-auth-json-1.5.4.tar.gz) = 6620553 +SHA256 (guacamole-client/guacamole-auth-ldap-1.5.4.tar.gz) = f912fe921cd0d429a752709e31a37b931e95d88a47bc4007ab49377d1c1a6336 +SIZE (guacamole-client/guacamole-auth-ldap-1.5.4.tar.gz) = 13219125 +SHA256 (guacamole-client/guacamole-auth-quickconnect-1.5.4.tar.gz) = 6ef8d8a239fcbb055eface4fc5941a16b549ef4f560cb428d9acb1aae9e4ee98 +SIZE (guacamole-client/guacamole-auth-quickconnect-1.5.4.tar.gz) = 3666619 +SHA256 (guacamole-client/guacamole-auth-sso-1.5.4.tar.gz) = d8aa6dbb4c9104f6c5fab7843b23b50c32b844f67c9534e316b8d0e5df8cfcea +SIZE (guacamole-client/guacamole-auth-sso-1.5.4.tar.gz) = 34613153 +SHA256 (guacamole-client/guacamole-auth-totp-1.5.4.tar.gz) = 0615bbf61802c9527a1503bd45d1911b26b2ae77d1c25dabfe826ed1acd723a0 +SIZE (guacamole-client/guacamole-auth-totp-1.5.4.tar.gz) = 4924784 +SHA256 (guacamole-client/guacamole-history-recording-storage-1.5.4.tar.gz) = f68d6534292d98497ab9ba94333e34b45b67c24412a5b954d76c7317a06bc0cf +SIZE (guacamole-client/guacamole-history-recording-storage-1.5.4.tar.gz) = 15891 +SHA256 (guacamole-client/guacamole-vault-1.5.4.tar.gz) = 2822a92660754de37987ca4cd9e6ef68d9e013348364850e26a8c28c46662caf +SIZE (guacamole-client/guacamole-vault-1.5.4.tar.gz) = 21123468
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401110403.40B43ddb059258>