+++ /dev/null
-From d9bea5154e28817f7c42e7fb7798df17eca483ff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar@debian.org>
-Date: Thu, 4 Jun 2015 11:05:20 +0000
-Subject: [PATCH] Add --clamp-mtime option
-
-The new `--clamp-mtime` option will change the behavior of `--mtime` to
-only use the time specified if the file mtime is newer than the given time.
-The `--clamp-mtime` option can only be used together with `--mtime`.
-
-Typical use case is to make builds reproducible: to loose less
-information, it's better to keep the original date of an archive, except for
-files modified during the build process. In that case, using a reference (and
-thus reproducible) timestamps for the latter is good enough. See
-<https://wiki.debian.org/ReproducibleBuilds> for more information.
-
-In order to implement the option, we transform `set_mtime_option` from
-a bool to an enum with three values: use original file mtime, force all mtimes
-to be of the same value, and clamp mtimes (as explained above).
-
-To verify that `--clamp-mtime` is used together with `--mtime`, `mtime_option`
-is now initialized to a minimal value as done for `newer_mtime_option`. As
-the same macro can now be used for both options, NEWER_OPTION_INITIALIZED
-has been renamed to TIME_OPTION_INITIALIZED.
----
- src/common.h | 17 ++++++++++++-----
- src/create.c | 15 ++++++++++++++-
- src/list.c | 2 +-
- src/tar.c | 23 ++++++++++++++++++++---
- 4 files changed, 47 insertions(+), 10 deletions(-)
-
---- a/src/common.h
-+++ b/src/common.h
-@@ -211,13 +211,20 @@
- do not get archived (also see after_date_option above). */
- GLOBAL struct timespec newer_mtime_option;
-
--/* If true, override actual mtime (see below) */
--GLOBAL bool set_mtime_option;
--/* Value to be put in mtime header field instead of the actual mtime */
-+enum set_mtime_option_mode
-+{
-+ USE_FILE_MTIME,
-+ FORCE_MTIME,
-+ CLAMP_MTIME,
-+};
-+
-+/* Override actual mtime if set to FORCE_MTIME or CLAMP_MTIME */
-+GLOBAL enum set_mtime_option_mode set_mtime_option;
-+/* Value to use when forcing or clamping the mtime header field. */
- GLOBAL struct timespec mtime_option;
-
--/* Return true if newer_mtime_option is initialized. */
--#define NEWER_OPTION_INITIALIZED(opt) (0 <= (opt).tv_nsec)
-+/* Return true if mtime_option or newer_mtime_option is initialized. */
-+#define TIME_OPTION_INITIALIZED(opt) (0 <= (opt).tv_nsec)
-
- /* Return true if the struct stat ST's M time is less than
- newer_mtime_option. */
---- a/src/create.c
-+++ b/src/create.c
-@@ -835,7 +835,20 @@
- }
-
- {
-- struct timespec mtime = set_mtime_option ? mtime_option : st->mtime;
-+ struct timespec mtime;
-+ switch (set_mtime_option)
-+ {
-+ case FORCE_MTIME:
-+ mtime = mtime_option;
-+ break;
-+ case CLAMP_MTIME:
-+ mtime = timespec_cmp (st->mtime, mtime_option) > 0 ? mtime_option : st->mtime;
-+ break;
-+ default:
-+ mtime = st->mtime;
-+ break;
-+ }
-+
- if (archive_format == POSIX_FORMAT)
- {
- if (MAX_OCTAL_VAL (header->header.mtime) < mtime.tv_sec
---- a/src/list.c
-+++ b/src/list.c
-@@ -193,7 +193,7 @@
- decode_header (current_header, ¤t_stat_info,
- ¤t_format, 1);
- if (! name_match (current_stat_info.file_name)
-- || (NEWER_OPTION_INITIALIZED (newer_mtime_option)
-+ || (TIME_OPTION_INITIALIZED (newer_mtime_option)
- /* FIXME: We get mtime now, and again later; this causes
- duplicate diagnostics if header.mtime is bogus. */
- && ((mtime.tv_sec
---- a/src/tar.c
-+++ b/src/tar.c
-@@ -276,6 +276,7 @@
- CHECK_DEVICE_OPTION,
- CHECKPOINT_OPTION,
- CHECKPOINT_ACTION_OPTION,
-+ CLAMP_MTIME_OPTION,
- DELAY_DIRECTORY_RESTORE_OPTION,
- HARD_DEREFERENCE_OPTION,
- DELETE_OPTION,
-@@ -532,6 +533,8 @@
- N_("force NAME as group for added files"), GRID+1 },
- {"mtime", MTIME_OPTION, N_("DATE-OR-FILE"), 0,
- N_("set mtime for added files from DATE-OR-FILE"), GRID+1 },
-+ {"clamp-mtime", CLAMP_MTIME_OPTION, 0, 0,
-+ N_("only set time when the file is more recent than what was given with --mtime"), GRID+1 },
- {"mode", MODE_OPTION, N_("CHANGES"), 0,
- N_("force (symbolic) mode CHANGES for added files"), GRID+1 },
- {"atime-preserve", ATIME_PRESERVE_OPTION,
-@@ -1425,6 +1428,10 @@
- set_subcommand_option (CREATE_SUBCOMMAND);
- break;
-
-+ case CLAMP_MTIME_OPTION:
-+ set_mtime_option = CLAMP_MTIME;
-+ break;
-+
- case 'C':
- name_add_dir (arg);
- break;
-@@ -1567,7 +1574,8 @@
-
- case MTIME_OPTION:
- get_date_or_file (args, "--mtime", arg, &mtime_option);
-- set_mtime_option = true;
-+ if (set_mtime_option == USE_FILE_MTIME)
-+ set_mtime_option = FORCE_MTIME;
- break;
-
- case 'n':
-@@ -1583,7 +1591,7 @@
- /* Fall through. */
-
- case NEWER_MTIME_OPTION:
-- if (NEWER_OPTION_INITIALIZED (newer_mtime_option))
-+ if (TIME_OPTION_INITIALIZED (newer_mtime_option))
- USAGE_ERROR ((0, 0, _("More than one threshold date")));
- get_date_or_file (args,
- key == NEWER_MTIME_OPTION ? "--newer-mtime"
-@@ -2350,6 +2358,8 @@
-
- newer_mtime_option.tv_sec = TYPE_MINIMUM (time_t);
- newer_mtime_option.tv_nsec = -1;
-+ mtime_option.tv_sec = TYPE_MINIMUM (time_t);
-+ mtime_option.tv_nsec = -1;
- recursion_option = FNM_LEADING_DIR;
- unquote_option = true;
- tar_sparse_major = 1;
-@@ -2510,7 +2520,7 @@
- _("Multiple archive files require '-M' option")));
-
- if (listed_incremental_option
-- && NEWER_OPTION_INITIALIZED (newer_mtime_option))
-+ && TIME_OPTION_INITIALIZED (newer_mtime_option))
- option_conflict_error ("--listed-incremental", "--newer");
-
- if (incremental_level != -1 && !listed_incremental_option)
-@@ -2563,6 +2573,13 @@
- USAGE_ERROR ((0, 0, _("Cannot concatenate compressed archives")));
- }
-
-+ if (set_mtime_option == CLAMP_MTIME)
-+ {
-+ if (!TIME_OPTION_INITIALIZED (mtime_option))
-+ USAGE_ERROR ((0, 0,
-+ _("--clamp-mtime needs a date specified using --mtime")));
-+ }
-+
- /* It is no harm to use --pax-option on non-pax archives in archive
- reading mode. It may even be useful, since it allows to override
- file attributes from tar headers. Therefore I allow such usage.
projects / debian / tar / commitdiff