From 06c0ec4278d53d5bdd13b2211837d2188b6239a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 14 Oct 2017 13:40:02 +0200 Subject: Declare compliance with Debian Policy 4.1.1 --- debian/changelog | 2 +- debian/control | 2 +- debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8d860cb..1023134 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ ipmitool (1.8.18-4) unstable; urgency=medium - debian/control: + Switch Build-Depends from libssl1.0-dev to libssl-dev to build against OpenSSL 1.1. - * Declare compliance with Debian Policy 4.0.0. (No changes needed). + * Declare compliance with Debian Policy 4.1.1. (No changes needed). * Refresh debian/patches/0115-typo.patch. * debian/rules: - Enable dummy interface. diff --git a/debian/control b/debian/control index a5b3b1b..0dab39b 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: libfreeipmi-dev [!hurd-i386], libreadline-dev, libssl-dev -Standards-Version: 4.0.0 +Standards-Version: 4.1.1 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ipmitool.git Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/ipmitool.git Homepage: https://sourceforge.net/projects/ipmitool/ diff --git a/debian/rules b/debian/rules index 7aa7d87..1d58eb0 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ override_dh_installinit: dh_installinit --name ipmievd --error-handler=ipmievd_initd_failed override_dh_systemd_enable: - dh_systemd_enable --no-enable ipmievd.service + dh_systemd_enable --no-enable debian/ipmitool.ipmievd.service override_dh_auto_configure: dh_auto_configure -- --prefix=/usr --with-kerneldir --mandir=/usr/share/man --enable-intf-dummy $(extra_config_opts) -- cgit v1.2.3 From 02035ed167fdb7d81d277178daa04c485816737f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 14 Oct 2017 13:42:48 +0200 Subject: At dh_systemd_enable use debian/ipmitool.ipmievd.service instead ipmievd.service --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1023134..1b028e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ipmitool (1.8.18-4) unstable; urgency=medium * Refresh debian/patches/0115-typo.patch. * debian/rules: - Enable dummy interface. + - At dh_systemd_enable use debian/ipmitool.ipmievd.service + instead ipmievd.service. * New README.source to explain the branching model used. -- Jörg Frings-Fürst Sun, 13 Aug 2017 10:56:16 +0200 -- cgit v1.2.3 From 668bb60cae1cc791b8665ee168fe50136443fb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 14 Oct 2017 13:51:39 +0200 Subject: New release 1.8.18-5 --- debian/changelog | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1b028e4..cd99fb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ipmitool (1.8.18-5) UNRELEASED; urgency=medium + + * debian/rules: + - At dh_systemd_enable use debian/ipmitool.ipmievd.service + instead ipmievd.service. + * Declare compliance with Debian Policy 4.1.1. (No changes needed). + + -- Jörg Frings-Fürst Sat, 14 Oct 2017 13:47:51 +0200 + ipmitool (1.8.18-4) unstable; urgency=medium * Migrate to OpenSSL1.1 (Closes_# 853782): @@ -6,12 +15,10 @@ ipmitool (1.8.18-4) unstable; urgency=medium - debian/control: + Switch Build-Depends from libssl1.0-dev to libssl-dev to build against OpenSSL 1.1. - * Declare compliance with Debian Policy 4.1.1. (No changes needed). + * Declare compliance with Debian Policy 4.0.0. (No changes needed). * Refresh debian/patches/0115-typo.patch. * debian/rules: - Enable dummy interface. - - At dh_systemd_enable use debian/ipmitool.ipmievd.service - instead ipmievd.service. * New README.source to explain the branching model used. -- Jörg Frings-Fürst Sun, 13 Aug 2017 10:56:16 +0200 -- cgit v1.2.3 From 5c88056f777df42cc97b5c0b654dfd1b09aec445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 08:27:18 +0200 Subject: merge 1.8.18-5 into git --- debian/changelog | 11 +++++------ debian/control | 2 +- debian/rules | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd99fb4..a417858 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,10 @@ -ipmitool (1.8.18-5) UNRELEASED; urgency=medium +ipmitool (1.8.18-5) unstable; urgency=medium - * debian/rules: - - At dh_systemd_enable use debian/ipmitool.ipmievd.service - instead ipmievd.service. - * Declare compliance with Debian Policy 4.1.1. (No changes needed). + * Team upload. + * Use dh_systemd_enable --name to install ipmitool.ipmievd.service. + (closes: #879063) - -- Jörg Frings-Fürst Sat, 14 Oct 2017 13:47:51 +0200 + -- Bas Couwenberg Tue, 14 Nov 2017 07:58:01 +0100 ipmitool (1.8.18-4) unstable; urgency=medium diff --git a/debian/control b/debian/control index 0dab39b..a5b3b1b 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.1 +Standards-Version: 4.0.0 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ipmitool.git Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/ipmitool.git Homepage: https://sourceforge.net/projects/ipmitool/ diff --git a/debian/rules b/debian/rules index 1d58eb0..2862de5 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ override_dh_installinit: dh_installinit --name ipmievd --error-handler=ipmievd_initd_failed override_dh_systemd_enable: - dh_systemd_enable --no-enable debian/ipmitool.ipmievd.service + dh_systemd_enable --no-enable --name=ipmievd override_dh_auto_configure: dh_auto_configure -- --prefix=/usr --with-kerneldir --mandir=/usr/share/man --enable-intf-dummy $(extra_config_opts) -- cgit v1.2.3 From ed8b744228e4ee5200d514b96feb8e250a23aef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 08:40:57 +0200 Subject: Change to my new email address --- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/copyright | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a417858..10f2e3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ipmitool (1.8.18-6) UNRELEASED; urgency=medium + + * debian/control: + - Change to my new email address. + * debian/copyright: + - Change to my new email address. + + -- Jörg Frings-Fürst Sun, 05 Aug 2018 08:28:10 +0200 + ipmitool (1.8.18-5) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index a5b3b1b..77d3133 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: ipmitool Section: utils Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Jörg Frings-Fürst Build-Depends: debhelper (>> 10), libncurses-dev, diff --git a/debian/copyright b/debian/copyright index a378fda..e3f784e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -34,7 +34,7 @@ Copyright: 2003-2005 Duncan Laurie 2011-2013 Luk Claes 2012 Leo Iannacone 2013 Robie Basak - 2014-2017 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: BSD-3-clause License: BSD-3-clause -- cgit v1.2.3 From 7effea4fecef54edb71e53f260102bd52b5e947e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 08:50:14 +0200 Subject: Remove trailing whitespaces --- debian/changelog | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 10f2e3a..982996f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ ipmitool (1.8.18-6) UNRELEASED; urgency=medium + * debian/changelog: + - Remove trailing whitespaces. * debian/control: - Change to my new email address. * debian/copyright: @@ -115,7 +117,7 @@ ipmitool (1.8.16-2) unstable; urgency=medium ipmitool (1.8.16-1) unstable; urgency=medium * New upstream release (Closes: #810827). - - fix does not fall back to IPv4 for IPMI v2 / RMCP+ sessions + - fix does not fall back to IPv4 for IPMI v2 / RMCP+ sessions (Closes: #755479). * Refresh patches. * Add year 2016 to debian/copyright. @@ -177,21 +179,21 @@ ipmitool (1.8.14-4) unstable; urgency=medium ipmitool (1.8.14-3) unstable; urgency=medium - * move ipmitool.conf + * move ipmitool.conf from /etc/modules-load.d to /usr/lib/modules-load.d ( Closes: #753762 ) -- Jörg Frings-Fürst Mon, 02 Jun 2014 20:46:28 +0200 ipmitool (1.8.14-2) unstable; urgency=medium - - * patch 115-lib_declarations.patch + + * patch 115-lib_declarations.patch - lib/kontronoem.c correct declaration of write_fru_area ( Closes: #749913 ) * remove hardening-wrapper from build-Depends * add ipmi* kernel-modules to startup-script ( LP: #908112 ) - * add debian/systemd/ipmitool.conf to load + * add debian/systemd/ipmitool.conf to load ipmi* kernel-modules under systemd * add debian/source/option compression xy / level 9 @@ -207,10 +209,10 @@ ipmitool (1.8.14-1) unstable; urgency=medium * remove debian/dirs * add debian/ipmitool.ipmievd.default - default ipmievd start is disabled - * add patch + * add patch - 096-manpage_longlines.patch - 097-source_typo.patch - - 098-manpage_typo.patch + - 098-manpage_typo.patch - fix "tiny misprint" ( Closes: #554348 ) * add systemd * rewrite debian/copyright @@ -284,22 +286,22 @@ ipmitool (1.8.11-4) unstable; urgency=low * debian/control: - Add ${misc:Depends} so deps can be added by debhelper. * debian/README.source: Add reference to quilt docs. - * debian/ipmitool.ipmievd.init: + * debian/ipmitool.ipmievd.init: - Test if /etc/default/rcS exists, before executing it. - Add status support (Closes: #536119). * debian/ipmitool.{post,pre}{inst,rm}: Add -e. * Fix buffer overflow in tsol session. - * Update Vcs-Browser as URL mentioned within Alioth's gitweb + * Update Vcs-Browser as URL mentioned within Alioth's gitweb interface does not work. -- Luk Claes Thu, 22 Sep 2011 07:49:10 +0200 ipmitool (1.8.11-3) unstable; urgency=high - * debian/control: + * debian/control: - Add myself as co-maintainer. - Add Vcs entries. - - Update Architecture to any as ipmitool can be used for + - Update Architecture to any as ipmitool can be used for remote devices (Closes: #578492). * Only approach rsp->data when rsp is set (Closes: #637423). @@ -319,7 +321,7 @@ ipmitool (1.8.11-2ubuntu5) oneiric; urgency=low ipmitool (1.8.11-2ubuntu4) natty; urgency=low - * Changed openipmi from Suggests to Recommends to ensure + * Changed openipmi from Suggests to Recommends to ensure it's installed too. (LP: #110992) -- Jeff Lane Wed, 09 Mar 2011 10:40:28 -0500 @@ -327,7 +329,7 @@ ipmitool (1.8.11-2ubuntu4) natty; urgency=low ipmitool (1.8.11-2ubuntu3) maverick; urgency=low * debian/patches/101_fix_buf_overflow.patch: Add patch to fix buffer overflow. - (LP: #633054) + (LP: #633054) -- Chuck Short Wed, 08 Sep 2010 09:11:26 -0400 @@ -352,7 +354,7 @@ ipmitool (1.8.11-2ubuntu1) maverick; urgency=low ipmitool (1.8.11-2) unstable; urgency=low - * Fix password reading (Patch from Kris Popendorf + * Fix password reading (Patch from Kris Popendorf <08kcn0b02@sneakemail.com> closes: #559363) * Remove libreadline5-dev dependency in favour of libreadline-dev (Closes: #553788) @@ -374,7 +376,7 @@ ipmitool (1.8.11-1ubuntu1) karmic; urgency=low ipmitool (1.8.11-1) unstable; urgency=low - * New upstream release + * New upstream release * Change to quilt rather than dpatch * Refresh config.sub/config.guess in configure * Bump standards version @@ -405,7 +407,7 @@ ipmitool (1.8.9-2) unstable; urgency=medium 20_ipmi_sdr.dpatch (Patch from Cyril Brulebois ) * Bump Standards-Version - * Remove empty /usr/share/ipmitool directory + * Remove empty /usr/share/ipmitool directory -- Matthew Johnson Tue, 19 Feb 2008 15:21:40 +0000 @@ -418,7 +420,7 @@ ipmitool (1.8.9-1) unstable; urgency=low * Add patch to fix segfault (Closes: #389741) * Add patch to fix isol (Closes: #412816) * Add watch file - * Move from DH_COMPAT to debian/compat + * Move from DH_COMPAT to debian/compat * Bump to dephelper v5 -- Matthew Johnson Thu, 13 Dec 2007 10:25:22 +0000 @@ -691,7 +693,7 @@ ipmitool (1.5.3) unstable; urgency=low ipmitool (1.5.2) unstable; urgency=low - * add support for setting gratuitous arp interval + * add support for setting gratuitous arp interval -- Duncan Laurie Fri, 24 Oct 2003 11:00:00 -0700 -- cgit v1.2.3 From 67f2a2194543297bfa426ae518819c161754866a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 09:04:38 +0200 Subject: Switch Vcs-* to new location --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 982996f..c83e485 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ ipmitool (1.8.18-6) UNRELEASED; urgency=medium - Remove trailing whitespaces. * debian/control: - Change to my new email address. + - Switch Vcs-* to new location. * debian/copyright: - Change to my new email address. diff --git a/debian/control b/debian/control index 77d3133..bc84b65 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Build-Depends: libreadline-dev, libssl-dev Standards-Version: 4.0.0 -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ipmitool.git -Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/ipmitool.git +Vcs-Git: git://jff.email/opt/git/ipmitool.git +Vcs-Browser: https://jff.email/cgit/ipmitool.git Homepage: https://sourceforge.net/projects/ipmitool/ Package: ipmitool -- cgit v1.2.3 From e4b4a1f74f7622e4a66146099ee4294b93c05e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 09:11:27 +0200 Subject: Declare compliance with Debian Policy 4.1.5 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c83e485..26bd578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ipmitool (1.8.18-6) UNRELEASED; urgency=medium - Switch Vcs-* to new location. * debian/copyright: - Change to my new email address. + * Declare compliance with Debian Policy 4.1.5 (No changes needed). -- Jörg Frings-Fürst Sun, 05 Aug 2018 08:28:10 +0200 @@ -731,4 +732,3 @@ ipmitool (1.0-1) unstable; urgency=low * Initial Release. -- Duncan Laurie Sun, 30 Mar 2003 21:30:46 -0700 - diff --git a/debian/control b/debian/control index bc84b65..d64f83a 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: libfreeipmi-dev [!hurd-i386], libreadline-dev, libssl-dev -Standards-Version: 4.0.0 +Standards-Version: 4.1.5 Vcs-Git: git://jff.email/opt/git/ipmitool.git Vcs-Browser: https://jff.email/cgit/ipmitool.git Homepage: https://sourceforge.net/projects/ipmitool/ -- cgit v1.2.3 From 5c9ad37eb34bd6763b823a0e81ec196cd869f59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 09:13:11 +0200 Subject: Migrate to debhelper 11 --- debian/changelog | 3 +++ debian/compat | 2 +- debian/control | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 26bd578..16bdc02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ ipmitool (1.8.18-6) UNRELEASED; urgency=medium * debian/copyright: - Change to my new email address. * Declare compliance with Debian Policy 4.1.5 (No changes needed). + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. -- Jörg Frings-Fürst Sun, 05 Aug 2018 08:28:10 +0200 diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index d64f83a..79beeeb 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: - debhelper (>> 10), + debhelper (>> 11), libncurses-dev, libfreeipmi-dev [!hurd-i386], libreadline-dev, -- cgit v1.2.3 From e750789a7933d3e82ce90f4160920e089244c2d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 09:29:09 +0200 Subject: Switch upstream to github --- debian/changelog | 5 +++++ debian/control | 2 +- debian/copyright | 4 ++-- debian/watch | 10 ++++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 16bdc02..8329af2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,13 @@ ipmitool (1.8.18-6) UNRELEASED; urgency=medium * debian/control: - Change to my new email address. - Switch Vcs-* to new location. + - Switch homepage to github. * debian/copyright: + - Use secure copyright format URI. - Change to my new email address. + - Switch homepage to github. + * debian/watch: + - Switch to github. * Declare compliance with Debian Policy 4.1.5 (No changes needed). * Migrate to debhelper 11: - Change debian/compat to 11. diff --git a/debian/control b/debian/control index 79beeeb..2b6d4c3 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: Standards-Version: 4.1.5 Vcs-Git: git://jff.email/opt/git/ipmitool.git Vcs-Browser: https://jff.email/cgit/ipmitool.git -Homepage: https://sourceforge.net/projects/ipmitool/ +Homepage: https://github.com/ipmitool/ipmitool Package: ipmitool Architecture: any diff --git a/debian/copyright b/debian/copyright index e3f784e..63d5a53 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 -Source: http://sourceforge.net/projects/ipmitool/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Source: https://github.com/ipmitool/ipmitool Files: * Copyright: 1999-2002 Aladdin Enterprises diff --git a/debian/watch b/debian/watch index 7641bb7..f4fe53a 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,9 @@ version=4 -opts=uversionmangle=s/\.(tar.*|xz|tgz|zip|gz|bz2)$// \ -http://sf.net/ipmitool/ipmitool-?_?([\d+\.]+|\d+)\.(tar.*|xz|tgz|zip|gz|bz2) debian uupdate +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 \ +(?:.*?/)?(?:rel|v|ipmitool|IPMITOOL)?[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \ +debian uupdate + -- cgit v1.2.3 From 015c410bda6db857882d4c090eb3cd2dd034ccc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 10:11:49 +0200 Subject: d/rules: Replace outdated dh_systemd_enable with dh_installsystemd --- debian/changelog | 2 ++ debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8329af2..a9781a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ipmitool (1.8.18-6) UNRELEASED; urgency=medium - Use secure copyright format URI. - Change to my new email address. - Switch homepage to github. + * debian/rules: + - Replace outdated dh_systemd_enable with dh_installsystemd. * debian/watch: - Switch to github. * Declare compliance with Debian Policy 4.1.5 (No changes needed). diff --git a/debian/rules b/debian/rules index 2862de5..f0e7b5a 100755 --- a/debian/rules +++ b/debian/rules @@ -32,8 +32,8 @@ override_dh_auto_install: override_dh_installinit: dh_installinit --name ipmievd --error-handler=ipmievd_initd_failed -override_dh_systemd_enable: - dh_systemd_enable --no-enable --name=ipmievd +override_dh_installsystemd: + dh_installsystemd --no-enable --name ipmievd override_dh_auto_configure: dh_auto_configure -- --prefix=/usr --with-kerneldir --mandir=/usr/share/man --enable-intf-dummy $(extra_config_opts) -- cgit v1.2.3 From 60088c4205a6560925611d94b5897e77ee9ce787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 10:53:08 +0200 Subject: Switch from enable ipmievd daemon via /etc/default/ipmievd to use update-rc.d --- debian/changelog | 4 +++- debian/ipmitool.ipmievd.default | 4 +++- debian/rules | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a9781a1..0ea53d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,9 @@ ipmitool (1.8.18-6) UNRELEASED; urgency=medium - Replace outdated dh_systemd_enable with dh_installsystemd. * debian/watch: - Switch to github. - * Declare compliance with Debian Policy 4.1.5 (No changes needed). + * Declare compliance with Debian Policy 4.1.5: + - Switch from enable ipmievd daemon via /etc/default/ipmievd to use + update-rc.d. * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. diff --git a/debian/ipmitool.ipmievd.default b/debian/ipmitool.ipmievd.default index 0368b6c..12439e0 100644 --- a/debian/ipmitool.ipmievd.default +++ b/debian/ipmitool.ipmievd.default @@ -3,7 +3,9 @@ # # To enable ipmievd set ENABLED="true" for sysvinit (ignored by systemd) # -ENABLED="false" +# 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). diff --git a/debian/rules b/debian/rules index f0e7b5a..08da15e 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,7 @@ override_dh_auto_install: $(RM) $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/ChangeLog override_dh_installinit: - dh_installinit --name ipmievd --error-handler=ipmievd_initd_failed + dh_installinit --no-enable --name ipmievd --error-handler=ipmievd_initd_failed override_dh_installsystemd: dh_installsystemd --no-enable --name ipmievd -- cgit v1.2.3 From aa6e47eff858677b0d457a5902b0c7eadf4f6ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 11:14:35 +0200 Subject: Comment about upload 1.8.15-5 as Teamupload --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0ea53d8..1b46c67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,11 +15,13 @@ ipmitool (1.8.18-6) UNRELEASED; urgency=medium * debian/watch: - Switch to github. * Declare compliance with Debian Policy 4.1.5: - - Switch from enable ipmievd daemon via /etc/default/ipmievd to use + - Switch from enable ipmievd daemon via /etc/default/ipmievd to use update-rc.d. * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. + * I disagree to the upload of the release 1.8.18-5 as a team upload. + That was a NMU. -- Jörg Frings-Fürst Sun, 05 Aug 2018 08:28:10 +0200 -- cgit v1.2.3 From 2fe9ded8d43ab38d2be5297b82ff67358123d708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 11:25:43 +0200 Subject: New d/p/0125-nvidia-iana.patch: Add IANA ID for NVIDIA hardware --- debian/changelog | 2 ++ debian/patches/0125-nvidia-iana.patch | 36 +++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 39 insertions(+) create mode 100644 debian/patches/0125-nvidia-iana.patch diff --git a/debian/changelog b/debian/changelog index 1b46c67..6edbd79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ ipmitool (1.8.18-6) UNRELEASED; urgency=medium * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. + * New debian/patches/0125-nvidia-iana.patch: + - Add IANA ID for NVIDIA hardware (Closes: #903616). * I disagree to the upload of the release 1.8.18-5 as a team upload. That was a NMU. diff --git a/debian/patches/0125-nvidia-iana.patch b/debian/patches/0125-nvidia-iana.patch new file mode 100644 index 0000000..28276f8 --- /dev/null +++ b/debian/patches/0125-nvidia-iana.patch @@ -0,0 +1,36 @@ +Description: Add IANA ID for NVIDIA hardware + Add the NVIDIA IANA ID to the hardcoded list used in ipmitool <= 1.8.18. + After upstream commit "9d41136 ID:491 - Fetch vendor IDs from IANA", ipmitool + generates a list of vendor IDs dynamically at build time, so we can drop this + patch in future releases. +Author: dann frazier +Origin: backport +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903616 +Forwarded: not-needed +Last-Update: 2018-07-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: ipmitool-1.8.18/include/ipmitool/ipmi.h +=================================================================== +--- ipmitool-1.8.18.orig/include/ipmitool/ipmi.h ++++ ipmitool-1.8.18/include/ipmitool/ipmi.h +@@ -279,6 +279,7 @@ typedef enum IPMI_OEM { + /* 4769 for [IBM Corporation] */ + IPMI_OEM_IBM_4769 = 4769, + IPMI_OEM_MAGNUM = 5593, ++ IPMI_OEM_NVIDIA = 5703, + IPMI_OEM_TYAN = 6653, + IPMI_OEM_QUANTA = 7244, + IPMI_OEM_NEWISYS = 9237, +Index: ipmitool-1.8.18/lib/ipmi_strings.c +=================================================================== +--- ipmitool-1.8.18.orig/lib/ipmi_strings.c ++++ ipmitool-1.8.18/lib/ipmi_strings.c +@@ -96,6 +96,7 @@ const struct valstr ipmi_oem_info[] = { + { IPMI_OEM_IBM_4769, "IBM Corporation" }, + { IPMI_OEM_IBM_20301, "IBM eServer X" }, + { IPMI_OEM_ADLINK_24339, "ADLINK Technology Inc." }, ++ { IPMI_OEM_NVIDIA, "NVIDIA Corporation" }, + { 0xffff , NULL }, + }; + diff --git a/debian/patches/series b/debian/patches/series index 197df06..80f7a3c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ #0001-Dialect_change.patch 0110-getpass-prototype.patch 0115-typo.patch +0125-nvidia-iana.patch -- cgit v1.2.3 From 862ad8f2fe7c68e56834818713b3d7664778e155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 11:46:15 +0200 Subject: d/changelog: change date/time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6edbd79..c8e6872 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ipmitool (1.8.18-6) UNRELEASED; urgency=medium +ipmitool (1.8.18-6) unstable; urgency=medium * debian/changelog: - Remove trailing whitespaces. @@ -25,7 +25,7 @@ ipmitool (1.8.18-6) UNRELEASED; urgency=medium * I disagree to the upload of the release 1.8.18-5 as a team upload. That was a NMU. - -- Jörg Frings-Fürst Sun, 05 Aug 2018 08:28:10 +0200 + -- Jörg Frings-Fürst Sun, 05 Aug 2018 11:39:41 +0200 ipmitool (1.8.18-5) unstable; urgency=medium -- cgit v1.2.3 From bd235ecf44621f77a90f6ef316b337e21a5d6c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Aug 2018 12:24:39 +0200 Subject: d/copyright: Add year 2018 for debian/*. --- debian/changelog | 3 ++- debian/copyright | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c8e6872..8b8a3eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ipmitool (1.8.18-6) unstable; urgency=medium - Use secure copyright format URI. - Change to my new email address. - Switch homepage to github. + - Add year 2018 for debian/*. * debian/rules: - Replace outdated dh_systemd_enable with dh_installsystemd. * debian/watch: @@ -25,7 +26,7 @@ ipmitool (1.8.18-6) unstable; urgency=medium * I disagree to the upload of the release 1.8.18-5 as a team upload. That was a NMU. - -- Jörg Frings-Fürst Sun, 05 Aug 2018 11:39:41 +0200 + -- Jörg Frings-Fürst Sun, 05 Aug 2018 12:20:50 +0200 ipmitool (1.8.18-5) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index 63d5a53..fe9f534 100644 --- a/debian/copyright +++ b/debian/copyright @@ -34,7 +34,7 @@ Copyright: 2003-2005 Duncan Laurie 2011-2013 Luk Claes 2012 Leo Iannacone 2013 Robie Basak - 2014-2017 Jörg Frings-Fürst + 2014-2018 Jörg Frings-Fürst License: BSD-3-clause License: BSD-3-clause -- cgit v1.2.3