Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package: androguard Fix FTBFS that got it kicked out of stretch, #849647, using upstream commit via Ubuntu. Attached is the source debdiff.
diff --git a/debian/.git-dpm b/debian/.git-dpm index df556b4..54468a9 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -5ab5caadcf4cc42534a3a3fd29d6d43bf1f44f45 -5ab5caadcf4cc42534a3a3fd29d6d43bf1f44f45 +67865eeef0706e98e3a05e5228cebe593e31038f +67865eeef0706e98e3a05e5228cebe593e31038f b830309cfa96b1f1fa8d9b9e6dca32d41dab31bd b830309cfa96b1f1fa8d9b9e6dca32d41dab31bd androguard_2.0.orig.tar.gz diff --git a/debian/changelog b/debian/changelog index 4f11b90..d00549f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +androguard (2.0-3) unstable; urgency=medium + + [ Bhavani Shankar ] + * upstream commit e1bd2a7 to fix compilation on non-x86 (Closes: #849647) + + -- Hans-Christoph Steiner <[email protected]> Sat, 11 Mar 2017 10:17:40 +0100 androguard (2.0-2) unstable; urgency=medium * lintian overrides: the included binaries are test objects diff --git a/debian/patches/0003-upstream-commit-e1bd2a7-to-fix-compilation-on-non-x8.patch b/debian/patches/0003-upstream-commit-e1bd2a7-to-fix-compilation-on-non-x8.patch new file mode 100644 index 0000000..492363c --- /dev/null +++ b/debian/patches/0003-upstream-commit-e1bd2a7-to-fix-compilation-on-non-x8.patch @@ -0,0 +1,60 @@ +From 67865eeef0706e98e3a05e5228cebe593e31038f Mon Sep 17 00:00:00 2001 +From: Hans-Christoph Steiner <[email protected]> +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 --git a/debian/patches/series b/debian/patches/series index d1ff929..d8883f4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +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 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"
