diff -Nru disktype-9/debian/changelog disktype-9/debian/changelog --- disktype-9/debian/changelog 2020-07-24 19:13:14.000000000 +0000 +++ disktype-9/debian/changelog 2020-11-07 12:32:28.000000000 +0000 @@ -1,3 +1,21 @@ +disktype (9-11) unstable; urgency=medium + + * Using forensics-samples-multiple package in second CI test. Consequently: + - debian/source/include-binaries: no longer needed. Removed. + - debian/tests/control: updated to use fsdeploy command to provide + fs.multiple image. + - debian/tests/test.img: no longer needed. Removed. + * debian/control: added exFAT and F2FS to long description. + * debian/NEWS: created to tell about exFAT and F2FS. + * debian/patches/: + - 40_add_support_exfat.patch: created to add support to exFAT. + - 50_add_support_f2fs.patch: created to add support to F2FS. Thanks to + Anders Thulin. + - 60_update_README.patch: created to make upstream README compliant with + Debian systems. + + -- Joao Eriberto Mota Filho Sat, 07 Nov 2020 09:32:28 -0300 + disktype (9-10) unstable; urgency=medium * debian/control: diff -Nru disktype-9/debian/control disktype-9/debian/control --- disktype-9/debian/control 2020-07-24 19:13:14.000000000 +0000 +++ disktype-9/debian/control 2020-11-07 12:32:28.000000000 +0000 @@ -20,7 +20,7 @@ As of version 9, disktype knows about the following formats: . File systems: - FAT12/FAT16/FAT32 + FAT12/FAT16/FAT32/exFAT NTFS HPFS MFS, HFS, HFS Plus @@ -39,6 +39,7 @@ SysV FS (some variations) JFS XFS + F2FS Amiga FS/FFS Amiga SFS Amiga PFS diff -Nru disktype-9/debian/NEWS disktype-9/debian/NEWS --- disktype-9/debian/NEWS 1970-01-01 00:00:00.000000000 +0000 +++ disktype-9/debian/NEWS 2020-11-07 12:32:28.000000000 +0000 @@ -0,0 +1,5 @@ +disktype (9-11) unstable; urgency=medium + + Since 9-11 revision in Debian, disktype supports exFAT and F2FS filesystems. + + -- Joao Eriberto Mota Filho Sat, 07 Nov 2020 09:32:28 -0300 diff -Nru disktype-9/debian/patches/40_add_support_exfat.patch disktype-9/debian/patches/40_add_support_exfat.patch --- disktype-9/debian/patches/40_add_support_exfat.patch 1970-01-01 00:00:00.000000000 +0000 +++ disktype-9/debian/patches/40_add_support_exfat.patch 2020-11-07 12:32:28.000000000 +0000 @@ -0,0 +1,78 @@ +Description: add support to exFAT filesystem +Author: not declared +Origin: https://github.com/ericpaulbishop/gargoyle/tree/master/package/disktype/patches +Origin: http://svn.exactcode.de/t2/trunk/package/filesystem/disktype/ +Reviewed-by: Joao Eriberto Mota Filho +Last-Update: 2020-11-07 +Index: disktype/detect.c +=================================================================== +--- disktype.orig/detect.c ++++ disktype/detect.c +@@ -47,6 +47,7 @@ void detect_atari_partmap(SECTION *secti + void detect_dos_partmap(SECTION *section, int level); + void detect_gpt_partmap(SECTION *section, int level); + void detect_fat(SECTION *section, int level); ++void detect_exfat(SECTION *section, int level); + void detect_ntfs(SECTION *section, int level); + void detect_hpfs(SECTION *section, int level); + void detect_dos_loader(SECTION *section, int level); +@@ -132,6 +133,7 @@ DETECTOR detectors[] = { + detect_amiga_fs, + detect_apple_volume, + detect_fat, ++ detect_exfat, + detect_ntfs, + detect_hpfs, + detect_udf, +Index: disktype/dos.c +=================================================================== +--- disktype.orig/dos.c ++++ disktype/dos.c +@@ -429,6 +429,8 @@ void detect_fat(SECTION *section, int le + /* since the above is also present on NTFS, make sure it's not NTFS... */ + if (memcmp(buf + 3, "NTFS ", 8) == 0) + return; ++ if (memcmp(buf + 3, "EXFAT ", 8) == 0) ++ return; + + /* next, some soft tests, taking score */ + score = 0; +@@ -516,6 +518,25 @@ void detect_fat(SECTION *section, int le + } + + /* ++ * exFAT file system ++ */ ++ ++void detect_exfat(SECTION *section, int level) ++{ ++ unsigned char *buf; ++ ++ if (get_buffer(section, 0, 512, (void **)&buf) < 512) ++ return; ++ ++ /* check signatures */ ++ if (memcmp(buf + 3, "EXFAT ", 8) != 0) ++ return; ++ ++ /* tell the user */ ++ print_line(level, "exFAT file system"); ++} ++ ++/* + * NTFS file system + */ + +Index: disktype/disktype.1 +=================================================================== +--- disktype.orig/disktype.1 ++++ disktype/disktype.1 +@@ -35,7 +35,7 @@ The following formats are recognized by + .No . + .Bl -tag -width flag + .It File systems: +-FAT12/FAT16/FAT32, NTFS, HPFS, MFS, HFS, HFS Plus, ++FAT12/FAT16/FAT32/exFAT, NTFS, HPFS, MFS, HFS, HFS Plus, + ISO9660, ext2/ext3/ext4, btrfs, Minix, ReiserFS, Reiser4, Linux romfs, Linux + cramfs, Linux squashfs, UFS (some variations), SysV FS (some + variations), JFS, XFS, Amiga FS/FFS, BeOS BFS, QNX4 FS, UDF, 3DO diff -Nru disktype-9/debian/patches/50_add_support_f2fs.patch disktype-9/debian/patches/50_add_support_f2fs.patch --- disktype-9/debian/patches/50_add_support_f2fs.patch 1970-01-01 00:00:00.000000000 +0000 +++ disktype-9/debian/patches/50_add_support_f2fs.patch 2020-11-07 12:32:28.000000000 +0000 @@ -0,0 +1,95 @@ +Description: add support to F2FS +Author: Anders Thulin +Origin: https://sourceforge.net/p/disktype/patches/6/ +Forwarded: not-needed +Reviewed-By: Joao Eriberto Mota Filho +Last-Update: 2018-08-19 +Index: disktype/Makefile +=================================================================== +--- disktype.orig/Makefile ++++ disktype/Makefile +@@ -9,7 +9,7 @@ OBJS = main.o lib.o \ + buffer.o file.o cdaccess.o cdimage.o vpc.o compressed.o \ + detect.o apple.o amiga.o atari.o dos.o cdrom.o \ + linux.o unix.o beos.o archives.o \ +- udf.o blank.o cloop.o ++ udf.o blank.o cloop.o f2fs.o + + TARGET = disktype + +Index: disktype/detect.c +=================================================================== +--- disktype.orig/detect.c ++++ disktype/detect.c +@@ -105,6 +105,9 @@ void detect_archive(SECTION *section, in + /* in blank.c */ + void detect_blank(SECTION *section, int level); + ++/* in f2fs.c */ ++void detect_f2fs(SECTION *section, int level); ++ + /* + * list of detectors + */ +@@ -148,6 +151,7 @@ DETECTOR detectors[] = { + detect_linux_lvm2, + detect_linux_swap, + detect_linux_misc, ++ detect_f2fs, + detect_jfs, + detect_xfs, + detect_ufs, +Index: disktype/f2fs.c +=================================================================== +--- /dev/null ++++ disktype/f2fs.c +@@ -0,0 +1,36 @@ ++/* ++ * f2fs.c ++ * Detection of f2fs file system ++ * ++ * Superblock details are from Github project f2fs-tools, ++ * file f2fs-tools-1.11.0\include\f2fs_fs.h ++ */ ++ ++#include "global.h" ++ ++void detect_f2fs(SECTION *section, int level) ++{ ++ // Superblock in sector 2 ++ // ++ unsigned char *buf; ++ if (get_buffer(section, 1024, 512, (void **)&buf) < 512) ++ return; ++ ++ if (get_le_long(buf+0) != 0xF2F52010) ++ return; ++ ++ u2 major = get_le_short(buf+4); ++ u2 minor = get_le_short(buf+6); ++ ++ print_line(level, "F2FS file system (version %d.%d)", major, minor); ++ ++ ++ char volume_name[512]; ++ format_utf16_le(buf+124, 512, volume_name); ++ print_line(level, "Volume name: %s", volume_name); ++ ++ ++ char uuid[40]; ++ format_uuid(buf+108, uuid); ++ print_line(level, "Volume uuid: %s", uuid); ++} +Index: disktype/disktype.1 +=================================================================== +--- disktype.orig/disktype.1 ++++ disktype/disktype.1 +@@ -38,7 +38,7 @@ The following formats are recognized by + FAT12/FAT16/FAT32/exFAT, NTFS, HPFS, MFS, HFS, HFS Plus, + ISO9660, ext2/ext3/ext4, btrfs, Minix, ReiserFS, Reiser4, Linux romfs, Linux + cramfs, Linux squashfs, UFS (some variations), SysV FS (some +-variations), JFS, XFS, Amiga FS/FFS, BeOS BFS, QNX4 FS, UDF, 3DO ++variations), JFS, XFS, F2FS, Amiga FS/FFS, BeOS BFS, QNX4 FS, UDF, 3DO + CD-ROM file system, Veritas VxFS, Xbox DVD file system. + .It Partitioning: + DOS/PC style, Apple, Amiga "Rigid Disk", ATARI ST (AHDI3), diff -Nru disktype-9/debian/patches/60_update_README.patch disktype-9/debian/patches/60_update_README.patch --- disktype-9/debian/patches/60_update_README.patch 1970-01-01 00:00:00.000000000 +0000 +++ disktype-9/debian/patches/60_update_README.patch 2020-11-07 12:32:28.000000000 +0000 @@ -0,0 +1,18 @@ +Description: make README compliant with Debian systems +Author: Joao Eriberto Mota Filho +Forwarded: not-needed +Last-Update: 2020-11-07 +Index: disktype/README +=================================================================== +--- disktype.orig/README ++++ disktype/README +@@ -60,7 +60,8 @@ File systems: FAT12/FAT16/FAT32, NTFS, H + cramfs, Linux squashfs, UFS (some variations), SysV FS (some + variations), JFS, XFS, Amiga FS/FFS, Amiga SFS, Amiga PFS, BeOS BFS, + QNX4 FS, UDF, 3DO CD-ROM file system, Veritas VxFS, Xbox DVD file +- system. ++ system. On Debian systems, Btrfs, exFAT, Ext4 and F2FS are also ++ known. + + Partitioning: DOS/PC style, EFI GPT, Apple, Amiga "Rigid Disk", ATARI + ST (AHDI3), BSD disklabel, Linux RAID physical disks, Linux LVM1 diff -Nru disktype-9/debian/patches/series disktype-9/debian/patches/series --- disktype-9/debian/patches/series 2020-07-24 19:13:09.000000000 +0000 +++ disktype-9/debian/patches/series 2020-11-07 12:32:28.000000000 +0000 @@ -1,3 +1,6 @@ 10_add_new_FS_to_manpage.patch 20_add_ext4_btrfs_grub_improv.patch 30_add_GCC_hardening.patch +40_add_support_exfat.patch +50_add_support_f2fs.patch +60_update_README.patch diff -Nru disktype-9/debian/source/include-binaries disktype-9/debian/source/include-binaries --- disktype-9/debian/source/include-binaries 2020-07-24 19:13:09.000000000 +0000 +++ disktype-9/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/tests/test.img diff -Nru disktype-9/debian/tests/control disktype-9/debian/tests/control --- disktype-9/debian/tests/control 2020-07-24 19:13:09.000000000 +0000 +++ disktype-9/debian/tests/control 2020-11-07 12:32:28.000000000 +0000 @@ -1,4 +1,7 @@ Test-Command: [ -e /dev/sda ] && disktype /dev/sda || echo "Device /dev/sda not found. Aborting test." Restrictions: allow-stderr -Test-Command: disktype debian/tests/test.img +Test-Command: fsdeploy fs.multiple.xz; + cd $AUTOPKGTEST_TMP; + disktype fs.multiple | egrep -i '(Btrfs|Ext4|exFAT|NTFS)' +Depends: @, forensics-samples-multiple (>= 1.1.2-1) Binary files /tmp/tmpboDTKo/WdCVKCP4Jh/disktype-9/debian/tests/test.img and /tmp/tmpboDTKo/mzo26oyTN5/disktype-9/debian/tests/test.img differ