diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/patches/0110-getpass-prototype.patch | 10 | ||||
| -rw-r--r-- | debian/patches/0115-typo.patch | 31 | ||||
| -rw-r--r-- | debian/patches/0500-fix_CVE-2011-4339.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 9 |
5 files changed, 58 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 685d88e..cfcf8d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +ipmitool (1.8.17-1) UNRELEASED; urgency=medium + + * New upstream release. + * Drop upstream applied patches: + - 0001-Dialect_change.patch + - 0105-typo.patch + - 0605-manpage_typo.patch + - 0610-readme_typo.patch + * Refresh patches: + - 0110-getpass-prototype.patch + - 0500-fix_CVE-2011-4339.patch + * New patch: + - 0115-typo.patch + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 08 May 2016 23:00:04 +0200 + ipmitool (1.8.16-3) unstable; urgency=medium * debian/rules: diff --git a/debian/patches/0110-getpass-prototype.patch b/debian/patches/0110-getpass-prototype.patch index 8b2b455..ecd8ee9 100644 --- a/debian/patches/0110-getpass-prototype.patch +++ b/debian/patches/0110-getpass-prototype.patch @@ -6,17 +6,17 @@ Author: Steve Langasek <steve.langasek@ubuntu.com> Origin: <upstream|backport|vendor|other>, <URL, required except if Author is present> Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional> Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819340 -Last-Update: 2016-04-13 +Last-Update: 2016-05-15 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/lib/ipmi_main.c =================================================================== --- trunk.orig/lib/ipmi_main.c +++ trunk/lib/ipmi_main.c -@@ -30,6 +30,7 @@ - * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - */ - #define _XOPEN_SOURCE 700 +@@ -34,6 +34,7 @@ + (_XOPEN_SOURCE >= 500 || \ + _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) && \ + !(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) +#define _DEFAULT_SOURCE #include <stdlib.h> diff --git a/debian/patches/0115-typo.patch b/debian/patches/0115-typo.patch new file mode 100644 index 0000000..c2887c2 --- /dev/null +++ b/debian/patches/0115-typo.patch @@ -0,0 +1,31 @@ +Description: source typos +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Last-Update: 2016-05-15 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/lib/dimm_spd.c +=================================================================== +--- trunk.orig/lib/dimm_spd.c ++++ trunk/lib/dimm_spd.c +@@ -798,7 +798,7 @@ const struct valstr jedec_id5_vals[] = { + { 0xE3, "WIS Technologies" }, + { 0x64, "GateChange Technologies" }, + { 0xE5, "High Density Devices AS" }, +- { 0xE6, "Synopsys" }, ++ { 0xE6, "Synopsis" }, + { 0x67, "Gigaram" }, + { 0x68, "Enigma Semiconductor Inc." }, + { 0xE9, "Century Micro Inc." }, +Index: trunk/lib/ipmi_hpmfwupg.c +=================================================================== +--- trunk.orig/lib/ipmi_hpmfwupg.c ++++ trunk/lib/ipmi_hpmfwupg.c +@@ -1502,7 +1502,7 @@ HpmfwupgGetTargetUpgCapabilities(struct + pCtx->resp.GlobalCapabilities.bitField.autRollbackOverride ? 'y' : 'n'); + lprintf(LOG_NOTICE, "IPMC degraded...........[%c] ", + pCtx->resp.GlobalCapabilities.bitField.ipmcDegradedDurinUpg ? 'y' : 'n'); +- lprintf(LOG_NOTICE, "Defered activation......[%c] ", ++ lprintf(LOG_NOTICE, "Deferred activation......[%c] ", + pCtx->resp.GlobalCapabilities.bitField.deferActivation ? 'y' : 'n'); + lprintf(LOG_NOTICE, "Service affected........[%c] ", + pCtx->resp.GlobalCapabilities.bitField.servAffectDuringUpg ? 'y' : 'n'); diff --git a/debian/patches/0500-fix_CVE-2011-4339.patch b/debian/patches/0500-fix_CVE-2011-4339.patch index 48bfe8c..8360417 100644 --- a/debian/patches/0500-fix_CVE-2011-4339.patch +++ b/debian/patches/0500-fix_CVE-2011-4339.patch @@ -11,7 +11,7 @@ Index: trunk/lib/helper.c =================================================================== --- trunk.orig/lib/helper.c +++ trunk/lib/helper.c -@@ -659,7 +659,6 @@ ipmi_start_daemon(struct ipmi_intf *intf +@@ -664,7 +664,6 @@ ipmi_start_daemon(struct ipmi_intf *intf #endif chdir("/"); diff --git a/debian/patches/series b/debian/patches/series index 2aa0edb..d3b8208 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,8 +1,9 @@ -0605-manpage_typo.patch -0105-typo.patch +#0605-manpage_typo.patch +#0105-typo.patch 0100-fix_buf_overflow.patch 0500-fix_CVE-2011-4339.patch -0610-readme_typo.patch +#0610-readme_typo.patch 0600-manpage_longlines.patch -0001-Dialect_change.patch +#0001-Dialect_change.patch 0110-getpass-prototype.patch +0115-typo.patch |