[pkg-remote-commits] [xrdp] 06/11: 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 caedb8f9822c5e4e93dfe015c327e1491e3b7e2d
Author: Dominik George <nik at naturalnet.de>
Date:   Sun Dec 11 14:39:12 2016 +0100

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

diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index 2bf23bf..82fd7f3 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -35,7 +35,7 @@ Subject: config patches for Debian
 -param=-nolisten
 -param=tcp
 -param=-logfile
--param=/dev/null
+-param=.xorgxrdp.%s.log
 -
  [Chansrv]
  ; drive redirection, defaults to xrdp_client if not set
diff --git a/debian/patches/make-fixes.diff b/debian/patches/make-fixes.diff
index f53947e..a43344d 100644
--- a/debian/patches/make-fixes.diff
+++ b/debian/patches/make-fixes.diff
@@ -19,24 +19,9 @@ Forwarded: https://github.com/neutrinolabs/xrdp/pull/467
    pkgconfig \
 +  xorgxrdp \
    $(XRDPVRDIR)
---- a/common/Makefile.am
-+++ b/common/Makefile.am
-@@ -49,7 +49,12 @@ libcommon_la_SOURCES = \
-   trans.h \
-   $(PIXMAN_SOURCES)
- 
-+if NEED_LIBDL
-+EXTRA_LIBDL = -ldl
-+endif
-+
- libcommon_la_LIBADD = \
-+  $(EXTRA_LIBDL) \
-   -lcrypto \
-   -lssl \
-   -lpthread
 --- a/configure.ac
 +++ b/configure.ac
-@@ -246,6 +246,14 @@ AC_CHECK_HEADER([X11/extensions/Xrandr.h
+@@ -251,6 +251,14 @@ AC_CHECK_HEADER([X11/extensions/Xrandr.h
    [AC_MSG_ERROR([please install libxrandr-dev or libXrandr-devel])],
    [#include <X11/Xlib.h>])
  
@@ -74,13 +59,3 @@ Forwarded: https://github.com/neutrinolabs/xrdp/pull/467
 +
 +libxrdpapi_la_LIBADD = \
 +  $(top_builddir)/common/libcommon.la
---- a/xorgxrdp/tests/Makefile.am
-+++ b/xorgxrdp/tests/Makefile.am
-@@ -1,6 +1,6 @@
- EXTRA_DIST = yuv2rgb
- 
--TESTS_ENVIRONMENT = top_builddir=$(top_builddir) top_srcdir=$(top_srcdir) $(SHELL)
-+TESTS_ENVIRONMENT = top_builddir=$(top_builddir) top_srcdir=$(top_srcdir)
- 
- TESTS = xorg-test-run.sh
- 
diff --git a/debian/patches/sockpath.diff b/debian/patches/sockpath.diff
index 97ee85f..69a83be 100644
--- a/debian/patches/sockpath.diff
+++ b/debian/patches/sockpath.diff
@@ -222,17 +222,6 @@ Subject:: change location of the socket path to something less racy
      if (dev->listen_sck == 0)
      {
          unlink(dev->uds_data);
---- a/xorgxrdp/module/rdpInput.c
-+++ b/xorgxrdp/module/rdpInput.c
-@@ -86,7 +86,7 @@ rdpUnregisterInputCallback(rdpInputEvent
-             {
-                 /* hack to cleanup
-                    remove when xrdpdevTearDown is working */
--                g_sprintf(text, "/tmp/.xrdp/xrdp_display_%s", display);
-+                g_sprintf(text, "/var/run/xrdp/sockdir/xrdp_display_%s", display);
-                 LLOGLN(0, ("rdpUnregisterInputCallback: deleting file %s", text));
-                 unlink(text);
-             }
 --- a/xrdp/xrdp.ini
 +++ b/xrdp/xrdp.ini
 @@ -32,7 +32,7 @@ key_file=

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