6 files changed, 11 insertions, 66 deletions

diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile
index 0afbb0b8ac36..7a20ef4787d6 100644
--- a/net/xrdp-devel/Makefile
+++ b/net/xrdp-devel/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	xrdp
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	-devel
@@ -16,7 +15,9 @@ COMMENT=	Open source Remote Desktop Protocol (RDP) server
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-# pulseaudio's built source is required for audio redirection
+IGNORE=		no development version available right now, use net/xrdp instead
+
+# pulseaudio's configured source is required for audio redirection
 BUILD_DEPENDS=	${NONEXISTENT}:audio/pulseaudio:configure \
 		${LOCALBASE}/bin/nasm:devel/nasm
 RUN_DEPENDS=	${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp
@@ -70,9 +71,6 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e "s|^PULSE_SCRIPT=/etc/xrdp/pulse/default.pa|PULSE_SCRIPT=${PREFIX}/etc/xrdp/pulse/default.pa|" \
-		${WRKSRC}/sesman/sesman.ini
-	@${REINPLACE_CMD} \
 		-e "s|^PULSE_DIR = .*|PULSE_DIR = `${PULSE_WRKSRC}`|" \
 		-e "s|-Wall -O2|-Wall -O2 -I${LOCALBASE}/include|" \
 		${WRKSRC}/sesman/chansrv/pulse/Makefile
diff --git a/net/xrdp-devel/distinfo b/net/xrdp-devel/distinfo
index 84eb9f6d69b2..49b168f757fa 100644
--- a/net/xrdp-devel/distinfo
+++ b/net/xrdp-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1514517059
-SHA256 (xrdp/neutrinolabs-xrdp-v0.9.5_GH0.tar.gz) = a932fc6a56d570207a58df9238cdf44f717071fd8061ac4445b5193fc3c73392
-SIZE (xrdp/neutrinolabs-xrdp-v0.9.5_GH0.tar.gz) = 1877715
+TIMESTAMP = 1522053694
+SHA256 (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 68361f4e75fd70a85e258af78af244754dc7190092abfdb9c709e20905de260d
+SIZE (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 1878049
 SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 8e2d6060aca6d92ebd8b5cd295e9b85b8dd12ec00aacf7e3d351a8dacb56f4f3
 SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 48379
 SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6
diff --git a/net/xrdp-devel/files/patch-sesman_sesman.ini b/net/xrdp-devel/files/patch-sesman_sesman.ini.in
index 5242cf4cf41b..94302d0cee34 100644
--- a/net/xrdp-devel/files/patch-sesman_sesman.ini
+++ b/net/xrdp-devel/files/patch-sesman_sesman.ini.in
@@ -1,5 +1,5 @@
---- sesman/sesman.ini.orig	2017-12-27 14:40:24 UTC
-+++ sesman/sesman.ini
+--- sesman/sesman.ini.in.orig	2017-12-27 14:40:24 UTC
++++ sesman/sesman.ini.in
 @@ -75,8 +75,8 @@ param=xrdp/xorg.conf
  param=-noreset
  param=-nolisten
diff --git a/net/xrdp-devel/files/patch-upstream-issue-1030 b/net/xrdp-devel/files/patch-upstream-issue-1030
deleted file mode 100644
index 6689c303b4c3..000000000000
--- a/net/xrdp-devel/files/patch-upstream-issue-1030
+++ /dev/null
@@ -1,54 +0,0 @@
---- sesman/session.c.orig	2017-12-27 14:40:24 UTC
-+++ sesman/session.c
-@@ -484,22 +484,40 @@ session_start_fork(tbus data, tui8 type,
-          *  $OpenBSD: session.c,v 1.252 2010/03/07 11:57:13 dtucker Exp $
-          *  with some ideas about BSD process grouping to xrdp
-          */
-+        pid_t bsdsespid = g_fork();
- 
--        /**
--         * Create a new session and process group since the 4.4BSD
--         * setlogin() affects the entire process group
--         */
--        if (g_setsid() < 0)
-+        if (bsdsespid == -1)
-         {
--            log_message(LOG_LEVEL_ERROR,
--                        "setsid failed - pid %d", g_getpid());
-+        }
-+        else if (bsdsespid == 0) /* BSD session leader */
-+        {
-+            /**
-+             * Create a new session and process group since the 4.4BSD
-+             * setlogin() affects the entire process group
-+             */
-+            if (g_setsid() < 0)
-+            {
-+                log_message(LOG_LEVEL_ERROR,
-+                            "setsid failed - pid %d", g_getpid());
-+            }
-+
-+            if (g_setlogin(s->username) < 0)
-+            {
-+                log_message(LOG_LEVEL_ERROR,
-+                            "setlogin failed for user %s - pid %d", s->username,
-+                            g_getpid());
-+            }
-         }
- 
--        if (g_setlogin(s->username) < 0)
-+        g_waitpid(bsdsespid);
-+
-+        if (bsdsespid > 0)
-         {
--            log_message(LOG_LEVEL_ERROR,
--                        "setlogin failed for user %s - pid %d", s->username,
--                        g_getpid());
-+            g_exit(0);
-+            /*
-+             * intermediate sesman should exit here after WM exits.
-+             * do not execure the following codes.
-+             */
-         }
- #endif
-         window_manager_pid = g_fork(); /* parent becomes X,
diff --git a/net/xrdp-devel/files/pkg-message.in b/net/xrdp-devel/files/pkg-message.in
index 7d4e3914601e..9024c32d5738 100644
--- a/net/xrdp-devel/files/pkg-message.in
+++ b/net/xrdp-devel/files/pkg-message.in
@@ -1,6 +1,6 @@
 ==============================================================================
 
-XRDP has been installed.
+xrdp has been installed.
 
 There is an rc.d script, so the service can be enabled by adding this line
 in /etc/rc.conf:
diff --git a/net/xrdp-devel/pkg-plist b/net/xrdp-devel/pkg-plist
index ac066783cb3b..39739d9fa886 100644
--- a/net/xrdp-devel/pkg-plist
+++ b/net/xrdp-devel/pkg-plist
@@ -50,6 +50,7 @@ etc/pam.d/xrdp-sesman
 etc/rc.d/xrdp
 %%ETCDIR%%/km-00000407.ini
 %%ETCDIR%%/km-00000409.ini
+%%ETCDIR%%/km-00010409.ini
 %%ETCDIR%%/km-0000040a.ini
 %%ETCDIR%%/km-0000040b.ini
 %%ETCDIR%%/km-0000040c.ini