Your message dated Sun, 22 Mar 2015 20:24:03 +0100
with message-id <[email protected]>
and subject line Re: [Pkg-openssl-devel] Bug#780955: openssl: please make the
build reproducible
has caused the Debian Bug report #780955,
regarding openssl: please make the build reproducible
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
780955: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=780955
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: openssl
Version: 1.0.1k-1
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: timestamps
Hi,
I noticed that the package openssl[1] could not be build reproducibly.
The attached patch modifies the crypto/Makefile and util/mkbuildinf.pl
so that the first can pass a fixed date to the later, avoiding inserting
the localtime into the build. debian/rules has also been modified to
export a variable containing the date of the last changelog, to be used
as a timestamp.
[1] https://reproducible.debian.net/rb-pkg/unstable/amd64/openssl.html
diff --git a/crypto/Makefile b/crypto/Makefile
index 2b6397a..7396d47 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -55,7 +55,8 @@ top:
all: shared
buildinf.h: ../Makefile
- $(PERL) $(TOP)/util/mkbuildinf.pl "$(CFLAGS)" "$(PLATFORM)" >buildinf.h
+ $(PERL) $(TOP)/util/mkbuildinf.pl "$(CFLAGS)" "$(PLATFORM)" "$(DATE)" \
+ > buildinf.h
x86cpuid.s: x86cpuid.pl perlasm/x86asm.pl
$(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
diff --git a/debian/rules b/debian/rules
index 615ce02..cf84660 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,9 @@ package=openssl
# For generating the manpages
export VERSION=$(shell dpkg-parsechangelog | grep '^Version:' | sed -e 's/^.*://' -e 's/-.*//')
+export DATE := $(strip $(shell LC_ALL=C dpkg-parsechangelog --show-field Date | \
+ LC_ALL=C date -u --file=- +%c ))
+
# The binary architeture
DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
diff --git a/util/mkbuildinf.pl b/util/mkbuildinf.pl
index 9d7b81c..7a14958 100755
--- a/util/mkbuildinf.pl
+++ b/util/mkbuildinf.pl
@@ -1,9 +1,11 @@
#!/usr/local/bin/perl
-my ($cflags, $platform) = @ARGV;
+my ($cflags, $platform, $date) = @ARGV;
$cflags = "compiler: $cflags";
-$date = localtime();
+if (!$date) {
+ $date = localtime();
+}
print <<"END_OUTPUT";
#ifndef MK1MF_BUILD
/* auto-generated by util/mkbuildinf.pl for crypto/cversion.c */
--- End Message ---
--- Begin Message ---
Version: 1.0.2-1
On Sun, Mar 22, 2015 at 07:36:31PM +0100, Dhole wrote:
>
>
> On 03/22/2015 02:49 PM, Kurt Roeckx wrote:
> > Have you actually checked:
> > - The comment in the reproducibilty tracker?
> > - The version in experimental?
> >
> > I will probably just close this as fixed in 1.0.2-1 unless I hear
> > otherwise from you.
> >
> >
> > Kurt
> >
>
> Oh sorry, I didn't check that, my bad.
> You can close this.
>
> Dhole
>
--- End Message ---
