[pkg-remote-commits] [xrdp] 06/07: I always knew FreeBSD was a Linux! ; -)

[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 6e1471e3d574b935c8aeb8031fa754a312338c36
Author: mirabilos <t.glaser at tarent.de>
Date:   Wed Jan 25 12:07:15 2017 +0100

    I always knew FreeBSD was a Linux! ;-)
---
 debian/patches/kfreebsd.diff | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
index 4435540..43f72c0 100644
--- a/debian/patches/kfreebsd.diff
+++ b/debian/patches/kfreebsd.diff
@@ -1,5 +1,6 @@
 From: Thorsten Glaser <tg at mirbsd.org>
-Subject: Recognise GNU/kFreeBSD as FreeBSD variant
+Subject: Recognise GNU/kFreeBSD as FreeBSD variant in code,
+ but as a Linux for instfiles/ (init scripts and so on)
 
 --- a/common/os_calls.c
 +++ b/common/os_calls.c
@@ -14,6 +15,18 @@ Subject: Recognise GNU/kFreeBSD as FreeBSD variant
  #include <sys/ucred.h>
  #endif
  
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,6 +24,9 @@ case $host_os in
+ 	*linux*)
+ 		linux=yes
+ 		;;
++	*kfreebsd*)
++		linux=yes # only used in instfiles/ so that’s ok for us for now
++		;;
+ 	*freebsd*)
+ 		freebsd=yes
+ 		;;
 --- a/librfxcodec/acinclude.m4
 +++ b/librfxcodec/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