Pullup ticket #4808 - requested by taca

sysutils/testdisk: security update

Revisions pulled up:
- sysutils/testdisk/Makefile                                    1.11 via patch
- sysutils/testdisk/PLIST                                       1.3
- sysutils/testdisk/distinfo                                    1.3

---
   Module Name:	pkgsrc
   Committed By:	leot
   Date:		Mon Aug 24 19:54:14 UTC 2015

   Modified Files:
   	pkgsrc/sysutils/testdisk: Makefile PLIST distinfo

   Log Message:
   Update sysutils/testdisk to testdisk-7.0.

   Changes:
   == 7.0 ==
   === General Improvements ===
   Various fix including security fix, thanks to
   * Coverity scan (Static Analysis of source code)
   * afl-fuzz (security-oriented fuzzer).
   * Denis Andzakovic from Security Assessment for reporting an
     exploitable Stack Buffer Overflow

   === TestDisk ===
   ==== Improvements ====
   * exFAT: better support
   * ext4: handle 64 bit blocks or 64 KiB blocksize. Fix detection and file
     listing

   ==== Bug fixes ====
   * Avoid erroneous error when writing 512 bytes on hard disk using 4k sector
   * FAT, NTFS: avoid NULL pointer dereference if localtime() returns NULL.
     Thanks to Graham Sutherland for reporting this bug.

   === PhotoRec & QPhotoRec ===
   QPhotoRec is a Graphical User Interface (Qt based GUI) version of PhotoRec.
   More user friendly, it recognizes the same file formats.

   PhotoRec remains recommended for advanced users, it can stop a recovery and
   resume it later, it recovers more fragmented files when brute-force technology
   is enabled and expert mode is available.

   ==== Improvements ====
   * Reduced false positives for more than 80 file formats.
   * .gif: fix filesize detection
   * .flv: add Flash filesize detection
   * .mpg: detect filesize for MPEG
   * .ra: detect filesize for RealAudio3
   * Improved algorithm to deal with data fragmentation resulting in a general
     speed increased
   * Speedup brute-force mode. Brute-force mode can recover more fragmented
     files, but it's still slow and not 100% reliable. You can enable it in
     PhotoRec Options menu.

   New file formats recovered by PhotoRec:
   * .3dm: Rhino / openNURBS
   * .ari: ARRI Raw Video
   * .camrec: Camtasia Studio
   * .dad: Micae DVR
   * .dcm: Digital Imaging and Communications in Medicine (DICOM)
   * .fp12: File Maker Pro 12
   * .kra: Krita
   * .mlv: Magic Lantern Video
   * .notebook: SMART notebook
   * .ora: Mypaint
   * .red: RED2 video format
   * .rlv: Revelation password
   * .vbm: Veeam Backup Metadata
   * .woff: Web Open Font Format

3 files changed, 23 insertions, 14 deletions

diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
index 3c1f1eaae49..95d2a721cf1 100644
--- a/sysutils/testdisk/Makefile
+++ b/sysutils/testdisk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2014/06/02 12:18:06 obache Exp $
+# $NetBSD: Makefile,v 1.9.10.1 2015/09/03 19:36:34 tron Exp $
 #
 
-DISTNAME=		testdisk-6.14
-PKGREVISION=		1
+DISTNAME=		testdisk-7.0
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.cgsecurity.org/
 EXTRACT_SUFX=		.tar.bz2
@@ -20,12 +19,15 @@ GNU_CONFIGURE=		yes
 .include "../../devel/libuuid/buildlink3.mk"
 .endif
 
+CONFIGURE_ARGS+=	--disable-qt
+
 # testdisk uses either ntfsprogs or fuse-ntfs-3g, but not both, and prefers
 # fuse-ntfs-3g.  Ignore configure-time warnings that the ntfs library is
 # disabled.
 .include "../../filesystems/libntfs/buildlink3.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/sysutils/testdisk/PLIST b/sysutils/testdisk/PLIST
index bbb33d67a5e..67b89f0835d 100644
--- a/sysutils/testdisk/PLIST
+++ b/sysutils/testdisk/PLIST
@@ -1,13 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2013/09/09 17:45:58 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2.16.1 2015/09/03 19:36:34 tron Exp $
 bin/fidentify
 bin/photorec
 bin/testdisk
 man/man8/fidentify.8
 man/man8/photorec.8
+man/man8/qphotorec.8
 man/man8/testdisk.8
-share/doc/${PKGNAME}/AUTHORS
-share/doc/${PKGNAME}/ChangeLog
-share/doc/${PKGNAME}/NEWS
-share/doc/${PKGNAME}/README
-share/doc/${PKGNAME}/THANKS
-share/doc/${PKGNAME}/documentation.html
+man/zh_CN/man8/fidentify.8
+man/zh_CN/man8/photorec.8
+man/zh_CN/man8/qphotorec.8
+man/zh_CN/man8/testdisk.8
+share/doc/testdisk/AUTHORS
+share/doc/testdisk/ChangeLog
+share/doc/testdisk/NEWS
+share/doc/testdisk/README
+share/doc/testdisk/THANKS
+share/doc/testdisk/documentation.html
+share/icons/hicolor/48x48/apps/qphotorec.png
+share/icons/hicolor/scalable/apps/qphotorec.svg
diff --git a/sysutils/testdisk/distinfo b/sysutils/testdisk/distinfo
index d332c26124e..52a7824cdfa 100644
--- a/sysutils/testdisk/distinfo
+++ b/sysutils/testdisk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2013/09/09 17:45:58 drochner Exp $
+$NetBSD: distinfo,v 1.2.16.1 2015/09/03 19:36:34 tron Exp $
 
-SHA1 (testdisk-6.14.tar.bz2) = a2359406db5e3e3f9db81d8e8fce2a125dcc3677
-RMD160 (testdisk-6.14.tar.bz2) = b1ba7d714da496216e16a942045f0f6e32554d8b
-Size (testdisk-6.14.tar.bz2) = 620077 bytes
+SHA1 (testdisk-7.0.tar.bz2) = 3badfd88fea3d785f0d14ba0368866a085041c50
+RMD160 (testdisk-7.0.tar.bz2) = 56ff652a9ddf1c2b5cf96493e9aed8e7f7942d1f
+Size (testdisk-7.0.tar.bz2) = 676990 bytes
 SHA1 (patch-aa) = 76105a444a099435f75bf230292742a92fdc6722