From nobody Sun Jan 09 23:09:47 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0A3981928EE1; Sun, 9 Jan 2022 23:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JXCMv4bkJz4rX2; Sun, 9 Jan 2022 23:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5E7E11AB14; Sun, 9 Jan 2022 23:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 209N9lKI039777; Sun, 9 Jan 2022 23:09:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 209N9lFf039776; Sun, 9 Jan 2022 23:09:47 GMT (envelope-from git) Date: Sun, 9 Jan 2022 23:09:47 GMT Message-Id: <202201092309.209N9lFf039776@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Richard Gallamore Subject: git: 9f1b1be53d96 - main - *: Updated guacamole-[server|client] to 1.4.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ultima X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f1b1be53d965ca9eedef7a6547eb47973c8dae0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641769787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LHrhyoPj1i97c93TSuEAgsFqvjb7jziTt6G6h+trK8M=; b=rzVlym8913I0CdN+dRg4zyxkpb0nRQKlgfbFUe9TSeMycBFzcvUaOkOzOPNoNeDY2hKwSW FE3+m7LAlnXH945VqanvNGJDqOyzmhaYreoTpYYiXmpNJhvL2uwXdPtkFqZYXVXuVBlQu3 JN2uhc2zh/f6hyvEa2vfnFchQJp5IQew9v2Q+VtX4Dm/m6Fn6YOcGOc9F3qkn0V1gPMb8d szIt6gzjI7iBn1Ad97MDLImVhJY+ILuXCYjW3plO4KAjLA6gVty0HM3Og9lf/YLWWiO193 5ohBaqXabQkNyzf4q+/DXWB0AWzrghTEQctZBbE3V1DuYwKUwyjIoGIAmKkERA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641769787; a=rsa-sha256; cv=none; b=GlOU6mcsTW1cIONeIEPrnv7F9EVjbLX+9t2vP5wshYh2fYkVENPFHNQsFDqekDx2YRkX3j rBzqG/IrcRVG7UYTvt9MmI444Gd2G8lEkvq4OLu5zBpoqQUM5u7novfbcYuswHXz/hCZ/4 tv4tXXYx47U+OlvjOo5zoT4YLJyCihnG/P+yyLK67hCNaic7qYnFU4/XpmhVU2Gsvinlaw dQPOE/OWSGpTqu5uaJVrfLH58D7UrTU+ZjoMRBeFgU6G/RTK2M42cJDU13GuLjbgzopuu+ JU61TdaqwRXJ9IWlwKCdANW/GcStFGJ3SjYvZKW27AtWk3ixNAg7ygIRKjCnWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ultima: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f1b1be53d965ca9eedef7a6547eb47973c8dae0 commit 9f1b1be53d965ca9eedef7a6547eb47973c8dae0 Author: Richard Gallamore AuthorDate: 2022-01-09 22:58:13 +0000 Commit: Richard Gallamore CommitDate: 2022-01-09 23:09:24 +0000 *: Updated guacamole-[server|client] to 1.4.0 Major rework to guacamole-client. As of 1.4.0, guacamole-client requires npm to build. Instead of building guacamole-client, changed the port to simply downloading the precompiled binaries. Since the precompiled binaries don't completely adhere to heir, added symlink to appropriate location --- net/guacamole-server/Makefile | 3 +- net/guacamole-server/distinfo | 6 ++-- net/guacamole-server/pkg-plist | 4 +-- www/guacamole-client/Makefile | 51 ++++++++++++------------------- www/guacamole-client/distinfo | 24 ++++++++++++--- www/guacamole-client/files/pkg-message.in | 2 +- www/guacamole-client/pkg-plist | 6 ++-- 7 files changed, 49 insertions(+), 47 deletions(-) diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile index 249b38397dd6..8f171b0e0068 100644 --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -1,8 +1,7 @@ # Created by: Richard Gallamore PORTNAME= guacamole-server -DISTVERSION= 1.3.0 -PORTREVISION= 1 +DISTVERSION= 1.4.0 CATEGORIES= net MAINTAINER= ultima@FreeBSD.org diff --git a/net/guacamole-server/distinfo b/net/guacamole-server/distinfo index 40bb4aaf721e..c7238ad68f93 100644 --- a/net/guacamole-server/distinfo +++ b/net/guacamole-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611226900 -SHA256 (apache-guacamole-server-1.3.0_GH0.tar.gz) = 1a544d12b45d35c7c197e6729bece05136aaad4541f976fbb0cfaa41de57ef93 -SIZE (apache-guacamole-server-1.3.0_GH0.tar.gz) = 532339 +TIMESTAMP = 1641668633 +SHA256 (apache-guacamole-server-1.4.0_GH0.tar.gz) = 4646b7850828aa8f35d69308656479b3a4855cafbe6673ae575c0e282d298846 +SIZE (apache-guacamole-server-1.4.0_GH0.tar.gz) = 550354 diff --git a/net/guacamole-server/pkg-plist b/net/guacamole-server/pkg-plist index 4665b80878d4..1db6fc48bb75 100644 --- a/net/guacamole-server/pkg-plist +++ b/net/guacamole-server/pkg-plist @@ -65,8 +65,8 @@ include/guacamole/wol.h %%VNC%%lib/libguac-client-vnc.so.0.0.0 lib/libguac.a lib/libguac.so -lib/libguac.so.19 -lib/libguac.so.19.0.0 +lib/libguac.so.20 +lib/libguac.so.20.0.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 f2f3e37edee1..b1212909d287 100644 --- a/www/guacamole-client/Makefile +++ b/www/guacamole-client/Makefile @@ -1,31 +1,28 @@ # Created by: Richard Gallamore PORTNAME= guacamole-client -DISTVERSION= 1.3.0 +DISTVERSION= 1.4.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 +MASTER_SITES= ${MASTER_SITE_APACHE} +MASTER_SITE_SUBDIR= guacamole/${DISTVERSIONFULL}/binary +DISTFILES= guacamole-${DISTVERSIONFULL}.war \ + 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-totp-${DISTVERSIONFULL}${EXTRACT_SUFX} 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 +NO_BUILD= yes SUB_FILES= pkg-message @@ -42,31 +39,23 @@ TOMCAT_VARS= TOMCAT_VER=9.0 SERVER_RUN_DEPENDS= guacd:net/guacamole-server -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-extract: do-install: @${MKDIR} ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${ETCDIR} + @${MKDIR} ${STAGEDIR}/etc - ${INSTALL_DATA} ${WRKSRC}/guacamole/target/guacamole-${DISTVERSIONFULL}.war \ + ${INSTALL_DATA} ${_DISTDIR}/${DISTFILES:M*.war} \ ${STAGEDIR}${DATADIR}/guacamole.war -.for i in ${AUTH_EXTENSION} - ${INSTALL_DATA} ${WRKSRC}/extensions/guacamole-auth-$i/target/guacamole-auth-$i-*.tar.gz \ - ${STAGEDIR}/${DATADIR}/guacamole-auth-$i.tar.gz +.for i in ${DISTFILES:N*.war} + ${INSTALL_DATA} ${_DISTDIR}/${i}${DISTVERSIONFULL}${EXTRACT_SUFX} \ + ${STAGEDIR}/${DATADIR}/${i:S|-$||}${EXTRACT_SUFX} .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}/ + ${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/etc/guacamole do-install-TOMCAT-on: @${MKDIR} ${STAGEDIR}${PREFIX}/apache-tomcat-${TOMCAT_VER}/webapps diff --git a/www/guacamole-client/distinfo b/www/guacamole-client/distinfo index 05aefd49b7de..936efd124509 100644 --- a/www/guacamole-client/distinfo +++ b/www/guacamole-client/distinfo @@ -1,5 +1,19 @@ -TIMESTAMP = 1611111000 -SHA256 (guacamole-client/repository-1.3.0.tar.xz) = 26d844f88991b65e1f6bc4f5632082a5149b3232fbfd609d3521e436cb2aaacc -SIZE (guacamole-client/repository-1.3.0.tar.xz) = 67415228 -SHA256 (guacamole-client/apache-guacamole-client-1.3.0_GH0.tar.gz) = b1b37588ebb28846e1a8a289b3478445b753fc49aa978eacba906e129965e705 -SIZE (guacamole-client/apache-guacamole-client-1.3.0_GH0.tar.gz) = 6153515 +TIMESTAMP = 1641761453 +SHA256 (guacamole-client/guacamole-1.4.0.war) = 92fb06e3ce8fe4f932ddfdffd75a352c06ab58d3bd0a946faa5beda73e8592f0 +SIZE (guacamole-client/guacamole-1.4.0.war) = 13011205 +SHA256 (guacamole-client/guacamole-auth-duo-1.4.0.tar.gz) = 62917e25cb9b6c7e08c5e13da43308469fa58ab317cd7e1f9e140ec94e4a2fda +SIZE (guacamole-client/guacamole-auth-duo-1.4.0.tar.gz) = 3596849 +SHA256 (guacamole-client/guacamole-auth-header-1.4.0.tar.gz) = 3f5491737b3295056949d235120dca60ee9518c951b09271780dddf15166a9de +SIZE (guacamole-client/guacamole-auth-header-1.4.0.tar.gz) = 3566935 +SHA256 (guacamole-client/guacamole-auth-jdbc-1.4.0.tar.gz) = 47f4f121cad74ab64d5baf3d14e8f709677a26b3058005a977277a07716d4d9c +SIZE (guacamole-client/guacamole-auth-jdbc-1.4.0.tar.gz) = 16486378 +SHA256 (guacamole-client/guacamole-auth-json-1.4.0.tar.gz) = 7398f04ae1630c93249edb4f0f267ca43b3ba66722f23d13e05acf7d79a80468 +SIZE (guacamole-client/guacamole-auth-json-1.4.0.tar.gz) = 11511282 +SHA256 (guacamole-client/guacamole-auth-ldap-1.4.0.tar.gz) = f28488717b26168a5396e125ec7fbff1b7268a658c6100f6ad1bbfbd18a17779 +SIZE (guacamole-client/guacamole-auth-ldap-1.4.0.tar.gz) = 9575832 +SHA256 (guacamole-client/guacamole-auth-quickconnect-1.4.0.tar.gz) = 5c4f6c5d581b7420bf658d16be585a9ef4499c3dabac14ac4289b73640665117 +SIZE (guacamole-client/guacamole-auth-quickconnect-1.4.0.tar.gz) = 3584581 +SHA256 (guacamole-client/guacamole-auth-sso-1.4.0.tar.gz) = 55ef6adac3beb753361b67eadda1c789ce3ffc70fe74794e9ddef70d8e6b8b8c +SIZE (guacamole-client/guacamole-auth-sso-1.4.0.tar.gz) = 22414937 +SHA256 (guacamole-client/guacamole-auth-totp-1.4.0.tar.gz) = 4c4c5390eecb68d1df07e15fa25829e51a079d4a83887c5e417ac8d7419e787b +SIZE (guacamole-client/guacamole-auth-totp-1.4.0.tar.gz) = 4769666 diff --git a/www/guacamole-client/files/pkg-message.in b/www/guacamole-client/files/pkg-message.in index da50a7500211..ea724c5735c3 100644 --- a/www/guacamole-client/files/pkg-message.in +++ b/www/guacamole-client/files/pkg-message.in @@ -6,7 +6,7 @@ For a quick Guacamole setup and test: cp %%ETCDIR%%/user-mapping.xml.sample \ %%ETCDIR%%/user-mapping.xml - Once tomcat8 and guacd are running + Once tomcat and guacd are running http://localhost:8080/guacamole For upgrading guacamole, this is a reminder to upgrade diff --git a/www/guacamole-client/pkg-plist b/www/guacamole-client/pkg-plist index 71e64f4b006e..e8bc0fac9404 100644 --- a/www/guacamole-client/pkg-plist +++ b/www/guacamole-client/pkg-plist @@ -1,14 +1,14 @@ +/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-duo.tar.gz -%%DATADIR%%/guacamole-auth-cas.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-openid.tar.gz %%DATADIR%%/guacamole-auth-quickconnect.tar.gz -%%DATADIR%%/guacamole-auth-saml.tar.gz +%%DATADIR%%/guacamole-auth-sso.tar.gz %%DATADIR%%/guacamole-auth-totp.tar.gz %%DATADIR%%/guacamole.war