Date: Wed, 26 Dec 2012 18:17:31 GMT From: Koichiro IWAO <meta+ports@vmeta.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/174721: [maintainer update] net/xrdp: fix install-time RSA key generation Message-ID: <201212261817.qBQIHVhI001203@red.freebsd.org> Resent-Message-ID: <201212261820.qBQIK0Eh071296@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174721
>Category: ports
>Synopsis: [maintainer update] net/xrdp: fix install-time RSA key generation
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 26 18:20:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Koichiro IWAO
>Release: 9.1-RELEASE
>Organization:
>Environment:
FreeBSD ports-dev.vmeta.jp 9.1-RELEASE FreeBSD 9.1-RELEASE #2 r244665: Wed Dec 26 03:45:20 JST 2012 root@icepick.vmeta.jp:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
My previous PR ports/173566 doesn't properly generate RSA key.
- Fix install time RSA key pair generation
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/net/xrdp/Makefile net/xrdp/Makefile
--- /usr/ports/net/xrdp/Makefile 2012-12-26 12:40:27.000000000 +0000
+++ net/xrdp/Makefile 2012-12-26 16:58:15.487366033 +0000
@@ -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 @@
${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>
diff -ruN /usr/ports/net/xrdp/pkg-plist net/xrdp/pkg-plist
--- /usr/ports/net/xrdp/pkg-plist 2012-12-26 12:40:27.000000000 +0000
+++ net/xrdp/pkg-plist 2012-12-26 17:46:41.867366265 +0000
@@ -52,7 +52,8 @@
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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212261817.qBQIHVhI001203>