Index: head/net/guacamole-server/Makefile =================================================================== --- head/net/guacamole-server/Makefile (revision 525691) +++ head/net/guacamole-server/Makefile (revision 525692) @@ -1,87 +1,91 @@ # Created by: Richard Gallamore # $FreeBSD$ PORTNAME= guacamole-server -DISTVERSION= 1.0.0 -PORTREVISION= 2 +DISTVERSION= 1.1.0 CATEGORIES= net MAINTAINER= ultima@FreeBSD.org COMMENT= HTML5 Clientless Remote Desktop 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 gnome jpeg libtool localbase pkgconfig shebangfix USE_GITHUB= yes GH_ACCOUNT= apache USE_GNOME= cairo USE_LDCONFIG= yes USE_RC_SUBR= guacd SHEBANG_FILES= ${WRKSRC}/src/protocols/rdp/keymaps/generate.pl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-guacd-conf=${ETCDIR}/guacd.conf INSTALL_TARGET= install-strip USERS= guacamole GROUPS= guacamole SUB_LIST= GUACD_USER=${USERS} \ GUACD_GROUP=${GROUPS} OPTIONS_DEFINE= GUACENC GUACLOG NLS SSL WEBP -OPTIONS_DEFAULT= GUACENC GUACLOG PULSEAUDIO RDP SSH SSL VNC VORBIS WEBP +OPTIONS_DEFAULT= GUACENC GUACLOG KUBERNETES PULSEAUDIO RDP \ + SSH SSL VNC VORBIS WEBP OPTIONS_GROUP= SP AUDIO -OPTIONS_GROUP_SP= RDP SSH VNC +OPTIONS_GROUP_SP= RDP KUBERNETES 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_WITH= kubernetes pango terminal +KUBERNETES_LIB_DEPENDS= libwebsockets.so:net/libwebsockets +KUBERNETES_USE= GNOME=pango NLS_USES= gettext-runtime PULSEAUDIO_CONFIGURE_WITH= pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio RDP_CONFIGURE_WITH= rdp -RDP_LIB_DEPENDS= libfreerdp1.so:net/freerdp1 +RDP_LIB_DEPENDS= libfreerdp2.so:net/freerdp SSH_CONFIGURE_WITH= pango ssh terminal SSH_IMPLIES= SSL SSH_LIB_DEPENDS= libssh2.so:security/libssh2 SSH_USE= GNOME=pango 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 post-patch: @${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} ${INSTALL_DATA} ${FILESDIR}/guacd.conf.sample ${STAGEDIR}${ETCDIR} .include Index: head/net/guacamole-server/distinfo =================================================================== --- head/net/guacamole-server/distinfo (revision 525691) +++ head/net/guacamole-server/distinfo (revision 525692) @@ -1,3 +1,3 @@ -TIMESTAMP = 1547246983 -SHA256 (apache-guacamole-server-1.0.0_GH0.tar.gz) = d93d7014a9f2a8f689a790b041cef37326d14982d0ff0c0517f92c84f0bf3ef8 -SIZE (apache-guacamole-server-1.0.0_GH0.tar.gz) = 441591 +TIMESTAMP = 1581290732 +SHA256 (apache-guacamole-server-1.1.0_GH0.tar.gz) = d0f0c66ebfa7a4fd6689ae5240f21797b5177945a042388b691b15b8bd5c81a8 +SIZE (apache-guacamole-server-1.1.0_GH0.tar.gz) = 502009 Index: head/net/guacamole-server/files/patch-configure.ac =================================================================== --- head/net/guacamole-server/files/patch-configure.ac (revision 525691) +++ head/net/guacamole-server/files/patch-configure.ac (nonexistent) @@ -1,66 +0,0 @@ ---- configure.ac.orig 2016-12-04 15:16:36 UTC -+++ configure.ac -@@ -389,13 +389,13 @@ then - event_interface=unknown - - # libfreerdp-core / libfreerdp -- AC_CHECK_LIB([freerdp-core], [freerdp_new], -- [RDP_LIBS="$RDP_LIBS -lfreerdp-core"], -- [AC_CHECK_LIB([freerdp], [freerdp_new], -- [RDP_LIBS="$RDP_LIBS -lfreerdp -lfreerdp-client"], -+ AC_CHECK_LIB([freerdp1-core], [freerdp_new], -+ [RDP_LIBS="$RDP_LIBS -lfreerdp1-core"], -+ [AC_CHECK_LIB([freerdp1], [freerdp_new], -+ [RDP_LIBS="$RDP_LIBS -lfreerdp1 -lfreerdp1-client"], - [AC_MSG_WARN([ - -------------------------------------------- -- Unable to find libfreerdp-core / libfreerdp -+ Unable to find libfreerdp1-core / libfreerdp1 - RDP will be disabled. - --------------------------------------------]) - have_freerdp=no])]) -@@ -405,33 +405,33 @@ fi - # libfreerdp-cache - if test "x${have_freerdp}" = "xyes" - then -- AC_CHECK_LIB([freerdp-cache], [glyph_cache_register_callbacks], -- [RDP_LIBS="$RDP_LIBS -lfreerdp-cache"]) -+ AC_CHECK_LIB([freerdp1-cache], [glyph_cache_register_callbacks], -+ [RDP_LIBS="$RDP_LIBS -lfreerdp1-cache"]) - fi - - # libfreerdp-channels (1.0) / libfreerdp-client + libfreerdp-core (1.1) - if test "x${have_freerdp}" = "xyes" - then -- AC_CHECK_LIB([freerdp-client], [freerdp_channels_new], -- [RDP_LIBS="$RDP_LIBS -lfreerdp-client"], -- [AC_CHECK_LIB([freerdp-channels], [freerdp_channels_new], -- [RDP_LIBS="$RDP_LIBS -lfreerdp-channels" -+ AC_CHECK_LIB([freerdp1-client], [freerdp_channels_new], -+ [RDP_LIBS="$RDP_LIBS -lfreerdp1-client"], -+ [AC_CHECK_LIB([freerdp1-channels], [freerdp_channels_new], -+ [RDP_LIBS="$RDP_LIBS -lfreerdp1-channels" - legacy_freerdp_extensions=yes])], -- [-lfreerdp-core]) -+ [-lfreerdp1-core]) - fi - - # libfreerdp-utils - if test "x${have_freerdp}" = "xyes" - then -- AC_CHECK_LIB([freerdp-utils], [svc_plugin_init], -- [RDP_LIBS="$RDP_LIBS -lfreerdp-utils"]) -+ AC_CHECK_LIB([freerdp1-utils], [svc_plugin_init], -+ [RDP_LIBS="$RDP_LIBS -lfreerdp1-utils"]) - fi - - # libfreerdp-codec - if test "x${have_freerdp}" = "xyes" - then -- AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert], -- [RDP_LIBS="$RDP_LIBS -lfreerdp-codec"]) -+ AC_CHECK_LIB([freerdp1-codec], [freerdp_image_convert], -+ [RDP_LIBS="$RDP_LIBS -lfreerdp1-codec"]) - fi - - # Available color conversion functions Property changes on: head/net/guacamole-server/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/guacamole-server/pkg-plist =================================================================== --- head/net/guacamole-server/pkg-plist (revision 525691) +++ head/net/guacamole-server/pkg-plist (revision 525692) @@ -1,65 +1,69 @@ %%GUACENC%%bin/guacenc %%GUACLOG%%bin/guaclog %%ETCDIR%%/guacd.conf.sample 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/error-types.h include/guacamole/error.h include/guacamole/hash.h include/guacamole/layer-types.h include/guacamole/layer.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/protocol-constants.h include/guacamole/protocol-types.h include/guacamole/protocol.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/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 -%%RDP%%lib/freerdp/guacai-client.so -%%RDP%%lib/freerdp/guacdr-client.so -%%RDP%%lib/freerdp/guacsnd-client.so -%%RDP%%lib/freerdp/guacsvc-client.so +%%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.16 -lib/libguac.so.16.0.0 +lib/libguac.so.17 +lib/libguac.so.17.0.0 %%GUACENC%%man/man1/guacenc.1.gz %%GUACLOG%%man/man1/guaclog.1.gz man/man5/guacd.conf.5.gz man/man8/guacd.8.gz sbin/guacd Index: head/www/guacamole-client/Makefile =================================================================== --- head/www/guacamole-client/Makefile (revision 525691) +++ head/www/guacamole-client/Makefile (revision 525692) @@ -1,78 +1,77 @@ # Created by: Richard Gallamore # $FreeBSD$ PORTNAME= guacamole-client -DISTVERSION= 1.0.0 -PORTREVISION= 2 +DISTVERSION= 1.1.0 CATEGORIES= www java MASTER_SITES+= https://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo \ http://sourceforge.net/projects/distfiles/files/${PORTNAME}/:repo DISTFILES= repository-${DISTVERSION}${EXTRACT_SUFX}:repo DIST_SUBDIR= ${PORTNAME} MAINTAINER= ultima@FreeBSD.org COMMENT= HTML5 Clientless Remote Desktop LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33 USES= tar:xz USE_JAVA= yes JAVA_VERSION= 1.8+ USE_GITHUB= yes GH_ACCOUNT= apache MVN= mvn MVN_ARGS= package -Duser.home=${WRKDIR} NO_ARCH= 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 AUTH_EXTENSION= cas duo header ldap openid quickconnect totp post-patch: @${REINPLACE_CMD} 's|/etc/guacamole|${ETCDIR}| ; \ s|"/etc"|"${ETCDIR:S|/${PORTNAME}||}"|' \ ${WRKSRC}/guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java do-build: cd ${WRKSRC} && ${MVN} ${MVN_ARGS} do-install: @${MKDIR} ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/guacamole/target/guacamole-${DISTVERSIONFULL}.war \ ${STAGEDIR}${DATADIR}/guacamole.war .for i in ${AUTH_EXTENSION} ${INSTALL_DATA} ${WRKSRC}/extensions/guacamole-auth-$i/target/guacamole-auth-$i-${DISTVERSIONFULL}.tar.gz \ ${STAGEDIR}/${DATADIR}/guacamole-auth-$i.tar.gz .endfor ${INSTALL_DATA} ${WRKSRC}/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/target/guacamole-auth-jdbc-${DISTVERSIONFULL}.tar.gz \ ${STAGEDIR}/${DATADIR}/guacamole-auth-jdbc.tar.gz ${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}/ 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 Index: head/www/guacamole-client/distinfo =================================================================== --- head/www/guacamole-client/distinfo (revision 525691) +++ head/www/guacamole-client/distinfo (revision 525692) @@ -1,5 +1,5 @@ -TIMESTAMP = 1547351778 -SHA256 (guacamole-client/repository-1.0.0.tar.xz) = b2a6d480ddbe40dec2c9af67730574c957dee7c037f21e82538174528b344daa -SIZE (guacamole-client/repository-1.0.0.tar.xz) = 56084152 -SHA256 (guacamole-client/apache-guacamole-client-1.0.0_GH0.tar.gz) = 6c44a41bbeec50301462f3bef23a479d207e754b604f61044400402f6b2b85ca -SIZE (guacamole-client/apache-guacamole-client-1.0.0_GH0.tar.gz) = 5978548 +TIMESTAMP = 1581312334 +SHA256 (guacamole-client/repository-1.1.0.tar.xz) = d744383a1f195cb4c5c431cf72e27f16232dcd150289a457dbe1f86cb4af0620 +SIZE (guacamole-client/repository-1.1.0.tar.xz) = 61660412 +SHA256 (guacamole-client/apache-guacamole-client-1.1.0_GH0.tar.gz) = be34e5afd1518e8e7e42233544efc7642f0a3388c76fee0ca16568485655ce11 +SIZE (guacamole-client/apache-guacamole-client-1.1.0_GH0.tar.gz) = 6034631