diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0105-typo.patch | 56 | ||||
| -rw-r--r-- | debian/patches/0600-typo-man.patch | 12 | ||||
| -rw-r--r-- | debian/patches/0705-crontab.patch | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 89 insertions, 0 deletions
diff --git a/debian/patches/0105-typo.patch b/debian/patches/0105-typo.patch index 6be4bb5..3d7f36c 100644 --- a/debian/patches/0105-typo.patch +++ b/debian/patches/0105-typo.patch @@ -8,6 +8,15 @@ Index: trunk/util/ihpm.c =================================================================== --- trunk.orig/util/ihpm.c +++ trunk/util/ihpm.c +@@ -2741,7 +2741,7 @@ int HpmfwupgGetTargetUpgCapabilities(voi + bitField.autRollbackOverride ? 'y' : 'n'); + lprintf(LOG_NOTICE,"IPMC degraded...........[%c] ", pCtx->resp.GlobalCapabilities. + bitField.ipmcDegradedDurinUpg ? 'y' : 'n'); +- lprintf(LOG_NOTICE,"Defered activation......[%c] ", pCtx->resp.GlobalCapabilities. ++ 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'); @@ -3337,12 +3337,12 @@ int HpmfwupgQueryRollbackStatus(void *in if ( pCtx->resp.rollbackComp.ComponentBits.byte != 0 ) { @@ -23,6 +32,15 @@ Index: trunk/util/ihpm.c } } else if ( rsp->ccode == 0x81 ) +@@ -3476,7 +3476,7 @@ struct ipmi_rs * HpmfwupgSendCmd(void *i + { + /* keeping the inaccessTimeout to 60 seconds results in almost 2900 retries + * So if the target is not available it will be retrying the command for 2900 +- * times which is not effecient -So reducing the Timout to 5 seconds which is ++ * times which is not effecient -So reducing the Timeout to 5 seconds which is + * almost 200 retries if it continuously recieves 0xC3 as completion code. + */ + inaccessTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT; @@ -3747,7 +3747,7 @@ static void HpmfwupgPrintUsage(void) lprintf(LOG_NOTICE," component 0 - BOOT"); lprintf(LOG_NOTICE," component 1 - RTK"); @@ -45,3 +63,41 @@ Index: trunk/lib/lanplus/lanplus.c goto fail; } } +Index: trunk/hpiutil/hpisel.c +=================================================================== +--- trunk.orig/hpiutil/hpisel.c ++++ trunk/hpiutil/hpisel.c +@@ -293,12 +293,12 @@ struct { + #define NCRITS 10 + char * crit_int_str[NCRITS] = { /* Critical Interrupt descriptions */ + /*00*/ "FP NMI ", /* Front Panel NMI */ +- /*01*/ "Bus Timout", ++ /*01*/ "Bus Timeout", + /*02*/ "IOch NMI ", /* IO channel check NMI */ + /*03*/ "Soft NMI ", + /*04*/ "PCI PERR ", + /*05*/ "PCI SERR ", +- /*06*/ "EISA Timout", ++ /*06*/ "EISA Timeout", + /*07*/ "Bus Warn ", /* Bus Correctable Error */ + /*08*/ "Bus Error", /* Bus Uncorrectable Error */ + /*09*/ "Fatal NMI" }; +Index: trunk/util/ievents.c +=================================================================== +--- trunk.orig/util/ievents.c ++++ trunk/util/ievents.c +@@ -269,12 +269,12 @@ static struct { + #define NCRITS 10 + char * crit_int_str[NCRITS] = { /* Critical Interrupt descriptions */ + /*00*/ "FP NMI ", /* Front Panel NMI */ +- /*01*/ "Bus Timout", ++ /*01*/ "Bus Timeout", + /*02*/ "IOch NMI ", /* IO channel check NMI */ + /*03*/ "Soft NMI ", + /*04*/ "PCI PERR ", + /*05*/ "PCI SERR ", +- /*06*/ "EISA Timout", ++ /*06*/ "EISA Timeout", + /*07*/ "Bus Warn ", /* Bus Correctable Error */ + /*08*/ "Bus Error", /* Bus Uncorrectable Error */ + /*09*/ "Fatal NMI" }; diff --git a/debian/patches/0600-typo-man.patch b/debian/patches/0600-typo-man.patch index 9d4be3e..1e1c2ef 100644 --- a/debian/patches/0600-typo-man.patch +++ b/debian/patches/0600-typo-man.patch @@ -65,3 +65,15 @@ Index: trunk/doc/iekanalyzer.8 .TP \fIunmatch\fP \fBxx=filename\fR \fBxx=filename\fR \fB...\fr .br +Index: trunk/doc/ifru.8 +=================================================================== +--- trunk.orig/doc/ifru.8 ++++ trunk/doc/ifru.8 +@@ -1,6 +1,6 @@ + .TH IFRU 8 "Version 1.4: 09 Sep 2010" + .SH NAME +-ipmiutil_fru \- show Field Replacable Unit configuration data ++ipmiutil_fru \- show Field Replaceable Unit configuration data + .SH SYNOPSIS + .B "ipmiutil fru [-abcdeikmsvx -N node -U user -P/-R pswd -EFJTVY]" + diff --git a/debian/patches/0705-crontab.patch b/debian/patches/0705-crontab.patch new file mode 100644 index 0000000..375ddba --- /dev/null +++ b/debian/patches/0705-crontab.patch @@ -0,0 +1,20 @@ +Description: Prevent watchdog to send minutly emails and log entries +Author: Harry Coin <hcoin@quietfountain.com> +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipmiutil/+bug/1535408 +Last-Update: 2016-05-15 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/scripts/ipmiutil_wdt +=================================================================== +--- trunk.orig/scripts/ipmiutil_wdt ++++ trunk/scripts/ipmiutil_wdt +@@ -63,7 +63,8 @@ start() { + # RETVAL=$? + # restart the watchdog every 60 seconds via /etc/cron.d + cat - <<%%% >$wdtcron +-* * * * * root $prog -r >/dev/null ++MAILTO='' ++* * * * * root $prog -r > $prog.lastrun 2&>1 + %%% + # make crond re-read the /etc/cron.d + $crond_sh restart >>$wdtlog diff --git a/debian/patches/series b/debian/patches/series index b5e7553..3c0bdc5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0105-typo.patch 0700-init.patch 0600-typo-man.patch +0705-crontab.patch |