Date: Wed, 9 Jan 2013 06:51:24 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310124 - head/net/xrdp Message-ID: <201301090651.r096pOTd074952@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Wed Jan 9 06:51:24 2013 New Revision: 310124 URL: http://svnweb.freebsd.org/changeset/ports/310124 Log: - Fix install time RSA key pair generation PR: ports/174721 Submitted by: Koichiro IWAO <meta+ports@vmeta.jp> (maintainer) Modified: head/net/xrdp/Makefile head/net/xrdp/pkg-plist Modified: head/net/xrdp/Makefile ============================================================================== --- head/net/xrdp/Makefile Wed Jan 9 04:21:34 2013 (r310123) +++ head/net/xrdp/Makefile Wed Jan 9 06:51:24 2013 (r310124) @@ -3,7 +3,7 @@ PORTNAME= xrdp PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF/xrdp/xrdp/${PORTVERSION} @@ -76,8 +76,8 @@ post-install: ${CP} -p ${PREFIX}/etc/xrdp/$f.sample ${PREFIX}/etc/xrdp/$f ; \ fi .endfor - @cmp -s ${PREFIX}/etc/xrdp/rsakeys.ini.sample ${PREFIX}/etc/xrdp/rsakeys.ini || \ - ${PREFIX}/bin/xrdp-keygen xrdp ${PREFIX}/etc/xrdp/rsakeys.ini + @if cmp -s ${PREFIX}/etc/xrdp/rsakeys.ini.sample ${PREFIX}/etc/xrdp/rsakeys.ini; then \ + ${PREFIX}/bin/xrdp-keygen xrdp ${PREFIX}/etc/xrdp/rsakeys.ini; fi @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} .include <bsd.port.mk> Modified: head/net/xrdp/pkg-plist ============================================================================== --- head/net/xrdp/pkg-plist Wed Jan 9 04:21:34 2013 (r310123) +++ head/net/xrdp/pkg-plist Wed Jan 9 06:51:24 2013 (r310124) @@ -52,7 +52,8 @@ etc/xrdp/rsakeys.ini.sample etc/xrdp/sesman.ini.sample etc/xrdp/startwm.sh.sample etc/xrdp/xrdp.ini.sample -@exec cmp -s %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini || %D/bin/xrdp-keygen xrdp %D/etc/xrdp/rsakeys.ini +@comment backup pre-compile-time keypair and generate new one +@exec if [ -f %D/etc/xrdp/rsakeys.ini ]; then cp -a %D/etc/xrdp/rsakeys.ini %D/etc/xrdp/rsakeys.ini.bak`date +%%Y%%m%%d`; %D/bin/xrdp-keygen xrdp %D/etc/xrdp/rsakeys.ini; fi @exec [ -f %D/etc/xrdp/sesman.ini ] || cp -p %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini @exec [ -f %D/etc/xrdp/startwm.sh ] || cp -p %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh @exec [ -f %D/etc/xrdp/xrdp.ini ] || cp -p %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301090651.r096pOTd074952>