Accepting request 266846 from systemsmanagement

1

OBS-URL: https://build.opensuse.org/request/show/266846
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ipmiutil?expand=0&rev=13

ipmiutil-2.9.2-fix-bashisms.patch

@@ -0,0 +1,149 @@
+diff -Ndur ipmiutil-2.9.2/scripts/ipmi_info ipmiutil-2.9.2-fix-bashisms/scripts/ipmi_info
+--- ipmiutil-2.9.2/scripts/ipmi_info	2013-10-09 21:20:02.000000000 +0300
++++ ipmiutil-2.9.2-fix-bashisms/scripts/ipmi_info	2014-11-17 06:41:28.838462431 +0200
+@@ -44,7 +44,7 @@
+ 
+ start()
+ {
+-	echo -n $"Starting $name: "
++	echo -n "Starting $name: "
+ 	echo
+ 	retval=1
+ 	PID=0
+@@ -66,7 +66,7 @@
+ 
+ stop()
+ {
+-	echo -n $"Stopping $name: "
++	echo -n "Stopping $name: "
+ 	echo
+         retval=0
+ 	echo
+@@ -116,7 +116,7 @@
+ 	restart
+ 	;;
+   *)
+-	echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++	echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ 	exit 2
+ esac
+ 
+diff -Ndur ipmiutil-2.9.2/scripts/ipmi_port.sh ipmiutil-2.9.2-fix-bashisms/scripts/ipmi_port.sh
+--- ipmiutil-2.9.2/scripts/ipmi_port.sh	2013-10-09 21:20:02.000000000 +0300
++++ ipmiutil-2.9.2-fix-bashisms/scripts/ipmi_port.sh	2014-11-17 06:41:52.921460802 +0200
+@@ -47,7 +47,7 @@
+ 
+ start()
+ {
+-	echo -n $"Starting $name: "
++	echo -n "Starting $name: "
+ 	echo
+ 	retval=1
+ 	PID=0
+@@ -93,7 +93,7 @@
+ 
+ stop()
+ {
+-	echo -n $"Stopping $name: "
++	echo -n "Stopping $name: "
+ 	echo
+         retval=1
+ 	if [ -f $lockfile ]; then
+@@ -178,7 +178,7 @@
+ 	restart
+ 	;;
+   *)
+-	echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++	echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ 	exit 2
+ esac
+ 
+diff -Ndur ipmiutil-2.9.2/scripts/ipmiutil_asy ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_asy
+--- ipmiutil-2.9.2/scripts/ipmiutil_asy	2013-10-09 21:20:02.000000000 +0300
++++ ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_asy	2014-11-17 06:42:11.496459545 +0200
+@@ -39,7 +39,7 @@
+ 
+ start()
+ {
+-	echo -n $"Starting $dname: "
++	echo -n "Starting $dname: "
+ 	driverok=0
+ 	dtype=`ipmiutil cmd -k |grep "IPMI access" |cut -f2 -d'=' |awk '{ print $1 }'`
+ 	if [ "x$dtype" = "xopen" ]; then
+@@ -67,7 +67,7 @@
+ 
+ stop()
+ {
+-	echo -n $"Stopping $dname: "
++	echo -n "Stopping $dname: "
+         retval=1
+         if [ -f $lockfile ]; then
+            p=`cat $lockfile`
+@@ -148,7 +148,7 @@
+         restart
+         ;;
+     *)
+-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++        echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+         exit 2
+ esac
+ exit $?
+diff -Ndur ipmiutil-2.9.2/scripts/ipmiutil_evt ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_evt
+--- ipmiutil-2.9.2/scripts/ipmiutil_evt	2013-10-09 21:20:02.000000000 +0300
++++ ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_evt	2014-11-17 06:42:23.912458706 +0200
+@@ -42,7 +42,7 @@
+ 
+ start()
+ {
+-	echo -n $"Starting $name: "
++	echo -n "Starting $name: "
+ 	# do not start if in driverless mode
+         ipmiutil cmd -k |grep "driverless" >/dev/null 2>&1
+ 	if [ $? -eq 0 ]; then
+@@ -70,7 +70,7 @@
+ 
+ stop()
+ {
+-	echo -n $"Stopping $name: "
++	echo -n "Stopping $name: "
+         retval=1
+         if [ -f $lockfile ]; then
+            p=`cat $lockfile`
+@@ -151,7 +151,7 @@
+         restart
+         ;;
+     *)
+-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
++        echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+         exit 2
+ esac
+ exit $?
+diff -Ndur ipmiutil-2.9.2/scripts/ipmiutil_wdt ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_wdt
+--- ipmiutil-2.9.2/scripts/ipmiutil_wdt	2013-10-09 21:20:02.000000000 +0300
++++ ipmiutil-2.9.2-fix-bashisms/scripts/ipmiutil_wdt	2014-11-17 06:42:32.368458133 +0200
+@@ -34,7 +34,7 @@
+ # tmpcron2=/tmp/wdtcron2.$$
+ 
+ start() {
+-	echo -n $"Starting $prog: "
++	echo -n "Starting $prog: "
+ 	echo
+         # do not start if in driverless mode
+         ipmiutil cmd -k |grep "driverless" >/dev/null 2>&1
+@@ -73,7 +73,7 @@
+ }
+ 
+ stop() {
+-	echo -n $"Stopping $prog: "
++	echo -n "Stopping $prog: "
+ 	echo
+ 	# first disable the watchdog 
+ 	$prog -d  >>$wdtlog
+@@ -141,6 +141,6 @@
+   	restart
+ 	;;
+   *)
+-	echo $"Usage: $0 {start|stop|status|restart|reload}"
++	echo "Usage: $0 {start|stop|status|restart|reload}"
+ 	exit 1
+ esac

ipmiutil.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov 17 04:00:00 UTC 2014 - Led <ledest@gmail.com>
+
+- fix bashisms in scripts
+- add patches:
+  * ipmiutil-2.9.2-fix-bashisms.patch
+
 -------------------------------------------------------------------
 Fri Oct 11 06:58:05 UTC 2013 - kkaempf@suse.com
 

ipmiutil.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ipmiutil
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Andy Cress
 #
 # All modifications and additions to the file contributed by third parties
@@ -25,6 +25,7 @@ License:        BSD-3-Clause
 Group:          System/Management
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch:          automake-1_13.patch
+Patch1:         %{name}-2.9.2-fix-bashisms.patch
 Url:            http://ipmiutil.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1210
@@ -71,6 +72,7 @@ useful for building custom IPMI applications.
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1
 
 %build
 autoreconf -fiv