Refresh patches

3 files changed, 117 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index cc4c6cc..a81d3a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ipmitool (1.8.18-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Refresh patches:
+    - 0115-typo.patch
+    - 0500-fix_CVE-2011-4339.patch
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sun, 09 Oct 2016 09:20:49 +0200
+
 ipmitool (1.8.17-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/0115-typo.patch b/debian/patches/0115-typo.patch
index c2887c2..1e32199 100644
--- a/debian/patches/0115-typo.patch
+++ b/debian/patches/0115-typo.patch
@@ -20,7 +20,7 @@ Index: trunk/lib/ipmi_hpmfwupg.c
 ===================================================================
 --- trunk.orig/lib/ipmi_hpmfwupg.c
 +++ trunk/lib/ipmi_hpmfwupg.c
-@@ -1502,7 +1502,7 @@ HpmfwupgGetTargetUpgCapabilities(struct
+@@ -1507,7 +1507,7 @@ HpmfwupgGetTargetUpgCapabilities(struct
  				pCtx->resp.GlobalCapabilities.bitField.autRollbackOverride ? 'y' : 'n');
  		lprintf(LOG_NOTICE, "IPMC degraded...........[%c]   ",
  				pCtx->resp.GlobalCapabilities.bitField.ipmcDegradedDurinUpg ? 'y' : 'n');
@@ -29,3 +29,109 @@ Index: trunk/lib/ipmi_hpmfwupg.c
  				pCtx->resp.GlobalCapabilities.bitField.deferActivation ? 'y' : 'n');
  		lprintf(LOG_NOTICE, "Service affected........[%c]   ",
  				pCtx->resp.GlobalCapabilities.bitField.servAffectDuringUpg ? 'y' : 'n');
+Index: trunk/lib/ipmi_kontronoem.c
+===================================================================
+--- trunk.orig/lib/ipmi_kontronoem.c
++++ trunk/lib/ipmi_kontronoem.c
+@@ -85,7 +85,7 @@ ipmi_kontronoem_main(struct ipmi_intf *i
+ 			return (-1);
+ 		}
+ 		if (ipmi_kontron_set_serial_number(intf) > 0) {
+-			printf("FRU serial number setted successfully\n");
++			printf("FRU serial number set successfully\n");
+ 		} else {
+ 			printf("FRU serial number set failed\n");
+ 			rc = (-1);
+@@ -96,7 +96,7 @@ ipmi_kontronoem_main(struct ipmi_intf *i
+ 			return (-1);
+ 		}
+ 		if (ipmi_kontron_set_mfg_date(intf) > 0) {
+-			printf("FRU manufacturing date setted successfully\n");
++			printf("FRU manufacturing date set successfully\n");
+ 		} else {
+ 			printf("FRU manufacturing date set failed\n");
+ 			rc = (-1);
+Index: trunk/lib/ipmi_ekanalyzer.c
+===================================================================
+--- trunk.orig/lib/ipmi_ekanalyzer.c
++++ trunk/lib/ipmi_ekanalyzer.c
+@@ -3398,7 +3398,7 @@ ipmi_ek_display_board_p2p_record(struct
+ 				printf("ShMC Cross-connect (two-pair)\n");
+ 				break;
+ 			default:
+-				printf("Unknwon\n");
++				printf("Unknown\n");
+ 				break;
+ 			}
+ 		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET) {
+@@ -3413,17 +3413,17 @@ ipmi_ek_display_board_p2p_record(struct
+ 				printf("FC-PI\n");
+ 				break;
+ 			default:
+-				printf("Unknwon\n");
++				printf("Unknown\n");
+ 				break;
+ 			}
+ 		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_INFINIBAND) {
+-			printf("Unknwon\n");
++			printf("Unknown\n");
+ 		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_STAR) {
+-			printf("Unknwon\n");
++			printf("Unknown\n");
+ 		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_PCIE) {
+-			printf("Unknwon\n");
++			printf("Unknown\n");
+ 		} else {
+-			printf("Unknwon\n");
++			printf("Unknown\n");
+ 		}
+ 		printf("\tLink Type:\t\t0x%02x - ", d->type);
+ 		if (d->type == 0 || d->type == 0xff) {
+Index: trunk/src/ipmievd.c
+===================================================================
+--- trunk.orig/src/ipmievd.c
++++ trunk/src/ipmievd.c
+@@ -125,7 +125,7 @@ static int openipmi_wait(struct ipmi_eve
+ static int openipmi_read(struct ipmi_event_intf * eintf);
+ static struct ipmi_event_intf openipmi_event_intf = {
+ 	.name = "open",
+-	.desc = "OpenIPMI asyncronous notification of events",
++	.desc = "OpenIPMI asynchronous notification of events",
+ 	.prefix = "",
+ 	.setup = openipmi_setup,
+ 	.wait = openipmi_wait,
+@@ -864,7 +864,7 @@ ipmievd_open_main(struct ipmi_intf * int
+ 
+ struct ipmi_cmd ipmievd_cmd_list[] = {
+ #ifdef IPMI_INTF_OPEN
+-	{ ipmievd_open_main,	"open",   "Use OpenIPMI for asyncronous notification of events" },
++	{ ipmievd_open_main,	"open",   "Use OpenIPMI for asynchronous notification of events" },
+ #endif
+ 	{ ipmievd_sel_main,	"sel",    "Poll SEL for notification of events" },
+ 	{ NULL }
+Index: trunk/include/ipmitool/ipmi_pef.h
+===================================================================
+--- trunk.orig/include/ipmitool/ipmi_pef.h
++++ trunk/include/ipmitool/ipmi_pef.h
+@@ -178,7 +178,7 @@ BIT_DESC_MAP_LIST,
+ 	{"Entity presence",				37},
+ 	{"Monitor ASIC/IC",				38},
+ 	{"LAN",								39},
+-	{"Management subsytem health",40},
++	{"Management subsystem health",40},
+ 	{"Battery",							41},
+ 	{NULL}
+ }	};
+Index: trunk/doc/ipmievd.8
+===================================================================
+--- trunk.orig/doc/ipmievd.8
++++ trunk/doc/ipmievd.8
+@@ -145,7 +145,7 @@ placed at the end of commands to get opt
+ > ipmievd help
+ .br 
+ Commands:
+-    open    Use OpenIPMI for asyncronous notification of events
++    open    Use OpenIPMI for asynchronous notification of events
+     sel     Poll SEL for notification of events
+ 
+ .TP 
diff --git a/debian/patches/0500-fix_CVE-2011-4339.patch b/debian/patches/0500-fix_CVE-2011-4339.patch
index 8360417..62a9d0c 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
-@@ -664,7 +664,6 @@ ipmi_start_daemon(struct ipmi_intf *intf
+@@ -829,7 +829,6 @@ ipmi_start_daemon(struct ipmi_intf *intf
  #endif
  
  	chdir("/");