Browse Source

Packaging cleanup

- Re-write debian/copyright in format 1.0
- Declare compliance with policy 3.9.8
- Refresh patch queue, add missing DEP-3 headers
- Bump debhelper compat level to 10
- Enable full hardening build
- Update VCS-* header
- Fix typos
Christoph Biedl 5 years ago
parent
commit
b33220572d

+ 0 - 1
.gitignore

@@ -1 +0,0 @@
-.pc

+ 2 - 2
debian/aoetools.install

@@ -1,2 +1,2 @@
-debian/modules-load.d/aoetools.conf /usr/lib/modules-load.d/
-debian/60-aoe.rules /lib/udev/rules.d/
+debian/60-aoe.rules                 lib/udev/rules.d/
+debian/modules-load.d/aoetools.conf usr/lib/modules-load.d/

+ 2 - 2
debian/aoetools.links

@@ -1,2 +1,2 @@
-dev/null lib/systemd/system/aoetools.service
-usr/sbin/aoe-discover etc/network/if-up.d/aoe-discover
+usr/sbin/aoe-discover   etc/network/if-up.d/aoe-discover
+dev/null                lib/systemd/system/aoetools.service

+ 1 - 1
debian/changelog

@@ -30,7 +30,7 @@ aoetools (36-1) unstable; urgency=low
     - Added override to dh_auto_install, because we need everything in /sbin.
     - Stop restarting aoetools on upgrades.  This is the wrong thing, as we
       don't have a daemon or anything like that, because everything happends
