From 5cf880887f2f051a945fb1d150f379ffc13310eb Mon Sep 17 00:00:00 2001 From: Phillip Warner Date: Sun, 27 Oct 2013 21:16:36 -0500 Subject: system/xrdp: Updated for version 0.6.0. Signed-off-by: Robby Workman --- system/xrdp/patches/Makefile.NOPAM.diff | 13 ------------- system/xrdp/patches/Makefile.PAM.diff | 22 ---------------------- system/xrdp/patches/sesman.ini.diff | 30 ------------------------------ 3 files changed, 65 deletions(-) delete mode 100644 system/xrdp/patches/Makefile.NOPAM.diff delete mode 100644 system/xrdp/patches/Makefile.PAM.diff delete mode 100644 system/xrdp/patches/sesman.ini.diff (limited to 'system/xrdp/patches') diff --git a/system/xrdp/patches/Makefile.NOPAM.diff b/system/xrdp/patches/Makefile.NOPAM.diff deleted file mode 100644 index 0d63f34eeeb95..0000000000000 --- a/system/xrdp/patches/Makefile.NOPAM.diff +++ /dev/null @@ -1,13 +0,0 @@ -Patch generated 20080922 by Phillip Warner -Permission granted to use this patch as you see fit. - ---- Makefile.orig 2008-09-22 11:57:24.000000000 -0500 -+++ Makefile 2008-09-22 11:57:51.000000000 -0500 -@@ -46,7 +46,6 @@ - make -C sesman install - make -C xup install - make -C docs install -- if [ -d /etc/pam.d ]; then install instfiles/pam.d/sesman /etc/pam.d/sesman; fi - install instfiles/xrdp_control.sh $(DESTDIR)/xrdp_control.sh - - installdeb: diff --git a/system/xrdp/patches/Makefile.PAM.diff b/system/xrdp/patches/Makefile.PAM.diff deleted file mode 100644 index adc25997390b8..0000000000000 --- a/system/xrdp/patches/Makefile.PAM.diff +++ /dev/null @@ -1,22 +0,0 @@ -Patch generated 20071215 by Phillip Warner -Permission granted to use this patch as you see fit. - ---- Makefile.orig 2007-12-15 00:22:34.000000000 -0600 -+++ Makefile 2007-12-15 00:15:13.000000000 -0600 -@@ -39,6 +39,7 @@ - mkdir -p $(PIDDIR) - mkdir -p $(MANDIR) - mkdir -p $(DOCDIR) -+ mkdir -p $(PKGDIR)/etc/pam.d - make -C vnc install - make -C libxrdp install - make -C xrdp install -@@ -46,7 +47,7 @@ - make -C sesman install - make -C xup install - make -C docs install -- if [ -d /etc/pam.d ]; then install instfiles/pam.d/sesman /etc/pam.d/sesman; fi -+ install instfiles/pam.d/sesman $(PKGDIR)/etc/pam.d/sesman - install instfiles/xrdp_control.sh $(DESTDIR)/xrdp_control.sh - - installdeb: diff --git a/system/xrdp/patches/sesman.ini.diff b/system/xrdp/patches/sesman.ini.diff deleted file mode 100644 index 4cbea3403fad5..0000000000000 --- a/system/xrdp/patches/sesman.ini.diff +++ /dev/null @@ -1,30 +0,0 @@ -Patch generated 20080925 by Phillip Warner -Permission granted to use this patch as you see fit. - ---- sesman/sesman.ini.orig 2008-09-22 12:56:51.000000000 -0500 -+++ sesman/sesman.ini 2008-09-25 11:39:03.000000000 -0500 -@@ -2,11 +2,11 @@ - ListenAddress=127.0.0.1 - ListenPort=3350 - EnableUserWindowManager=1 --UserWindowManager=startwm.sh -+UserWindowManager=.xrdp-xinitrc - DefaultWindowManager=startwm.sh - - [Security] --AllowRootLogin=1 -+AllowRootLogin=0 - MaxLoginRetry=4 - TerminalServerUsers=tsusers - TerminalServerAdmins=tsadmins -@@ -18,8 +18,8 @@ - DisconnectedTimeLimit=0 - - [Logging] --LogFile=./sesman.log --LogLevel=DEBUG -+LogFile=/var/log/sesman.log -+LogLevel=INFO - EnableSyslog=0 - SyslogLevel=DEBUG - -- cgit v1.2.3