Index: head/net/guacamole-server/Makefile =================================================================== --- head/net/guacamole-server/Makefile (revision 542386) +++ head/net/guacamole-server/Makefile (revision 542387) @@ -1,99 +1,99 @@ # Created by: Richard Gallamore # $FreeBSD$ PORTNAME= guacamole-server -DISTVERSION= 1.1.0 -PORTREVISION= 1 +DISTVERSION= 1.2.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 compiler:c11 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 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_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= 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/-Werror//' ${WRKSRC}/src/libguac/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 Index: head/net/guacamole-server/distinfo =================================================================== --- head/net/guacamole-server/distinfo (revision 542386) +++ head/net/guacamole-server/distinfo (revision 542387) @@ -1,3 +1,3 @@ -TIMESTAMP = 1581290732 -SHA256 (apache-guacamole-server-1.1.0_GH0.tar.gz) = d0f0c66ebfa7a4fd6689ae5240f21797b5177945a042388b691b15b8bd5c81a8 -SIZE (apache-guacamole-server-1.1.0_GH0.tar.gz) = 502009 +TIMESTAMP = 1594877637 +SHA256 (apache-guacamole-server-1.2.0_GH0.tar.gz) = 31212aa115a326030ccb58c76a77554a60c2c8bcdf285baab22af9f2a043bb06 +SIZE (apache-guacamole-server-1.2.0_GH0.tar.gz) = 523137 Index: head/net/guacamole-server/pkg-plist =================================================================== --- head/net/guacamole-server/pkg-plist (revision 542386) +++ head/net/guacamole-server/pkg-plist (revision 542387) @@ -1,70 +1,72 @@ %%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 +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.17 -lib/libguac.so.17.0.0 +lib/libguac.so.17.1.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 @dir(%%GUACD_USER%%,%%GUACD_GROUP%%,) %%GUACD_HOME%% Index: head/www/guacamole-client/Makefile =================================================================== --- head/www/guacamole-client/Makefile (revision 542386) +++ head/www/guacamole-client/Makefile (revision 542387) @@ -1,77 +1,77 @@ # Created by: Richard Gallamore # $FreeBSD$ PORTNAME= guacamole-client -DISTVERSION= 1.1.0 +DISTVERSION= 1.2.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 +AUTH_EXTENSION= cas duo header ldap openid quickconnect saml 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 542386) +++ head/www/guacamole-client/distinfo (revision 542387) @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1594924532 +SHA256 (guacamole-client/repository-1.2.0.tar.xz) = 6c56e869feee0195e202fa181140e30789f62bf73248f615ffd546de6315e6df +SIZE (guacamole-client/repository-1.2.0.tar.xz) = 66204420 +SHA256 (guacamole-client/apache-guacamole-client-1.2.0_GH0.tar.gz) = 2327368a32e61cf82032311be79ded4e5eefbc59ac9fb6e0a054b4f49168843e +SIZE (guacamole-client/apache-guacamole-client-1.2.0_GH0.tar.gz) = 6116116 Index: head/www/guacamole-client/pkg-plist =================================================================== --- head/www/guacamole-client/pkg-plist (revision 542386) +++ head/www/guacamole-client/pkg-plist (revision 542387) @@ -1,13 +1,14 @@ %%TOMCAT%%apache-tomcat-%%TOMCAT_VER%%/webapps/guacamole.war %%ETCDIR%%/guacamole.properties.sample %%ETCDIR%%/logback.xml.sample %%ETCDIR%%/user-mapping.xml.sample %%DATADIR%%/guacamole-auth-duo.tar.gz %%DATADIR%%/guacamole-auth-cas.tar.gz %%DATADIR%%/guacamole-auth-header.tar.gz %%DATADIR%%/guacamole-auth-jdbc.tar.gz %%DATADIR%%/guacamole-auth-ldap.tar.gz %%DATADIR%%/guacamole-auth-openid.tar.gz %%DATADIR%%/guacamole-auth-quickconnect.tar.gz +%%DATADIR%%/guacamole-auth-saml.tar.gz %%DATADIR%%/guacamole-auth-totp.tar.gz %%DATADIR%%/guacamole.war