summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/005-init.patch80
2 files changed, 44 insertions, 42 deletions
diff --git a/debian/changelog b/debian/changelog
index 73fe335..70b08dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,11 @@ ipmiutil (2.9.6-1) UNRELEASED; urgency=medium
- Remove debian/patches/100-out-of-bounds.patch.
* Remove debian/source/options because compression xz is standard now.
* debian/watch:
- - Remove "debian uupdate"
+ - Remove "debian uupdate".
* debian/copyright:
- - Add year 2015
+ - Add year 2015.
+ * Refresh patches:
+ - debian/patches/005-init.patch.
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 12 Nov 2014 17:12:39 +0100
diff --git a/debian/patches/005-init.patch b/debian/patches/005-init.patch
index 938b511..954e034 100644
--- a/debian/patches/005-init.patch
+++ b/debian/patches/005-init.patch
@@ -5,8 +5,8 @@ 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 2014-08-10 13:32:43.716552784 +0200
-+++ trunk/scripts/ipmi_port.sh 2014-08-10 13:32:43.292544281 +0200
+--- 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
@@ -18,7 +18,7 @@ Index: trunk/scripts/ipmi_port.sh
# 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 @@
+@@ -40,6 +40,8 @@ threshout=${vardir}/thresh_out.txt
# This threshold script could be created by ipmiutil sensor -p ...
thresh="${vardir}/thresholds.sh"
@@ -27,15 +27,15 @@ Index: trunk/scripts/ipmi_port.sh
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 @@
+@@ -184,4 +186,3 @@ case "$1" in
esac
exit $?
-
Index: trunk/scripts/ipmiutil_asy
===================================================================
---- trunk.orig/scripts/ipmiutil_asy 2014-08-10 13:32:43.716552784 +0200
-+++ trunk/scripts/ipmiutil_asy 2014-08-10 13:32:43.292544281 +0200
+--- trunk.orig/scripts/ipmiutil_asy
++++ trunk/scripts/ipmiutil_asy
@@ -13,8 +13,8 @@
# Provides: ipmiutil_asy
# Required-Start: $local_fs $remote_fs $syslog
@@ -47,7 +47,7 @@ Index: trunk/scripts/ipmiutil_asy
# 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 @@
+@@ -37,6 +37,8 @@ getpid () {
echo $p
}
@@ -55,16 +55,16 @@ Index: trunk/scripts/ipmiutil_asy
+
start()
{
- echo -n $"Starting $dname: "
-@@ -152,4 +154,3 @@
+ 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 2014-08-10 13:32:43.716552784 +0200
-+++ trunk/scripts/ipmiutil_wdt 2014-08-10 13:32:43.296544361 +0200
+--- trunk.orig/scripts/ipmiutil_wdt
++++ trunk/scripts/ipmiutil_wdt
@@ -14,8 +14,8 @@
# Provides: ipmiutil_wdt
# Required-Start: $local_fs $remote_fs $syslog
@@ -76,16 +76,16 @@ Index: trunk/scripts/ipmiutil_wdt
# 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 @@
+@@ -33,6 +33,8 @@ wdtlog=/var/log/$name
#tmpcron=/tmp/wdtcron.$$
# tmpcron2=/tmp/wdtcron2.$$
+. /lib/lsb/init-functions
+
start() {
- echo -n $"Starting $prog: "
+ echo -n "Starting $prog: "
echo
-@@ -137,10 +139,13 @@
+@@ -137,10 +139,13 @@ case "$1" in
restart)
restart
;;
@@ -96,14 +96,14 @@ Index: trunk/scripts/ipmiutil_wdt
restart
;;
*)
-- echo $"Usage: $0 {start|stop|status|restart|reload}"
-+ echo $"Usage: $0 {start|stop|status|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 2014-08-10 13:32:43.716552784 +0200
-+++ trunk/scripts/ipmiutil_evt 2014-08-10 13:32:43.296544361 +0200
+--- trunk.orig/scripts/ipmiutil_evt
++++ trunk/scripts/ipmiutil_evt
@@ -15,8 +15,8 @@
# Provides: ipmiutil_evt
# Required-Start: $local_fs $remote_fs $syslog
@@ -115,7 +115,7 @@ Index: trunk/scripts/ipmiutil_evt
# Short-Description: ipmiutil event monitoring init script
# Description: Init script starts ipmiutil event monitoring service
### END INIT INFO
-@@ -40,6 +40,8 @@
+@@ -40,6 +40,8 @@ getpid () {
echo $p
}
@@ -123,17 +123,17 @@ Index: trunk/scripts/ipmiutil_evt
+
start()
{
- echo -n $"Starting $name: "
-@@ -155,4 +157,3 @@
+ echo -n "Starting $name: "
+@@ -155,4 +157,3 @@ case "$1" in
exit 2
esac
exit $?
-
Index: trunk/configure.ac
===================================================================
---- trunk.orig/configure.ac 2014-08-10 13:32:43.716552784 +0200
-+++ trunk/configure.ac 2014-08-10 13:32:43.296544361 +0200
-@@ -326,11 +326,11 @@
+--- trunk.orig/configure.ac
++++ trunk/configure.ac
+@@ -374,11 +374,11 @@ else
MD2_CFLAGS="-DSKIP_MD2"
init0=/etc/rc.d/init.d
fi
@@ -151,8 +151,8 @@ Index: trunk/configure.ac
if test $? -ne 0; then
Index: trunk/scripts/ipmi_info
===================================================================
---- trunk.orig/scripts/ipmi_info 2014-08-10 13:32:43.716552784 +0200
-+++ trunk/scripts/ipmi_info 2014-08-10 13:32:43.296544361 +0200
+--- trunk.orig/scripts/ipmi_info
++++ trunk/scripts/ipmi_info
@@ -11,8 +11,8 @@
# Provides: ipmi_info
# Required-Start: $local_fs $network $remote_fs
@@ -164,7 +164,7 @@ Index: trunk/scripts/ipmi_info
# 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 @@
+@@ -21,6 +21,8 @@ name=ipmi_info
iuprog=/usr/bin/ipmiutil
tmp=/tmp/ipmi_info.tmp
@@ -173,25 +173,25 @@ Index: trunk/scripts/ipmi_info
getosver() {
if [ -f /etc/os-release ]; then
. /etc/os-release
-@@ -121,4 +123,3 @@
+@@ -121,4 +123,3 @@ case "$1" in
esac
exit $?
-
Index: trunk/scripts/ipmiutil_asy.service
===================================================================
---- trunk.orig/scripts/ipmiutil_asy.service 2014-08-10 13:32:43.716552784 +0200
-+++ trunk/scripts/ipmiutil_asy.service 2014-08-10 13:32:43.296544361 +0200
-@@ -11,4 +11,3 @@
+--- 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 2014-08-10 13:32:43.716552784 +0200
-+++ trunk/scripts/ipmiutil_evt.service 2014-08-10 13:32:43.296544361 +0200
-@@ -11,5 +11,3 @@
+--- 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
@@ -199,9 +199,9 @@ Index: trunk/scripts/ipmiutil_evt.service
-
Index: trunk/scripts/ipmiutil_wdt.service
===================================================================
---- trunk.orig/scripts/ipmiutil_wdt.service 2014-08-10 13:32:43.716552784 +0200
-+++ trunk/scripts/ipmiutil_wdt.service 2014-08-10 13:32:43.708552623 +0200
-@@ -10,5 +10,3 @@
+--- trunk.orig/scripts/ipmiutil_wdt.service
++++ trunk/scripts/ipmiutil_wdt.service
+@@ -10,5 +10,3 @@ RemainAfterExit=1
[Install]
WantedBy=multi-user.target
@@ -209,9 +209,9 @@ Index: trunk/scripts/ipmiutil_wdt.service
-
Index: trunk/scripts/ipmi_port.service
===================================================================
---- trunk.orig/scripts/ipmi_port.service 2013-07-11 17:08:38.000000000 +0200
-+++ trunk/scripts/ipmi_port.service 2014-08-10 13:33:22.773336083 +0200
-@@ -11,5 +11,3 @@
+--- 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 03:05:47 +0000