dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: iprutils
-# $Id: Makefile,v 1.1 2004/09/09 06:18:32 cvsdist Exp $
-NAME := iprutils
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

iprutils-initscripts.patch

@@ -0,0 +1,417 @@
+diff -up iprutils/init.d/iprha.initscript iprutils/init.d/iprha
+diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump
+--- iprutils/init.d/iprdump.initscript	2007-06-21 15:44:33.000000000 +0200
++++ iprutils/init.d/iprdump	2008-04-09 16:46:13.000000000 +0200
+@@ -20,84 +20,74 @@
+ # Short-Description: Start the ipr dump daemon
+ # Description:       Start the ipr dump daemon
+ ### END INIT INFO
+-
+-IPRDUMP=/sbin/iprdump
+-test -x $IPRDUMP || exit 5
+-. /lib/lsb/init-functions
++#
++# chkconfig: 2345 20 80
++# description: Runs the IBM Power RAID adapter dump daemon
++# processname: iprdump
++# pidfile: /var/run/iprdump.pid
++#
++
++# Source function library
++. /etc/init.d/functions
++
++RETVAL=0
++
++prog=iprdump
++iprdump=/sbin/iprdump
++lockfile=/var/lock/subsys/iprdump
++pidfile=/var/run/iprdump.pid
+ 
+ start() {
+     echo -n "Starting ipr dump daemon"
+     if [ ! -d /sys/class/scsi_generic ] ; then
+         modprobe sg
+     fi
+-    start_daemon $IPRDUMP
+-
++    
++    daemon $iprdump
+     RETVAL=$?
+-    if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
+-    else
+-	log_failure_msg " "
+-    fi
++    echo
++    [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprdump > $pidfile
+     return $RETVAL
+ }
+ 
+ stop() {
+-    echo -n "Shutting down ipr dump daemon"
+-    killproc $IPRDUMP
+-
+-    RETVAL=$?
+-    if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
+-    else
+-	log_failure_msg " "
+-    fi
+-    return $RETVAL
+-}
+-
+-restart() {
+-    $0 stop
+-    $0 start
+-    return $RETVAL
+-}
+-
+-reload() {
+-    echo -n "Reload ipr dump daemon"
+-    $0 stop  &&  $0 start
+-    return $RETVAL
+-}
+-
+-status() {
+-    echo -n "Checking for iprdump daemon: "
+-
+-    pidofproc $IPRDUMP >& /dev/null
+-
++    echo -n "Stopping iprdump: "
++    killproc $iprdump -TERM
+     RETVAL=$?
+-    if [ $RETVAL -eq 0 ]; then
+-	log_success_msg "running"
+-    else
+-	log_failure_msg "unused"
+-    fi
+-    return $RETVAL
++    rm -f $lockfile $pidfile
++    [ $RETVAL = 0 ] || return $RETVAL
+ }
+ 
+ case "$1" in
+     start)
+ 	start
++	RETVAL=$?
+ 	;;
+     stop)
+ 	stop
++	RETVAL=$?
+ 	;;
+-    restart)
+-	restart
++    restart|force-reload)
++	stop; start
++	RETVAL=$?
+ 	;;
+-    reload)
++    try-restart|reload|configtest)
++	RETVAL=3
+ 	reload
+ 	;;
++    condrestart)
++	if [ -f $lockfile ]; then
++            stop ; start
++            RETVAL=$?
++        fi
++        ;;
++
+     status)
+-	status
++	status $iprdump
++	RETVAL=$?
+ 	;;
+     *)
+-	echo "Usage: $0 {start|stop|status|restart|reload}"
+-	exit 1
++        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
++        RETVAL=3
+ 	;;
+ esac
+diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate
+--- iprutils/init.d/iprupdate.initscript	2007-06-21 15:45:29.000000000 +0200
++++ iprutils/init.d/iprupdate	2008-04-09 17:18:29.000000000 +0200
+@@ -20,86 +20,74 @@
+ # Short-Description: Start the iprupdate utility
+ # Description:       Start the iprupdate utility
+ ### END INIT INFO
+-
+-IPRUPDATE=/sbin/iprupdate
+-test -x $IPRUPDATE || exit 5
+-. /lib/lsb/init-functions
++#
++# chkconfig: 2345 20 80
++# description: Runs the IBM Power RAID adapter update daemon
++# processname: iprupdate
++# pidfile: /var/run/iprupdate.pid
++#
++
++# Source function library
++. /etc/init.d/functions
++
++RETVAL=0
++
++prog=iprupdate
++iprupdate=/sbin/iprupdate
++lockfile=/var/lock/subsys/iprupdate
++pidfile=/var/run/iprupdate.pid
+ 
+ start() {
+-	echo "Checking ipr microcode levels"
+-	if [ ! -d /sys/class/scsi_generic ] ; then
+-	    modprobe sg
+-	fi
+-	$IPRUPDATE --daemon
+-
+-	RETVAL=$?
+-	if [ $RETVAL -eq 0 ]; then
+-	    echo -n "Completed ipr microcode updates"
+-	    log_success_msg " "
+-	else
+-	    echo -n "Completed ipr microcode updates"
+-	    log_failure_msg " "
+-	fi
+-        return $RETVAL
+-}
++    echo -n "Starting iprupdate: "
+ 
+-stop() {
+-    echo -n "Shutting down ipr update daemon"
+-    killproc $IPRUPDATE
+-    
+-    RETVAL=$?
+-    if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
+-    else
+-	log_failure_msg " "
++    if [ ! -d /sys/class/scsi_generic ]; then
++        modprobe sg
+     fi
+-    return $RETVAL
+-}
+-
+-restart() {
+-    $0 stop
+-    $0 start
+-    return $RETVAL
+-}
+ 
+-reload() {
+-    $0 stop
+-    $0 start
++    daemon $iprupdate --daemon
++    RETVAL=$?
++    echo
++    [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprupdate > $pidfile
+     return $RETVAL
+ }
+ 
+-status() {
+-    echo -n "Checking for ipr update daemon: "
+-
+-    pidofproc $IPRUPDATE >& /dev/null
+-
++stop() {
++    echo -n "Stopping iprupdate: "
++    killproc $iprupdate -TERM
+     RETVAL=$?
+-    if [ $RETVAL -eq 0 ]; then
+-	log_success_msg "running"
+-    else
+-	log_failure_msg "unused"
+-    fi
+-    return $RETVAL
++    rm -f $lockfile $pidfile
++    [ $RETVAL = 0 ] || return $RETVAL
+ }
+ 
+ case "$1" in
+-	start)
+-		start
+-	;;
+-	stop)
+-		stop
+-	;;
+-	restart)
+-		restart
+-	;;
+-	reload)
+-		reload
+-	;;
+-	status)
+-		status
+-	;;
+-	*)
+-		echo "Usage: $0 {start|stop|status|restart|reload}"
+-		exit 1
+-	;;
++    start)
++        start
++        RETVAL=$?
++        ;;
++    stop)
++        stop
++        RETVAL=$?
++        ;;
++    restart|force-reload)
++        stop ; start
++        RETVAL=$?
++        ;;
++    try-restart|reload|configtest)
++        RETVAL=3
++        ;;
++    condrestart)
++        if [ -f $lockfile ]; then
++            stop ; start
++            RETVAL=$?
++        fi
++        ;;
++    status)
++        status $iprupdate
++        RETVAL=$?
++        ;;
++    *)
++        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
++        RETVAL=3
++        ;;
+ esac
++
+diff -up iprutils/init.d/iprinit.initscript iprutils/init.d/iprinit
+--- iprutils/init.d/iprinit.initscript	2007-06-21 15:46:37.000000000 +0200
++++ iprutils/init.d/iprinit	2008-04-09 17:03:38.000000000 +0200
+@@ -20,84 +20,73 @@
+ # Short-Description: Start the ipr init daemon
+ # Description:       Start the ipr initialization daemon
+ ### END INIT INFO
+-
+-IPRINIT=/sbin/iprinit
+-test -x $IPRINIT || exit 5
+-. /lib/lsb/init-functions
++#
++# chkconfig: 2345 20 80
++# description: Runs the IBM Power RAID adapter initialization daemon
++# processname: iprinit
++# pidfile: /var/run/iprinit.pid
++#
++
++# Source function library
++. /etc/init.d/functions
++
++RETVAL=0
++
++prog=iprinit
++iprinit=/sbin/iprinit
++lockfile=/var/lock/subsys/iprinit
++pidfile=/var/run/iprinit.pid
+ 
+ start() {
+-    echo -n "Starting ipr initialization daemon"
++    echo -n "Starting iprinit: "
+     if [ ! -d /sys/class/scsi_generic ] ; then
+         modprobe sg
+     fi
+-    start_daemon $IPRINIT --daemon
++    daemon $iprinit --daemon
+ 
+     RETVAL=$?
+-    if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
+-    else
+-	log_failure_msg " "
+-    fi
++    echo
++    [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprinit > $pidfile
+     return $RETVAL
+ }
+ 
+ stop() {
+-    echo -n "Shutting down ipr initialization daemon"
+-    killproc $IPRINIT
+-    
+-    RETVAL=$?
+-    if [ $RETVAL -eq 0 ]; then
+-	log_success_msg " "
+-    else
+-	log_failure_msg " "
+-    fi
+-    return $RETVAL
+-}
+-
+-restart() {
+-    $0 stop
+-    $0 start
+-    return $RETVAL
+-}
+-
+-reload() {
+-    echo -n "Reload ipr initialization daemon"
+-    $0 stop  &&  $0 start
+-    return $RETVAL
+-}
+-
+-status() {
+-    echo -n "Checking for ipr initialization daemon: "
+-
+-    pidofproc $IPRINIT >& /dev/null
+-
++    echo -n "Stopping iprinit: "
++    killproc $iprinit -TERM
+     RETVAL=$?
+-    if [ $RETVAL -eq 0 ]; then
+-	log_success_msg "running"
+-    else
+-	log_failure_msg "unused"
+-    fi
+-    return $RETVAL
++    rm -f $lockfile $pidfile
++    [ $RETVAL = 0 ] || return $RETVAL
+ }
+ 
+ case "$1" in
+     start)
+-	start
+-	;;
++        start
++        RETVAL=$?
++        ;;
+     stop)
+-	stop
+-	;;
+-    restart)
+-	restart
+-	;;
+-    reload)
+-	reload
+-	;;
++        stop
++        RETVAL=$?
++        ;;
++    restart|force-reload)
++        stop ; start
++        RETVAL=$?
++        ;;
++    try-restart|reload|configtest)
++        RETVAL=3
++        ;;
++    condrestart)
++        if [ -f $lockfile ]; then
++            stop ; start
++            RETVAL=$?
++        fi
++        ;;
+     status)
+-	status
+-	;;
++        status $iprinit
++        RETVAL=$?
++        ;;
+     *)
+-	echo "Usage: $0 {start|stop|status|restart|reload}"
+-	exit 1
+-	;;
++        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
++        RETVAL=3
++        ;;
+ esac
++

