Hello community,

here is the log from the commit of package enblend-enfuse for openSUSE:Factory 
checked in at 2019-09-20 14:52:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/enblend-enfuse (Old)
 and      /work/SRC/openSUSE:Factory/.enblend-enfuse.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "enblend-enfuse"

Fri Sep 20 14:52:10 2019 rev:36 rq:731800 version:4.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/enblend-enfuse/enblend-enfuse.changes    
2018-07-28 12:44:35.324901224 +0200
+++ /work/SRC/openSUSE:Factory/.enblend-enfuse.new.7948/enblend-enfuse.changes  
2019-09-20 14:52:18.242893270 +0200
@@ -1,0 +2,6 @@
+Tue Sep 17 10:53:45 UTC 2019 - Bernhard Wiedemann <[email protected]>
+
+- Add reproducibledate.patch to override build date (boo#1047218)
+- Add reproducible.patch to override build hostname (boo#1084909)
+
+-------------------------------------------------------------------

New:
----
  reproducible.patch
  reproducibledate.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ enblend-enfuse.spec ++++++
--- /var/tmp/diff_new_pack.iLlmzB/_old  2019-09-20 14:52:24.122892099 +0200
+++ /var/tmp/diff_new_pack.iLlmzB/_new  2019-09-20 14:52:24.130892097 +0200
@@ -36,6 +36,10 @@
 
 # PATCH-FIX-UPSTREAM enblend-enfuse-4.2-add-missing-cmakelists.patch
 Patch0:         enblend-enfuse-4.2-add-missing-cmakelists.patch
+# PATCH-FIX-UPSTREAM reproducible.patch by bmwiedemann
+Patch1:         reproducibledate.patch
+# PATCH-FIX-OPENSUSE by bmwiedemann
+Patch2:         reproducible.patch
 
 BuildRequires:  OpenEXR-devel
 BuildRequires:  cmake
@@ -101,6 +105,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %if ! %{_build_doc}
 cp %{SOURCE10} doc/

++++++ reproducible.patch ++++++
Author: Bernhard M. Wiedemann <[email protected]>
Date: 2019-09-17

Index: enblend-enfuse-4.2/src/DefaultSig.pm
===================================================================
--- enblend-enfuse-4.2.orig/src/DefaultSig.pm
+++ enblend-enfuse-4.2/src/DefaultSig.pm
@@ -143,6 +144,9 @@ sub _login_name {
 sub _real_user_name {
     my $self = shift;
 
+    if ($ENV{SOURCE_DATE_EPOCH}) {
+        return "reproducible";
+    }
     if ($OSNAME eq 'MSWin32') {
         return $self->_login_name();
     } else {
@@ -169,6 +173,9 @@ sub _clean_hostname {
     if ($OSNAME =~ m/MacOS/) {
         $hostname =~ s/^(.*?)[-.].*$/$1/;
     }
+    if ($ENV{SOURCE_DATE_EPOCH}) {
+        $hostname = "reproducible";
+    }
 
     return $hostname;
 }
++++++ reproducibledate.patch ++++++
is in upstream hg via
changeset:   1509:a98e00eed893
user:        Bernhard M. Wiedemann <bwiedemann suse.de>
date:        Sun Aug 13 09:39:59 2017 +0200
summary:     Facilitate reproducible builds

Index: enblend-enfuse-4.2/src/DefaultSig.pm
===================================================================
--- enblend-enfuse-4.2.orig/src/DefaultSig.pm
+++ enblend-enfuse-4.2/src/DefaultSig.pm
@@ -109,9 +109,10 @@ sub monthnames {my $self = shift;  retur
 sub update_date_and_time {
     my $self = shift;
 
+    my $now = $ENV{SOURCE_DATE_EPOCH} || time;
     my ($second, $minute, $hour,
         $day_of_month, $month, $year,
-        $day_of_week) = $self->is_using_gmt() ? gmtime : localtime;
+        $day_of_week) = $self->is_using_gmt() ? gmtime($now) : localtime($now);
 
     $self->{DATE} = $self->format_date($day_of_month, $month, $year + 1900, 
$day_of_week,
                                        $self->weekdays->[$day_of_week],

Reply via email to