Date: Tue, 11 Feb 2020 01:20:10 +0000 (UTC) From: Richard Gallamore <ultima@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525771 - in head/net/guacamole-server: . files Message-ID: <202002110120.01B1KAF2051839@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ultima Date: Tue Feb 11 01:20:10 2020 New Revision: 525771 URL: https://svnweb.freebsd.org/changeset/ports/525771 Log: Added homedir to fix issues with librdp2. Without this users get permission errors when attempting to connect using this protocol. Reordered GROUP_SP to maintain alphabetical sort. Modified: head/net/guacamole-server/Makefile head/net/guacamole-server/files/guacd.in head/net/guacamole-server/pkg-plist Modified: head/net/guacamole-server/Makefile ============================================================================== --- head/net/guacamole-server/Makefile Tue Feb 11 01:11:42 2020 (r525770) +++ head/net/guacamole-server/Makefile Tue Feb 11 01:20:10 2020 (r525771) @@ -3,6 +3,7 @@ PORTNAME= guacamole-server DISTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= ultima@FreeBSD.org @@ -30,17 +31,23 @@ 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_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= RDP KUBERNETES SSH VNC +OPTIONS_GROUP_SP= KUBERNETES RDP SSH VNC OPTIONS_GROUP_AUDIO= VORBIS PULSEAUDIO OPTIONS_SUB= yes @@ -85,7 +92,7 @@ post-patch: ${WRKSRC}/src/guacd/man/guacd.conf.5.in post-install: - @${MKDIR} ${STAGEDIR}${ETCDIR} + @${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${GUACAMOLE_HOME} ${INSTALL_DATA} ${FILESDIR}/guacd.conf.sample ${STAGEDIR}${ETCDIR} .include <bsd.port.mk> Modified: head/net/guacamole-server/files/guacd.in ============================================================================== --- head/net/guacamole-server/files/guacd.in Tue Feb 11 01:11:42 2020 (r525770) +++ head/net/guacamole-server/files/guacd.in Tue Feb 11 01:20:10 2020 (r525771) @@ -10,6 +10,8 @@ # # guacd_enable (bool): Set to "NO" by default. # Set it to "YES" to enable guacd. +# guacd_home (str): Home directory for guacd to use +# Default to "%%GUACD_HOME%%" created by the port # guacd_user (str): User to run guacd as # Default to "%%GUACD_USER%%" created by the port # guacd_group (str): Group to run guacd as @@ -24,9 +26,12 @@ rcvar=${name}_enable load_rc_config ${name} : ${guacd_enable:="NO"} +: ${guacd_home:="%%GUACD_HOME%%"} : ${guacd_user:="%%GUACD_USER%%"} : ${guacd_group:="%%GUACD_GROUP%%"} : ${guacd_pidfile:="/var/run/${name}/${name}.pid"} + +guacd_env="$guacd_env HOME=$guacd_home" command=%%PREFIX%%/sbin/guacd pidfile=${guacd_pidfile} Modified: head/net/guacamole-server/pkg-plist ============================================================================== --- head/net/guacamole-server/pkg-plist Tue Feb 11 01:11:42 2020 (r525770) +++ head/net/guacamole-server/pkg-plist Tue Feb 11 01:20:10 2020 (r525771) @@ -67,3 +67,4 @@ lib/libguac.so.17.0.0 man/man5/guacd.conf.5.gz man/man8/guacd.8.gz sbin/guacd +@dir(%%GUACD_USER%%,%%GUACD_GROUP%%,) %%GUACD_HOME%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002110120.01B1KAF2051839>