From 22cd9f1d484d8609f616b6500c0c658a9b07d5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 6 Nov 2015 03:11:45 +0100 Subject: Refresh and rename patches --- debian/patches/003-typo-man.patch | 67 ---------- debian/patches/005-init.patch | 219 -------------------------------- debian/patches/0100-out-of-bounds.patch | 61 +++++++++ debian/patches/0600-typo-man.patch | 67 ++++++++++ debian/patches/0700-init.patch | 219 ++++++++++++++++++++++++++++++++ debian/patches/100-out-of-bounds.patch | 61 --------- debian/patches/series | 6 +- 7 files changed, 350 insertions(+), 350 deletions(-) delete mode 100644 debian/patches/003-typo-man.patch delete mode 100644 debian/patches/005-init.patch create mode 100644 debian/patches/0100-out-of-bounds.patch create mode 100644 debian/patches/0600-typo-man.patch create mode 100644 debian/patches/0700-init.patch delete mode 100644 debian/patches/100-out-of-bounds.patch (limited to 'debian/patches') diff --git a/debian/patches/003-typo-man.patch b/debian/patches/003-typo-man.patch deleted file mode 100644 index 9d4be3e..0000000 --- a/debian/patches/003-typo-man.patch +++ /dev/null @@ -1,67 +0,0 @@ -Description: typo manpages -Author: Jörg Frings-Fürst -Last-Update: 2014-06-04 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/doc/iseltime.8 -=================================================================== ---- trunk.orig/doc/iseltime.8 -+++ trunk/doc/iseltime.8 -@@ -54,7 +54,7 @@ Use a specified IPMI LAN Authentication - Use a specified IPMI LAN privilege level. 1=Callback level, 2=User level, 3=Operator level, 4=Administrator level (default), 5=OEM level. - .IP "-Y" - Yes, do prompt the user for the IPMI LAN remote password. --Alternatives for the password are -E or -P. -+Alternatives for the password are \-E or \-P. - - - .SH "SEE ALSO" -Index: trunk/doc/iekanalyzer.8 -=================================================================== ---- trunk.orig/doc/iekanalyzer.8 -+++ trunk/doc/iekanalyzer.8 -@@ -114,7 +114,7 @@ Display point to point physical connecti - AMC slot B2 topology: - Port 0 =====> On Carrier Device ID 0, Port 3 - Port 2 =====> AMC slot B1, Port 2 -- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -+ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* - From Carrier file: carrierfru - On Carrier Device ID 0 topology: - Port 0 =====> AMC slot B1, Port 4 -@@ -170,7 +170,7 @@ and an AMC module or between 2 AMC modul - Link Type: AMC.2 Ethernet - Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link - Link Group ID: 0 || Link Asym. Match: exact match -- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -+ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* - AMC slot B1 port 1 ==> On-Carrier Device 0 port 12 - Matching Result - From On-Carrier Device ID 0 -@@ -183,7 +183,7 @@ and an AMC module or between 2 AMC modul - Link Type: AMC.2 Ethernet - Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link - Link Group ID: 0 || Link Asym. Match: exact match -- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -+ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* - On-Carrier Device vs AMC slot A2 - AMC slot A2 port 0 ==> On-Carrier Device 0 port 3 - Matching Result -@@ -197,7 +197,7 @@ and an AMC module or between 2 AMC modul - Link Type: AMC.2 Ethernet - Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link - Link Group ID: 0 || Link Asym. Match: exact match -- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -+ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* - AMC slot B1 vs AMC slot A2 - AMC slot A2 port 2 ==> AMC slot B1 port 2 - Matching Result -@@ -211,7 +211,7 @@ and an AMC module or between 2 AMC modul - Link Type: AMC.3 Storage - Link Type extension: Serial Attached SCSI (SAS/SATA) - Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match} -- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -+ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* - .TP - \fIunmatch\fP \fBxx=filename\fR \fBxx=filename\fR \fB...\fr - .br diff --git a/debian/patches/005-init.patch b/debian/patches/005-init.patch deleted file mode 100644 index 954e034..0000000 --- a/debian/patches/005-init.patch +++ /dev/null @@ -1,219 +0,0 @@ -Description: include lsb/init-functions -Author: Jörg Frings-Fürst -Last-Update: 2014-08-09 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/scripts/ipmi_port.sh -=================================================================== ---- trunk.orig/scripts/ipmi_port.sh -+++ trunk/scripts/ipmi_port.sh -@@ -14,8 +14,8 @@ - # Provides: ipmi_port - # Required-Start: $local_fs $network $remote_fs - # Required-Stop: $local_fs $network $remote_fs --# Default-Start: 3 4 5 3 4 5 --# Default-Stop: 0 1 2 6 0 1 2 6 -+# Default-Start: 2 3 4 5 -+# Default-Stop: 0 1 6 - # Short-Description: ipmi_port reserves the RMCP port from portmap - # Description: ipmi_port is used to reserve the RMCP port from portmap - ### END INIT INFO -@@ -40,6 +40,8 @@ threshout=${vardir}/thresh_out.txt - # This threshold script could be created by ipmiutil sensor -p ... - thresh="${vardir}/thresholds.sh" - -+. /lib/lsb/init-functions -+ - getpid () { - # This is messy if the parent script is same name as $1 - p=`ps -ef |grep "$1" |grep -v grep |awk '{print $2}'` -@@ -184,4 +186,3 @@ case "$1" in - esac - - exit $? -- -Index: trunk/scripts/ipmiutil_asy -=================================================================== ---- trunk.orig/scripts/ipmiutil_asy -+++ trunk/scripts/ipmiutil_asy -@@ -13,8 +13,8 @@ - # Provides: ipmiutil_asy - # Required-Start: $local_fs $remote_fs $syslog - # Required-Stop: $local_fs $remote_fs $syslog --# Default-Start: 3 4 5 3 4 5 --# Default-Stop: 0 1 2 6 0 1 2 6 -+# Default-Start: 2 3 4 5 -+# Default-Stop: 0 1 6 - # Short-Description: ipmiutil async bridge agent init script - # Description: Init script starts ipmiutil async bridge agent for remote reset - ### END INIT INFO -@@ -37,6 +37,8 @@ getpid () { - echo $p - } - -+. /lib/lsb/init-functions -+ - start() - { - echo -n "Starting $dname: " -@@ -152,4 +154,3 @@ case "$1" in - exit 2 - esac - exit $? -- -Index: trunk/scripts/ipmiutil_wdt -=================================================================== ---- trunk.orig/scripts/ipmiutil_wdt -+++ trunk/scripts/ipmiutil_wdt -@@ -14,8 +14,8 @@ - # Provides: ipmiutil_wdt - # Required-Start: $local_fs $remote_fs $syslog - # Required-Stop: $local_fs $remote_fs $syslog --# Default-Start: 3 4 5 3 4 5 --# Default-Stop: 0 1 2 6 0 1 2 6 -+# Default-Start: 2 3 4 5 -+# Default-Stop: 0 1 6 - # Short-Description: ipmiutil watchdog timer init script - # Description: Init script to enable and reset ipmiutil watchdog timer via cron - ### END INIT INFO -@@ -33,6 +33,8 @@ wdtlog=/var/log/$name - #tmpcron=/tmp/wdtcron.$$ - # tmpcron2=/tmp/wdtcron2.$$ - -+. /lib/lsb/init-functions -+ - start() { - echo -n "Starting $prog: " - echo -@@ -137,10 +139,13 @@ case "$1" in - restart) - restart - ;; -+ force-reload) -+ restart -+ ;; - reload) - restart - ;; - *) -- echo "Usage: $0 {start|stop|status|restart|reload}" -+ echo "Usage: $0 {start|stop|status|restart|force-reload|reload}" - exit 1 - esac -Index: trunk/scripts/ipmiutil_evt -=================================================================== ---- trunk.orig/scripts/ipmiutil_evt -+++ trunk/scripts/ipmiutil_evt -@@ -15,8 +15,8 @@ - # Provides: ipmiutil_evt - # Required-Start: $local_fs $remote_fs $syslog - # Required-Stop: $local_fs $remote_fs $syslog --# Default-Start: 3 4 5 3 4 5 --# Default-Stop: 0 1 2 6 0 1 2 6 -+# Default-Start: 2 3 4 5 -+# Default-Stop: 0 1 6 - # Short-Description: ipmiutil event monitoring init script - # Description: Init script starts ipmiutil event monitoring service - ### END INIT INFO -@@ -40,6 +40,8 @@ getpid () { - echo $p - } - -+. /lib/lsb/init-functions -+ - start() - { - echo -n "Starting $name: " -@@ -155,4 +157,3 @@ case "$1" in - exit 2 - esac - exit $? -- -Index: trunk/configure.ac -=================================================================== ---- trunk.orig/configure.ac -+++ trunk/configure.ac -@@ -374,11 +374,11 @@ else - MD2_CFLAGS="-DSKIP_MD2" - init0=/etc/rc.d/init.d - fi -- if test $isredhat -eq 0 ; then -+# if test $isredhat -eq 0 ; then - # set default start/stop for init scripts -- sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts -- sed -i 's/# Default-Stop:/# Default-Stop: 0 1 2 6/' $init_scripts -- fi -+# sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts -+# sed -i 's/# Default-Stop:/# Default-Stop: 0 1 2 6/' $init_scripts -+# fi - if test -f "$LIB_DIR/libcrypto.so"; then - strings $LIB_DIR/libcrypto.so | grep EVP_md2 >/dev/null 2>&1 - if test $? -ne 0; then -Index: trunk/scripts/ipmi_info -=================================================================== ---- trunk.orig/scripts/ipmi_info -+++ trunk/scripts/ipmi_info -@@ -11,8 +11,8 @@ - # Provides: ipmi_info - # Required-Start: $local_fs $network $remote_fs - # Required-Stop: $local_fs $network $remote_fs --# Default-Start: --# Default-Stop: -+# Default-Start: 2 3 4 5 -+# Default-Stop: 0 1 6 - # Short-Description: ipmi_info saves OS info to the IPMI system info - # Description: ipmi_info saves OS info to the IPMI system info - ### END INIT INFO -@@ -21,6 +21,8 @@ name=ipmi_info - iuprog=/usr/bin/ipmiutil - tmp=/tmp/ipmi_info.tmp - -+. /lib/lsb/init-functions -+ - getosver() { - if [ -f /etc/os-release ]; then - . /etc/os-release -@@ -121,4 +123,3 @@ case "$1" in - esac - - exit $? -- -Index: trunk/scripts/ipmiutil_asy.service -=================================================================== ---- trunk.orig/scripts/ipmiutil_asy.service -+++ trunk/scripts/ipmiutil_asy.service -@@ -11,4 +11,3 @@ ExecStart=/usr/bin/ipmiutil getevt -a -b - - [Install] - WantedBy=multi-user.target -- -Index: trunk/scripts/ipmiutil_evt.service -=================================================================== ---- trunk.orig/scripts/ipmiutil_evt.service -+++ trunk/scripts/ipmiutil_evt.service -@@ -11,5 +11,3 @@ ExecStart=/usr/bin/ipmiutil getevt $IPMI - - [Install] - WantedBy=multi-user.target -- -- -Index: trunk/scripts/ipmiutil_wdt.service -=================================================================== ---- trunk.orig/scripts/ipmiutil_wdt.service -+++ trunk/scripts/ipmiutil_wdt.service -@@ -10,5 +10,3 @@ RemainAfterExit=1 - - [Install] - WantedBy=multi-user.target -- -- -Index: trunk/scripts/ipmi_port.service -=================================================================== ---- trunk.orig/scripts/ipmi_port.service -+++ trunk/scripts/ipmi_port.service -@@ -11,5 +11,3 @@ ExecStart=/usr/sbin/ipmi_port -b - - [Install] - WantedBy=multi-user.target -- -- diff --git a/debian/patches/0100-out-of-bounds.patch b/debian/patches/0100-out-of-bounds.patch new file mode 100644 index 0000000..19ba67b --- /dev/null +++ b/debian/patches/0100-out-of-bounds.patch @@ -0,0 +1,61 @@ +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/0600-typo-man.patch b/debian/patches/0600-typo-man.patch new file mode 100644 index 0000000..9d4be3e --- /dev/null +++ b/debian/patches/0600-typo-man.patch @@ -0,0 +1,67 @@ +Description: typo manpages +Author: Jörg Frings-Fürst +Last-Update: 2014-06-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/doc/iseltime.8 +=================================================================== +--- trunk.orig/doc/iseltime.8 ++++ trunk/doc/iseltime.8 +@@ -54,7 +54,7 @@ Use a specified IPMI LAN Authentication + Use a specified IPMI LAN privilege level. 1=Callback level, 2=User level, 3=Operator level, 4=Administrator level (default), 5=OEM level. + .IP "-Y" + Yes, do prompt the user for the IPMI LAN remote password. +-Alternatives for the password are -E or -P. ++Alternatives for the password are \-E or \-P. + + + .SH "SEE ALSO" +Index: trunk/doc/iekanalyzer.8 +=================================================================== +--- trunk.orig/doc/iekanalyzer.8 ++++ trunk/doc/iekanalyzer.8 +@@ -114,7 +114,7 @@ Display point to point physical connecti + AMC slot B2 topology: + Port 0 =====> On Carrier Device ID 0, Port 3 + Port 2 =====> AMC slot B1, Port 2 +- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* ++ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + From Carrier file: carrierfru + On Carrier Device ID 0 topology: + Port 0 =====> AMC slot B1, Port 4 +@@ -170,7 +170,7 @@ and an AMC module or between 2 AMC modul + Link Type: AMC.2 Ethernet + Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link + Link Group ID: 0 || Link Asym. Match: exact match +- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* ++ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + AMC slot B1 port 1 ==> On-Carrier Device 0 port 12 + Matching Result + From On-Carrier Device ID 0 +@@ -183,7 +183,7 @@ and an AMC module or between 2 AMC modul + Link Type: AMC.2 Ethernet + Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link + Link Group ID: 0 || Link Asym. Match: exact match +- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* ++ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + On-Carrier Device vs AMC slot A2 + AMC slot A2 port 0 ==> On-Carrier Device 0 port 3 + Matching Result +@@ -197,7 +197,7 @@ and an AMC module or between 2 AMC modul + Link Type: AMC.2 Ethernet + Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link + Link Group ID: 0 || Link Asym. Match: exact match +- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* ++ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + AMC slot B1 vs AMC slot A2 + AMC slot A2 port 2 ==> AMC slot B1 port 2 + Matching Result +@@ -211,7 +211,7 @@ and an AMC module or between 2 AMC modul + Link Type: AMC.3 Storage + Link Type extension: Serial Attached SCSI (SAS/SATA) + Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match} +- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* ++ *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + .TP + \fIunmatch\fP \fBxx=filename\fR \fBxx=filename\fR \fB...\fr + .br diff --git a/debian/patches/0700-init.patch b/debian/patches/0700-init.patch new file mode 100644 index 0000000..42c60c0 --- /dev/null +++ b/debian/patches/0700-init.patch @@ -0,0 +1,219 @@ +Description: include lsb/init-functions +Author: Jörg Frings-Fürst +Last-Update: 2014-08-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/scripts/ipmi_port.sh +=================================================================== +--- trunk.orig/scripts/ipmi_port.sh ++++ trunk/scripts/ipmi_port.sh +@@ -14,8 +14,8 @@ + # Provides: ipmi_port + # Required-Start: $local_fs $network $remote_fs + # Required-Stop: $local_fs $network $remote_fs +-# Default-Start: 3 4 5 3 4 5 +-# Default-Stop: 0 1 2 6 0 1 2 6 ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + # Short-Description: ipmi_port reserves the RMCP port from portmap + # Description: ipmi_port is used to reserve the RMCP port from portmap + ### END INIT INFO +@@ -40,6 +40,8 @@ threshout=${vardir}/thresh_out.txt + # This threshold script could be created by ipmiutil sensor -p ... + thresh="${vardir}/thresholds.sh" + ++. /lib/lsb/init-functions ++ + getpid () { + # This is messy if the parent script is same name as $1 + p=`ps -ef |grep "$1" |grep -v grep |awk '{print $2}'` +@@ -184,4 +186,3 @@ case "$1" in + esac + + exit $? +- +Index: trunk/scripts/ipmiutil_asy +=================================================================== +--- trunk.orig/scripts/ipmiutil_asy ++++ trunk/scripts/ipmiutil_asy +@@ -13,8 +13,8 @@ + # Provides: ipmiutil_asy + # Required-Start: $local_fs $remote_fs $syslog + # Required-Stop: $local_fs $remote_fs $syslog +-# Default-Start: 3 4 5 3 4 5 +-# Default-Stop: 0 1 2 6 0 1 2 6 ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + # Short-Description: ipmiutil async bridge agent init script + # Description: Init script starts ipmiutil async bridge agent for remote reset + ### END INIT INFO +@@ -37,6 +37,8 @@ getpid () { + echo $p + } + ++. /lib/lsb/init-functions ++ + start() + { + echo -n "Starting $dname: " +@@ -152,4 +154,3 @@ case "$1" in + exit 2 + esac + exit $? +- +Index: trunk/scripts/ipmiutil_wdt +=================================================================== +--- trunk.orig/scripts/ipmiutil_wdt ++++ trunk/scripts/ipmiutil_wdt +@@ -14,8 +14,8 @@ + # Provides: ipmiutil_wdt + # Required-Start: $local_fs $remote_fs $syslog + # Required-Stop: $local_fs $remote_fs $syslog +-# Default-Start: 3 4 5 3 4 5 +-# Default-Stop: 0 1 2 6 0 1 2 6 ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + # Short-Description: ipmiutil watchdog timer init script + # Description: Init script to enable and reset ipmiutil watchdog timer via cron + ### END INIT INFO +@@ -33,6 +33,8 @@ wdtlog=/var/log/$name + #tmpcron=/tmp/wdtcron.$$ + # tmpcron2=/tmp/wdtcron2.$$ + ++. /lib/lsb/init-functions ++ + start() { + echo -n "Starting $prog: " + echo +@@ -137,10 +139,13 @@ case "$1" in + restart) + restart + ;; ++ force-reload) ++ restart ++ ;; + reload) + restart + ;; + *) +- echo "Usage: $0 {start|stop|status|restart|reload}" ++ echo "Usage: $0 {start|stop|status|restart|force-reload|reload}" + exit 1 + esac +Index: trunk/scripts/ipmiutil_evt +=================================================================== +--- trunk.orig/scripts/ipmiutil_evt ++++ trunk/scripts/ipmiutil_evt +@@ -15,8 +15,8 @@ + # Provides: ipmiutil_evt + # Required-Start: $local_fs $remote_fs $syslog + # Required-Stop: $local_fs $remote_fs $syslog +-# Default-Start: 3 4 5 3 4 5 +-# Default-Stop: 0 1 2 6 0 1 2 6 ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + # Short-Description: ipmiutil event monitoring init script + # Description: Init script starts ipmiutil event monitoring service + ### END INIT INFO +@@ -40,6 +40,8 @@ getpid () { + echo $p + } + ++. /lib/lsb/init-functions ++ + start() + { + echo -n "Starting $name: " +@@ -155,4 +157,3 @@ case "$1" in + exit 2 + esac + exit $? +- +Index: trunk/scripts/ipmi_info +=================================================================== +--- trunk.orig/scripts/ipmi_info ++++ trunk/scripts/ipmi_info +@@ -11,8 +11,8 @@ + # Provides: ipmi_info + # Required-Start: $local_fs $network $remote_fs + # Required-Stop: $local_fs $network $remote_fs +-# Default-Start: +-# Default-Stop: ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + # Short-Description: ipmi_info saves OS info to the IPMI system info + # Description: ipmi_info saves OS info to the IPMI system info + ### END INIT INFO +@@ -21,6 +21,8 @@ name=ipmi_info + iuprog=/usr/bin/ipmiutil + tmp=/tmp/ipmi_info.tmp + ++. /lib/lsb/init-functions ++ + getosver() { + if [ -f /etc/os-release ]; then + . /etc/os-release +@@ -121,4 +123,3 @@ case "$1" in + esac + + exit $? +- +Index: trunk/scripts/ipmiutil_asy.service +=================================================================== +--- trunk.orig/scripts/ipmiutil_asy.service ++++ trunk/scripts/ipmiutil_asy.service +@@ -11,4 +11,3 @@ ExecStart=/usr/bin/ipmiutil getevt -a -b + + [Install] + WantedBy=multi-user.target +- +Index: trunk/scripts/ipmiutil_evt.service +=================================================================== +--- trunk.orig/scripts/ipmiutil_evt.service ++++ trunk/scripts/ipmiutil_evt.service +@@ -11,5 +11,3 @@ ExecStart=/usr/bin/ipmiutil getevt $IPMI + + [Install] + WantedBy=multi-user.target +- +- +Index: trunk/scripts/ipmiutil_wdt.service +=================================================================== +--- trunk.orig/scripts/ipmiutil_wdt.service ++++ trunk/scripts/ipmiutil_wdt.service +@@ -10,5 +10,3 @@ RemainAfterExit=1 + + [Install] + WantedBy=multi-user.target +- +- +Index: trunk/scripts/ipmi_port.service +=================================================================== +--- trunk.orig/scripts/ipmi_port.service ++++ trunk/scripts/ipmi_port.service +@@ -11,5 +11,3 @@ ExecStart=/usr/sbin/ipmi_port -b + + [Install] + WantedBy=multi-user.target +- +- +Index: trunk/configure.ac +=================================================================== +--- trunk.orig/configure.ac ++++ trunk/configure.ac +@@ -389,11 +389,11 @@ else + MD2_CFLAGS="-DSKIP_MD2" + init0=/etc/rc.d/init.d + fi +- if test $isredhat -eq 0 ; then ++# if test $isredhat -eq 0 ; then + # set default start/stop for init scripts +- sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts +- sed -i 's/# Default-Stop:/# Default-Stop: 0 1 2 6/' $init_scripts +- fi ++# sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts ++# sed -i 's/# Default-Stop:/# Default-Stop: 0 1 2 6/' $init_scripts ++# fi + if test -f "$LIB_DIR/libcrypto.so"; then + strings $LIB_DIR/libcrypto.so | grep EVP_md2 >/dev/null 2>&1 + if test $? -ne 0; then diff --git a/debian/patches/100-out-of-bounds.patch b/debian/patches/100-out-of-bounds.patch deleted file mode 100644 index 19ba67b..0000000 --- a/debian/patches/100-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/series b/debian/patches/series index 2777650..6bb1f7e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ -#100-out-of-bounds.patch -005-init.patch -003-typo-man.patch +#0100-out-of-bounds.patch +0700-init.patch +0600-typo-man.patch -- cgit v1.2.3