diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 79113a3..0000000 --- a/.cvsignore +++ /dev/null @@ -1,11 +0,0 @@ -iprutils-2.0.12-src.tgz -sysfsutils-1.1.0.tar.gz -iprutils-2.0.13-src.tgz -iprutils-2.0.13.5-src.tgz -iprutils-2.0.13.7-src.tgz -iprutils-2.0.14-src.tgz -iprutils-2.0.15.3-src.tgz -iprutils-2.1.1-src.tgz -iprutils-2.1.4-src.tgz -iprutils-2.1.5-src.tgz -iprutils-2.2.6-src.tgz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c5ef60e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +iprutils-2.2.13-src.tgz diff --git a/Makefile b/Makefile deleted file mode 100644 index 19c6f21..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Makefile for source rpm: iprutils -# $Id$ -NAME := iprutils -SPECFILE = $(firstword $(wildcard *.spec)) - -include ../common/Makefile.common diff --git a/iprutils-initscripts.patch b/iprutils-initscripts.patch new file mode 100644 index 0000000..afbf955 --- /dev/null +++ b/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 +- ++ ++ daemon $iprdump --daemon + 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 +- start_daemon $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 ++ diff --git a/iprutils-swab-moved.patch b/iprutils-swab-moved.patch new file mode 100644 index 0000000..059c430 --- /dev/null +++ b/iprutils-swab-moved.patch @@ -0,0 +1,12 @@ +diff -up iprutils/iprlib.h.swab-moved iprutils/iprlib.h +--- iprutils/iprlib.h.swab-moved 2009-02-02 13:07:44.118559632 -0500 ++++ iprutils/iprlib.h 2009-02-02 13:07:58.318558756 -0500 +@@ -43,7 +43,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/iprutils.spec b/iprutils.spec index fe5a659..14ca2f1 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,20 +1,28 @@ -ExclusiveArch: ppc ppc64 Summary: Utilities for the IBM Power Linux RAID adapters -Name: iprutils -Version: 2.2.6 +Name: iprutils +Version: 2.2.13 Release: 3%{?dist} License: CPL -Group: System Environment/Base -Source0: iprutils-%{version}-src.tgz -Patch0: iprutils-cflags.patch -Patch1: iprutils-lsb-init-ectomy.patch -URL: http://sourceforge.net/projects/iprdd/ -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Obsoletes: ipr-utils +Group: System Environment/Base +URL: http://sourceforge.net/projects/iprdd/ + +Source0: http://osdn.dl.sourceforge.net/sourceforge/iprdd/%{name}-%{version}-src.tgz +Patch0: %{name}-cflags.patch +#Patch1: %{name}-lsb-init-ectomy.patch +Patch2: %{name}-initscripts.patch +Patch3: iprutils-swab-moved.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExclusiveArch: ppc ppc64 + +Requires: /sbin/pidof + BuildRequires: libsysfs-devel BuildRequires: pciutils-devel BuildRequires: ncurses-devel BuildRequires: libcap-devel +BuildRequires: kernel-devel + +Obsoletes: ipr-utils %description Provides a suite of utilities to manage and configure SCSI devices @@ -23,18 +31,20 @@ supported by the ipr SCSI storage device driver. %prep %setup -q -n %{name} %patch0 -p1 -%patch1 -p1 - +#%patch1 -p1 +%patch2 -p1 +%patch3 -p1 -b .swab-moved %build -CFLAGS=$RPM_OPT_FLAGS make +CFLAGS="%{optflags}" %{__make} %install -rm -rf $RPM_BUILD_ROOT -make INSTALL_MOD_PATH=$RPM_BUILD_ROOT install -install -d $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d -install -m 755 init.d/iprinit $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/iprinit -install -m 755 init.d/iprdump $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/iprdump -install -m 755 init.d/iprupdate $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/iprupdate +%{__rm} -rf %{buildroot} +%{__make} INSTALL_MOD_PATH=%{buildroot} install + +%{__install} -d %{buildroot}%{_sysconfdir}/rc.d/init.d +%{__install} -m 0755 init.d/iprinit %{buildroot}%{_sysconfdir}/rc.d/init.d/iprinit +%{__install} -m 0755 init.d/iprdump %{buildroot}%{_sysconfdir}/rc.d/init.d/iprdump +%{__install} -m 0755 init.d/iprupdate %{buildroot}%{_sysconfdir}/rc.d/init.d/iprupdate %post /sbin/chkconfig --add iprdump @@ -47,7 +57,7 @@ install -m 755 init.d/iprupdate $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/iprup /sbin/chkconfig --del iprinit %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) @@ -57,6 +67,31 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2.2.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 2 2009 Will Woods - 2.2.13-2 +- Fix iprdump startup - #483340 +- iprutils-swab-moved.patch - fix compilation with 2.6.29 kernels (#483643) + +* Fri Nov 21 2008 Roman Rakus - 2.2.13-1 +- New upstream version + +* Wed Jul 2 2008 Roman Rakus - 2.2.8-6 +- Fixed ExclusiveArch tag + +* Wed Jul 2 2008 Roman Rakus - 2.2.8-5 +- Fixed chkconfig issue - #453165 + +* Wed Apr 9 2008 Roman Rakus - 2.2.8-4 +- Rewrited initscripts for satisfying LSB spec + +* Fri Feb 08 2008 David Cantrell - 2.2.8-2 +- Rebuild for gcc-4.3 + +* Fri Nov 16 2007 David Cantrell - 2.2.8-1 +- Upgrade to latest upstream release + * Mon Oct 1 2007 Jeremy Katz - 2.2.6-3 - don't require redhat-lsb (#252343) diff --git a/sources b/sources index d5e1dc1..ec7d0fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77cb57b85cd9aa331242b7ee37a7aa1b iprutils-2.2.6-src.tgz +c5ac4eb628ee16fd7816f94c226d6a5b iprutils-2.2.13-src.tgz