Source: ssh-tools
Version: 1.7-1
Severity: wishlist
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: environment
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org

Hi,

Whilst working on the Reproducible Builds effort [0] we noticed that
ssh-tools could not be built reproducibly.

This is because the manpage embeds the build user:

│ │ │ │ │  \fB\-l\fR user
│ │ │ │ │ -Try login with <user> as username. The default is $USER (pbuilder1).
│ │ │ │ │ +Try login with <user> as username. The default is $USER (pbuilder2).

I think this is actually wrong: the actual default is the *current*
value of $USER, not just what it happened to be there at build time.

Patch attached that corrects this, also making the build reproducible.

 [0] https://reproducible-builds.org/


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-
--- a/debian/patches/reproducible-builds.patch  1970-01-01 01:00:00.000000000 
+0100
--- b/debian/patches/reproducible-builds.patch  2021-11-01 09:09:53.230554937 
+0000
@@ -0,0 +1,15 @@
+Description: Make the build reproducible
+Author: Chris Lamb <la...@debian.org>
+Last-Update: 2021-11-01
+
+--- ssh-tools-1.7.orig/ssh-ping
++++ ssh-tools-1.7/ssh-ping
+@@ -90,7 +90,7 @@ cat << EOF
+         -h             Show this message
+         -i interval    Wait <interval> seconds between sending each request.
+                        The default is 1 second.
+-        -l user        Try login with <user> as username. The default is 
\$USER (${USER}).
++        -l user        Try login with <user> as username. The default is the 
current value of \$USER.
+         -D             Print timestamp (unix time + microseconds as in 
gettimeofday) before each line
+         -H             Print timestamp (human readable) before each line
+         -W timeout     Time to wait for a response, in seconds
--- a/debian/patches/series     1970-01-01 01:00:00.000000000 +0100
--- b/debian/patches/series     2021-11-01 09:09:51.702554279 +0000
@@ -0,0 +1 @@
+reproducible-builds.patch

Reply via email to