Lintian Fixes - tftp-hpa

Ready changes

Merge these changes:

git pull https://janitor.debian.net/git/tftp-hpa lintian-fixes

Summary

Diff

=== modified file 'debian/changelog'
--- a/debian/changelog	2015-08-08 04:50:30 +0000
+++ b/debian/changelog	2019-12-24 02:43:16 +0000
@@ -1,3 +1,16 @@
+tftp-hpa (5.2+20150808-2) UNRELEASED; urgency=medium
+
+  * Use secure copyright file specification URI.
+  * Add missing ${misc:Depends} to Depends for tftp-hpa, tftp-hpa-dbg.
+  * Transition to automatic debug package (from: tftp-hpa-dbg).
+  * Use secure URI in Homepage field.
+  * Bump debhelper from old 9 to 12.
+  * Set debhelper-compat version in Build-Depends.
+  * Change priority extra to priority optional.
+  * Rely on pre-initialized dpkg-architecture variables.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 24 Dec 2019 02:40:36 +0000
+
 tftp-hpa (5.2+20150808-1) unstable; urgency=medium
 
   * Canonicalize all the addresses.  This avoids the situation of trying to

=== removed file 'debian/compat'
--- a/debian/compat	2012-03-14 06:59:35 +0000
+++ b/debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-9

=== modified file 'debian/control'
--- a/debian/control	2018-04-22 19:34:35 +0000
+++ b/debian/control	2019-12-24 02:42:53 +0000
@@ -1,16 +1,16 @@
 Source: tftp-hpa
 Section: net
-Priority: extra
+Priority: optional
 Maintainer: Ron Lee <ron@debian.org>
-Build-Depends: debhelper (>= 9), autoconf, autotools-dev, libwrap0-dev, po-debconf
+Build-Depends: debhelper-compat (= 12), autoconf, autotools-dev, libwrap0-dev, po-debconf
 Standards-Version: 3.9.6.1
-Homepage: http://git.kernel.org/cgit/network/tftp/tftp-hpa.git
+Homepage: https://git.kernel.org/cgit/network/tftp/tftp-hpa.git
 Vcs-Git: https://salsa.debian.org/ron/tftp-hpa.git
 Vcs-Browser: https://salsa.debian.org/ron/tftp-hpa
 
 Package: tftp-hpa
 Architecture: linux-any kfreebsd-any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: tftp
 Description: HPA's tftp client
  Trivial File Transfer Protocol (TFTP) is a file transfer protocol, mainly to
@@ -21,20 +21,6 @@
  .
  This package contains the client.
 
-Package: tftp-hpa-dbg
-Section: debug
-Priority: extra
-Architecture: linux-any kfreebsd-any
-Depends: tftp-hpa (= ${binary:Version}), tftpd-hpa (= ${binary:Version})
-Description: HPA's tftp (debug)
- Trivial File Transfer Protocol (TFTP) is a file transfer protocol, mainly to
- serve boot images over the network to other machines (PXE).
- .
- tftp-hpa is an enhanced version of the BSD TFTP client and server. It
- possesses a number of bugfixes and enhancements over the original.
- .
- This package contains the debugging symbols for both the client and the server.
-
 Package: tftpd-hpa
 Architecture: linux-any kfreebsd-any
 Depends: ${shlibs:Depends}, adduser, ${misc:Depends}

=== modified file 'debian/copyright'
--- a/debian/copyright	2014-07-30 13:36:58 +0000
+++ b/debian/copyright	2019-12-24 02:40:45 +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: tftp-hpa
 Upstream-Contact: syslinux@zytor.com
 Source: git://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git

=== modified file 'debian/rules'
--- a/debian/rules	2014-07-30 13:36:58 +0000
+++ b/debian/rules	2019-12-24 02:43:16 +0000
@@ -10,8 +10,7 @@
 PARALLEL = $(subst parallel=,,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 NJOBS    = -j$(or $(PARALLEL),$(NUM_CPUS),1)
 
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/dpkg/architecture.mk
 
 
 clean:
@@ -68,7 +67,7 @@
 	dh_installchangelogs
 	dh_installdocs
 	dh_installdebconf
-	dh_strip --dbg-package=tftp-hpa-dbg
+	dh_strip --dbgsym-migration='tftp-hpa-dbg (<< 5.2+20150808-2~)'
 	dh_compress
 	dh_fixperms
 	dh_installdeb

=== added file 'debian/tftpd-hpa.maintscript'
--- a/debian/tftpd-hpa.maintscript	1970-01-01 00:00:00 +0000
+++ b/debian/tftpd-hpa.maintscript	2019-12-24 02:42:11 +0000
@@ -0,0 +1,1 @@
+rm_conffile /etc/init/tftpd-hpa.conf 5.2+20150808-2

=== removed file 'debian/tftpd-hpa.upstart'
--- a/debian/tftpd-hpa.upstart	2014-05-04 13:16:55 +0000
+++ b/debian/tftpd-hpa.upstart	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-description	"tftp-hpa server"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-expect fork
-respawn
-
-env DEFAULTS="/etc/default/tftpd-hpa"
-env PIDFILE="/var/run/tftpd-hpa.pid"
-
-pre-start script
-	if [ -f ${DEFAULTS} ]
-	then
-		. ${DEFAULTS}
-	fi
-
-	# Ensure --secure and multiple server directories are not used at the
-	# same time
-	if [ "$(echo ${TFTP_DIRECTORY} | wc -w)" -ge 2 ] && echo ${TFTP_OPTIONS} | grep -qs secure
-	then
-		echo
-		echo "When --secure is specified, exactly one directory can be specified."
-		echo "Please correct your /etc/default/tftpd-hpa."
-
-		stop
-		exit 0
-	fi
-
-	# Ensure server directories are existing
-	for _DIRECTORY in ${TFTP_DIRECTORY}
-	do
-		if [ ! -d "${_DIRECTORY}" ]
-		then
-			echo "${_DIRECTORY} missing, aborting."
-
-			stop
-			exit 0
-		fi
-	done
-
-end script
-
-script
-	if [ -f ${DEFAULTS} ]
-	then
-		. ${DEFAULTS}
-	fi
-
-	exec /usr/sbin/in.tftpd --listen  --user ${TFTP_USERNAME} --address ${TFTP_ADDRESS} ${TFTP_OPTIONS} ${TFTP_DIRECTORY}
-end script

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/6e/141d16a06d7ab30f7ae2cf420d7b1664977b73.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/dc/613ff47dc9d8d2a17818941c4d8b355ae6303b.debug
-rwxr-xr-x  root/root   DEBIAN/preinst
lrwxrwxrwx  root/root   /usr/share/doc/tftp-hpa-dbgsym -> tftp-hpa
lrwxrwxrwx  root/root   /usr/share/doc/tftpd-hpa-dbgsym -> tftpd-hpa

Files in first set of .debs but not in second

-rw-r--r--  root/root   /etc/init/tftpd-hpa.conf
-rw-r--r--  root/root   /usr/lib/debug/.build-id/14/ecd66ebea545086bacc8719f884e41c2eddd1d.debug
-rw-r--r--  root/root   /usr/lib/debug/.build-id/24/1c8ce96b3c7a4fce599c730921a716302c5e94.debug
-rw-r--r--  root/root   /usr/share/doc/tftp-hpa-dbg/changelog.Debian.gz
-rw-r--r--  root/root   /usr/share/doc/tftp-hpa-dbg/changelog.gz
-rw-r--r--  root/root   /usr/share/doc/tftp-hpa-dbg/copyright

Control files of package tftp-hpa: lines which differ (wdiff format)

  • Homepage: http://git.kernel.org/cgit/network/tftp/tftp-hpa.git https://git.kernel.org/cgit/network/tftp/tftp-hpa.git
  • Priority: extra optional

Control files of package tftpd-hpa: lines which differ (wdiff format)

  • Homepage: http://git.kernel.org/cgit/network/tftp/tftp-hpa.git https://git.kernel.org/cgit/network/tftp/tftp-hpa.git
  • Priority: extra optional

Failed fixers:

See the worker log for details.

Run locally

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

debcheckout tftp-hpa
cd tftp-hpa
lintian-brush

More details

Full run details