[Forensics-changes] [yara] 05/08: Removed old patches, added fix for building Python bindings

[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 575f5627045e873113884a6253e1b58234052a87
Author: Hilko Bengen <bengen at debian.org>
Date:   Fri Aug 29 21:53:52 2014 +0200

    Removed old patches, added fix for building Python bindings
---
 ...ry-path-so-Python-bindings-are-linked-aga.patch | 19 +++++++++++++
 debian/patches/fix-kfreebsd-build                  | 16 -----------
 debian/patches/fix-python-build                    | 13 ---------
 debian/patches/manpage                             | 32 ----------------------
 debian/patches/series                              |  5 +---
 debian/patches/try-fix-hurd-build                  | 16 -----------
 6 files changed, 20 insertions(+), 81 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
new file mode 100644
index 0000000..431c0af
--- /dev/null
+++ b/debian/patches/0001-Added-library-path-so-Python-bindings-are-linked-aga.patch
@@ -0,0 +1,19 @@
+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/fix-kfreebsd-build b/debian/patches/fix-kfreebsd-build
deleted file mode 100644
index 4e3f1ae..0000000
--- a/debian/patches/fix-kfreebsd-build
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix build on KFreeBSD.
-Author: Hilko Bengen <bengen at debian.org>
-Last-Update: 2014-03-23
-Index: yara/libyara/proc.c
-===================================================================
---- yara.orig/libyara/proc.c	2014-03-23 14:48:31.421970668 +0100
-+++ yara/libyara/proc.c	2014-03-23 14:50:33.706854027 +0100
-@@ -152,7 +152,7 @@
- #include "mem.h"
- #include "proc.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
diff --git a/debian/patches/fix-python-build b/debian/patches/fix-python-build
deleted file mode 100644
index b5ed9bf..0000000
--- a/debian/patches/fix-python-build
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: fix python build.
-Author: Hilko Bengen <bengen at debian.org>
-Last-Update: 2014-01-05
---- a/yara-python/setup.py
-+++ b/yara-python/setup.py
-@@ -8,5 +8,6 @@
-         name='yara',
-         sources=['yara-python.c'],
-         libraries=['yara'],
--        include_dirs=['../windows/include', '../libyara'],
-+        include_dirs=['../libyara'],
-+        library_dirs=['../libyara/.libs']
-     )])
diff --git a/debian/patches/manpage b/debian/patches/manpage
deleted file mode 100644
index fe3c93f..0000000
--- a/debian/patches/manpage
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: fix some hyphens in manpage.
-Author: Joao Eriberto Mota Filho <eriberto at debian.org>
-Last-Update: 2014-01-05
---- a/yara.man
-+++ b/yara.man
-@@ -80,7 +80,7 @@
- to all files on current directory. Subdirectories are not scanned.
- .RE
- .PP
--$ yara -t Packer -t Compiler /foo/bar/rules bazfile
-+$ yara \-t Packer \-t Compiler /foo/bar/rules bazfile
- .RS
- .PP
- Apply rules on
-@@ -93,7 +93,7 @@
- .I Compiler.
- .RE
- .PP
--$ cat /foo/bar/rules1 | yara -r /foo
-+$ cat /foo/bar/rules1 | yara \-r /foo
- .RS
- .PP
- Scan all files in the
-@@ -101,7 +101,7 @@
- directory and its subdirectories. Rules are read from standard input.
- .RE
- .PP
--$ yara -d mybool=true -d myint=5 -d mystring="my string" /foo/bar/rules bazfile
-+$ yara \-d mybool=true \-d myint=5 \-d mystring="my string" /foo/bar/rules bazfile
- .RS
- .PP
- Defines three external variables
diff --git a/debian/patches/series b/debian/patches/series
index 183198e..86f3146 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-fix-python-build
-manpage
-fix-kfreebsd-build
-try-fix-hurd-build
+0001-Added-library-path-so-Python-bindings-are-linked-aga.patch
diff --git a/debian/patches/try-fix-hurd-build b/debian/patches/try-fix-hurd-build
deleted file mode 100644
index 7f262ca..0000000
--- a/debian/patches/try-fix-hurd-build
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: try to fix the build on Hurd.
-Author: Hilko Bengen <bengen at debian.org>
-Last-Update: 2014-03-23
-Index: yara/libyara/proc.c
-===================================================================
---- yara.orig/libyara/proc.c	2014-03-23 15:25:17.137680593 +0100
-+++ yara/libyara/proc.c	2014-03-23 15:25:35.221219042 +0100
-@@ -157,7 +157,7 @@
- #define PTRACE_DETACH PT_DETACH
- #endif
- 
--#if defined(__MACH__)
-+#if defined(__MACH__) && !defined(__gnu_hurd)
- 
- #include <mach/mach.h>
- #include <mach/mach_vm.h>

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