Index: Makefile =================================================================== --- Makefile (revision 405399) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= radare2 -PORTVERSION= 0.9.8 -PORTREVISION= 1 +PORTVERSION= 0.9.9 CATEGORIES= devel MASTER_SITES= http://rada.re/get/ @@ -13,11 +12,14 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libcapstone.so:${PORTSDIR}/devel/capstone + +CONFIGURE_ARGS+= --with-syscapstone + GNU_CONFIGURE= yes USES= gmake tar:xz USE_LDCONFIG= yes -CONFIGURE_ARGS+=--without-ewf --without-gmp MAKE_ENV+= HOST_CC=${CC} PLIST_SUB+= PORTVERSION="${PORTVERSION}" @@ -28,6 +30,8 @@ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|..LFX./pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|g' \ ${WRKSRC}/libr/Makefile + @${ECHO_CMD} 'CFLAGS+=-I${LOCALBASE}/include' >> ${WRKSRC}/libr/anal/Makefile + @${ECHO_CMD} 'CFLAGS+=-I${LOCALBASE}/include' >> ${WRKSRC}/libr/asm/Makefile post-patch-DOCS-off: @${REINPLACE_CMD} -e 's| install-doc ||g' \ Index: distinfo =================================================================== --- distinfo (revision 405399) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (radare2-0.9.8.tar.xz) = 8e72caaebdac10300fd7ec86a5d06b1cbecfc6914e5fea4007c6e06e667bfa5a -SIZE (radare2-0.9.8.tar.xz) = 4614588 +SHA256 (radare2-0.9.9.tar.xz) = 024adba5255f12e58c2c1a5e2263fada75aad6e71b082461dea4a2b94b29df32 +SIZE (radare2-0.9.9.tar.xz) = 4318304 Index: files/patch-CVE-2015-2331 =================================================================== --- files/patch-CVE-2015-2331 (revision 405399) +++ files/patch-CVE-2015-2331 (working copy) @@ -1,13 +1,15 @@ -changeset: 1718:9f11d54f692e -user: Thomas Klausner -date: Sat Mar 21 12:28:42 2015 +0100 -summary: Avoid integer overflow. Addresses CVE-2015-2331. - -diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c ---- shlr/zip/zip/zip_dirent.c -+++ shlr/zip/zip/zip_dirent.c -@@ -110,7 +110,7 @@ _zip_cdir_new(zip_uint64_t nentry, struc +--- shlr/zip/zip/zip_dirent.c 2014-12-03 13:56:31.000000000 -0800 ++++ shlr/zip/zip/zip_dirent.c 2016-01-06 19:45:39.162585000 -0800 +@@ -33,6 +33,7 @@ + + ++#include + #include + #include + #include +@@ -110,7 +111,7 @@ + if (nentry == 0) cd->entry = NULL; - else if ((cd->entry=(struct zip_entry *)malloc(sizeof(*(cd->entry))*nentry)) == NULL) { Index: pkg-plist =================================================================== --- pkg-plist (revision 405399) +++ pkg-plist (working copy) @@ -54,6 +54,7 @@ include/libr/r_types_base.h include/libr/r_userconf.h include/libr/r_util.h +include/libr/r_version.h include/libr/sdb.h include/libr/sdb/buffer.h include/libr/sdb/cdb.h @@ -79,6 +80,7 @@ include/libr/sflib/linux-x86-64/sfsyscall.h include/libr/sflib/linux-x86-64/sfsysnr.h lib/libr2.so +lib/libr2.so.%%PORTVERSION%% lib/libr_anal.so lib/libr_anal.so.%%PORTVERSION%% lib/libr_asm.so @@ -99,8 +101,6 @@ lib/libr_db.so.%%PORTVERSION%% lib/libr_debug.so lib/libr_debug.so.%%PORTVERSION%% -lib/libr_diff.so -lib/libr_diff.so.%%PORTVERSION%% lib/libr_egg.so lib/libr_egg.so.%%PORTVERSION%% lib/libr_flags.so @@ -133,12 +133,15 @@ lib/radare2/%%PORTVERSION%%/asm_avr.so lib/radare2/%%PORTVERSION%%/asm_bf.so lib/radare2/%%PORTVERSION%%/asm_cr16.so +lib/radare2/%%PORTVERSION%%/asm_cris_gnu.so lib/radare2/%%PORTVERSION%%/asm_csr.so lib/radare2/%%PORTVERSION%%/asm_dalvik.so lib/radare2/%%PORTVERSION%%/asm_ebc.so lib/radare2/%%PORTVERSION%%/asm_gb.so lib/radare2/%%PORTVERSION%%/asm_h8300.so +lib/radare2/%%PORTVERSION%%/asm_i4004.so lib/radare2/%%PORTVERSION%%/asm_java.so +lib/radare2/%%PORTVERSION%%/asm_lh5801.so lib/radare2/%%PORTVERSION%%/asm_malbolge.so lib/radare2/%%PORTVERSION%%/asm_mips_gnu.so lib/radare2/%%PORTVERSION%%/asm_msil.so @@ -146,7 +149,6 @@ lib/radare2/%%PORTVERSION%%/asm_ppc_cs.so lib/radare2/%%PORTVERSION%%/asm_ppc_gnu.so lib/radare2/%%PORTVERSION%%/asm_propeller.so -lib/radare2/%%PORTVERSION%%/asm_psosvm.so lib/radare2/%%PORTVERSION%%/asm_sh.so lib/radare2/%%PORTVERSION%%/asm_snes.so lib/radare2/%%PORTVERSION%%/asm_sparc_cs.so @@ -161,6 +163,7 @@ lib/radare2/%%PORTVERSION%%/asm_x86_nz.so lib/radare2/%%PORTVERSION%%/asm_x86_olly.so lib/radare2/%%PORTVERSION%%/asm_x86_udis.so +lib/radare2/%%PORTVERSION%%/asm_z80_cr.so lib/radare2/%%PORTVERSION%%/bin_any.so lib/radare2/%%PORTVERSION%%/bin_bios.so lib/radare2/%%PORTVERSION%%/bin_coff.so @@ -173,6 +176,7 @@ lib/radare2/%%PORTVERSION%%/bin_mach064.so lib/radare2/%%PORTVERSION%%/bin_ningb.so lib/radare2/%%PORTVERSION%%/bin_ningba.so +lib/radare2/%%PORTVERSION%%/bin_omf.so lib/radare2/%%PORTVERSION%%/bin_pe.so lib/radare2/%%PORTVERSION%%/bin_pe64.so lib/radare2/%%PORTVERSION%%/bin_te.so @@ -179,16 +183,18 @@ lib/radare2/%%PORTVERSION%%/bin_xbe.so lib/radare2/%%PORTVERSION%%/bin_xtr_dyldcache.so lib/radare2/%%PORTVERSION%%/bin_xtr_fatmach0.so +lib/radare2/%%PORTVERSION%%/bin_zimg.so lib/radare2/%%PORTVERSION%%/bp_arm.so lib/radare2/%%PORTVERSION%%/bp_x86.so +lib/radare2/%%PORTVERSION%%/core_anal.so lib/radare2/%%PORTVERSION%%/core_java.so lib/radare2/%%PORTVERSION%%/crypto_aes.so lib/radare2/%%PORTVERSION%%/debug_gdb.so lib/radare2/%%PORTVERSION%%/debug_native.so +lib/radare2/%%PORTVERSION%%/debug_wind.so lib/radare2/%%PORTVERSION%%/hud/main lib/radare2/%%PORTVERSION%%/io_debug.so lib/radare2/%%PORTVERSION%%/io_gdb.so -lib/radare2/%%PORTVERSION%%/io_haret.so lib/radare2/%%PORTVERSION%%/io_mach.so lib/radare2/%%PORTVERSION%%/io_malloc.so lib/radare2/%%PORTVERSION%%/io_procpid.so @@ -195,6 +201,12 @@ lib/radare2/%%PORTVERSION%%/io_ptrace.so lib/radare2/%%PORTVERSION%%/io_shm.so lib/radare2/%%PORTVERSION%%/io_w32dbg.so +lib/radare2/%%PORTVERSION%%/io_windbg.so +lib/radare2/%%PORTVERSION%%/parse_arm_pseudo.so +lib/radare2/%%PORTVERSION%%/parse_att2intel.so +lib/radare2/%%PORTVERSION%%/parse_mreplace.so +lib/radare2/%%PORTVERSION%%/parse_x86_pseudo.so +lib/radare2/%%PORTVERSION%%/parse_z80_pseudo.so lib/radare2/%%PORTVERSION%%/magic/OpenBSD lib/radare2/%%PORTVERSION%%/magic/archive lib/radare2/%%PORTVERSION%%/magic/cafebabe @@ -207,6 +219,7 @@ lib/radare2/%%PORTVERSION%%/magic/flash lib/radare2/%%PORTVERSION%%/magic/freebsd lib/radare2/%%PORTVERSION%%/magic/gimp +lib/radare2/%%PORTVERSION%%/magic/gpg lib/radare2/%%PORTVERSION%%/magic/html lib/radare2/%%PORTVERSION%%/magic/images lib/radare2/%%PORTVERSION%%/magic/java @@ -232,16 +245,17 @@ lib/radare2/%%PORTVERSION%%/magic/vorbis lib/radare2/%%PORTVERSION%%/magic/zfs lib/radare2/%%PORTVERSION%%/opcodes/arm.sdb +lib/radare2/%%PORTVERSION%%/opcodes/mips.sdb lib/radare2/%%PORTVERSION%%/opcodes/ppc.sdb lib/radare2/%%PORTVERSION%%/opcodes/x86.sdb lib/radare2/%%PORTVERSION%%/opcodes/z80.sdb -lib/radare2/%%PORTVERSION%%/parse_att2intel.so -lib/radare2/%%PORTVERSION%%/parse_mreplace.so -lib/radare2/%%PORTVERSION%%/parse_x86_pseudo.so lib/radare2/%%PORTVERSION%%/syscall/darwin-x86-32.sdb lib/radare2/%%PORTVERSION%%/syscall/darwin-x86-64.sdb lib/radare2/%%PORTVERSION%%/syscall/dos-x86-16.sdb lib/radare2/%%PORTVERSION%%/syscall/freebsd-x86-32.sdb +lib/radare2/%%PORTVERSION%%/syscall/ios-arm-32.sdb +lib/radare2/%%PORTVERSION%%/syscall/ios-arm-64.sdb +lib/radare2/%%PORTVERSION%%/syscall/ios-x86-32.sdb lib/radare2/%%PORTVERSION%%/syscall/linux-arm-32.sdb lib/radare2/%%PORTVERSION%%/syscall/linux-mips-32.sdb lib/radare2/%%PORTVERSION%%/syscall/linux-sparc-32.sdb @@ -262,7 +276,6 @@ libdata/pkgconfig/r_core.pc libdata/pkgconfig/r_db.pc libdata/pkgconfig/r_debug.pc -libdata/pkgconfig/r_diff.pc libdata/pkgconfig/r_flags.pc libdata/pkgconfig/r_fs.pc libdata/pkgconfig/r_hash.pc @@ -334,6 +347,7 @@ %%DATADIR%%/%%PORTVERSION%%/cons/dark %%DATADIR%%/%%PORTVERSION%%/cons/focus %%DATADIR%%/%%PORTVERSION%%/cons/lima +%%DATADIR%%/%%PORTVERSION%%/cons/matrix %%DATADIR%%/%%PORTVERSION%%/cons/ogray %%DATADIR%%/%%PORTVERSION%%/cons/pink %%DATADIR%%/%%PORTVERSION%%/cons/rasta @@ -342,8 +356,14 @@ %%DATADIR%%/%%PORTVERSION%%/cons/tango %%DATADIR%%/%%PORTVERSION%%/cons/twilight %%DATADIR%%/%%PORTVERSION%%/cons/white +%%DATADIR%%/%%PORTVERSION%%/cons/xvilka %%DATADIR%%/%%PORTVERSION%%/cons/zenburn +%%DATADIR%%/%%PORTVERSION%%/format/CSMFPAPI.sdb +%%DATADIR%%/%%PORTVERSION%%/format/MSI.sdb %%DATADIR%%/%%PORTVERSION%%/format/Makefile +%%DATADIR%%/%%PORTVERSION%%/format/OLEAUT32.sdb +%%DATADIR%%/%%PORTVERSION%%/format/WS2_32.sdb +%%DATADIR%%/%%PORTVERSION%%/format/WSOCK32.sdb %%DATADIR%%/%%PORTVERSION%%/format/elf32 %%DATADIR%%/%%PORTVERSION%%/format/elf64 %%DATADIR%%/%%PORTVERSION%%/format/elf_enums @@ -360,19 +380,31 @@ %%DATADIR%%/%%PORTVERSION%%/www/enyo/build/enyo.css %%DATADIR%%/%%PORTVERSION%%/www/enyo/build/enyo.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/colors/index.html +%%DATADIR%%/%%PORTVERSION%%/www/enyo/disasm.css %%DATADIR%%/%%PORTVERSION%%/www/enyo/favicon.ico %%DATADIR%%/%%PORTVERSION%%/www/enyo/icon.png %%DATADIR%%/%%PORTVERSION%%/www/enyo/index.css %%DATADIR%%/%%PORTVERSION%%/www/enyo/index.html %%DATADIR%%/%%PORTVERSION%%/www/enyo/index.js +%%DATADIR%%/%%PORTVERSION%%/www/enyo/joint.min.css +%%DATADIR%%/%%PORTVERSION%%/www/enyo/jquery.layout.css %%DATADIR%%/%%PORTVERSION%%/www/enyo/js/about.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/js/assembler.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/js/config.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/js/console.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/js/debugger.js +%%DATADIR%%/%%PORTVERSION%%/www/enyo/js/disasm.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/js/disassembler.js +%%DATADIR%%/%%PORTVERSION%%/www/enyo/js/disassembler_old.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/js/graph.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/js/hexdump.js +%%DATADIR%%/%%PORTVERSION%%/www/enyo/js/joint.js +%%DATADIR%%/%%PORTVERSION%%/www/enyo/js/joint.layout.DirectedGraph.js +%%DATADIR%%/%%PORTVERSION%%/www/enyo/js/jquery-1.9.0.js +%%DATADIR%%/%%PORTVERSION%%/www/enyo/js/jquery-ui-latest.js +%%DATADIR%%/%%PORTVERSION%%/www/enyo/js/jquery.layout-latest.js +%%DATADIR%%/%%PORTVERSION%%/www/enyo/js/jquery.scrollTo.js +%%DATADIR%%/%%PORTVERSION%%/www/enyo/js/jquery.ui.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/js/leftpanel.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/js/logs.js %%DATADIR%%/%%PORTVERSION%%/www/enyo/js/main.js @@ -386,6 +418,7 @@ %%DATADIR%%/%%PORTVERSION%%/www/enyo/lib/onyx/images/gradient-invert.png %%DATADIR%%/%%PORTVERSION%%/www/enyo/lib/onyx/images/gradient.png %%DATADIR%%/%%PORTVERSION%%/www/enyo/r2ui.js +%%DATADIR%%/%%PORTVERSION%%/www/enyo/rlogo-tr.png %%DATADIR%%/%%PORTVERSION%%/www/enyo/two %%DATADIR%%/%%PORTVERSION%%/www/favicon.ico %%DATADIR%%/%%PORTVERSION%%/www/graph/img/arrow.gif @@ -400,11 +433,45 @@ %%DATADIR%%/%%PORTVERSION%%/www/graph/make.sh %%DATADIR%%/%%PORTVERSION%%/www/graph/sf-homepage.css %%DATADIR%%/%%PORTVERSION%%/www/index.html +%%DATADIR%%/%%PORTVERSION%%/www/index.old.html %%DATADIR%%/%%PORTVERSION%%/www/log.html %%DATADIR%%/%%PORTVERSION%%/www/old/index.html %%DATADIR%%/%%PORTVERSION%%/www/old/rlogo2.png %%DATADIR%%/%%PORTVERSION%%/www/old/script.js %%DATADIR%%/%%PORTVERSION%%/www/old/style.css +%%DATADIR%%/%%PORTVERSION%%/www/p/Makefile +%%DATADIR%%/%%PORTVERSION%%/www/p/colors.html +%%DATADIR%%/%%PORTVERSION%%/www/p/index.html +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/css/jquery-colpick.css +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/css/jquery-ui.css +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/css/jquery.onoff.css +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/css/jquery.ui.tabs.css +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/css/layout-default-latest.css +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/css/main.css +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/css/spectrum.css +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/css/tree.jquery.css +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/disasm_panel.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/entropy_panel.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/hex_panel.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/jquery-1.9.0.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/jquery-colpick.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/jquery-ui-latest.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/jquery.donetyping.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/jquery.layout-latest.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/jquery.layout.resizePaneAccordions-latest.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/jquery.onoff.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/jquery.scrollTo-latest.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/jquery.ui-contextmenu.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/main.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/projects_panel.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/settings_panel.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/spectrum.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/strings_panel.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/taphold.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/tree.jquery.js +%%DATADIR%%/%%PORTVERSION%%/www/p/lib/js/types_panel.js +%%DATADIR%%/%%PORTVERSION%%/www/p/rlogo-inv.png +%%DATADIR%%/%%PORTVERSION%%/www/r2.svg %%DATADIR%%/%%PORTVERSION%%/www/rlogo.png %%DATADIR%%/%%PORTVERSION%%/www/t/Makefile %%DATADIR%%/%%PORTVERSION%%/www/t/README.md @@ -414,5 +481,3 @@ %%DATADIR%%/%%PORTVERSION%%/www/t/style.css %%DATADIR%%/%%PORTVERSION%%/www/t/tiled.js %%DATADIR%%/%%PORTVERSION%%/www/upload.html -%%DATADIR%%/%%PORTVERSION%%/yara/crypto.yara.gz -%%DATADIR%%/%%PORTVERSION%%/yara/packers.yara.gz