forked from pool/python-distorm3
Accepting request 682846 from devel:languages:python
- Update to 3.4.1: * various small fixes around - Merged patches: * 0001-don-t-stutter-static-on-BigEndian.patch * reproducible.patch OBS-URL: https://build.opensuse.org/request/show/682846 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-distorm3?expand=0&rev=15
This commit is contained in:
Git OBS Bridge
@@ -1,76 +0,0 @@
|
||||
From 9d4942f5fae759d2eb3c1d2e4a68236ede60a843 Mon Sep 17 00:00:00 2001
|
||||
From: Dinar Valeev <dvaleev@suse.com>
|
||||
Date: Fri, 27 Jul 2012 10:35:19 +0200
|
||||
Subject: [PATCH] don't stutter static on BigEndian
|
||||
|
||||
---
|
||||
src/config.h | 2 +-
|
||||
src/prefix.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/src/config.h
|
||||
+++ b/src/config.h
|
||||
@@ -128,34 +128,45 @@ This library is licensed under the BSD l
|
||||
|
||||
/* Define stream read functions for big endian systems. */
|
||||
#ifdef BE_SYSTEM
|
||||
+
|
||||
+/* Avoid defining 'static static' for GCC. */
|
||||
+#ifndef __GNUC__
|
||||
+#define STATIC_INLINE static _INLINE_
|
||||
+#else
|
||||
+#define STATIC_INLINE static
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
- * These functions can read from the stream safely!
|
||||
+ * Assumption: These functions can read from the stream safely!
|
||||
* Swap endianity of input to little endian.
|
||||
*/
|
||||
-static _INLINE_ int16_t RSHORT(const uint8_t *s)
|
||||
+STATIC_INLINE int16_t RSHORT(const uint8_t *s)
|
||||
{
|
||||
return s[0] | (s[1] << 8);
|
||||
}
|
||||
-static _INLINE_ uint16_t RUSHORT(const uint8_t *s)
|
||||
+STATIC_INLINE uint16_t RUSHORT(const uint8_t *s)
|
||||
{
|
||||
return s[0] | (s[1] << 8);
|
||||
}
|
||||
-static _INLINE_ int32_t RLONG(const uint8_t *s)
|
||||
+STATIC_INLINE int32_t RLONG(const uint8_t *s)
|
||||
{
|
||||
return s[0] | (s[1] << 8) | (s[2] << 16) | (s[3] << 24);
|
||||
}
|
||||
-static _INLINE_ uint32_t RULONG(const uint8_t *s)
|
||||
+STATIC_INLINE uint32_t RULONG(const uint8_t *s)
|
||||
{
|
||||
return s[0] | (s[1] << 8) | (s[2] << 16) | (s[3] << 24);
|
||||
}
|
||||
-static _INLINE_ int64_t RLLONG(const uint8_t *s)
|
||||
+STATIC_INLINE int64_t RLLONG(const uint8_t *s)
|
||||
{
|
||||
return s[0] | (s[1] << 8) | (s[2] << 16) | (s[3] << 24) | ((uint64_t)s[4] << 32) | ((uint64_t)s[5] << 40) | ((uint64_t)s[6] << 48) | ((uint64_t)s[7] << 56);
|
||||
}
|
||||
-static _INLINE_ uint64_t RULLONG(const uint8_t *s)
|
||||
+STATIC_INLINE uint64_t RULLONG(const uint8_t *s)
|
||||
{
|
||||
return s[0] | (s[1] << 8) | (s[2] << 16) | (s[3] << 24) | ((uint64_t)s[4] << 32) | ((uint64_t)s[5] << 40) | ((uint64_t)s[6] << 48) | ((uint64_t)s[7] << 56);
|
||||
}
|
||||
+
|
||||
+#undef STATIC_INLINE
|
||||
+
|
||||
#else
|
||||
/* Little endian macro's will just make the cast. */
|
||||
#define RSHORT(x) *(int16_t *)x
|
||||
--- a/src/prefix.c
|
||||
+++ b/src/prefix.c
|
||||
@@ -116,7 +116,7 @@ uint16_t prefixes_set_unused_mask(_Prefi
|
||||
* Mark a prefix as unused, and bookkeep where we last saw this same type,
|
||||
* because in the future we might want to disable it too.
|
||||
*/
|
||||
-_INLINE_ void prefixes_track_unused(_PrefixState* ps, int index, _PrefixIndexer pi)
|
||||
+static void prefixes_track_unused(_PrefixState* ps, int index, _PrefixIndexer pi)
|
||||
{
|
||||
prefixes_ignore(ps, pi);
|
||||
/* Book-keep the current index for this type. */
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a4dddc2d3cf4fe3e1f8b35507e3c30b082f6e0b0ae46e71c4d6ed6f463eb09ae
|
||||
size 129202
|
||||
3
distorm3-3.4.1.tar.gz
Normal file
3
distorm3-3.4.1.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0ed65741b31cc113f1c98641594fc3e24f0563b6977c5ea2a7d97983095caa0c
|
||||
size 155678
|
||||
@@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 8 13:26:27 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Update to 3.4.1:
|
||||
* various small fixes around
|
||||
- Merged patches:
|
||||
* 0001-don-t-stutter-static-on-BigEndian.patch
|
||||
* reproducible.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 9 11:37:56 UTC 2018 - Matej Cepl <mcepl@suse.com>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-distorm3
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -19,17 +19,13 @@
|
||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||
%define modname distorm3
|
||||
Name: python-%{modname}
|
||||
Version: 3.3.4
|
||||
Version: 3.4.1
|
||||
Release: 0
|
||||
Summary: Disassembler Library For x86/AMD64
|
||||
License: BSD-3-Clause
|
||||
Group: Development/Libraries/Python
|
||||
URL: https://github.com/gdabah/distorm
|
||||
Source: https://files.pythonhosted.org/packages/source/d/distorm3/%{modname}-%{version}.zip
|
||||
# Issue filed upstream https://github.com/gdabah/distorm/issues/123
|
||||
Patch0: 0001-don-t-stutter-static-on-BigEndian.patch
|
||||
# PATCH-FIX-UPSTREAM https://github.com/gdabah/distorm/pull/116
|
||||
Patch1: reproducible.patch
|
||||
Source: https://files.pythonhosted.org/packages/source/d/distorm3/%{modname}-%{version}.tar.gz
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: fdupes
|
||||
@@ -44,8 +40,6 @@ text.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{modname}-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags}"
|
||||
@@ -53,12 +47,6 @@ export CFLAGS="%{optflags}"
|
||||
|
||||
%install
|
||||
%python_install
|
||||
# setup.py install puts files into wrong directory
|
||||
# https://github.com/gdabah/distorm/issues/124
|
||||
if [ "x%_lib" != "xlib" ]; then
|
||||
%python_expand mkdir -p %{buildroot}%{$python_sitearch}
|
||||
%python_expand mv -v %{buildroot}%{$python_sitelib}/%{modname}* %{buildroot}%{$python_sitearch}
|
||||
fi
|
||||
%python_expand %fdupes %{buildroot}%{$python_sitearch}
|
||||
|
||||
# tests are not packaged in the upstream tarball
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
https://github.com/gdabah/distorm/pull/116
|
||||
|
||||
From e300df86b8483f59dcd56c521eb5b8d07c9c92d9 Mon Sep 17 00:00:00 2001
|
||||
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
|
||||
Date: Mon, 5 Jun 2017 21:59:26 +0200
|
||||
Subject: [PATCH] sort input files
|
||||
|
||||
when building packages (e.g. for openSUSE Linux)
|
||||
(random) filesystem order of input files
|
||||
influences ordering of functions in the output,
|
||||
thus without the patch, builds (in disposable VMs) would usually differ.
|
||||
|
||||
See https://reproducible-builds.org/ for why this matters.
|
||||
---
|
||||
setup.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index b14ad67..e035e5b 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -33,7 +33,7 @@ def get_sources():
|
||||
create the libdistorm3 library.
|
||||
"""
|
||||
|
||||
- return glob('src/*.c')
|
||||
+ return sorted(glob('src/*.c'))
|
||||
|
||||
|
||||
class custom_build(build):
|
||||
Reference in New Issue
Block a user