-      inside the kernel once the devices are mounted.  We caused unnecesary
+      inside the kernel once the devices are mounted.  We caused unnecessary
       grief with it (closes: #568554).  I'm very sorry.
   * debian/watch: Added.
   * debian/patches:

+ 1 - 1
debian/compat

@@ -1 +1 @@
-9
+10

+ 8 - 7
debian/control

@@ -1,16 +1,17 @@
 Source: aoetools
-Section: admin
-Priority: optional
 Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Standards-Version: 3.9.5
 Homepage: http://aoetools.sf.net
-Build-Depends: debhelper (>> 9), dh-systemd
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/aoetools.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/aoetools.git
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/aoetools.git
+Vcs-Git: https://anonscm.debian.org/collab-maint/aoetools.git
+Build-Depends: debhelper (>> 10~),
+Priority: optional
+Section: admin
 
 Package: aoetools
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base
+Depends: ${misc:Depends}, ${shlibs:Depends},
+    lsb-base,
 Description: tools to assist in using ATA over Ethernet
  The aoetools are programs that assist in using ATA over Ethernet.  These
  tools are designed to work with the "aoe" driver for Linux 2.6+ kernels;

+ 27 - 25
debian/copyright

@@ -1,27 +1,29 @@
-This package was firstly debianized by David Martínez Moreno <ender@debian.org> on
-Sat, 23 Apr 2005 03:39:56 +0200.
-
-It was downloaded from http://aoetools.sf.net/
-
-Upstream Author: Ed L. Cashin <ecashin@coraid.com>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Ed L. Cashin <ecashin@coraid.com>
 
+Files: *
 Copyright: (C) 2007 by Coraid, Inc., Ed Cashin and Erik Quanstrom.
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+License: GPL-2.0-only
+
+Files:
+ debian/*
+Copyright:
+ 2003-2014 David Martínez Moreno <ender@debian.org>
+ 2016 Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+License: GPL-2.0-only
+
+License: GPL-2.0-only
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".

+ 0 - 2
debian/dirs

@@ -1,2 +0,0 @@
-/usr/share/initramfs-tools/hooks
-/usr/share/initramfs-tools/scripts/local-top

+ 6 - 9
debian/patches/01_no_bashisms.patch

@@ -1,12 +1,9 @@
-# 01_no_bashisms.patch
-# 
-# This patch avois calling directly to /bin/sh.
-#
-Index: aoetools-30/aoe-mkdevs
-===================================================================
---- aoetools-30.orig/aoe-mkdevs
-+++ aoetools-30/aoe-mkdevs
-@@ -56,6 +56,6 @@ export n_partitions
+Subject: This patch avois calling directly to /bin/sh.
+Author: David Martínez Moreno <ender@debian.org>
+
+--- a/aoe-mkdevs
++++ b/aoe-mkdevs
+@@ -56,6 +56,6 @@
  mkshelf=`echo $0 | sed 's!mkdevs!mkshelf!'`
  i=0
  while test $i -lt $n_shelves; do

+ 9 - 9
debian/patches/04_support_slash_run_slash_udev.patch

@@ -3,20 +3,20 @@ Description: Support the new /run/udev location for udev detection.
  transient state files, i.e. files containing run-time information
  that may or may not need to be written early in the boot process and
  which does not require preserving across reboots.
-
+ .
  A result of that change is that udev no longer uses /dev/ to store
  its runtime state file, i.e. the /dev/.udev/ directory, /dev/.udevdb
  and /dev/.udev.tdb are gone and udev uses /run/udev/ now.
 Author: Roger Leigh <rleigh@codelibre.net>
-Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=aoetools-run-udev.patch;att=1;bug=644308
-Bug-Debian: http://bugs.debian.org/644308
+Origin: other, https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=aoetools-run-udev.patch;att=1;bug=644308
+Bug-Debian: https://bugs.debian.org/644308
 Forwarded: no
 Reviewed-By: David Martínez Moreno <ender@debian.org>
 Last-Update: 2014-01-13
 
---- aoetools-36.orig/aoe-mkdevs
-+++ aoetools-36/aoe-mkdevs
-@@ -23,7 +23,7 @@ $zero: Exiting.
+--- a/aoe-mkdevs
++++ b/aoe-mkdevs
+@@ -23,7 +23,7 @@
  EOF
  	exit 1
  fi
@@ -25,9 +25,9 @@ Last-Update: 2014-01-13
  	cat 1>&2 <<EOF
  $zero Error: udev detected.  You shouldn't need to use $zero.
  $zero: Please see the aoe-mkdevs manpage.
---- aoetools-36.orig/aoe-mkshelf.in
-+++ aoetools-36/aoe-mkshelf.in
-@@ -18,7 +18,7 @@ $zero: Exiting.
+--- a/aoe-mkshelf.in
++++ b/aoe-mkshelf.in
+@@ -18,7 +18,7 @@
  EOF
  	exit 1
  fi

+ 34 - 0
debian/patches/fix-typos.patch

@@ -0,0 +1,34 @@
+Subject: Fix typos found by lintian
+Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+
+--- a/aoecfg.8
++++ b/aoecfg.8
+@@ -62,7 +62,7 @@
+ default to broadcast.
+ .TP
+ .B netif
+-specifiy the network interface.  The default is
++specify the network interface.  The default is
+ .IR eth0 .
+ .SH "SEE ALSO"
+ .IR aoe-discover (8),
+--- a/aoeping.8
++++ b/aoeping.8
+@@ -40,7 +40,7 @@
+ Issue an ATA "identify device" command after receiving the AoE
+ device's Config
+ Query response.  The "ident" response will be printed on standard
+-output as a hexidecimal dump.
++output as a hexadecimal dump.
+ .TP
+ \fB-I\fP
+ Issue an ATA "identify device" command after receiving the AoE
+@@ -50,7 +50,7 @@
+ .TP
+ \fB-v\fP
+ Turn on 
+-more copious output, including a hexidecimal dump of the Config Query
++more copious output, including a hexadecimal dump of the Config Query
+ response from the AoE device (see AoE spec at URL below).
+ .TP
+ \fB-s\fP

+ 1 - 0
debian/patches/series

@@ -2,3 +2,4 @@
 02_no_hyphen_in_manpages.patch
 03_enable_hardened_build.patch
 04_support_slash_run_slash_udev.patch
+fix-typos.patch

+ 3 - 4
debian/rules

@@ -1,15 +1,14 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@ --with systemd
 
 override_dh_auto_install:
 	$(MAKE) install PREFIX=debian/aoetools SBINDIR=debian/aoetools/sbin
-	install debian/hooks_aoe debian/aoetools/usr/share/initramfs-tools/hooks/aoe
-	install debian/local-top_aoe debian/aoetools/usr/share/initramfs-tools/scripts/local-top/aoe
+	install -D debian/hooks_aoe debian/aoetools/usr/share/initramfs-tools/hooks/aoe
+	install -D debian/local-top_aoe debian/aoetools/usr/share/initramfs-tools/scripts/local-top/aoe
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS