Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

1 files changed, 22 insertions, 20 deletions

diff --git a/setver b/setver
index 5b69562..f4af5a4 100755
--- a/setver
+++ b/setver
@@ -6,7 +6,7 @@
 #    [doinc?] is 'n'.
 #    if [doinc?] is 'r', reverse increment (decrement).
 #
-ver=3.0.2
+ver=3.0.4
 rel=1
 tmped=/tmp/edver.tmp
 tmpspec=/tmp/edspec.tmp
@@ -198,10 +198,11 @@ q
 fi
 
 cmdc="ialarms.c icmd.c iconfig.c ievents.c ifru.c igetevent.c ihealth.c 
-      ilan.c ireset.c isel.c isensor.c iserial.c isol.c iwdt.c 
-      ifruset.c oem_sun.c ipicmg.c ifirewall.c oem_dell.c itsol.c 
-      idcmi.c iseltime.c iuser.c oem_supermicro.c 
-      ifwum.c ihpm.c iekanalyzer.c idiscover.c"
+      ilan.c ireset.c isel.c isensor.c iserial.c isol.c iwdt.c itsol.c  
+      ifruset.c ipicmg.c ifirewall.c idcmi.c iuser.c iseltime.c 
+      oem_intel.c oem_kontron.c oem_dell.c oem_hp.c oem_sun.c oem_asus.c 
+      oem_fujitsu.c oem_lenovo.c oem_newisys.c oem_quanta.c oem_supermicro.c
+      iekanalyzer.c ifwum.c ihpm.c idiscover.c"
 
 if [ $skipinc -ne 1 ]
 then
@@ -214,7 +215,8 @@ then
   echo $utilc >$cmdf
 
   cd util
-  echo "  ipmiutil-$ver contains:" >$relnote
+  # echo "  ipmiutil-$ver contains:" >$relnote
+  num=0
   for f in $utilc
   do
       fver=`grep "progver   = " $f |cut -f2 -d'=' |cut -f2 -d'"'`
@@ -222,23 +224,23 @@ then
       fver2=`echo $fver |cut -f2 -d'.'`
       if [ $reverseinc -eq 1 ]
       then      
-	fvernew=${fver1}.`expr $fver2 - 1`
+          fvernew=${fver1}.`expr $fver2 - 1`
       else
-	# fvernew=${fver1}.`expr $fver2 + 1`
-	# use the specified version from above
-	fvernew=${v12}${v3}
+          # fvernew=${fver1}.`expr $fver2 + 1`
+          # use the specified version from above
+          fvernew=${v12}${v3}
       fi
       tmpf=/tmp/$f.new
       tag=`grep "progname  = " $f |cut -f2 -d'=' |cut -f2 -d'"'`
       alias=`grep "int argc" $f |head -n1 |cut -f1 -d'(' |awk '{print $2}' |sed -e 's/i_/ipmiutil /'`
       if [ "$f" = "ipmi_port.c" ]; then
           do_incr=0
-	  tag=ipmi_port
-	  alias=ipmi_port
+          tag=ipmi_port
+          alias=ipmi_port
       elif [ "$f" = "iseltime.c" ]; then
-	  alias=iseltime
+          alias=iseltime
       elif [ "$f" = "ifruset.c" ]; then
-	  alias=ifruset
+          alias=ifruset
       elif [ "$f" = "idiscover.c" ]; then
           do_incr=0
       elif [ "$f" = "iekanalyzer.c" ]; then
@@ -250,23 +252,23 @@ then
       else 
           do_incr=1
       fi
+      num=`expr $num + 1`
       f1=`echo $f |cut -f1 -d'.'`
-      if [ $do_incr -eq 0 ]
-      then
+      if [ $do_incr -eq 0 ]; then
         # don't update the version 
         fvernew=$fver
         echo "$tag   	progver: $fvernew"
-        echo "    $tag	($alias)  	 ver $fvernew" >>$relnote
+        # echo "    $tag	($alias)  	 ver $fvernew" >>$relnote
       else
         # update the version automatically 
-        echo "$tag   	progver: $fvernew"
-        echo "    $tag	($alias)  	 ver $fvernew" >>$relnote
         sed -e "s/progver   = .${fver}/progver   = \"${fvernew}/" $f >$tmpf
         cp -f $tmpf $f
+        echo "$tag   	progver: $fvernew"
+        # echo "    $tag	($alias)  	 ver $fvernew" >>$relnote
       fi
   done
   cd ..
-  cat $relnote >>ChangeLog
+  # cat $relnote >>ChangeLog
 fi
 
 echo ""