Hello community, here is the log from the commit of package fsvs for openSUSE:Factory checked in at 2017-06-15 11:25:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fsvs (Old) and /work/SRC/openSUSE:Factory/.fsvs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fsvs" Thu Jun 15 11:25:13 2017 rev:12 rq:503619 version:1.2.7 Changes: -------- --- /work/SRC/openSUSE:Factory/fsvs/fsvs.changes 2015-06-24 20:58:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fsvs.new/fsvs.changes 2017-06-15 11:25:48.930883432 +0200 @@ -1,0 +2,9 @@ +Sat May 27 16:52:15 UTC 2017 - [email protected] + +- Update to 1.2.7 + * Updates for GCC 5 and Clang +- Rebase fsvs-1.2.5-linking.patch +- Add reproducible.patch to sort input files to make build reproducible + (boo#1041090) + +------------------------------------------------------------------- Old: ---- fsvs-1.2.5.tar.bz2 New: ---- fsvs-1.2.7.tar.bz2 reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fsvs.spec ++++++ --- /var/tmp/diff_new_pack.RdYkHg/_old 2017-06-15 11:25:50.514659861 +0200 +++ /var/tmp/diff_new_pack.RdYkHg/_new 2017-06-15 11:25:50.518659296 +0200 @@ -17,15 +17,17 @@ Name: fsvs -Version: 1.2.5 +Version: 1.2.7 Release: 0 Url: http://fsvs.tigris.org/ Summary: Backup/Restore/Versioning of large Data Sets with Meta-Data License: GPL-3.0+ Group: Productivity/Archiving/Backup -Source: http://download.fsvs-software.org/fsvs-%{version}.tar.bz2 +Source: https://download.fsvs-software.org/fsvs-%{version}.tar.bz2 Patch1: fsvs-destdir.patch Patch2: fsvs-1.2.5-linking.patch +# PATCH-FIX-UPSTREAM -- TODO +Patch3: reproducible.patch BuildRequires: apache2-devel BuildRequires: ctags BuildRequires: db-devel @@ -67,6 +69,7 @@ %setup -q %patch1 %patch2 +%patch3 -p1 %build export CFLAGS="%{optflags} $(pkg-config --includes apr-1)" ++++++ fsvs-1.2.5-linking.patch ++++++ --- /var/tmp/diff_new_pack.RdYkHg/_old 2017-06-15 11:25:50.554654215 +0200 +++ /var/tmp/diff_new_pack.RdYkHg/_new 2017-06-15 11:25:50.558653651 +0200 @@ -1,6 +1,7 @@ -diff -up src/fsvs.c.orig src/fsvs.c ---- src/fsvs.c.orig 2015-06-22 23:08:52.660973689 +0200 -+++ src/fsvs.c 2015-06-22 23:09:37.361972946 +0200 +Index: src/fsvs.c +=================================================================== +--- src/fsvs.c.orig ++++ src/fsvs.c @@ -640,8 +640,7 @@ const char* Version(FILE *output) " version " FSVS_VERSION "\n"); if (opt__is_verbose()>0) @@ -11,21 +12,19 @@ #ifdef HAVE_VALGRIND STRINGIFY(HAVE_VALGRIND) #endif -diff -up src/Makefile.in.orig src/Makefile.in ---- src/Makefile.in.orig 2015-06-22 23:06:22.966976178 +0200 -+++ src/Makefile.in 2015-06-22 23:08:40.808973886 +0200 -@@ -16,9 +16,9 @@ HEADREV := "$Revision: 2457 $" +Index: src/Makefile.in +=================================================================== +--- src/Makefile.in.orig ++++ src/Makefile.in +@@ -16,7 +16,7 @@ HEADREV := "$Revision: 2478 $" VERSION = $(shell perl -e '($$r) = (q( $(HEADREV) ) =~ m:(\d+):); $$t= q( $(HEADURL) ) =~ m:/tags/([^/]+): ? $$1 : "trunk"; print "$$t:$$r\n";' ) - CFLAGS := @CFLAGS@ @NEED_FNESTED_FUNCTIONS@ + CFLAGS := @CFLAGS@ -CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"' +CFLAGS += -Wall -funsigned-char -DFSVS_VERSION='"$(VERSION)"' LDFLAGS := @LDFLAGS@ --FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm -+FSVS_LDFLAGS = $(LDFLAGS) -lapr-1 -laprutil-1 -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm -ldl + FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm -ldl EXTRALIBS := @EXTRALIBS@ - WAA_CHARS?= @WAA_WC_MD5_CHARS@ - @@ -146,13 +146,13 @@ docs: $(MANDEST)/fsvs-howto-backup.5 $(M ################################ Rules ###################################### %.o: %.c @@ -46,8 +45,8 @@ deps: $(D_FILES) .%.d: %.c @echo " deps for $<" -- @$(CC) $(INCS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@ -+ $(CC) $(INCS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@ - # $(CC) $(INCS) -MM -MF $@ $< +- @$(CC) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@ ++ $(CC) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@ include $(D_FILES) + tools/fsvs-chrooter: tools/fsvs-chrooter.c ++++++ fsvs-1.2.5.tar.bz2 -> fsvs-1.2.7.tar.bz2 ++++++ ++++ 2507 lines of diff (skipped) ++++++ reproducible.patch ++++++ sort input files when building packages (e.g. for openSUSE Linux) (random) filesystem order of input files influences ordering of functions in the output, thus without the patch, builds (in disposable VMs) would usually differ. See https://reproducible-builds.org/ for why this matters. Index: fsvs-1.2.7/src/Makefile.in =================================================================== --- fsvs-1.2.7.orig/src/Makefile.in +++ fsvs-1.2.7/src/Makefile.in @@ -40,7 +40,7 @@ endif -C_FILES := $(wildcard *.c) +C_FILES := $(sort $(wildcard *.c)) H_FILES := $(wildcard *.h) D_FILES := $(C_FILES:%.c=.%.d) DEST := fsvs
