From 89131db982af23120b1d9598771fa0f9a72723ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Jul 2019 12:54:38 +0200 Subject: d/watch: Use tags instead releases --- debian/changelog | 6 ++++++ debian/watch | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8b8a3eb..b2dd2a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ipmitool (1.8.18-7) UNRELEASED; urgency=medium + + * debian/watch: Use tags instead releases. + + -- Jörg Frings-Fürst Sat, 13 Jul 2019 12:52:23 +0200 + ipmitool (1.8.18-6) unstable; urgency=medium * debian/changelog: diff --git a/debian/watch b/debian/watch index f4fe53a..3cb1ca3 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 -- cgit v1.2.3 From 1b70b9ad20093d8ee08121b58096d205095d60de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 18 Jul 2019 16:26:44 +0200 Subject: Migrate to debhelper 12 --- debian/changelog | 3 +++ debian/compat | 2 +- debian/control | 2 +- debian/watch | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b2dd2a0..449a829 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ ipmitool (1.8.18-7) UNRELEASED; urgency=medium * debian/watch: Use tags instead releases. + * Migrate to debhelper 12: + - Change debian/compat to 12. + - Bump minimum debhelper version in debian/control to >= 12. -- Jörg Frings-Fürst Sat, 13 Jul 2019 12:52:23 +0200 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..ac0b119 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: - debhelper (>> 11), + debhelper (>> 12), libncurses-dev, libfreeipmi-dev [!hurd-i386], libreadline-dev, diff --git a/debian/watch b/debian/watch index 3cb1ca3..616229c 100644 --- a/debian/watch +++ b/debian/watch @@ -5,5 +5,5 @@ uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/; filenamemangle=s/(?:.*?)?(?:rel|v|ipmitool|IPMITOOL)?[\-\_]?(\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/ipmitool-$1.$2/ \ https://github.com/ipmitool/ipmitool/tags \ (?:.*?/)?(?:rel|v|ipmitool|IPMITOOL)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \ -debian uupdate + -- cgit v1.2.3 From 0635c36c25a836bba7e829789316c2291e8114f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 18 Jul 2019 16:29:08 +0200 Subject: Declare compliance with Debian Policy 4.4.0 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 449a829..25aad0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ ipmitool (1.8.18-7) UNRELEASED; urgency=medium * 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). -- Jörg Frings-Fürst Sat, 13 Jul 2019 12:52:23 +0200 diff --git a/debian/control b/debian/control index ac0b119..92870ed 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: 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 -- cgit v1.2.3 From e694dbe09be0de2a73b3d655fb15ca1eff20ca0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 18 Jul 2019 17:40:12 +0200 Subject: Add missing Depend init_system_helpers; Fix typos in man pages --- debian/changelog | 3 +++ debian/control | 3 +++ debian/ipmitool.lintian-overrides | 4 +++ debian/patches/0615-manpage_typo.patch | 49 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 60 insertions(+) create mode 100644 debian/ipmitool.lintian-overrides create mode 100644 debian/patches/0615-manpage_typo.patch diff --git a/debian/changelog b/debian/changelog index 25aad0b..9e8f90e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ ipmitool (1.8.18-7) UNRELEASED; urgency=medium - 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. + * New debian/patches/0615-manpage_typo.patch: Fix typos in man pages. -- Jörg Frings-Fürst Sat, 13 Jul 2019 12:52:23 +0200 diff --git a/debian/control b/debian/control index 92870ed..faa77ad 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>> 12), + init-system-helpers (>> 0.1), libncurses-dev, libfreeipmi-dev [!hurd-i386], libreadline-dev, @@ -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.lintian-overrides b/debian/ipmitool.lintian-overrides new file mode 100644 index 0000000..94a5070 --- /dev/null +++ b/debian/ipmitool.lintian-overrides @@ -0,0 +1,4 @@ +# +# see bug #932378 +# +ipmitool: missing-versioned-depends-on-init-system-helpers postinst:20 "update-rc.d defaults-disabled" needs init-system-helpers >= 1.50 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 +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 -- cgit v1.2.3 From ba688b5bccb8326bf3bd508e6892369e796b3884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 18 Jul 2019 17:58:29 +0200 Subject: Add DEP 8 smoketest --- debian/changelog | 2 ++ debian/tests/control | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 debian/tests/control diff --git a/debian/changelog b/debian/changelog index 9e8f90e..40d154e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ipmitool (1.8.18-7) UNRELEASED; urgency=medium * debian/control: Add missing Depend init_system_helpers to fix lintan warning. * New debian/patches/0615-manpage_typo.patch: Fix typos in man pages. + * Add DEP 8 smoketest (Closes: #903676). + Thanks to dann frazier . -- Jörg Frings-Fürst Sat, 13 Jul 2019 12:52:23 +0200 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 -- cgit v1.2.3 From 5b85de46a1c816ae92ce5824c8c7a0a9dec47b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 18 Jul 2019 18:07:01 +0200 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 40d154e..ac8b029 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ipmitool (1.8.18-7) UNRELEASED; urgency=medium +ipmitool (1.8.18-7) unstable; urgency=medium * debian/watch: Use tags instead releases. * Migrate to debhelper 12: @@ -9,9 +9,9 @@ ipmitool (1.8.18-7) UNRELEASED; urgency=medium lintan warning. * New debian/patches/0615-manpage_typo.patch: Fix typos in man pages. * Add DEP 8 smoketest (Closes: #903676). - Thanks to dann frazier . + Thanks to "Dann Frazier" . - -- Jörg Frings-Fürst Sat, 13 Jul 2019 12:52:23 +0200 + -- Jörg Frings-Fürst Thu, 18 Jul 2019 18:02:00 +0200 ipmitool (1.8.18-6) unstable; urgency=medium -- cgit v1.2.3 From 34a85840513e8ea8beb4874c8fa45e5848d26a81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 18 Jul 2019 18:59:52 +0200 Subject: Remove not longer needed debian/ipmitool.ipmievd.default --- debian/changelog | 4 +++- debian/ipmitool.ipmievd.default | 13 ------------- debian/ipmitool.lintian-overrides | 2 +- debian/ipmitool.maintscript | 1 + 4 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 debian/ipmitool.ipmievd.default create mode 100644 debian/ipmitool.maintscript diff --git a/debian/changelog b/debian/changelog index ac8b029..16aa447 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,10 @@ ipmitool (1.8.18-7) unstable; urgency=medium * New debian/patches/0615-manpage_typo.patch: Fix typos in man pages. * Add DEP 8 smoketest (Closes: #903676). Thanks to "Dann Frazier" . + * Remove not longer needed debian/ipmitool.ipmievd.default (Closes: #907832). + - New debian/ipmitool.maintscript to remove /etc/default/ipmitool. - -- Jörg Frings-Fürst Thu, 18 Jul 2019 18:02:00 +0200 + -- Jörg Frings-Fürst Thu, 18 Jul 2019 18:40:24 +0200 ipmitool (1.8.18-6) unstable; urgency=medium 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 index 94a5070..00696e1 100644 --- a/debian/ipmitool.lintian-overrides +++ b/debian/ipmitool.lintian-overrides @@ -1,4 +1,4 @@ # # see bug #932378 # -ipmitool: missing-versioned-depends-on-init-system-helpers postinst:20 "update-rc.d defaults-disabled" needs init-system-helpers >= 1.50 +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~ -- cgit v1.2.3 From 7f1d2250953bd41e71f443752f755d919ba8ed16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 18 Jul 2019 19:16:58 +0200 Subject: Change parameter at debian/ipmitool.ipmievd.service --- debian/changelog | 3 ++- debian/systemd/ipmitool.ipmievd.service | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 16aa447..f98733c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,9 @@ ipmitool (1.8.18-7) unstable; urgency=medium Thanks to "Dann Frazier" . * Remove not longer needed debian/ipmitool.ipmievd.default (Closes: #907832). - New debian/ipmitool.maintscript to remove /etc/default/ipmitool. + - Add IPMIEVD_OPTIONS direct into debian/ipmitool.ipmievd.service. - -- Jörg Frings-Fürst Thu, 18 Jul 2019 18:40:24 +0200 + -- Jörg Frings-Fürst Thu, 18 Jul 2019 19:16:04 +0200 ipmitool (1.8.18-6) unstable; urgency=medium 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 -- cgit v1.2.3 From 77599435de9faf43b334d7a3647f449663e24c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 18 Jul 2019 20:13:31 +0200 Subject: some typos --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f98733c..62baf6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ ipmitool (1.8.18-7) unstable; urgency=medium - * debian/watch: Use tags instead releases. + * 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. @@ -12,7 +12,8 @@ ipmitool (1.8.18-7) unstable; urgency=medium Thanks to "Dann Frazier" . * Remove not longer needed debian/ipmitool.ipmievd.default (Closes: #907832). - New debian/ipmitool.maintscript to remove /etc/default/ipmitool. - - Add IPMIEVD_OPTIONS direct into debian/ipmitool.ipmievd.service. + - Add IPMIEVD_OPTIONS from /etc/default/ipmitool into + debian/ipmitool.ipmievd.service. -- Jörg Frings-Fürst Thu, 18 Jul 2019 19:16:04 +0200 -- cgit v1.2.3 From e7ca9ee2211c8086f5a2be0ccdb38429cc41a280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 20 Jul 2019 11:01:37 +0200 Subject: d/changelog: add lintian warning; d/control: Fix init-system-helpers version --- debian/changelog | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 62baf6a..4d4749e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ ipmitool (1.8.18-7) unstable; urgency=medium - 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. + 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" . @@ -15,7 +15,7 @@ ipmitool (1.8.18-7) unstable; urgency=medium - Add IPMIEVD_OPTIONS from /etc/default/ipmitool into debian/ipmitool.ipmievd.service. - -- Jörg Frings-Fürst Thu, 18 Jul 2019 19:16:04 +0200 + -- Jörg Frings-Fürst Sat, 20 Jul 2019 10:59:12 +0200 ipmitool (1.8.18-6) unstable; urgency=medium diff --git a/debian/control b/debian/control index faa77ad..cdf7432 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>> 12), - init-system-helpers (>> 0.1), + init-system-helpers (>> 1.5), libncurses-dev, libfreeipmi-dev [!hurd-i386], libreadline-dev, -- cgit v1.2.3 From 265d5792020ab384c803010ea9c2ce727cd3ce34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 20 Jul 2019 11:20:48 +0200 Subject: d/control: Typo --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index cdf7432..172d14f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>> 12), - init-system-helpers (>> 1.5), + init-system-helpers (>> 1.50), libncurses-dev, libfreeipmi-dev [!hurd-i386], libreadline-dev, -- cgit v1.2.3