Hello community, here is the log from the commit of package zip for openSUSE:Factory checked in at 2019-05-07 23:11:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zip (Old) and /work/SRC/openSUSE:Factory/.zip.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zip" Tue May 7 23:11:20 2019 rev:24 rq:700968 version:3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/zip/zip.changes 2017-12-03 10:08:39.545377468 +0100 +++ /work/SRC/openSUSE:Factory/.zip.new.5148/zip.changes 2019-05-07 23:11:22.043975878 +0200 @@ -1,0 +2,7 @@ +Fri May 3 10:41:10 UTC 2019 - Bernhard Wiedemann <[email protected]> + +- Add reproducible.patch to allow to override mtime values + stored in .zip (boo#1047218) +- Add zip-3.0-fix-doc.patch for the --strip-extra param + +------------------------------------------------------------------- New: ---- reproducible.patch zip-3.0-fix-doc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zip.spec ++++++ --- /var/tmp/diff_new_pack.9ZhrMW/_old 2019-05-07 23:11:23.463978533 +0200 +++ /var/tmp/diff_new_pack.9ZhrMW/_new 2019-05-07 23:11:23.467978541 +0200 @@ -23,7 +23,7 @@ Summary: File compression program License: BSD-3-Clause Group: Productivity/Archiving/Compression -Url: http://www.info-zip.org/ +Url: https://github.com/distropatches/zip/commits/opensuse Source: http://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz Patch2: zip-3.0-iso8859_2.patch Patch3: zip-3.0-add_options_to_help.patch @@ -34,6 +34,8 @@ Patch8: zip-3.0-nomutilation.patch # PATCH-FIX-UPSTREAM bsc#1068346 [email protected] -- fix memory leaks Patch9: zip-3.0-fix-memory_leaks.patch +Patch10: reproducible.patch +Patch11: zip-3.0-fix-doc.patch Provides: crzip = %{version} Obsoletes: crzip < %{version} BuildRequires: libbz2-devel @@ -53,6 +55,8 @@ %patch7 %patch8 %patch9 +%patch10 -p1 +%patch11 -p1 %build make %{?_smp_mflags} -f unix/Makefile prefix=/usr CC="gcc %{optflags} -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc ++++++ reproducible.patch ++++++ Author: Bernhard M. Wiedemann <bwiedemann suse de> Date: 2019-05-03 Override mtime with zip -X and SOURCE_DATE_EPOCH to allow for reproducible builds of .zip files See https://reproducible-builds.org/ for why this is good and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable. Index: zip30/zipup.c =================================================================== --- zip30.orig/zipup.c +++ zip30/zipup.c @@ -414,6 +414,7 @@ struct zlist far *z; /* zip entry to ush tempcext = 0; char *tempextra = NULL; char *tempcextra = NULL; + const char *source_date_epoch; #ifdef WINDLL @@ -674,6 +675,13 @@ struct zlist far *z; /* zip entry to } /* strcmp(z->name, "-") == 0 */ + if (extra_fields == 0 && (source_date_epoch = getenv("SOURCE_DATE_EPOCH")) != NULL) { + time_t epoch = strtoull(source_date_epoch, NULL, 10); + if (epoch > 0) { + ulg epochtim = unix2dostime(&epoch); + if (z->tim > epochtim) z->tim = epochtim; + } + } if (extra_fields == 2) { unsigned len; char *p; ++++++ zip-3.0-fix-doc.patch ++++++ Index: zip30/zip.txt =================================================================== --- zip30.orig/zip.txt +++ zip30/zip.txt @@ -1620,7 +1620,7 @@ OPTIONS See -i for more on include and exclude. -X - --no-extra + --strip-extra Do not save extra file attributes (Extended Attributes on OS/2, uid/gid and file times on Unix). The zip format uses extra fields to include additional information for each entry. Some
