[pkg-remote-commits] [xrdp] 04/07: Possibly add kFreeBSD support.

[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 cdc893644fa9d89ccc84a84003dfa74f8a0555d6
Author: mirabilos <t.glaser at tarent.de>
Date:   Wed Jan 25 11:40:09 2017 +0100

    Possibly add kFreeBSD support.
---
 debian/changelog             |  3 ++-
 debian/patches/kfreebsd.diff | 25 +++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f4ef4b0..d167665 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xrdp (0.9.1-4) unstable; urgency=high
 
   * Fix up PAM conffile handling for upgrades from jessie{,-backports}.
   * Don’t use FUSE on the Hurd, it does not support enough of it yet.
+  * Add GNU/kFreeBSD support to NASM format detection autoconfigury.
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 25 Jan 2017 11:34:16 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 25 Jan 2017 11:39:33 +0100
 
 xrdp (0.9.1-3) unstable; urgency=medium
 
diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
new file mode 100644
index 0000000..a1e720a
--- /dev/null
+++ b/debian/patches/kfreebsd.diff
@@ -0,0 +1,25 @@
+From: Thorsten Glaser <tg at mirbsd.org>
+Subject: Recognise GNU/kFreeBSD as FreeBSD variant for NASM
+
+--- a/librfxcodec/acinclude.m4
++++ b/librfxcodec/acinclude.m4
+@@ -40,7 +40,7 @@ case "$host_os" in
+         ;;
+     esac
+   ;;
+-  freebsd* | netbsd* | openbsd*)
++  kfreebsd* | freebsd* | netbsd* | openbsd*)
+     if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+       objfmt='BSD-a.out'
+     else
+--- a/xorgxrdp/acinclude.m4
++++ b/xorgxrdp/acinclude.m4
+@@ -40,7 +40,7 @@ case "$host_os" in
+         ;;
+     esac
+   ;;
+-  freebsd* | netbsd* | openbsd*)
++  kfreebsd* | freebsd* | netbsd* | openbsd*)
+     if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+       objfmt='BSD-a.out'
+     else
diff --git a/debian/patches/series b/debian/patches/series
index 2e874e8..a1fb5c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ nxstack.diff
 fix_perms.diff
 shutup-daemon.diff
 sockpath.diff
+kfreebsd.diff

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