From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 20 05:58:40 2012 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C525F8DD; Sat, 20 Oct 2012 05:58:40 +0000 (UTC) (envelope-from meta+ports@vmeta.jp) Received: from glory.vmeta.jp (7c293911.i-revonet.jp [124.41.57.17]) by mx1.freebsd.org (Postfix) with ESMTP id 6CF858FC08; Sat, 20 Oct 2012 05:58:39 +0000 (UTC) Received: from icepick.vmeta.jp (z179.124-44-236.ppp.wakwak.ne.jp [124.44.236.179]) by glory.vmeta.jp (Postfix) with ESMTPSA id 83E68D58; Sat, 20 Oct 2012 14:53:19 +0900 (JST) Date: Sat, 20 Oct 2012 14:53:15 +0900 From: Koichiro IWAO To: makc@FreeBSD.org Subject: Re: ports/172793: copy request: net/xrdp -> net/xrdp-devel Message-ID: <20121020055315.GA22197@icepick.vmeta.jp> References: <201210191957.q9JJvIeB044899@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Nq2Wo0NMKNjxTN9z" Content-Disposition: inline In-Reply-To: <201210191957.q9JJvIeB044899@freefall.freebsd.org> X-Operating-System: FreeBSD 9.1-RC2 amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: freebsd-ports-bugs@FreeBSD.org, meta+ports@vmeta.jp X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Oct 2012 05:58:41 -0000 --Nq2Wo0NMKNjxTN9z Content-Type: text/plain; charset=iso-2022-jp Content-Disposition: inline See attached patch. -- `whois vmeta.jp | nkf -w` meta --Nq2Wo0NMKNjxTN9z Content-Type: text/plain; charset=iso-2022-jp Content-Disposition: attachment; filename="patch.txt" diff -ruN /usr/ports/net/xrdp/Makefile net/xrdp-devel/Makefile --- /usr/ports/net/xrdp/Makefile 2012-10-06 10:25:46.000000000 +0900 +++ net/xrdp-devel/Makefile 2012-10-20 14:49:33.171231315 +0900 @@ -6,11 +6,11 @@ # PORTNAME= xrdp -PORTVERSION= 0.6.0 -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/ \ @@ -30,6 +30,7 @@ CONFIGURE_ARGS= --localstatedir=/var LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include +CONFLICTS= xrdp-[0-9]* USE_LDCONFIG= ${PREFIX}/lib/xrdp diff -ruN /usr/ports/net/xrdp/distinfo net/xrdp-devel/distinfo --- /usr/ports/net/xrdp/distinfo 2012-10-06 10:25:46.000000000 +0900 +++ net/xrdp-devel/distinfo 2012-10-01 15:54:55.623627030 +0900 @@ -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 diff -ruN /usr/ports/net/xrdp/files/patch-sesman__session_1.patch net/xrdp-devel/files/patch-sesman__session_1.patch --- /usr/ports/net/xrdp/files/patch-sesman__session_1.patch 2012-09-10 07:20:17.000000000 +0900 +++ net/xrdp-devel/files/patch-sesman__session_1.patch 2012-10-01 15:54:55.629627819 +0900 @@ -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)); + } + } diff -ruN /usr/ports/net/xrdp/pkg-plist net/xrdp-devel/pkg-plist --- /usr/ports/net/xrdp/pkg-plist 2012-10-06 10:25:46.000000000 +0900 +++ net/xrdp-devel/pkg-plist 2012-10-01 15:54:55.617628644 +0900 @@ -5,6 +5,7 @@ bin/xrdp-sesadmin bin/xrdp-sesrun bin/xrdp-sestest +bin/xrdp-xcon etc/pam.d/xrdp-sesman etc/xrdp/km-0407.ini etc/xrdp/km-0409.ini @@ -53,6 +54,10 @@ 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 @@ -69,5 +74,5 @@ share/xrdp/xrdp24b.bmp share/xrdp/xrdp256.bmp @dirrm share/xrdp -@dirrm lib/xrdp +@dirrmtry lib/xrdp @dirrmtry etc/xrdp --Nq2Wo0NMKNjxTN9z--