[pkg-remote-commits] [xrdp] 04/09: Update patches.

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit d0ba7aa02aacf9a0b1aa2a7f552891e99ed17ec6
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Dec 22 22:15:29 2016 +0100

    Update patches.
---
 debian/patches/config.diff     | 11 +----------
 debian/patches/make-fixes.diff | 20 ++++++--------------
 debian/patches/sockpath.diff   |  2 +-
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index 3f25317..bd5995c 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -39,16 +39,7 @@ Subject: Use xorgxrdp instead of x11rdp
  FuseMountName=thinclient_drives
 --- a/xrdp/xrdp.ini
 +++ b/xrdp/xrdp.ini
-@@ -32,7 +32,7 @@ key_file=
- 
- ; Section name to use for automatic login if the client sends username
- ; and password
--autorun=X11rdp
-+autorun=Xorg
- 
- allow_channels=true
- allow_multimon=true
-@@ -145,16 +145,6 @@ tcutils=true
+@@ -147,16 +147,6 @@ tcutils=true
  ; Session types
  ;
  
diff --git a/debian/patches/make-fixes.diff b/debian/patches/make-fixes.diff
index a43344d..bb43865 100644
--- a/debian/patches/make-fixes.diff
+++ b/debian/patches/make-fixes.diff
@@ -5,15 +5,7 @@ Subject: Build system fixes
 Forwarded: https://github.com/neutrinolabs/xrdp/pull/467
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -24,6 +24,7 @@ SUBDIRS = \
-   mc \
-   $(NEUTRINORDPDIR) \
-   libxrdp \
-+  librfxcodec \
-   xrdp \
-   sesman \
-   keygen \
-@@ -32,4 +33,5 @@ SUBDIRS = \
+@@ -65,4 +65,5 @@ SUBDIRS = \
    genkeymap \
    xrdpapi \
    pkgconfig \
@@ -21,7 +13,7 @@ Forwarded: https://github.com/neutrinolabs/xrdp/pull/467
    $(XRDPVRDIR)
 --- a/configure.ac
 +++ b/configure.ac
-@@ -251,6 +251,14 @@ AC_CHECK_HEADER([X11/extensions/Xrandr.h
+@@ -264,6 +264,14 @@ AC_CHECK_HEADER([X11/extensions/Xrandr.h
    [AC_MSG_ERROR([please install libxrandr-dev or libXrandr-devel])],
    [#include <X11/Xlib.h>])
  
@@ -38,18 +30,18 @@ Forwarded: https://github.com/neutrinolabs/xrdp/pull/467
  AC_SUBST([moduledir], '${libdir}/xrdp')
 --- a/xrdp/Makefile.am
 +++ b/xrdp/Makefile.am
-@@ -19,7 +19,7 @@ endif
+@@ -24,7 +24,7 @@ endif
  if XRDP_RFXCODEC
  AM_CPPFLAGS += -DXRDP_RFXCODEC
  AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include
--XRDP_EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.a
-+XRDP_EXTRA_LIBS += $(top_srcdir)/librfxcodec/src/.libs/librfxencode.la
+-XRDP_EXTRA_LIBS += $(top_builddir)/librfxcodec/src/.libs/librfxencode.a
++XRDP_EXTRA_LIBS += $(top_builddir)/librfxcodec/src/.libs/librfxencode.la
  endif
  
  if XRDP_PIXMAN
 --- a/xrdpapi/Makefile.am
 +++ b/xrdpapi/Makefile.am
-@@ -4,3 +4,9 @@ module_LTLIBRARIES = \
+@@ -9,3 +9,9 @@ module_LTLIBRARIES = \
  libxrdpapi_la_SOURCES = \
    xrdpapi.c \
    xrdpapi.h
diff --git a/debian/patches/sockpath.diff b/debian/patches/sockpath.diff
index 54ae6f2..4b72bcb 100644
--- a/debian/patches/sockpath.diff
+++ b/debian/patches/sockpath.diff
@@ -224,7 +224,7 @@ Subject:: change location of the socket path to something less racy
          unlink(dev->uds_data);
 --- a/xrdp/xrdp.ini
 +++ b/xrdp/xrdp.ini
-@@ -135,10 +135,10 @@ xrdpvr=true
+@@ -137,10 +137,10 @@ xrdpvr=true
  tcutils=true
  
  ; for debugging xrdp, in section xrdp1, change port=-1 to this:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/packages/xrdp.git