Commit b0cfb895 authored by Sophie Brun's avatar Sophie Brun

New upstream release

parent b7242d35
......@@ -88,3 +88,5 @@ test_arm_regression
test_arm_regression.o
*.s
.pc/
capstone (3.0-0kali1) kali; urgency=medium
* New upstream release
-- Sophie Brun <sophie@freexian.com> Mon, 24 Nov 2014 10:04:58 +0100
capstone (2.1.2-2~kali1) kali; urgency=medium
* Import debian package in kali
......
......@@ -12,20 +12,20 @@ Build-Depends: debhelper (>= 9),
Standards-Version: 3.9.5
Section: devel
Homepage: http://www.capstone-engine.org/
Vcs-Git: git://anonscm.debian.org/collab-maint/capstone.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/capstone.git;a=summary
Vcs-Git: git://git.kali.org/packages/capstone.git
Vcs-Browser: http://git.kali.org/gitweb?p=packages/capstone.git;a=summary
Package: libcapstone-dev
Section: libdevel
Architecture: any
Depends: libcapstone2 (= ${binary:Version}), ${misc:Depends}
Depends: libcapstone3 (= ${binary:Version}), ${misc:Depends}
Description: lightweight multi-architecture disassembly framework - devel files
Capstone is a lightweight multi-platform, multi-architecture disassembly
framework.
.
These are the development headers and libraries.
Package: libcapstone2
Package: libcapstone3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
......@@ -58,4 +58,4 @@ Description: lightweight multi-architecture disassembly framework - Python bindi
Capstone is a lightweight multi-platform, multi-architecture disassembly
framework.
.
These are the Python 2 bindings.
These are the Python 2 and Python 3 bindings.
......@@ -40,7 +40,6 @@ Files: arch/AArch64/AArch64BaseInfo.c
MCInstrDesc.h
MCRegisterInfo.c
MCRegisterInfo.h
SubtargetFeature.h
Copyright: 2013, University of Illinois
2013, Nguyen Anh Quynh <aquynh@gmail.com>
License: BSD_LLVM
......
......@@ -10,14 +10,14 @@ Last-Update: 2014-05-05
--- a/bindings/python/setup_cython.py
+++ b/bindings/python/setup_cython.py
@@ -6,19 +6,21 @@
VERSION = '2.1'
@@ -6,25 +6,27 @@ from Cython.Distutils import build_ext
VERSION = '3.0'
compile_args = ['-O3', '-fomit-frame-pointer']
+include_dirs = ['../../include']
+library_dirs = ['../../']
+include_dirs = ['../../../include']
+library_dirs = ['../../../']
-ext_modules = [ Extension("capstone.capstone", ["pyx/capstone.pyx"], extra_compile_args=compile_args),
ext_modules = [
- Extension("capstone.ccapstone", ["pyx/ccapstone.pyx"], libraries=["capstone"], extra_compile_args=compile_args),
- Extension("capstone.arm", ["pyx/arm.pyx"], extra_compile_args=compile_args),
- Extension("capstone.arm_const", ["pyx/arm_const.pyx"], extra_compile_args=compile_args),
......@@ -28,8 +28,13 @@ Last-Update: 2014-05-05
- Extension("capstone.ppc", ["pyx/ppc.pyx"], extra_compile_args=compile_args),
- Extension("capstone.ppc_const", ["pyx/ppc_const.pyx"], extra_compile_args=compile_args),
- Extension("capstone.x86", ["pyx/x86.pyx"], extra_compile_args=compile_args),
- Extension("capstone.x86_const", ["pyx/x86_const.pyx"], extra_compile_args=compile_args)
+ext_modules = [ Extension("capstone.capstone", ["pyx/capstone.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
- Extension("capstone.x86_const", ["pyx/x86_const.pyx"], extra_compile_args=compile_args),
- Extension("capstone.sparc", ["pyx/sparc.pyx"], extra_compile_args=compile_args),
- Extension("capstone.sparc_const", ["pyx/sparc_const.pyx"], extra_compile_args=compile_args),
- Extension("capstone.systemz", ["pyx/systemz.pyx"], extra_compile_args=compile_args),
- Extension("capstone.sysz_const", ["pyx/sysz_const.pyx"], extra_compile_args=compile_args),
- Extension("capstone.xcore", ["pyx/xcore.pyx"], extra_compile_args=compile_args),
- Extension("capstone.xcore_const", ["pyx/xcore_const.pyx"], extra_compile_args=compile_args)
+ Extension("capstone.ccapstone", ["pyx/ccapstone.pyx"], libraries=["capstone"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
+ Extension("capstone.arm", ["pyx/arm.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
+ Extension("capstone.arm_const", ["pyx/arm_const.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
......@@ -40,40 +45,24 @@ Last-Update: 2014-05-05
+ Extension("capstone.ppc", ["pyx/ppc.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
+ Extension("capstone.ppc_const", ["pyx/ppc_const.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
+ Extension("capstone.x86", ["pyx/x86.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
+ Extension("capstone.x86_const", ["pyx/x86_const.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs)
+ Extension("capstone.x86_const", ["pyx/x86_const.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
+ Extension("capstone.sparc", ["pyx/sparc.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
+ Extension("capstone.sparc_const", ["pyx/sparc_const.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
+ Extension("capstone.systemz", ["pyx/systemz.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
+ Extension("capstone.sysz_const", ["pyx/sysz_const.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
+ Extension("capstone.xcore", ["pyx/xcore.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs),
+ Extension("capstone.xcore_const", ["pyx/xcore_const.pyx"], extra_compile_args=compile_args, include_dirs=include_dirs, library_dirs=library_dirs)
]
# clean package directory first
--- a/bindings/python/pyx/ccapstone.pxd
+++ b/bindings/python/pyx/ccapstone.pxd
@@ -3,7 +3,7 @@
from libcpp cimport bool
from libc.stdint cimport uint8_t, uint64_t, uint16_t
-cdef extern from "<capstone/capstone.h>":
+cdef extern from "<capstone.h>":
ctypedef size_t csh
--- a/bindings/python/Makefile
+++ b/bindings/python/Makefile
@@ -27,7 +27,7 @@
# clean up first
rm -rf build
# then install
- python setup_cython.py install
+ python setup_cython.py install $(OPTS)
@@ -42,7 +42,7 @@ install_cython:
cp capstone/xcore_const.py $(OBJDIR)/pyx/xcore_const.pyx
cd $(OBJDIR) && python setup_cython.py build -b ./tmp install --home=$(OBJDIR)
mv $(OBJDIR)/build/lib/python/capstone/* capstone
- cd $(OBJDIR) && python setup_cython.py build -b ./tmp install
+ cd $(OBJDIR) && python setup_cython.py build -b ./tmp install $(OPTS)
clean:
rm -rf capstone/*.pyc
--- a/bindings/python/capstone/capstone.py
+++ b/bindings/python/capstone/capstone.py
@@ -124,7 +124,7 @@
__file__ = inspect.getfile(inspect.currentframe())
_lib_path = split(__file__)[0]
-_all_libs = ['libcapstone.dll', 'libcapstone.so', 'libcapstone.dylib']
+_all_libs = ['libcapstone.dll', 'libcapstone.so.2', 'libcapstone.dylib']
_found = False
for _lib in _all_libs:
rm -rf $(OBJDIR)
......@@ -7,14 +7,14 @@ Forwarded: no
Reviewed-By: David Martínez Moreno <ender@debian.org>
Last-Update: 2014-07-18
--- capstone-2.1.2.orig/Makefile
+++ capstone-2.1.2/Makefile
@@ -104,7 +104,7 @@ DEP_MIPS += arch/Mips/MipsGenSubtargetIn
--- a/Makefile
+++ b/Makefile
@@ -123,7 +123,7 @@ DEP_MIPS += arch/Mips/MipsGenSubtargetIn
LIBOBJ_MIPS =
ifneq (,$(findstring mips,$(CAPSTONE_ARCHS)))
- CFLAGS += -DCAPSTONE_HAS_MIPS
+ CFLAGS += -DCAPSTONE_HAS_MIPS -Umips
LIBOBJ_MIPS += arch/Mips/MipsDisassembler.o
LIBOBJ_MIPS += arch/Mips/MipsInstPrinter.o
LIBOBJ_MIPS += arch/Mips/MipsMapping.o
LIBOBJ_MIPS += $(OBJDIR)/arch/Mips/MipsDisassembler.o
LIBOBJ_MIPS += $(OBJDIR)/arch/Mips/MipsInstPrinter.o
LIBOBJ_MIPS += $(OBJDIR)/arch/Mips/MipsMapping.o
Description: Stop installing libcapstone in /usr/lib64.
Upstream seems to make a distinction between x86_64 and the rest of
architectures and install the libraries in /usr/lib64 if we are building
for that architecture. At least Debian doesn't have such difference.
Author: David Martínez Moreno <ender@debian.org>
Forwarded: not-needed
Last-Update: 2014-05-05
--- a/Makefile
+++ b/Makefile
@@ -34,13 +34,13 @@
# on x86_64, we might have /usr/lib64 directory instead of /usr/lib
UNAME_M := $(shell uname -m)
UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_M), x86_64)
-ifeq (,$(wildcard $(LIBDIR)))
-ifneq ($(UNAME_S), Darwin)
-LIBDIR = $(DESTDIR)$(PREFIX)/lib64
-endif
-endif
-endif
+#ifeq ($(UNAME_M), x86_64)
+#ifeq (,$(wildcard $(LIBDIR)))
+#ifneq ($(UNAME_S), Darwin)
+#LIBDIR = $(DESTDIR)$(PREFIX)/lib64
+#endif
+#endif
+#endif
ifneq ($(UNAME_S),Darwin)
LDFLAGS += -shared
typos
no_usr_lib64
use_cppflags
fix_python_bindings
mips_macro_conflict.patch
Description: Fix typos.
Some things here and there that need to be fixed.
Author: David Martínez Moreno <ender@debian.org>
Forwarded: no
Last-Update: 2014-05-05
--- a/README
+++ b/README
@@ -31,7 +31,7 @@
[Compile]
-See COMPILE.TXT file for how to compile and install Capstone
+See COMPILE.TXT file for how to compile and install Capstone.
[Status]
@@ -41,7 +41,7 @@
- X86 engine cannot handle many malware tricks yet. Please report all the raw
binary code that Capstone cannot disassemble, or does that wrongly, so we can
-fix that in the next version
+fix that in the next version.
- This package only contains Java & Python bindings. For C#, Go, Ocaml & Ruby,
refer to the corresponding git repositories.
@@ -49,7 +49,7 @@
[Hack]
-See HACK.TXT file for the structuture of the source code.
+See HACK.TXT file for the structure of the source code.
[License]
--- a/config.mk
+++ b/config.mk
@@ -40,7 +40,7 @@
# such as @regs_read/write & @group. The amount of binary size reduced is
# up to 50% in some individual archs.
#
-# NOTE: we still keep all those related fileds @mnemonic, @op_str, @regs_read,
+# NOTE: we still keep all those related fields @mnemonic, @op_str, @regs_read,
# @regs_write, @groups, etc in fields in cs_insn structure regardless, but they
# will not be updated (i.e empty), thus become irrelevant.
--- a/COMPILE.TXT
+++ b/COMPILE.TXT
@@ -1,4 +1,4 @@
-How To Compile, install & run Capstone for Linux, Mac OSX, *BSD and Windows
+How to compile, install & run Capstone for Linux, Mac OSX, *BSD and Windows
*-*-*-*-*-*
Capstone requires no prerequisite packages, so it is easy to compile & install.
@@ -7,7 +7,7 @@
(0) Tailor Capstone to your need.
- Out of 5 archtitectures supported by Capstone (Arm, Arm64, Mips, PPC & X86),
+ Out of 5 architectures supported by Capstone (ARM, ARM64, MIPS, PPC & x86),
if you just need several selected archs, you can choose which ones you want
to compile in by modifying config.mk before going to next steps.
@@ -17,13 +17,13 @@
(1) Compile from source
- On *nix (such as MacOSX, Linux, *BSD, Solaris):
+ On *nix (such as OSX, Linux, *BSD, Solaris):
- To compile for current platform, run:
$ ./make.sh
- - On 64-bit OS, run command below to cross-compile Capstone for 32-bit binary:
+ - On a 64-bit OS, run command below to cross-compile Capstone for 32-bit binary:
$ ./make.sh nix32
@@ -34,7 +34,7 @@
To install Capstone, run:
$ sudo ./make.sh install
-
+
For FreeBSD/OpenBSD, where sudo is unavailable, run:
$ su; ./make.sh install
@@ -70,14 +70,14 @@
- To cross-compile Windows 64-bit binary, run:
$ ./make.sh cross-win64
- Resulted files libcapstone.dll, libcapstone.dll.a & tests/test*.exe can then
- be used on Windows machine.
+ Resulting files libcapstone.dll, libcapstone.dll.a & tests/test*.exe can then
+ be used on a Windows machine.
(4) Cross-compile iOS from Mac OSX.
- To cross-compile for iOS (iPhone/iPad/iPod), Mac OSX with XCode installed is required.
+ To cross-compile for iOS (iPhone/iPad/iPod), Mac OSX with XCode installed is required.
- To cross-compile for ArmV7 (iPod 4, iPad 1/2/3, iPhone4, iPhone4S), run:
$ ./make.sh ios_armv7
@@ -126,7 +126,7 @@
So far, Python, Ocaml & Java are supported by bindings in the main code.
Look for the bindings under directory bindings/, and refer to README file
- of corresponding languages.
+ of the corresponding language.
Community also provide bindings for C#, Go, Ruby & Vala. Links to these can
- be found at address http://capstone-engine.org/download.html
+ be found at the address http://capstone-engine.org/download.html.
......@@ -4,11 +4,14 @@ Author: David Martínez Moreno <ender@debian.org>
Forwarded: no
Last-Update: 2014-05-05
--- a/Makefile
+++ b/Makefile
@@ -286,4 +286,4 @@
git archive --format=zip --prefix=capstone-$(DIST_VERSION)/ $(TAG) > capstone-$(DIST_VERSION).zip
.c.o:
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
--- a/functions.mk
+++ b/functions.mk
@@ -2,7 +2,7 @@
# Common functions used by Makefile & tests/Makefile
define compile
- ${CC} ${CFLAGS} -c $< -o $@
+ ${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
endef
......@@ -7,6 +7,12 @@
%:
dh $@ --with python2
override_dh_auto_build:
env
dh_auto_build -- V=1
override_dh_auto_install:
ln -sf . include/capstone
dh_auto_install
cd bindings/python && OPTS="--root=$(CURDIR)/debian/tmp/ --install-layout=deb" make install_cython
rm -f include/capstone
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment