Source: sogo
Version: 3.2.6-1
Severity: wishlist
Tags: upstream patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: username hostname timestamps
Hi!
While working on the “reproducible builds” effort [1], we have noticed
that sogo could not be built reproducibly, because it embeds the value
of $(CFLAGS), which varies due to -fdebug-prefix-map (added by the
reproducibility infrastructure) and -DSOGO_BUILD_DATE.
The attached patch removes -DSOGO_BUILD_DATE from $(CFLAGS), which
should make the package reproducible in the future, once we fix the
-fdebug-prefix-map issue globally on our end. As a side effect, it will
also ensure that if upstream adds references to SOGO_BUILD_DATE, the
build will fail until they are removed, in line with the original intent
of the 0005 patch.
Cheers,
Daniel
[1]: https://wiki.debian.org/ReproducibleBuilds
diff --git a/debian/patches/0005-Remove-build-date.patch b/debian/patches/0005-Remove-build-date.patch
index 5b1b584..6cf8d7f 100644
--- a/debian/patches/0005-Remove-build-date.patch
+++ b/debian/patches/0005-Remove-build-date.patch
@@ -11,7 +11,8 @@ Subject: Remove build date
UI/SOGoUI/UIxComponent.m | 5 -----
UI/Templates/MainUI/SOGoRootPage.wox | 2 +-
UI/Templates/UIxPageFrame.wox | 1 -
- 8 files changed, 3 insertions(+), 15 deletions(-)
+ SoObjects/SOGo/GNUmakefile.preamble | 2 --
+ 9 files changed, 3 insertions(+), 17 deletions(-)
Index: sogo/Main/SOGo.m
===================================================================
@@ -119,3 +120,18 @@ Index: sogo/UI/Templates/UIxPageFrame.wox
<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1" />
<link href="mailto:supp...@inverse.ca" rev="made" />
<link rel="shortcut icon" var:href="siteFavicon" type="image/x-icon" />
+Index: sogo/SoObjects/SOGo/GNUmakefile.preamble
+===================================================================
+--- sogo.orig/SoObjects/SOGo/GNUmakefile.preamble
++++ sogo/SoObjects/SOGo/GNUmakefile.preamble
+@@ -3,10 +3,8 @@
+ SOGo_INCLUDE_DIRS += -I.. -I../../UI
+
+ HOSTNAME ?= $(shell hostname -f)
+-BUILD_DATE = $(shell echo $$USER@$(HOSTNAME); date +"%Y%m%d%H%M")
+
+ ADDITIONAL_CPPFLAGS += \
+- -DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\"" \
+ -DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\"" \
+ -DSOGO_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \
+ -DSOGO_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
