From nobody@FreeBSD.org  Sun Nov 11 19:03:10 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 74522611
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Nov 2012 19:03:10 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 59B2D8FC16
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Nov 2012 19:03:10 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qABJ39eW095843
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 11 Nov 2012 19:03:09 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qABJ39LU095842;
	Sun, 11 Nov 2012 19:03:09 GMT
	(envelope-from nobody)
Message-Id: <201211111903.qABJ39LU095842@red.freebsd.org>
Date: Sun, 11 Nov 2012 19:03:09 GMT
From: Koichiro IWAO <meta+ports@vmeta.jp>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] net/xrdp: change install-time behaviour to generate new RSA key pair
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         173566
>Category:       ports
>Synopsis:       [maintainer update] net/xrdp: change install-time behaviour to generate new RSA key pair
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 11 19:10:00 UTC 2012
>Closed-Date:    Wed Dec 26 12:27:43 UTC 2012
>Last-Modified:  Wed Dec 26 12:30:00 UTC 2012
>Originator:     Koichiro IWAO
>Release:        9.1-RC2
>Organization:
>Environment:
FreeBSD ports-dev.vmeta.jp 9.1-RC2 FreeBSD 9.1-RC2 #1 r241308: Mon Oct  8 00:22:22 JST 2012     root@icepick.vmeta.jp:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
- Change install-time bevaviour to generate new RSA key pair
- Update rc script in order to control daemons xrdp and xrdp-sesman separately
- Update WWW in pkg-descr
- Trim Makefile header
>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-10-06 10:25:46.000000000 +0900
+++ net/xrdp/Makefile	2012-11-12 03:41:35.880427979 +0900
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	xrdp
-# Date created:				2007-02-19
-# Whom:					alepulver
-#
-# $FreeBSD: ports/net/xrdp/Makefile,v 1.20 2012/10/06 01:25:46 swills Exp $
-#
+# Created by: alepulver
+# $FreeBSD$
 
 PORTNAME=	xrdp
 PORTVERSION=	0.6.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/xrdp/xrdp/${PORTVERSION}
@@ -79,6 +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
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/net/xrdp/files/pkg-message.in net/xrdp/files/pkg-message.in
--- /usr/ports/net/xrdp/files/pkg-message.in	2012-08-06 20:55:56.000000000 +0900
+++ net/xrdp/files/pkg-message.in	2012-11-12 01:21:37.147428113 +0900
@@ -6,6 +6,7 @@
 in /etc/rc.conf:
 
 xrdp_enable="YES"
+xrdp_sesman_enable="YES" # if you want to run xrdp-sesman on the same machine
 
 Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"
 and the "%%PREFIX%%/etc/xrdp/startwm.sh" script.
diff -ruN /usr/ports/net/xrdp/files/xrdp.in net/xrdp/files/xrdp.in
--- /usr/ports/net/xrdp/files/xrdp.in	2012-08-06 20:55:56.000000000 +0900
+++ net/xrdp/files/xrdp.in	2012-11-12 01:23:51.334427550 +0900
@@ -3,19 +3,24 @@
 # $FreeBSD: ports/net/xrdp/files/xrdp.in,v 1.6 2012/08/06 11:55:56 ak Exp $
 #
 # REQUIRE: DAEMON
-# PROVIDE: xrdp sesman
+# PROVIDE: xrdp xrdp_sesman
 #
 
 . /etc/rc.subr
 
 name="xrdp"
 rcvar=xrdp_enable
-xrdp_daemons="xrdp xrdpsesman"
+xrdp_daemons="xrdp"
 
 # Read settings and set default values.
 load_rc_config "$name"
 : ${xrdp_enable="NO"}
 
+# Enable/disable dependent daemon.
+if [ -n "${rcvar}" ] && checkyesno "xrdp_sesman_enable"; then
+	xrdp_daemons="xrdp xrdp_sesman"
+fi
+
 # Commands.
 extra_commands="reload status"
 start_cmd="xrdp_cmd"
@@ -36,7 +41,7 @@
     # Apply to all the daemons.
     for name in ${xrdp_daemons}; do
 	rcvar=${name}_enable
-	if [ "${name}" = "xrdpsesman" ]; then
+	if [ "${name}" = "xrdp_sesman" ]; then
 		command="%%PREFIX%%/sbin/xrdp-sesman"
 		pidfile="/var/run/xrdp-sesman.pid"
 	else
diff -ruN /usr/ports/net/xrdp/pkg-descr net/xrdp/pkg-descr
--- /usr/ports/net/xrdp/pkg-descr	2007-05-04 10:12:46.000000000 +0900
+++ net/xrdp/pkg-descr	2012-11-12 00:32:07.080429213 +0900
@@ -10,4 +10,4 @@
 
 Xrdp uses Xvnc or X11rdp to manage the X session.
 
