diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 19 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/ipmitool.ipmievd.default | 13 | ||||
| -rw-r--r-- | debian/ipmitool.lintian-overrides | 4 | ||||
| -rw-r--r-- | debian/ipmitool.maintscript | 1 | ||||
| -rw-r--r-- | debian/patches/0615-manpage_typo.patch | 49 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/systemd/ipmitool.ipmievd.service | 3 | ||||
| -rw-r--r-- | debian/tests/control | 3 | ||||
| -rw-r--r-- | debian/watch | 4 |
11 files changed, 86 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog index 8b8a3eb..4d4749e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +ipmitool (1.8.18-7) unstable; urgency=medium + + * debian/watch: Use tags instead releases to fix the wrong format. + * Migrate to debhelper 12: + - Change debian/compat to 12. + - Bump minimum debhelper version in debian/control to >= 12. + * Declare compliance with Debian Policy 4.4.0 (No changes needed). + * debian/control: Add missing Depend init_system_helpers to fix + lintan warning missing-versioned-depends-on-init-system-helpers. + * New debian/patches/0615-manpage_typo.patch: Fix typos in man pages. + * Add DEP 8 smoketest (Closes: #903676). + Thanks to "Dann Frazier" <dannf@debian.org>. + * Remove not longer needed debian/ipmitool.ipmievd.default (Closes: #907832). + - New debian/ipmitool.maintscript to remove /etc/default/ipmitool. + - Add IPMIEVD_OPTIONS from /etc/default/ipmitool into + debian/ipmitool.ipmievd.service. + + -- Jörg Frings-Fürst <debian@jff.email> Sat, 20 Jul 2019 10:59:12 +0200 + ipmitool (1.8.18-6) unstable; urgency=medium * debian/changelog: diff --git a/debian/compat b/debian/compat index b4de394..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/debian/control b/debian/control index 2b6d4c3..172d14f 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,13 @@ Section: utils Priority: optional Maintainer: Jörg Frings-Fürst <debian@jff.email> Build-Depends: - debhelper (>> 11), + debhelper (>> 12), + init-system-helpers (>> 1.50), libncurses-dev, libfreeipmi-dev [!hurd-i386], libreadline-dev, libssl-dev -Standards-Version: 4.1.5 +Standards-Version: 4.4.0 Vcs-Git: git://jff.email/opt/git/ipmitool.git Vcs-Browser: https://jff.email/cgit/ipmitool.git Homepage: https://github.com/ipmitool/ipmitool @@ -19,6 +20,8 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base (>= 3.0-6) +Pre-Depends: + ${misc:Pre-Depends} Recommends: openipmi Description: utility for IPMI control with kernel driver or LAN interface (daemon) A utility for managing and configuring devices that support the diff --git a/debian/ipmitool.ipmievd.default b/debian/ipmitool.ipmievd.default deleted file mode 100644 index 12439e0..0000000 --- a/debian/ipmitool.ipmievd.default +++ /dev/null @@ -1,13 +0,0 @@ -# This is a shell script fraction - -# -# To enable ipmievd set ENABLED="true" for sysvinit (ignored by systemd) -# -# This is disabled because Debian Policy Manual section 9.3.3.1 -# -#E N A B L E D="false" - - -# Options to the daemon ipmievd(8). -# -IPMIEVD_OPTIONS="open daemon" diff --git a/debian/ipmitool.lintian-overrides b/debian/ipmitool.lintian-overrides new file mode 100644 index 0000000..00696e1 --- /dev/null +++ b/debian/ipmitool.lintian-overrides @@ -0,0 +1,4 @@ +# +# see bug #932378 +# +ipmitool: missing-versioned-depends-on-init-system-helpers postinst:23 "update-rc.d defaults-disabled" needs init-system-helpers >= 1.50 diff --git a/debian/ipmitool.maintscript b/debian/ipmitool.maintscript new file mode 100644 index 0000000..92457ee --- /dev/null +++ b/debian/ipmitool.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/default/ipmitool 1.8.18-6~ diff --git a/debian/patches/0615-manpage_typo.patch b/debian/patches/0615-manpage_typo.patch new file mode 100644 index 0000000..b1196d7 --- /dev/null +++ b/debian/patches/0615-manpage_typo.patch @@ -0,0 +1,49 @@ +Description: typo in man-pages +Author: Jörg Frings-Fürst <debian@jff.email> +Last-Update: 2019-07-18 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/doc/ipmitool.1 +=================================================================== +--- trunk.orig/doc/ipmitool.1 ++++ trunk/doc/ipmitool.1 +@@ -2478,7 +2478,7 @@ Discover Node Manager presence as well a + .br + + Add a new power policy, or overwrite an existing policy. +-The \fIcorrection\fP parameter is the agressiveness of frequency limiting, default is auto. ++The \fIcorrection\fP parameter is the aggressiveness of frequency limiting, default is auto. + The \fItrig_lim\fP is the correction time limit and must be at least 6000 and not greater than 65535. + The \fIstats\fP setting is the averaging period in seconds and ranges from 1-65535. + If domain is not supplied a default of platform is used. +@@ -2489,7 +2489,7 @@ If domain is not supplied a default of p + .br + + Add a new inlet temp policy, or overwrite an existing policy. +-The \fIcorrection\fP parameter is the agressiveness of frequency limiting, default is auto. ++The \fIcorrection\fP parameter is the aggressiveness of frequency limiting, default is auto. + The \fItrig_lim\fP is the correction time limit and must be at least 6000 and not greater than 65535. + The \fIstats\fP setting is the averaging period in seconds and ranges from 1-65535. + If domain is not supplied a default of platform is used. +@@ -3657,7 +3657,7 @@ and encryption algorithms to use for for + on the cipher suite ID found in the IPMIv2.0 specification in table + 22\-19. The default cipher suite is \fI3\fP which specifies + RAKP\-HMAC\-SHA1 authentication, HMAC\-SHA1\-96 integrity, and AES\-CBC\-128 +-encryption algorightms. ++encryption algorithms. + + .SH "FREE INTERFACE" + .LP +Index: trunk/doc/ipmievd.8 +=================================================================== +--- trunk.orig/doc/ipmievd.8 ++++ trunk/doc/ipmievd.8 +@@ -56,7 +56,7 @@ This is not available with all commands. + The remote server authentication, integrity, and encryption algorithms + to use for IPMIv2 \fIlanplus\fP connections. See table 22\-19 in the + IPMIv2 specification. The default is 3 which specifies RAKP\-HMAC\-SHA1 +-authentication, HMAC\-SHA1\-96 integrity, and AES\-CBC\-128 encryption algorightms. ++authentication, HMAC\-SHA1\-96 integrity, and AES\-CBC\-128 encryption algorithms. + .TP + \fB\-E\fR + The remote server password is specified by the environment diff --git a/debian/patches/series b/debian/patches/series index 80f7a3c..d9b084c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ 0110-getpass-prototype.patch 0115-typo.patch 0125-nvidia-iana.patch +0615-manpage_typo.patch diff --git a/debian/systemd/ipmitool.ipmievd.service b/debian/systemd/ipmitool.ipmievd.service index e7a8528..fdae14f 100644 --- a/debian/systemd/ipmitool.ipmievd.service +++ b/debian/systemd/ipmitool.ipmievd.service @@ -3,8 +3,7 @@ Description=IPMI event daemon [Service] Type=forking -EnvironmentFile=-/etc/default/ipmievd -ExecStart=/usr/sbin/ipmievd $IPMIEVD_OPTIONS +ExecStart=/usr/sbin/ipmievd open daemon [Install] WantedBy=multi-user.target diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..110eac8 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,3 @@ +# smoke test +Test-Command: ipmitool -V +Depends: ipmitool diff --git a/debian/watch b/debian/watch index f4fe53a..616229c 100644 --- a/debian/watch +++ b/debian/watch @@ -3,7 +3,7 @@ opts=\ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/;s/\-/\./g;s/\_/\./g,\ filenamemangle=s/(?:.*?)?(?:rel|v|ipmitool|IPMITOOL)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/ipmitool-$1.$2/ \ -https://github.com/ipmitool/ipmitool/releases \ +https://github.com/ipmitool/ipmitool/tags \ (?:.*?/)?(?:rel|v|ipmitool|IPMITOOL)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \ -debian uupdate + |