[Forensics-changes] [yara] 06/09: Dropped patches that have been integrated upstream

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository yara.

commit b9da0c3202966415dc5260a6120a2a11a94290a7
Author: Hilko Bengen <bengen at debian.org>
Date:   Tue Feb 10 14:25:05 2015 +0100

    Dropped patches that have been integrated upstream
---
 ...ry-path-so-Python-bindings-are-linked-aga.patch | 19 ---------------
 .../0002-Add-ifdefs-for-kFreeBSD-and-Hurd.patch    | 27 ----------------------
 debian/patches/series                              |  2 --
 3 files changed, 48 deletions(-)

diff --git a/debian/patches/0001-Added-library-path-so-Python-bindings-are-linked-aga.patch b/debian/patches/0001-Added-library-path-so-Python-bindings-are-linked-aga.patch
deleted file mode 100644
index 431c0af..0000000
--- a/debian/patches/0001-Added-library-path-so-Python-bindings-are-linked-aga.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Fri, 29 Aug 2014 22:12:41 +0200
-Subject: Added library path so Python bindings are linked against the correct
- library
-
----
- yara-python/setup.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/yara-python/setup.py b/yara-python/setup.py
-index ef2a1b1..a390218 100644
---- a/yara-python/setup.py
-+++ b/yara-python/setup.py
-@@ -25,4 +25,5 @@ setup(name='yara-python',
-         sources=['yara-python.c'],
-         libraries=['yara'],
-         include_dirs=['../windows/include', '../libyara/include'],
-+        library_dirs=['../libyara/.libs'],
-     )])
diff --git a/debian/patches/0002-Add-ifdefs-for-kFreeBSD-and-Hurd.patch b/debian/patches/0002-Add-ifdefs-for-kFreeBSD-and-Hurd.patch
deleted file mode 100644
index d7f89d5..0000000
--- a/debian/patches/0002-Add-ifdefs-for-kFreeBSD-and-Hurd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index bbad620..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-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