From 22638a8b2534950db078463d0c176d739c492edd Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:10:11 +0000 Subject: [PATCH 01/70] Initialize branch F-12 for iprutils --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 38caa68c253abd22a2bf45e3af855f5f347fa3bc Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Mon, 5 Oct 2009 13:20:06 +0000 Subject: [PATCH 02/70] Fixed initscripts (#522464, #522462, #522461) --- iprutils-initscripts.patch | 550 ++++++++++++++++++++----------------- iprutils.spec | 5 +- 2 files changed, 302 insertions(+), 253 deletions(-) diff --git a/iprutils-initscripts.patch b/iprutils-initscripts.patch index afbf955..0641491 100644 --- a/iprutils-initscripts.patch +++ b/iprutils-initscripts.patch @@ -1,15 +1,10 @@ -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 @@ +diff -up iprutils/init.d/iprdump.initscripts iprutils/init.d/iprdump +--- iprutils/init.d/iprdump.initscripts 2008-11-20 02:20:20.000000000 +0100 ++++ iprutils/init.d/iprdump 2009-10-05 13:46:41.000000000 +0200 +@@ -20,84 +20,98 @@ # 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 @@ -23,19 +18,25 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump +RETVAL=0 + +prog=iprdump -+iprdump=/sbin/iprdump ++exec=/sbin/iprdump +lockfile=/var/lock/subsys/iprdump +pidfile=/var/run/iprdump.pid +-IPRDUMP=/sbin/iprdump +-test -x $IPRDUMP || exit 5 +-. /lib/lsb/init-functions + start() { - echo -n "Starting ipr dump daemon" +- echo -n "Starting ipr dump daemon" ++ [ -x $exec ] || exit 5 ++ echo -n "Starting $prog: " if [ ! -d /sys/class/scsi_generic ] ; then modprobe sg fi - start_daemon $IPRDUMP --daemon - + -+ daemon $iprdump --daemon ++ daemon $exec --daemon RETVAL=$? - if [ $RETVAL -eq 0 ]; then - log_success_msg " " @@ -43,7 +44,7 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump - log_failure_msg " " - fi + echo -+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprdump > $pidfile ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile return $RETVAL } @@ -51,88 +52,255 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump - echo -n "Shutting down ipr dump daemon" - killproc $IPRDUMP - -- RETVAL=$? ++ echo -n "Stopping $prog: " ++ killproc $exec -TERM + RETVAL=$? - if [ $RETVAL -eq 0 ]; then - log_success_msg " " - else - log_failure_msg " " - fi -- return $RETVAL --} -- --restart() { ++ echo ++ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile + return $RETVAL + } + + restart() { - $0 stop - $0 start - return $RETVAL --} -- --reload() { ++ stop ++ start + } + + reload() { - echo -n "Reload ipr dump daemon" - $0 stop && $0 start - return $RETVAL --} -- ++ restart + } + -status() { - echo -n "Checking for iprdump daemon: " -- ++force_reload() { ++ restart ++} + - pidofproc $IPRDUMP >& /dev/null -- -+ echo -n "Stopping iprdump: " -+ killproc $iprdump -TERM - RETVAL=$? ++rh_status() { ++ # run checks to determine if the service is running or use generic status ++ status $prog ++} + +- 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 ++rh_status_q() { ++ rh_status >/dev/null 2>&1 } 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 +- start +- ;; ++ rh_status_q && exit 0 ++ $1 ++ ;; + stop) +- stop +- ;; ++ rh_status_q || exit 0 ++ $1 ++ ;; + restart) +- restart +- ;; ++ $1 ++ ;; + reload) +- reload +- ;; ++ rh_status_q || exit 7 ++ $1 ++ ;; ++ force-reload) ++ force_reload + ;; -+ status) - status -+ status $iprdump -+ RETVAL=$? - ;; +- ;; ++ rh_status ++ ;; ++ condrestart|try-restart) ++ rh_status_q || exit 0 ++ restart ++ ;; *) - echo "Usage: $0 {start|stop|status|restart|reload}" - exit 1 -+ echo $"Usage: $0 {start|stop|restart|condrestart|status}" -+ RETVAL=3 - ;; +- ;; ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 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 @@ ++exit $? ++ +diff -up iprutils/init.d/iprinit.initscripts iprutils/init.d/iprinit +--- iprutils/init.d/iprinit.initscripts 2007-08-21 20:56:03.000000000 +0200 ++++ iprutils/init.d/iprinit 2009-10-05 14:59:18.000000000 +0200 +@@ -20,84 +20,97 @@ + # 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 ++exec=/sbin/iprinit ++lockfile=/var/lock/subsys/$prog ++pidfile=/var/run/iprinit.pid + + start() { +- echo -n "Starting ipr initialization daemon" ++ [ -x $exec ] || exit 5 ++ echo -n "Starting $prog: " + if [ ! -d /sys/class/scsi_generic ] ; then + modprobe sg + fi +- start_daemon $IPRINIT --daemon ++ daemon $exec --daemon + + RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg " " +- else +- log_failure_msg " " +- fi ++ echo ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile + return $RETVAL + } + + stop() { +- echo -n "Shutting down ipr initialization daemon" +- killproc $IPRINIT +- ++ echo -n "Stopping iprinit: " ++ killproc $exec -TERM + RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg " " +- else +- log_failure_msg " " +- fi ++ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile + return $RETVAL + } + + restart() { +- $0 stop +- $0 start +- return $RETVAL ++ stop ++ start + } + + reload() { +- echo -n "Reload ipr initialization daemon" +- $0 stop && $0 start +- return $RETVAL ++ restart + } + +-status() { +- echo -n "Checking for ipr initialization daemon: " ++force_reload() { ++ restart ++} + +- pidofproc $IPRINIT >& /dev/null ++rh_status() { ++ # run checks to determine if the service is running or use generic status ++ status $prog ++} + +- RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg "running" +- else +- log_failure_msg "unused" +- fi +- return $RETVAL ++rh_status_q() { ++ rh_status >/dev/null 2>&1 + } + ++ + case "$1" in + start) +- start +- ;; ++ rh_status_q && exit 0 ++ $1 ++ ;; + stop) +- stop +- ;; ++ rh_status_q || exit 0 ++ $1 ++ ;; + restart) +- restart +- ;; ++ $1 ++ ;; + reload) +- reload +- ;; ++ rh_status_q || exit 7 ++ $1 ++ ;; ++ force-reload) ++ force_reload ++ ;; + status) +- status +- ;; ++ rh_status ++ ;; ++ condrestart|try-restart) ++ rh_status_q || exit 0 ++ restart ++ ;; + *) +- echo "Usage: $0 {start|stop|status|restart|reload}" +- exit 1 +- ;; ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 + esac ++exit $? ++ +diff -up iprutils/init.d/iprupdate.initscripts iprutils/init.d/iprupdate +--- iprutils/init.d/iprupdate.initscripts 2008-11-20 02:20:20.000000000 +0100 ++++ iprutils/init.d/iprupdate 2009-10-05 15:04:50.000000000 +0200 +@@ -20,86 +20,98 @@ # Short-Description: Start the iprupdate utility # Description: Start the iprupdate utility ### END INIT INFO @@ -153,7 +321,7 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate +RETVAL=0 + +prog=iprupdate -+iprupdate=/sbin/iprupdate ++exec=/sbin/iprupdate +lockfile=/var/lock/subsys/iprupdate +pidfile=/var/run/iprupdate.pid @@ -173,59 +341,75 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate - log_failure_msg " " - fi - return $RETVAL --} ++ [ -x $exec ] || exit 5 + echo -n "Starting iprupdate: " ++ ++ if [ ! -d /sys/class/scsi_generic ]; then ++ modprobe sg ++ fi ++ ++ daemon $exec --daemon ++ RETVAL=$? ++ echo ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile ++ return $RETVAL + } --stop() { + stop() { - echo -n "Shutting down ipr update daemon" - killproc $IPRUPDATE - -- RETVAL=$? ++ echo -n "Stopping iprupdate: " ++ killproc $exec -TERM + 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 +- fi ++ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile return $RETVAL } + restart() { +- $0 stop +- $0 start +- return $RETVAL ++ stop ++ start + } + + reload() { +- $0 stop +- $0 start +- return $RETVAL ++ restart + } + -status() { - echo -n "Checking for ipr update daemon: " -- ++force_reload() { ++ restart ++} + - pidofproc $IPRUPDATE >& /dev/null -- -+stop() { -+ echo -n "Stopping iprupdate: " -+ killproc $iprupdate -TERM - RETVAL=$? ++rh_status() { ++ # run checks to determine if the service is running or use generic status ++ status $prog ++} + +- 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 ++rh_status_q() { ++ rh_status >/dev/null 2>&1 } ++ case "$1" in - start) - start @@ -247,171 +431,33 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate - exit 1 - ;; + start) -+ start -+ RETVAL=$? ++ rh_status_q && exit 0 ++ $1 + ;; + stop) -+ stop -+ RETVAL=$? ++ rh_status_q || exit 0 ++ $1 + ;; -+ restart|force-reload) -+ stop ; start -+ RETVAL=$? ++ restart) ++ $1 + ;; -+ try-restart|reload|configtest) -+ RETVAL=3 ++ reload) ++ rh_status_q || exit 7 ++ $1 + ;; -+ condrestart) -+ if [ -f $lockfile ]; then -+ stop ; start -+ RETVAL=$? -+ fi ++ force-reload) ++ force_reload + ;; + status) -+ status $iprupdate -+ RETVAL=$? ++ rh_status ++ ;; ++ condrestart|try-restart) ++ rh_status_q || exit 0 ++ restart + ;; + *) -+ 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 -+ ;; ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 esac ++exit $? + diff --git a/iprutils.spec b/iprutils.spec index 9bf96c8..b1b1b61 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.17 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -64,6 +64,9 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog +* Mon Oct 05 2009 Roman Rakus - 2.2.17-2 +- Fixed initscripts (#522464, #522462, #522461) + * Thu Sep 17 2009 Roman Rakus - 2.2.17-1 - Version 2.2.17 From 65920af009798245445998f757ccd6880366bacf Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Wed, 4 Nov 2009 12:53:02 +0000 Subject: [PATCH 03/70] Corrected initscripts. Version 2.2.18 --- .cvsignore | 2 +- iprutils-initscripts.patch | 550 ++++++++++++++++++++----------------- iprutils.spec | 6 +- sources | 2 +- 4 files changed, 305 insertions(+), 255 deletions(-) diff --git a/.cvsignore b/.cvsignore index 302ab1d..68a48b7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -iprutils-2.2.17-src.tgz +iprutils-2.2.18-src.tgz diff --git a/iprutils-initscripts.patch b/iprutils-initscripts.patch index afbf955..0641491 100644 --- a/iprutils-initscripts.patch +++ b/iprutils-initscripts.patch @@ -1,15 +1,10 @@ -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 @@ +diff -up iprutils/init.d/iprdump.initscripts iprutils/init.d/iprdump +--- iprutils/init.d/iprdump.initscripts 2008-11-20 02:20:20.000000000 +0100 ++++ iprutils/init.d/iprdump 2009-10-05 13:46:41.000000000 +0200 +@@ -20,84 +20,98 @@ # 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 @@ -23,19 +18,25 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump +RETVAL=0 + +prog=iprdump -+iprdump=/sbin/iprdump ++exec=/sbin/iprdump +lockfile=/var/lock/subsys/iprdump +pidfile=/var/run/iprdump.pid +-IPRDUMP=/sbin/iprdump +-test -x $IPRDUMP || exit 5 +-. /lib/lsb/init-functions + start() { - echo -n "Starting ipr dump daemon" +- echo -n "Starting ipr dump daemon" ++ [ -x $exec ] || exit 5 ++ echo -n "Starting $prog: " if [ ! -d /sys/class/scsi_generic ] ; then modprobe sg fi - start_daemon $IPRDUMP --daemon - + -+ daemon $iprdump --daemon ++ daemon $exec --daemon RETVAL=$? - if [ $RETVAL -eq 0 ]; then - log_success_msg " " @@ -43,7 +44,7 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump - log_failure_msg " " - fi + echo -+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $iprdump > $pidfile ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile return $RETVAL } @@ -51,88 +52,255 @@ diff -up iprutils/init.d/iprdump.initscript iprutils/init.d/iprdump - echo -n "Shutting down ipr dump daemon" - killproc $IPRDUMP - -- RETVAL=$? ++ echo -n "Stopping $prog: " ++ killproc $exec -TERM + RETVAL=$? - if [ $RETVAL -eq 0 ]; then - log_success_msg " " - else - log_failure_msg " " - fi -- return $RETVAL --} -- --restart() { ++ echo ++ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile + return $RETVAL + } + + restart() { - $0 stop - $0 start - return $RETVAL --} -- --reload() { ++ stop ++ start + } + + reload() { - echo -n "Reload ipr dump daemon" - $0 stop && $0 start - return $RETVAL --} -- ++ restart + } + -status() { - echo -n "Checking for iprdump daemon: " -- ++force_reload() { ++ restart ++} + - pidofproc $IPRDUMP >& /dev/null -- -+ echo -n "Stopping iprdump: " -+ killproc $iprdump -TERM - RETVAL=$? ++rh_status() { ++ # run checks to determine if the service is running or use generic status ++ status $prog ++} + +- 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 ++rh_status_q() { ++ rh_status >/dev/null 2>&1 } 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 +- start +- ;; ++ rh_status_q && exit 0 ++ $1 ++ ;; + stop) +- stop +- ;; ++ rh_status_q || exit 0 ++ $1 ++ ;; + restart) +- restart +- ;; ++ $1 ++ ;; + reload) +- reload +- ;; ++ rh_status_q || exit 7 ++ $1 ++ ;; ++ force-reload) ++ force_reload + ;; -+ status) - status -+ status $iprdump -+ RETVAL=$? - ;; +- ;; ++ rh_status ++ ;; ++ condrestart|try-restart) ++ rh_status_q || exit 0 ++ restart ++ ;; *) - echo "Usage: $0 {start|stop|status|restart|reload}" - exit 1 -+ echo $"Usage: $0 {start|stop|restart|condrestart|status}" -+ RETVAL=3 - ;; +- ;; ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 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 @@ ++exit $? ++ +diff -up iprutils/init.d/iprinit.initscripts iprutils/init.d/iprinit +--- iprutils/init.d/iprinit.initscripts 2007-08-21 20:56:03.000000000 +0200 ++++ iprutils/init.d/iprinit 2009-10-05 14:59:18.000000000 +0200 +@@ -20,84 +20,97 @@ + # 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 ++exec=/sbin/iprinit ++lockfile=/var/lock/subsys/$prog ++pidfile=/var/run/iprinit.pid + + start() { +- echo -n "Starting ipr initialization daemon" ++ [ -x $exec ] || exit 5 ++ echo -n "Starting $prog: " + if [ ! -d /sys/class/scsi_generic ] ; then + modprobe sg + fi +- start_daemon $IPRINIT --daemon ++ daemon $exec --daemon + + RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg " " +- else +- log_failure_msg " " +- fi ++ echo ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile + return $RETVAL + } + + stop() { +- echo -n "Shutting down ipr initialization daemon" +- killproc $IPRINIT +- ++ echo -n "Stopping iprinit: " ++ killproc $exec -TERM + RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg " " +- else +- log_failure_msg " " +- fi ++ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile + return $RETVAL + } + + restart() { +- $0 stop +- $0 start +- return $RETVAL ++ stop ++ start + } + + reload() { +- echo -n "Reload ipr initialization daemon" +- $0 stop && $0 start +- return $RETVAL ++ restart + } + +-status() { +- echo -n "Checking for ipr initialization daemon: " ++force_reload() { ++ restart ++} + +- pidofproc $IPRINIT >& /dev/null ++rh_status() { ++ # run checks to determine if the service is running or use generic status ++ status $prog ++} + +- RETVAL=$? +- if [ $RETVAL -eq 0 ]; then +- log_success_msg "running" +- else +- log_failure_msg "unused" +- fi +- return $RETVAL ++rh_status_q() { ++ rh_status >/dev/null 2>&1 + } + ++ + case "$1" in + start) +- start +- ;; ++ rh_status_q && exit 0 ++ $1 ++ ;; + stop) +- stop +- ;; ++ rh_status_q || exit 0 ++ $1 ++ ;; + restart) +- restart +- ;; ++ $1 ++ ;; + reload) +- reload +- ;; ++ rh_status_q || exit 7 ++ $1 ++ ;; ++ force-reload) ++ force_reload ++ ;; + status) +- status +- ;; ++ rh_status ++ ;; ++ condrestart|try-restart) ++ rh_status_q || exit 0 ++ restart ++ ;; + *) +- echo "Usage: $0 {start|stop|status|restart|reload}" +- exit 1 +- ;; ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 + esac ++exit $? ++ +diff -up iprutils/init.d/iprupdate.initscripts iprutils/init.d/iprupdate +--- iprutils/init.d/iprupdate.initscripts 2008-11-20 02:20:20.000000000 +0100 ++++ iprutils/init.d/iprupdate 2009-10-05 15:04:50.000000000 +0200 +@@ -20,86 +20,98 @@ # Short-Description: Start the iprupdate utility # Description: Start the iprupdate utility ### END INIT INFO @@ -153,7 +321,7 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate +RETVAL=0 + +prog=iprupdate -+iprupdate=/sbin/iprupdate ++exec=/sbin/iprupdate +lockfile=/var/lock/subsys/iprupdate +pidfile=/var/run/iprupdate.pid @@ -173,59 +341,75 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate - log_failure_msg " " - fi - return $RETVAL --} ++ [ -x $exec ] || exit 5 + echo -n "Starting iprupdate: " ++ ++ if [ ! -d /sys/class/scsi_generic ]; then ++ modprobe sg ++ fi ++ ++ daemon $exec --daemon ++ RETVAL=$? ++ echo ++ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile ++ return $RETVAL + } --stop() { + stop() { - echo -n "Shutting down ipr update daemon" - killproc $IPRUPDATE - -- RETVAL=$? ++ echo -n "Stopping iprupdate: " ++ killproc $exec -TERM + 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 +- fi ++ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile return $RETVAL } + restart() { +- $0 stop +- $0 start +- return $RETVAL ++ stop ++ start + } + + reload() { +- $0 stop +- $0 start +- return $RETVAL ++ restart + } + -status() { - echo -n "Checking for ipr update daemon: " -- ++force_reload() { ++ restart ++} + - pidofproc $IPRUPDATE >& /dev/null -- -+stop() { -+ echo -n "Stopping iprupdate: " -+ killproc $iprupdate -TERM - RETVAL=$? ++rh_status() { ++ # run checks to determine if the service is running or use generic status ++ status $prog ++} + +- 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 ++rh_status_q() { ++ rh_status >/dev/null 2>&1 } ++ case "$1" in - start) - start @@ -247,171 +431,33 @@ diff -up iprutils/init.d/iprupdate.initscript iprutils/init.d/iprupdate - exit 1 - ;; + start) -+ start -+ RETVAL=$? ++ rh_status_q && exit 0 ++ $1 + ;; + stop) -+ stop -+ RETVAL=$? ++ rh_status_q || exit 0 ++ $1 + ;; -+ restart|force-reload) -+ stop ; start -+ RETVAL=$? ++ restart) ++ $1 + ;; -+ try-restart|reload|configtest) -+ RETVAL=3 ++ reload) ++ rh_status_q || exit 7 ++ $1 + ;; -+ condrestart) -+ if [ -f $lockfile ]; then -+ stop ; start -+ RETVAL=$? -+ fi ++ force-reload) ++ force_reload + ;; + status) -+ status $iprupdate -+ RETVAL=$? ++ rh_status ++ ;; ++ condrestart|try-restart) ++ rh_status_q || exit 0 ++ restart + ;; + *) -+ 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 -+ ;; ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 esac ++exit $? + diff --git a/iprutils.spec b/iprutils.spec index 9bf96c8..39907e2 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,6 +1,6 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.2.17 +Version: 2.2.18 Release: 1%{?dist} License: CPL Group: System Environment/Base @@ -64,6 +64,10 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Nov 04 2009 Roman Rakus - 2.2.18-1 +- Version 2.2.18 +- Corrected initscripts + * Thu Sep 17 2009 Roman Rakus - 2.2.17-1 - Version 2.2.17 diff --git a/sources b/sources index 9c283b2..11d282e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b067fc42272d7883091b5ed44c47b42 iprutils-2.2.17-src.tgz +ec24e468174b84460587cc6cdf6f9561 iprutils-2.2.18-src.tgz From 7811ce67af58c7aeff1e25720bd310d13380e2a7 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Wed, 4 Nov 2009 16:14:11 +0000 Subject: [PATCH 04/70] Version 2.2.18 --- .cvsignore | 2 +- iprutils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 302ab1d..68a48b7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -iprutils-2.2.17-src.tgz +iprutils-2.2.18-src.tgz diff --git a/iprutils.spec b/iprutils.spec index b1b1b61..6ba600d 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.2.17 -Release: 2%{?dist} +Version: 2.2.18 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -64,6 +64,9 @@ CFLAGS="%{optflags}" %{__make} %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Nov 04 2009 Roman Rakus - 2.2.18-1 +- Version 2.2.18 + * Mon Oct 05 2009 Roman Rakus - 2.2.17-2 - Fixed initscripts (#522464, #522462, #522461) diff --git a/sources b/sources index 9c283b2..11d282e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b067fc42272d7883091b5ed44c47b42 iprutils-2.2.17-src.tgz +ec24e468174b84460587cc6cdf6f9561 iprutils-2.2.18-src.tgz From 0ad3763a71dd5a09e8ce99fde3fb13489ebbc335 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:40:40 +0000 Subject: [PATCH 05/70] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7872342..96b24ad 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: iprutils -# $Id: Makefile,v 1.1 2004/09/09 06:18:32 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:53:14 notting 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5f3b760aa65289c25cfa3cff9845cf6109d74cc3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:22:04 +0000 Subject: [PATCH 06/70] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7872342..96b24ad 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: iprutils -# $Id: Makefile,v 1.1 2004/09/09 06:18:32 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:53:14 notting 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f6c293f60078f224ffe471363c00365048618d56 Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Thu, 28 Jan 2010 12:21:37 +0000 Subject: [PATCH 07/70] moved files from /sbin to /usr/sbin and made symlinks --- iprutils.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 6ba600d..9ddd3ee 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.18 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -42,6 +42,13 @@ CFLAGS="%{optflags}" %{__make} %{__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 +# move all binaries from /sbin to /usr/sbin and +# make symbolink links for all binaries in /sbin to /usr/sbin +mkdir %{buildroot}/usr/sbin +for file in iprconfig iprdbg iprdump iprinit iprupdate; do + mv %{buildroot}/sbin/$file %{buildroot}/usr/sbin/$file + ln -s /usr/sbin/$file %{buildroot}/sbin/$file +done %post /sbin/chkconfig --add iprdump @@ -60,10 +67,14 @@ CFLAGS="%{optflags}" %{__make} %defattr(-,root,root,-) %doc README LICENSE /sbin/* +/usr/sbin/* %{_mandir}/man*/* %{_sysconfdir}/rc.d/init.d/* %changelog +* Tue Jan 26 2010 Roman Rakus 2.2.18-2 +- moved files from /sbin to /usr/sbin and made symlinks + * Wed Nov 04 2009 Roman Rakus - 2.2.18-1 - Version 2.2.18 From 49b35bfc5ebb60f12c0bdac73def030b0414cbcb Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Thu, 11 Feb 2010 08:37:39 +0000 Subject: [PATCH 08/70] added missing man page of iprdbg --- iprdbg.8.gz | Bin 0 -> 582 bytes iprutils.spec | 13 ++++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 iprdbg.8.gz diff --git a/iprdbg.8.gz b/iprdbg.8.gz new file mode 100644 index 0000000000000000000000000000000000000000..999b3727fce1e54e62013e3f0fa5445d7f651c2a GIT binary patch literal 582 zcmV-M0=fMkiwFoRx^qha18Hz_WMXG7H~@W8&u^PB6u$FUJmu0>Y8={AJ5AF_!WK(O zh=6RJ)QbU!SOXi`hBp8Go=wtamvKP$v%mNKcqXqCxLw@ALUkuC>Z66nFbwbA|2ZId zNTuakGAop14a|EZBsT^&tUS6E0(GafKL;i&Q1-~RAs!nw4WzEAfs`Ar2VN1#kHSEw zRjpa;5eNWQma6TTJPBEQXv>gRu*Lw>9CsDo8JK8T(QxQx#kI%brPhEtxQ)jxRNJDG zU0*b!gtaKSG#rKp62jY2l*bPyf!eK;QVC=I+zo{i$V{OuawAhl~}Za%@@w{@-#YRu-ZnzfMq`=}`z zwHQyojI%{bcR5YA0hz;SBtWv>aGZ-eEB?PNH*4%QiC<_ASsvy4Y!VQPp?MpPhV*IRNq+`iCc5^NRFBtoVEXXSdCE=V*!4D>H7k}=!+37d|W;vi5M4zR_C zGxC0;>p1f*XWW*v(E}-!JdDMG=~<)d^T9Z^BuB`3Y**1<(!At5`pV)MqIHH+$vky; zTyIg|KHc44DplWha9t1*rC%5NuEGcHO1^2d&sRwr{A4G|VXjUX?dLbQDZVytR%DRe U5>d2hr2P{70Vmqul%)dz0J_E$;s5{u literal 0 HcmV?d00001 diff --git a/iprutils.spec b/iprutils.spec index 9ddd3ee..5baddbe 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,12 +1,16 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.2.18 -Release: 2%{?dist} +Release: 3%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/%{version}/%{name}-%{version}-src.tgz + +# missing man page +Source1: iprdbg.8.gz + Patch0: %{name}-cflags.patch Patch1: %{name}-initscripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,6 +46,10 @@ CFLAGS="%{optflags}" %{__make} %{__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 + +# missing man page +%{__install} -m 0755 %SOURCE1 %{buildroot}%{_mandir}/man8/ + # move all binaries from /sbin to /usr/sbin and # make symbolink links for all binaries in /sbin to /usr/sbin mkdir %{buildroot}/usr/sbin @@ -72,6 +80,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Thu Feb 11 2010 Roman Rakus 2.2.18-3 +- added missing man page + * Tue Jan 26 2010 Roman Rakus 2.2.18-2 - moved files from /sbin to /usr/sbin and made symlinks From 6d72059444d1b18b627c0a3725b3d3e5d2344c7c Mon Sep 17 00:00:00 2001 From: Roman Rakus Date: Mon, 12 Apr 2010 11:42:51 +0000 Subject: [PATCH 09/70] Update to version 2.2.20 --- .cvsignore | 2 +- iprutils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 68a48b7..467857e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -iprutils-2.2.18-src.tgz +iprutils-2.2.20-src.tgz diff --git a/iprutils.spec b/iprutils.spec index 5baddbe..208e221 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.2.18 -Release: 3%{?dist} +Version: 2.2.20 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -80,6 +80,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Mon Apr 12 2010 Roman Rakus - 2.2.20-1 +- Update to version 2.2.20 + * Thu Feb 11 2010 Roman Rakus 2.2.18-3 - added missing man page diff --git a/sources b/sources index 11d282e..bc64ef9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec24e468174b84460587cc6cdf6f9561 iprutils-2.2.18-src.tgz +465643c0e6fa9b362ab2af4b12f2ed33 iprutils-2.2.20-src.tgz From b889ff1d662688a607bed28fe920d3bb219f6add Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:23:54 +0000 Subject: [PATCH 10/70] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 96b24ad..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: iprutils -# $Id: Makefile,v 1.2 2007/10/15 18:53:14 notting 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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 From 213a4f8baaf2af3f809d9bfdc69ae244aaacd8d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:23:57 +0000 Subject: [PATCH 11/70] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 96b24ad..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: iprutils -# $Id: Makefile,v 1.2 2007/10/15 18:53:14 notting 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 $$d/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) From a4d24db8ad84f3135e9b1e65ea1aedf1ad0d0710 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Wed, 9 Feb 2011 13:03:13 +0100 Subject: [PATCH 12/70] - Update to version 2.3.2 --- .gitignore | 1 + iprutils.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 467857e..bffa073 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ iprutils-2.2.20-src.tgz +/iprutils-2.3.2-src.tgz diff --git a/iprutils.spec b/iprutils.spec index 208e221..22adb63 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,6 +1,6 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.2.20 +Version: 2.3.2 Release: 1%{?dist} License: CPL Group: System Environment/Base @@ -80,6 +80,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Feb 09 2011 Jiri Skala - 2.3.2-1 +- Update to version 2.3.2 + * Mon Apr 12 2010 Roman Rakus - 2.2.20-1 - Update to version 2.2.20 diff --git a/sources b/sources index bc64ef9..4728aa0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -465643c0e6fa9b362ab2af4b12f2ed33 iprutils-2.2.20-src.tgz +497b13a0890c62bc8c4b1ed599a75b33 iprutils-2.3.2-src.tgz From cd3dd63c0d6197679d6eb4106faa429b0606df05 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 06:59:50 -0600 Subject: [PATCH 13/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 22adb63..f27de81 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -80,6 +80,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 2.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Feb 09 2011 Jiri Skala - 2.3.2-1 - Update to version 2.3.2 From 360c5d9b7d3bdf10d923a7a49471d0e2eefb31ff Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Fri, 5 Aug 2011 19:21:27 +0200 Subject: [PATCH 14/70] Update to version 2.3.6 --- .gitignore | 1 + iprutils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bffa073..ee846b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ iprutils-2.2.20-src.tgz /iprutils-2.3.2-src.tgz +/iprutils-2.3.6-src.tgz diff --git a/iprutils.spec b/iprutils.spec index f27de81..7a7d105 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.3.2 -Release: 2%{?dist} +Version: 2.3.6 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -80,6 +80,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Fri Aug 05 2011 Jiri Skala - 2.3.6-1 +- Update to version 2.3.6 + * Wed Feb 09 2011 Fedora Release Engineering - 2.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 4728aa0..c0a5b99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -497b13a0890c62bc8c4b1ed599a75b33 iprutils-2.3.2-src.tgz +f308573b8d60892d1721b98b0fbac83c iprutils-2.3.6-src.tgz From 070133056e449016c5f56be55e7364699bf2d7d1 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Wed, 24 Aug 2011 10:44:39 +0200 Subject: [PATCH 15/70] Update to version 2.3.7 --- .gitignore | 1 + iprutils.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ee846b1..379143f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ iprutils-2.2.20-src.tgz /iprutils-2.3.2-src.tgz /iprutils-2.3.6-src.tgz +/iprutils-2.3.7-src.tgz diff --git a/iprutils.spec b/iprutils.spec index 7a7d105..f6c8059 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,6 +1,6 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.3.6 +Version: 2.3.7 Release: 1%{?dist} License: CPL Group: System Environment/Base @@ -80,6 +80,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Aug 24 2011 Jiri Skala - 2.3.7-1 +- Update to version 2.3.7 + * Fri Aug 05 2011 Jiri Skala - 2.3.6-1 - Update to version 2.3.6 diff --git a/sources b/sources index c0a5b99..3184be5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f308573b8d60892d1721b98b0fbac83c iprutils-2.3.6-src.tgz +068ca361a8abe3a713939e2834f21582 iprutils-2.3.7-src.tgz From 808eaaf00c5da024a0592e1309d7d598cd703dc3 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Thu, 22 Dec 2011 10:48:49 +0100 Subject: [PATCH 16/70] Update to version 2.3.9 --- .gitignore | 1 + iprutils.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 379143f..a20cac8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ iprutils-2.2.20-src.tgz /iprutils-2.3.2-src.tgz /iprutils-2.3.6-src.tgz /iprutils-2.3.7-src.tgz +/iprutils-2.3.9-src.tgz diff --git a/iprutils.spec b/iprutils.spec index f6c8059..93463e6 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,6 +1,6 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.3.7 +Version: 2.3.9 Release: 1%{?dist} License: CPL Group: System Environment/Base @@ -80,6 +80,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Thu Dec 22 2011 Jiri Skala - 2.3.9-1 +- Update to version 2.3.9 + * Wed Aug 24 2011 Jiri Skala - 2.3.7-1 - Update to version 2.3.7 diff --git a/sources b/sources index 3184be5..21dd002 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -068ca361a8abe3a713939e2834f21582 iprutils-2.3.7-src.tgz +e6d0a2866f6f1c9d9dec00a01cc634d7 iprutils-2.3.9-src.tgz From eda95a481680ab86c96ce8267590ab5f71493580 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 23:58:08 -0600 Subject: [PATCH 17/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 93463e6..a9e6f6a 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.3.9 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -80,6 +80,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 2.3.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Dec 22 2011 Jiri Skala - 2.3.9-1 - Update to version 2.3.9 From 667d3189e449221d27f9e5e58b8f42e189cb843c Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 8 May 2012 14:53:45 +0200 Subject: [PATCH 18/70] update to iprutils-2.3.10 --- .gitignore | 1 + iprutils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a20cac8..4a8c4b4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ iprutils-2.2.20-src.tgz /iprutils-2.3.6-src.tgz /iprutils-2.3.7-src.tgz /iprutils-2.3.9-src.tgz +/iprutils-2.3.10-src.tgz diff --git a/iprutils.spec b/iprutils.spec index a9e6f6a..fbef0fc 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.3.9 -Release: 2%{?dist} +Version: 2.3.10 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -80,6 +80,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Tue May 08 2012 Karsten Hopp 2.3.10-1 +- update to iprutils-2.3.10 + * Fri Jan 13 2012 Fedora Release Engineering - 2.3.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 21dd002..ce82412 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6d0a2866f6f1c9d9dec00a01cc634d7 iprutils-2.3.9-src.tgz +c11686bd78042c64575219a5951bfad9 iprutils-2.3.10-src.tgz From 974fac3ce93e9148797fcd529131a80593b241d6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 10:02:22 -0500 Subject: [PATCH 19/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index fbef0fc..cecae96 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.3.10 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -80,6 +80,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 2.3.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue May 08 2012 Karsten Hopp 2.3.10-1 - update to iprutils-2.3.10 From 4276961aeab70c74d974864934fd1edda8058172 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 5 Sep 2012 17:04:44 +0200 Subject: [PATCH 20/70] update to 2.3.11 enable on all archs as it now supports some adapters on them, too. --- .gitignore | 1 + iprutils.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4a8c4b4..81d0f12 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ iprutils-2.2.20-src.tgz /iprutils-2.3.7-src.tgz /iprutils-2.3.9-src.tgz /iprutils-2.3.10-src.tgz +/iprutils-2.3.11-src.tgz diff --git a/iprutils.spec b/iprutils.spec index cecae96..0846b71 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.3.10 -Release: 2%{?dist} +Version: 2.3.11 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -14,7 +14,6 @@ Source1: iprdbg.8.gz Patch0: %{name}-cflags.patch Patch1: %{name}-initscripts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: ppc ppc64 Requires: /sbin/pidof @@ -80,6 +79,10 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Wed Sep 05 2012 Karsten Hopp 2.3.11-1 +- update to 2.3.11 +- enable on all archs as it now supports some adapters on them, too. + * Thu Jul 19 2012 Fedora Release Engineering - 2.3.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index ce82412..1286113 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c11686bd78042c64575219a5951bfad9 iprutils-2.3.10-src.tgz +c615e7e7d9ddde3fc24f9d2ce85c1537 iprutils-2.3.11-src.tgz From 02fb4a969820867f5504e6485e6d42555587186e Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 11 Sep 2012 21:37:47 +0200 Subject: [PATCH 21/70] Prevent the RPM from conflicting with itself (BZ #856330) (David Aquilina) --- iprutils.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/iprutils.spec b/iprutils.spec index 0846b71..19346ce 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.3.11 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -49,12 +49,10 @@ CFLAGS="%{optflags}" %{__make} # missing man page %{__install} -m 0755 %SOURCE1 %{buildroot}%{_mandir}/man8/ -# move all binaries from /sbin to /usr/sbin and -# make symbolink links for all binaries in /sbin to /usr/sbin +# move all binaries from /sbin to /usr/sbin mkdir %{buildroot}/usr/sbin for file in iprconfig iprdbg iprdump iprinit iprupdate; do mv %{buildroot}/sbin/$file %{buildroot}/usr/sbin/$file - ln -s /usr/sbin/$file %{buildroot}/sbin/$file done %post @@ -73,12 +71,14 @@ done %files %defattr(-,root,root,-) %doc README LICENSE -/sbin/* -/usr/sbin/* +%{_sbindir}/* %{_mandir}/man*/* %{_sysconfdir}/rc.d/init.d/* %changelog +* Tue Sep 11 2012 David Aquilina 2.3.11-2 +- Prevent the RPM from conflicting with itself (BZ #856330) + * Wed Sep 05 2012 Karsten Hopp 2.3.11-1 - update to 2.3.11 - enable on all archs as it now supports some adapters on them, too. From 05a8a1800879a03d19e6349689dce88c734c8db1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 29 Dec 2012 11:16:01 +0000 Subject: [PATCH 22/70] 2.3.13 --- .gitignore | 8 +------- iprutils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 81d0f12..37c9935 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -iprutils-2.2.20-src.tgz -/iprutils-2.3.2-src.tgz -/iprutils-2.3.6-src.tgz -/iprutils-2.3.7-src.tgz -/iprutils-2.3.9-src.tgz -/iprutils-2.3.10-src.tgz -/iprutils-2.3.11-src.tgz +/iprutils-*-src.tgz diff --git a/iprutils.spec b/iprutils.spec index 19346ce..b81d2e7 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.3.11 -Release: 2%{?dist} +Version: 2.3.13 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -76,6 +76,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Sat Dec 29 2012 Peter Robinson 2.3.13-1 +- update to 2.3.13 + * Tue Sep 11 2012 David Aquilina 2.3.11-2 - Prevent the RPM from conflicting with itself (BZ #856330) diff --git a/sources b/sources index 1286113..a3b0b9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c615e7e7d9ddde3fc24f9d2ce85c1537 iprutils-2.3.11-src.tgz +02bce5bf7c33535dfcf7af70db8900b2 iprutils-2.3.13-src.tgz From 7c1eec2297cc54f79ebc8c93d12e6ff46e2eef23 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 20:12:47 -0600 Subject: [PATCH 23/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index b81d2e7..d5ca898 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.3.13 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -76,6 +76,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 2.3.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Dec 29 2012 Peter Robinson 2.3.13-1 - update to 2.3.13 From b1f482df87d13c0eb41471e3d2fd71d32ce02ce0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 14:51:23 -0500 Subject: [PATCH 24/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index d5ca898..2a38b40 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.3.13 -Release: 2%{?dist} +Release: 3%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -76,6 +76,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.3.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 2.3.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From edecacdc5c36ee17b1dda877807269ce68debdab Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 17:37:33 -0500 Subject: [PATCH 25/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 2a38b40..ab0dd79 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.3.13 -Release: 3%{?dist} +Release: 4%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -76,6 +76,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.3.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 2.3.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From d0c2a4deb0edf7e2328238a4bfcc8c4e9b99bb06 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 21:45:38 +0000 Subject: [PATCH 26/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index ab0dd79..753945d 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.3.13 -Release: 4%{?dist} +Release: 5%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -76,6 +76,9 @@ done %{_sysconfdir}/rc.d/init.d/* %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 2.3.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 2.3.13-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 3f5259234e697c572006380dc899a75bf7ef29c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Wed, 1 Oct 2014 13:07:37 +0200 Subject: [PATCH 27/70] Rebase to 2.4.4 --- ...vice-start-is-controled-by-udev-rule.patch | 68 +++ iprutils-cflags.patch | 11 - iprutils-initscripts.patch | 463 ------------------ iprutils-lsb-init-ectomy.patch | 189 ------- iprutils.spec | 71 +-- sources | 2 +- 6 files changed, 111 insertions(+), 693 deletions(-) create mode 100644 0001-Service-start-is-controled-by-udev-rule.patch delete mode 100644 iprutils-cflags.patch delete mode 100644 iprutils-initscripts.patch delete mode 100644 iprutils-lsb-init-ectomy.patch diff --git a/0001-Service-start-is-controled-by-udev-rule.patch b/0001-Service-start-is-controled-by-udev-rule.patch new file mode 100644 index 0000000..2cf9077 --- /dev/null +++ b/0001-Service-start-is-controled-by-udev-rule.patch @@ -0,0 +1,68 @@ +From fed37f858254734b26c09f3b52b51cb63d102229 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20=C4=8Cajka?= +Date: Mon, 1 Sep 2014 14:03:56 +0200 +Subject: [PATCH] Service start is controled by udev rule + +--- + systemd/iprdump.service | 2 +- + systemd/iprinit.service | 2 +- + systemd/iprupdate.service | 2 +- + systemd/iprutils.target | 7 +++++++ + udev/rules.d/90-iprutils.rules | 1 + + 5 files changed, 11 insertions(+), 3 deletions(-) + create mode 100644 systemd/iprutils.target + create mode 100644 udev/rules.d/90-iprutils.rules + +diff --git a/systemd/iprdump.service b/systemd/iprdump.service +index f1a72ff..4f085eb 100644 +--- a/systemd/iprdump.service ++++ b/systemd/iprdump.service +@@ -7,4 +7,4 @@ Type=forking + ExecStart=/sbin/iprdump --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprinit.service b/systemd/iprinit.service +index 2ae0ce0..1d699d6 100644 +--- a/systemd/iprinit.service ++++ b/systemd/iprinit.service +@@ -6,4 +6,4 @@ Type=forking + ExecStart=/sbin/iprinit --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprupdate.service b/systemd/iprupdate.service +index f34ed86..732dcf4 100644 +--- a/systemd/iprupdate.service ++++ b/systemd/iprupdate.service +@@ -6,4 +6,4 @@ Type=forking + ExecStart=/sbin/iprupdate --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprutils.target b/systemd/iprutils.target +new file mode 100644 +index 0000000..1b1260e +--- /dev/null ++++ b/systemd/iprutils.target +@@ -0,0 +1,7 @@ ++[Unit] ++Description=IBM Power Raid utilities ++Requires=iprupdate.service iprinit.service iprdump.service basic.target ++Before=default.target ++ ++[Install] ++WantedBy=default.target +diff --git a/udev/rules.d/90-iprutils.rules b/udev/rules.d/90-iprutils.rules +new file mode 100644 +index 0000000..ea39fa3 +--- /dev/null ++++ b/udev/rules.d/90-iprutils.rules +@@ -0,0 +1 @@ ++DRIVERS=="ipr", TAG+="systemd", ENV{SYSTEMD_WANTS}+="iprutils.target" +-- +1.9.3 + diff --git a/iprutils-cflags.patch b/iprutils-cflags.patch deleted file mode 100644 index b615bde..0000000 --- a/iprutils-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iprutils/Makefile.cflags 2005-12-23 10:11:42.000000000 +0000 -+++ iprutils/Makefile 2005-12-23 10:11:49.000000000 +0000 -@@ -9,7 +9,7 @@ - - include version.mk - --CFLAGS = -g -Wall $(IPR_DEFINES) -+CFLAGS += -g -Wall $(IPR_DEFINES) - UTILS_VER = $(IPR_MAJOR_RELEASE).$(IPR_MINOR_RELEASE).$(IPR_FIX_LEVEL) - TAR = cd .. && tar -zcpf iprutils-$(UTILS_VER)-src.tgz --exclude CVS --exclude applied-patches --exclude series --exclude txt --exclude pc --exclude patches --exclude debug --exclude *~* iprutils - diff --git a/iprutils-initscripts.patch b/iprutils-initscripts.patch deleted file mode 100644 index 0641491..0000000 --- a/iprutils-initscripts.patch +++ /dev/null @@ -1,463 +0,0 @@ -diff -up iprutils/init.d/iprdump.initscripts iprutils/init.d/iprdump ---- iprutils/init.d/iprdump.initscripts 2008-11-20 02:20:20.000000000 +0100 -+++ iprutils/init.d/iprdump 2009-10-05 13:46:41.000000000 +0200 -@@ -20,84 +20,98 @@ - # Short-Description: Start the ipr dump daemon - # Description: Start the ipr dump daemon - ### END INIT INFO -+# -+# 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 -+exec=/sbin/iprdump -+lockfile=/var/lock/subsys/iprdump -+pidfile=/var/run/iprdump.pid - --IPRDUMP=/sbin/iprdump --test -x $IPRDUMP || exit 5 --. /lib/lsb/init-functions - - start() { -- echo -n "Starting ipr dump daemon" -+ [ -x $exec ] || exit 5 -+ echo -n "Starting $prog: " - if [ ! -d /sys/class/scsi_generic ] ; then - modprobe sg - fi -- start_daemon $IPRDUMP --daemon -- -+ -+ daemon $exec --daemon - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -+ echo -+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile - return $RETVAL - } - - stop() { -- echo -n "Shutting down ipr dump daemon" -- killproc $IPRDUMP -- -+ echo -n "Stopping $prog: " -+ killproc $exec -TERM - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -+ echo -+ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile - return $RETVAL - } - - restart() { -- $0 stop -- $0 start -- return $RETVAL -+ stop -+ start - } - - reload() { -- echo -n "Reload ipr dump daemon" -- $0 stop && $0 start -- return $RETVAL -+ restart - } - --status() { -- echo -n "Checking for iprdump daemon: " -+force_reload() { -+ restart -+} - -- pidofproc $IPRDUMP >& /dev/null -+rh_status() { -+ # run checks to determine if the service is running or use generic status -+ status $prog -+} - -- RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg "running" -- else -- log_failure_msg "unused" -- fi -- return $RETVAL -+rh_status_q() { -+ rh_status >/dev/null 2>&1 - } - - case "$1" in - start) -- start -- ;; -+ rh_status_q && exit 0 -+ $1 -+ ;; - stop) -- stop -- ;; -+ rh_status_q || exit 0 -+ $1 -+ ;; - restart) -- restart -- ;; -+ $1 -+ ;; - reload) -- reload -- ;; -+ rh_status_q || exit 7 -+ $1 -+ ;; -+ force-reload) -+ force_reload -+ ;; - status) -- status -- ;; -+ rh_status -+ ;; -+ condrestart|try-restart) -+ rh_status_q || exit 0 -+ restart -+ ;; - *) -- echo "Usage: $0 {start|stop|status|restart|reload}" -- exit 1 -- ;; -+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" -+ exit 2 - esac -+exit $? -+ -diff -up iprutils/init.d/iprinit.initscripts iprutils/init.d/iprinit ---- iprutils/init.d/iprinit.initscripts 2007-08-21 20:56:03.000000000 +0200 -+++ iprutils/init.d/iprinit 2009-10-05 14:59:18.000000000 +0200 -@@ -20,84 +20,97 @@ - # 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 -+exec=/sbin/iprinit -+lockfile=/var/lock/subsys/$prog -+pidfile=/var/run/iprinit.pid - - start() { -- echo -n "Starting ipr initialization daemon" -+ [ -x $exec ] || exit 5 -+ echo -n "Starting $prog: " - if [ ! -d /sys/class/scsi_generic ] ; then - modprobe sg - fi -- start_daemon $IPRINIT --daemon -+ daemon $exec --daemon - - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -+ echo -+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile - return $RETVAL - } - - stop() { -- echo -n "Shutting down ipr initialization daemon" -- killproc $IPRINIT -- -+ echo -n "Stopping iprinit: " -+ killproc $exec -TERM - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -+ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile - return $RETVAL - } - - restart() { -- $0 stop -- $0 start -- return $RETVAL -+ stop -+ start - } - - reload() { -- echo -n "Reload ipr initialization daemon" -- $0 stop && $0 start -- return $RETVAL -+ restart - } - --status() { -- echo -n "Checking for ipr initialization daemon: " -+force_reload() { -+ restart -+} - -- pidofproc $IPRINIT >& /dev/null -+rh_status() { -+ # run checks to determine if the service is running or use generic status -+ status $prog -+} - -- RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg "running" -- else -- log_failure_msg "unused" -- fi -- return $RETVAL -+rh_status_q() { -+ rh_status >/dev/null 2>&1 - } - -+ - case "$1" in - start) -- start -- ;; -+ rh_status_q && exit 0 -+ $1 -+ ;; - stop) -- stop -- ;; -+ rh_status_q || exit 0 -+ $1 -+ ;; - restart) -- restart -- ;; -+ $1 -+ ;; - reload) -- reload -- ;; -+ rh_status_q || exit 7 -+ $1 -+ ;; -+ force-reload) -+ force_reload -+ ;; - status) -- status -- ;; -+ rh_status -+ ;; -+ condrestart|try-restart) -+ rh_status_q || exit 0 -+ restart -+ ;; - *) -- echo "Usage: $0 {start|stop|status|restart|reload}" -- exit 1 -- ;; -+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" -+ exit 2 - esac -+exit $? -+ -diff -up iprutils/init.d/iprupdate.initscripts iprutils/init.d/iprupdate ---- iprutils/init.d/iprupdate.initscripts 2008-11-20 02:20:20.000000000 +0100 -+++ iprutils/init.d/iprupdate 2009-10-05 15:04:50.000000000 +0200 -@@ -20,86 +20,98 @@ - # 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 -+exec=/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 -+ [ -x $exec ] || exit 5 -+ echo -n "Starting iprupdate: " -+ -+ if [ ! -d /sys/class/scsi_generic ]; then -+ modprobe sg -+ fi -+ -+ daemon $exec --daemon -+ RETVAL=$? -+ echo -+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile -+ return $RETVAL - } - - stop() { -- echo -n "Shutting down ipr update daemon" -- killproc $IPRUPDATE -- -+ echo -n "Stopping iprupdate: " -+ killproc $exec -TERM - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -+ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile - return $RETVAL - } - - restart() { -- $0 stop -- $0 start -- return $RETVAL -+ stop -+ start - } - - reload() { -- $0 stop -- $0 start -- return $RETVAL -+ restart - } - --status() { -- echo -n "Checking for ipr update daemon: " -+force_reload() { -+ restart -+} - -- pidofproc $IPRUPDATE >& /dev/null -+rh_status() { -+ # run checks to determine if the service is running or use generic status -+ status $prog -+} - -- RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg "running" -- else -- log_failure_msg "unused" -- fi -- return $RETVAL -+rh_status_q() { -+ rh_status >/dev/null 2>&1 - } - -+ - case "$1" in -- start) -- start -- ;; -- stop) -- stop -- ;; -- restart) -- restart -- ;; -- reload) -- reload -- ;; -- status) -- status -- ;; -- *) -- echo "Usage: $0 {start|stop|status|restart|reload}" -- exit 1 -- ;; -+ start) -+ rh_status_q && exit 0 -+ $1 -+ ;; -+ stop) -+ rh_status_q || exit 0 -+ $1 -+ ;; -+ restart) -+ $1 -+ ;; -+ reload) -+ rh_status_q || exit 7 -+ $1 -+ ;; -+ force-reload) -+ force_reload -+ ;; -+ status) -+ rh_status -+ ;; -+ condrestart|try-restart) -+ rh_status_q || exit 0 -+ restart -+ ;; -+ *) -+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" -+ exit 2 - esac -+exit $? -+ diff --git a/iprutils-lsb-init-ectomy.patch b/iprutils-lsb-init-ectomy.patch deleted file mode 100644 index 328b5c5..0000000 --- a/iprutils-lsb-init-ectomy.patch +++ /dev/null @@ -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 - } diff --git a/iprutils.spec b/iprutils.spec index 753945d..b35aca8 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.3.13 -Release: 5%{?dist} +Version: 2.4.4 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -11,17 +11,15 @@ Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20k # missing man page Source1: iprdbg.8.gz -Patch0: %{name}-cflags.patch -Patch1: %{name}-initscripts.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# sent to upstream +Patch0: 0001-Service-start-is-controled-by-udev-rule.patch Requires: /sbin/pidof -BuildRequires: libsysfs-devel -BuildRequires: pciutils-devel BuildRequires: ncurses-devel BuildRequires: libcap-devel BuildRequires: kernel-devel +BuildRequires: systemd Obsoletes: ipr-utils @@ -31,51 +29,66 @@ supported by the ipr SCSI storage device driver. %prep %setup -q -n %{name} -%patch0 -p1 -b .cflags -%patch1 -p1 -b .initscripts +%patch0 -p1 -b .udev %build -CFLAGS="%{optflags}" %{__make} +export CFLAGS="%{optflags} -fPIE -Wl,-z,relro,-z,now" +export LDFLAGS="-pie" +%{__make} %install -%{__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 +mkdir -p %{buildroot}/%{_unitdir} +%{__install} -m 0644 systemd/iprinit.service %{buildroot}/%{_unitdir}/iprinit.service +%{__install} -m 0644 systemd/iprdump.service %{buildroot}/%{_unitdir}/iprdump.service +%{__install} -m 0644 systemd/iprupdate.service %{buildroot}/%{_unitdir}/iprupdate.service +%{__install} -m 0644 systemd/iprutils.target %{buildroot}/%{_unitdir}/iprutils.target + +mkdir -p %{buildroot}/%{_udevrulesdir} +%{__install} -m 0644 udev/rules.d/90-iprutils.rules %{buildroot}/%{_udevrulesdir}/90-iprutils.rules # missing man page -%{__install} -m 0755 %SOURCE1 %{buildroot}%{_mandir}/man8/ +%{__install} -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/ # move all binaries from /sbin to /usr/sbin mkdir %{buildroot}/usr/sbin for file in iprconfig iprdbg iprdump iprinit iprupdate; do mv %{buildroot}/sbin/$file %{buildroot}/usr/sbin/$file + # fix permissions + chmod 0755 %{buildroot}/usr/sbin/$file done %post -/sbin/chkconfig --add iprdump -/sbin/chkconfig --add iprupdate -/sbin/chkconfig --add iprinit +%systemd_post iprinit.service +%systemd_post iprdump.service +%systemd_post iprupdate.service +%systemd_post iprutils.target %preun -/sbin/chkconfig --del iprdump -/sbin/chkconfig --del iprupdate -/sbin/chkconfig --del iprinit - -%clean -%{__rm} -rf %{buildroot} +%systemd_preun iprinit.service +%systemd_preun iprdump.service +%systemd_preun iprupdate.service +%systemd_preun iprutils.target %files -%defattr(-,root,root,-) %doc README LICENSE %{_sbindir}/* -%{_mandir}/man*/* -%{_sysconfdir}/rc.d/init.d/* - +#fix permissions +%attr(0644,root,root) %{_mandir}/man*/* +%{_unitdir}/iprinit.service +%{_unitdir}/iprdump.service +%{_unitdir}/iprupdate.service +%{_unitdir}/iprutils.target +%{_udevrulesdir}/90-iprutils.rules + %changelog +* Wed Oct 1 2014 Jakub Čajka - 2.4.4-1 +- Rebase to 2.4.4 +- Moved to systemd +- Spec file clean up +- Fixed build flags + * Sat Aug 16 2014 Fedora Release Engineering - 2.3.13-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index a3b0b9e..9272c42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02bce5bf7c33535dfcf7af70db8900b2 iprutils-2.3.13-src.tgz +c7c7bef8c0512ff3f570b7e93c52c994 iprutils-2.4.4-src.tgz From f3f722739420bf6f544ef7670e5e8d0cb96cde4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Wed, 19 Nov 2014 10:39:00 +0100 Subject: [PATCH 28/70] Rebase to 2.4.5 --- iprutils.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/iprutils.spec b/iprutils.spec index b35aca8..46d85ec 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,6 +1,6 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.4 +Version: 2.4.5 Release: 1%{?dist} License: CPL Group: System Environment/Base @@ -83,6 +83,9 @@ done %{_udevrulesdir}/90-iprutils.rules %changelog +* Wed Nov 19 2014 Jakub Čajka - 2.4.5-1 +- Rebase to 2.4.5 + * Wed Oct 1 2014 Jakub Čajka - 2.4.4-1 - Rebase to 2.4.4 - Moved to systemd diff --git a/sources b/sources index 9272c42..a05227c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7c7bef8c0512ff3f570b7e93c52c994 iprutils-2.4.4-src.tgz +62411afab58c47fd52a532c3b02fd1d0 iprutils-2.4.5-src.tgz From e43a35cc61980b7bf32fe3018bbc4e8c24de2b52 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 11:31:24 +0000 Subject: [PATCH 29/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 46d85ec..4b9d50f 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -83,6 +83,9 @@ done %{_udevrulesdir}/90-iprutils.rules %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Nov 19 2014 Jakub Čajka - 2.4.5-1 - Rebase to 2.4.5 From d4e3b749c4229f2f0fca746989fe7394ec064e6e Mon Sep 17 00:00:00 2001 From: Gabriel Krisman Bertazi Date: Tue, 14 Jul 2015 12:59:18 -0300 Subject: [PATCH 30/70] Rebase to 2.4.8 --- .gitignore | 1 + ...vice-start-is-controled-by-udev-rule.patch | 51 ++++++++++--------- iprutils.spec | 49 ++++++++++++------ sources | 2 +- 4 files changed, 62 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 37c9935..8850c00 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /iprutils-*-src.tgz +/iprutils-2.4.8.tar.gz diff --git a/0001-Service-start-is-controled-by-udev-rule.patch b/0001-Service-start-is-controled-by-udev-rule.patch index 2cf9077..629a976 100644 --- a/0001-Service-start-is-controled-by-udev-rule.patch +++ b/0001-Service-start-is-controled-by-udev-rule.patch @@ -1,44 +1,47 @@ -From fed37f858254734b26c09f3b52b51cb63d102229 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jakub=20=C4=8Cajka?= -Date: Mon, 1 Sep 2014 14:03:56 +0200 +From b880ec7893b072467df1dc202d3a09f5bddbb9b6 Mon Sep 17 00:00:00 2001 +From: Jakub Cajka +Date: Wed, 8 Jul 2015 12:48:43 -0300 Subject: [PATCH] Service start is controled by udev rule +Signed-off-by: Gabriel Krisman Bertazi + [Rebased to upstream.] + [Modified to use Autotools.] --- - systemd/iprdump.service | 2 +- - systemd/iprinit.service | 2 +- - systemd/iprupdate.service | 2 +- + systemd/iprdump.service.in | 2 +- + systemd/iprinit.service.in | 2 +- + systemd/iprupdate.service.in | 2 +- systemd/iprutils.target | 7 +++++++ udev/rules.d/90-iprutils.rules | 1 + 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 systemd/iprutils.target create mode 100644 udev/rules.d/90-iprutils.rules -diff --git a/systemd/iprdump.service b/systemd/iprdump.service -index f1a72ff..4f085eb 100644 ---- a/systemd/iprdump.service -+++ b/systemd/iprdump.service +diff --git a/systemd/iprdump.service.in b/systemd/iprdump.service.in +index 7f60e7c..fc92a40 100644 +--- a/systemd/iprdump.service.in ++++ b/systemd/iprdump.service.in @@ -7,4 +7,4 @@ Type=forking - ExecStart=/sbin/iprdump --daemon + ExecStart=@sbindir@/iprdump --daemon [Install] -WantedBy=multi-user.target +WantedBy=iprutils.target -diff --git a/systemd/iprinit.service b/systemd/iprinit.service -index 2ae0ce0..1d699d6 100644 ---- a/systemd/iprinit.service -+++ b/systemd/iprinit.service +diff --git a/systemd/iprinit.service.in b/systemd/iprinit.service.in +index dfbd33e..fb20cce 100644 +--- a/systemd/iprinit.service.in ++++ b/systemd/iprinit.service.in @@ -6,4 +6,4 @@ Type=forking - ExecStart=/sbin/iprinit --daemon + ExecStart=@sbindir@/iprinit --daemon [Install] -WantedBy=multi-user.target +WantedBy=iprutils.target -diff --git a/systemd/iprupdate.service b/systemd/iprupdate.service -index f34ed86..732dcf4 100644 ---- a/systemd/iprupdate.service -+++ b/systemd/iprupdate.service +diff --git a/systemd/iprupdate.service.in b/systemd/iprupdate.service.in +index 9f44245..001b1e8 100644 +--- a/systemd/iprupdate.service.in ++++ b/systemd/iprupdate.service.in @@ -6,4 +6,4 @@ Type=forking - ExecStart=/sbin/iprupdate --daemon + ExecStart=@sbindir@/iprupdate --daemon [Install] -WantedBy=multi-user.target @@ -58,11 +61,11 @@ index 0000000..1b1260e +WantedBy=default.target diff --git a/udev/rules.d/90-iprutils.rules b/udev/rules.d/90-iprutils.rules new file mode 100644 -index 0000000..ea39fa3 +index 0000000..1bb5a4a --- /dev/null +++ b/udev/rules.d/90-iprutils.rules @@ -0,0 +1 @@ -+DRIVERS=="ipr", TAG+="systemd", ENV{SYSTEMD_WANTS}+="iprutils.target" ++DRIVERS=="ipr", TAG+="systemd", ENV{SYSTEMD_WANTS}+="iprutils.target" -- -1.9.3 +2.1.0 diff --git a/iprutils.spec b/iprutils.spec index 4b9d50f..c160843 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,12 +1,12 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.5 -Release: 2%{?dist} +Version: 2.4.8 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ -Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/%{version}/%{name}-%{version}-src.tgz +Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/%{version}/%{name}-%{version}.tar.gz # missing man page Source1: iprdbg.8.gz @@ -20,6 +20,7 @@ BuildRequires: ncurses-devel BuildRequires: libcap-devel BuildRequires: kernel-devel BuildRequires: systemd +BuildRequires: python-devel Obsoletes: ipr-utils @@ -28,21 +29,25 @@ Provides a suite of utilities to manage and configure SCSI devices supported by the ipr SCSI storage device driver. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 -b .udev %build export CFLAGS="%{optflags} -fPIE -Wl,-z,relro,-z,now" export LDFLAGS="-pie" -%{__make} +%configure +%{__make} %{?_smp_mflags} %install -%{__make} INSTALL_MOD_PATH=%{buildroot} install +%{__make} DESTDIR=%{buildroot} install +# move systemd files to _unitdir mkdir -p %{buildroot}/%{_unitdir} -%{__install} -m 0644 systemd/iprinit.service %{buildroot}/%{_unitdir}/iprinit.service -%{__install} -m 0644 systemd/iprdump.service %{buildroot}/%{_unitdir}/iprdump.service -%{__install} -m 0644 systemd/iprupdate.service %{buildroot}/%{_unitdir}/iprupdate.service +%{__mv} %{buildroot}/%{_datadir}/iprutils/iprinit.service %{buildroot}/%{_unitdir}/ +%{__mv} %{buildroot}/%{_datadir}/iprutils/iprdump.service %{buildroot}/%{_unitdir}/ +%{__mv} %{buildroot}/%{_datadir}/iprutils/iprupdate.service %{buildroot}/%{_unitdir}/ + +# iprutils.target %{__install} -m 0644 systemd/iprutils.target %{buildroot}/%{_unitdir}/iprutils.target mkdir -p %{buildroot}/%{_udevrulesdir} @@ -51,13 +56,16 @@ mkdir -p %{buildroot}/%{_udevrulesdir} # missing man page %{__install} -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/ -# move all binaries from /sbin to /usr/sbin -mkdir %{buildroot}/usr/sbin -for file in iprconfig iprdbg iprdump iprinit iprupdate; do - mv %{buildroot}/sbin/$file %{buildroot}/usr/sbin/$file - # fix permissions - chmod 0755 %{buildroot}/usr/sbin/$file -done +#install bash completion +%{__mv} %{buildroot}/%{_sysconfdir}/bash_completion.d/{iprconfig-bash-completion.sh,iprconfig} + +# Remove temporary files and scripts that will not be packaged. +%{__rm} %{buildroot}/%{_sysconfdir}/ha.d/resource.d/{iprha,iprha.in} +%{__rm} %{buildroot}/%{_datadir}/iprutils/{iprdump,iprinit,iprupdate} +%{__rm} %{buildroot}/%{_datadir}/iprutils/{iprdump,iprinit,iprupdate}.in +%{__rm} %{buildroot}/%{_datadir}/iprutils/{iprdump,iprinit,iprupdate}.service.in +%{__rm} %{buildroot}/%{_datadir}/iprutils/iprutils.spec +%{__rm} %{buildroot}/%{python_sitelib}/sos/plugins/iprutils.{py,pyo,pyc} %post %systemd_post iprinit.service @@ -74,6 +82,7 @@ done %files %doc README LICENSE %{_sbindir}/* +%{_sysconfdir}/bash_completion.d/ #fix permissions %attr(0644,root,root) %{_mandir}/man*/* %{_unitdir}/iprinit.service @@ -83,6 +92,14 @@ done %{_udevrulesdir}/90-iprutils.rules %changelog +* Fri Jul 10 2015 Gabriel Krisman Bertazi - 2.4.8-1 +- Rebase to 2.4.8 +- Move to Autotools +- Remove unused files +- Rebase patch 0001 to use autotools +- Install bash completion +- Spec file clean up + * Wed Jun 17 2015 Fedora Release Engineering - 2.4.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index a05227c..61ae336 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62411afab58c47fd52a532c3b02fd1d0 iprutils-2.4.5-src.tgz +0c7877b914848e47710e14acc89c01c2 iprutils-2.4.8.tar.gz From 2c648baa2f35daf852bb3a5bad1e5727339076db Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 00:37:12 +0000 Subject: [PATCH 31/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index c160843..f646a97 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.8 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -92,6 +92,9 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jul 10 2015 Gabriel Krisman Bertazi - 2.4.8-1 - Rebase to 2.4.8 - Move to Autotools From 7d37c5b354a3dcceafc15a0d469d390bc66b59c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Sat, 27 Feb 2016 17:57:41 +0100 Subject: [PATCH 32/70] rebase to 2.4.10.1 --- .gitignore | 1 + iprutils.spec | 24 ++++++++---------------- sources | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 8850c00..d082e8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /iprutils-*-src.tgz /iprutils-2.4.8.tar.gz +/iprutils-2.4.10.1.tar.gz diff --git a/iprutils.spec b/iprutils.spec index f646a97..7b08fa2 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,12 +1,11 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.8 -Release: 2%{?dist} +Version: 2.4.10.1 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ - -Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/%{version}/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/2.4.10/%{name}-%{version}.tar.gz # missing man page Source1: iprdbg.8.gz @@ -41,12 +40,6 @@ export LDFLAGS="-pie" %install %{__make} DESTDIR=%{buildroot} install -# move systemd files to _unitdir -mkdir -p %{buildroot}/%{_unitdir} -%{__mv} %{buildroot}/%{_datadir}/iprutils/iprinit.service %{buildroot}/%{_unitdir}/ -%{__mv} %{buildroot}/%{_datadir}/iprutils/iprdump.service %{buildroot}/%{_unitdir}/ -%{__mv} %{buildroot}/%{_datadir}/iprutils/iprupdate.service %{buildroot}/%{_unitdir}/ - # iprutils.target %{__install} -m 0644 systemd/iprutils.target %{buildroot}/%{_unitdir}/iprutils.target @@ -60,12 +53,7 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{__mv} %{buildroot}/%{_sysconfdir}/bash_completion.d/{iprconfig-bash-completion.sh,iprconfig} # Remove temporary files and scripts that will not be packaged. -%{__rm} %{buildroot}/%{_sysconfdir}/ha.d/resource.d/{iprha,iprha.in} -%{__rm} %{buildroot}/%{_datadir}/iprutils/{iprdump,iprinit,iprupdate} -%{__rm} %{buildroot}/%{_datadir}/iprutils/{iprdump,iprinit,iprupdate}.in -%{__rm} %{buildroot}/%{_datadir}/iprutils/{iprdump,iprinit,iprupdate}.service.in -%{__rm} %{buildroot}/%{_datadir}/iprutils/iprutils.spec -%{__rm} %{buildroot}/%{python_sitelib}/sos/plugins/iprutils.{py,pyo,pyc} +%{__rm} %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %post %systemd_post iprinit.service @@ -92,6 +80,10 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Sat Feb 27 2016 Jakub Čajka - 2.4.10.1-1 +- rebase to 2.4.10.1 +- Resolves: #1289145 - iprutils-2.4.9 package update in Fedora + * Thu Feb 04 2016 Fedora Release Engineering - 2.4.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 61ae336..0c3085b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c7877b914848e47710e14acc89c01c2 iprutils-2.4.8.tar.gz +b0c186ed279ab10929e61e3ac3fc4fba iprutils-2.4.10.1.tar.gz From 95f81e924da6923c91b29899721fcf6683616209 Mon Sep 17 00:00:00 2001 From: Sinny Kumari Date: Mon, 11 Apr 2016 14:40:40 +0530 Subject: [PATCH 33/70] Rebase to 2.4.11.1 --- .gitignore | 1 + iprutils.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d082e8f..eb83409 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /iprutils-*-src.tgz /iprutils-2.4.8.tar.gz /iprutils-2.4.10.1.tar.gz +/iprutils-2.4.11.1.tar.gz diff --git a/iprutils.spec b/iprutils.spec index 7b08fa2..8b94a66 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,11 +1,11 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.10.1 +Version: 2.4.11.1 Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ -Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/2.4.10/%{name}-%{version}.tar.gz +Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.11/%{name}-%{version}.tar.gz # missing man page Source1: iprdbg.8.gz @@ -20,6 +20,7 @@ BuildRequires: libcap-devel BuildRequires: kernel-devel BuildRequires: systemd BuildRequires: python-devel +BuildRequires: zlib-devel Obsoletes: ipr-utils @@ -80,6 +81,10 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Mon Apr 11 2016 Sinny Kumari - 2.4.11.1-1 +- Update to 2.4.11.1 +- Add zlib-devel as BuildRequires + * Sat Feb 27 2016 Jakub Čajka - 2.4.10.1-1 - rebase to 2.4.10.1 - Resolves: #1289145 - iprutils-2.4.9 package update in Fedora diff --git a/sources b/sources index 0c3085b..3ab5fd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0c186ed279ab10929e61e3ac3fc4fba iprutils-2.4.10.1.tar.gz +e94750153d289871acba85c035155874 iprutils-2.4.11.1.tar.gz From e55caa3bd8c58e8f406260085b05a746bdc4c2e6 Mon Sep 17 00:00:00 2001 From: Sinny Kumari Date: Wed, 10 Aug 2016 12:29:57 +0530 Subject: [PATCH 34/70] Rebase to 2.4.12.1 --- .gitignore | 1 + iprutils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eb83409..0f1ed76 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /iprutils-2.4.8.tar.gz /iprutils-2.4.10.1.tar.gz /iprutils-2.4.11.1.tar.gz +/iprutils-2.4.12.1.tar.gz diff --git a/iprutils.spec b/iprutils.spec index 8b94a66..54d3bc2 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,11 +1,11 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.11.1 +Version: 2.4.12.1 Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ -Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.11/%{name}-%{version}.tar.gz +Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.12/%{name}-%{version}.tar.gz # missing man page Source1: iprdbg.8.gz @@ -81,6 +81,9 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Wed Aug 10 2016 Sinny Kumari - 2.4.12.1-1 +- Rebase to 2.4.12.1 + * Mon Apr 11 2016 Sinny Kumari - 2.4.11.1-1 - Update to 2.4.11.1 - Add zlib-devel as BuildRequires diff --git a/sources b/sources index 3ab5fd0..c561b48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e94750153d289871acba85c035155874 iprutils-2.4.11.1.tar.gz +63f497e1f58e7859ec0467991746e73b iprutils-2.4.12.1.tar.gz From e8e3c85d2b5bd80137cd97e71efca12b283595b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 16:31:39 +0000 Subject: [PATCH 35/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 54d3bc2..2f7599b 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.12.1 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -81,6 +81,9 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.4.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Aug 10 2016 Sinny Kumari - 2.4.12.1-1 - Rebase to 2.4.12.1 From 69b5d3c4dce26dd75f02e6e15644ec5e26e407de Mon Sep 17 00:00:00 2001 From: Sinny Kumari Date: Wed, 5 Apr 2017 11:50:54 +0530 Subject: [PATCH 36/70] Rebase to 2.4.14.1 --- .gitignore | 1 + iprutils.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0f1ed76..bbb1374 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /iprutils-2.4.10.1.tar.gz /iprutils-2.4.11.1.tar.gz /iprutils-2.4.12.1.tar.gz +/iprutils-2.4.14.1.tar.gz diff --git a/iprutils.spec b/iprutils.spec index 2f7599b..5089927 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,11 +1,11 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.12.1 -Release: 2%{?dist} +Version: 2.4.14.1 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ -Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.12/%{name}-%{version}.tar.gz +Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.14/%{name}-%{version}.tar.gz # missing man page Source1: iprdbg.8.gz @@ -81,6 +81,9 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Wed Apr 05 2017 Sinny Kumari - 2.4.14.1-1 +- Rebase to 2.4.14.1 + * Fri Feb 10 2017 Fedora Release Engineering - 2.4.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index c561b48..613538f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63f497e1f58e7859ec0467991746e73b iprutils-2.4.12.1.tar.gz +SHA512 (iprutils-2.4.14.1.tar.gz) = 74ef79332134746f6b9b6890dc04bb42573f154aecbc4314198847342a909a21c0d2982cc3c849b0d1ca191d08c3b1eb5d59a334f75140830cdf91d55438e8a8 From 7b342c2949196600b41f941142b35e924af0f838 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 13:39:31 +0000 Subject: [PATCH 37/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 5089927..744cb82 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.14.1 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -81,6 +81,9 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.4.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Apr 05 2017 Sinny Kumari - 2.4.14.1-1 - Rebase to 2.4.14.1 From 2db88f8558024c44e525c62b2018cdf28d21e1e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 23:50:42 +0000 Subject: [PATCH 38/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 744cb82..3394c2a 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.14.1 -Release: 2%{?dist} +Release: 3%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -81,6 +81,9 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.4.14.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.4.14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 8f31e7386715df4f9dba3f4ecb1437a335c38d0f Mon Sep 17 00:00:00 2001 From: Sinny Kumari Date: Fri, 13 Oct 2017 13:08:27 +0530 Subject: [PATCH 39/70] Rebase to 2.4.15.1 --- .gitignore | 1 + iprutils.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bbb1374..30019a3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /iprutils-2.4.11.1.tar.gz /iprutils-2.4.12.1.tar.gz /iprutils-2.4.14.1.tar.gz +/iprutils-2.4.15.1.tar.gz diff --git a/iprutils.spec b/iprutils.spec index 3394c2a..e03859a 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,11 +1,11 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.14.1 -Release: 3%{?dist} +Version: 2.4.15.1 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ -Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.14/%{name}-%{version}.tar.gz +Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.15/%{name}-%{version}.tar.gz # missing man page Source1: iprdbg.8.gz @@ -81,6 +81,9 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Fri Oct 13 2017 Sinny Kumari - 2.4.15.1-1 +- Rebase to 2.4.15.1 + * Wed Aug 02 2017 Fedora Release Engineering - 2.4.14.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 613538f..5b3bb90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iprutils-2.4.14.1.tar.gz) = 74ef79332134746f6b9b6890dc04bb42573f154aecbc4314198847342a909a21c0d2982cc3c849b0d1ca191d08c3b1eb5d59a334f75140830cdf91d55438e8a8 +SHA512 (iprutils-2.4.15.1.tar.gz) = 34987356c989ccfcb462153eb7d3792c770a04f4ef14406073dfec4895598e5e7968050e17d2b6d057659c2c57be68406911d9abbc1b820980685ed27ea83dad From 4ded6c759c94312c12f273321ba90628f0380a6d Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 23 Jan 2018 07:08:23 -0600 Subject: [PATCH 40/70] Not building kernel modules, so use kernel-headers instead of kernel-devel --- iprutils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/iprutils.spec b/iprutils.spec index e03859a..4f7f15f 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.15.1 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -17,7 +17,7 @@ Requires: /sbin/pidof BuildRequires: ncurses-devel BuildRequires: libcap-devel -BuildRequires: kernel-devel +BuildRequires: kernel-headers BuildRequires: systemd BuildRequires: python-devel BuildRequires: zlib-devel @@ -81,6 +81,9 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Tue Jan 23 2018 Merlin Mathesius - 2.4.15.1-2 +- Not building kernel modules, so use kernel-headers instead of kernel-devel + * Fri Oct 13 2017 Sinny Kumari - 2.4.15.1-1 - Rebase to 2.4.15.1 From f7d9cedd313a321daa1c12b1afb06e27d69c935a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 17:36:29 +0000 Subject: [PATCH 41/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 4f7f15f..262d741 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.15.1 -Release: 2%{?dist} +Release: 3%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -81,6 +81,9 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.4.15.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 23 2018 Merlin Mathesius - 2.4.15.1-2 - Not building kernel modules, so use kernel-headers instead of kernel-devel From c5216a8a480df7ae83f7811c42c815db0c3d6bce Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Thu, 15 Mar 2018 05:03:12 +0100 Subject: [PATCH 42/70] Update Python 2 dependency declarations to new packaging standards --- iprutils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/iprutils.spec b/iprutils.spec index 262d741..8a7a609 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.15.1 -Release: 3%{?dist} +Release: 4%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -19,7 +19,7 @@ BuildRequires: ncurses-devel BuildRequires: libcap-devel BuildRequires: kernel-headers BuildRequires: systemd -BuildRequires: python-devel +BuildRequires: python2-devel BuildRequires: zlib-devel Obsoletes: ipr-utils @@ -81,6 +81,10 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %{_udevrulesdir}/90-iprutils.rules %changelog +* Thu Mar 15 2018 Iryna Shcherbina - 2.4.15.1-4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 07 2018 Fedora Release Engineering - 2.4.15.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From eb604b348bfedd254f1352dd3b3abbdebca6e650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 11 May 2018 11:47:15 +0200 Subject: [PATCH 43/70] - rebased to 2.4.16.1 - spec file cleanup --- .gitignore | 1 + iprutils.spec | 48 +++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 30019a3..7a912b8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /iprutils-2.4.12.1.tar.gz /iprutils-2.4.14.1.tar.gz /iprutils-2.4.15.1.tar.gz +/iprutils-2.4.16.1.tar.gz diff --git a/iprutils.spec b/iprutils.spec index 8a7a609..9477b2e 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,11 +1,11 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.15.1 -Release: 4%{?dist} +Version: 2.4.16.1 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ -Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.15/%{name}-%{version}.tar.gz +Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.16/%{name}-%{version}.tar.gz # missing man page Source1: iprdbg.8.gz @@ -13,48 +13,45 @@ Source1: iprdbg.8.gz # sent to upstream Patch0: 0001-Service-start-is-controled-by-udev-rule.patch -Requires: /sbin/pidof - BuildRequires: ncurses-devel BuildRequires: libcap-devel BuildRequires: kernel-headers BuildRequires: systemd -BuildRequires: python2-devel BuildRequires: zlib-devel -Obsoletes: ipr-utils %description Provides a suite of utilities to manage and configure SCSI devices supported by the ipr SCSI storage device driver. + %prep -%setup -q -%patch0 -p1 -b .udev +%autosetup -p1 + %build -export CFLAGS="%{optflags} -fPIE -Wl,-z,relro,-z,now" -export LDFLAGS="-pie" -%configure -%{__make} %{?_smp_mflags} +%configure --with-systemd --disable-static --disable-sosreport +%{make_build} + %install -%{__make} DESTDIR=%{buildroot} install +%{make_install} # iprutils.target -%{__install} -m 0644 systemd/iprutils.target %{buildroot}/%{_unitdir}/iprutils.target +install -p -m 0644 systemd/iprutils.target %{buildroot}/%{_unitdir}/iprutils.target mkdir -p %{buildroot}/%{_udevrulesdir} -%{__install} -m 0644 udev/rules.d/90-iprutils.rules %{buildroot}/%{_udevrulesdir}/90-iprutils.rules +install -p -m 0644 udev/rules.d/90-iprutils.rules %{buildroot}/%{_udevrulesdir}/90-iprutils.rules # missing man page -%{__install} -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/ +install -p -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/ #install bash completion -%{__mv} %{buildroot}/%{_sysconfdir}/bash_completion.d/{iprconfig-bash-completion.sh,iprconfig} +mv %{buildroot}/%{_sysconfdir}/bash_completion.d/{iprconfig-bash-completion.sh,iprconfig} # Remove temporary files and scripts that will not be packaged. -%{__rm} %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha +rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha + %post %systemd_post iprinit.service @@ -69,18 +66,23 @@ mkdir -p %{buildroot}/%{_udevrulesdir} %systemd_preun iprutils.target %files -%doc README LICENSE +%license LICENSE +%doc README %{_sbindir}/* %{_sysconfdir}/bash_completion.d/ -#fix permissions -%attr(0644,root,root) %{_mandir}/man*/* +%{_mandir}/man*/* %{_unitdir}/iprinit.service %{_unitdir}/iprdump.service %{_unitdir}/iprupdate.service %{_unitdir}/iprutils.target %{_udevrulesdir}/90-iprutils.rules - + + %changelog +* Fri May 11 2018 Dan Horák - 2.4.16.1-1 +- rebased to 2.4.16.1 +- spec file cleanup + * Thu Mar 15 2018 Iryna Shcherbina - 2.4.15.1-4 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/sources b/sources index 5b3bb90..78f2983 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iprutils-2.4.15.1.tar.gz) = 34987356c989ccfcb462153eb7d3792c770a04f4ef14406073dfec4895598e5e7968050e17d2b6d057659c2c57be68406911d9abbc1b820980685ed27ea83dad +SHA512 (iprutils-2.4.16.1.tar.gz) = 9eb69689bfd6821a69f8cfb550f007a2b5359f5d38652d61c74aff04e2b7acf1c7e8d32492dc3e6da0876de5d2338eba36100f4b2ded04e932d1ddf36ad9c171 From fa7a55e97650187c7134d4b22a01a0c1a83660a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 14 May 2018 15:39:57 +0200 Subject: [PATCH 44/70] - use better patch for udev activation --- ...vice-start-is-controled-by-udev-rule.patch | 71 ------- iprutils-udev-activation.patch | 199 ++++++++++++++++++ iprutils.spec | 20 +- 3 files changed, 209 insertions(+), 81 deletions(-) delete mode 100644 0001-Service-start-is-controled-by-udev-rule.patch create mode 100644 iprutils-udev-activation.patch diff --git a/0001-Service-start-is-controled-by-udev-rule.patch b/0001-Service-start-is-controled-by-udev-rule.patch deleted file mode 100644 index 629a976..0000000 --- a/0001-Service-start-is-controled-by-udev-rule.patch +++ /dev/null @@ -1,71 +0,0 @@ -From b880ec7893b072467df1dc202d3a09f5bddbb9b6 Mon Sep 17 00:00:00 2001 -From: Jakub Cajka -Date: Wed, 8 Jul 2015 12:48:43 -0300 -Subject: [PATCH] Service start is controled by udev rule - -Signed-off-by: Gabriel Krisman Bertazi - [Rebased to upstream.] - [Modified to use Autotools.] ---- - systemd/iprdump.service.in | 2 +- - systemd/iprinit.service.in | 2 +- - systemd/iprupdate.service.in | 2 +- - systemd/iprutils.target | 7 +++++++ - udev/rules.d/90-iprutils.rules | 1 + - 5 files changed, 11 insertions(+), 3 deletions(-) - create mode 100644 systemd/iprutils.target - create mode 100644 udev/rules.d/90-iprutils.rules - -diff --git a/systemd/iprdump.service.in b/systemd/iprdump.service.in -index 7f60e7c..fc92a40 100644 ---- a/systemd/iprdump.service.in -+++ b/systemd/iprdump.service.in -@@ -7,4 +7,4 @@ Type=forking - ExecStart=@sbindir@/iprdump --daemon - - [Install] --WantedBy=multi-user.target -+WantedBy=iprutils.target -diff --git a/systemd/iprinit.service.in b/systemd/iprinit.service.in -index dfbd33e..fb20cce 100644 ---- a/systemd/iprinit.service.in -+++ b/systemd/iprinit.service.in -@@ -6,4 +6,4 @@ Type=forking - ExecStart=@sbindir@/iprinit --daemon - - [Install] --WantedBy=multi-user.target -+WantedBy=iprutils.target -diff --git a/systemd/iprupdate.service.in b/systemd/iprupdate.service.in -index 9f44245..001b1e8 100644 ---- a/systemd/iprupdate.service.in -+++ b/systemd/iprupdate.service.in -@@ -6,4 +6,4 @@ Type=forking - ExecStart=@sbindir@/iprupdate --daemon - - [Install] --WantedBy=multi-user.target -+WantedBy=iprutils.target -diff --git a/systemd/iprutils.target b/systemd/iprutils.target -new file mode 100644 -index 0000000..1b1260e ---- /dev/null -+++ b/systemd/iprutils.target -@@ -0,0 +1,7 @@ -+[Unit] -+Description=IBM Power Raid utilities -+Requires=iprupdate.service iprinit.service iprdump.service basic.target -+Before=default.target -+ -+[Install] -+WantedBy=default.target -diff --git a/udev/rules.d/90-iprutils.rules b/udev/rules.d/90-iprutils.rules -new file mode 100644 -index 0000000..1bb5a4a ---- /dev/null -+++ b/udev/rules.d/90-iprutils.rules -@@ -0,0 +1 @@ -+DRIVERS=="ipr", TAG+="systemd", ENV{SYSTEMD_WANTS}+="iprutils.target" --- -2.1.0 - diff --git a/iprutils-udev-activation.patch b/iprutils-udev-activation.patch new file mode 100644 index 0000000..9b4d69d --- /dev/null +++ b/iprutils-udev-activation.patch @@ -0,0 +1,199 @@ +From 65ada384b036556ad4c608b317187a89543d053f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20=C4=8Cajka?= +Date: Sun, 13 May 2018 18:48:47 +0200 +Subject: [PATCH 1/3] Add posibility to activate ipr systemd units via udev + rule and corresponding iprutils.target that makes deps between the ipr + systemd units Add those new files in to the dist target + +--- + Makefile.am | 1 + + configure.ac | 2 +- + systemd/Makefile.am | 2 +- + systemd/iprdump.service.in | 2 +- + systemd/iprinit.service.in | 2 +- + systemd/iprupdate.service.in | 2 +- + systemd/iprutils.target | 7 +++++++ + udev/Makefile.am | 11 +++++++++++ + udev/rules.d/90-iprutils.rules | 1 + + 9 files changed, 25 insertions(+), 5 deletions(-) + create mode 100644 systemd/iprutils.target + create mode 100644 udev/Makefile.am + create mode 100644 udev/rules.d/90-iprutils.rules + +diff --git a/Makefile.am b/Makefile.am +index d528c26..a92f1bf 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -47,6 +47,7 @@ SUBDIRS = . init.d spec + + if SYSTEMD + SUBDIRS += systemd ++SUBDIRS += udev + endif + + if SOSREPORT +diff --git a/configure.ac b/configure.ac +index 774db12..dd1e32d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -159,5 +159,5 @@ AC_CHECK_FUNCS([getcwd isascii memset mkdir munmap pow setenv setlocale \ + socket strcasecmp strchr strncasecmp strrchr strstr \ + strtol strtoul strtoull]) + +-AC_CONFIG_FILES([Makefile systemd/Makefile init.d/Makefile spec/Makefile]) ++AC_CONFIG_FILES([Makefile systemd/Makefile init.d/Makefile spec/Makefile udev/Makefile]) + AC_OUTPUT +diff --git a/systemd/Makefile.am b/systemd/Makefile.am +index b9a28c9..3feb05d 100644 +--- a/systemd/Makefile.am ++++ b/systemd/Makefile.am +@@ -16,7 +16,7 @@ systemdunitdir = @systemdunitdir@ + nodist_systemdunit_DATA = iprdump.service \ + iprinit.service iprupdate.service + EXTRA_DIST = iprdump.service.in \ +- iprinit.service.in iprupdate.service.in ++ iprinit.service.in iprupdate.service.in iprutils.target + + clean-local: + -rm iprdump.service iprinit.service iprupdate.service +diff --git a/systemd/iprdump.service.in b/systemd/iprdump.service.in +index 7f60e7c..fc92a40 100644 +--- a/systemd/iprdump.service.in ++++ b/systemd/iprdump.service.in +@@ -7,4 +7,4 @@ Type=forking + ExecStart=@sbindir@/iprdump --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprinit.service.in b/systemd/iprinit.service.in +index dfbd33e..fb20cce 100644 +--- a/systemd/iprinit.service.in ++++ b/systemd/iprinit.service.in +@@ -6,4 +6,4 @@ Type=forking + ExecStart=@sbindir@/iprinit --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprupdate.service.in b/systemd/iprupdate.service.in +index 9f44245..001b1e8 100644 +--- a/systemd/iprupdate.service.in ++++ b/systemd/iprupdate.service.in +@@ -6,4 +6,4 @@ Type=forking + ExecStart=@sbindir@/iprupdate --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprutils.target b/systemd/iprutils.target +new file mode 100644 +index 0000000..1b1260e +--- /dev/null ++++ b/systemd/iprutils.target +@@ -0,0 +1,7 @@ ++[Unit] ++Description=IBM Power Raid utilities ++Requires=iprupdate.service iprinit.service iprdump.service basic.target ++Before=default.target ++ ++[Install] ++WantedBy=default.target +diff --git a/udev/Makefile.am b/udev/Makefile.am +new file mode 100644 +index 0000000..740dcaa +--- /dev/null ++++ b/udev/Makefile.am +@@ -0,0 +1,11 @@ ++# IBM IPR adapter configuration utility ++# ++# (C) Copyright 2015 ++# International Business Machines Corporation and others. ++# All Rights Reserved. This program and the accompanying ++# materials are made available under the terms of the ++# Common Public License v1.0 which accompanies this distribution. ++# ++# ++: ++EXTRA_DIST = rules.d/ +diff --git a/udev/rules.d/90-iprutils.rules b/udev/rules.d/90-iprutils.rules +new file mode 100644 +index 0000000..1bb5a4a +--- /dev/null ++++ b/udev/rules.d/90-iprutils.rules +@@ -0,0 +1 @@ ++DRIVERS=="ipr", TAG+="systemd", ENV{SYSTEMD_WANTS}+="iprutils.target" + +From aeca4f9208bf45db2486736530021e53f65f7e6d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Mon, 14 May 2018 10:27:38 +0200 +Subject: [PATCH 2/3] properly install iprutils.target + +--- + systemd/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/systemd/Makefile.am b/systemd/Makefile.am +index 3feb05d..ba858ef 100644 +--- a/systemd/Makefile.am ++++ b/systemd/Makefile.am +@@ -16,7 +16,8 @@ systemdunitdir = @systemdunitdir@ + nodist_systemdunit_DATA = iprdump.service \ + iprinit.service iprupdate.service + EXTRA_DIST = iprdump.service.in \ +- iprinit.service.in iprupdate.service.in iprutils.target ++ iprinit.service.in iprupdate.service.in ++systemdunit_DATA = iprutils.target + + clean-local: + -rm iprdump.service iprinit.service iprupdate.service + +From 3af0d5dc832406ccee601ef1e8aba777c8262406 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Mon, 14 May 2018 10:46:59 +0200 +Subject: [PATCH 3/3] install udev rules + +--- + configure.ac | 2 ++ + udev/{rules.d => }/90-iprutils.rules | 0 + udev/Makefile.am | 5 +++-- + 3 files changed, 5 insertions(+), 2 deletions(-) + rename udev/{rules.d => }/90-iprutils.rules (100%) + +diff --git a/configure.ac b/configure.ac +index dd1e32d..e71558a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,6 +75,7 @@ AM_CONDITIONAL([IPRDUMPFMT], [test "x${iprdumpfmt}" = xtrue]) + + # --with-systemd + systemdunitdir='${exec_prefix}/lib/systemd/system/' ++udevrulesdir='${exec_prefix}/lib/udev/rules.d/' + AC_ARG_WITH([systemd], + [--without-systemd Disable systemd service files.], + [case $withval in +@@ -91,6 +92,7 @@ AC_ARG_WITH([systemd], + esac], [systemd=true]) + AM_CONDITIONAL([SYSTEMD], [test "x${systemd}" = xtrue]) + AC_SUBST(systemdunitdir, ${systemdunitdir}) ++AC_SUBST(udevrulesdir, ${udevrulesdir}) + + # --with-initd + initddir="${prefix}/etc/init.d/" +diff --git a/udev/rules.d/90-iprutils.rules b/udev/90-iprutils.rules +similarity index 100% +rename from udev/rules.d/90-iprutils.rules +rename to udev/90-iprutils.rules +diff --git a/udev/Makefile.am b/udev/Makefile.am +index 740dcaa..30211c1 100644 +--- a/udev/Makefile.am ++++ b/udev/Makefile.am +@@ -7,5 +7,6 @@ + # Common Public License v1.0 which accompanies this distribution. + # + # +-: +-EXTRA_DIST = rules.d/ ++ ++udevrulesdir = @udevrulesdir@ ++udevrules_DATA = 90-iprutils.rules diff --git a/iprutils.spec b/iprutils.spec index 9477b2e..5abd181 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.16.1 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -10,9 +10,10 @@ Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20ker # missing man page Source1: iprdbg.8.gz -# sent to upstream -Patch0: 0001-Service-start-is-controled-by-udev-rule.patch +# https://github.com/bjking1/iprutils/pull/2 +Patch0: iprutils-udev-activation.patch +BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: libcap-devel BuildRequires: kernel-headers @@ -28,21 +29,17 @@ supported by the ipr SCSI storage device driver. %prep %autosetup -p1 +autoreconf -vif + %build -%configure --with-systemd --disable-static --disable-sosreport +%configure --with-systemd --without-initscripts --disable-static --disable-sosreport %{make_build} %install %{make_install} -# iprutils.target -install -p -m 0644 systemd/iprutils.target %{buildroot}/%{_unitdir}/iprutils.target - -mkdir -p %{buildroot}/%{_udevrulesdir} -install -p -m 0644 udev/rules.d/90-iprutils.rules %{buildroot}/%{_udevrulesdir}/90-iprutils.rules - # missing man page install -p -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/ @@ -79,6 +76,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Mon May 14 2018 Dan Horák - 2.4.16.1-2 +- use better patch for udev activation + * Fri May 11 2018 Dan Horák - 2.4.16.1-1 - rebased to 2.4.16.1 - spec file cleanup From dff160204fe31f6b80f1c6a1ddc83fb1c333bf8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 05:48:33 +0000 Subject: [PATCH 45/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 5abd181..1b1794d 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.16.1 -Release: 2%{?dist} +Release: 3%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -76,6 +76,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.4.16.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon May 14 2018 Dan Horák - 2.4.16.1-2 - use better patch for udev activation From b7a4f2db67eece25f86c3ce7bf02aace31528441 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:48 +0100 Subject: [PATCH 46/70] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- iprutils.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 1b1794d..8b2dd57 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,6 @@ Name: iprutils Version: 2.4.16.1 Release: 3%{?dist} License: CPL -Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.16/%{name}-%{version}.tar.gz From 4ed6c78e326ccfbcd714ec5dad92a94274ddb84a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 03:29:55 +0000 Subject: [PATCH 47/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 8b2dd57..b1634a6 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.16.1 -Release: 3%{?dist} +Release: 4%{?dist} License: CPL URL: http://sourceforge.net/projects/iprdd/ Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.16/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.4.16.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 2.4.16.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 240e474fee6fafaacac39b4032fe678ef95ef9be Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 4 Mar 2019 12:33:52 +0100 Subject: [PATCH 48/70] update to 2.4.17.1 --- .gitignore | 1 + iprutils-udev-activation.patch | 199 --------------------------------- iprutils.spec | 12 +- sources | 2 +- 4 files changed, 8 insertions(+), 206 deletions(-) delete mode 100644 iprutils-udev-activation.patch diff --git a/.gitignore b/.gitignore index 7a912b8..ec0e1aa 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /iprutils-2.4.14.1.tar.gz /iprutils-2.4.15.1.tar.gz /iprutils-2.4.16.1.tar.gz +/iprutils-2.4.17.1.tar.gz diff --git a/iprutils-udev-activation.patch b/iprutils-udev-activation.patch deleted file mode 100644 index 9b4d69d..0000000 --- a/iprutils-udev-activation.patch +++ /dev/null @@ -1,199 +0,0 @@ -From 65ada384b036556ad4c608b317187a89543d053f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jakub=20=C4=8Cajka?= -Date: Sun, 13 May 2018 18:48:47 +0200 -Subject: [PATCH 1/3] Add posibility to activate ipr systemd units via udev - rule and corresponding iprutils.target that makes deps between the ipr - systemd units Add those new files in to the dist target - ---- - Makefile.am | 1 + - configure.ac | 2 +- - systemd/Makefile.am | 2 +- - systemd/iprdump.service.in | 2 +- - systemd/iprinit.service.in | 2 +- - systemd/iprupdate.service.in | 2 +- - systemd/iprutils.target | 7 +++++++ - udev/Makefile.am | 11 +++++++++++ - udev/rules.d/90-iprutils.rules | 1 + - 9 files changed, 25 insertions(+), 5 deletions(-) - create mode 100644 systemd/iprutils.target - create mode 100644 udev/Makefile.am - create mode 100644 udev/rules.d/90-iprutils.rules - -diff --git a/Makefile.am b/Makefile.am -index d528c26..a92f1bf 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -47,6 +47,7 @@ SUBDIRS = . init.d spec - - if SYSTEMD - SUBDIRS += systemd -+SUBDIRS += udev - endif - - if SOSREPORT -diff --git a/configure.ac b/configure.ac -index 774db12..dd1e32d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -159,5 +159,5 @@ AC_CHECK_FUNCS([getcwd isascii memset mkdir munmap pow setenv setlocale \ - socket strcasecmp strchr strncasecmp strrchr strstr \ - strtol strtoul strtoull]) - --AC_CONFIG_FILES([Makefile systemd/Makefile init.d/Makefile spec/Makefile]) -+AC_CONFIG_FILES([Makefile systemd/Makefile init.d/Makefile spec/Makefile udev/Makefile]) - AC_OUTPUT -diff --git a/systemd/Makefile.am b/systemd/Makefile.am -index b9a28c9..3feb05d 100644 ---- a/systemd/Makefile.am -+++ b/systemd/Makefile.am -@@ -16,7 +16,7 @@ systemdunitdir = @systemdunitdir@ - nodist_systemdunit_DATA = iprdump.service \ - iprinit.service iprupdate.service - EXTRA_DIST = iprdump.service.in \ -- iprinit.service.in iprupdate.service.in -+ iprinit.service.in iprupdate.service.in iprutils.target - - clean-local: - -rm iprdump.service iprinit.service iprupdate.service -diff --git a/systemd/iprdump.service.in b/systemd/iprdump.service.in -index 7f60e7c..fc92a40 100644 ---- a/systemd/iprdump.service.in -+++ b/systemd/iprdump.service.in -@@ -7,4 +7,4 @@ Type=forking - ExecStart=@sbindir@/iprdump --daemon - - [Install] --WantedBy=multi-user.target -+WantedBy=iprutils.target -diff --git a/systemd/iprinit.service.in b/systemd/iprinit.service.in -index dfbd33e..fb20cce 100644 ---- a/systemd/iprinit.service.in -+++ b/systemd/iprinit.service.in -@@ -6,4 +6,4 @@ Type=forking - ExecStart=@sbindir@/iprinit --daemon - - [Install] --WantedBy=multi-user.target -+WantedBy=iprutils.target -diff --git a/systemd/iprupdate.service.in b/systemd/iprupdate.service.in -index 9f44245..001b1e8 100644 ---- a/systemd/iprupdate.service.in -+++ b/systemd/iprupdate.service.in -@@ -6,4 +6,4 @@ Type=forking - ExecStart=@sbindir@/iprupdate --daemon - - [Install] --WantedBy=multi-user.target -+WantedBy=iprutils.target -diff --git a/systemd/iprutils.target b/systemd/iprutils.target -new file mode 100644 -index 0000000..1b1260e ---- /dev/null -+++ b/systemd/iprutils.target -@@ -0,0 +1,7 @@ -+[Unit] -+Description=IBM Power Raid utilities -+Requires=iprupdate.service iprinit.service iprdump.service basic.target -+Before=default.target -+ -+[Install] -+WantedBy=default.target -diff --git a/udev/Makefile.am b/udev/Makefile.am -new file mode 100644 -index 0000000..740dcaa ---- /dev/null -+++ b/udev/Makefile.am -@@ -0,0 +1,11 @@ -+# IBM IPR adapter configuration utility -+# -+# (C) Copyright 2015 -+# International Business Machines Corporation and others. -+# All Rights Reserved. This program and the accompanying -+# materials are made available under the terms of the -+# Common Public License v1.0 which accompanies this distribution. -+# -+# -+: -+EXTRA_DIST = rules.d/ -diff --git a/udev/rules.d/90-iprutils.rules b/udev/rules.d/90-iprutils.rules -new file mode 100644 -index 0000000..1bb5a4a ---- /dev/null -+++ b/udev/rules.d/90-iprutils.rules -@@ -0,0 +1 @@ -+DRIVERS=="ipr", TAG+="systemd", ENV{SYSTEMD_WANTS}+="iprutils.target" - -From aeca4f9208bf45db2486736530021e53f65f7e6d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Mon, 14 May 2018 10:27:38 +0200 -Subject: [PATCH 2/3] properly install iprutils.target - ---- - systemd/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/systemd/Makefile.am b/systemd/Makefile.am -index 3feb05d..ba858ef 100644 ---- a/systemd/Makefile.am -+++ b/systemd/Makefile.am -@@ -16,7 +16,8 @@ systemdunitdir = @systemdunitdir@ - nodist_systemdunit_DATA = iprdump.service \ - iprinit.service iprupdate.service - EXTRA_DIST = iprdump.service.in \ -- iprinit.service.in iprupdate.service.in iprutils.target -+ iprinit.service.in iprupdate.service.in -+systemdunit_DATA = iprutils.target - - clean-local: - -rm iprdump.service iprinit.service iprupdate.service - -From 3af0d5dc832406ccee601ef1e8aba777c8262406 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Mon, 14 May 2018 10:46:59 +0200 -Subject: [PATCH 3/3] install udev rules - ---- - configure.ac | 2 ++ - udev/{rules.d => }/90-iprutils.rules | 0 - udev/Makefile.am | 5 +++-- - 3 files changed, 5 insertions(+), 2 deletions(-) - rename udev/{rules.d => }/90-iprutils.rules (100%) - -diff --git a/configure.ac b/configure.ac -index dd1e32d..e71558a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -75,6 +75,7 @@ AM_CONDITIONAL([IPRDUMPFMT], [test "x${iprdumpfmt}" = xtrue]) - - # --with-systemd - systemdunitdir='${exec_prefix}/lib/systemd/system/' -+udevrulesdir='${exec_prefix}/lib/udev/rules.d/' - AC_ARG_WITH([systemd], - [--without-systemd Disable systemd service files.], - [case $withval in -@@ -91,6 +92,7 @@ AC_ARG_WITH([systemd], - esac], [systemd=true]) - AM_CONDITIONAL([SYSTEMD], [test "x${systemd}" = xtrue]) - AC_SUBST(systemdunitdir, ${systemdunitdir}) -+AC_SUBST(udevrulesdir, ${udevrulesdir}) - - # --with-initd - initddir="${prefix}/etc/init.d/" -diff --git a/udev/rules.d/90-iprutils.rules b/udev/90-iprutils.rules -similarity index 100% -rename from udev/rules.d/90-iprutils.rules -rename to udev/90-iprutils.rules -diff --git a/udev/Makefile.am b/udev/Makefile.am -index 740dcaa..30211c1 100644 ---- a/udev/Makefile.am -+++ b/udev/Makefile.am -@@ -7,5 +7,6 @@ - # Common Public License v1.0 which accompanies this distribution. - # - # --: --EXTRA_DIST = rules.d/ -+ -+udevrulesdir = @udevrulesdir@ -+udevrules_DATA = 90-iprutils.rules diff --git a/iprutils.spec b/iprutils.spec index b1634a6..e5cb6cb 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,17 +1,14 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.16.1 -Release: 4%{?dist} +Version: 2.4.17.1 +Release: 1%{?dist} License: CPL URL: http://sourceforge.net/projects/iprdd/ -Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.16/%{name}-%{version}.tar.gz +Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.17/%{name}-%{version}.tar.gz # missing man page Source1: iprdbg.8.gz -# https://github.com/bjking1/iprutils/pull/2 -Patch0: iprutils-udev-activation.patch - BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: libcap-devel @@ -75,6 +72,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Mon Mar 04 2019 Than Ngo - 2.4.17.1-1 +- update to 2.4.17.1 + * Fri Feb 01 2019 Fedora Release Engineering - 2.4.16.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 78f2983..11c881d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iprutils-2.4.16.1.tar.gz) = 9eb69689bfd6821a69f8cfb550f007a2b5359f5d38652d61c74aff04e2b7acf1c7e8d32492dc3e6da0876de5d2338eba36100f4b2ded04e932d1ddf36ad9c171 +SHA512 (iprutils-2.4.17.1.tar.gz) = d9b257a1e86350ef26e6491d5030ac864a244283697a4ca588af7ee21c2518c631a2bcfc9913783f973025d186feab8ed045b1d4674621a08b401823e9c52d3d From e5ea455f1b9ece328b0113e8e8cacd21b4e6b407 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 15 Apr 2019 16:47:02 +0200 Subject: [PATCH 49/70] add tier1 tests --- iprutils.spec | 5 +- tests/basic-functionality-test/Makefile | 65 ++++++++ tests/basic-functionality-test/PURPOSE | 11 ++ tests/basic-functionality-test/runtest.sh | 185 ++++++++++++++++++++++ tests/tests.yml | 13 ++ 5 files changed, 278 insertions(+), 1 deletion(-) create mode 100644 tests/basic-functionality-test/Makefile create mode 100644 tests/basic-functionality-test/PURPOSE create mode 100755 tests/basic-functionality-test/runtest.sh create mode 100644 tests/tests.yml diff --git a/iprutils.spec b/iprutils.spec index e5cb6cb..8e65898 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.17.1 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL URL: http://sourceforge.net/projects/iprdd/ Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.17/%{name}-%{version}.tar.gz @@ -72,6 +72,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Mon Apr 15 2019 Than Ngo - 2.4.17.1-2 +- add tests + * Mon Mar 04 2019 Than Ngo - 2.4.17.1-1 - update to 2.4.17.1 diff --git a/tests/basic-functionality-test/Makefile b/tests/basic-functionality-test/Makefile new file mode 100644 index 0000000..5530481 --- /dev/null +++ b/tests/basic-functionality-test/Makefile @@ -0,0 +1,65 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /CoreOS/patch/Regression/Cannot-handle-file-names-with-integrated-spaces +# Description: Test for bz431887 (Cannot handle file names with integrated spaces) +# Author: Ondrej Moris +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2010 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/CoreOS/patch/Regression/Cannot-handle-file-names-with-integrated-spaces +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Ondrej Moris " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: Test for bz431887 (Cannot handle file names with integrated spaces)" >> $(METADATA) + @echo "Type: Regression" >> $(METADATA) + @echo "TestTime: 5m" >> $(METADATA) + @echo "RunFor: patch" >> $(METADATA) + @echo "Requires: patch" >> $(METADATA) + @echo "Requires: expect" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Bug: 431887" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/basic-functionality-test/PURPOSE b/tests/basic-functionality-test/PURPOSE new file mode 100644 index 0000000..4d05a09 --- /dev/null +++ b/tests/basic-functionality-test/PURPOSE @@ -0,0 +1,11 @@ +PURPOSE of /CoreOS/iprutils/basic-functionality-test +Description: Tier1 tests +Author: Than Ngo + +tests following scenarios: + * test iprdump --version + * test iprinit --version + * test iprupdate --version + * test Services: iprdump, iprinit, iprupdate + * test existence of man pages + * test existence of license and readme file diff --git a/tests/basic-functionality-test/runtest.sh b/tests/basic-functionality-test/runtest.sh new file mode 100755 index 0000000..93d9ea0 --- /dev/null +++ b/tests/basic-functionality-test/runtest.sh @@ -0,0 +1,185 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/which/Sanity/basic-functionality-test +# Description: tests basic functionality +# Author: Than Ngo +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2019 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +PACKAGES="iprutils man-db coreutils rpm" +SERVICES="iprdump iprinit iprupdate" + +# Include Beaker environment +. /usr/bin/rhts-environment.sh || exit 1 +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + for p in $PACKAGES ; do + rlAssertRpm $p + done + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + rlPhaseEnd + # test the sercives + rlPhaseStartTest "Services: iprdump, iprinit, iprupdate" + for s in $SERVICES ; do + rlServiceStart $s + rlRun "systemctl status -l $s" + rlServiceStop $s + done + rlPhaseEnd + rlPhaseStartTest "Smoke, sanity and function tests" + rlRun "VERSION=\$( rpm -q --qf '%{VERSION}' iprutils )" + rlRun -s "iprconfig --version" 0 "It ought show the version" + rlAssertGrep "iprconfig: $VERSION" $rlRun_LOG + rlRun "iprconfig -c show-config" 0 "Show ipr configuration" + rlRun "iprconfig -c show-alt-config" 0 "Show alternate ipr configuration information" + rlRun "iprconfig -c show-ioas" 0 "Show all ipr adapters" + rlRun "iprconfig -c show-arrays" 0 "Show all ipr arrays" + # rlRun "iprconfig -c show-battey-info" 0 "Show cache battery information for specified IOA" + # rlRun "iprconfig -c show-details sda" 0 "Show device details for specified device" + rlRun "iprconfig -c show-hot-spares" 0 "Show all configured hot spares" + rlRun "iprconfig -c show-af-disks" 0 "Show disks formatted for Advanced Function that are not configured in an array or as a hot spare" + rlRun "iprconfig -c show-all-af-disks" 0 "Show all disks formatted for Advanced Function" + rlRun "iprconfig -c show-jbod-disks" 0 "Show all disks formatted for JBOD Function" + rlRun "iprconfig -c show-slots" 0 "Show all disks slots available on the system" + # iprconfig -c status /dev/sda || echo FAILED $? + # iprconfig -c alt-status /dev/sda || echo FAILED $? + # iprconfig -c query-aid-ceate || echo FAILED $? + # iprconfig -c query-aid-delete || echo FAILED $? + # iprconfig -c query-hot-spae-ceate || echo FAILED $? + # iprconfig -c query-hot-spae-delete || echo FAILED $? + rlRun "iprconfig -c query-raid-consistency-check" 0 "Show all RAID arrays that are candidates for a RAID consistency check" + rlRun "iprconfig -c query-format-for-jbod" 0 "Show all disks that can be reformatted for JBOD function" + rlRun "iprconfig -c query-reclaim" 0 "Show all IOAs that may need a reclaim cache storage" + rlRun "iprconfig -c query-arrays-raid-include" 0 "Show all RAID arrays that can have disks included in them to increase their capacity" + # iprconfig -c query-devices-aid-include || echo FAILED $? + # iprconfig -c query-suppoted-aid-levels || echo FAILED $? + # iprconfig -c query-include-allowed || echo FAILED $? + # iprconfig -c query-max-devices-in-aay || echo FAILED $? + # iprconfig -c query-min-devices-in-aay || echo FAILED $? + # iprconfig -c quey-min-mult-in-aay || echo FAILED $? + # iprconfig -c quey-supp-stipe-sizes || echo FAILED $? + # iprconfig -c query-ecommended-stipe-size || echo FAILED $? + rlRun "iprconfig -c query-recovery-format" 0 "Show all disks that can be formatted for error recovery purposes" + rlRun "iprconfig -c query-raid-rebuild" 0 "Show all disks in RAID arrays that can be rebuilt" + rlRun "iprconfig -c query-format-for-raid" 0 "Show all disks that can be formatted such that they can be used in a RAID array or as a hot spare" + # iprconfig -c query-ucode-level || echo FAILED $? + # iprconfig -c ssd-report || echo FAILED $? + rlRun "iprconfig -c show-ucode-levels" 0 "Show the microcode level that is currently loaded for every device and adapter in the system" + # iprconfig -c query-format-timeout || echo FAILED $? + # iprconfig -c query-qdepth || echo FAILED $? + # iprconfig -c query-tcq-enable || echo FAILED $? + # iprconfig -c query-log-level || echo FAILED $? + rlRun "iprconfig -c query-add-device" 0 "Show all empty disk slots that can have a disk concurrently added" + rlRun "iprconfig -c query-remove-device" 0 "Show all disk slots which are either empty or have disks in them which can be concurrently removed from the running system" + # iprconfig -c query-initiator-id || echo FAILED $? + # iprconfig -c query-bus-speed || echo FAILED $? + # iprconfig -c query-bus-width || echo FAILED $? + rlRun "iprconfig -c query-path-status" 0 "Show the current dual path state for the SAS devices attached specified IOA" + # iprconfig -c query-path-details || echo FAILED $? + # iprconfig -c query-arrays-raid-migrate || echo FAILED $? + # iprconfig -c query-devices-raid-migrate || echo FAILED $? + # iprconfig -c query-raid-levels-raid-migrate || echo FAILED $? + # iprconfig -c query-stripe-sizes-raid-migrate || echo FAILED $? + # iprconfig -c query-devices-min-max-raid-migrate || echo FAILED $? + rlRun "iprconfig -c query-ioas-asymmetric-access" 0 "Show the IOAs that support asymmetric access" + rlRun "iprconfig -c query-arrays-asymmetric-access" 0 "Show the disk arrays that are candidates for setting their asymmetric access mode to Optimized or Non-Optimized" + # iprconfig -c query-ioa-asymmetric-access-mode || echo FAILED $? + # iprconfig -c query-aay-asymmetric-access-mode || echo FAILED $? + # iprconfig -c query-ioa-caching || echo FAILED $? + # iprconfig -c query-array-label || echo FAILED $? + # iprconfig -c query-array-rebuild-rate || echo FAILED $? + # iprconfig -c query-array-rebuild-verify || echo FAILED $? + # iprconfig -c query-array || echo FAILED $? + # iprconfig -c query-device || echo FAILED $? + # iprconfig -c query-location || echo FAILED $? + # iprconfig -c query-write-cache-policy || echo FAILED $? + # iprconfig -c raid-create || echo FAILED $? + # iprconfig -c raid-delete || echo FAILED $? + # iprconfig -c raid-include || echo FAILED $? + # iprconfig -c raid-migrate || echo FAILED $? + # iprconfig -c format-for-raid || echo FAILED $? + # iprconfig -c format-for-jbod || echo FAILED $? + # iprconfig -c recovey-format || echo FAILED $? + # iprconfig -c hot-spare-create || echo FAILED $? + # iprconfig -c hot-spare-delete || echo FAILED $? + # iprconfig -c disrupt-device || echo FAILED $? + # iprconfig -c reclaim-cache || echo FAILED $? + # iprconfig -c reclaim-unknown-cache || echo FAILED $? + # iprconfig -c raid-consistency-check || echo FAILED $? + # iprconfig -c raid-rebuild || echo FAILED $? + # iprconfig -c update-ucode || echo FAILED $? + rlRun "iprconfig -c update-all-ucodes" 0 "Update the microcode of every device with the latest version found in the system" + # iprconfig -c set-format-timeout || echo FAILED $? + # iprconfig -c set-qdepth || echo FAILED $? + # iprconfig -c set-tcq-enable || echo FAILED $? + # iprconfig -c set-log-level || echo FAILED $? + # iprconfig -c set-write-cache-policy || echo FAILED $? + # iprconfig -c identify-disk || echo FAILED $? + # iprconfig -c identify-slot || echo FAILED $? + # iprconfig -c remove-disk || echo FAILED $? + # iprconfig -c remove-slot || echo FAILED $? + # iprconfig -c add-slot || echo FAILED $? + # iprconfig -c set-initiator-id || echo FAILED $? + # iprconfig -c set-bus-speed || echo FAILED $? + # iprconfig -c set-bus-width || echo FAILED $? + # iprconfig -c primary || echo FAILED $? + # iprconfig -c secondary || echo FAILED $? + rlRun "iprconfig -c set-all-primary" 0 "Set all attached ipr adapters as the preferred primary adapter" + rlRun "iprconfig -c set-all-secondary" 0 "Set all attached ipr adapters to indicate they are not the preferred primary adapter" + # iprconfig -c query-ha-mode || echo FAILED $? + # iprconfig -c set-ha-mode || echo FAILED $? + # iprconfig -c set-aay-asymmetic-access-mode || echo FAILED $? + # iprconfig -c set-ioa-asymmetric-access-mode || echo FAILED $? + # iprconfig -c set-ioa-caching || echo FAILED $? + # iprconfig -c set-array-rebuild-verify || echo FAILED $? + # iprconfig -c set-array-rebuild-rate || echo FAILED $? + # iprconfig -c get-live-dump || echo FAILED $? + rlRun "iprconfig -c dump" 0 "Display detailed hardware and system information on standard output" + + # should not segfault + rlRun -s "iprdump --version" 0 "Print iprdump version" + rlAssertGrep "iprdump: $VERSION" $rlRun_LOG + rlRun -s "iprinit --version" 0 "Print iprinit version" + rlAssertGrep "iprinit: $VERSION" $rlRun_LOG + # iprsos --version + rlRun -s "iprupdate --version" 0 "Print iprupdate version" + rlAssertGrep "iprupdate: $VERSION" $rlRun_LOG + + # check man page + for m in iprconfig iprdbg iprdump iprinit iprsos iprupdate ; do + rlRun "man -P head $m" 0 "Show the $m man page" + done + + # check for sane license and readme file + rlRun "head /usr/share/licenses/iputils/LICENSE" 0 "Check for license file" + rlRun "head /usr/share/doc/iputils/README" 0 "Check for README file" + rlPhaseEnd + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -fr $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..7619f5f --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,13 @@ +--- +# Run tests in all contexts +- hosts: localhost + tags: + - classic + roles: + - role: standard-test-beakerlib + tests: + - basic-functionality-test + required_packages: + - man-db + - coreutils + - rpm From 2a996d952883a7fb3f6a4b9b742c574b2df6d32a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 09:39:38 +0000 Subject: [PATCH 50/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 8e65898..64d986f 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.17.1 -Release: 2%{?dist} +Release: 3%{?dist} License: CPL URL: http://sourceforge.net/projects/iprdd/ Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.17/%{name}-%{version}.tar.gz @@ -72,6 +72,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.4.17.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Apr 15 2019 Than Ngo - 2.4.17.1-2 - add tests From c40c6a61682d473ea9af8f68dfdc80c1ccc1a226 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 05:35:47 +0000 Subject: [PATCH 51/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 64d986f..dc821a8 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.17.1 -Release: 3%{?dist} +Release: 4%{?dist} License: CPL URL: http://sourceforge.net/projects/iprdd/ Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.17/%{name}-%{version}.tar.gz @@ -72,6 +72,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.4.17.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 2.4.17.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From c0875a9bf11967068fade42b53e001a55fb913b7 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 9 Jul 2020 15:33:31 +0200 Subject: [PATCH 52/70] rebase to 2.4.19 --- iprutils.spec | 15 ++++++++++----- sources | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/iprutils.spec b/iprutils.spec index dc821a8..29b9c81 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,10 +1,12 @@ +%global gitver rel-2-4-19 + Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.4.17.1 -Release: 4%{?dist} +Version: 2.4.19 +Release: 1%{?dist} License: CPL -URL: http://sourceforge.net/projects/iprdd/ -Source0: https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.17/%{name}-%{version}.tar.gz +URL: https://github.com/bjking1/iprutils +Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz # missing man page Source1: iprdbg.8.gz @@ -23,7 +25,7 @@ supported by the ipr SCSI storage device driver. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{gitver} autoreconf -vif @@ -72,6 +74,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Thu Jul 09 2020 Than Ngo - 2.4.19-1 +- rebase to 2.4.19 + * Wed Jan 29 2020 Fedora Release Engineering - 2.4.17.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 11c881d..1a03d26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (iprutils-2.4.17.1.tar.gz) = d9b257a1e86350ef26e6491d5030ac864a244283697a4ca588af7ee21c2518c631a2bcfc9913783f973025d186feab8ed045b1d4674621a08b401823e9c52d3d +SHA512 (iprutils-2.4.19.tar.gz) = 4b2a5cfdc7982d26b976b82e8d6eac219266059dda40dd79f03734c6e6ef434a273bfc5f8276ea4f2dd55b1a749c2c03b7c5677c64527469dd54fe45afe6f25d From 45139386c6cb5d1e45918e84cff29cd3734ba479 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 01:55:24 +0000 Subject: [PATCH 53/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 29b9c81..421d448 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 1%{?dist} +Release: 2%{?dist} License: CPL URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -74,6 +74,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.4.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 09 2020 Than Ngo - 2.4.19-1 - rebase to 2.4.19 From 479a1bb9ce9054ae73181b2b3757204ddb2d97a4 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 19 Dec 2020 00:53:58 +0000 Subject: [PATCH 54/70] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- iprutils.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/iprutils.spec b/iprutils.spec index 421d448..c4f6e30 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -17,6 +17,7 @@ BuildRequires: libcap-devel BuildRequires: kernel-headers BuildRequires: systemd BuildRequires: zlib-devel +BuildRequires: make %description From 7ae29fcdb2184ed45b5514730441336dc73b6bbc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:27:48 +0000 Subject: [PATCH 55/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index c4f6e30..3dc49ea 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 2%{?dist} +Release: 3%{?dist} License: CPL URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.4.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.4.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 50ebb847291851831556c4db65b34d40b23dd7cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 08:42:00 +0000 Subject: [PATCH 56/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 3dc49ea..c406c18 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 3%{?dist} +Release: 4%{?dist} License: CPL URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.4.19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 2.4.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 745b8a9324f7e8ce5d4194c743586e4ccf0ac138 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:25:05 +0000 Subject: [PATCH 57/70] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index c406c18..67a43df 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 4%{?dist} +Release: 5%{?dist} License: CPL URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.4.19-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 2.4.19-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From cb03a5fee6d314ba42ff19c11ac7c25430ab28d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 14:48:48 +0000 Subject: [PATCH 58/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 67a43df..c286e2e 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 5%{?dist} +Release: 6%{?dist} License: CPL URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.4.19-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 2.4.19-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 79b29b5f3cf7d24ecfefc74e789e33878b0f019a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:18:48 +0000 Subject: [PATCH 59/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index c286e2e..a52133c 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 6%{?dist} +Release: 7%{?dist} License: CPL URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.4.19-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 2.4.19-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From cad6a4ba5d6a309dd45b281239c82fa7e64e21bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 07:34:59 +0000 Subject: [PATCH 60/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index a52133c..e250df6 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 7%{?dist} +Release: 8%{?dist} License: CPL URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.4.19-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 2.4.19-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ef134128fe4b05c040c606a837bc46bdf788a8f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:14:49 +0000 Subject: [PATCH 61/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index e250df6..70909e8 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 8%{?dist} +Release: 9%{?dist} License: CPL URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 2.4.19-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 2.4.19-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d9d1adf690f17444eaf7e8892a61f79eb5099795 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 22:53:36 +0000 Subject: [PATCH 62/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 70909e8..60ef0de 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 9%{?dist} +Release: 10%{?dist} License: CPL URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -75,6 +75,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.4.19-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 2.4.19-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 258bf6598e9e50a1f1902d310307550edec72fab Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 8 Jul 2024 14:53:46 +0200 Subject: [PATCH 63/70] - fixed covscan issues and test - limit to ppc64le --- iprutils-2.4.19-covscan.patch | 449 ++++++++++++++++++++++ iprutils.spec | 10 +- tests/basic-functionality-test/runtest.sh | 4 +- 3 files changed, 460 insertions(+), 3 deletions(-) create mode 100644 iprutils-2.4.19-covscan.patch diff --git a/iprutils-2.4.19-covscan.patch b/iprutils-2.4.19-covscan.patch new file mode 100644 index 0000000..87b4e66 --- /dev/null +++ b/iprutils-2.4.19-covscan.patch @@ -0,0 +1,449 @@ +diff -up iprutils-rel-2-4-19/iprconfig.c.me iprutils-rel-2-4-19/iprconfig.c +--- iprutils-rel-2-4-19/iprconfig.c.me 2024-06-17 12:10:54.493119641 +0200 ++++ iprutils-rel-2-4-19/iprconfig.c 2024-06-18 11:20:17.885495296 +0200 +@@ -2483,7 +2483,7 @@ static char *disk_details(char *body, st + char vendor_id[IPR_VENDOR_ID_LEN+1]; + char serial_num[IPR_SERIAL_NUM_LEN+1]; + char buffer[100]; +- int len, scsi_channel, scsi_id, scsi_lun; ++ int len = 0, scsi_channel = 0, scsi_id = 0, scsi_lun = 0; + + device_record = (struct ipr_dev_record *)dev->dev_rcd; + +@@ -2633,7 +2633,7 @@ int get_ses_phy_loc(struct ipr_dev *dev) + int rc, i, ret = 1; + struct ses_inquiry_page0 ses_page0_inq; + struct ses_serial_num_vpd ses_vpd_inq; +- struct esm_serial_num_vpd esm_vpd_inq; ++ struct esm_serial_num_vpd esm_vpd_inq = {0}; + char buffer[100]; + + memset(&ses_vpd_inq, 0, sizeof(ses_vpd_inq)); +@@ -2649,18 +2649,18 @@ int get_ses_phy_loc(struct ipr_dev *dev) + + if (ret == 0 ) { + dev->physical_location[0] = '\0'; +- strncat(dev->physical_location, "U", strlen("U")); ++ strcat(dev->physical_location, "U"); + ipr_strncpy_0(buffer, (char *)ses_vpd_inq.feature_code, + sizeof(ses_vpd_inq.feature_code)); +- strncat(dev->physical_location, buffer, strlen(buffer)); ++ strncat(dev->physical_location, buffer, sizeof(dev->physical_location) - strlen(dev->physical_location) -1); + ipr_strncpy_0(buffer, (char *)ses_vpd_inq.count, + sizeof(ses_vpd_inq.count)); +- strncat(dev->physical_location, ".", strlen(".")); +- strncat(dev->physical_location, buffer, strlen(buffer)); ++ strcat(dev->physical_location, "."); ++ strncat(dev->physical_location, buffer, sizeof(dev->physical_location) - strlen(dev->physical_location) -1); + ipr_strncpy_0(buffer, (char *)ses_vpd_inq.ses_serial_num, + sizeof(ses_vpd_inq.ses_serial_num)); +- strncat(dev->physical_location, ".", strlen(".")); +- strncat(dev->physical_location, buffer, strlen(buffer)); ++ strcat(dev->physical_location, "."); ++ strncat(dev->physical_location, buffer, sizeof(dev->physical_location) - strlen(dev->physical_location) -1); + + } + +@@ -2676,8 +2676,8 @@ int get_ses_phy_loc(struct ipr_dev *dev) + ipr_strncpy_0((char *)&dev->serial_number, (char *)&esm_vpd_inq.esm_serial_num[0], sizeof(esm_vpd_inq.esm_serial_num)); + ipr_strncpy_0(buffer, (char *)esm_vpd_inq.frb_label, + sizeof(esm_vpd_inq.frb_label)); +- strncat(dev->physical_location, "-", strlen("-")); +- strncat(dev->physical_location, buffer, strlen(buffer)); ++ strcat(dev->physical_location, "-"); ++ strncat(dev->physical_location, buffer, sizeof(dev->physical_location) - strlen(dev->physical_location) -1); + return 0; + } + } +@@ -3313,7 +3313,7 @@ static int raid_stop_complete() + **/ + int do_confirm_raid_stop(i_container *i_con) + { +- struct ipr_dev *vset; ++ struct ipr_dev *vset = NULL; + struct array_cmd_data *cur_raid_cmd; + struct ipr_ioa *ioa; + int rc; +@@ -3715,7 +3715,7 @@ int configure_raid_parameters(i_containe + int ch, start_row; + int cur_field_index; + int selected_count = 0, ssd_num = 0, hdd_num = 0; +- int stripe_sz, stripe_sz_mask, stripe_sz_list[16]; ++ int stripe_sz, stripe_sz_mask, stripe_sz_list[16] = {0}; + struct prot_level *prot_level_list; + int *userptr = NULL; + int *retptr; +@@ -3979,7 +3979,7 @@ int configure_raid_parameters(i_containe + sprintf(stripe_menu_str[index].line,"%d k",stripe_sz_mask); + + if (stripe_sz_mask == ntohs(cap_entry->recommended_stripe_size)) { +- sprintf(buffer,_("%s - recommend"),stripe_menu_str[index].line); ++ snprintf(buffer, sizeof(buffer), _("%s - recommend"),stripe_menu_str[index].line); + raid_item[index] = new_item(buffer, ""); + } else { + raid_item[index] = new_item(stripe_menu_str[index].line, ""); +@@ -7486,7 +7486,7 @@ int remove_or_add_back_device_64bit(stru + int res_path_len, dev_slot; + struct ipr_dev *sec_dev, *tmp_dev; + char new_sysfs_res_path[IPR_MAX_RES_PATH_LEN]; +- int rc; ++ int rc = 0; + + res_path_len = strlen(dev->res_path_name); + dev_slot = strtoul(dev->res_path_name + (res_path_len - 2), NULL, 16); +@@ -7558,7 +7558,7 @@ int process_conc_maint(i_container *i_co + int toggle=0; + s_node *n_screen; + struct screen_output *s_out; +- struct ipr_res_addr res_addr; ++ struct ipr_res_addr res_addr = {0}; + struct ipr_res_path res_path[2]; + int max_y, max_x; + +@@ -7905,7 +7905,7 @@ static struct ipr_dev *alloc_empty_slot( + dev->ses[0] = ses; + dev->ioa = ioa; + dev->physical_location[0] = '\0'; +- strncat(dev->physical_location, phy_loc, strlen(phy_loc)); ++ strncat(dev->physical_location, phy_loc, sizeof(dev->physical_location) - strlen(dev->physical_location) -1); + get_res_addrs(dev); + return dev; + } +@@ -7948,7 +7948,7 @@ static struct ipr_dev *alloc_empty_slot_ + dev->ses[0] = ses; + dev->ioa = ioa; + dev->physical_location[0] = '\0'; +- strncat(dev->physical_location, phy_loc, strlen(phy_loc)); ++ strncat(dev->physical_location, phy_loc, sizeof(dev->physical_location) - strlen(dev->physical_location) -1); + get_res_path(dev); + return dev; + } +@@ -8020,7 +8020,7 @@ static struct ipr_dev *get_dev_for_slot( + } + dev->physical_location[0] = '\0'; + if (strlen(phy_loc)) +- strncat(dev->physical_location, phy_loc, strlen(phy_loc)); ++ strncat(dev->physical_location, phy_loc, sizeof(dev->physical_location) - strlen(dev->physical_location) -1); + return dev; + } + } +@@ -8068,7 +8068,7 @@ static struct ipr_dev *get_dev_for_slot_ + } + dev->physical_location[0] = '\0'; + if (strlen(phy_loc)) +- strncat(dev->physical_location, phy_loc, strlen(phy_loc)); ++ strncat(dev->physical_location, phy_loc, sizeof(dev->physical_location) - strlen(dev->physical_location) -1); + return dev; + + } +@@ -8282,7 +8282,7 @@ static int get_conc_devs(struct ipr_dev + int ses_bus, scsi_id_found, is_spi, is_vses; + struct ipr_ses_config_pg ses_cfg; + struct drive_elem_desc_pg drive_data; +- char phy_loc[PHYSICAL_LOCATION_LENGTH + 1]; ++ char phy_loc[PHYSICAL_LOCATION_LENGTH + 1] = {0}; + int times, index; + + for_each_primary_ioa(ioa) { +@@ -11447,7 +11447,7 @@ int change_ioa_config(i_container * i_co + * number of options showed at screen. It should be more generic... + */ + struct ioa_config_attr *config_attr = NULL; +- struct ipr_ioa_attr ioa_attr; ++ struct ipr_ioa_attr ioa_attr = {0}; + int header_lines = 0, index = 0; + char *body = NULL; + struct screen_output *s_out; +@@ -12418,8 +12418,7 @@ int ibm_storage_log(i_container *i_con) + (*dirent)->d_name); + logsource_fp = gzopen(logfile, "r"); + if (logsource_fp == NULL) { +- syslog(LOG_ERR, "Could not open %s: %m\n", line); +- close(log_fd); ++ syslog(LOG_ERR, "Could not open %s: %m\n", logfile); + continue; /* proceed to next log file */ + } + +@@ -12524,8 +12523,7 @@ int kernel_log(i_container *i_con) + (*dirent)->d_name); + logsource_fp = gzopen(logfile, "r"); + if (logsource_fp == NULL) { +- syslog(LOG_ERR, "Could not open %s: %m\n", line); +- close(log_fd); ++ syslog(LOG_ERR, "Could not open %s: %m\n", logfile); + continue; /* proceed to next log file */ + } + +@@ -12602,8 +12600,7 @@ int iprconfig_log(i_container *i_con) + (*dirent)->d_name); + logsource_fp = gzopen(logfile, "r"); + if (logsource_fp == NULL) { +- syslog(LOG_ERR, "Could not open %s: %m\n", line); +- close(log_fd); ++ syslog(LOG_ERR, "Could not open %s: %m\n", logfile); + continue; /* proceed to next log file */ + } + +@@ -12855,7 +12852,7 @@ int ibm_boot_log(i_container *i_con) + snprintf(logfile, sizeof(logfile), "%s/boot.msg", log_root_dir); + logsource_fp = fopen(logfile, "r"); + if (!logsource_fp) { +- syslog(LOG_ERR, "Could not open %s: %m\n", line); ++ syslog(LOG_ERR, "Could not open %s: %m\n", logfile); + free(tmp_log); + close(log_fd); + return RC_75_Failed_Read_Err_Log; +@@ -12917,7 +12914,7 @@ static void get_status(struct ipr_dev *d + int blk_size = 0; + struct ipr_mode_pages mode_pages; + struct ipr_block_desc *block_desc; +- struct sense_data_t sense_data; ++ struct sense_data_t sense_data = {0}; + struct ipr_cmd_status cmd_status; + struct ipr_cmd_status_record *status_record; + int percent_cmplt = 0; +@@ -13261,7 +13258,7 @@ static char *print_phy64(struct ipr_fabr + ipr_format_res_path_wo_hyphen(cfg->res_path, buffer, IPR_MAX_RES_PATH_LEN); + ff_len = res_path_len - strlen(buffer); + for ( i = 0; i < ff_len; i++) +- strncat(buffer, "F", strlen("F")); ++ strcat(buffer, "F"); + + len += sprintf(body + len, "%s", buffer); + +@@ -13419,8 +13416,8 @@ char *__print_device(struct ipr_dev *dev + char res_path_name[IPR_MAX_RES_PATH_LEN]; + int tab_stop = 0; + int loc_len = 0; +- char vendor_id[IPR_VENDOR_ID_LEN + 1]; +- char product_id[IPR_PROD_ID_LEN + 1]; ++ char vendor_id[IPR_VENDOR_ID_LEN + 1] = {0}; ++ char product_id[IPR_PROD_ID_LEN + 1] = {0}; + struct ipr_ioa *ioa = dev->ioa, *ioa_phy_loc; + bool is4k = false, isri = false; + +@@ -14009,7 +14006,7 @@ static void curses_init() + **/ + static int format_devices(char **args, int num_args, int fmt_flag) + { +- int i, rc, blksz; ++ int i, rc, blksz = 0; + struct ipr_dev *dev; + + for (i = 0; i < num_args; i++) { +@@ -17779,7 +17776,7 @@ static int get_drive_phy_loc(struct ipr_ + struct ipr_ses_config_pg ses_cfg; + int ses_bus, scsi_id_found, is_spi, is_vses; + struct drive_elem_desc_pg drive_data; +- char phy_loc[PHYSICAL_LOCATION_LENGTH + 1]; ++ char phy_loc[PHYSICAL_LOCATION_LENGTH + 1] = {0}; + int times, index; + + is_spi = ioa_is_spi(ioa); +@@ -18222,7 +18219,7 @@ static int set_ioa_caching(char **args, + static int set_array_rebuild_verify(char **args, int num_args) + { + int rc; +- struct ipr_ioa_attr attr; ++ struct ipr_ioa_attr attr = {0}; + struct ipr_ioa *ioa; + struct ipr_dev *dev; + int disable_rebuild_verify; +@@ -18318,7 +18315,7 @@ static int set_array_rebuild_rate(char** + int err_rebuild_rate = 0; + int rebuild_rate = 0; + int rc; +- struct ipr_ioa_attr attr; ++ struct ipr_ioa_attr attr = {0}; + struct ipr_ioa *ioa; + struct ipr_dev *dev; + +@@ -18382,7 +18379,7 @@ static int set_array_rebuild_rate(char** + **/ + static int query_array_rebuild_rate(char**args, int num_args) + { +- struct ipr_ioa_attr attr; ++ struct ipr_ioa_attr attr = {0}; + struct ipr_ioa *ioa; + struct ipr_dev *dev; + int rebuild_rate = 0; +diff -up iprutils-rel-2-4-19/iprconfig.h.me iprutils-rel-2-4-19/iprconfig.h +diff -up iprutils-rel-2-4-19/iprdump.c.me iprutils-rel-2-4-19/iprdump.c +--- iprutils-rel-2-4-19/iprdump.c.me 2024-06-17 17:12:49.846400485 +0200 ++++ iprutils-rel-2-4-19/iprdump.c 2024-06-18 00:41:47.907738323 +0200 +@@ -23,6 +23,7 @@ + #define MAX_DUMP_FILES 4 + #define TOOL_NAME "iprdump" + #define DUMP_PREFIX TOOL_NAME"." ++#define MAX_PATH_LENGTH 1024 + + char *tool_name = TOOL_NAME; + +@@ -156,7 +157,7 @@ static int dump_sort(const struct dirent + static void cleanup_old_dumps() + { + struct dirent **dirent; +- char fname[100]; ++ char fname[MAX_PATH_LENGTH]; + int rc, i; + + rc = scandir(usr_dir, &dirent, select_dump_file, dump_sort); +@@ -226,7 +227,7 @@ static void write_dump(struct ipr_ioa *i + if (get_dump_fname(dump_file)) + return; + +- sprintf(dump_path, "%s%s", usr_dir, dump_file); ++ snprintf(dump_path, sizeof(dump_path), "%s%s", usr_dir, dump_file); + f_dump = creat(dump_path, S_IRUSR); + if (f_dump < 0) { + syslog(LOG_ERR, "Cannot open %s. %m\n", dump_path); +@@ -347,7 +348,7 @@ int main(int argc, char *argv[]) + if (strcmp(argv[i], "-d") == 0) { + strcpy(usr_dir,argv[++i]); + len = strlen(usr_dir); +- if (len < sizeof(usr_dir) && usr_dir[len] != '/') { ++ if (len < sizeof(usr_dir) - 2 && usr_dir[len] != '/') { + usr_dir[len + 1] = '/'; + usr_dir[len + 2] = '\0'; + } +diff -up iprutils-rel-2-4-19/iprlib.c.me iprutils-rel-2-4-19/iprlib.c +--- iprutils-rel-2-4-19/iprlib.c.me 2024-06-17 12:22:56.983740856 +0200 ++++ iprutils-rel-2-4-19/iprlib.c 2024-06-18 10:09:20.716132953 +0200 +@@ -2063,8 +2063,9 @@ static void ipr_get_pci_slots() + if (strcmp(pci_slot[i].pci_device, ioa->pci_address) && + strcmp(pci_slot[i].slot_name, ioa->pci_address)) + continue; +- strcpy(ioa->physical_location, +- pci_slot[i].physical_name); ++ strncpy(ioa->physical_location, ++ pci_slot[i].physical_name, sizeof(ioa->physical_location) - 1); ++ ioa->physical_location[sizeof(ioa->physical_location) - 1] = '\0'; + break; + } + } +@@ -2101,7 +2102,7 @@ void load_system_p_oper_mode() + **/ + static int __tool_init(int save_state) + { +- int temp, fw_type; ++ int temp, fw_type = 0; + struct ipr_ioa *ipr_ioa; + DIR *dirfd, *host_dirfd; + struct dirent *dent, *host_dent; +@@ -2132,13 +2133,15 @@ static int __tool_init(int save_state) + memset(ipr_ioa,0,sizeof(struct ipr_ioa)); + + /* PCI address */ +- strcpy(ipr_ioa->pci_address, dent->d_name); ++ strncpy(ipr_ioa->pci_address, dent->d_name, sizeof(ipr_ioa->pci_address) - 1); ++ ipr_ioa->pci_address[sizeof(ipr_ioa->pci_address) -1] = '\0'; + ipr_ioa->host_num = -1; + sprintf(devpath, "/sys/bus/pci/drivers/ipr/%s", + dent->d_name); + host_dirfd = opendir(devpath); + if (!host_dirfd) { + syslog_dbg("Failed to open scsi_host class.\n"); ++ closedir(dirfd); + return -EAGAIN; + } + while ((host_dent = readdir(host_dirfd)) != NULL) { +@@ -2152,7 +2155,8 @@ static int __tool_init(int save_state) + &ipr_ioa->host_num) != 1) + continue; + +- strcpy(ipr_ioa->host_name, host_dent->d_name); ++ strncpy(ipr_ioa->host_name, host_dent->d_name, sizeof(ipr_ioa->host_name) - 1); ++ ipr_ioa->host_name[sizeof(ipr_ioa->host_name) - 1] = '\0'; + get_pci_attrs(ipr_ioa, devpath); + + sprintf(scsipath, "%s/%s/scsi_host/%s", devpath, +@@ -2188,6 +2192,7 @@ static int __tool_init(int save_state) + len = sysfs_read_attr(devpath, "model", buff, 16); + if (len < 0 || (sscanf(buff, "%4X", &temp) != 1)) { + syslog_dbg("Cannot read SCSI device model.\n"); ++ closedir(dirfd); + return -EAGAIN; + } + ipr_ioa->ccin = temp; +@@ -5747,7 +5752,7 @@ int ipr_set_active_active_mode(struct ip + **/ + int set_active_active_mode(struct ipr_ioa *ioa, int mode) + { +- struct ipr_ioa_attr attr; ++ struct ipr_ioa_attr attr = {0}; + int rc; + + /* Get the current ioa attributes. */ +@@ -5860,7 +5865,7 @@ int get_scsi_dev_data(struct scsi_dev_da + len = sysfs_read_attr(devpath, "resource_path", buff, 256); + if (len > 0) + ipr_strncpy_0n(scsi_dev_data->res_path, +- buff, IPR_MAX_RES_PATH_LEN); ++ buff, IPR_MAX_RES_PATH_LEN-1); + + len = sysfs_read_attr(devpath, "device_id", buff, 256); + if (len > 0) +@@ -6255,15 +6260,19 @@ static void get_prot_levels(struct ipr_i + for_each_array(ioa, array) { + prot_level_str = get_prot_level_str(ioa->supported_arrays, + array->raid_level); +- strncpy(array->prot_level_str, prot_level_str, 8); ++ strncpy(array->prot_level_str, prot_level_str, sizeof(array->prot_level_str) - 1); ++ array->prot_level_str[sizeof(array->prot_level_str) - 1] = '\0'; + } + + for_each_vset(ioa, vset) { + prot_level_str = get_prot_level_str(ioa->supported_arrays, + vset->raid_level); +- strncpy(vset->prot_level_str, prot_level_str, 8); +- for_each_dev_in_vset(vset, dev) +- strncpy(dev->prot_level_str, prot_level_str, 8); ++ strncpy(vset->prot_level_str, prot_level_str, sizeof(vset->prot_level_str) - 1); ++ vset->prot_level_str[sizeof(vset->prot_level_str) - 1] = '\0'; ++ for_each_dev_in_vset(vset, dev) { ++ strncpy(dev->prot_level_str, prot_level_str, sizeof(dev->prot_level_str) - 1); ++ dev->prot_level_str[sizeof(dev->prot_level_str) - 1] = '\0'; ++ } + } + } + +@@ -7038,6 +7047,7 @@ static void ipr_save_attr(struct ipr_ioa + temp_fd = fopen(temp_fname, "w"); + if (temp_fd == NULL) { + syslog(LOG_ERR, "Could not open %s. %m\n", temp_fname); ++ fclose(fd); + return; + } + +@@ -9175,6 +9185,8 @@ int ipr_update_ioa_fw(struct ipr_ioa *io + dir = opendir(hotplug_dir); + if (!dir) + mkdir(hotplug_dir, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); ++ else ++ closedir(dir); + + dir = opendir(hotplug_dir); + if (!dir) { +@@ -9356,7 +9368,12 @@ int ipr_ses_get_time(struct ipr_dev *dev + return -EIO; + + *origin = !!get_time.timestamp_origin; +- *timestamp = be64toh(*((u64*) get_time.timestamp)) >> 16; ++ *timestamp = ((u64)get_time.timestamp[0] << 40) | ++ ((u64)get_time.timestamp[1] << 32) | ++ ((u64)get_time.timestamp[2] << 24) | ++ ((u64)get_time.timestamp[3] << 16) | ++ ((u64)get_time.timestamp[4] << 8) | ++ (u64)get_time.timestamp[5]; + return 0; + } + +@@ -9776,7 +9793,7 @@ static void init_gpdd_dev(struct ipr_dev + */ + static void init_af_dev(struct ipr_dev *dev) + { +- struct ipr_disk_attr attr; ++ struct ipr_disk_attr attr = {0}; + int rc; + + if (ipr_set_dasd_timeouts(dev, 0)) diff --git a/iprutils.spec b/iprutils.spec index 60ef0de..6e78121 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 10%{?dist} +Release: 11%{?dist} License: CPL URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -11,6 +11,10 @@ Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version # missing man page Source1: iprdbg.8.gz +Patch10: iprutils-2.4.19-covscan.patch + +ExclusiveArch: ppc64le + BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: libcap-devel @@ -75,6 +79,10 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Mon Jul 08 2024 Than Ngo - 2.4.19-11 +- fixed covscan issues and test +- limit to ppc64le + * Wed Jan 24 2024 Fedora Release Engineering - 2.4.19-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/tests/basic-functionality-test/runtest.sh b/tests/basic-functionality-test/runtest.sh index 93d9ea0..b16a304 100755 --- a/tests/basic-functionality-test/runtest.sh +++ b/tests/basic-functionality-test/runtest.sh @@ -174,8 +174,8 @@ rlJournalStart done # check for sane license and readme file - rlRun "head /usr/share/licenses/iputils/LICENSE" 0 "Check for license file" - rlRun "head /usr/share/doc/iputils/README" 0 "Check for README file" + rlRun "head /usr/share/licenses/iprutils/LICENSE" 0 "Check for license file" + rlRun "head /usr/share/doc/iprutils/README" 0 "Check for README file" rlPhaseEnd rlPhaseStartCleanup rlRun "popd" From 2999637c6532240fb549e66418c834ae141de54d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:33:03 +0000 Subject: [PATCH 64/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 6e78121..92c9ddc 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 11%{?dist} +Release: 12%{?dist} License: CPL URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -79,6 +79,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.4.19-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 08 2024 Than Ngo - 2.4.19-11 - fixed covscan issues and test - limit to ppc64le From 3cfb3dc7c0601d04c4bb8ae33bdf6de1dcbed6f5 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 5 Aug 2024 08:20:22 +0200 Subject: [PATCH 65/70] fix license tag --- iprutils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/iprutils.spec b/iprutils.spec index 92c9ddc..a917806 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,8 +3,8 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 12%{?dist} -License: CPL +Release: 13%{?dist} +License: CPL-1.0 URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -79,6 +79,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Mon Aug 05 2024 Than Ngo - 2.4.19-13 +- fix license tag + * Thu Jul 18 2024 Fedora Release Engineering - 2.4.19-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7ea06f1d5eeca0aedec3ee2e30f5478a861860a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 7 Aug 2024 09:39:22 +0200 Subject: [PATCH 66/70] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- iprutils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/iprutils.spec b/iprutils.spec index a917806..ae13436 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,8 +3,9 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 13%{?dist} -License: CPL-1.0 +Release: 14%{?dist} +# Automatically converted from old format: CPL-1.0 - review is highly recommended. +License: Not a valid license string in legacy syntax. Pass '--verbose' to get full parser error. URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -79,6 +80,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Wed Aug 07 2024 Miroslav Suchý - 2.4.19-14 +- convert license to SPDX + * Mon Aug 05 2024 Than Ngo - 2.4.19-13 - fix license tag From 52debdb86dcc1814c094bed69afed240802817b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 13 Sep 2024 06:41:40 +0000 Subject: [PATCH 67/70] Correct SPDX license formula Previously, the script for automatic conversion made an incorrect change. Reverting back as CPL-1.0 is a valid license id. --- iprutils.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iprutils.spec b/iprutils.spec index ae13436..d992cb6 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -4,8 +4,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 Release: 14%{?dist} -# Automatically converted from old format: CPL-1.0 - review is highly recommended. -License: Not a valid license string in legacy syntax. Pass '--verbose' to get full parser error. +License: CPL-1.0 URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz From c88aa208ebcf8a665a09fb9d6c413e939eede0e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:21:31 +0000 Subject: [PATCH 68/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index d992cb6..95b3c8b 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 14%{?dist} +Release: 15%{?dist} License: CPL-1.0 URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -79,6 +79,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.4.19-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 07 2024 Miroslav Suchý - 2.4.19-14 - convert license to SPDX From 81c60cdbb36957071f1fd415cfb70a2f6b8b9838 Mon Sep 17 00:00:00 2001 From: Jakub Haruda Date: Tue, 15 Jul 2025 14:56:45 +0200 Subject: [PATCH 69/70] Convert STI to TMT --- .fmf/version | 1 + plans/basic.fmf | 11 ++++ tests/basic-functionality-test/Makefile | 65 ------------------- tests/basic-functionality-test/PURPOSE | 11 ---- tests/sanity/main.fmf | 24 +++++++ .../runtest.sh | 1 - tests/tests.yml | 13 ---- 7 files changed, 36 insertions(+), 90 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf delete mode 100644 tests/basic-functionality-test/Makefile delete mode 100644 tests/basic-functionality-test/PURPOSE create mode 100644 tests/sanity/main.fmf rename tests/{basic-functionality-test => sanity}/runtest.sh (99%) delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..b5711c6 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,11 @@ +--- +/: + inherit: false + +summary: Plan for running all tests + +discover: + how: fmf +execute: + how: tmt + diff --git a/tests/basic-functionality-test/Makefile b/tests/basic-functionality-test/Makefile deleted file mode 100644 index 5530481..0000000 --- a/tests/basic-functionality-test/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/patch/Regression/Cannot-handle-file-names-with-integrated-spaces -# Description: Test for bz431887 (Cannot handle file names with integrated spaces) -# Author: Ondrej Moris -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2010 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/patch/Regression/Cannot-handle-file-names-with-integrated-spaces -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Ondrej Moris " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for bz431887 (Cannot handle file names with integrated spaces)" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: patch" >> $(METADATA) - @echo "Requires: patch" >> $(METADATA) - @echo "Requires: expect" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 431887" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/basic-functionality-test/PURPOSE b/tests/basic-functionality-test/PURPOSE deleted file mode 100644 index 4d05a09..0000000 --- a/tests/basic-functionality-test/PURPOSE +++ /dev/null @@ -1,11 +0,0 @@ -PURPOSE of /CoreOS/iprutils/basic-functionality-test -Description: Tier1 tests -Author: Than Ngo - -tests following scenarios: - * test iprdump --version - * test iprinit --version - * test iprupdate --version - * test Services: iprdump, iprinit, iprupdate - * test existence of man pages - * test existence of license and readme file diff --git a/tests/sanity/main.fmf b/tests/sanity/main.fmf new file mode 100644 index 0000000..b0aef71 --- /dev/null +++ b/tests/sanity/main.fmf @@ -0,0 +1,24 @@ +summary: Test for bz431887 (Cannot handle file names with integrated spaces) +description: "tests following scenarios:\n * test iprdump --version\n * test iprinit + --version\n * test iprupdate --version\n * test Services: iprdump, iprinit, iprupdate\n\ + \ * test existence of man pages\n * test existence of license and readme file\ + \ \n" +contact: Ondrej Moris +link: + - relates: https://bugzilla.redhat.com/show_bug.cgi?id=431887 +component: + - patch +test: ./runtest.sh +framework: beakerlib +recommend: + - iprutils + - patch + - expect + - man-db + - coreutils + - rpm +duration: 5m +extra-summary: + /CoreOS/patch/Regression/Cannot-handle-file-names-with-integrated-spaces +extra-task: + /CoreOS/patch/Regression/Cannot-handle-file-names-with-integrated-spaces diff --git a/tests/basic-functionality-test/runtest.sh b/tests/sanity/runtest.sh similarity index 99% rename from tests/basic-functionality-test/runtest.sh rename to tests/sanity/runtest.sh index b16a304..2cc274e 100755 --- a/tests/basic-functionality-test/runtest.sh +++ b/tests/sanity/runtest.sh @@ -30,7 +30,6 @@ PACKAGES="iprutils man-db coreutils rpm" SERVICES="iprdump iprinit iprupdate" # Include Beaker environment -. /usr/bin/rhts-environment.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1 rlJournalStart diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 7619f5f..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Run tests in all contexts -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-beakerlib - tests: - - basic-functionality-test - required_packages: - - man-db - - coreutils - - rpm From f40acc53aa4c16da13c8bd167848a9b90ac5a677 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:45:44 +0000 Subject: [PATCH 70/70] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- iprutils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iprutils.spec b/iprutils.spec index 95b3c8b..fb01523 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -3,7 +3,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils Version: 2.4.19 -Release: 15%{?dist} +Release: 16%{?dist} License: CPL-1.0 URL: https://github.com/bjking1/iprutils Source0: https://github.com/bjking1/iprutils/archive/%{gitver}/%{name}-%{version}.tar.gz @@ -79,6 +79,9 @@ rm %{buildroot}/%{_sysconfdir}/ha.d/resource.d/iprha %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.4.19-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 2.4.19-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild