libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New -as mkisofs options -checksum_algorithm_iso, -checksum_algorithm_template

Browse Source
This commit is contained in:
Thomas Schmitt 2010-10-03 08:23:32 +00:00
parent faa993f121
commit 5af2f24b1d
7 changed files with 110 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libisoburn/trunk/xorriso/emulators.c
View File

@ -617,7 +617,6 @@ int Xorriso_genisofs_ignore(struct XorrisO *xorriso, char *whom,
static char ignored_arg1_options[][41]= { static char ignored_arg1_options[][41]= {
"-check-session", "-hide-hfs", "-hide-hfs-list", "-root", "-check-session", "-hide-hfs", "-hide-hfs-list", "-root",
"-old-root", "-table-name", "-volset-seqno", "-volset-size", "-old-root", "-table-name", "-volset-seqno", "-volset-size",
"-checksum_algorithm_iso", "-checksum_algorithm_template",
"" ""
}; };
int k, idx_offset= 0; int k, idx_offset= 0;
@ -725,6 +724,10 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
" -md5-list FILE File containing MD5 sums of the files that should be checked", " -md5-list FILE File containing MD5 sums of the files that should be checked",
" -jigdo-template-compress ALGORITHM", " -jigdo-template-compress ALGORITHM",
" Choose to use gzip or bzip2 compression for template data; default is gzip", " Choose to use gzip or bzip2 compression for template data; default is gzip",
" -checksum_algorithm_iso alg1,alg2,...",
" Specify the checksum types desired for the output image (in .jigdo)",
" -checksum_algorithm_template alg1,alg2,...",
" Specify the checksum types desired for the output jigdo template"
" -b FILE, -eltorito-boot FILE", " -b FILE, -eltorito-boot FILE",
" Set El Torito boot image name", " Set El Torito boot image name",
" -eltorito-alt-boot Start specifying alternative El Torito boot parameters", " -eltorito-alt-boot Start specifying alternative El Torito boot parameters",
@ -1372,6 +1375,8 @@ is_unknown_option_2:;
strcmp(argv[i], "-jigdo-force-md5") == 0 || strcmp(argv[i], "-jigdo-force-md5") == 0 ||
strcmp(argv[i], "-jigdo-map") == 0 || strcmp(argv[i], "-jigdo-map") == 0 ||
strcmp(argv[i], "-jigdo-template-compress") == 0 || strcmp(argv[i], "-jigdo-template-compress") == 0 ||
strcmp(argv[i], "-checksum_algorithm_iso") == 0 ||
strcmp(argv[i], "-checksum_algorithm_template") == 0 ||
strcmp(argv[i], "-md5-list") == 0) { strcmp(argv[i], "-md5-list") == 0) {
i++; i++;
ret= Xorriso_option_jigdo(xorriso, argv[i - 1], argv[i], 0); ret= Xorriso_option_jigdo(xorriso, argv[i - 1], argv[i], 0);

6
libisoburn/trunk/xorriso/lib_mgt.c
View File

@ -592,11 +592,13 @@ int Xorriso_jigdo_interpreter(struct XorrisO *xorriso, char *aspect, char *arg,
ret= libjte_set_min_size(jte, num); ret= libjte_set_min_size(jte, num);
if(ret <= 0) if(ret <= 0)
goto jte_failed; goto jte_failed;
} else if(strcmp(aspect, "checksum_iso") == 0) { } else if(strcmp(aspect, "checksum_iso") == 0 ||
strcmp(aspect, "-checksum_algorithm_iso") == 0) {
ret= libjte_set_checksum_iso(jte, arg); ret= libjte_set_checksum_iso(jte, arg);
if(ret <= 0) if(ret <= 0)
goto jte_failed; goto jte_failed;
} else if(strcmp(aspect, "checksum_template") == 0) { } else if(strcmp(aspect, "checksum_template") == 0 ||
strcmp(aspect, "-checksum_algorithm_template") == 0) {
ret= libjte_set_checksum_template(jte, arg); ret= libjte_set_checksum_template(jte, arg);
if(ret <= 0) if(ret <= 0)
goto jte_failed; goto jte_failed;

3
libisoburn/trunk/xorriso/opts_d_h.c
View File

@ -1379,9 +1379,10 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" -jigdo \"clear\"|\"verbose\"|\"template_path\"|\"jigdo_path\"|\"md5_path\"", " -jigdo \"clear\"|\"verbose\"|\"template_path\"|\"jigdo_path\"|\"md5_path\"",
" |\"min_size\"|\"checksum_iso\"|\"checksum_template\"", " |\"min_size\"|\"checksum_iso\"|\"checksum_template\"",
" |\"compression\"|\"exclude\"|\"demand_md5\"|\"mapping\"", " |\"compression\"|\"exclude\"|\"demand_md5\"|\"mapping\"",
" |\"checksum_iso\"|\"checksum_template\"",
" value", " value",
" Clear Jigdo Template Extraction parameter list or add a", " Clear Jigdo Template Extraction parameter list or add a",
" parameter to that list.", " parameter with its value to that list.",
" -compliance rule[:rule...]", " -compliance rule[:rule...]",
" Allow more or less harmless deviations from strict standards", " Allow more or less harmless deviations from strict standards",
" compliance.", " compliance.",

18
libisoburn/trunk/xorriso/xorriso.1
View File

@ -9,7 +9,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" other parameters are allowed: see man(7), man(1)
.TH XORRISO 1 "Oct 02, 2010" .TH XORRISO 1 "Oct 03, 2010"
.\" Please adjust this date whenever revising the manpage. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -2430,11 +2430,12 @@ listed in the .jigdo file and externally referenced in the .template file.
Each desired file is represented in the .md5 file by a single text line: Each desired file is represented in the .md5 file by a single text line:
.br .br
MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks, MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks,
absolute path in the disk filesystem as given to xorriso. basename of file in the disk filesystem (directory path is allowed but gets
ignored).
.br .br
If the list of jigdo parameters is not empty, then xorriso will refuse to If the list of jigdo parameters is not empty, then xorriso will refuse to
write to non-blank targets, it will disable multi-session emulation and write to non-blank targets, it will disable multi-session emulation, and
padding. eventual padding will be counted as part of the ISO image.
.br .br
.TP .TP
\fB\-jigdo\fR parameter_name value \fB\-jigdo\fR parameter_name value
@ -2482,6 +2483,15 @@ Alias: -jigdo-map
\fBcompression\fR chooses one of "bzip2" or "gzip" for the compression of \fBcompression\fR chooses one of "bzip2" or "gzip" for the compression of
the template file. The jigdo file is put out uncompressed. the template file. The jigdo file is put out uncompressed.
Alias: -jigdo-template-compress Alias: -jigdo-template-compress
.br
\fBchecksum_iso\fR chooses one or more of "md5", "sha1", "sha256", "sha512"
for the auxiliary "# Image Hex" checksums in the jigdo file. The value may e.g.
look like "md5,sha1,sha512". Value "all" chooses all available algorithms.
Note that MD5 stays always enabled.
Alias: -checksum_algorithm_iso
.br
\fBchecksum_template\fR is like checksum_iso but for "# Template Hex".
Alias: -checksum_algorithm_template
.TP .TP
.B Character sets: .B Character sets:
.PP .PP

132
libisoburn/trunk/xorriso/xorriso.info
View File

@ -1,5 +1,5 @@
This is xorriso/xorriso.info, produced by makeinfo version 4.8 from This is xorriso.info, produced by makeinfo version 4.8 from
./xorriso/xorriso.texi. ./xorriso.texi.
INFO-DIR-SECTION Archiving INFO-DIR-SECTION Archiving
START-INFO-DIR-ENTRY START-INFO-DIR-ENTRY
@ -2166,7 +2166,8 @@ be listed in the .jigdo file and externally referenced in the .template
file. Each desired file is represented in the .md5 file by a single file. Each desired file is represented in the .md5 file by a single
text line: text line:
MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2
blanks, absolute path in the disk filesystem as given to xorriso. blanks, basename of file in the disk filesystem (directory path is
allowed but gets ignored).
If the list of jigdo parameters is not empty, then xorriso will refuse If the list of jigdo parameters is not empty, then xorriso will refuse
to write to non-blank targets, it will disable multi-session emulation, to write to non-blank targets, it will disable multi-session emulation,
and eventual padding will be counted as part of the ISO image. and eventual padding will be counted as part of the ISO image.
@ -2200,10 +2201,17 @@ and eventual padding will be counted as part of the ISO image.
the .jigdo file will be checked whether it begins with the From the .jigdo file will be checked whether it begins with the From
string. If so, this string will be replaced by the To string and a string. If so, this string will be replaced by the To string and a
':' character. The From string should end by a '/' character. ':' character. The From string should end by a '/' character.
Alias: -jigdo-map Alias: -jigdo-map
*compression* chooses one of "bzip2" or "gzip" for the compression of *compression* chooses one of "bzip2" or "gzip" for the compression
the template file. The jigdo file is put out uncompressed. Alias: of the template file. The jigdo file is put out uncompressed.
-jigdo-template-compress Alias: -jigdo-template-compress
*checksum_iso* chooses one or more of "md5", "sha1", "sha256",
"sha512" for the auxiliary "# Image Hex" checksums in the jigdo
file. The value may e.g. look like "md5,sha1,sha512". Value "all"
chooses all available algorithms. Note that MD5 stays always
enabled. Alias: -checksum_algorithm_iso
*checksum_template* is like checksum_iso but for "# Template Hex".
Alias: -checksum_algorithm_template
 
File: xorriso.info, Node: Charset, Next: Exception, Prev: Jigdo, Up: Options File: xorriso.info, Node: Charset, Next: Exception, Prev: Jigdo, Up: Options
@ -3903,7 +3911,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -indev aquires a drive for input: AqDrive. (line 22) * -indev aquires a drive for input: AqDrive. (line 22)
* -iso_rr_pattern controls pattern expansion: Manip. (line 10) * -iso_rr_pattern controls pattern expansion: Manip. (line 10)
* -jigdo clears JTE or sets input/output character set: Jigdo. * -jigdo clears JTE or sets input/output character set: Jigdo.
(line 27) (line 28)
* -joliet enables production of Joliet tree: SetWrite. (line 10) * -joliet enables production of Joliet tree: SetWrite. (line 10)
* -list_delimiter replaces '--': Scripting. (line 38) * -list_delimiter replaces '--': Scripting. (line 38)
* -list_formats lists available formats: Writing. (line 107) * -list_formats lists available formats: Writing. (line 107)
@ -4121,7 +4129,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Insert, pathspecs, -add: Insert. (line 42) * Insert, pathspecs, -add: Insert. (line 42)
* Insert, piece of data file, -cut_out: Insert. (line 126) * Insert, piece of data file, -cut_out: Insert. (line 126)
* iso_rr_path, _definition: Insert. (line 7) * iso_rr_path, _definition: Insert. (line 7)
* Jigdo Template Extraction, -jigdo: Jigdo. (line 27) * Jigdo Template Extraction, -jigdo: Jigdo. (line 28)
* Jigdo Template Extraction, _definition: Jigdo. (line 6) * Jigdo Template Extraction, _definition: Jigdo. (line 6)
* List delimiter, _definiton: Processing. (line 8) * List delimiter, _definiton: Processing. (line 8)
* MBR, _definiton: Extras. (line 26) * MBR, _definiton: Extras. (line 26)
@ -4248,58 +4256,58 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
 
Tag Table: Tag Table:
Node: Top436 Node: Top420
Node: Overview1340 Node: Overview1324
Node: Model3225 Node: Model3209
Node: Media6105 Node: Media6089
Node: Methods8755 Node: Methods8739
Node: Drives11311 Node: Drives11295
Node: Extras14617 Node: Extras14601
Node: Processing18044 Node: Processing18028
Node: Dialog21540 Node: Dialog21524
Node: Options23197 Node: Options23181
Node: AqDrive24815 Node: AqDrive24799
Node: Loading27721 Node: Loading27705
Node: Insert39900 Node: Insert39884
Node: SetInsert48257 Node: SetInsert48241
Node: Manip56824 Node: Manip56808
Node: CmdFind65505 Node: CmdFind65489
Node: Filter75456 Node: Filter75440
Node: Writing79805 Node: Writing79789
Node: SetWrite86094 Node: SetWrite86078
Node: Bootable98045 Node: Bootable98029
Node: Jigdo107135 Node: Jigdo107119
Node: Charset110477 Node: Charset110943
Node: Exception113228 Node: Exception113694
Node: DialogCtl117743 Node: DialogCtl118209
Node: Inquiry120088 Node: Inquiry120554
Node: Navigate124218 Node: Navigate124684
Node: Verify131816 Node: Verify132282
Node: Restore140236 Node: Restore140702
Node: Emulation146892 Node: Emulation147358
Node: Scripting154892 Node: Scripting155358
Node: Frontend160454 Node: Frontend160920
Node: Examples161655 Node: Examples162121
Node: ExDevices162824 Node: ExDevices163290
Node: ExCreate163458 Node: ExCreate163924
Node: ExDialog164732 Node: ExDialog165198
Node: ExGrowing165994 Node: ExGrowing166460
Node: ExModifying166796 Node: ExModifying167262
Node: ExBootable167297 Node: ExBootable167763
Node: ExCharset167844 Node: ExCharset168310
Node: ExPseudo168672 Node: ExPseudo169138
Node: ExCdrecord169566 Node: ExCdrecord170032
Node: ExMkisofs169881 Node: ExMkisofs170347
Node: ExGrowisofs170884 Node: ExGrowisofs171350
Node: ExException172008 Node: ExException172474
Node: ExTime172462 Node: ExTime172928
Node: ExIncBackup172921 Node: ExIncBackup173387
Node: ExRestore176393 Node: ExRestore176859
Node: ExRecovery177362 Node: ExRecovery177828
Node: Files177928 Node: Files178394
Node: Seealso179156 Node: Seealso179622
Node: Legal179680 Node: Legal180146
Node: CommandIdx180602 Node: CommandIdx181068
Node: ConceptIdx194546 Node: ConceptIdx195012
 
End Tag Table End Tag Table

16
libisoburn/trunk/xorriso/xorriso.texi
View File

@ -44,7 +44,7 @@
@c man .\" First parameter, NAME, should be all caps @c man .\" First parameter, NAME, should be all caps
@c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
@c man .\" other parameters are allowed: see man(7), man(1) @c man .\" other parameters are allowed: see man(7), man(1)
@c man .TH XORRISO 1 "Oct 02, 2010" @c man .TH XORRISO 1 "Oct 03, 2010"
@c man .\" Please adjust this date whenever revising the manpage. @c man .\" Please adjust this date whenever revising the manpage.
@c man .\" @c man .\"
@c man .\" Some roff macros, for reference: @c man .\" Some roff macros, for reference:
@ -2904,7 +2904,8 @@ listed in the .jigdo file and externally referenced in the .template file.
Each desired file is represented in the .md5 file by a single text line: Each desired file is represented in the .md5 file by a single text line:
@* @*
MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks, MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks,
absolute path in the disk filesystem as given to xorriso. basename of file in the disk filesystem (directory path is allowed but gets
ignored).
@* @*
If the list of jigdo parameters is not empty, then xorriso will refuse to If the list of jigdo parameters is not empty, then xorriso will refuse to
write to non-blank targets, it will disable multi-session emulation, and write to non-blank targets, it will disable multi-session emulation, and
@ -2955,12 +2956,21 @@ The absolute disk_path of any file that will be listed in the .jigdo file will
be checked whether it begins with the From string. If so, this string will be checked whether it begins with the From string. If so, this string will
be replaced by the To string and a ':' character. The From string should end be replaced by the To string and a ':' character. The From string should end
by a '/' character. by a '/' character.
@end table
Alias: -jigdo-map Alias: -jigdo-map
@* @*
@strong{compression} chooses one of "bzip2" or "gzip" for the compression of @strong{compression} chooses one of "bzip2" or "gzip" for the compression of
the template file. The jigdo file is put out uncompressed. the template file. The jigdo file is put out uncompressed.
Alias: -jigdo-template-compress Alias: -jigdo-template-compress
@*
@strong{checksum_iso} chooses one or more of "md5", "sha1", "sha256", "sha512"
for the auxiliary "# Image Hex" checksums in the jigdo file. The value may e.g.
look like "md5,sha1,sha512". Value "all" chooses all available algorithms.
Note that MD5 stays always enabled.
Alias: -checksum_algorithm_iso
@*
@strong{checksum_template} is like checksum_iso but for "# Template Hex".
Alias: -checksum_algorithm_template
@end table
@c man .TP @c man .TP
@c man .B Character sets: @c man .B Character sets:
@node Charset, Exception, Jigdo, Options @node Charset, Exception, Jigdo, Options

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.10.02.210305" #define Xorriso_timestamP "2010.10.03.082304"