[pkg-remote-commits] [xrdp] 05/07: More FreeBSDish places.

[Thorsten Glaser]

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

tg pushed a commit to branch master
in repository xrdp.

commit 01160816617c7e92423a4a663ee8b3de3a73c745
Author: mirabilos <t.glaser at tarent.de>
Date:   Wed Jan 25 11:55:57 2017 +0100

    More FreeBSDish places.
---
 debian/patches/kfreebsd.diff | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
index a1e720a..4435540 100644
--- a/debian/patches/kfreebsd.diff
+++ b/debian/patches/kfreebsd.diff
@@ -1,6 +1,19 @@
 From: Thorsten Glaser <tg at mirbsd.org>
-Subject: Recognise GNU/kFreeBSD as FreeBSD variant for NASM
+Subject: Recognise GNU/kFreeBSD as FreeBSD variant
 
+--- a/common/os_calls.c
++++ b/common/os_calls.c
+@@ -87,8 +87,8 @@ extern char **environ;
+ #endif
+ 
+ /* sys/ucred.h needs to be included to use struct xucred
+- * in FreeBSD and OS X. No need for other BSDs  */
+-#if defined(__FreeBSD__) || defined(__APPLE__)
++ * in FreeBSD and OS X. No need for other BSDs except GNU/kFreeBSD */
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__FreeBSD_kernel__)
+ #include <sys/ucred.h>
+ #endif
+ 
 --- a/librfxcodec/acinclude.m4
 +++ b/librfxcodec/acinclude.m4
 @@ -40,7 +40,7 @@ case "$host_os" in
@@ -12,6 +25,17 @@ Subject: Recognise GNU/kFreeBSD as FreeBSD variant for NASM
      if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
        objfmt='BSD-a.out'
      else
+--- a/sesman/session.c
++++ b/sesman/session.c
+@@ -503,7 +503,7 @@ session_start_fork(tbus data, tui8 type,
+         g_sprintf(geometry, "%dx%d", s->width, s->height);
+         g_sprintf(depth, "%d", s->bpp);
+         g_sprintf(screen, ":%d", display);
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+         /*
+          * FreeBSD bug
+          * ports/157282: effective login name is not set by xrdp-sesman
 --- a/xorgxrdp/acinclude.m4
 +++ b/xorgxrdp/acinclude.m4
 @@ -40,7 +40,7 @@ case "$host_os" in

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