CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Pierre Pronchery" <khorben%netbsd.org@localhost>
Date: Fri, 23 Feb 2018 02:42:06 +0000

Module Name:    pkgsrc
Committed By:   khorben
Date:           Fri Feb 23 02:42:06 UTC 2018

Modified Files:
        pkgsrc/devel/capstone: Makefile Makefile.common PLIST distinfo
        pkgsrc/devel/py-capstone: Makefile PLIST
Added Files:
        pkgsrc/devel/capstone/patches: patch-cstool_Makefile
Removed Files:
        pkgsrc/devel/capstone/patches: patch-Makefile

Log Message:
Update devel/capstone to version 3.0.5-rc2

This provides important fixes in the core & several bindings:

Library

    Fix build for Visual Studio 2012
    Fix X86_REL_ADDR macro
    Add CS_VERSION_MAJOR, CS_VERSION_MINOR, CS_VERSION_EXTRA
    Better support for embedding Capstone into Windows kernel drivers
    Support to embedded Capstone into MacOS kernel
    Support MacOS 10.11 and up
    Better support for Cygwin
    Support build packages for FreeBSD & DragonflyBSD
    Add a command-line tool "cstool"
    Properly handle switching to Endian mode at run-time for Arm, Arm64, Mips & Sparc

X86

    Some random 16-bit code can be handled wrongly.
    Remove abundant operand type X86_OP_FP
    Fix instructions MOVQ, LOOP, LOOPE, LOOPNE, CALL/JMP rel16, REPNE LODSD, MOV *AX, MOFFS, FAR JMP/CALL
    Add X86_REG_EFLAGS for STC and STD
    Fix instruction attributes for SYSEXIT, MOVW, ROL, LGS, SLDT
    Rename registers ST0-ST7 to be consistent with asm output

Arm

    Properly handle IT instruction
    Fix LDRSB
    Fix writeback for LDR
    Fix Thumb BigEndian setup

Arm

    Fix arith extender
    Fix writeback for LDR
    Rename enum arm64_mrs_reg to arm64_sysreg

PowerPC

    Print 0 offset for memory operand

Sparc

    Fix POPC instruction

Python binding

    Better PyPy support
    Add __version__
    Better support for Python 3
    Fix CS_SKIPDATA_CALLBACK prototype
    Cast skipdata function inside binding to simplify the API

Java binding

    Better handle input with invalid code

PowerShell binding

    New binding

Build-tested with devel/ropper and devel/{py-,}radare2 on NetBSD/amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/capstone/Makefile \
    pkgsrc/devel/capstone/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/capstone/Makefile.common \
    pkgsrc/devel/capstone/PLIST
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/capstone/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/capstone/patches/patch-cstool_Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-capstone/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-capstone/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/capstone/Makefile
diff -u pkgsrc/devel/capstone/Makefile:1.9 pkgsrc/devel/capstone/Makefile:1.10
--- pkgsrc/devel/capstone/Makefile:1.9  Mon Jun 13 01:51:04 2016
+++ pkgsrc/devel/capstone/Makefile      Fri Feb 23 02:42:06 2018
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2016/06/13 01:51:04 kamil Exp $
+# $NetBSD: Makefile,v 1.10 2018/02/23 02:42:06 khorben Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   2
-
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Lightweight multi-platform, multi-architecture disassembly framework
 LICENSE=       modified-bsd
Index: pkgsrc/devel/capstone/distinfo
diff -u pkgsrc/devel/capstone/distinfo:1.9 pkgsrc/devel/capstone/distinfo:1.10
--- pkgsrc/devel/capstone/distinfo:1.9  Sat Feb 20 11:40:30 2016
+++ pkgsrc/devel/capstone/distinfo      Fri Feb 23 02:42:06 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2016/02/20 11:40:30 jperkin Exp $
+$NetBSD: distinfo,v 1.10 2018/02/23 02:42:06 khorben Exp $
 
-SHA1 (capstone-3.0.4.tar.gz) = 6153bbb4a4141fd9e6996d646cf7c81953cfe75a
-RMD160 (capstone-3.0.4.tar.gz) = 3f96993cc7cd2fbc1080e785bb7c7ae7f209d0f9
-SHA512 (capstone-3.0.4.tar.gz) = a5c29e7c559b5391d6a4ec9a7f766699ea6d321aa2f1fc57fdcec893107fa3ef2f5f6323629971c1129f1ca087df4f3ad03d0a8234d2eae368c8ccfec04dbf4d
-Size (capstone-3.0.4.tar.gz) = 2800818 bytes
-SHA1 (patch-Makefile) = a29910046034f468101b6b291c4f995923d09528
+SHA1 (capstone-3.0.5rc2.tar.gz) = 52052e754c4f92128d16d5b028b85f646547f091
+RMD160 (capstone-3.0.5rc2.tar.gz) = 960473fc8f4b7113adc291b768e668e27a7c8b56
+SHA512 (capstone-3.0.5rc2.tar.gz) = 31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
+Size (capstone-3.0.5rc2.tar.gz) = 2829338 bytes
+SHA1 (patch-cstool_Makefile) = 94c029a1f667ceffad787f056c332c11001344df

Index: pkgsrc/devel/capstone/Makefile.common
diff -u pkgsrc/devel/capstone/Makefile.common:1.1 pkgsrc/devel/capstone/Makefile.common:1.2
--- pkgsrc/devel/capstone/Makefile.common:1.1   Mon Jun 13 01:51:04 2016
+++ pkgsrc/devel/capstone/Makefile.common       Fri Feb 23 02:42:06 2018
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.1 2016/06/13 01:51:04 kamil Exp $
+# $NetBSD: Makefile.common,v 1.2 2018/02/23 02:42:06 khorben Exp $
 #
 # used by devel/py-capstone/Makefile
 