-WWW: http://xrdp.sourceforge.net/
+WWW: http://www.xrdp.org/
diff -ruN /usr/ports/net/xrdp/pkg-plist net/xrdp/pkg-plist
--- /usr/ports/net/xrdp/pkg-plist	2012-10-06 10:25:46.000000000 +0900
+++ net/xrdp/pkg-plist	2012-11-12 03:38:07.422428894 +0900
@@ -5,30 +5,6 @@
 bin/xrdp-sesadmin
 bin/xrdp-sesrun
 bin/xrdp-sestest
-etc/pam.d/xrdp-sesman
-etc/xrdp/km-0407.ini
-etc/xrdp/km-0409.ini
-etc/xrdp/km-040c.ini
-etc/xrdp/km-0410.ini
-etc/xrdp/km-0419.ini
-etc/xrdp/km-041d.ini
-%%JP106%%etc/xrdp/km-0411.ini
-%%JP106%%etc/xrdp/km-e0200411.ini
-%%JP106%%etc/xrdp/km-e0010411.ini
-%%JP106%%etc/xrdp/km-e0210411.ini
-@unexec if cmp -s %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini; then rm -f %D/etc/xrdp/rsakeys.ini; fi
-@unexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi
-@unexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi
-@unexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi
-etc/xrdp/rsakeys.ini.sample
-etc/xrdp/sesman.ini.sample
-etc/xrdp/startwm.sh.sample
-etc/xrdp/xrdp.ini.sample
-@exec [ -f %D/etc/xrdp/rsakeys.ini ] || cp -p %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini
-@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
-etc/xrdp/xrdp.sh
 lib/xrdp/libcommon.a
 lib/xrdp/libcommon.la
 lib/xrdp/libcommon.so
@@ -57,6 +33,30 @@
 lib/xrdp/libxup.la
 lib/xrdp/libxup.so
 lib/xrdp/libxup.so.0
