diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile index 4e4d4ed89657..f335b7ca4018 100644 --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -1,113 +1,113 @@ PORTNAME= guacamole-server -DISTVERSION= 1.5.5 +DISTVERSION= 1.6.0 CATEGORIES= net MASTER_SITES= APACHE/guacamole/${DISTVERSION}/source/ MAINTAINER= ultima@FreeBSD.org COMMENT= HTML5 Clientless Remote Desktop WWW= https://guacamole.incubator.apache.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libossp-uuid.so:misc/ossp-uuid \ libpng.so:graphics/png CONFLICTS_BUILD=pulseaudio-*+jack_* ffmpeg-*+jack_* USES= autoreconf compiler:c11 gnome jpeg libtool localbase pkgconfig \ shebangfix USE_GNOME= cairo USE_LDCONFIG= yes USE_RC_SUBR= guacd SHEBANG_FILES= ${WRKSRC}/src/protocols/rdp/keymaps/generate.pl GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --with-guacd-conf=${ETCDIR}/guacd.conf INSTALL_TARGET= install-strip CFLAGS+= -Wno-error=newline-eof GUACAMOLE_HOME?= ${PREFIX}/guacamole USERS= guacamole GROUPS= guacamole SUB_LIST= GUACD_USER=${USERS} \ GUACD_GROUP=${GROUPS} \ GUACD_HOME=${GUACAMOLE_HOME} PLIST_SUB= GUACD_USER=${USERS} \ GUACD_GROUP=${GROUPS} \ GUACD_HOME=${GUACAMOLE_HOME} OPTIONS_DEFINE= GUACENC GUACLOG NLS SSL WEBP OPTIONS_DEFAULT= GUACENC GUACLOG KUBERNETES PULSEAUDIO RDP \ SSH SSL VNC VORBIS WEBP OPTIONS_GROUP= SP AUDIO OPTIONS_GROUP_SP= KUBERNETES RDP SSH VNC OPTIONS_GROUP_AUDIO= VORBIS PULSEAUDIO OPTIONS_SUB= yes AUDIO_DESC= Audio Support GUACENC_DESC= Video Encoding Utility GUACLOG_DESC= Input log interpreter KUBERNETES_DESC= Kubernetes protocol support RDP_DESC= RDP protocol support SP_DESC= Supported Protocols VNC_DESC= VNC protocol support GUACENC_CONFIGURE_ENABLE= guacenc GUACENC_CONFIGURE_WITH= libavcodec libavutil libswscale GUACENC_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg GUACENC_CFLAGS= -Wno-error=deprecated GUACLOG_CONFIGURE_ENABLE= guaclog KUBERNETES_CONFIGURE_ENABLE= kubernetes KUBERNETES_LIB_DEPENDS= libwebsockets.so:net/libwebsockets \ libharfbuzz.so:print/harfbuzz NLS_USES= gettext-runtime PULSEAUDIO_CONFIGURE_WITH= pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio RDP_CONFIGURE_WITH= rdp RDP_LIB_DEPENDS= libfreerdp2.so:net/freerdp SSH_CONFIGURE_WITH= ssh SSH_IMPLIES= SSL SSH_LIB_DEPENDS= libssh2.so:security/libssh2 SSL_CONFIGURE_WITH= ssl SSL_USES= ssl VNC_CONFIGURE_WITH= vnc VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver VORBIS_CONFIGURE_WITH= vorbis VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp .include .if ${PORT_OPTIONS:MKUBERNETES}${PORT_OPTIONS:MSSH} CONFIGURE_ARGS+= --with-pango --with-terminal PLIST_SUB+= TERMINAL="" USE_GNOME+= pango .else CONFIGURE_ARGS+= --without-pango --without-terminal PLIST_SUB+= TERMINAL="@comment " .endif .if ${OPSYS} == FreeBSD CFLAGS+= -Wno-error=strict-prototypes \ -Wno-error=unused-but-set-variable .endif post-patch: @${REINPLACE_CMD} 's/-Werror//' ${WRKSRC}/src/libguac/Makefile.am \ ${WRKSRC}/src/protocols/vnc/Makefile.am @${REINPLACE_CMD} 's|/etc/ssl|${PREFIX}/etc/ssl|g ; \ s|/etc/guacamole|${ETCDIR}|g' \ ${WRKSRC}/src/guacd/man/guacd.conf.5.in post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${GUACAMOLE_HOME} ${INSTALL_DATA} ${FILESDIR}/guacd.conf.sample ${STAGEDIR}${ETCDIR} .include diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo index 1e6e2036c4d3..2eef90b041b5 100644 --- a/net/guacamole-server/distinfo +++ b/net/guacamole-server/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1739487171 -SHA256 (guacamole-server-1.5.5.tar.gz) = 67499611c2e22d9c933763adc5408e716a4bfd08a3eb8a5ba2fc6f8f70868f6b -SIZE (guacamole-server-1.5.5.tar.gz) = 1136892 -SHA256 (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = fe104f8eeade04051b1ba86ecb69307dc172746b11c10892dd24ea4a8593d083 -SIZE (5cf408ebbba9544fb5dfb297d98d5a1e1751a56d.patch) = 3222 +TIMESTAMP = 1750962604 +SHA256 (guacamole-server-1.6.0.tar.gz) = 8bc45675da96d7b6f39728160181e3d4ff3c08f460f6d26de5805b642bf13f2b +SIZE (guacamole-server-1.6.0.tar.gz) = 1252749 diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist index e998fbc11d47..ef66399379c6 100644 --- a/net/guacamole-server/pkg-plist +++ b/net/guacamole-server/pkg-plist @@ -1,85 +1,97 @@ %%GUACENC%%bin/guacenc %%GUACLOG%%bin/guaclog %%ETCDIR%%/guacd.conf.sample include/guacamole/argv-constants.h include/guacamole/argv-fntypes.h include/guacamole/argv.h +include/guacamole/assert.h include/guacamole/audio-fntypes.h include/guacamole/audio-types.h include/guacamole/audio.h include/guacamole/client-constants.h include/guacamole/client-fntypes.h include/guacamole/client-types.h include/guacamole/client.h +include/guacamole/display-constants.h +include/guacamole/display-types.h +include/guacamole/display.h include/guacamole/error-types.h include/guacamole/error.h +include/guacamole/fifo-constants.h +include/guacamole/fifo-types.h +include/guacamole/fifo.h include/guacamole/fips.h +include/guacamole/flag-types.h +include/guacamole/flag.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 include/guacamole/parser-types.h include/guacamole/parser.h 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/rect-types.h +include/guacamole/rect.h include/guacamole/rwlock.h include/guacamole/socket-constants.h include/guacamole/socket-fntypes.h %%SSL%%include/guacamole/socket-ssl.h include/guacamole/socket-types.h include/guacamole/socket.h include/guacamole/stream-types.h include/guacamole/stream.h include/guacamole/string.h +include/guacamole/tcp.h %%TERMINAL%%include/guacamole/terminal/terminal.h include/guacamole/timestamp-types.h include/guacamole/timestamp.h include/guacamole/unicode.h include/guacamole/user-constants.h include/guacamole/user-fntypes.h include/guacamole/user-types.h include/guacamole/user.h include/guacamole/wol-constants.h include/guacamole/wol.h %%RDP%%lib/freerdp2/libguac-common-svc-client.so %%RDP%%lib/freerdp2/libguacai-client.so %%KUBERNETES%%lib/libguac-client-kubernetes.a %%KUBERNETES%%lib/libguac-client-kubernetes.so %%KUBERNETES%%lib/libguac-client-kubernetes.so.0 %%KUBERNETES%%lib/libguac-client-kubernetes.so.0.0.0 %%RDP%%lib/libguac-client-rdp.a %%RDP%%lib/libguac-client-rdp.so %%RDP%%lib/libguac-client-rdp.so.0 %%RDP%%lib/libguac-client-rdp.so.0.0.0 %%SSH%%lib/libguac-client-ssh.a %%SSH%%lib/libguac-client-ssh.so %%SSH%%lib/libguac-client-ssh.so.0 %%SSH%%lib/libguac-client-ssh.so.0.0.0 %%VNC%%lib/libguac-client-vnc.a %%VNC%%lib/libguac-client-vnc.so %%VNC%%lib/libguac-client-vnc.so.0 %%VNC%%lib/libguac-client-vnc.so.0.0.0 -lib/libguac.a -lib/libguac.so -lib/libguac.so.24 -lib/libguac.so.24.0.0 %%TERMINAL%%lib/libguac-terminal.a %%TERMINAL%%lib/libguac-terminal.so -%%TERMINAL%%lib/libguac-terminal.so.0 -%%TERMINAL%%lib/libguac-terminal.so.0.1.0 +%%TERMINAL%%lib/libguac-terminal.so.2 +%%TERMINAL%%lib/libguac-terminal.so.2.0.0 +lib/libguac.a +lib/libguac.so +lib/libguac.so.25 +lib/libguac.so.25.0.0 +sbin/guacd %%GUACENC%%share/man/man1/guacenc.1.gz %%GUACLOG%%share/man/man1/guaclog.1.gz share/man/man5/guacd.conf.5.gz share/man/man8/guacd.8.gz -sbin/guacd @dir(%%GUACD_USER%%,%%GUACD_GROUP%%,) %%GUACD_HOME%% diff --git a/www/guacamole-client/Makefile b/www/guacamole-client/Makefile index 61fe4e81ec2c..ddc23bc6330c 100644 --- a/www/guacamole-client/Makefile +++ b/www/guacamole-client/Makefile @@ -1,66 +1,69 @@ PORTNAME= guacamole-client -DISTVERSION= 1.5.5 +DISTVERSION= 1.6.0 CATEGORIES= www java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= guacamole/${DISTVERSIONFULL}/binary DISTFILES= guacamole-${DISTVERSIONFULL}.war \ + guacamole-auth-ban-${DISTVERSIONFULL}${EXTRACT_SUFX} \ guacamole-auth-duo-${DISTVERSIONFULL}${EXTRACT_SUFX} \ guacamole-auth-header-${DISTVERSIONFULL}${EXTRACT_SUFX} \ guacamole-auth-jdbc-${DISTVERSIONFULL}${EXTRACT_SUFX} \ guacamole-auth-json-${DISTVERSIONFULL}${EXTRACT_SUFX} \ guacamole-auth-ldap-${DISTVERSIONFULL}${EXTRACT_SUFX} \ guacamole-auth-quickconnect-${DISTVERSIONFULL}${EXTRACT_SUFX} \ guacamole-auth-sso-${DISTVERSIONFULL}${EXTRACT_SUFX} \ + guacamole-auth-restrict-${DISTVERSIONFULL}${EXTRACT_SUFX} \ guacamole-auth-totp-${DISTVERSIONFULL}${EXTRACT_SUFX} \ + guacamole-display-statistics-${DISTVERSIONFULL}${EXTRACT_SUFX} \ guacamole-history-recording-storage-${DISTVERSIONFULL}${EXTRACT_SUFX} \ guacamole-vault-${DISTVERSIONFULL}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} MAINTAINER= ultima@FreeBSD.org COMMENT= HTML5 Clientless Remote Desktop WWW= https://guacamole.incubator.apache.org LICENSE= APACHE20 NO_ARCH= yes NO_BUILD= yes SUB_FILES= pkg-message OPTIONS_DEFINE= SERVER TOMCAT OPTIONS_DEFAULT= SERVER TOMCAT OPTIONS_SUB= yes SERVER_DESC= Include Guacamole Server TOMCAT_DESC= Use Tomcat as your servlet TOMCAT_PLIST_SUB= TOMCAT_VER=${TOMCAT_VER} TOMCAT_RUN_DEPENDS= ${LOCALBASE}/apache-tomcat-${TOMCAT_VER}/bin/bootstrap.jar:www/tomcat${TOMCAT_VER:C/\.[0]?//} TOMCAT_VARS= TOMCAT_VER=9.0 SERVER_RUN_DEPENDS= guacd:net/guacamole-server do-extract: do-install: @${MKDIR} ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}/etc ${INSTALL_DATA} ${_DISTDIR}/${DISTFILES:M*.war} \ ${STAGEDIR}${DATADIR}/guacamole.war .for i in ${DISTFILES:N*.war} ${INSTALL_DATA} ${_DISTDIR}/${i}${DISTVERSIONFULL}${EXTRACT_SUFX} \ ${STAGEDIR}/${DATADIR}/${i:S|-$||}${EXTRACT_SUFX} .endfor ${INSTALL_DATA} ${FILESDIR}/user-mapping.xml.sample ${STAGEDIR}${ETCDIR}/ ${INSTALL_DATA} ${FILESDIR}/logback.xml.sample ${STAGEDIR}${ETCDIR}/ ${INSTALL_DATA} ${FILESDIR}/guacamole.properties.sample ${STAGEDIR}${ETCDIR}/ ${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/etc/guacamole do-install-TOMCAT-on: @${MKDIR} ${STAGEDIR}${PREFIX}/apache-tomcat-${TOMCAT_VER}/webapps ${RLN} ${STAGEDIR}${DATADIR}/guacamole.war \ ${STAGEDIR}${PREFIX}/apache-tomcat-${TOMCAT_VER}/webapps .include diff --git a/www/guacamole-client/distinfo b/www/guacamole-client/distinfo index 0300255aae27..41ebb4143394 100644 --- a/www/guacamole-client/distinfo +++ b/www/guacamole-client/distinfo @@ -1,23 +1,29 @@ -TIMESTAMP = 1739487208 -SHA256 (guacamole-client/guacamole-1.5.5.war) = 4267307f3600663723f24af92d596e99c8359425315135052a42d451f9529200 -SIZE (guacamole-client/guacamole-1.5.5.war) = 17401039 -SHA256 (guacamole-client/guacamole-auth-duo-1.5.5.tar.gz) = 36419b294847e2e8ae0c54e7080f0c082da8aa946614774ba1a5d059533ebf5f -SIZE (guacamole-client/guacamole-auth-duo-1.5.5.tar.gz) = 3679932 -SHA256 (guacamole-client/guacamole-auth-header-1.5.5.tar.gz) = a39ca9563be6d31b4dc1251c76a62baeb2a9d4930b3055e342bb9ce80e526a78 -SIZE (guacamole-client/guacamole-auth-header-1.5.5.tar.gz) = 3650107 -SHA256 (guacamole-client/guacamole-auth-jdbc-1.5.5.tar.gz) = 80cca0a02076babad0dc7c76b60daa896f3d9bf10be82708f425fd42ce411393 -SIZE (guacamole-client/guacamole-auth-jdbc-1.5.5.tar.gz) = 33099128 -SHA256 (guacamole-client/guacamole-auth-json-1.5.5.tar.gz) = 3efb29583e03e01b96f3bce077c7d5bec3ec2fcbf307f112e31d8ac9d01b330d -SIZE (guacamole-client/guacamole-auth-json-1.5.5.tar.gz) = 10320319 -SHA256 (guacamole-client/guacamole-auth-ldap-1.5.5.tar.gz) = 01d3cd74da5de9da9cc73a788ab2938dd44f5cbe42ad90eebb4bee07f246dfa3 -SIZE (guacamole-client/guacamole-auth-ldap-1.5.5.tar.gz) = 16892997 -SHA256 (guacamole-client/guacamole-auth-quickconnect-1.5.5.tar.gz) = 4786aa97558765013986e38616f4cf508fb771ddfc31708a7adbcf08c4453aec -SIZE (guacamole-client/guacamole-auth-quickconnect-1.5.5.tar.gz) = 3666843 -SHA256 (guacamole-client/guacamole-auth-sso-1.5.5.tar.gz) = b0ef76d3e661f95c2dbe46a17a9ce8a1b8d4100727458fa55e0635a85d37add8 -SIZE (guacamole-client/guacamole-auth-sso-1.5.5.tar.gz) = 38286364 -SHA256 (guacamole-client/guacamole-auth-totp-1.5.5.tar.gz) = 37f2f9d89b68dbcb44e5349e30474a38d79224dbeb0a67f03ecfe787a5feaf42 -SIZE (guacamole-client/guacamole-auth-totp-1.5.5.tar.gz) = 4923857 -SHA256 (guacamole-client/guacamole-history-recording-storage-1.5.5.tar.gz) = 2524ad78603f6d34ef6020c0635c5ae819941d4cbb0e01d8db185f67db6ebce5 -SIZE (guacamole-client/guacamole-history-recording-storage-1.5.5.tar.gz) = 15894 -SHA256 (guacamole-client/guacamole-vault-1.5.5.tar.gz) = 382a5e1739f82eb9a17e40190d76e7ceaa3c317cf8ea8a32c60e3f7b5fa9470e -SIZE (guacamole-client/guacamole-vault-1.5.5.tar.gz) = 28569114 +TIMESTAMP = 1750962586 +SHA256 (guacamole-client/guacamole-1.6.0.war) = b41ceb1e2df010b54db563e0b00edb8d5fe9f073c6168462e4c978df0fc6e716 +SIZE (guacamole-client/guacamole-1.6.0.war) = 15641879 +SHA256 (guacamole-client/guacamole-auth-ban-1.6.0.tar.gz) = b4c4a2d73d3f66083c46d05409e3dea6f560579d3cf9c3ca3bf099aad7040aca +SIZE (guacamole-client/guacamole-auth-ban-1.6.0.tar.gz) = 912563 +SHA256 (guacamole-client/guacamole-auth-duo-1.6.0.tar.gz) = 8b1500c3b8381d417d3987b239c819d6545e01a82acd1b537f2f759995a86c3f +SIZE (guacamole-client/guacamole-auth-duo-1.6.0.tar.gz) = 12638000 +SHA256 (guacamole-client/guacamole-auth-header-1.6.0.tar.gz) = 54c6ea944aab5153bda20401fa28400128ad89606b57027bee2127327b65f958 +SIZE (guacamole-client/guacamole-auth-header-1.6.0.tar.gz) = 3650100 +SHA256 (guacamole-client/guacamole-auth-jdbc-1.6.0.tar.gz) = 97bc5fd3d67d25c0e98a475d1dfd308a037859f549fac47171c723b7a7039366 +SIZE (guacamole-client/guacamole-auth-jdbc-1.6.0.tar.gz) = 33222166 +SHA256 (guacamole-client/guacamole-auth-json-1.6.0.tar.gz) = 49db365e0d715970d78563fada65f43c76f908eed0d26725d4b98b05b3dfb0e9 +SIZE (guacamole-client/guacamole-auth-json-1.6.0.tar.gz) = 5827577 +SHA256 (guacamole-client/guacamole-auth-ldap-1.6.0.tar.gz) = b07f27adc370324108527b6929f61d93880026d57c1033064bd1c55b881c7497 +SIZE (guacamole-client/guacamole-auth-ldap-1.6.0.tar.gz) = 13330861 +SHA256 (guacamole-client/guacamole-auth-quickconnect-1.6.0.tar.gz) = b21ca4bed438fae6f6bbcab496a15788eda624f2f1b1a61eb4e8d1b97119cf47 +SIZE (guacamole-client/guacamole-auth-quickconnect-1.6.0.tar.gz) = 3668232 +SHA256 (guacamole-client/guacamole-auth-sso-1.6.0.tar.gz) = e957984471ac50a87f472f51aec9bf7e378ae67ce2502ff938030011a670dcae +SIZE (guacamole-client/guacamole-auth-sso-1.6.0.tar.gz) = 48667535 +SHA256 (guacamole-client/guacamole-auth-restrict-1.6.0.tar.gz) = eee1f74d5295a58001b61f59c2e526412c295a9f06cbbd4a625674d6c0031eef +SIZE (guacamole-client/guacamole-auth-restrict-1.6.0.tar.gz) = 3694616 +SHA256 (guacamole-client/guacamole-auth-totp-1.6.0.tar.gz) = 0202c197d3b4e59e69b4dde2a80906adf5f03a497748b74ad3d599022e26f347 +SIZE (guacamole-client/guacamole-auth-totp-1.6.0.tar.gz) = 4930039 +SHA256 (guacamole-client/guacamole-display-statistics-1.6.0.tar.gz) = 3f85738345a8466985ac079e8f5d8c6acb279556a5a40b6e205032b3f3d5697b +SIZE (guacamole-client/guacamole-display-statistics-1.6.0.tar.gz) = 14640 +SHA256 (guacamole-client/guacamole-history-recording-storage-1.6.0.tar.gz) = 823ea44766035cf8a8b108946547c94749022b7010c9961ffd3e73fd5659796d +SIZE (guacamole-client/guacamole-history-recording-storage-1.6.0.tar.gz) = 16748 +SHA256 (guacamole-client/guacamole-vault-1.6.0.tar.gz) = 5cabc2229994bde531971f139d050bacaf052b3e855d4a71e7a8bde4aff75a0f +SIZE (guacamole-client/guacamole-vault-1.6.0.tar.gz) = 21990704 diff --git a/www/guacamole-client/pkg-plist b/www/guacamole-client/pkg-plist index b20361489392..3cb946c5bf4c 100644 --- a/www/guacamole-client/pkg-plist +++ b/www/guacamole-client/pkg-plist @@ -1,16 +1,19 @@ /etc/guacamole %%TOMCAT%%apache-tomcat-%%TOMCAT_VER%%/webapps/guacamole.war %%ETCDIR%%/guacamole.properties.sample %%ETCDIR%%/logback.xml.sample %%ETCDIR%%/user-mapping.xml.sample +%%DATADIR%%/guacamole-auth-ban.tar.gz %%DATADIR%%/guacamole-auth-duo.tar.gz %%DATADIR%%/guacamole-auth-header.tar.gz %%DATADIR%%/guacamole-auth-jdbc.tar.gz %%DATADIR%%/guacamole-auth-json.tar.gz %%DATADIR%%/guacamole-auth-ldap.tar.gz %%DATADIR%%/guacamole-auth-quickconnect.tar.gz +%%DATADIR%%/guacamole-auth-restrict.tar.gz %%DATADIR%%/guacamole-auth-sso.tar.gz %%DATADIR%%/guacamole-auth-totp.tar.gz +%%DATADIR%%/guacamole-display-statistics.tar.gz %%DATADIR%%/guacamole-history-recording-storage.tar.gz %%DATADIR%%/guacamole-vault.tar.gz %%DATADIR%%/guacamole.war