[Python-modules-commits] [androguard] 02/03: merge patched into master

[Hans-Christoph Steiner]

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

eighthave pushed a commit to branch master
in repository androguard.

commit 8de197a4c60afc134d988efabf9ad38bc687d443
Merge: 5e587dd 67865ee
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Sat Mar 11 10:59:30 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...mmit-e1bd2a7-to-fix-compilation-on-non-x8.patch | 60 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 elsim/elsim/similarity/libsimilarity/similarity.c  | 25 +++------
 elsim/elsim/similarity/libsimilarity/similarity.h  |  1 +
 5 files changed, 70 insertions(+), 21 deletions(-)

diff --cc debian/.git-dpm
index df556b4,0000000..54468a9
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 5ab5caadcf4cc42534a3a3fd29d6d43bf1f44f45
- 5ab5caadcf4cc42534a3a3fd29d6d43bf1f44f45
++67865eeef0706e98e3a05e5228cebe593e31038f
++67865eeef0706e98e3a05e5228cebe593e31038f
 +b830309cfa96b1f1fa8d9b9e6dca32d41dab31bd
 +b830309cfa96b1f1fa8d9b9e6dca32d41dab31bd
 +androguard_2.0.orig.tar.gz
 +53747bdae5d95dfb6f701aa27141d38114dcb037
 +4739992
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-upstream-commit-e1bd2a7-to-fix-compilation-on-non-x8.patch
index 0000000,0000000..492363c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-upstream-commit-e1bd2a7-to-fix-compilation-on-non-x8.patch
@@@ -1,0 -1,0 +1,60 @@@
++From 67865eeef0706e98e3a05e5228cebe593e31038f Mon Sep 17 00:00:00 2001
++From: Hans-Christoph Steiner <hans at eds.org>
++Date: Sat, 11 Mar 2017 10:59:21 +0100
++Subject: upstream commit e1bd2a7 to fix compilation on non-x86 (Closes:
++ #849647)
++
++---
++ elsim/elsim/similarity/libsimilarity/similarity.c | 25 ++++++-----------------
++ elsim/elsim/similarity/libsimilarity/similarity.h |  1 +
++ 2 files changed, 7 insertions(+), 19 deletions(-)
++
++diff --git a/elsim/elsim/similarity/libsimilarity/similarity.c b/elsim/elsim/similarity/libsimilarity/similarity.c
++index 78468b7..a78c7b2 100644
++--- a/elsim/elsim/similarity/libsimilarity/similarity.c
+++++ b/elsim/elsim/similarity/libsimilarity/similarity.c
++@@ -329,26 +329,13 @@ unsigned int kolmogorov(int level, void *orig, size_t size_orig)
++ 
++ /* Haypo */
++ 
+++/* returns the number of seconds since some point; always increasing.
+++ * Used only for timing operations.
+++ */
++ double RDTSC(void) {
++-#if defined linux || defined __APPLE__
++-    unsigned long long x;
++-    __asm__ volatile (".byte 0x0f, 0x31" : "=A"(x));
++-    return (double)x;
++-#else
++-    unsigned long a, b;
++-    double x;
++-    asm
++-    {
++-        db 0x0F, 0x31
++-            mov [a], eax
++-            mov [b], eax
++-    }
++-
++-    x = b;
++-    x *= 4294967296;
++-    x += a;
++-    return x;
++-#endif
+++    struct timespec time;
+++    clock_gettime(CLOCK_MONOTONIC, &time);
+++    return time.tv_sec + time.tv_nsec / 1e9;
++ }
++ 
++ double bennett(int level, void *orig, size_t size_orig)
++diff --git a/elsim/elsim/similarity/libsimilarity/similarity.h b/elsim/elsim/similarity/libsimilarity/similarity.h
++index d51fd7b..d632a9e 100644
++--- a/elsim/elsim/similarity/libsimilarity/similarity.h
+++++ b/elsim/elsim/similarity/libsimilarity/similarity.h
++@@ -4,6 +4,7 @@
++ #include <stdio.h>
++ #include <string.h>
++ #include <math.h>
+++#include <time.h>
++ 
++ #include "./z/z.h"
++ #include "./bz2/bz2.h"
diff --cc debian/patches/series
index d1ff929,0000000..d8883f4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-upstream-put-the-wrong-version-in-setup.py.patch
 +0002-force-add-embedded-elsim-package-and-use-the-Debian-.patch
++0003-upstream-commit-e1bd2a7-to-fix-compilation-on-non-x8.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/androguard.git