[Forensics-changes] [yara] 07/08: Re-addded patches for FTBFS on kFreeBSD, Hurd

[Hilko Bengen]

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

bengen pushed a commit to branch debian
in repository yara.

commit 4f28b87350e7a18601c1f45db01e15bcd7c878ba
Author: Hilko Bengen <bengen at debian.org>
Date:   Sat Aug 30 10:20:06 2014 +0200

    Re-addded patches for FTBFS on kFreeBSD, Hurd
---
 .../0002-Add-ifdefs-for-kFreeBSD-and-Hurd.patch    | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/0002-Add-ifdefs-for-kFreeBSD-and-Hurd.patch b/debian/patches/0002-Add-ifdefs-for-kFreeBSD-and-Hurd.patch
new file mode 100644
index 0000000..d7f89d5
--- /dev/null
+++ b/debian/patches/0002-Add-ifdefs-for-kFreeBSD-and-Hurd.patch
@@ -0,0 +1,27 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Sat, 30 Aug 2014 10:19:08 +0200
+Subject: Add ifdefs for kFreeBSD and Hurd
+
+---
+ libyara/proc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libyara/proc.c b/libyara/proc.c
+index ee13bef..09d05b9 100644
+--- a/libyara/proc.c
++++ b/libyara/proc.c
+@@ -152,12 +152,12 @@ int yr_process_get_memory(
+ #include <yara/proc.h>
+ #include <yara/mem.h>
+ 
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MACH__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__MACH__)
+ #define PTRACE_ATTACH PT_ATTACH
+ #define PTRACE_DETACH PT_DETACH
+ #endif
+ 
+-#if defined(__MACH__)
++#if defined(__MACH__) && !defined(__gnu_hurd)
+ 
+ #include <mach/mach.h>
+ #include <mach/mach_vm.h>
diff --git a/debian/patches/series b/debian/patches/series
index 86f3146..bbad620 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Added-library-path-so-Python-bindings-are-linked-aga.patch
+0002-Add-ifdefs-for-kFreeBSD-and-Hurd.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git