NetBSD Problem Report #48189

From iamleot@gmail.com  Fri Sep  6 17:30:49 2013
Return-Path: <iamleot@gmail.com>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "mail.NetBSD.org", Issuer "Postmaster NetBSD.org" (verified OK))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 30B6E71206
	for <gnats-bugs@gnats.netbsd.org>; Fri,  6 Sep 2013 17:30:49 +0000 (UTC)
Message-Id: <522a1142.4c560f0a.4eac.fffff1bf@mx.google.com>
Date: Fri, 06 Sep 2013 10:30:42 -0700 (PDT)
From: Leonardo Taccari <iamleot@gmail.com>
Reply-To: Leonardo Taccari <iamleot@gmail.com>
To: gnats-bugs@gnats.NetBSD.org
Subject: Update sysutils/testdisk to 6.14
X-Send-Pr-Version: 3.95

>Number:         48189
>Category:       pkg
>Synopsis:       Update sysutils/testdisk to 6.14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Sep 06 17:35:00 +0000 2013
>Closed-Date:    Mon Sep 09 17:46:46 +0000 2013
>Last-Modified:  Mon Sep 09 17:50:00 +0000 2013
>Originator:     Leonardo Taccari
>Release:        NetBSD 6.1
>Organization:
>Environment:
System: NetBSD :) 6.1 NetBSD 6.1 (EEEPC900) #1: Fri Jul 12 06:24:35 CEST 2013 leot@:):/usr/src/sys/arch/i386/compile/EEEPC900 i386
Architecture: i386
Machine: i386
>Description:
	sysutils/testdisk in pkgsrc (6.13) is not the latest stable version
	(6.14).
>How-To-Repeat:
	$ cd pkgsrc/sysutils/testdisk
	$ make show-var VARNAME=PKGNAME
>Fix:
	Please apply the following patch, it is straightforward altough I will
	comment some changes that I did.
	 0. I completely modified the DESCR file (it's just a cut&paste from the
	    official website). I think that this one better describes the
		package and it's <25 lines (so pkglint(1) does not complain anymore ;)).
	 1. I updated and added a comment in patches/patch-aa, always suggested by
	    pkglint(1).

	I will also attach a possible commit message (just a
	"lynx -nolist -dump http://www.cgsecurity.org/wiki/TestDisk_6.14_Release"
	and some minor cosmetic text improvements).

	Thank you!


------------8<---------------8<---------------8<---------------8<------------
Update sysutils/testdisk to testdisk-6.14.


Changes:
General Improvements
====================
     * The log file generated by the Windows version (cygwin) reports bad
       sectors in a more readable fashion, example
         ReadFile Data error (cyclic redundancy check).
     * As openssl isn't used, don't link with this cryptographic library
       (Debian tries to avoid mixing GPL code and openssl)


