Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package parti for openSUSE:Factory checked in at 2023-07-24 18:25:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parti (Old) and /work/SRC/openSUSE:Factory/.parti.new.1467 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "parti" Mon Jul 24 18:25:57 2023 rev:15 rq:1099885 version:2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/parti/parti.changes 2023-05-16 14:27:20.979715639 +0200 +++ /work/SRC/openSUSE:Factory/.parti.new.1467/parti.changes 2023-07-24 18:26:20.150280317 +0200 @@ -1,0 +2,7 @@ +Fri Jul 21 10:18:29 UTC 2023 - wfe...@opensuse.org + +- merge gh#wfeldt/parti#17 +- identify signature block on iso9660 file system +- 2.5 + +-------------------------------------------------------------------- Old: ---- parti-2.4.tar.xz New: ---- parti-2.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parti.spec ++++++ --- /var/tmp/diff_new_pack.Y0SPKP/_old 2023-07-24 18:26:21.486288165 +0200 +++ /var/tmp/diff_new_pack.Y0SPKP/_new 2023-07-24 18:26:21.546288517 +0200 @@ -18,7 +18,7 @@ Name: parti -Version: 2.4 +Version: 2.5 Release: 0 Summary: Show partition table information License: GPL-3.0 @@ -29,6 +29,7 @@ BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(json-c) +BuildRequires: libmediacheck-devel %if 0%{suse_version} >= 1500 Requires: mkisofs %else ++++++ parti-2.4.tar.xz -> parti-2.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parti-2.4/Makefile new/parti-2.5/Makefile --- old/parti-2.4/Makefile 2023-05-15 20:32:10.000000000 +0200 +++ new/parti-2.5/Makefile 2023-07-21 12:18:29.000000000 +0200 @@ -1,7 +1,7 @@ CC = gcc CFLAGS = -g -O2 -fomit-frame-pointer -Wall # -Wno-pointer-sign -Wsign-conversion -Wsign-compare -LDFLAGS = -ljson-c -luuid -lblkid +LDFLAGS = -ljson-c -luuid -lblkid -lmediacheck BINDIR = /usr/bin GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parti-2.4/VERSION new/parti-2.5/VERSION --- old/parti-2.4/VERSION 2023-05-15 20:32:10.000000000 +0200 +++ new/parti-2.5/VERSION 2023-07-21 12:18:29.000000000 +0200 @@ -1 +1 @@ -2.4 +2.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parti-2.4/changelog new/parti-2.5/changelog --- old/parti-2.4/changelog 2023-05-15 20:32:10.000000000 +0200 +++ new/parti-2.5/changelog 2023-07-21 12:18:29.000000000 +0200 @@ -1,3 +1,7 @@ +2023-07-21: 2.5 + - merge gh#wfeldt/parti#17 + - identify signature block on iso9660 file system + 2023-05-15: 2.4 - merge gh#wfeldt/parti#15 - add unify-gpt tool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parti-2.4/filesystem.c new/parti-2.5/filesystem.c --- old/parti-2.4/filesystem.c 2023-05-15 20:32:10.000000000 +0200 +++ new/parti-2.5/filesystem.c 2023-07-21 12:18:29.000000000 +0200 @@ -14,6 +14,7 @@ #include <uuid/uuid.h> #include <blkid/blkid.h> #include <json-c/json.h> +#include <mediacheck.h> #include "disk.h" #include "filesystem.h" @@ -34,6 +35,7 @@ int fs_probe(fs_detail_t *fs, disk_t *disk, uint64_t offset); int fs_detail_fat(disk_t *disk, int indent, uint64_t sector); +int fs_detail_iso9660(json_object *json_fs, disk_t *disk, int indent, uint64_t sector); void read_isoinfo(disk_t *disk); file_start_t *iso_offsets = NULL; @@ -222,6 +224,49 @@ /* + * Print iso9669 file system details. + * + * The fs starts at sector (sector size is disk->block_size). + * The output is indented by 'indent' spaces. + * If indent is 0, prints also a separator line. + */ +int fs_detail_iso9660(json_object *json_fs, disk_t *disk, int indent, uint64_t sector) +{ + if(sector || disk->block_size < 0x200) return 0; + + mediacheck_t *media = mediacheck_init(disk->name, 0); + if(!media->err && media->signature.start) { + uint64_t sig_block = media->signature.start; + int sig_state = media->signature.state.id == sig_not_checked ? 1 : 0; + + unsigned sig_size = -1u; + char *sig_file = iso_block_to_name(disk, sig_block, &sig_size); + + log_info("%*ssignature: %"PRIu64" (%ssigned)", indent, "", + sig_block, + sig_state ? "" : "not " + ); + + if(sig_file) log_info(", \"%s\"", sig_file); + + log_info("\n"); + + json_object *json_sig = json_object_new_object(); + json_object_object_add(json_fs, "signature", json_sig); + + json_object_object_add(json_sig, "first_lba", json_object_new_int64(sig_block)); + if(sig_file) json_object_object_add(json_sig, "file_name", json_object_new_string(sig_file)); + if(sig_size != -1u) json_object_object_add(json_sig, "file_size", json_object_new_int(sig_size)); + json_object_object_add(json_sig, "signed", json_object_new_boolean(sig_state)); + } + + mediacheck_done(media); + + return 1; +} + + +/* * Print file system details. * * The fs starts at sector (sector size is disk->block_size). @@ -267,6 +312,7 @@ log_info("\n"); fs_detail_fat(disk, indent, sector); + if(!strcmp(fs_detail.type, "iso9660")) fs_detail_iso9660(json_fs, disk, indent, sector); return fs_ok; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parti-2.4/obs/parti.spec new/parti-2.5/obs/parti.spec --- old/parti-2.4/obs/parti.spec 2023-05-15 20:32:10.000000000 +0200 +++ new/parti-2.5/obs/parti.spec 2023-07-21 12:18:29.000000000 +0200 @@ -29,6 +29,7 @@ BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(json-c) +BuildRequires: libmediacheck-devel %if 0%{suse_version} >= 1500 Requires: mkisofs %else