-DISTNAME=      capstone-3.0.4
+DISTNAME=      capstone-3.0.5rc2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=aquynh/}
+GITHUB_TAG=    3.0.5-rc2
 
 HOMEPAGE=      http://www.capstone-engine.org/
 
 DISTINFO_FILE= ${.CURDIR}/../../devel/capstone/distinfo
-PATCHDIR=      ${.CURDIR}/../../devel/capstone/patches
Index: pkgsrc/devel/capstone/PLIST
diff -u pkgsrc/devel/capstone/PLIST:1.1 pkgsrc/devel/capstone/PLIST:1.2
--- pkgsrc/devel/capstone/PLIST:1.1     Fri Dec  5 11:51:58 2014
+++ pkgsrc/devel/capstone/PLIST Fri Feb 23 02:42:06 2018
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2014/12/05 11:51:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/02/23 02:42:06 khorben Exp $
+bin/cstool
 include/capstone/arm.h
 include/capstone/arm64.h
 include/capstone/capstone.h

Index: pkgsrc/devel/py-capstone/Makefile
diff -u pkgsrc/devel/py-capstone/Makefile:1.3 pkgsrc/devel/py-capstone/Makefile:1.4
--- pkgsrc/devel/py-capstone/Makefile:1.3       Tue Jun 14 06:54:19 2016
+++ pkgsrc/devel/py-capstone/Makefile   Fri Feb 23 02:42:06 2018
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2016/06/14 06:54:19 kamil Exp $
+# $NetBSD: Makefile,v 1.4 2018/02/23 02:42:06 khorben Exp $
 
 .include "../../devel/capstone/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES+=   python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Python bindings for capstone
 LICENSE=       modified-bsd
 
+WRKSRC=                ${WRKDIR}/capstone-${GITHUB_TAG}
 PYSETUPSUBDIR= bindings/python
 
 .include "../../devel/capstone/buildlink3.mk"

Index: pkgsrc/devel/py-capstone/PLIST
diff -u pkgsrc/devel/py-capstone/PLIST:1.1 pkgsrc/devel/py-capstone/PLIST:1.2
--- pkgsrc/devel/py-capstone/PLIST:1.1  Mon Jun 13 01:56:18 2016
+++ pkgsrc/devel/py-capstone/PLIST      Fri Feb 23 02:42:06 2018
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2016/06/13 01:56:18 kamil Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.2 2018/02/23 02:42:06 khorben Exp $
+${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PYSITELIB}/${EGG_FILE}/top_level.txt
+${PYSITELIB}/${EGG_FILE}/zip-safe
 ${PYSITELIB}/capstone/__init__.py
 ${PYSITELIB}/capstone/__init__.pyc
 ${PYSITELIB}/capstone/__init__.pyo
@@ -15,6 +19,18 @@ ${PYSITELIB}/capstone/arm64_const.pyo
 ${PYSITELIB}/capstone/arm_const.py
 ${PYSITELIB}/capstone/arm_const.pyc
 ${PYSITELIB}/capstone/arm_const.pyo
+${PYSITELIB}/capstone/include/capstone/arm.h
+${PYSITELIB}/capstone/include/capstone/arm64.h
+${PYSITELIB}/capstone/include/capstone/capstone.h
+${PYSITELIB}/capstone/include/capstone/mips.h
+${PYSITELIB}/capstone/include/capstone/platform.h
+${PYSITELIB}/capstone/include/capstone/ppc.h
+${PYSITELIB}/capstone/include/capstone/sparc.h
+${PYSITELIB}/capstone/include/capstone/systemz.h
+${PYSITELIB}/capstone/include/capstone/x86.h
+${PYSITELIB}/capstone/include/capstone/xcore.h
+${PYSITELIB}/capstone/lib/libcapstone.a
+${PYSITELIB}/capstone/lib/libcapstone.so
 ${PYSITELIB}/capstone/mips.py
 ${PYSITELIB}/capstone/mips.pyc
 ${PYSITELIB}/capstone/mips.pyo

Added files:

Index: pkgsrc/devel/capstone/patches/patch-cstool_Makefile
diff -u /dev/null pkgsrc/devel/capstone/patches/patch-cstool_Makefile:1.1
--- /dev/null   Fri Feb 23 02:42:06 2018
+++ pkgsrc/devel/capstone/patches/patch-cstool_Makefile Fri Feb 23 02:42:06 2018
@@ -0,0 +1,19 @@
+$NetBSD: patch-cstool_Makefile,v 1.1 2018/02/23 02:42:06 khorben Exp $
+
+Fix path to the libraries installed.
+
+--- cstool/Makefile.orig       2017-03-02 14:21:24.000000000 +0000
++++ cstool/Makefile
+@@ -6,8 +6,10 @@ include ../functions.mk
+ 
+ LIBNAME = capstone
+ 
+-CFLAGS = -I../include
+-LDFLAGS = -O3 -Wall -L.. -l$(LIBNAME)
++PREFIX ?= /usr
++LIBDIRARCH ?= lib
++CFLAGS = -I../include -O3 -Wall
++LDFLAGS = -Wl,-rpath,$(PREFIX)/$(LIBDIRARCH) -L.. -l$(LIBNAME)
+ 
+ TARGET = cstool
+ SOURCES := $(wildcard *.c)

Prev by Date: CVS commit: pkgsrc/devel/py-manticore
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/py-manticore
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index