TestDisk
========
Improvements
------------
     * testdisk /list now displays the disk model, serial number, firmware
       version and hpa or dco presence if detected
     * Recover WBFS (Wii Backup File System) partition
     * Make FAT RebuildBS works when there is a single FAT table
     * Interface: Display the partition table type if autodetected
     * Interface: modified warning about mismatching geometry between FAT
       or NTFS boot sector and HD geometry information (Debian #651756)
     * Interface: Remove "Allow partial last cylinder" option

Bug fixes
---------
     * Fix crc in EFI backup GPT
     * Rewrote how TestDisk aligns partition on cylinder or 1MB boundary.
       It avoids to create partition entry where the partition ends after
       the end of the disk.


PhotoRec
========
Improvements
------------
     * Improve Olympus .orf recovery
     * Improve WP Mac/WP5/WP6 Corel Documents .wpd files recovery
     * Fix thumbs.db recovery, avoid some false positive with .doc
     * Interface: if less than 10 file families are enabled, display the
       results even if zero has been found yet

   New file formats:
     * .aep After Effects
     * .axx AxCrypt
     * .dp Designer, a Photobook Designer Software
     * .lzh archive
     * .mmap MindManager
     * .plt Gerber Graphix Advantage
     * .prproj Adobe Premiere project
     * .psb Adobe Photoshop Image
     * .pts PTGui, panoramic stitching software
     * .qcp The QCP File Format and Media Types for Speech Data (RFC3625)
     * .shn Shorten audio file
     * .snt Windows Sticky Notes
     * .ttd TinyTag Data
     * .wallet Armory bitcoin wallet
     * .wim Windows imaging (WIM) image

Bug fixes
---------
     * Fix an endless loop during .caf file recovery
     * Fix tiff recovery including some raw file formats, 64-bit version
       wasn't affected
------------8<---------------8<---------------8<---------------8<------------


------------8<---------------8<---------------8<---------------8<------------
Index: DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/testdisk/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- DESCR	5 May 2013 20:59:22 -0000	1.2
+++ DESCR	6 Sep 2013 17:08:41 -0000
@@ -1,25 +1,17 @@
-Tool to check and undelete partitions.
+TestDisk is powerful free data recovery software! It was primarily designed
+to help recover lost partitions and/or make non-booting disks bootable
+again when these symptoms are caused by faulty software, certain types of
+viruses or human error (such as accidentally deleting a Partition Table).
+Partition table recovery using TestDisk is really easy.

-Supported filesystems:
-- BeFS ( BeOS )
-- BSD disklabel ( FreeBSD/OpenBSD/NetBSD )
-- CramFS (Compressed File System)
-- DOS/Windows FAT12, FAT16 and FAT32
-- Windows exFAT
-- HFS, Hierarchical File System
-- JFS, IBM's Journaled File System
-- Linux Ext2 and Ext3
-- Linux Raid
-- Linux Swap (versions 1 and 2)
-- LVM and LVM2, Linux Logical Volume Manager
-- Netware NSS
-- NTFS ( Windows NT/2K/XP/2003 )
-- ReiserFS 3.5 and 3.6
-- UFS (Sun/BSD/...)
-- XFS, SGI's Journaled File System
-
-Known to work on:
-* DOS/Win9x/NT4/2k/XP/2k3
-* GNU/Linux
-* FreeBSD, NetBSD, OpenBSD
-* Sun Solaris (minimal support)
+TestDisk can
+ * Fix partition table, recover deleted partition
+ * Recover FAT32 boot sector from its backup
+ * Rebuild FAT12/FAT16/FAT32 boot sector
+ * Fix FAT tables
+ * Rebuild NTFS boot sector
+ * Recover NTFS boot sector from its backup
+ * Fix MFT using MFT mirror
+ * Locate ext2/ext3/ext4 Backup SuperBlock
+ * Undelete files from FAT, exFAT, NTFS and ext2 filesystem
+ * Copy files from deleted FAT, exFAT, NTFS and ext2/ext3/ext4 partitions.
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/testdisk/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	4 May 2013 13:16:40 -0000	1.6
+++ Makefile	6 Sep 2013 17:08:41 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2013/05/04 13:16:40 dsainty Exp $
 #

-DISTNAME=		testdisk-6.13
-PKGREVISION=		2
+DISTNAME=		testdisk-6.14
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.cgsecurity.org/
 EXTRACT_SUFX=		.tar.bz2
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/testdisk/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- PLIST	4 Jul 2012 17:58:31 -0000	1.1
+++ PLIST	6 Sep 2013 17:08:41 -0000
@@ -10,4 +10,5 @@
 share/doc/${PKGNAME}/NEWS
 share/doc/${PKGNAME}/README
 share/doc/${PKGNAME}/THANKS
+share/doc/${PKGNAME}/documentation.html
 @pkgdir share/doc/${PKGNAME}/html
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/testdisk/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	4 Jul 2012 17:58:31 -0000	1.1
+++ distinfo	6 Sep 2013 17:08:41 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.1 2012/07/04 17:58:31 drochner Exp $

-SHA1 (testdisk-6.13.tar.bz2) = b08ace0257e3e437b6fc140360d75807ca4d46ae
-RMD160 (testdisk-6.13.tar.bz2) = 9ff09fdcc53a02240b4e22365193eac14a7d5e13
-Size (testdisk-6.13.tar.bz2) = 560696 bytes
-SHA1 (patch-aa) = 05e401608dd426bd780475e3b515e5677ab1ccc5
+SHA1 (testdisk-6.14.tar.bz2) = a2359406db5e3e3f9db81d8e8fce2a125dcc3677
+RMD160 (testdisk-6.14.tar.bz2) = b1ba7d714da496216e16a942045f0f6e32554d8b
+Size (testdisk-6.14.tar.bz2) = 620077 bytes
+SHA1 (patch-aa) = 76105a444a099435f75bf230292742a92fdc6722
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/testdisk/patches/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- patches/patch-aa	4 Jul 2012 17:58:31 -0000	1.1
+++ patches/patch-aa	6 Sep 2013 17:08:41 -0000
@@ -1,6 +1,9 @@
 $NetBSD: patch-aa,v 1.1 2012/07/04 17:58:31 drochner Exp $

---- src/intrfn.h.orig	2010-10-18 06:25:15.000000000 +0000
+stdarg(3) is required by various functions that can be called with variable
+argument lists.
+
+--- src/intrfn.h.orig	2013-05-17 09:34:03.000000000 +0000
 +++ src/intrfn.h
 @@ -39,6 +39,8 @@ extern "C" {
  #include <curses.h>
@@ -10,4 +13,4 @@
 +
  void aff_copy(WINDOW *window);
  void aff_copy_short(WINDOW *window);
- void aff_part(WINDOW *window, const unsigned int newline, const disk_t *disk_car, const partition_t *partition);
+ void aff_LBA2CHS(const disk_t *disk_car, const unsigned long int pos_LBA);

>Release-Note:

>Audit-Trail:

State-Changed-From-To: open->closed
State-Changed-By: drochner@NetBSD.org
State-Changed-When: Mon, 09 Sep 2013 17:46:46 +0000
State-Changed-Why:
applied, thanks


From: "Matthias Drochner" <drochner@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/48189 CVS commit: pkgsrc/sysutils/testdisk
Date: Mon, 9 Sep 2013 17:45:58 +0000

 Module Name:	pkgsrc
 Committed By:	drochner
 Date:		Mon Sep  9 17:45:58 UTC 2013

 Modified Files:
 	pkgsrc/sysutils/testdisk: DESCR Makefile PLIST distinfo
 	pkgsrc/sysutils/testdisk/patches: patch-aa

 Log Message:
 Update sysutils/testdisk to testdisk-6.14.
 from Leonardo Taccari per PR pkg/48189

 Changes:
 General Improvements
 ====================
      * The log file generated by the Windows version (cygwin) reports bad
        sectors in a more readable fashion, example
          ReadFile Data error (cyclic redundancy check).
      * As openssl isn't used, don't link with this cryptographic library
        (Debian tries to avoid mixing GPL code and openssl)

 TestDisk
 ========
 Improvements
 ------------
      * testdisk /list now displays the disk model, serial number, firmware
        version and hpa or dco presence if detected
      * Recover WBFS (Wii Backup File System) partition
      * Make FAT RebuildBS works when there is a single FAT table
      * Interface: Display the partition table type if autodetected
      * Interface: modified warning about mismatching geometry between FAT
        or NTFS boot sector and HD geometry information (Debian #651756)
      * Interface: Remove "Allow partial last cylinder" option

 Bug fixes
 ---------
      * Fix crc in EFI backup GPT
      * Rewrote how TestDisk aligns partition on cylinder or 1MB boundary.
        It avoids to create partition entry where the partition ends after
        the end of the disk.

 PhotoRec
 ========
 Improvements
 ------------
      * Improve Olympus .orf recovery
      * Improve WP Mac/WP5/WP6 Corel Documents .wpd files recovery
      * Fix thumbs.db recovery, avoid some false positive with .doc
      * Interface: if less than 10 file families are enabled, display the
        results even if zero has been found yet

    New file formats:
      * .aep After Effects
      * .axx AxCrypt
      * .dp Designer, a Photobook Designer Software
      * .lzh archive
      * .mmap MindManager
      * .plt Gerber Graphix Advantage
      * .prproj Adobe Premiere project
      * .psb Adobe Photoshop Image
      * .pts PTGui, panoramic stitching software
      * .qcp The QCP File Format and Media Types for Speech Data (RFC3625)
      * .shn Shorten audio file
      * .snt Windows Sticky Notes
      * .ttd TinyTag Data
      * .wallet Armory bitcoin wallet
      * .wim Windows imaging (WIM) image

 Bug fixes
 ---------
      * Fix an endless loop during .caf file recovery
      * Fix tiff recovery including some raw file formats, 64-bit version
        wasn't affected


 To generate a diff of this commit:
 cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/testdisk/DESCR
 cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/testdisk/Makefile
 cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/testdisk/PLIST \
     pkgsrc/sysutils/testdisk/distinfo
 cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/testdisk/patches/patch-aa

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

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.