Your message dated Wed, 29 Jun 2016 23:29:38 +0000
with message-id <e1biovk-0005d6...@franck.debian.org>
and subject line Bug#828994: fixed in syncthing 0.13.9+dfsg1-2
has caused the Debian Bug report #828994,
regarding syncthing: 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 ow...@bugs.debian.org
immediately.)


-- 
828994: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828994
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: syncthing 
Version: 0.13.4+dfsg1-1 
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: locale
X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org

Hi,

While working on the "reproducible builds" effort [1], we have noticed
that syncthing could not be built reproducibly.

genassets.go embeds a timestamp of the localtime to a source code file
generated during the build.

The attached patch fixes this replacing the local timestamp by
SOURCE_DATE_EPOCH if defined. Once applied, syncthing can be built
reproducibly in our current experimental framework.

 [1]: https://wiki.debian.org/ReproducibleBuilds

Regards,
-- 
Dhole
diff -Nru syncthing-0.13.4+dfsg1/debian/changelog 
syncthing-0.13.4+dfsg1/debian/changelog
--- syncthing-0.13.4+dfsg1/debian/changelog     2016-06-01 16:29:56.000000000 
+0200
+++ syncthing-0.13.4+dfsg1/debian/changelog     2016-06-29 15:50:58.000000000 
+0200
@@ -1,3 +1,10 @@
+syncthing (0.13.4+dfsg1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Use SOURCE_DATE_EPOCH as embedded timestamp by genassets.go if defined.
+
+ -- Eduard Sanou <dh...@openmailbox.org>  Wed, 29 Jun 2016 15:49:38 +0200
+
 syncthing (0.13.4+dfsg1-1) unstable; urgency=medium
 
   * Added missing CC-BY-SA-4.0 section in d/copyright
diff -Nru syncthing-0.13.4+dfsg1/debian/patches/series 
syncthing-0.13.4+dfsg1/debian/patches/series
--- syncthing-0.13.4+dfsg1/debian/patches/series        2016-06-01 
16:29:56.000000000 +0200
+++ syncthing-0.13.4+dfsg1/debian/patches/series        2016-06-29 
15:51:12.000000000 +0200
@@ -1,2 +1,3 @@
 use-packaged-gateway.patch
 genxdr-command.patch
+use-SOURCE_DATE_EPOCH.patch
diff -Nru syncthing-0.13.4+dfsg1/debian/patches/use-SOURCE_DATE_EPOCH.patch 
syncthing-0.13.4+dfsg1/debian/patches/use-SOURCE_DATE_EPOCH.patch
--- syncthing-0.13.4+dfsg1/debian/patches/use-SOURCE_DATE_EPOCH.patch   
1970-01-01 01:00:00.000000000 +0100
+++ syncthing-0.13.4+dfsg1/debian/patches/use-SOURCE_DATE_EPOCH.patch   
2016-06-29 15:52:18.000000000 +0200
@@ -0,0 +1,46 @@
+Description: Use SOURCE_DATE_EPOCH in genassets.go
+ Use SOURCE_DATE_EPOCH if defined as the embedded timestamp by genassets.go to
+ make the generated file reproducible.
+Author: Eduard Sanou <dh...@openmailbox.org>
+
+--- syncthing-0.13.4+dfsg1.orig/script/genassets.go
++++ syncthing-0.13.4+dfsg1/script/genassets.go
+@@ -13,11 +13,13 @@ import (
+       "compress/gzip"
+       "encoding/base64"
+       "flag"
++      "fmt"
+       "go/format"
+       "io"
+       "net/http"
+       "os"
+       "path/filepath"
++      "strconv"
+       "strings"
+       "text/template"
+       "time"
+@@ -93,10 +95,23 @@ func main() {
+       flag.Parse()
+ 
+       filepath.Walk(flag.Arg(0), walkerFor(flag.Arg(0)))
++
++      source_date_epoch := os.Getenv("SOURCE_DATE_EPOCH")
++      var build_date string
++      if source_date_epoch == "" {
++              build_date = time.Now().UTC().Format(http.TimeFormat)
++      } else {
++              sde, err := strconv.ParseInt(source_date_epoch, 10, 64)
++              if err != nil {
++                      panic(fmt.Sprintf("Invalid SOURCE_DATE_EPOCH: %s", err))
++              }
++              build_date = time.Unix(sde, 0).UTC().Format(http.TimeFormat)
++      }
++
+       var buf bytes.Buffer
+       tpl.Execute(&buf, templateVars{
+               Assets:    assets,
+-              BuildDate: time.Now().UTC().Format(http.TimeFormat),
++              BuildDate: build_date,
+       })
+       bs, err := format.Source(buf.Bytes())
+       if err != nil {

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message ---
Source: syncthing
Source-Version: 0.13.9+dfsg1-2

We believe that the bug you reported is fixed in the latest version of
syncthing, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 828...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Nicolas Braud-Santoni <nico...@braud-santoni.eu> (supplier of updated syncthing 
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Wed, 29 Jun 2016 23:13:55 +0200
Source: syncthing
Binary: golang-github-syncthing-syncthing-dev syncthing
Architecture: source all amd64
Version: 0.13.9+dfsg1-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Go Packaging Team 
<pkg-go-maintainers@lists.alioth.debian.org>
Changed-By: Nicolas Braud-Santoni <nico...@braud-santoni.eu>
Description:
 golang-github-syncthing-syncthing-dev - decentralized file synchronization - 
dev package
 syncthing  - decentralized file synchronization
Closes: 828808 828994
Changes:
 syncthing (0.13.9+dfsg1-2) unstable; urgency=medium
 .
   * Team upload.
   * Import upstream patches
     - Remove the TestGithubRelease test (Closes: #828808)
     - Honor SOURCE_DATE_EPOCH when set  (Closes: #828994)
   * Fix typos in messages and manpages
Checksums-Sha1:
 025d6327af6189cd820925e018478b522bcc917b 2856 syncthing_0.13.9+dfsg1-2.dsc
 08392def5be6f9ec2c0ac2928e084cf1cb7e478c 24692 
syncthing_0.13.9+dfsg1-2.debian.tar.xz
 bdc9f128ebed9603f704489c6805950b9c4b20f7 2264644 
golang-github-syncthing-syncthing-dev_0.13.9+dfsg1-2_all.deb
 e332f87875e7f7aa28e5af0fe1d007540a269826 3577298 
syncthing_0.13.9+dfsg1-2_amd64.deb
Checksums-Sha256:
 2c29faf4d96e97d5f1453312596de54ffc001a5dc33dcbe6665cc8f7b7858d21 2856 
syncthing_0.13.9+dfsg1-2.dsc
 5d92771c3b9c5aaaf79a1a9870b158e8f4d66b9e8a36c881bf8d9b2982f35396 24692 
syncthing_0.13.9+dfsg1-2.debian.tar.xz
 285ca30b7422aa8ce56ce622e9a84d522808c705e03109b39b56fdb6aa74a1d8 2264644 
golang-github-syncthing-syncthing-dev_0.13.9+dfsg1-2_all.deb
 1708c51d8cac417d306369c8905f17df1e602a50d020863e95e790aa0779b2ed 3577298 
syncthing_0.13.9+dfsg1-2_amd64.deb
Files:
 3423b58e36ad2248eba4c7255f4d12bf 2856 devel extra syncthing_0.13.9+dfsg1-2.dsc
 33572966dfc1757b9fb7cf1c3be90b56 24692 devel extra 
syncthing_0.13.9+dfsg1-2.debian.tar.xz
 3cefa61e3871b5f5880b31474ad8a13e 2264644 devel extra 
golang-github-syncthing-syncthing-dev_0.13.9+dfsg1-2_all.deb
 87e679e25e389d9f67ede9e5b4eb8cd3 3577298 devel extra 
syncthing_0.13.9+dfsg1-2_amd64.deb

-----BEGIN PGP SIGNATURE-----

iQIcBAEBCgAGBQJXdEpwAAoJENqCgw48zDo6RY8P/jp6RgtFIKVvUa6A+GUIyMUl
xCEQdf90lBQBQ7Dd1Xgy8tPnfl9nkwJZO5IHH+oX1R/k9wxX1vbOc600hXCJbZ5H
N2E81La0rhNCkZ0+vnwJ/gcfQIbZEYn/JLe+nf4uYmqua3ZH29c3nVkY+y8Ngaui
w0t+DCDTcQ18bzxda6L7ToGkLBVyW4ox1LWUW/hJrRuc6SbsrFXdRLTRnbjjDG8t
A8U5d5QtGbUnuwlWMrxoTPYCkOSdxd6dmENNAIa6XaRYh+IjIQWRNTy/r4obw8aw
IC5RdT8uRztnBvsVSB0lKBu2R7aZ1mOJ0Pxce/xkF4Owgl3bq8oKbF+wcyupCcP1
lj9oojoVwsUTOwYfu+idh0Fv+zUlarwuf9ZqzcKz4w8jIOBvw/DveDHSYg1D4+Ha
i9wiA3O1BVke5VetU6otGvrLsdStRsht3qP1UoqsW6wNYdJZdTBeB4s3ijRLguTP
eLKDBQbSOis+E8HpQtqIDpUGSu8w2monVbLg9zb2a076zwb5YjAtfz+0jYpWyK7w
cJACwADxdabJPlqK2G8x5Kpv92+pQ5ZYhFwc9SNF2BkvdGLR3Z2Bi2LbsokY9smk
exES4ETi1ObD4mR1Jw9t1+lxn9EJ+ReHsISuxIn7rSaU3HguRab5Gyb6FEaMaP3u
4/2BRsjeE6PcPMhiYHW7
=5c1h
-----END PGP SIGNATURE-----

--- End Message ---
_______________________________________________
Pkg-go-maintainers mailing list
Pkg-go-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-go-maintainers

Reply via email to