0 | |
Description: Let libisoburn and xorriso demand libjte version >= 2.0.0.
|
1 | |
Use the new function names and offer the new Jigdo related options.
|
2 | |
.so numbering gets incremented from libisoburn.so.1.109.0 to
|
3 | |
libisoburn.so.1.110.0 to reflect the increase of demand in comparison to
|
4 | |
unpatched libisoburn-1.5.2.
|
5 | |
The ./configure test now checks availability of new libjte2 function
|
6 | |
libjte_set_checksum_algorithm. If not present, then libjte will not be used.
|
7 | |
(Compile time and run-time checks would refuse if libjte < 2.0.0 is found.)
|
8 | |
Author: Thomas Schmitt <scdbackup@gmx.net>
|
9 | |
|
10 | |
--- a/configure.ac
|
11 | |
+++ b/configure.ac
|
12 | |
@@ -37,16 +37,17 @@
|
13 | |
dnl Generate libisoburn.so.1.x.y
|
14 | |
dnl SONAME will become LT_CURRENT - LT_AGE
|
15 | |
dnl
|
16 | |
-dnl ts B91026
|
17 | |
-dnl This is the release version 1.5.2 = libisoburn.so.1.109.0
|
18 | |
+dnl ts B91126
|
19 | |
+dnl This is the release version 1.5.2 patched to use libjte.so.2
|
20 | |
+dnl = libisoburn.so.1.110.0
|
21 | |
dnl ### This is the development version after above stable release
|
22 | |
-dnl LT_CURRENT++, LT_AGE++ have not happened yet.
|
23 | |
-dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
|
24 | |
+dnl ### LT_CURRENT++, LT_AGE++ have not happened yet.
|
25 | |
+dnl LT_CURRENT++, LT_AGE++ has happened because of the patch.
|
26 | |
dnl
|
27 | |
-dnl SONAME = 110 - 109 = 1 . Library name = libisoburn.so.1.109.0
|
28 | |
+dnl SONAME = 111 - 110 = 1 . Library name = libisoburn.so.1.110.0
|
29 | |
LT_RELEASE=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION
|
30 | |
-LT_CURRENT=110
|
31 | |
-LT_AGE=109
|
32 | |
+LT_CURRENT=111
|
33 | |
+LT_AGE=110
|
34 | |
LT_REVISION=0
|
35 | |
LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
|
36 | |
|
37 | |
@@ -276,11 +277,11 @@
|
38 | |
|
39 | |
dnl ts B00928
|
40 | |
AC_ARG_ENABLE(libjte,
|
41 | |
-[ --enable-libjte Enable use of libjte by xorriso, default=yes],
|
42 | |
+[ --enable-libjte Enable use of libjte >= 2.0 by xorriso, default=yes],
|
43 | |
, enable_libjte=yes)
|
44 | |
if test "x$enable_libjte" = xyes; then
|
45 | |
LIBJTE_DEF="-DXorriso_with_libjtE"
|
46 | |
- AC_CHECK_HEADER(libjte/libjte.h, AC_CHECK_LIB(jte, libjte_new, , LIBJTE_DEF= ), LIBJTE_DEF= )
|
47 | |
+ AC_CHECK_HEADER(libjte/libjte.h, AC_CHECK_LIB(jte, libjte_set_checksum_algorithm, , LIBJTE_DEF= ), LIBJTE_DEF= )
|
48 | |
else
|
49 | |
LIBJTE_DEF=
|
50 | |
fi
|
51 | |
--- a/xorriso/emulators.c
|
52 | |
+++ b/xorriso/emulators.c
|
53 | |
@@ -657,8 +657,10 @@
|
54 | |
"-alpha-boot", "-hppa-cmdline", "-hppa-kernel-32", "-hppa-kernel-64",
|
55 | |
"-hppa-bootloader", "-hppa-ramdisk", "-mips-boot", "-mipsel-boot",
|
56 | |
"-jigdo-jigdo", "-jigdo-template", "-jigdo-min-file-size",
|
57 | |
- "-jigdo-force-md5", "-jigdo-exclude", "-jigdo-map", "-md5-list",
|
58 | |
- "-jigdo-template-compress",
|
59 | |
+ "-jigdo-force-md5", "-jigdo-force-checksum",
|
60 | |
+ "-md5-list", "-checksum-list",
|
61 | |
+ "-jigdo-exclude", "-jigdo-map",
|
62 | |
+ "-jigdo-template-compress", "-jigdo-checksum-algorithm",
|
63 | |
"-checksum_algorithm_iso", "-checksum_algorithm_template",
|
64 | |
"--stdio_sync", "--quoted_path_list", "--efi-boot", "--embedded-boot",
|
65 | |
"-isohybrid-mbr", "-e", "-partition_offset", "-partition_hd_cyl",
|
66 | |
@@ -852,11 +854,16 @@
|
67 | |
" -jigdo-jigdo FILE Produce a jigdo .jigdo file as well as the .iso",
|
68 | |
" -jigdo-template FILE Produce a jigdo .template file as well as the .iso",
|
69 | |
" -jigdo-min-file-size SIZE Minimum size for a file to be listed in the jigdo file",
|
70 | |
-" -jigdo-force-md5 PATTERN Pattern(s) where files MUST match an externally-supplied MD5sum",
|
71 | |
+" -jigdo-force-checksum PTRN Pattern(s) where files MUST match an externally-supplied checksum",
|
72 | |
+" -jigdo-force-md5 PATTERN Outdated alias of -jigdo-force-checksum",
|
73 | |
" -jigdo-exclude PATTERN Pattern(s) to exclude from the jigdo file",
|
74 | |
" -jigdo-map PATTERN1=PATTERN2",
|
75 | |
" Pattern(s) to map paths (e.g. Debian=/mirror/debian)",
|
76 | |
-" -md5-list FILE File containing MD5 sums of the files that should be checked",
|
77 | |
+" -checksum-list FILE File containing checksums of the files that should be checked",
|
78 | |
+" -md5-list FILE Outdated alias of -checksum-list",
|
79 | |
+" -jigdo-checksum-algorithm ALGORITHM",
|
80 | |
+" Choose algorithm for file matching checksums: md5, sha256",
|
81 | |
+" Expected in the -checksum-list FILE, written into .jigdo file.",
|
82 | |
" -jigdo-template-compress ALGORITHM",
|
83 | |
" Choose to use gzip or bzip2 compression for template data; default is gzip",
|
84 | |
" -checksum_algorithm_iso alg1,alg2,...",
|
85 | |
@@ -2097,11 +2104,14 @@
|
86 | |
strcmp(argpt, "-jigdo-min-file-size") == 0 ||
|
87 | |
strcmp(argpt, "-jigdo-exclude") == 0 ||
|
88 | |
strcmp(argpt, "-jigdo-force-md5") == 0 ||
|
89 | |
+ strcmp(argpt, "-jigdo-force-checksum") == 0 ||
|
90 | |
strcmp(argpt, "-jigdo-map") == 0 ||
|
91 | |
+ strcmp(argpt, "-jigdo-checksum-algorithm") == 0 ||
|
92 | |
strcmp(argpt, "-jigdo-template-compress") == 0 ||
|
93 | |
strcmp(argpt, "-checksum_algorithm_iso") == 0 ||
|
94 | |
strcmp(argpt, "-checksum_algorithm_template") == 0 ||
|
95 | |
- strcmp(argpt, "-md5-list") == 0) {
|
96 | |
+ strcmp(argpt, "-md5-list") == 0 ||
|
97 | |
+ strcmp(argpt, "-checksum-list") == 0) {
|
98 | |
i++;
|
99 | |
ret= Xorriso_option_jigdo(xorriso, argpt, argv[i], 0);
|
100 | |
if(ret <= 0)
|
101 | |
--- a/xorriso/lib_mgt.c
|
102 | |
+++ b/xorriso/lib_mgt.c
|
103 | |
@@ -765,8 +765,10 @@
|
104 | |
goto jte_failed;
|
105 | |
xorriso->libjte_params_given|= 8;
|
106 | |
} else if(strcmp(aspect, "md5_path") == 0 ||
|
107 | |
- strcmp(aspect, "-md5-list") == 0) {
|
108 | |
- ret= libjte_set_md5_path(jte, arg);
|
109 | |
+ strcmp(aspect, "-md5-list") == 0 ||
|
110 | |
+ strcmp(aspect, "checksum_path") == 0 ||
|
111 | |
+ strcmp(aspect, "-checksum-list") == 0) {
|
112 | |
+ ret= libjte_set_checksum_path(jte, arg);
|
113 | |
if(ret <= 0)
|
114 | |
goto jte_failed;
|
115 | |
xorriso->libjte_params_given|= 16;
|
116 | |
@@ -802,8 +804,10 @@
|
117 | |
goto jte_failed;
|
118 | |
xorriso->libjte_params_given|= 512;
|
119 | |
} else if(strcmp(aspect, "demand_md5") == 0 ||
|
120 | |
- strcmp(aspect, "-jigdo-force-md5") == 0) {
|
121 | |
- ret= libjte_add_md5_demand(jte, arg);
|
122 | |
+ strcmp(aspect, "-jigdo-force-md5") == 0 ||
|
123 | |
+ strcmp(aspect, "demand_checksum") == 0 ||
|
124 | |
+ strcmp(aspect, "-jigdo-force-checksum") == 0) {
|
125 | |
+ ret= libjte_add_checksum_demand(jte, arg);
|
126 | |
if(ret <= 0)
|
127 | |
goto jte_failed;
|
128 | |
xorriso->libjte_params_given|= 1024;
|
129 | |
@@ -813,6 +817,13 @@
|
130 | |
if(ret <= 0)
|
131 | |
goto jte_failed;
|
132 | |
xorriso->libjte_params_given|= 2048;
|
133 | |
+ } else if(strcmp(aspect, "checksum_algorithm") == 0 ||
|
134 | |
+ strcmp(aspect, "-jigdo-checksum-algorithm") == 0) {
|
135 | |
+ int ck_size;
|
136 | |
+ ret= libjte_set_checksum_algorithm(jte, arg, &ck_size);
|
137 | |
+ if(ret <= 0)
|
138 | |
+ goto jte_failed;
|
139 | |
+ xorriso->libjte_params_given|= 4096;
|
140 | |
} else {
|
141 | |
sprintf(xorriso->info_text, "-jigdo: unknown aspect '%s'", aspect);
|
142 | |
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
|
143 | |
--- a/xorriso/opts_d_h.c
|
144 | |
+++ b/xorriso/opts_d_h.c
|
145 | |
@@ -1879,6 +1879,7 @@
|
146 | |
" Opportunity to omit Rock Ridge info. (Do not do it !)",
|
147 | |
" -jigdo \"clear\"|\"template_path\"|\"jigdo_path\"|\"md5_path\"",
|
148 | |
" |\"min_size\"|\"checksum_iso\"|\"checksum_template\"",
|
149 | |
+" |\"checksum_path\"|\"demand_checksum\"|\"checksum_algorithm\"",
|
150 | |
" |\"compression\"|\"exclude\"|\"demand_md5\"|\"mapping\"",
|
151 | |
" |\"checksum_iso\"|\"checksum_template\"",
|
152 | |
" value",
|
153 | |
--- a/xorriso/xorriso.1
|
154 | |
+++ b/xorriso/xorriso.1
|
155 | |
@@ -9,7 +9,7 @@
|
156 | |
.\" First parameter, NAME, should be all caps
|
157 | |
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
|
158 | |
.\" other parameters are allowed: see man(7), man(1)
|
159 | |
-.TH XORRISO 1 "Version 1.5.2, Oct 26, 2019"
|
160 | |
+.TH XORRISO 1 "Version 1.5.2, Nov 26, 2019"
|
161 | |
.\" Please adjust this date whenever revising the manpage.
|
162 | |
.\"
|
163 | |
.\" Some roff macros, for reference:
|
164 | |
@@ -3772,14 +3772,19 @@
|
165 | |
instead of the content bytes of the listed files.
|
166 | |
.br
|
167 | |
Input for this process are the normal arguments for a \fBxorriso\fR session
|
168 | |
-on a blank \-outdev, and a .md5 file which lists those data files which may be
|
169 | |
-listed in the .jigdo file and externally referenced in the .template file.
|
170 | |
-Each designated file is represented in the .md5 file by a single text line:
|
171 | |
+on a blank \-outdev, and a checksum file which lists those data files which may
|
172 | |
+be listed in the .jigdo file and externally referenced in the .template file.
|
173 | |
+Each designated file is represented in the checksum file by a single text line:
|
174 | |
.br
|
175 | |
-MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks,
|
176 | |
+Checksum as hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks,
|
177 | |
symbolic file address
|
178 | |
.br
|
179 | |
-The file address in an .md5 line has to bear the same basename as the
|
180 | |
+The kind of checksum is chosen by \-jigdo "checksum_algorithm" with values "md5"
|
181 | |
+(32 hex digits) or "sha256" (64 hex digits).
|
182 | |
+It will also be used for the file address lines in the .jigdo file.
|
183 | |
+The default is "md5".
|
184 | |
+.br
|
185 | |
+The file address in a checksum file line has to bear the same basename as the
|
186 | |
disk_path of the file which it shall match. The directory path of
|
187 | |
the file address is decisive for To=From mapping, not for file recognition.
|
188 | |
After To=From mapping, the file address gets written into the .jigdo
|
189 | |
@@ -3801,6 +3806,12 @@
|
190 | |
Parameter \fBclear\fR with any value empties the whole list.
|
191 | |
No .jigdo and .template file will be produced.
|
192 | |
.br
|
193 | |
+\fBchecksum_algorithm\fR chooses the checksum algorithm which shall be used
|
194 | |
+for the data file entries in the .jigdo file and is expected in the checksum
|
195 | |
+file. Permissible are "md5" or "sha256". Default is "md5".
|
196 | |
+.br
|
197 | |
+Alias: \-jigdo\-checksum\-algorithm
|
198 | |
+.br
|
199 | |
\fBtemplate_path\fR sets the disk_path for the .template file with the
|
200 | |
holed and compressed ISO image copy.
|
201 | |
.br
|
202 | |
@@ -3811,7 +3822,12 @@
|
203 | |
.br
|
204 | |
Alias: \-jigdo\-jigdo
|
205 | |
.br
|
206 | |
-\fBmd5_path\fR sets the disk_path where to find the .md5 input file.
|
207 | |
+\fBchecksum_path\fR sets the disk_path where to find the checksum file with
|
208 | |
+symbolic file addresses and checksums according to \fBchecksum_algorithm\fR.
|
209 | |
+.br
|
210 | |
+Alias: md5_path
|
211 | |
+.br
|
212 | |
+Alias: \-checksum\-list
|
213 | |
.br
|
214 | |
Alias: \-md5\-list
|
215 | |
.br
|
216 | |
@@ -3826,15 +3842,19 @@
|
217 | |
.br
|
218 | |
Alias: \-jigdo\-exclude
|
219 | |
.br
|
220 | |
-\fBdemand_md5\fR adds a regular expression pattern which will get compared
|
221 | |
-with the absolute disk_path of any data file that was not found in the .md5
|
222 | |
-list. A match causes a MISHAP event.
|
223 | |
+\fBdemand_checksum\fR adds a regular expression pattern which will get
|
224 | |
+compared with the absolute disk_path of any data file that was not found
|
225 | |
+in the checksum list file as of "checksum_path". A match causes a MISHAP event.
|
226 | |
+.br
|
227 | |
+Alias: demand_md5
|
228 | |
+.br
|
229 | |
+Alias: \-jigdo\-force\-checksum
|
230 | |
.br
|
231 | |
Alias: \-jigdo\-force\-md5
|
232 | |
.br
|
233 | |
\fBmapping\fR adds a string pair of the form To=From to the parameter list.
|
234 | |
If a data file gets listed in the .jigdo file, then it is referred by the
|
235 | |
-file address from its line in the .md5 file. This file address gets checked
|
236 | |
+file address from its line in the checksum file. This file address gets checked
|
237 | |
whether it begins with the From string. If so, then this string will be
|
238 | |
replaced by the To string and a ':' character, before it goes into the .jigdo
|
239 | |
file. The From string should end by a '/' character.
|
240 | |
--- a/xorriso/xorriso.info
|
241 | |
+++ b/xorriso/xorriso.info
|
242 | |
@@ -3185,18 +3185,22 @@
|
243 | |
image with reference tags instead of the content bytes of the listed
|
244 | |
files.
|
245 | |
Input for this process are the normal arguments for a 'xorriso' session
|
246 | |
-on a blank -outdev, and a .md5 file which lists those data files which
|
247 | |
-may be listed in the .jigdo file and externally referenced in the
|
248 | |
-.template file. Each designated file is represented in the .md5 file by
|
249 | |
-a single text line:
|
250 | |
-MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2
|
251 | |
+on a blank -outdev, and a checksum file which lists those data files
|
252 | |
+which may be listed in the .jigdo file and externally referenced in the
|
253 | |
+.template file. Each designated file is represented in the checksum
|
254 | |
+file by a single text line:
|
255 | |
+Checksum as hex digits, 2 blanks, size as 12 decimal digits or blanks, 2
|
256 | |
blanks, symbolic file address
|
257 | |
-The file address in an .md5 line has to bear the same basename as the
|
258 | |
-disk_path of the file which it shall match. The directory path of the
|
259 | |
-file address is decisive for To=From mapping, not for file recognition.
|
260 | |
-After To=From mapping, the file address gets written into the .jigdo
|
261 | |
-file. Jigdo restore tools will convert these addresses into really
|
262 | |
-reachable data source addresses from which they can read.
|
263 | |
+The kind of checksum is chosen by -jigdo "checksum_algorithm" with
|
264 | |
+values "md5" (32 hex digits) or "sha256" (64 hex digits). It will also
|
265 | |
+be used for the file address lines in the .jigdo file. The default is
|
266 | |
+"md5".
|
267 | |
+The file address in a checksum file line has to bear the same basename
|
268 | |
+as the disk_path of the file which it shall match. The directory path
|
269 | |
+of the file address is decisive for To=From mapping, not for file
|
270 | |
+recognition. After To=From mapping, the file address gets written into
|
271 | |
+the .jigdo file. Jigdo restore tools will convert these addresses into
|
272 | |
+really reachable data source addresses from which they can read.
|
273 | |
If the list of jigdo parameters is not empty, then 'xorriso' will refuse
|
274 | |
to write to non-blank targets, it will disable multi-session emulation,
|
275 | |
and padding will be counted as part of the ISO image.
|
276 | |
@@ -3208,6 +3212,11 @@
|
277 | |
they are recognized by the -as mkisofs emulation command.
|
278 | |
Parameter *clear* with any value empties the whole list. No .jigdo
|
279 | |
and .template file will be produced.
|
280 | |
+ *checksum_algorithm* chooses the checksum algorithm which shall be
|
281 | |
+ used for the data file entries in the .jigdo file and is expected
|
282 | |
+ in the checksum file. Permissible are "md5" or "sha256". Default
|
283 | |
+ is "md5".
|
284 | |
+ Alias: -jigdo-checksum-algorithm
|
285 | |
*template_path* sets the disk_path for the .template file with the
|
286 | |
holed and compressed ISO image copy.
|
287 | |
Alias: -jigdo-template
|
288 | |
@@ -3215,7 +3224,11 @@
|
289 | |
checksums and download addresses for filling the holes in
|
290 | |
.template.
|
291 | |
Alias: -jigdo-jigdo
|
292 | |
- *md5_path* sets the disk_path where to find the .md5 input file.
|
293 | |
+ *checksum_path* sets the disk_path where to find the checksum file
|
294 | |
+ with symbolic file addresses and checksums according to
|
295 | |
+ *checksum_algorithm*.
|
296 | |
+ Alias: md5_path
|
297 | |
+ Alias: -checksum-list
|
298 | |
Alias: -md5-list
|
299 | |
*min_size* sets the minimum size for a data file to be listed in
|
300 | |
the .jigdo file and being a hole in the .template file.
|
301 | |
@@ -3224,17 +3237,20 @@
|
302 | |
with the absolute disk_path of any data file. A match causes the
|
303 | |
file to stay in .template in any case.
|
304 | |
Alias: -jigdo-exclude
|
305 | |
- *demand_md5* adds a regular expression pattern which will get
|
306 | |
+ *demand_checksum* adds a regular expression pattern which will get
|
307 | |
compared with the absolute disk_path of any data file that was not
|
308 | |
- found in the .md5 list. A match causes a MISHAP event.
|
309 | |
+ found in the checksum list file as of "checksum_path". A match
|
310 | |
+ causes a MISHAP event.
|
311 | |
+ Alias: demand_md5
|
312 | |
+ Alias: -jigdo-force-checksum
|
313 | |
Alias: -jigdo-force-md5
|
314 | |
*mapping* adds a string pair of the form To=From to the parameter
|
315 | |
list. If a data file gets listed in the .jigdo file, then it is
|
316 | |
- referred by the file address from its line in the .md5 file. This
|
317 | |
- file address gets checked whether it begins with the From string.
|
318 | |
- If so, then this string will be replaced by the To string and a ':'
|
319 | |
- character, before it goes into the .jigdo file. The From string
|
320 | |
- should end by a '/' character.
|
321 | |
+ referred by the file address from its line in the checksum file.
|
322 | |
+ This file address gets checked whether it begins with the From
|
323 | |
+ string. If so, then this string will be replaced by the To string
|
324 | |
+ and a ':' character, before it goes into the .jigdo file. The From
|
325 | |
+ string should end by a '/' character.
|
326 | |
Alias: -jigdo-map
|
327 | |
*compression* chooses one of "bzip2" or "gzip" for the compression
|
328 | |
of the template file. The jigdo file is put out uncompressed.
|
329 | |
@@ -5409,7 +5425,7 @@
|
330 | |
* -iso_nowtime fixed "now" time for ISO 9660 objects: Loading.
|
331 | |
(line 217)
|
332 | |
* -iso_rr_pattern controls pattern expansion: Manip. (line 10)
|
333 | |
-* -jigdo clears JTE or or adds parameter to JTE: Jigdo. (line 33)
|
334 | |
+* -jigdo clears JTE or or adds parameter to JTE: Jigdo. (line 37)
|
335 | |
* -joliet enables production of Joliet tree: SetWrite. (line 10)
|
336 | |
* -launch_frontend starts frontend program at pipes: Frontend.
|
337 | |
(line 141)
|
338 | |
@@ -5704,7 +5720,7 @@
|
339 | |
* Interval reader for system area and partitions: Bootable. (line 32)
|
340 | |
* ISO 9660, _definition: Model. (line 6)
|
341 | |
* iso_rr_path, _definition: Insert. (line 7)
|
342 | |
-* Jigdo Template Extraction, -jigdo: Jigdo. (line 33)
|
343 | |
+* Jigdo Template Extraction, -jigdo: Jigdo. (line 37)
|
344 | |
* Jigdo Template Extraction, _definition: Jigdo. (line 6)
|
345 | |
* LBA, _definition: Drives. (line 17)
|
346 | |
* libisofs, fixed "now" time: Loading. (line 217)
|
347 | |
@@ -5885,39 +5901,39 @@
|
348 | |
Node: SetWrite120625
|
349 | |
Node: Bootable145384
|
350 | |
Node: Jigdo172341
|
351 | |
-Node: Charset176600
|
352 | |
-Node: Exception179929
|
353 | |
-Node: DialogCtl186058
|
354 | |
-Node: Inquiry188660
|
355 | |
-Node: Navigate197544
|
356 | |
-Node: Verify206001
|
357 | |
-Node: Restore216472
|
358 | |
-Node: Emulation225149
|
359 | |
-Node: Scripting235608
|
360 | |
-Node: Frontend243391
|
361 | |
-Node: Examples253017
|
362 | |
-Node: ExDevices254195
|
363 | |
-Node: ExCreate254856
|
364 | |
-Node: ExDialog256156
|
365 | |
-Node: ExGrowing257427
|
366 | |
-Node: ExModifying258236
|
367 | |
-Node: ExBootable258746
|
368 | |
-Node: ExCharset259301
|
369 | |
-Node: ExPseudo260197
|
370 | |
-Node: ExCdrecord261124
|
371 | |
-Node: ExMkisofs261444
|
372 | |
-Node: ExGrowisofs263342
|
373 | |
-Node: ExException264496
|
374 | |
-Node: ExTime264954
|
375 | |
-Node: ExIncBackup265412
|
376 | |
-Node: ExRestore269438
|
377 | |
-Node: ExRecovery270384
|
378 | |
-Node: Files270956
|
379 | |
-Node: Environ272290
|
380 | |
-Node: Seealso273038
|
381 | |
-Node: Bugreport273755
|
382 | |
-Node: Legal274346
|
383 | |
-Node: CommandIdx275358
|
384 | |
-Node: ConceptIdx292901
|
385 | |
+Node: Charset177344
|
386 | |
+Node: Exception180673
|
387 | |
+Node: DialogCtl186802
|
388 | |
+Node: Inquiry189404
|
389 | |
+Node: Navigate198288
|
390 | |
+Node: Verify206745
|
391 | |
+Node: Restore217216
|
392 | |
+Node: Emulation225893
|
393 | |
+Node: Scripting236352
|
394 | |
+Node: Frontend244135
|
395 | |
+Node: Examples253761
|
396 | |
+Node: ExDevices254939
|
397 | |
+Node: ExCreate255600
|
398 | |
+Node: ExDialog256900
|
399 | |
+Node: ExGrowing258171
|
400 | |
+Node: ExModifying258980
|
401 | |
+Node: ExBootable259490
|
402 | |
+Node: ExCharset260045
|
403 | |
+Node: ExPseudo260941
|
404 | |
+Node: ExCdrecord261868
|
405 | |
+Node: ExMkisofs262188
|
406 | |
+Node: ExGrowisofs264086
|
407 | |
+Node: ExException265240
|
408 | |
+Node: ExTime265698
|
409 | |
+Node: ExIncBackup266156
|
410 | |
+Node: ExRestore270182
|
411 | |
+Node: ExRecovery271128
|
412 | |
+Node: Files271700
|
413 | |
+Node: Environ273034
|
414 | |
+Node: Seealso273782
|
415 | |
+Node: Bugreport274499
|
416 | |
+Node: Legal275090
|
417 | |
+Node: CommandIdx276102
|
418 | |
+Node: ConceptIdx293645
|
419 | |
|
420 | |
End Tag Table
|
421 | |
--- a/xorriso/xorriso.texi
|
422 | |
+++ b/xorriso/xorriso.texi
|
423 | |
@@ -50,7 +50,7 @@
|
424 | |
@c man .\" First parameter, NAME, should be all caps
|
425 | |
@c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
|
426 | |
@c man .\" other parameters are allowed: see man(7), man(1)
|
427 | |
-@c man .TH XORRISO 1 "Version 1.5.2, Oct 26, 2019"
|
428 | |
+@c man .TH XORRISO 1 "Version 1.5.2, Nov 26, 2019"
|
429 | |
@c man .\" Please adjust this date whenever revising the manpage.
|
430 | |
@c man .\"
|
431 | |
@c man .\" Some roff macros, for reference:
|
432 | |
@@ -4351,14 +4351,19 @@
|
433 | |
instead of the content bytes of the listed files.
|
434 | |
@*
|
435 | |
Input for this process are the normal arguments for a @command{xorriso} session
|
436 | |
-on a blank -outdev, and a .md5 file which lists those data files which may be
|
437 | |
-listed in the .jigdo file and externally referenced in the .template file.
|
438 | |
-Each designated file is represented in the .md5 file by a single text line:
|
439 | |
+on a blank -outdev, and a checksum file which lists those data files which may
|
440 | |
+be listed in the .jigdo file and externally referenced in the .template file.
|
441 | |
+Each designated file is represented in the checksum file by a single text line:
|
442 | |
@*
|
443 | |
-MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks,
|
444 | |
+Checksum as hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks,
|
445 | |
symbolic file address
|
446 | |
@*
|
447 | |
-The file address in an .md5 line has to bear the same basename as the
|
448 | |
+The kind of checksum is chosen by -jigdo "checksum_algorithm" with values "md5"
|
449 | |
+(32 hex digits) or "sha256" (64 hex digits).
|
450 | |
+It will also be used for the file address lines in the .jigdo file.
|
451 | |
+The default is "md5".
|
452 | |
+@*
|
453 | |
+The file address in a checksum file line has to bear the same basename as the
|
454 | |
disk_path of the file which it shall match. The directory path of
|
455 | |
the file address is decisive for To=From mapping, not for file recognition.
|
456 | |
After To=From mapping, the file address gets written into the .jigdo
|
457 | |
@@ -4384,6 +4389,12 @@
|
458 | |
Parameter @strong{clear} with any value empties the whole list.
|
459 | |
No .jigdo and .template file will be produced.
|
460 | |
@*
|
461 | |
+@strong{checksum_algorithm} chooses the checksum algorithm which shall be used
|
462 | |
+for the data file entries in the .jigdo file and is expected in the checksum
|
463 | |
+file. Permissible are "md5" or "sha256". Default is "md5".
|
464 | |
+@*
|
465 | |
+Alias: -jigdo-checksum-algorithm
|
466 | |
+@*
|
467 | |
@strong{template_path} sets the disk_path for the .template file with the
|
468 | |
holed and compressed ISO image copy.
|
469 | |
@*
|
470 | |
@@ -4394,7 +4405,12 @@
|
471 | |
@*
|
472 | |
Alias: -jigdo-jigdo
|
473 | |
@*
|
474 | |
-@strong{md5_path} sets the disk_path where to find the .md5 input file.
|
475 | |
+@strong{checksum_path} sets the disk_path where to find the checksum file with
|
476 | |
+symbolic file addresses and checksums according to @strong{checksum_algorithm}.
|
477 | |
+@*
|
478 | |
+Alias: md5_path
|
479 | |
+@*
|
480 | |
+Alias: -checksum-list
|
481 | |
@*
|
482 | |
Alias: -md5-list
|
483 | |
@*
|
484 | |
@@ -4409,15 +4425,19 @@
|
485 | |
@*
|
486 | |
Alias: -jigdo-exclude
|
487 | |
@*
|
488 | |
-@strong{demand_md5} adds a regular expression pattern which will get compared
|
489 | |
-with the absolute disk_path of any data file that was not found in the .md5
|
490 | |
-list. A match causes a MISHAP event.
|
491 | |
+@strong{demand_checksum} adds a regular expression pattern which will get
|
492 | |
+compared with the absolute disk_path of any data file that was not found
|
493 | |
+in the checksum list file as of "checksum_path". A match causes a MISHAP event.
|
494 | |
+@*
|
495 | |
+Alias: demand_md5
|
496 | |
+@*
|
497 | |
+Alias: -jigdo-force-checksum
|
498 | |
@*
|
499 | |
Alias: -jigdo-force-md5
|
500 | |
@*
|
501 | |
@strong{mapping} adds a string pair of the form To=From to the parameter list.
|
502 | |
If a data file gets listed in the .jigdo file, then it is referred by the
|
503 | |
-file address from its line in the .md5 file. This file address gets checked
|
504 | |
+file address from its line in the checksum file. This file address gets checked
|
505 | |
whether it begins with the From string. If so, then this string will be
|
506 | |
replaced by the To string and a ':' character, before it goes into the .jigdo
|
507 | |
file. The From string should end by a '/' character.
|
508 | |
--- a/xorriso/xorrisofs.1
|
509 | |
+++ b/xorriso/xorrisofs.1
|
510 | |
@@ -9,7 +9,7 @@
|
511 | |
.\" First parameter, NAME, should be all caps
|
512 | |
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
|
513 | |
.\" other parameters are allowed: see man(7), man(1)
|
514 | |
-.TH XORRISOFS 1 "Version 1.5.2, Oct 26, 2019"
|
515 | |
+.TH XORRISOFS 1 "Version 1.5.2, Nov 26, 2019"
|
516 | |
.\" Please adjust this date whenever revising the manpage.
|
517 | |
.\"
|
518 | |
.\" Some roff macros, for reference:
|
519 | |
@@ -1529,15 +1529,20 @@
|
520 | |
instead of the content bytes of the listed files.
|
521 | |
.br
|
522 | |
Input for this process are the normal arguments for a \fBxorrisofs\fR
|
523 | |
-session
|
524 | |
-with no image loaded, and a .md5 file which lists those data files which may be
|
525 | |
+session with no image loaded, and a checksum file which lists those
|
526 | |
+data files which may be
|
527 | |
listed in the .jigdo file and externally referenced in the .template file.
|
528 | |
-Each designated file is represented in the .md5 file by a single text line:
|
529 | |
+Each designated file is represented in the checksum file by a single text line:
|
530 | |
.br
|
531 | |
-MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks,
|
532 | |
+Checksum as hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks,
|
533 | |
symbolic file address
|
534 | |
.br
|
535 | |
-The file address in an .md5 line has to bear the same basename as the
|
536 | |
+The kind of checksum is chosen by \-jigdo "checksum_algorithm" with values "md5"
|
537 | |
+(32 hex digits) or "sha256" (64 hex digits).
|
538 | |
+It will also be used for the file address lines in the .jigdo file.
|
539 | |
+ The default is "md5".
|
540 | |
+.br
|
541 | |
+The file address in a checksum file line has to bear the same basename as the
|
542 | |
disk_path of the file which it shall match. The directory path of
|
543 | |
the file address is decisive for To=From mapping, not for file recognition.
|
544 | |
After To=From mapping, the file address gets written into the .jigdo
|
545 | |
@@ -1548,6 +1553,10 @@
|
546 | |
counted as part of the ISO image.
|
547 | |
.br
|
548 | |
.TP
|
549 | |
+\fB\-jigdo-checksum-algorithm\fR "md5"|"sha256"
|
550 | |
+Set the checksum algorithm which shall be used for the data file entries
|
551 | |
+in the .jigdo file and is expected in the checksum file. Default is "md5".
|
552 | |
+.TP
|
553 | |
\fB\-jigdo-jigdo\fR disk_path
|
554 | |
Set the disk_path for the .jigdo file with the checksums
|
555 | |
and download addresses for filling the holes in .template.
|
556 | |
@@ -1563,12 +1572,16 @@
|
557 | |
letter "k", "m", "g" to count KiB (1024 bytes), MiB (1024 KiB), or
|
558 | |
GiB (1024 MiB).
|
559 | |
.TP
|
560 | |
-\fB\-jigdo-force-md5\fR disk_path_pattern
|
561 | |
+\fB\-jigdo-force-checksum\fR disk_path_pattern
|
562 | |
adds a regular expression pattern which will get compared
|
563 | |
-with the absolute disk_path of any data file that was not found in the .md5
|
564 | |
-list. A match causes a MISHAP event, which normally does not abort the
|
565 | |
+with the absolute disk_path of any data file that was not found in the
|
566 | |
+checksum file.
|
567 | |
+A match causes a MISHAP event, which normally does not abort the
|
568 | |
program run but finally causes a non\-zero exit value of the program.
|
569 | |
.TP
|
570 | |
+\fB\-jigdo-force-md5\fR disk_path_pattern
|
571 | |
+Outdated alias of \-jigdo\-force\-checksum.
|
572 | |
+.TP
|
573 | |
\fB\-jigdo-exclude\fR disk_path_pattern
|
574 | |
Add a regular expression pattern which will get compared
|
575 | |
with the absolute disk_path of any data file. A match causes the file to
|
576 | |
@@ -1577,13 +1590,17 @@
|
577 | |
\fB\-jigdo-map\fR To=From
|
578 | |
Add a string pair of the form To=From to the parameter list.
|
579 | |
If a data file gets listed in the .jigdo file, then it is referred by the
|
580 | |
-file address from its line in the .md5 file. This file address gets checked
|
581 | |
+file address from its line in the checksum file. This file address gets checked
|
582 | |
whether it begins with the From string. If so, then this string will be
|
583 | |
replaced by the To string and a ':' character, before it goes into the .jigdo
|
584 | |
file. The From string should end by a '/' character.
|
585 | |
.TP
|
586 | |
+\fB\-checksum-list\fR disk_path
|
587 | |
+Set the disk_path where to find the checksum file file with
|
588 | |
+symbolic file addresses and checksums according to \-jigdo\-checksum\-algorithm.
|
589 | |
+.TP
|
590 | |
\fB\-md5-list\fR disk_path
|
591 | |
-Set the disk_path where to find the .md5 input file.
|
592 | |
+Outdated alias of \-checksum\-list.
|
593 | |
.TP
|
594 | |
\fB\-jigdo-template-compress\fR "gzip"|"bzip2"
|
595 | |
Choose one of "bzip2" or "gzip" for the compression of
|
596 | |
--- a/xorriso/xorrisofs.info
|
597 | |
+++ b/xorriso/xorrisofs.info
|
598 | |
@@ -1334,21 +1334,29 @@
|
599 | |
.template file contains the compressed ISO image with reference tags
|
600 | |
instead of the content bytes of the listed files.
|
601 | |
Input for this process are the normal arguments for a 'xorrisofs'
|
602 | |
-session with no image loaded, and a .md5 file which lists those data
|
603 | |
+session with no image loaded, and a checksum file which lists those data
|
604 | |
files which may be listed in the .jigdo file and externally referenced
|
605 | |
-in the .template file. Each designated file is represented in the .md5
|
606 | |
-file by a single text line:
|
607 | |
-MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2
|
608 | |
+in the .template file. Each designated file is represented in the
|
609 | |
+checksum file by a single text line:
|
610 | |
+Checksum as hex digits, 2 blanks, size as 12 decimal digits or blanks, 2
|
611 | |
blanks, symbolic file address
|
612 | |
-The file address in an .md5 line has to bear the same basename as the
|
613 | |
-disk_path of the file which it shall match. The directory path of the
|
614 | |
-file address is decisive for To=From mapping, not for file recognition.
|
615 | |
-After To=From mapping, the file address gets written into the .jigdo
|
616 | |
-file. Jigdo restore tools will convert these addresses into really
|
617 | |
-reachable data source addresses from which they can read.
|
618 | |
+The kind of checksum is chosen by -jigdo "checksum_algorithm" with
|
619 | |
+values "md5" (32 hex digits) or "sha256" (64 hex digits). It will also
|
620 | |
+be used for the file address lines in the .jigdo file. The default is
|
621 | |
+"md5".
|
622 | |
+The file address in a checksum file line has to bear the same basename
|
623 | |
+as the disk_path of the file which it shall match. The directory path
|
624 | |
+of the file address is decisive for To=From mapping, not for file
|
625 | |
+recognition. After To=From mapping, the file address gets written into
|
626 | |
+the .jigdo file. Jigdo restore tools will convert these addresses into
|
627 | |
+really reachable data source addresses from which they can read.
|
628 | |
If the list of jigdo parameters is not empty, then padding will be
|
629 | |
counted as part of the ISO image.
|
630 | |
|
631 | |
+-jigdo-checksum-algorithm "md5"|"sha256"
|
632 | |
+ Set the checksum algorithm which shall be used for the data file
|
633 | |
+ entries in the .jigdo file and is expected in the checksum file.
|
634 | |
+ Default is "md5".
|
635 | |
-jigdo-jigdo disk_path
|
636 | |
Set the disk_path for the .jigdo file with the checksums and
|
637 | |
download addresses for filling the holes in .template.
|
638 | |
@@ -1360,12 +1368,14 @@
|
639 | |
file and being a hole in the .template file. size may be a plain
|
640 | |
number counting bytes, or a number with appended letter "k", "m",
|
641 | |
"g" to count KiB (1024 bytes), MiB (1024 KiB), or GiB (1024 MiB).
|
642 | |
--jigdo-force-md5 disk_path_pattern
|
643 | |
+-jigdo-force-checksum disk_path_pattern
|
644 | |
adds a regular expression pattern which will get compared with the
|
645 | |
- absolute disk_path of any data file that was not found in the .md5
|
646 | |
- list. A match causes a MISHAP event, which normally does not abort
|
647 | |
- the program run but finally causes a non-zero exit value of the
|
648 | |
- program.
|
649 | |
+ absolute disk_path of any data file that was not found in the
|
650 | |
+ checksum file. A match causes a MISHAP event, which normally does
|
651 | |
+ not abort the program run but finally causes a non-zero exit value
|
652 | |
+ of the program.
|
653 | |
+-jigdo-force-md5 disk_path_pattern
|
654 | |
+ Outdated alias of -jigdo-force-checksum.
|
655 | |
-jigdo-exclude disk_path_pattern
|
656 | |
Add a regular expression pattern which will get compared with the
|
657 | |
absolute disk_path of any data file. A match causes the file to
|
658 | |
@@ -1373,13 +1383,17 @@
|
659 | |
-jigdo-map To=From
|
660 | |
Add a string pair of the form To=From to the parameter list. If a
|
661 | |
data file gets listed in the .jigdo file, then it is referred by
|
662 | |
- the file address from its line in the .md5 file. This file address
|
663 | |
- gets checked whether it begins with the From string. If so, then
|
664 | |
- this string will be replaced by the To string and a ':' character,
|
665 | |
- before it goes into the .jigdo file. The From string should end by
|
666 | |
- a '/' character.
|
667 | |
+ the file address from its line in the checksum file. This file
|
668 | |
+ address gets checked whether it begins with the From string. If
|
669 | |
+ so, then this string will be replaced by the To string and a ':'
|
670 | |
+ character, before it goes into the .jigdo file. The From string
|
671 | |
+ should end by a '/' character.
|
672 | |
+-checksum-list disk_path
|
673 | |
+ Set the disk_path where to find the checksum file file with
|
674 | |
+ symbolic file addresses and checksums according to
|
675 | |
+ -jigdo-checksum-algorithm.
|
676 | |
-md5-list disk_path
|
677 | |
- Set the disk_path where to find the .md5 input file.
|
678 | |
+ Outdated alias of -checksum-list.
|
679 | |
-jigdo-template-compress "gzip"|"bzip2"
|
680 | |
Choose one of "bzip2" or "gzip" for the compression of the template
|
681 | |
file. The jigdo file is put out uncompressed.
|
682 | |
@@ -2011,9 +2025,10 @@
|
683 | |
* -C set load address and write address offset: Loading. (line 25)
|
684 | |
* -cdrecord-params set load address and write address offset: Loading.
|
685 | |
(line 41)
|
686 | |
-* -checksum_algorithm_iso choose .jigdo checksums: Jigdo. (line 72)
|
687 | |
+* -checksum-list set path of input checksum file: Jigdo. (line 77)
|
688 | |
+* -checksum_algorithm_iso choose .jigdo checksums: Jigdo. (line 86)
|
689 | |
* -checksum_algorithm_template choose .template checksums: Jigdo.
|
690 | |
- (line 78)
|
691 | |
+ (line 92)
|
692 | |
* -chrp-boot CHRP partition: SystemArea. (line 267)
|
693 | |
* -chrp-boot-part CHRP partition: SystemArea. (line 258)
|
694 | |
* -copyright set Copyright File path: ImageId. (line 66)
|
695 | |
@@ -2089,14 +2104,20 @@
|
696 | |
* -iso_mbr_part_type Set type of ISO MBR partition: SystemArea.
|
697 | |
(line 127)
|
698 | |
* -J enable production of Joliet directory tree: SetExtras. (line 147)
|
699 | |
-* -jigdo-exclude add exclusion pattern for .md5: Jigdo. (line 55)
|
700 | |
-* -jigdo-force-md5 add check pattern for .md5: Jigdo. (line 49)
|
701 | |
-* -jigdo-jigdo set name of .jigdo file: Jigdo. (line 38)
|
702 | |
-* -jigdo-map add address translation for .jigdo: Jigdo. (line 59)
|
703 | |
-* -jigdo-min-file-size set minimum extract size: Jigdo. (line 44)
|
704 | |
-* -jigdo-template set name of .template file: Jigdo. (line 41)
|
705 | |
+* -jigdo-checksum-algorithm set data file checksum algorithm: Jigdo.
|
706 | |
+ (line 42)
|
707 | |
+* -jigdo-exclude add exclusion pattern for checksum file: Jigdo.
|
708 | |
+ (line 65)
|
709 | |
+* -jigdo-force-checksum add check pattern for checksum file: Jigdo.
|
710 | |
+ (line 57)
|
711 | |
+* -jigdo-force-md5 add check pattern for checksum file: Jigdo.
|
712 | |
+ (line 63)
|
713 | |
+* -jigdo-jigdo set name of .jigdo file: Jigdo. (line 46)
|
714 | |
+* -jigdo-map add address translation for .jigdo: Jigdo. (line 69)
|
715 | |
+* -jigdo-min-file-size set minimum extract size: Jigdo. (line 52)
|
716 | |
+* -jigdo-template set name of .template file: Jigdo. (line 49)
|
717 | |
* -jigdo-template-compress choose compression algorithm: Jigdo.
|
718 | |
- (line 69)
|
719 | |
+ (line 83)
|
720 | |
* -joliet enable production of Joliet directory tree: SetExtras.
|
721 | |
(line 151)
|
722 | |
* -joliet-long allow longer Joliet names: SetExtras. (line 153)
|
723 | |
@@ -2107,7 +2128,7 @@
|
724 | |
* -M set path for loading existing ISO image: Loading. (line 11)
|
725 | |
* -max-iso9660-filenames allow 37 characters in ISO file names: SetCompl.
|
726 | |
(line 61)
|
727 | |
-* -md5-list set path of readable .md5: Jigdo. (line 67)
|
728 | |
+* -md5-list set path of input checksum file: Jigdo. (line 81)
|
729 | |
* -mips-boot MIPS Big Endian boot image: SystemArea. (line 274)
|
730 | |
* -mipsel-boot MIPS Little Endian boot image: SystemArea. (line 280)
|
731 | |
* -N omit version number in ISO file names: SetCompl. (line 64)
|
732 | |
@@ -2330,17 +2351,21 @@
|
733 | |
* ISO level, specify, -iso-level <1>: SetCompl. (line 8)
|
734 | |
* ISO root directory, redirect, -root: SetInsert. (line 55)
|
735 | |
* iso_rr_path, _definition: Insert. (line 8)
|
736 | |
-* Jigdo Template Extraction, -checksum_algorithm_iso: Jigdo. (line 72)
|
737 | |
+* Jigdo Template Extraction, -checksum-list: Jigdo. (line 77)
|
738 | |
+* Jigdo Template Extraction, -checksum_algorithm_iso: Jigdo. (line 86)
|
739 | |
* Jigdo Template Extraction, -checksum_algorithm_template: Jigdo.
|
740 | |
- (line 78)
|
741 | |
-* Jigdo Template Extraction, -jigdo-exclude: Jigdo. (line 55)
|
742 | |
-* Jigdo Template Extraction, -jigdo-force-md5: Jigdo. (line 49)
|
743 | |
-* Jigdo Template Extraction, -jigdo-jigdo: Jigdo. (line 38)
|
744 | |
-* Jigdo Template Extraction, -jigdo-map: Jigdo. (line 59)
|
745 | |
-* Jigdo Template Extraction, -jigdo-min-file-size: Jigdo. (line 44)
|
746 | |
-* Jigdo Template Extraction, -jigdo-template: Jigdo. (line 41)
|
747 | |
-* Jigdo Template Extraction, -jigdo-template-compress: Jigdo. (line 69)
|
748 | |
-* Jigdo Template Extraction, -md5-list: Jigdo. (line 67)
|
749 | |
+ (line 92)
|
750 | |
+* Jigdo Template Extraction, -jigdo-checksum-algorithm: Jigdo.
|
751 | |
+ (line 42)
|
752 | |
+* Jigdo Template Extraction, -jigdo-exclude: Jigdo. (line 65)
|
753 | |
+* Jigdo Template Extraction, -jigdo-force-checksum: Jigdo. (line 57)
|
754 | |
+* Jigdo Template Extraction, -jigdo-force-md5: Jigdo. (line 63)
|
755 | |
+* Jigdo Template Extraction, -jigdo-jigdo: Jigdo. (line 46)
|
756 | |
+* Jigdo Template Extraction, -jigdo-map: Jigdo. (line 69)
|
757 | |
+* Jigdo Template Extraction, -jigdo-min-file-size: Jigdo. (line 52)
|
758 | |
+* Jigdo Template Extraction, -jigdo-template: Jigdo. (line 49)
|
759 | |
+* Jigdo Template Extraction, -jigdo-template-compress: Jigdo. (line 83)
|
760 | |
+* Jigdo Template Extraction, -md5-list: Jigdo. (line 81)
|
761 | |
* Jigdo Template Extraction, _definition: Jigdo. (line 6)
|
762 | |
* Joliet, allows longer names, -joliet-long: SetExtras. (line 153)
|
763 | |
* Joliet, enable, -J, -joliet: SetExtras. (line 147)
|
764 | |
@@ -2418,21 +2443,21 @@
|
765 | |
Node: SystemArea45270
|
766 | |
Node: Charset63502
|
767 | |
Node: Jigdo64527
|
768 | |
-Node: Miscellaneous68804
|
769 | |
-Node: Examples70449
|
770 | |
-Node: ExSimple70943
|
771 | |
-Node: ExGraft71426
|
772 | |
-Node: ExMkisofs72726
|
773 | |
-Node: ExGrowisofs74535
|
774 | |
-Node: ExIncBackup75725
|
775 | |
-Node: ExIncBckAcc78902
|
776 | |
-Node: ExBootable80607
|
777 | |
-Node: Files84789
|
778 | |
-Node: Environ85884
|
779 | |
-Node: Seealso86757
|
780 | |
-Node: Bugreport87408
|
781 | |
-Node: Legal88001
|
782 | |
-Node: CommandIdx88898
|
783 | |
-Node: ConceptIdx104765
|
784 | |
+Node: Miscellaneous69497
|
785 | |
+Node: Examples71142
|
786 | |
+Node: ExSimple71636
|
787 | |
+Node: ExGraft72119
|
788 | |
+Node: ExMkisofs73419
|
789 | |
+Node: ExGrowisofs75228
|
790 | |
+Node: ExIncBackup76418
|
791 | |
+Node: ExIncBckAcc79595
|
792 | |
+Node: ExBootable81300
|
793 | |
+Node: Files85482
|
794 | |
+Node: Environ86577
|
795 | |
+Node: Seealso87450
|
796 | |
+Node: Bugreport88101
|
797 | |
+Node: Legal88694
|
798 | |
+Node: CommandIdx89591
|
799 | |
+Node: ConceptIdx105942
|
800 | |
|
801 | |
End Tag Table
|
802 | |
--- a/xorriso/xorrisofs.texi
|
803 | |
+++ b/xorriso/xorrisofs.texi
|
804 | |
@@ -50,7 +50,7 @@
|
805 | |
@c man .\" First parameter, NAME, should be all caps
|
806 | |
@c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
|
807 | |
@c man .\" other parameters are allowed: see man(7), man(1)
|
808 | |
-@c man .TH XORRISOFS 1 "Version 1.5.2, Oct 26, 2019"
|
809 | |
+@c man .TH XORRISOFS 1 "Version 1.5.2, Nov 26, 2019"
|
810 | |
@c man .\" Please adjust this date whenever revising the manpage.
|
811 | |
@c man .\"
|
812 | |
@c man .\" Some roff macros, for reference:
|
813 | |
@@ -2004,15 +2004,20 @@
|
814 | |
instead of the content bytes of the listed files.
|
815 | |
@*
|
816 | |
Input for this process are the normal arguments for a @command{xorrisofs}
|
817 | |
-session
|
818 | |
-with no image loaded, and a .md5 file which lists those data files which may be
|
819 | |
+session with no image loaded, and a checksum file which lists those
|
820 | |
+data files which may be
|
821 | |
listed in the .jigdo file and externally referenced in the .template file.
|
822 | |
-Each designated file is represented in the .md5 file by a single text line:
|
823 | |
+Each designated file is represented in the checksum file by a single text line:
|
824 | |
@*
|
825 | |
-MD5 as 32 hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks,
|
826 | |
+Checksum as hex digits, 2 blanks, size as 12 decimal digits or blanks, 2 blanks,
|
827 | |
symbolic file address
|
828 | |
@*
|
829 | |
-The file address in an .md5 line has to bear the same basename as the
|
830 | |
+The kind of checksum is chosen by -jigdo "checksum_algorithm" with values "md5"
|
831 | |
+(32 hex digits) or "sha256" (64 hex digits).
|
832 | |
+It will also be used for the file address lines in the .jigdo file.
|
833 | |
+ The default is "md5".
|
834 | |
+@*
|
835 | |
+The file address in a checksum file line has to bear the same basename as the
|
836 | |
disk_path of the file which it shall match. The directory path of
|
837 | |
the file address is decisive for To=From mapping, not for file recognition.
|
838 | |
After To=From mapping, the file address gets written into the .jigdo
|
839 | |
@@ -2025,6 +2030,12 @@
|
840 | |
@table @asis
|
841 | |
@sp 1
|
842 | |
@c man .TP
|
843 | |
+@item -jigdo-checksum-algorithm "md5"|"sha256"
|
844 | |
+@kindex -jigdo-checksum-algorithm set data file checksum algorithm
|
845 | |
+@cindex Jigdo Template Extraction, -jigdo-checksum-algorithm
|
846 | |
+Set the checksum algorithm which shall be used for the data file entries
|
847 | |
+in the .jigdo file and is expected in the checksum file. Default is "md5".
|
848 | |
+@c man .TP
|
849 | |
@item -jigdo-jigdo disk_path
|
850 | |
@kindex -jigdo-jigdo set name of .jigdo file
|
851 | |
@cindex Jigdo Template Extraction, -jigdo-jigdo
|
852 | |
@@ -2046,16 +2057,22 @@
|
853 | |
letter "k", "m", "g" to count KiB (1024 bytes), MiB (1024 KiB), or
|
854 | |
GiB (1024 MiB).
|
855 | |
@c man .TP
|
856 | |
-@item -jigdo-force-md5 disk_path_pattern
|
857 | |
-@kindex -jigdo-force-md5 add check pattern for .md5
|
858 | |
-@cindex Jigdo Template Extraction, -jigdo-force-md5
|
859 | |
+@item -jigdo-force-checksum disk_path_pattern
|
860 | |
+@kindex -jigdo-force-checksum add check pattern for checksum file
|
861 | |
+@cindex Jigdo Template Extraction, -jigdo-force-checksum
|
862 | |
adds a regular expression pattern which will get compared
|
863 | |
-with the absolute disk_path of any data file that was not found in the .md5
|
864 | |
-list. A match causes a MISHAP event, which normally does not abort the
|
865 | |
+with the absolute disk_path of any data file that was not found in the
|
866 | |
+checksum file.
|
867 | |
+A match causes a MISHAP event, which normally does not abort the
|
868 | |
program run but finally causes a non-zero exit value of the program.
|
869 | |
@c man .TP
|
870 | |
+@item -jigdo-force-md5 disk_path_pattern
|
871 | |
+@kindex -jigdo-force-md5 add check pattern for checksum file
|
872 | |
+@cindex Jigdo Template Extraction, -jigdo-force-md5
|
873 | |
+Outdated alias of -jigdo-force-checksum.
|
874 | |
+@c man .TP
|
875 | |
@item -jigdo-exclude disk_path_pattern
|
876 | |
-@kindex -jigdo-exclude add exclusion pattern for .md5
|
877 | |
+@kindex -jigdo-exclude add exclusion pattern for checksum file
|
878 | |
@cindex Jigdo Template Extraction, -jigdo-exclude
|
879 | |
Add a regular expression pattern which will get compared
|
880 | |
with the absolute disk_path of any data file. A match causes the file to
|
881 | |
@@ -2066,15 +2083,21 @@
|
882 | |
@cindex Jigdo Template Extraction, -jigdo-map
|
883 | |
Add a string pair of the form To=From to the parameter list.
|
884 | |
If a data file gets listed in the .jigdo file, then it is referred by the
|
885 | |
-file address from its line in the .md5 file. This file address gets checked
|
886 | |
+file address from its line in the checksum file. This file address gets checked
|
887 | |
whether it begins with the From string. If so, then this string will be
|
888 | |
replaced by the To string and a ':' character, before it goes into the .jigdo
|
889 | |
file. The From string should end by a '/' character.
|
890 | |
@c man .TP
|
891 | |
+@item -checksum-list disk_path
|
892 | |
+@kindex -checksum-list set path of input checksum file
|
893 | |
+@cindex Jigdo Template Extraction, -checksum-list
|
894 | |
+Set the disk_path where to find the checksum file file with
|
895 | |
+symbolic file addresses and checksums according to -jigdo-checksum-algorithm.
|
896 | |
+@c man .TP
|
897 | |
@item -md5-list disk_path
|
898 | |
-@kindex -md5-list set path of readable .md5
|
899 | |
+@kindex -md5-list set path of input checksum file
|
900 | |
@cindex Jigdo Template Extraction, -md5-list
|
901 | |
-Set the disk_path where to find the .md5 input file.
|
902 | |
+Outdated alias of -checksum-list.
|
903 | |
@c man .TP
|
904 | |
@item -jigdo-template-compress "gzip"|"bzip2"
|
905 | |
@kindex -jigdo-template-compress choose compression algorithm
|