summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/changelog75
-rw-r--r--debian/compat2
-rw-r--r--debian/control12
-rw-r--r--debian/copyright6
-rw-r--r--debian/ipmitool.ipmievd.default4
-rw-r--r--debian/patches/0125-nvidia-iana.patch36
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules6
-rw-r--r--debian/watch10
9 files changed, 117 insertions, 35 deletions
diff --git a/debian/changelog b/debian/changelog
index 8d860cb..8b8a3eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+ipmitool (1.8.18-6) unstable; urgency=medium
+
+ * debian/changelog:
+ - Remove trailing whitespaces.
+ * 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.
+ - Add year 2018 for debian/*.
+ * debian/rules:
+ - Replace outdated dh_systemd_enable with dh_installsystemd.
+ * debian/watch:
+ - Switch to github.
+ * 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.
+ * 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.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Sun, 05 Aug 2018 12:20:50 +0200
+
+ipmitool (1.8.18-5) unstable; urgency=medium
+
+ * Team upload.
+ * Use dh_systemd_enable --name to install ipmitool.ipmievd.service.
+ (closes: #879063)
+
+ -- Bas Couwenberg <sebastic@debian.org> Tue, 14 Nov 2017 07:58:01 +0100
+
ipmitool (1.8.18-4) unstable; urgency=medium
* Migrate to OpenSSL1.1 (Closes_# 853782):
@@ -98,7 +136,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.
@@ -160,21 +198,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 <debian@jff-webhosting.net> 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
@@ -190,10 +228,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
@@ -267,22 +305,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 <luk@debian.org> 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).
@@ -302,7 +340,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 <jeff@ubuntu.com> Wed, 09 Mar 2011 10:40:28 -0500
@@ -310,7 +348,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 <zulcss@ubuntu.com> Wed, 08 Sep 2010 09:11:26 -0400
@@ -335,7 +373,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)
@@ -357,7 +395,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
@@ -388,7 +426,7 @@ ipmitool (1.8.9-2) unstable; urgency=medium
20_ipmi_sdr.dpatch (Patch from Cyril Brulebois
<cyril.brulebois@kerlabs.com>)
* Bump Standards-Version
- * Remove empty /usr/share/ipmitool directory
+ * Remove empty /usr/share/ipmitool directory
-- Matthew Johnson <mjj29@debian.org> Tue, 19 Feb 2008 15:21:40 +0000
@@ -401,7 +439,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 <mjj29@debian.org> Thu, 13 Dec 2007 10:25:22 +0000
@@ -674,7 +712,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 <duncan@sun.com> Fri, 24 Oct 2003 11:00:00 -0700
@@ -711,4 +749,3 @@ ipmitool (1.0-1) unstable; urgency=low
* Initial Release.
-- Duncan Laurie <duncan@sun.com> Sun, 30 Mar 2003 21:30:46 -0700
-
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 a5b3b1b..2b6d4c3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,17 @@
Source: ipmitool
Section: utils
Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
Build-Depends:
- debhelper (>> 10),
+ debhelper (>> 11),
libncurses-dev,
libfreeipmi-dev [!hurd-i386],
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
-Homepage: https://sourceforge.net/projects/ipmitool/
+Standards-Version: 4.1.5
+Vcs-Git: git://jff.email/opt/git/ipmitool.git
+Vcs-Browser: https://jff.email/cgit/ipmitool.git
+Homepage: https://github.com/ipmitool/ipmitool
Package: ipmitool
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index a378fda..fe9f534 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
@@ -34,7 +34,7 @@ Copyright: 2003-2005 Duncan Laurie <duncan@sun.com>
2011-2013 Luk Claes <luk@debian.org>
2012 Leo Iannacone <l3on@ubuntu.com>
2013 Robie Basak <robie.basak@canonical.com>
- 2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+ 2014-2018 Jörg Frings-Fürst <debian@jff.email>
License: BSD-3-clause
License: BSD-3-clause
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/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 <dannf@debian.org>
+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
diff --git a/debian/rules b/debian/rules
index 7aa7d87..08da15e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,10 +30,10 @@ 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_systemd_enable:
- dh_systemd_enable --no-enable ipmievd.service
+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)
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
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:38:37 +0000