From cfd13fc6beb71ebf086b896b6cdc90aeaaedf627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 15 Mar 2023 21:19:30 +0100 Subject: Refresh d/p/0105-typo.patch --- debian/changelog | 3 +- debian/patches/0105-typo.patch | 13 +++++ debian/patches/0105-typo.patch~ | 103 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0105-typo.patch~ diff --git a/debian/changelog b/debian/changelog index 08c1823..2d5947a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -ipmiutil (3.1.9-5) UNRELEASED; urgency=medium +ipmiutil (3.1.9-1) UNRELEASED; urgency=medium * New upstream release. - Refresh patches: + debian/patches/0700-init.patch + debian/patches/0705-crontab.patch + + debian/patches/0105-typo.patch -- Jörg Frings-Fürst Wed, 15 Mar 2023 20:37:19 +0100 diff --git a/debian/patches/0105-typo.patch b/debian/patches/0105-typo.patch index 70c9875..d3934a9 100644 --- a/debian/patches/0105-typo.patch +++ b/debian/patches/0105-typo.patch @@ -101,3 +101,16 @@ Index: trunk/util/ievents.c /*07*/ "Bus Warn ", /* Bus Correctable Error */ /*08*/ "Bus Error", /* Bus Uncorrectable Error */ /*09*/ "Fatal NMI" }; +Index: trunk/util/oem_dell.c +=================================================================== +--- trunk.orig/util/oem_dell.c ++++ trunk/util/oem_dell.c +@@ -5642,7 +5642,7 @@ char * get_dell_evt_desc(uchar *sel_rec, + if(code == 0x10) + { + if((data1 & 0x0f) == 0x03) { +- snprintf(desc,SIZE_OF_DESC,"All Even Logging Dissabled"); ++ snprintf(desc,SIZE_OF_DESC,"All Even Logging Disabled"); + *psev = SEV_INFO; + } + } diff --git a/debian/patches/0105-typo.patch~ b/debian/patches/0105-typo.patch~ new file mode 100644 index 0000000..70c9875 --- /dev/null +++ b/debian/patches/0105-typo.patch~ @@ -0,0 +1,103 @@ +Description: some source typos +Author: Jörg Frings-Fürst +Forwarded: Not possible because not authorized +Last-Update: 2018-06-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +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 ) + { + /* Rollback occured */ +- lprintf(LOG_NOTICE,"Rollback occured on component mask: 0x%02x", ++ lprintf(LOG_NOTICE,"Rollback occurred on component mask: 0x%02x", + pCtx->resp.rollbackComp.ComponentBits.byte); + } + else + { +- lprintf(LOG_NOTICE,"No Firmware rollback occured"); ++ lprintf(LOG_NOTICE,"No Firmware rollback occurred"); + } + } + 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"); + lprintf(LOG_NOTICE,"upgrade activate - Upgrade the firmware using a valid HPM.1 image "); +- lprintf(LOG_NOTICE," If activate is specified, activate new firmware rigth"); ++ lprintf(LOG_NOTICE," If activate is specified, activate new firmware right"); + lprintf(LOG_NOTICE," away"); + lprintf(LOG_NOTICE,"activate [norollback] - Activate the newly uploaded firmware"); + lprintf(LOG_NOTICE,"targetcap - Get the target upgrade capabilities"); +Index: trunk/lib/lanplus/lanplus.c +=================================================================== +--- trunk.orig/lib/lanplus/lanplus.c ++++ trunk/lib/lanplus/lanplus.c +@@ -3819,7 +3819,7 @@ ipmi_lanplus_open(struct ipmi_intf * int + if (ipmi_get_auth_capabilities_cmd(intf, &auth_cap)) + { + lprintf(LOG_INFO, "Error issuing Get Channel " +- "Authentication Capabilies request"); ++ "Authentication Capabilities request"); + 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 +@@ -275,12 +275,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" }; -- cgit v1.2.3 From 268263f8861bb803099aae6dbcd9e20a4ce78168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 15 Mar 2023 21:22:50 +0100 Subject: Remove old patches --- debian/changelog | 3 + debian/patches/0100-out-of-bounds.patch | 61 ------------------- debian/patches/0105-typo.patch~ | 103 -------------------------------- debian/patches/0710-systemd.patch | 21 ------- debian/patches/series | 3 - 5 files changed, 3 insertions(+), 188 deletions(-) delete mode 100644 debian/patches/0100-out-of-bounds.patch delete mode 100644 debian/patches/0105-typo.patch~ delete mode 100644 debian/patches/0710-systemd.patch diff --git a/debian/changelog b/debian/changelog index 2d5947a..342119d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ ipmiutil (3.1.9-1) UNRELEASED; urgency=medium + debian/patches/0700-init.patch + debian/patches/0705-crontab.patch + debian/patches/0105-typo.patch + * Remove old patches: + - debian/patches/0100-out-of-bounds.patch + - debian/patches/0710-systemd.patch -- Jörg Frings-Fürst Wed, 15 Mar 2023 20:37:19 +0100 diff --git a/debian/patches/0100-out-of-bounds.patch b/debian/patches/0100-out-of-bounds.patch deleted file mode 100644 index 19ba67b..0000000 --- a/debian/patches/0100-out-of-bounds.patch +++ /dev/null @@ -1,61 +0,0 @@ -Description: prevent out-of-bounds -Author: Jörg Frings-Fürst -Forwarded: https://sourceforge.net/p/ipmiutil/mailman/ipmiutil-developers/?viewmonth=201410 -Last-Update: 2014-10-29 ---- -Index: trunk/util/ievents.c -=================================================================== ---- trunk.orig/util/ievents.c -+++ trunk/util/ievents.c -@@ -193,10 +193,10 @@ static const char *sensor_types[NSTYPES] - /* 2Eh */ "ME" /* 0xDC == ME Node Manager */ - }; - --#define NFWERRS 15 -+#define NFWERRS 14 - static struct { /* See Table 36-3, type 0Fh, offset 00h */ - int code; char *msg; -- } fwerrs[NFWERRS] = { -+ } fwerrs[NFWERRS + 1] = { - { 0x00, "Unspecified"}, - { 0x01, "No system memory"}, - { 0x02, "No usable memory"}, -@@ -214,10 +214,10 @@ static struct { /* See Table 36-3, ty - { 0x0E, "Reserved" } - }; - --#define NFWSTAT 27 -+#define NFWSTAT 26 - static struct { /* See Table 36-3, type 0Fh, offset 01h & 02h */ - int code; char *msg; -- } fwstat[NFWSTAT] = { -+ } fwstat[NFWSTAT + 1] = { - { 0x00, "Unspecified"}, - { 0x01, "Memory init"}, - { 0x02, "Hard disk init"}, -Index: trunk/util/ifirewall.h -=================================================================== ---- trunk.orig/util/ifirewall.h -+++ trunk/util/ifirewall.h -@@ -82,7 +82,7 @@ struct lun_netfn_support { - }; - struct lun_support { - unsigned char support; -- struct lun_netfn_support netfn[MAX_NETFN_PAIR]; -+ struct lun_netfn_support netfn[MAX_NETFN]; - }; - struct bmc_fn_support { - struct lun_support lun[MAX_LUN]; -Index: trunk/util/iconfig.c -=================================================================== ---- trunk.orig/util/iconfig.c -+++ trunk/util/iconfig.c -@@ -1765,7 +1765,7 @@ int SerialIsOptional(int bparam) - int optvals[9] = { 5, 9, 10, 11, 12, 13, 14, 20, 21 }; - int rv = 0; - int i; -- for (i = 0; i < sizeof(optvals); i++) { -+ for (i = 0; i < (sizeof(optvals) / sizeof(int)); i++) { - if (optvals[i] == bparam) { rv = 1; break; } - } - return(rv); diff --git a/debian/patches/0105-typo.patch~ b/debian/patches/0105-typo.patch~ deleted file mode 100644 index 70c9875..0000000 --- a/debian/patches/0105-typo.patch~ +++ /dev/null @@ -1,103 +0,0 @@ -Description: some source typos -Author: Jörg Frings-Fürst -Forwarded: Not possible because not authorized -Last-Update: 2018-06-26 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -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 ) - { - /* Rollback occured */ -- lprintf(LOG_NOTICE,"Rollback occured on component mask: 0x%02x", -+ lprintf(LOG_NOTICE,"Rollback occurred on component mask: 0x%02x", - pCtx->resp.rollbackComp.ComponentBits.byte); - } - else - { -- lprintf(LOG_NOTICE,"No Firmware rollback occured"); -+ lprintf(LOG_NOTICE,"No Firmware rollback occurred"); - } - } - 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"); - lprintf(LOG_NOTICE,"upgrade activate - Upgrade the firmware using a valid HPM.1 image "); -- lprintf(LOG_NOTICE," If activate is specified, activate new firmware rigth"); -+ lprintf(LOG_NOTICE," If activate is specified, activate new firmware right"); - lprintf(LOG_NOTICE," away"); - lprintf(LOG_NOTICE,"activate [norollback] - Activate the newly uploaded firmware"); - lprintf(LOG_NOTICE,"targetcap - Get the target upgrade capabilities"); -Index: trunk/lib/lanplus/lanplus.c -=================================================================== ---- trunk.orig/lib/lanplus/lanplus.c -+++ trunk/lib/lanplus/lanplus.c -@@ -3819,7 +3819,7 @@ ipmi_lanplus_open(struct ipmi_intf * int - if (ipmi_get_auth_capabilities_cmd(intf, &auth_cap)) - { - lprintf(LOG_INFO, "Error issuing Get Channel " -- "Authentication Capabilies request"); -+ "Authentication Capabilities request"); - 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 -@@ -275,12 +275,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/0710-systemd.patch b/debian/patches/0710-systemd.patch deleted file mode 100644 index 77ddc1b..0000000 --- a/debian/patches/0710-systemd.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Escape not allowed characters at ExecStart -Author: Jörg Frings-Fürst -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=848861 -Forwarded: https://sourceforge.net/p/ipmiutil/mailman/ipmiutil-developers/thread/1482238056.9870.6.camel%40jff-webhosting.net/#msg35561807 -Last-Update: 2016-12-20 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/scripts/ipmi_port.service -=================================================================== ---- trunk.orig/scripts/ipmi_port.service -+++ trunk/scripts/ipmi_port.service -@@ -6,7 +6,8 @@ After=network.target - Type=forking - PIDFile=/run/ipmi_port.pid - EnvironmentFile=/usr/share/ipmiutil/ipmiutil.env --ExecStart=/usr/share/ipmiutil/ipmiutil.setup >/dev/null && /usr/sbin/ipmi_port -b || : -+ExecStartPre=/usr/share/ipmiutil/ipmiutil.setup -+ExecStart=-/usr/sbin/ipmi_port -b - - [Install] - WantedBy=multi-user.target diff --git a/debian/patches/series b/debian/patches/series index 3cc68c3..c8614ec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,4 @@ -#0100-out-of-bounds.patch 0105-typo.patch 0700-init.patch 0600-typo-man.patch 0705-crontab.patch -#0710-systemd.patch - -- cgit v1.2.3 From 06b8b4b51519bfcf8d210eb199e2eab09e0c6a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 15 Mar 2023 21:27:24 +0100 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 342119d..fe5e22c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ipmiutil (3.1.9-1) UNRELEASED; urgency=medium +ipmiutil (3.1.9-1) unstable; urgency=medium * New upstream release. - Refresh patches: @@ -9,7 +9,7 @@ ipmiutil (3.1.9-1) UNRELEASED; urgency=medium - debian/patches/0100-out-of-bounds.patch - debian/patches/0710-systemd.patch - -- Jörg Frings-Fürst Wed, 15 Mar 2023 20:37:19 +0100 + -- Jörg Frings-Fürst Wed, 15 Mar 2023 21:26:30 +0100 ipmiutil (3.1.8-4) unstable; urgency=medium -- cgit v1.2.3