Lintian Fixes - openssh-ssh1

Ready changes

Merge these changes:

git pull https://janitor.debian.net/git/openssh-ssh1 lintian-fixes

Summary

Diff

=== modified file 'debian/changelog'
--- a/debian/changelog	2019-08-03 11:50:07 +0000
+++ b/debian/changelog	2020-02-15 16:36:46 +0000
@@ -1,7 +1,20 @@
 openssh-ssh1 (1:7.5p1-12) UNRELEASED; urgency=medium
 
+  [ Colin Watson ]
   * Use debhelper-compat instead of debian/compat.
 
+  [ Debian Janitor ]
+  * Trim trailing whitespace.
+  * Use secure copyright file specification URI.
+  * Wrap long lines in changelog entries: 1:5.7p1-1, 1:5.3p1-1, 1:5.2p1-
+    1, 1:2.9p2-4, 1:2.5.2p2-1.
+  * Use secure URI in Homepage field.
+  * Bump debhelper from old 9 to 12.
+  * Set upstream metadata fields: Contact, Name.
+  * Drop unnecessary dependency on dh-autoreconf.
+  * Fix day-of-week for changelog entries 1:3.0.2p1-9, 1:3.0.2p1-2,
+    1:3.0.1p1-1.
+
  -- Colin Watson <cjwatson@debian.org>  Sat, 03 Aug 2019 12:49:54 +0100
 
 openssh-ssh1 (1:7.5p1-11) unstable; urgency=medium
@@ -2214,7 +2227,7 @@
         its effective configuration to stdout and exit. Extended test mode
         also supports the specification of connection parameters (username,
         source address and hostname) to test the application of
