Attachment 130732 Details for Bug 174721 – file.diff

[patch] file.diff

file.diff (text/plain), 1.72 KB, created by Koichiro Iwao on 2012-12-26 18:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koichiro Iwao

Created: 2012-12-26 18:20:00 UTC

Size: 1.72 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 174721: 130732