iprutils-lsb-init-ectomy.patch

@@ -1,189 +0,0 @@
-diff -up iprutils/init.d/iprdump.lsb iprutils/init.d/iprdump
---- iprutils/init.d/iprdump.lsb	2007-10-01 14:07:33.000000000 -0400
-+++ iprutils/init.d/iprdump	2007-10-01 14:12:04.000000000 -0400
-@@ -23,20 +23,20 @@
- 
- IPRDUMP=/sbin/iprdump
- test -x $IPRDUMP || exit 5
--. /lib/lsb/init-functions
-+. /etc/init.d/functions
- 
- start() {
-     echo -n "Starting ipr dump daemon"
-     if [ ! -d /sys/class/scsi_generic ] ; then
-         modprobe sg
-     fi
--    start_daemon $IPRDUMP
-+    daemon $IPRDUMP
- 
-     RETVAL=$?
-     if [ $RETVAL -eq 0 ]; then
--	log_success_msg " "
-+	success " "
-     else
--	log_failure_msg " "
-+	failure " "
-     fi
-     return $RETVAL
- }
-@@ -47,9 +47,9 @@ stop() {
- 
-     RETVAL=$?
-     if [ $RETVAL -eq 0 ]; then
--	log_success_msg " "
-+	success " "
-     else
--	log_failure_msg " "
-+	failure " "
-     fi
-     return $RETVAL
- }
-@@ -73,9 +73,9 @@ status() {
- 
-     RETVAL=$?
-     if [ $RETVAL -eq 0 ]; then
--	log_success_msg "running"
-+	success "running"
-     else
--	log_failure_msg "unused"
-+	failure "unused"
-     fi
-     return $RETVAL
- }
-diff -up iprutils/init.d/iprha.lsb iprutils/init.d/iprha
---- iprutils/init.d/iprha.lsb	2007-10-01 14:07:37.000000000 -0400
-+++ iprutils/init.d/iprha	2007-10-01 14:12:17.000000000 -0400
-@@ -25,7 +25,7 @@
- 
- IPRCONFIG=/sbin/iprconfig
- test -x $IPRCONFIG || exit 5
--. /lib/lsb/init-functions
-+. /etc/init.d/functions
- 
- start() {
-     echo -n "Enabling ipr primary adapter mode"
-@@ -33,9 +33,9 @@ start() {
- 
-     RETVAL=$?
-     if [ $RETVAL -eq 0 ]; then
--	log_success_msg " "
-+	success " "
-     else
--	log_failure_msg " "
-+	failure " "
-     fi
-     return $RETVAL
- }
-@@ -46,9 +46,9 @@ stop() {
-     
-     RETVAL=$?
-     if [ $RETVAL -eq 0 ]; then
--	log_success_msg " "
-+	success " "
-     else
--	log_failure_msg " "
-+	failure " "
-     fi
-     return $RETVAL
- }
-diff -up iprutils/init.d/iprupdate.lsb iprutils/init.d/iprupdate
---- iprutils/init.d/iprupdate.lsb	2007-10-01 14:07:47.000000000 -0400
-+++ iprutils/init.d/iprupdate	2007-10-01 14:11:29.000000000 -0400
-@@ -23,7 +23,7 @@
- 
- IPRUPDATE=/sbin/iprupdate
- test -x $IPRUPDATE || exit 5
--. /lib/lsb/init-functions
-+. /etc/init.d/functions
- 
- start() {
- 	echo "Checking ipr microcode levels"
-@@ -35,10 +35,10 @@ start() {
- 	RETVAL=$?
- 	if [ $RETVAL -eq 0 ]; then
- 	    echo -n "Completed ipr microcode updates"
--	    log_success_msg " "
-+	    success " "
- 	else
- 	    echo -n "Completed ipr microcode updates"
--	    log_failure_msg " "
-+	    failure " "
- 	fi
-         return $RETVAL
- }
-@@ -49,9 +49,9 @@ stop() {
-     
-     RETVAL=$?
-     if [ $RETVAL -eq 0 ]; then
--	log_success_msg " "
-+	success " "
-     else
--	log_failure_msg " "
-+	failure " "
-     fi
-     return $RETVAL
- }
-@@ -75,9 +75,9 @@ status() {
- 
-     RETVAL=$?
-     if [ $RETVAL -eq 0 ]; then
--	log_success_msg "running"
-+	success "running"
-     else
--	log_failure_msg "unused"
-+	failure "unused"
-     fi
-     return $RETVAL
- }
-diff -up iprutils/init.d/iprinit.lsb iprutils/init.d/iprinit
---- iprutils/init.d/iprinit.lsb	2007-10-01 14:07:43.000000000 -0400
-+++ iprutils/init.d/iprinit	2007-10-01 14:13:05.000000000 -0400
-@@ -23,20 +23,20 @@
- 
- IPRINIT=/sbin/iprinit
- test -x $IPRINIT || exit 5
--. /lib/lsb/init-functions
-+. /etc/init.d/functions
- 
- start() {
-     echo -n "Starting ipr initialization daemon"
-     if [ ! -d /sys/class/scsi_generic ] ; then
-         modprobe sg
-     fi
--    start_daemon $IPRINIT --daemon
-+    daemon $IPRINIT --daemon
- 
-     RETVAL=$?
-     if [ $RETVAL -eq 0 ]; then
--	log_success_msg " "
-+	success " "
-     else
--	log_failure_msg " "
-+	failure " "
-     fi
-     return $RETVAL
- }
-@@ -47,9 +47,9 @@ stop() {
-     
-     RETVAL=$?
-     if [ $RETVAL -eq 0 ]; then
--	log_success_msg " "
-+	success " "
-     else
--	log_failure_msg " "
-+	failure " "
-     fi
-     return $RETVAL
- }
-@@ -73,9 +73,9 @@ status() {
- 
-     RETVAL=$?
-     if [ $RETVAL -eq 0 ]; then
--	log_success_msg "running"
-+	success "running"
-     else
--	log_failure_msg "unused"
-+	failure "unused"
-     fi
-     return $RETVAL
- }

iprutils.spec

@@ -2,12 +2,14 @@ ExclusiveArch: ppc ppc64
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name: iprutils
 Version: 2.2.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: CPL
 Group: System Environment/Base
 Source0: iprutils-%{version}-src.tgz
+
 Patch0: iprutils-cflags.patch
-Patch1: iprutils-lsb-init-ectomy.patch
+Patch1: iprutils-initscripts.patch
+
 URL: http://sourceforge.net/projects/iprdd/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Obsoletes: ipr-utils
@@ -23,7 +25,7 @@ supported by the ipr SCSI storage device driver.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-%patch1 -p1
+%patch1 -p1 -b .initscripts
 
 %build
 CFLAGS=$RPM_OPT_FLAGS make
@@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Tue Aug 12 2008 Roman Rakus <rrakus@redhat.com> - 2.2.6-4
+- Corrected init scripts #243682
+
 * Mon Oct  1 2007 Jeremy Katz <katzj@redhat.com> - 2.2.6-3
 - don't require redhat-lsb (#252343)