+etc/pam.d/xrdp-sesman
+etc/xrdp/km-0407.ini
+etc/xrdp/km-0409.ini
+etc/xrdp/km-040c.ini
+etc/xrdp/km-0410.ini
+etc/xrdp/km-0419.ini
+etc/xrdp/km-041d.ini
+%%JP106%%etc/xrdp/km-0411.ini
+%%JP106%%etc/xrdp/km-e0200411.ini
+%%JP106%%etc/xrdp/km-e0010411.ini
+%%JP106%%etc/xrdp/km-e0210411.ini
+@unexec if cmp -s %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini; then rm -f %D/etc/xrdp/rsakeys.ini; fi
+@unexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi
+@unexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi
+@unexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi
+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
+@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
+etc/xrdp/xrdp.sh
 sbin/xrdp
 sbin/xrdp-chansrv
 sbin/xrdp-sesman


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: rakuco 
State-Changed-When: Wed Dec 26 12:27:41 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173566 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173566: commit references a PR
Date: Wed, 26 Dec 2012 12:27:33 +0000 (UTC)

 Author: rakuco
 Date: Wed Dec 26 12:27:15 2012
 New Revision: 309514
 URL: http://svnweb.freebsd.org/changeset/ports/309514
 
 Log:
   - Change install-time bevaviour to generate new RSA key pair
   - Update rc script in order to control daemons xrdp and xrdp-sesman separately
   - Update WWW in pkg-descr
   - Trim Makefile header
   
   PR:		ports/173566
   Submitted by:   Koichiro IWAO <meta+ports@vmeta.jp> (maintainer)
 
 Modified:
   head/net/xrdp/Makefile
   head/net/xrdp/files/pkg-message.in
   head/net/xrdp/files/xrdp.in
   head/net/xrdp/pkg-descr
   head/net/xrdp/pkg-plist
 
 Modified: head/net/xrdp/Makefile
 ==============================================================================
 --- head/net/xrdp/Makefile	Wed Dec 26 10:39:17 2012	(r309513)
 +++ head/net/xrdp/Makefile	Wed Dec 26 12:27:15 2012	(r309514)
 @@ -1,12 +1,9 @@
 -# New ports collection makefile for:	xrdp
 -# Date created:				2007-02-19
 -# Whom:					alepulver
 -#
 +# Created by: alepulver
  # $FreeBSD$
 -#
  
  PORTNAME=	xrdp
  PORTVERSION=	0.6.0
 +PORTREVISION=	1
  PORTEPOCH=	1
  CATEGORIES=	net
  MASTER_SITES=	SF/xrdp/xrdp/${PORTVERSION}
 @@ -79,6 +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
  	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
  
  .include <bsd.port.mk>
 
 Modified: head/net/xrdp/files/pkg-message.in
 ==============================================================================
 --- head/net/xrdp/files/pkg-message.in	Wed Dec 26 10:39:17 2012	(r309513)
 +++ head/net/xrdp/files/pkg-message.in	Wed Dec 26 12:27:15 2012	(r309514)
 @@ -6,6 +6,7 @@ There is an rc.d script, so the service 
  in /etc/rc.conf:
  
  xrdp_enable="YES"
 +xrdp_sesman_enable="YES" # if you want to run xrdp-sesman on the same machine
  
  Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"
  and the "%%PREFIX%%/etc/xrdp/startwm.sh" script.
 
 Modified: head/net/xrdp/files/xrdp.in
 ==============================================================================
 --- head/net/xrdp/files/xrdp.in	Wed Dec 26 10:39:17 2012	(r309513)
 +++ head/net/xrdp/files/xrdp.in	Wed Dec 26 12:27:15 2012	(r309514)
 @@ -3,19 +3,24 @@
  # $FreeBSD$
  #
  # REQUIRE: DAEMON
 -# PROVIDE: xrdp sesman
 +# PROVIDE: xrdp xrdp_sesman
  #
  
  . /etc/rc.subr
  
  name="xrdp"
  rcvar=xrdp_enable
 -xrdp_daemons="xrdp xrdpsesman"
 +xrdp_daemons="xrdp"
  
  # Read settings and set default values.
  load_rc_config "$name"
  : ${xrdp_enable="NO"}
  
 +# Enable/disable dependent daemon.
 +if [ -n "${rcvar}" ] && checkyesno "xrdp_sesman_enable"; then
 +	xrdp_daemons="xrdp xrdp_sesman"
 +fi
 +
  # Commands.
  extra_commands="reload status"
  start_cmd="xrdp_cmd"
 @@ -36,7 +41,7 @@ xrdp_cmd() {
      # Apply to all the daemons.
      for name in ${xrdp_daemons}; do
  	rcvar=${name}_enable
 -	if [ "${name}" = "xrdpsesman" ]; then
 +	if [ "${name}" = "xrdp_sesman" ]; then
  		command="%%PREFIX%%/sbin/xrdp-sesman"
  		pidfile="/var/run/xrdp-sesman.pid"
  	else
 
 Modified: head/net/xrdp/pkg-descr
 ==============================================================================
 --- head/net/xrdp/pkg-descr	Wed Dec 26 10:39:17 2012	(r309513)
 +++ head/net/xrdp/pkg-descr	Wed Dec 26 12:27:15 2012	(r309514)
 @@ -10,4 +10,4 @@ but an X window desktop to the user.
  
  Xrdp uses Xvnc or X11rdp to manage the X session.
  
 -WWW: http://xrdp.sourceforge.net/
 +WWW: http://www.xrdp.org/
 
 Modified: head/net/xrdp/pkg-plist
 ==============================================================================
 --- head/net/xrdp/pkg-plist	Wed Dec 26 10:39:17 2012	(r309513)
 +++ head/net/xrdp/pkg-plist	Wed Dec 26 12:27:15 2012	(r309514)
 @@ -5,30 +5,6 @@ bin/xrdp-keygen
  bin/xrdp-sesadmin
  bin/xrdp-sesrun
  bin/xrdp-sestest
 -etc/pam.d/xrdp-sesman
 -etc/xrdp/km-0407.ini
 -etc/xrdp/km-0409.ini
 -etc/xrdp/km-040c.ini
 -etc/xrdp/km-0410.ini
 -etc/xrdp/km-0419.ini
 -etc/xrdp/km-041d.ini
 -%%JP106%%etc/xrdp/km-0411.ini
 -%%JP106%%etc/xrdp/km-e0200411.ini
 -%%JP106%%etc/xrdp/km-e0010411.ini
 -%%JP106%%etc/xrdp/km-e0210411.ini
 -@unexec if cmp -s %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini; then rm -f %D/etc/xrdp/rsakeys.ini; fi
 -@unexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi
 -@unexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi
 -@unexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi
 -etc/xrdp/rsakeys.ini.sample
 -etc/xrdp/sesman.ini.sample
 -etc/xrdp/startwm.sh.sample
 -etc/xrdp/xrdp.ini.sample
 -@exec [ -f %D/etc/xrdp/rsakeys.ini ] || cp -p %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini
 -@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
 -etc/xrdp/xrdp.sh
  lib/xrdp/libcommon.a
  lib/xrdp/libcommon.la
  lib/xrdp/libcommon.so
 @@ -57,6 +33,30 @@ lib/xrdp/libxup.a
  lib/xrdp/libxup.la
  lib/xrdp/libxup.so
  lib/xrdp/libxup.so.0
 +etc/pam.d/xrdp-sesman
 +etc/xrdp/km-0407.ini
 +etc/xrdp/km-0409.ini
 +etc/xrdp/km-040c.ini
 +etc/xrdp/km-0410.ini
 +etc/xrdp/km-0419.ini
 +etc/xrdp/km-041d.ini
 +%%JP106%%etc/xrdp/km-0411.ini
 +%%JP106%%etc/xrdp/km-e0200411.ini
 +%%JP106%%etc/xrdp/km-e0010411.ini
 +%%JP106%%etc/xrdp/km-e0210411.ini
 +@unexec if cmp -s %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini; then rm -f %D/etc/xrdp/rsakeys.ini; fi
 +@unexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi
 +@unexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi
 +@unexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi
 +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
 +@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
 +etc/xrdp/xrdp.sh
  sbin/xrdp
  sbin/xrdp-chansrv
  sbin/xrdp-sesman
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
