From owner-svn-ports-all@FreeBSD.ORG Sat Jan 19 02:29:01 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6B5249A7; Sat, 19 Jan 2013 02:29:01 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5D73E3FF; Sat, 19 Jan 2013 02:29:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0J2T1CI040243; Sat, 19 Jan 2013 02:29:01 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0J2T0l3040226; Sat, 19 Jan 2013 02:29:00 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201301190229.r0J2T0l3040226@svn.freebsd.org> From: Steve Wills Date: Sat, 19 Jan 2013 02:29:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310630 - in head/net: . xrdp-devel xrdp-devel/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jan 2013 02:29:01 -0000 Author: swills Date: Sat Jan 19 02:28:59 2013 New Revision: 310630 URL: http://svnweb.freebsd.org/changeset/ports/310630 Log: - Copy net/xrdp to net/xrdp-devel, update to 0.7.0 PR: ports/172793 Submitted by: Koichiro IWAO (maintainer) Added: head/net/xrdp-devel/ - copied from r310327, head/net/xrdp/ Modified: head/net/Makefile head/net/xrdp-devel/Makefile head/net/xrdp-devel/distinfo head/net/xrdp-devel/files/patch-sesman__session_1.patch head/net/xrdp-devel/pkg-plist Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Sat Jan 19 02:28:36 2013 (r310629) +++ head/net/Makefile Sat Jan 19 02:28:59 2013 (r310630) @@ -1250,6 +1250,7 @@ SUBDIR += xpvm SUBDIR += xrdesktop SUBDIR += xrdp + SUBDIR += xrdp-devel SUBDIR += yaph SUBDIR += yate SUBDIR += yaz Modified: head/net/xrdp-devel/Makefile ============================================================================== --- head/net/xrdp/Makefile Sun Jan 13 18:25:20 2013 (r310327) +++ head/net/xrdp-devel/Makefile Sat Jan 19 02:28:59 2013 (r310630) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= xrdp -PORTVERSION= 0.6.0 -PORTREVISION= 2 -PORTEPOCH= 1 +PORTVERSION= 0.7.0.20120918 CATEGORIES= net -MASTER_SITES= SF/xrdp/xrdp/${PORTVERSION} -DISTNAME= ${PORTNAME}-v${PORTVERSION} +MASTER_SITES= http://www.club.kyutech.ac.jp/~meta/distfiles/ \ + http://key2.jp/~meta/distfiles/ +PKGNAMESUFFIX= -devel DIST_SUBDIR?= ${PORTNAME} PATCH_SITES= http://www.club.kyutech.ac.jp/~meta/patches/xrdp/0.6.0/ \ @@ -27,6 +26,7 @@ USE_RC_SUBR= xrdp CONFIGURE_ARGS= --localstatedir=/var LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include +CONFLICTS= xrdp-[0-9]* USE_LDCONFIG= ${PREFIX}/lib/xrdp Modified: head/net/xrdp-devel/distinfo ============================================================================== --- head/net/xrdp/distinfo Sun Jan 13 18:25:20 2013 (r310327) +++ head/net/xrdp-devel/distinfo Sat Jan 19 02:28:59 2013 (r310630) @@ -1,5 +1,5 @@ -SHA256 (xrdp/xrdp-v0.6.0.tar.gz) = 8b20fe56d935252981d73ac3b70b9b1654a83939824d9962beebb1586e429690 -SIZE (xrdp/xrdp-v0.6.0.tar.gz) = 322104 +SHA256 (xrdp/xrdp-0.7.0.20120918.tar.gz) = 97b447a2634dc151b869beca216116c5ec7cb17cc662c0642861c6226c4dcec9 +SIZE (xrdp/xrdp-0.7.0.20120918.tar.gz) = 6618465 SHA256 (xrdp/patch-instfiles__Makefile.am) = 92e8a1768b63f508bc5b37cdc5723d1e03875af7fbdf064aa86a6b40b1bd2f07 SIZE (xrdp/patch-instfiles__Makefile.am) = 710 SHA256 (xrdp/patch-instfiles__km-0411.ini) = 58bcb7f063db4fcde9230be3013d46226b8af5c0060b7faf00250a51aa7da4fd Modified: head/net/xrdp-devel/files/patch-sesman__session_1.patch ============================================================================== --- head/net/xrdp/files/patch-sesman__session_1.patch Sun Jan 13 18:25:20 2013 (r310327) +++ head/net/xrdp-devel/files/patch-sesman__session_1.patch Sat Jan 19 02:28:59 2013 (r310630) @@ -67,13 +67,13 @@ + { + if (setsid() < 0) + { -+ log_message(&(g_cfg->log), LOG_LEVEL_ERROR, ++ log_message(LOG_LEVEL_ERROR, + "setsid failed: %.100s", strerror(errno)); + } + + if (setlogin(username) < 0) + { -+ log_message(&(g_cfg->log), LOG_LEVEL_ERROR, ++ log_message(LOG_LEVEL_ERROR, + "setlogin failed: %.100s", strerror(errno)); + } + } Modified: head/net/xrdp-devel/pkg-plist ============================================================================== --- head/net/xrdp/pkg-plist Sun Jan 13 18:25:20 2013 (r310327) +++ head/net/xrdp-devel/pkg-plist Sat Jan 19 02:28:59 2013 (r310630) @@ -5,6 +5,7 @@ bin/xrdp-keygen bin/xrdp-sesadmin bin/xrdp-sesrun bin/xrdp-sestest +bin/xrdp-xcon lib/xrdp/libcommon.a lib/xrdp/libcommon.la lib/xrdp/libcommon.so @@ -29,6 +30,10 @@ lib/xrdp/libxrdp.a lib/xrdp/libxrdp.la lib/xrdp/libxrdp.so lib/xrdp/libxrdp.so.0 +lib/xrdp/libxrdpapi.la +lib/xrdp/libxrdpapi.so +lib/xrdp/libxrdpapi.so.0 +lib/xrdp/libxrdpapi.a lib/xrdp/libxup.a lib/xrdp/libxup.la lib/xrdp/libxup.so @@ -70,5 +75,5 @@ share/xrdp/sans-10.fv1 share/xrdp/xrdp24b.bmp share/xrdp/xrdp256.bmp @dirrm share/xrdp -@dirrm lib/xrdp +@dirrmtry lib/xrdp @dirrmtry etc/xrdp