svn commit: r357718 - in head/sysutils/bulk_extractor: . files

[Antoine Brodin]

Author: antoine
Date: Fri Jun 13 19:00:19 2014
New Revision: 357718
URL: http://svnweb.freebsd.org/changeset/ports/357718
QAT: https://qat.redports.org/buildarchive/r357718/

Log:
  - Remove __sync_add_and_fetch_8 hack, configure script now detects support for it
  - Fix a use after free when dealing with ewf images (already committed upstream)

Modified:
  head/sysutils/bulk_extractor/Makefile
  head/sysutils/bulk_extractor/files/patch-src__image_process.h

Modified: head/sysutils/bulk_extractor/Makefile
==============================================================================
--- head/sysutils/bulk_extractor/Makefile	Fri Jun 13 18:45:22 2014	(r357717)
+++ head/sysutils/bulk_extractor/Makefile	Fri Jun 13 19:00:19 2014	(r357718)
@@ -3,7 +3,7 @@
 
 PORTNAME=	bulk_extractor
 PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.digitalcorpora.org/downloads/bulk_extractor/
 
@@ -35,11 +35,6 @@ BEVIEWER_PLIST_FILES=	bin/BEViewer bin/B
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
-# Needed for __sync_add_and_fetch_8
-CFLAGS+=	-march=i586
-.endif
-
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 CONFIGURE_ENV=	LEX=${LOCALBASE}/bin/flex

Modified: head/sysutils/bulk_extractor/files/patch-src__image_process.h
==============================================================================
--- head/sysutils/bulk_extractor/files/patch-src__image_process.h	Fri Jun 13 18:45:22 2014	(r357717)
+++ head/sysutils/bulk_extractor/files/patch-src__image_process.h	Fri Jun 13 19:00:19 2014	(r357718)
@@ -1,5 +1,14 @@
---- src/image_process.h.orig	2014-01-18 09:13:38.000000000 +0900
-+++ src/image_process.h	2014-01-18 09:14:25.000000000 +0900
+--- ./src/image_process.h.orig	2014-01-15 15:00:06.000000000 +0000
++++ ./src/image_process.h	2014-06-09 14:15:54.000000000 +0000
+@@ -128,7 +128,7 @@
+     virtual int open()=0;				    /* open; return 0 if successful */
+     virtual int pread(uint8_t *,size_t bytes,int64_t offset) const =0;	    /* read */
+     virtual int64_t image_size() const=0;
+-    virtual std::string image_fname() const { return image_fname_;}
++    virtual const std::string &image_fname() const { return image_fname_;}
+ 
+     /* iterator support; these virtual functions are called by iterator through (*myimage) */
+     virtual image_process::iterator begin() const =0;
 @@ -154,7 +154,7 @@
   ****************************************************************/