-        sshd_config(5) Match rules. 
+        sshd_config(5) Match rules.
       + ssh(1) now prints the number of bytes transferred and the overall
         connection throughput for SSH protocol 2 sessions when in verbose
         mode (previously these statistics were displayed for protocol 1
@@ -2874,7 +2887,7 @@
 openssh (1:4.3p2-5.1) unstable; urgency=low
 
   * NMU to update SELinux patch, bringing it in line with current selinux
-    releases.  The patch for this NMU is simply the Bug#394795 patch, 
+    releases.  The patch for this NMU is simply the Bug#394795 patch,
     and no other changes.                       (closes: #394795)
 
  -- Manoj Srivastava <srivasta@debian.org>  Mon,  23 Oct 2006 14:11:24 -0500
@@ -3951,8 +3964,8 @@
   * save old sshd_configs to sshd_config.dpkg-old when auto-generating a
     new one
   * tell/ask the user about PriviledgeSeparation
-  * /etc/init.d/ssh run will now create the chroot empty dir if necessary 
-  * Remove our previous statoverride on /usr/bin/ssh (only for people 
+  * /etc/init.d/ssh run will now create the chroot empty dir if necessary
+  * Remove our previous statoverride on /usr/bin/ssh (only for people
     upgrading from a version where we'd put one in ourselves!)
   * Stop slandering Russia, since someone asked so nicely (Closes: #148951)
   * Reduce the sleep time in /etc/init.d/ssh during a restart
@@ -4008,12 +4021,12 @@
 
   * Thanks to those who NMUd
   * The only change in this version is to debian/control - I've removed
-    the bit that says you can't export it from the US - it would look 
+    the bit that says you can't export it from the US - it would look
     pretty daft to say this about a package in main! Also, it's now OK
     to use crypto in France, so I've edited that comment slightly
   * Correct a path in README.Debian too (Closes: #138634)
 
- -- Matthew Vernon <matthew@debian.org>  Sun,  4 Apr 2002 09:52:59 +0100
+ -- Matthew Vernon <matthew@debian.org>  Thu, 04 Apr 2002 09:52:59 +0100
 
 openssh (1:3.0.2p1-8.3) unstable; urgency=medium
 
@@ -4045,8 +4058,8 @@
 openssh (1:3.0.2p1-8) unstable; urgency=critical
 
   * Security fix - patch from upstream (Closes: #137209, #137210)
-  * Undo the changes in the unreleased -7, since they appear to break 
-    things here. Accordingly, the code change is minimal, and I'm 
+  * Undo the changes in the unreleased -7, since they appear to break
+    things here. Accordingly, the code change is minimal, and I'm
     happy to get it into testing ASAP
 
  -- Matthew Vernon <matthew@debian.org>  Thu,  7 Mar 2002 14:25:23 +0000
@@ -4072,7 +4085,7 @@
 
 openssh (1:3.0.2p1-4) unstable; urgency=medium
 
-  * If we're asked to not run sshd, stop any running sshd's first 
+  * If we're asked to not run sshd, stop any running sshd's first
     (Closes: #129327)
 
  -- Matthew Vernon <matthew@debian.org>  Wed, 16 Jan 2002 21:24:16 +0000
@@ -4087,11 +4100,11 @@
 
 openssh (1:3.0.2p1-2) unstable; urgency=high
 
-  * Fix postinst to not automatically overwrite sshd_config (!) 
+  * Fix postinst to not automatically overwrite sshd_config (!)
     (Closes: #127842, #127867)
   * Add section in README.Debian about the PermitRootLogin setting
 
- -- Matthew Vernon <matthew@debian.org>  Sat,  5 Jan 2003 05:26:30 +0000
+ -- Matthew Vernon <matthew@debian.org>  Sun, 05 Jan 2003 05:26:30 +0000
 
 openssh (1:3.0.2p1-1) unstable; urgency=high
 
@@ -4100,7 +4113,7 @@
   * Capitalise IETF (Closes: #125379)
   * Refer to the correct sftp-server location (Closes: #126854, #126224)
   * Do what we're asked re SetUID ssh (Closes: #124065, #124154, #123247)
-  * Ask people upgrading from potato if they want a new conffile 
+  * Ask people upgrading from potato if they want a new conffile
     (Closes: #125642)
   * Fix a typo in postinst (Closes: #122192, #122410, #123440)
   * Frob the default config a little (Closes: #122284, #125827, #125696,
@@ -4144,7 +4157,7 @@
   * Experimental smartcard support not enabled, since I have no way of
     testing it.
 
- -- Matthew Vernon <matthew@debian.org>  Thu, 28 Nov 2001 17:43:01 +0000
+ -- Matthew Vernon <matthew@debian.org>  Wed, 28 Nov 2001 17:43:01 +0000
 
 openssh (1:2.9p2-6) unstable; urgency=low
 
@@ -4168,7 +4181,7 @@
   * patch from Peter Benie to DTRT wrt X forwarding if the server refuses
     us access (Closes: #48297)
   * patch from upstream CVS to fix port forwarding (Closes: #107132)
-  * patch from Jonathan Amery to document ssh-keygen behaviour 
+  * patch from Jonathan Amery to document ssh-keygen behaviour
     (Closes:#106643, #107512)
   * patch to postinst from Jonathan Amery (Closes: #106411)
   * patch to manpage from Jonathan Amery (Closes: #107364)
@@ -4177,7 +4190,7 @@
   * patch from Ian Jackson to cause us to destroy a file when we scp it
     onto itself, rather than dumping bits of our memory into it, which was
     a security hole (see #51955)
-  * patch from Jonathan Amery to document lack of Kerberos support 
+  * patch from Jonathan Amery to document lack of Kerberos support
     (Closes: #103726)
   * patch from Matthew Vernon to make the 'waiting for connections to
     terminate' message more helpful (Closes: #50308)
@@ -4187,7 +4200,8 @@
 openssh (1:2.9p2-4) unstable; urgency=high
 
   * Today's build of ssh is strawberry flavoured
-  * Patch from mhp to reduce length of time sshd is stopped for (Closes: #106176)
+  * Patch from mhp to reduce length of time sshd is stopped for
+    (Closes: #106176)
   * Tidy up debconf template (Closes: #106152)
   * If called non-setuid, then setgid()'s failure should not be fatal (see
     #105854)
@@ -4238,9 +4252,9 @@
  -- Matthew Vernon <matthew@debian.org>  Thu, 28 Jun 2001 23:15:42 +0100
 
 openssh (1:2.5.2p2-2.1) unstable; urgency=low
- 
+
   * NMU
-  * Remove duplicate Build-Depends for libssl096-dev and change it to 
+  * Remove duplicate Build-Depends for libssl096-dev and change it to
     depend on libssl-dev instaed.  Also adding in virtual | real package
     style build-deps.  (Closes: #93793, #75228)
   * Removing add-log entry (Closes: #79266)
@@ -4258,7 +4272,7 @@
   * postinst bugs fixed (Closes: #88057, #88066, #88196, #88405, #88612)
     (Closes: #88774, #88196, #89556, #90123, #90228, #90833, #87814, #85465)
   * Adding in debconf dependency
- 
+
  -- Ivan E. Moore II <rkrusty@debian.org>  Mon, 16 Apr 2001 14:11:04 +0100
 
 openssh (1:2.5.2p2-2) unstable; urgency=high
@@ -4271,7 +4285,8 @@
 openssh (1:2.5.2p2-1) unstable; urgency=low
 
   * New upstream release
-  * removed make-ssh-known-hosts, since ssh-keyscan does that job (closes: #86069, #87748)
+  * removed make-ssh-known-hosts, since ssh-keyscan does that job (closes:
+    #86069, #87748)
   * fix double space indent in german templates (closes: #89493)
   * make postinst check for ssh_host_rsa_key
   * get rid of the last of the misguided debian/rules NMU debris  :-/
@@ -4284,7 +4299,7 @@
   * fix broken dpkg-statoverride test in postinst
     (closes: #89612, #90474, #90460, #89605)
   * NMU bug fixed but not closed in last upload  (closes: #88206)
-  
+
  -- Philip Hands <phil@hands.com>  Fri, 23 Mar 2001 16:11:33 +0000
 
 openssh (1:2.5.1p2-1) unstable; urgency=high
@@ -4314,7 +4329,7 @@
 
 openssh (1:2.5.1p1-1.6) unstable; urgency=high
 
-  * Fixes postinst to handle overrides that are already there. Damn, I 
+  * Fixes postinst to handle overrides that are already there. Damn, I
     should have noticed the bug earlier.
 
  -- Christian Kurz <shorty@debian.org>  Wed, 28 Feb 2001 22:35:00 +0100
@@ -4342,7 +4357,7 @@
 openssh (1:2.5.1p1-1.2) unstable; urgency=low
 
   * Added Conflict with sftp, since we now provide our own sftp-client.
-  * Added a fix for our broken dpkg-statoverride call in the 
+  * Added a fix for our broken dpkg-statoverride call in the
     2.3.0p1-13.
   * Fixed some config pathes in the comments of sshd_config.
   * Removed ssh-key-exchange-vulnerability-patch since it's not needed
@@ -4386,7 +4401,7 @@
 openssh (1:2.3.0p1-1.12) unstable; urgency=high
 
   * Added suggest for xbase-clients to control-file. (Closes #85227)
-  * Applied patch from Markus Friedl to fix a vulnerability in 
+  * Applied patch from Markus Friedl to fix a vulnerability in
     the rsa keyexchange.
   * Fixed position of horizontal line. (Closes: #83613)
   * Fixed hopefully the grep problem in the config-file. (Closes: #78802)
@@ -4475,28 +4490,28 @@
   * Update Build-Depends to point to new libssl096.
   * This upstream release doesn't leak any information depending
     on the setting of PermitRootLogin (Closes: #59933)
-  * New upstream release contains fix against forcing a client to 
+  * New upstream release contains fix against forcing a client to
     do X/agent forwarding (Closes: #76788)
-  * Changed template to contain correct path to the documentation 
+  * Changed template to contain correct path to the documentation
     (Closes: #67245)
-  * Added --with-4in6 switch as compile option into debian/rules.	
-  * Added --with-ipv4-default as compile option into debian/rules. 
+  * Added --with-4in6 switch as compile option into debian/rules.
+  * Added --with-ipv4-default as compile option into debian/rules.
     (Closes: #75037)
-  * Changed default path to also contain /usr/local/bin and 
+  * Changed default path to also contain /usr/local/bin and
     /usr/X11R6/bin (Closes: #62472,#54567,#62810)
   * Changed path to sftp-server in sshd_config to match the
     our package (Closes: #68347)
-  * Replaced OpenBSDh with OpenBSD in the init-script.	
+  * Replaced OpenBSDh with OpenBSD in the init-script.
   * Changed location to original source in copyright.head
   * Changed behaviour of init-script when invoked with the option
     restart (Closes: #68706,#72560)
-  * Added a note about -L option of scp to README.Debian	
+  * Added a note about -L option of scp to README.Debian
   * ssh won't print now the motd if invoked with -t option
     (Closes: #59933)
-  * RFC.nroff.gz get's now converted into RFC.gz. (Closes: #63867)	
-  * Added a note about tcp-wrapper support to README.Debian 
+  * RFC.nroff.gz get's now converted into RFC.gz. (Closes: #63867)
+  * Added a note about tcp-wrapper support to README.Debian
     (Closes: #72807,#22190)
-  * Removed two unneeded options from building process.	
+  * Removed two unneeded options from building process.
   * Added sshd.pam into debian dir and install it.
   * Commented out unnecessary call to dh_installinfo.
   * Added a line to sshd.pam so that limits will be paid attention
@@ -4509,10 +4524,10 @@
     (Closes: #51747)
   * scp should now have no more problems with shell-init-files that
     produces ouput (Closes: #56280,#59873)
-  * ssh now prints the motd correctly (Closes: #66926)	
+  * ssh now prints the motd correctly (Closes: #66926)
   * ssh upgrade should disable ssh daemon only if users has choosen
     to do so (Closes: #67478)
-  * ssh can now be installed suid (Closes: #70879)	
+  * ssh can now be installed suid (Closes: #70879)
   * Modified debian/rules to support hurd.
 
  -- Christian Kurz <shorty@debian.org>  Wed, 27 Dec 2000 20:06:57 +0100
@@ -4569,7 +4584,7 @@
     (closes: #64424, #66437, #66859)  *RC*
   * typos in config (closes: #66779, #66780)
   * sshd_not_to_be_run could be assumed to be true, in error, if the config
-    script died in an unusual way --- I've reversed this (closes: #66335)  
+    script died in an unusual way --- I've reversed this (closes: #66335)
   * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to ssh-askpass-ptk
     (closes: #65981)
   * change default for PermitRootLogin to "no" (closes: #66406)
@@ -4632,7 +4647,7 @@
 openssh (1:1.2.3-3) frozen unstable; urgency=low
 
   * redirect sshd's file descriptors to /dev/null in init to
-    prevent debconf from locking up during installation 
+    prevent debconf from locking up during installation
     ** grave bug just submited by me **
 
  -- Philip Hands <phil@hands.com>  Thu, 20 Apr 2000 17:10:59 +0100
@@ -4680,7 +4695,7 @@
   * Moved setting upgrade_to_openssh isdefault flag to the place
     where preinst would abort. This means no double question to most
     users, people who currently suffer from "can't upgrade" may need
-    to run apt-get install ssh twice. Did not do the same for 
+    to run apt-get install ssh twice. Did not do the same for
     use_old_init_script, as the situation is a bit different, and
     less common (closes: #54010, #56224)
   * Check for existance of ssh-keygen before attempting to use it in
@@ -4717,7 +4732,7 @@
   * Non-maintainer upload.
   * Integrated scp pipe buffer patch from Ben Collins
     <benc@debian.org>, should now work even if reading
-    a pipe gives less than fstat st_blksize bytes. 
+    a pipe gives less than fstat st_blksize bytes.
     Should now work on Alpha and Sparc Linux (closes: #53697, #52071)
   * Made ssh depend on libssl09 (>= 0.9.4-3) (closes: #51393)
   * Integrated patch from Ben Collins <benc@debian.org>
@@ -4737,7 +4752,7 @@
   * patch SSHD_PAM_SERVICE back into auth-pam.c, again :-/
     (closes: #49902, #55872, #56959)
   * uncoment the * line in ssh_config (closes: #56444)
-  
+
   * #54894 & #49902 are release critical, so this should go in frozen
 
  -- Philip Hands <phil@hands.com>  Wed,  9 Feb 2000 04:52:04 +0000
@@ -4843,7 +4858,7 @@
 
   * use pam patch from Ben Collins <bcollins@debian.org>
   * add slogin symlink to Makefile.in
-  * change /usr/bin/login to LOGIN_PROGRAM define of /bin/login 
+  * change /usr/bin/login to LOGIN_PROGRAM define of /bin/login
   * sort out debconf usage
   * patch from Tommi Virtanen <tv@debian.org>'s makes ssh-add use ssh-askpass
 

=== modified file 'debian/control'
--- a/debian/control	2019-08-03 11:50:07 +0000
+++ b/debian/control	2020-02-15 16:36:19 +0000
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
 Build-Depends: autotools-dev,
-               debhelper-compat (= 9),
-               dh-autoreconf,
+               debhelper-compat (= 12),
                dh-exec,
                dpkg-dev (>= 1.16.1~),
                libpam0g-dev | libpam-dev,
@@ -14,7 +13,7 @@
 Standards-Version: 3.9.8
 Uploaders: Colin Watson <cjwatson@debian.org>,
            Matthew Vernon <matthew@debian.org>,
-Homepage: http://www.openssh.com/
+Homepage: https://www.openssh.com/
 Vcs-Git: https://salsa.debian.org/ssh-team/openssh-ssh1.git
 Vcs-Browser: https://salsa.debian.org/ssh-team/openssh-ssh1
 

=== modified file 'debian/copyright'
--- a/debian/copyright	2017-06-18 11:08:41 +0000
+++ b/debian/copyright	2020-02-15 16:33:57 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OpenSSH
 Upstream-Contact: openssh-unix-dev@mindrot.org
 Source: http://www.openssh.com/portable.html

=== modified file 'debian/rules'
--- a/debian/rules	2018-10-27 20:29:41 +0000
+++ b/debian/rules	2020-02-15 16:36:19 +0000
@@ -63,7 +63,7 @@
 confflags += --with-ldflags='$(strip -Wl,--as-needed $(LDFLAGS))'
 
 %:
-	dh $@ --with=autoreconf
+	dh $@
 
 autoreconf:
 	autoreconf -f -i
@@ -85,10 +85,10 @@
 
 override_dh_auto_install:
 
-override_dh_install:
-	dh_install --fail-missing
-
 # Tighten libssl dependencies to match the check in entropy.c.
 override_dh_shlibdeps:
 	dh_shlibdeps
 	debian/adjust-openssl-dependencies
+
+override_dh_missing:
+	dh_missing --fail-missing

=== added file 'debian/upstream/metadata'
--- a/debian/upstream/metadata	1970-01-01 00:00:00 +0000
+++ b/debian/upstream/metadata	2020-02-15 16:35:52 +0000
@@ -0,0 +1,2 @@
+Name: OpenSSH
+Contact: openssh-unix-dev@mindrot.org

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/60/5717fb6e33f2821666df5e6faf571185f10f38.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/83/dc04fcd150a339f93566f3e3be10994eb0d995.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/c1/ff9856e69b65d3e90317f241311dd45f7f6307.debug
-rw-r--r--  root/root   /usr/lib/debug/.dwz/x86_64-linux-gnu/openssh-client-ssh1.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/34/fd1f013bd885cb99545834b42aba65cbf8e83f.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/9e/45318b34efbaf68051169404161df7e12ce95d.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/c1/9d8f56e05c8989082d5c9acd9d851b6215585e.debug

Control files of package openssh-client-ssh1: lines which differ (wdiff format)

  • Homepage: http://www.openssh.com/ https://www.openssh.com/

Control files of package openssh-client-ssh1-dbgsym: lines which differ (wdiff format)

  • Build-Ids: 34fd1f013bd885cb99545834b42aba65cbf8e83f 9e45318b34efbaf68051169404161df7e12ce95d c19d8f56e05c8989082d5c9acd9d851b6215585e 605717fb6e33f2821666df5e6faf571185f10f38 83dc04fcd150a339f93566f3e3be10994eb0d995 c1ff9856e69b65d3e90317f241311dd45f7f6307

Run locally

Try this locally (using the lintian-brush package):

debcheckout openssh-ssh1
cd openssh-ssh1
lintian-brush

More details

Full run details