Hello community, here is the log from the commit of package kakoune for openSUSE:Factory checked in at 2017-07-25 11:40:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kakoune (Old) and /work/SRC/openSUSE:Factory/.kakoune.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kakoune" Tue Jul 25 11:40:03 2017 rev:6 rq:512147 version:0.0+git.20170513 Changes: -------- --- /work/SRC/openSUSE:Factory/kakoune/kakoune.changes 2017-05-22 10:48:24.617076394 +0200 +++ /work/SRC/openSUSE:Factory/.kakoune.new/kakoune.changes 2017-07-25 11:40:56.739688386 +0200 @@ -1,0 +2,6 @@ +Sun Jul 23 18:31:46 UTC 2017 - bwiedem...@suse.com + +- Update reproducible.patch + to make the package build fully reproducible (boo#1041090) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kakoune.spec ++++++ --- /var/tmp/diff_new_pack.2GRgri/_old 2017-07-25 11:40:58.403453490 +0200 +++ /var/tmp/diff_new_pack.2GRgri/_new 2017-07-25 11:40:58.403453490 +0200 @@ -24,7 +24,7 @@ Group: Productivity/Text/Editors Url: http://kakoune.org/ Source: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -- bmwiedemann +# PATCH-FIX-UPSTREAM -- bmwiedemann https://github.com/mawww/kakoune/pull/1390 Patch0: reproducible.patch BuildRequires: asciidoc BuildRequires: libxslt-tools ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.2GRgri/_old 2017-07-25 11:40:58.471443891 +0200 +++ /var/tmp/diff_new_pack.2GRgri/_new 2017-07-25 11:40:58.475443326 +0200 @@ -1,11 +1,19 @@ -produce bit-identical results -by not embedding timestamps in gz files +From 78991c482088d6d71d709ddc9522a2608f691df7 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" <bwiedem...@suse.de> +Date: Sat, 20 May 2017 22:49:36 +0200 +Subject: [PATCH 1/2] do not embed timestamps in .gz files -Index: kakoune-0.0+git.20170223/src/Makefile -=================================================================== ---- kakoune-0.0+git.20170223.orig/src/Makefile -+++ kakoune-0.0+git.20170223/src/Makefile -@@ -73,7 +73,7 @@ kak : $(objects) +using gzip -n to produce bit-identical results +and -9 to compress a bit better +--- + src/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index dbef95d9..7a06d8d9 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -77,7 +77,7 @@ kak$(suffix) : $(objects) # Generate the man page ../doc/kak.1.gz: ../doc/kak.1.txt a2x --no-xmllint -f manpage $< @@ -14,7 +22,7 @@ # Generate the editor's documentation pages # Since `a2x` won't generate man pages if some sections are missing (which we don't need), -@@ -82,7 +82,7 @@ kak : $(objects) +@@ -86,7 +86,7 @@ kak$(suffix) : $(objects) a2x --no-xmllint -f manpage $< sed -i -r -e "s,^\.TH .+,.TH KAKOUNE 1 \"\" \"\" \"$(basename $(notdir $<))\"," \ -e "/^\.SH \"NAME\"/{N;d;}" $(@:.gz=.1) @@ -23,3 +31,31 @@ mv -f $(@:.gz=.1.gz) $@ check: test + +From 4788112f2dd09118097de46f403210be3a35c5e7 Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" <bwiedem...@suse.de> +Date: Sat, 20 May 2017 22:50:25 +0200 +Subject: [PATCH 2/2] Always link input files in the same order + +to produce bit-identical 'kak' binaries +See https://reproducible-builds.org/ for why this is good. + +This change is needed because filesystem ordering is random +and ordering matters for the g++ linker +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 7a06d8d9..cde2b943 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -13,7 +13,7 @@ else + endif + endif + +-sources := $(wildcard *.cc) ++sources := $(sort $(wildcard *.cc)) + objects := $(addprefix ., $(sources:.cc=$(suffix).o)) + deps := $(addprefix ., $(sources:.cc=$(suffix).d)) + docs := $(wildcard ../doc/manpages/*.asciidoc)
