From 813cca57a26fc40d8786a3baf237356b4fd4c790 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 15 Jan 2012 10:40:12 +0000 Subject: [PATCH] Made -compliance "rec_mtime" default for xorriso --- libisoburn/trunk/xorriso/write_run.h | 2 +- libisoburn/trunk/xorriso/xorriso.1 | 5 +- libisoburn/trunk/xorriso/xorriso.info | 163 ++++++++++--------- libisoburn/trunk/xorriso/xorriso.texi | 5 +- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 5 files changed, 90 insertions(+), 87 deletions(-) diff --git a/libisoburn/trunk/xorriso/write_run.h b/libisoburn/trunk/xorriso/write_run.h index f245f025..933d9f9a 100644 --- a/libisoburn/trunk/xorriso/write_run.h +++ b/libisoburn/trunk/xorriso/write_run.h @@ -21,7 +21,7 @@ /* Default setting for -compliance */ #define Xorriso_relax_compliance_defaulT \ (isoburn_igopt_allow_deep_paths | isoburn_igopt_allow_longer_paths | \ - isoburn_igopt_always_gmt | \ + isoburn_igopt_always_gmt | isoburn_igopt_dir_rec_mtime | \ isoburn_igopt_rrip_version_1_10 | isoburn_igopt_aaip_susp_1_10 | \ isoburn_igopt_only_iso_versions | isoburn_igopt_no_j_force_dots) diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index 68947989..377a7616 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/xorriso/xorriso.1 @@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRISO 1 "Version 1.1.9, Jan 14, 2012" +.TH XORRISO 1 "Version 1.1.9, Jan 15, 2012" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -2187,7 +2187,8 @@ than 64. "rec_mtime" records with non\-RockRidge directory entries the disk file's mtime and not the creation time of the image. This applies to the ECMA\-119 tree (plain ISO 9660), to Joliet, and to ISO 9660:1999. "rec_time" is -automatically enabled by \-as mkisofs emulation, when a pathspec is encountered. +default. If disabled, it gets automatically re\-enabled by \-as mkisofs emulation +when a pathspec is encountered. .br "new_rr" uses Rock Ridge version 1.12 (suitable for GNU/Linux but not for older FreeBSD or for Solaris). This implies "aaip_susp_1_10_off" which may be changed diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info index 84d0d355..bebd4a38 100644 --- a/libisoburn/trunk/xorriso/xorriso.info +++ b/libisoburn/trunk/xorriso/xorriso.info @@ -1947,8 +1947,9 @@ will be written according to the setting of option -acl. "rec_mtime" records with non-RockRidge directory entries the disk file's mtime and not the creation time of the image. This applies to the ECMA-119 tree (plain ISO 9660), to Joliet, and to ISO - 9660:1999. "rec_time" is automatically enabled by -as mkisofs - emulation, when a pathspec is encountered. + 9660:1999. "rec_time" is default. If disabled, it gets + automatically re-enabled by -as mkisofs emulation when a pathspec + is encountered. "new_rr" uses Rock Ridge version 1.12 (suitable for GNU/Linux but not for older FreeBSD or for Solaris). This implies "aaip_susp_1_10_off" which may be changed by subsequent @@ -4258,7 +4259,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * # starts a comment line: Scripting. (line 162) * -abort_on controls abort on error: Exception. (line 27) -* -abstract_file sets abstract file name: SetWrite. (line 163) +* -abstract_file sets abstract file name: SetWrite. (line 164) * -acl controls handling of ACLs: Loading. (line 142) * -add inserts one or more paths: Insert. (line 42) * -add_plainly inserts one or more paths: Insert. (line 61) @@ -4266,13 +4267,13 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -alter_date_r sets timestamps in ISO image: Manip. (line 167) * -append_partition adds arbitrary file after image end: Bootable. (line 199) -* -application_id sets application id: SetWrite. (line 122) +* -application_id sets application id: SetWrite. (line 123) * -as emulates mkisofs or cdrecord: Emulation. (line 13) * -assert_volid rejects undesired images: Loading. (line 83) * -auto_charset learns character set from image: Loading. (line 97) * -backslash_codes enables backslash conversion: Scripting. (line 67) * -ban_stdio_write demands real drive: Loading. (line 246) -* -biblio_file sets biblio file name: SetWrite. (line 170) +* -biblio_file sets biblio file name: SetWrite. (line 171) * -blank erases media: Writing. (line 45) * -boot_image controls bootability: Bootable. (line 26) * -calm_drive reduces drive activity: Loading. (line 235) @@ -4290,7 +4291,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -chown sets ownership in ISO image: Manip. (line 42) * -chown_r sets ownership in ISO image: Manip. (line 47) * -clone copies ISO directory tree: Insert. (line 171) -* -close controls media closing: SetWrite. (line 265) +* -close controls media closing: SetWrite. (line 266) * -close_damaged closes damaged track and session: Writing. (line 136) * -close_filter_list bans filter registration: Filter. (line 52) * -commit writes pending ISO image: Writing. (line 13) @@ -4299,7 +4300,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -compare_l reports ISO/disk differences: Navigate. (line 164) * -compare_r reports ISO/disk differences: Navigate. (line 159) * -compliance controls standard compliance: SetWrite. (line 14) -* -copyright_file sets copyright file name: SetWrite. (line 157) +* -copyright_file sets copyright file name: SetWrite. (line 158) * -cp_clone copies ISO directory tree: Insert. (line 183) * -cp_rx copies file trees to disk: Restore. (line 108) * -cpax copies files to disk: Restore. (line 104) @@ -4316,11 +4317,11 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top (line 35) * -drive_class controls drive accessability: Loading. (line 53) * -du show directory size in ISO image: Navigate. (line 89) -* -dummy controls write simulation: SetWrite. (line 254) +* -dummy controls write simulation: SetWrite. (line 255) * -dus show directory size in ISO image: Navigate. (line 93) * -dusx show directory size on disk: Navigate. (line 102) * -dux show directory size on disk: Navigate. (line 97) -* -dvd_obs set write block size: SetWrite. (line 241) +* -dvd_obs set write block size: SetWrite. (line 242) * -early_stdio_test classifies stdio drives: Loading. (line 251) * -eject ejects drive tray: Writing. (line 36) * -end writes pending session and ends program: Scripting. (line 156) @@ -4338,12 +4339,12 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -follow softlinks and mount points: SetInsert. (line 76) * -for_backup -acl,-xattr,-hardlinks,-md5: Loading. (line 184) * -format formats media: Writing. (line 72) -* -fs sets size of fifo: SetWrite. (line 258) +* -fs sets size of fifo: SetWrite. (line 259) * -getfacl shows ACL in ISO image: Navigate. (line 70) * -getfacl_r shows ACL in ISO image: Navigate. (line 77) * -getfattr shows xattr in ISO image: Navigate. (line 81) * -getfattr_r shows xattr in ISO image: Navigate. (line 85) -* -gid sets global ownership: SetWrite. (line 198) +* -gid sets global ownership: SetWrite. (line 199) * -grow_blindly overides next writeable address: AqDrive. (line 46) * -hardlinks controls handling of hard links: Loading. (line 109) * -help prints help text: Scripting. (line 20) @@ -4388,17 +4389,17 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -not_paths sets absolute exclusion paths: SetInsert. (line 55) * -options_from_file reads commands from file: Scripting. (line 12) * -osirrox enables ISO-to-disk copying: Restore. (line 18) -* -out_charset sets output character set: SetWrite. (line 188) +* -out_charset sets output character set: SetWrite. (line 189) * -outdev aquires a drive for output: AqDrive. (line 31) * -overwrite enables overwriting in ISO: SetInsert. (line 127) * -pacifier controls pacifier text form: Emulation. (line 158) -* -padding sets amount or mode of image padding: SetWrite. (line 271) +* -padding sets amount or mode of image padding: SetWrite. (line 272) * -page set terminal geometry: DialogCtl. (line 19) * -paste_in copies file into disk file: Restore. (line 121) * -path_list inserts paths from disk file: Insert. (line 75) * -pathspecs sets meaning of = with -add: SetInsert. (line 118) * -pkt_output consolidates text output: Frontend. (line 7) -* -preparer_id sets preparer id: SetWrite. (line 176) +* -preparer_id sets preparer id: SetWrite. (line 177) * -print prints result text line: Scripting. (line 99) * -print_info prints message text line: Scripting. (line 102) * -print_mark prints synchronizing text line: Scripting. (line 105) @@ -4406,7 +4407,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -prog sets program name: Frontend. (line 30) * -prog_help prints help text: Frontend. (line 33) * -prompt prompts for enter key: Scripting. (line 110) -* -publisher sets publisher id: SetWrite. (line 116) +* -publisher sets publisher id: SetWrite. (line 117) * -pvd_info shows image id strings: Inquiry. (line 93) * -pwd tells working directory in ISO: Navigate. (line 20) * -pwdx tells working directory on disk: Navigate. (line 23) @@ -4440,27 +4441,27 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -signal_handling controls handling of system signals: Exception. (line 69) * -sleep waits for a given time span: Scripting. (line 114) -* -speed set write speed: SetWrite. (line 214) +* -speed set write speed: SetWrite. (line 215) * -split_size enables large file splitting: SetInsert. (line 140) * -status shows current settings: Scripting. (line 47) * -status_history_max curbs -status history: Scripting. (line 56) -* -stdio_sync controls stdio buffer: SetWrite. (line 248) -* -stream_recording controls defect management: SetWrite. (line 229) -* -system_id sets system id: SetWrite. (line 131) +* -stdio_sync controls stdio buffer: SetWrite. (line 249) +* -stream_recording controls defect management: SetWrite. (line 230) +* -system_id sets system id: SetWrite. (line 132) * -tell_media_space reports free space: Inquiry. (line 89) * -temp_mem_limit curbs memory consumption: Scripting. (line 92) * -toc shows list of sessions: Inquiry. (line 28) -* -uid sets global ownership: SetWrite. (line 194) +* -uid sets global ownership: SetWrite. (line 195) * -update inserts path if different: Insert. (line 99) * -update_l inserts paths if different: Insert. (line 121) * -update_r inserts paths if different: Insert. (line 110) * -use_readline enables readline for dialog: DialogCtl. (line 28) * -version prints help text: Scripting. (line 23) -* -volid sets volume id: SetWrite. (line 92) -* -volset_id sets volume set id: SetWrite. (line 111) -* -volume_date sets volume timestamp: SetWrite. (line 138) +* -volid sets volume id: SetWrite. (line 93) +* -volset_id sets volume set id: SetWrite. (line 112) +* -volume_date sets volume timestamp: SetWrite. (line 139) * -xattr controls handling of xattr (EA): Loading. (line 150) -* -zisofs controls zisofs production: SetWrite. (line 202) +* -zisofs controls zisofs production: SetWrite. (line 203)  File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top @@ -4492,7 +4493,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Character Set, _definition: Charset. (line 6) * Character Set, for input, -in_charset: Loading. (line 91) * Character Set, for input/output, -charset: Charset. (line 43) -* Character Set, for output, -out_charset: SetWrite. (line 188) +* Character Set, for output, -out_charset: SetWrite. (line 189) * Character set, learn from image, -auto_charset: Loading. (line 97) * Character Set, of terminal, -local_charset: Charset. (line 47) * Closed media, _definition: Media. (line 43) @@ -4546,8 +4547,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Filter, show chain, -show_stream: Navigate. (line 169) * Filter, show chains of tree, -show_stream_r: Navigate. (line 183) * Filter, unregister, -unregister_filter: Filter. (line 48) -* Filter, zisofs parameters, -zisofs: SetWrite. (line 202) -* Group, global in ISO image, -gid: SetWrite. (line 198) +* Filter, zisofs parameters, -zisofs: SetWrite. (line 203) +* Group, global in ISO image, -gid: SetWrite. (line 199) * Group, in ISO image, -chgrp: Manip. (line 50) * Group, in ISO image, -chgrp_r: Manip. (line 55) * Growing, _definition: Methods. (line 19) @@ -4556,16 +4557,16 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Image, _definition: Model. (line 9) * Image, demand volume id, -assert_volid: Loading. (line 83) * Image, discard pending changes, -rollback: Writing. (line 9) -* Image, set abstract file name, -abstract_file: SetWrite. (line 163) -* Image, set application id, -application_id: SetWrite. (line 122) -* Image, set biblio file name, -biblio_file: SetWrite. (line 170) -* Image, set copyright file name, -copyright_file: SetWrite. (line 157) -* Image, set preparer id, -preparer_id: SetWrite. (line 176) -* Image, set publisher id, -publisher: SetWrite. (line 116) -* Image, set system id, -system_id: SetWrite. (line 131) -* Image, set volume id, -volid: SetWrite. (line 92) -* Image, set volume set id, -volset_id: SetWrite. (line 111) -* Image, set volume timestamp, -volume_date: SetWrite. (line 138) +* Image, set abstract file name, -abstract_file: SetWrite. (line 164) +* Image, set application id, -application_id: SetWrite. (line 123) +* Image, set biblio file name, -biblio_file: SetWrite. (line 171) +* Image, set copyright file name, -copyright_file: SetWrite. (line 158) +* Image, set preparer id, -preparer_id: SetWrite. (line 177) +* Image, set publisher id, -publisher: SetWrite. (line 117) +* Image, set system id, -system_id: SetWrite. (line 132) +* Image, set volume id, -volid: SetWrite. (line 93) +* Image, set volume set id, -volset_id: SetWrite. (line 112) +* Image, set volume timestamp, -volume_date: SetWrite. (line 139) * Image, show id strings, -pvd_info: Inquiry. (line 93) * Insert, enable overwriting, -overwrite: SetInsert. (line 127) * Insert, file exclusion absolute, -not_paths: SetInsert. (line 55) @@ -4623,7 +4624,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Navigate, tell ISO working directory, -pwd: Navigate. (line 20) * Next writeable address, -grow_blindly: AqDrive. (line 46) * Overwriteable media, _definition: Media. (line 14) -* Ownership, global in ISO image, -uid: SetWrite. (line 194) +* Ownership, global in ISO image, -uid: SetWrite. (line 195) * Ownership, in ISO image, -chown: Manip. (line 42) * Ownership, in ISO image, -chown_r: Manip. (line 47) * Partition offset, _definiton: Bootable. (line 146) @@ -4701,22 +4702,22 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Verify, file checksum, -check_md5: Verify. (line 147) * Verify, file tree checksums, -check_md5_r: Verify. (line 163) * Verify, preset -check_media, -check_media_defaults: Verify. (line 40) -* Write, block size, -dvd_obs: SetWrite. (line 241) +* Write, block size, -dvd_obs: SetWrite. (line 242) * Write, bootability, -boot_image: Bootable. (line 26) -* Write, buffer syncing, -stdio_sync: SetWrite. (line 248) -* Write, close media, -close: SetWrite. (line 265) +* Write, buffer syncing, -stdio_sync: SetWrite. (line 249) +* Write, close media, -close: SetWrite. (line 266) * Write, compliance to specs, -compliance: SetWrite. (line 14) -* Write, defect management, -stream_recording: SetWrite. (line 229) +* Write, defect management, -stream_recording: SetWrite. (line 230) * Write, enable Joliet, -joliet: SetWrite. (line 10) -* Write, fifo size, -fs: SetWrite. (line 258) +* Write, fifo size, -fs: SetWrite. (line 259) * Write, free space, -tell_media_space: Inquiry. (line 89) * Write, log problematic disk files, -errfile_log: Scripting. (line 118) * Write, log written sessions, -session_log: Scripting. (line 138) -* Write, padding image, -padding: SetWrite. (line 271) +* Write, padding image, -padding: SetWrite. (line 272) * Write, pending ISO image, -commit: Writing. (line 13) * Write, predict image size, -print_size: Inquiry. (line 80) -* Write, set speed, -speed: SetWrite. (line 214) -* Write, simulation, -dummy: SetWrite. (line 254) +* Write, set speed, -speed: SetWrite. (line 215) +* Write, simulation, -dummy: SetWrite. (line 255) * xattr, _definiton: Extras. (line 54) * xattr, control handling, -xattr: Loading. (line 150) * xattr, set in ISO image, -setfattr: Manip. (line 111) @@ -4747,40 +4748,40 @@ Node: CmdFind69467 Node: Filter81572 Node: Writing85910 Node: SetWrite93911 -Node: Bootable108177 -Node: Jigdo121397 -Node: Charset125643 -Node: Exception128402 -Node: DialogCtl134515 -Node: Inquiry137102 -Node: Navigate141965 -Node: Verify150223 -Node: Restore158890 -Node: Emulation165795 -Node: Scripting175600 -Node: Frontend182765 -Node: Examples184064 -Node: ExDevices185241 -Node: ExCreate185900 -Node: ExDialog187182 -Node: ExGrowing188445 -Node: ExModifying189250 -Node: ExBootable189753 -Node: ExCharset190305 -Node: ExPseudo191125 -Node: ExCdrecord192023 -Node: ExMkisofs192340 -Node: ExGrowisofs193680 -Node: ExException194815 -Node: ExTime195269 -Node: ExIncBackup195728 -Node: ExRestore199714 -Node: ExRecovery200674 -Node: Files201244 -Node: Seealso202542 -Node: Bugreport203265 -Node: Legal203846 -Node: CommandIdx204776 -Node: ConceptIdx219872 +Node: Bootable108214 +Node: Jigdo121434 +Node: Charset125680 +Node: Exception128439 +Node: DialogCtl134552 +Node: Inquiry137139 +Node: Navigate142002 +Node: Verify150260 +Node: Restore158927 +Node: Emulation165832 +Node: Scripting175637 +Node: Frontend182802 +Node: Examples184101 +Node: ExDevices185278 +Node: ExCreate185937 +Node: ExDialog187219 +Node: ExGrowing188482 +Node: ExModifying189287 +Node: ExBootable189790 +Node: ExCharset190342 +Node: ExPseudo191162 +Node: ExCdrecord192060 +Node: ExMkisofs192377 +Node: ExGrowisofs193717 +Node: ExException194852 +Node: ExTime195306 +Node: ExIncBackup195765 +Node: ExRestore199751 +Node: ExRecovery200711 +Node: Files201281 +Node: Seealso202579 +Node: Bugreport203302 +Node: Legal203883 +Node: CommandIdx204813 +Node: ConceptIdx219909  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi index 544b52ef..13983783 100644 --- a/libisoburn/trunk/xorriso/xorriso.texi +++ b/libisoburn/trunk/xorriso/xorriso.texi @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @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 .TH XORRISO 1 "Version 1.1.9, Jan 14, 2012" +@c man .TH XORRISO 1 "Version 1.1.9, Jan 15, 2012" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -2614,7 +2614,8 @@ than 64. "rec_mtime" records with non-RockRidge directory entries the disk file's mtime and not the creation time of the image. This applies to the ECMA-119 tree (plain ISO 9660), to Joliet, and to ISO 9660:1999. "rec_time" is -automatically enabled by -as mkisofs emulation, when a pathspec is encountered. +default. If disabled, it gets automatically re-enabled by -as mkisofs emulation +when a pathspec is encountered. @* "new_rr" uses Rock Ridge version 1.12 (suitable for GNU/Linux but not for older FreeBSD or for Solaris). This implies "aaip_susp_1_10_off" which may be changed diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 2e9f45ca..218f38e8 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.01.14.144535" +#define Xorriso_timestamP "2012.01.15.104012"