[Forensics-changes] [yara] 239/415: Fix bug in yara-python and add define WIN32 to build it in Windows
Hilko Bengen
bengen at moszumanska.debian.org
Thu Apr 3 05:43:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch debian
in repository yara.
commit e8ac1cf1c6e4ef0c923c7d590ef3f391909a39bb
Author: Victor M. Alvarez <plusvic at gmail.com>
Date: Fri Nov 22 15:31:20 2013 +0000
Fix bug in yara-python and add define WIN32 to build it in Windows
---
yara-python/setupwin32.py | 27 ++++++++++++++-------------
yara-python/setupwin64.py | 27 ++++++++++++++-------------
yara-python/yara-python.c | 2 +-
3 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/yara-python/setupwin32.py b/yara-python/setupwin32.py
index cfa8a67..39e0a5b 100644
--- a/yara-python/setupwin32.py
+++ b/yara-python/setupwin32.py
@@ -1,13 +1,14 @@
-from distutils.core import setup, Extension
-
-setup(name='yara-python',
- version='2.0',
- author='Victor M. Alvarez',
- author_email='vmalvarez at virustotal.com',
- ext_modules=[Extension(
- name='yara',
- sources=['yara-python.c'],
- include_dirs=['../windows/include', '../libyara'],
- extra_objects=[
- '../windows/yara/Release/libyara32.lib']
- )])
+from distutils.core import setup, Extension
+
+setup(name='yara-python',
+ version='2.0',
+ author='Victor M. Alvarez',
+ author_email='vmalvarez at virustotal.com',
+ ext_modules=[Extension(
+ name='yara',
+ sources=['yara-python.c'],
+ include_dirs=['../windows/include', '../libyara'],
+ define_macros=[('WIN32', None)],
+ extra_objects=[
+ '../windows/yara/Release/libyara32.lib']
+ )])
diff --git a/yara-python/setupwin64.py b/yara-python/setupwin64.py
index 4ab5990..c5c4d24 100644
--- a/yara-python/setupwin64.py
+++ b/yara-python/setupwin64.py
@@ -1,13 +1,14 @@
-from distutils.core import setup, Extension
-
-setup(name='yara-python',
- version='2.0',
- author='Victor M. Alvarez',
- author_email='vmalvarez at virustotal.com',
- ext_modules=[Extension(
- name='yara',
- sources=['yara-python.c'],
- include_dirs=['../windows/include', '../libyara'],
- extra_objects=[
- '../windows/yara/Release/libyara64.lib']
- )])
+from distutils.core import setup, Extension
+
+setup(name='yara-python',
+ version='2.0',
+ author='Victor M. Alvarez',
+ author_email='vmalvarez at virustotal.com',
+ ext_modules=[Extension(
+ name='yara',
+ sources=['yara-python.c'],
+ include_dirs=['../windows/include', '../libyara'],
+ define_macros=[('WIN32', None)],
+ extra_objects=[
+ '../windows/yara/Release/libyara64.lib']
+ )])
diff --git a/yara-python/yara-python.c b/yara-python/yara-python.c
index 8040bd1..13d8409 100644
--- a/yara-python/yara-python.c
+++ b/yara-python/yara-python.c
@@ -372,7 +372,7 @@ int yara_callback(
object = PyBytes_FromStringAndSize((char*) m->data, m->length);
tuple = Py_BuildValue(
- "(i,s,O)",
+ "(L,s,O)",
m->first_offset,
string->identifier,
object);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git
More information about the forensics-changes
mailing list