Index: head/net/guacamole-server/Makefile =================================================================== --- head/net/guacamole-server/Makefile (revision 490439) +++ head/net/guacamole-server/Makefile (revision 490440) @@ -1,86 +1,87 @@ # Created by: Richard Gallamore # $FreeBSD$ PORTNAME= guacamole-server -DISTVERSION= 0.9.14 -PORTREVISION= 4 +DISTVERSION= 1.0.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 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 NLS SSL WEBP -OPTIONS_DEFAULT= GUACENC PULSEAUDIO RDP SSH SSL VNC VORBIS WEBP +OPTIONS_DEFINE= GUACENC GUACLOG NLS SSL WEBP +OPTIONS_DEFAULT= GUACENC GUACLOG PULSEAUDIO RDP SSH SSL VNC VORBIS WEBP OPTIONS_GROUP= SP AUDIO OPTIONS_GROUP_SP= 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 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 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 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 490439) +++ head/net/guacamole-server/distinfo (revision 490440) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516318156 -SHA256 (apache-guacamole-server-0.9.14_GH0.tar.gz) = 3a4e3f856ebf3daacaf08b93b45a013f919530a11d86cc5c41f858b3bc2984b6 -SIZE (apache-guacamole-server-0.9.14_GH0.tar.gz) = 412667 +TIMESTAMP = 1547246983 +SHA256 (apache-guacamole-server-1.0.0_GH0.tar.gz) = d93d7014a9f2a8f689a790b041cef37326d14982d0ff0c0517f92c84f0bf3ef8 +SIZE (apache-guacamole-server-1.0.0_GH0.tar.gz) = 441591 Index: head/net/guacamole-server/pkg-plist =================================================================== --- head/net/guacamole-server/pkg-plist (revision 490439) +++ head/net/guacamole-server/pkg-plist (revision 490440) @@ -1,63 +1,65 @@ +%%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/parser-constants.h -include/guacamole/parser-types.h -include/guacamole/parser.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-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/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/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.12 -lib/libguac.so.12.3.0 +lib/libguac.so.16 +lib/libguac.so.16.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 -%%GUACENC%%man/man1/guacenc.1.gz sbin/guacd -%%GUACENC%%bin/guacenc Index: head/www/guacamole-client/Makefile =================================================================== --- head/www/guacamole-client/Makefile (revision 490439) +++ head/www/guacamole-client/Makefile (revision 490440) @@ -1,75 +1,74 @@ # Created by: Richard Gallamore # $FreeBSD$ PORTNAME= guacamole-client -DISTVERSION= 0.9.14 -PORTREVISION= 1 +DISTVERSION= 1.0.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_RUN_DEPENDS= ${LOCALBASE}/apache-tomcat-8.0/bin/bootstrap.jar:www/tomcat8 SERVER_RUN_DEPENDS= guacd:net/guacamole-server -AUTH_EXTENSION= cas duo header ldap noauth openid +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-8.0/webapps ${RLN} ${STAGEDIR}${DATADIR}/guacamole.war \ ${STAGEDIR}${PREFIX}/apache-tomcat-8.0/webapps .include Index: head/www/guacamole-client/distinfo =================================================================== --- head/www/guacamole-client/distinfo (revision 490439) +++ head/www/guacamole-client/distinfo (revision 490440) @@ -1,5 +1,5 @@ -TIMESTAMP = 1516328642 -SHA256 (guacamole-client/repository-0.9.14.tar.xz) = e43889aec0a36c799283d935f4dc3889a62862c9cd68ef25f9ca930c0a113d5d -SIZE (guacamole-client/repository-0.9.14.tar.xz) = 48252548 -SHA256 (guacamole-client/apache-guacamole-client-0.9.14_GH0.tar.gz) = 2b2df9ee951696c29a2c1d9b0415c7d5742f3dee33da6dea4b52082bd8e04db0 -SIZE (guacamole-client/apache-guacamole-client-0.9.14_GH0.tar.gz) = 5821042 +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 Index: head/www/guacamole-client/files/pkg-message.in =================================================================== --- head/www/guacamole-client/files/pkg-message.in (revision 490439) +++ head/www/guacamole-client/files/pkg-message.in (revision 490440) @@ -1,6 +1,11 @@ +For a quick Guacamole setup and test: Guacamole-client requires authentication to start. cp %%ETCDIR%%/user-mapping.xml.sample \ %%ETCDIR%%/user-mapping.xml Once tomcat8 and guacd are running http://localhost:8080/guacamole + +For upgrading guacamole, this is a reminder to upgrade +the auth-extensions. (and database if jdbc is used) +https://guacamole.apache.org/doc/gug/jdbc-auth.html Index: head/www/guacamole-client/pkg-plist =================================================================== --- head/www/guacamole-client/pkg-plist (revision 490439) +++ head/www/guacamole-client/pkg-plist (revision 490440) @@ -1,12 +1,13 @@ %%TOMCAT%%apache-tomcat-8.0/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-noauth.tar.gz %%DATADIR%%/guacamole-auth-openid.tar.gz +%%DATADIR%%/guacamole-auth-quickconnect.tar.gz +%%DATADIR%%/guacamole-auth-totp.tar.gz %%DATADIR%%/guacamole.war