Hello community, here is the log from the commit of package scsirastools for openSUSE:Factory checked in at 2012-10-31 07:03:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scsirastools (Old) and /work/SRC/openSUSE:Factory/.scsirastools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scsirastools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/scsirastools/scsirastools.changes 2012-04-20 15:21:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scsirastools.new/scsirastools.changes 2012-10-31 07:03:18.000000000 +0100 @@ -1,0 +2,17 @@ +Fri Oct 26 17:38:20 UTC 2012 - [email protected] + +- Added scsirastools-stop-using-var-lock-subsys.patch: remove use + of /var/lock/subsys in service init files (bnc#714645) + +------------------------------------------------------------------- +Wed Oct 24 17:07:03 UTC 2012 - [email protected] + +- added URL to Source0. + +------------------------------------------------------------------- +Fri Oct 19 23:37:41 EDT 2012 - [email protected] + +- updated the scsirastools-1.4.9-SUSE.diff patch to scsirastools-1.6.4-SUSE.diff + + corrected the sysvinit scripts for proper status behavior/output + +------------------------------------------------------------------- Old: ---- scsirastools-1.4.9-SuSE.diff scsirastools-1.6.4.tar.bz2 New: ---- scsirastools-1.6.4-SUSE.diff scsirastools-1.6.4.tar.gz scsirastools-stop-using-var-lock-subsys.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scsirastools.spec ++++++ --- /var/tmp/diff_new_pack.DBmZh4/_old 2012-10-31 07:03:19.000000000 +0100 +++ /var/tmp/diff_new_pack.DBmZh4/_new 2012-10-31 07:03:19.000000000 +0100 @@ -16,23 +16,20 @@ # - Name: scsirastools Version: 1.6.4 -Release: 0 -License: BSD-3-Clause -Group: Hardware/Other +Release: 17.11 BuildRequires: automake Requires: mdadm Summary: Serviceability for SCSI Disks and Arrays -# Normally available from http://downloads.sourceforge.net/project/scsirastools/%%{name}-%%{version}.tar.gz -# But version 1.5.8 is not anymore available -Source: %{name}/%{name}-%{version}.tar.bz2 -Patch: %{name}-1.4.9-SuSE.diff +License: BSD-3-Clause +Group: Hardware/Other +Source: http://downloads.sourceforge.net/project/%{name}/%{name}-%{version}.tar.gz +Patch: %{name}-1.6.4-SUSE.diff Patch2: %{name}-install Patch3: %{name}-single-dev.diff +Patch4: %{name}-stop-using-var-lock-subsys.patch Url: http://scsirastools.sourceforge.net/ -#Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,6 +74,7 @@ %patch -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build autoreconf -fi ++++++ scsirastools-1.6.4-SUSE.diff ++++++ diff -Naurp scsirastools-1.6.4.orig/doc/Makefile.am scsirastools-1.6.4/doc/Makefile.am --- scsirastools-1.6.4.orig/doc/Makefile.am 2011-08-23 13:26:05.000000000 +0000 +++ scsirastools-1.6.4/doc/Makefile.am 2012-10-15 14:10:14.289365169 +0000 @@ -13,8 +13,10 @@ exe_prefix = datadir = ${prefix}/share mandir = ${prefix}/share/man sysconfdir = ${exe_prefix}/etc +docdir = ${datadir}/doc/packages sbindir = ${exe_prefix}/sbin datato = ${DESTDIR}${datadir}/scsirastools +docto = ${DESTDIR}${docdir}/scsirastools sbin_PROGRAMS = @@ -34,9 +36,10 @@ install: ${INSTALL_DATA_CMD} $(fromd)/sgraidmon.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA_CMD} $(fromd)/sgdiskmon.8 ${DESTDIR}${mandir}/man8 ${INSTALL_DATA_CMD} $(fromd)/sgsafte.8 ${DESTDIR}${mandir}/man8 - ${INSTALL_DATA_CMD} $(fromd)/UserGuide ${datato} - ${INSTALL_DATA_CMD} $(TOPDIR)/README ${datato} - ${INSTALL_DATA_CMD} $(TOPDIR)/COPYING ${datato} - ${INSTALL_DATA_CMD} $(TOPDIR)/kern/SCSIRAS ${datato} + $(MKDIR) ${docto} + ${INSTALL_DATA_CMD} $(fromd)/UserGuide ${docto} + ${INSTALL_DATA_CMD} $(TOPDIR)/README ${docto} + ${INSTALL_DATA_CMD} $(TOPDIR)/COPYING ${docto} + ${INSTALL_DATA_CMD} $(TOPDIR)/kern/SCSIRAS ${docto} EXTRA_DIST = diff -Naurp scsirastools-1.6.4.orig/files/sgdisk scsirastools-1.6.4/files/sgdisk --- scsirastools-1.6.4.orig/files/sgdisk 2011-08-23 13:26:05.000000000 +0000 +++ scsirastools-1.6.4/files/sgdisk 2012-10-15 14:10:14.289365169 +0000 @@ -5,11 +5,13 @@ # processname: sgdiskmon # description: sgdisk is used to start/stop the sgdiskmon software raid1 daemon # -### BEGIN SLES INIT INFO +### BEGIN INIT INFO # Provides: sgdisk # Required-Start: $local_fs -# Default-Start: 3 4 5 +# Required-Stop: $local_fs +# Default-Start: 3 5 # Default-Stop: 0 1 2 6 +# Short-Description: sgdiskmon daemon # Description: sgdisk is used to start/stop the sgdiskmon software raid1 daemon ### END INIT INFO @@ -24,15 +26,16 @@ else fi # Dont need functions any more -#if [ $osver = suse ] -#then -# . /etc/rc.status +if [ $osver = suse ] +then + . /etc/rc.status #else # . /etc/init.d/functions -#fi +fi case "$1" in "start") + echo -n "Starting sgdiskmon " # Is sg module loaded? lsmod | grep sg >/dev/null if [ $? -ne 0 ] @@ -44,18 +47,34 @@ case "$1" in if [ "${rpid}" != "" ] then echo "sgdiskmon is already started" - exit 1 + rc_status -v + rc_exit fi sgdiskmon -b + rc_status -v touch /var/lock/subsys/sgdiskmon ;; "stop") + echo -n "Stopping sgdiskmon " rpid=`ps -ef |grep sgdiskmon |grep -v grep |awk '{print $2}'` if [ "${rpid}" != "" ] then + echo -n "(pid $rpid) " kill $rpid fi rm -f /var/lock/subsys/sgdiskmon + rc_status -v + ;; +"status") + echo -n "Checking for sgdiskmon " + rpid=`ps -ef |grep sgdiskmon |grep -v grep |awk '{print $2}'` + if [ "${rpid}" != "" ] + then + echo "(pid $rpid)" + else + rc_failed 3 + fi + rc_status -v ;; *) echo "Usage: $0 start|stop" @@ -63,4 +82,4 @@ case "$1" in ;; esac -exit 0 +rc_exit diff -Naurp scsirastools-1.6.4.orig/files/sgraid scsirastools-1.6.4/files/sgraid --- scsirastools-1.6.4.orig/files/sgraid 2011-08-23 13:26:05.000000000 +0000 +++ scsirastools-1.6.4/files/sgraid 2012-10-15 14:14:26.409827836 +0000 @@ -5,11 +5,13 @@ # processname: sgraidmon # description: sgraid is used to start/stop the sgraidmon software raid1 daemon # -### BEGIN SLES INIT INFO +### BEGIN INIT INFO # Provides: sgraid # Required-Start: $local_fs -# Default-Start: 3 4 5 +# Required-Stop: $local_fs +# Default-Start: 3 5 # Default-Stop: 0 1 2 6 +# Short-Description: sgraidmon daemon # Description: sgraid is used to start/stop the sgraidmon software raid1 daemon ### END INIT INFO @@ -24,15 +26,16 @@ else fi # Dont need functions any more -#if [ $osver = suse ] -#then -# . /etc/rc.status -#else -# . /etc/init.d/functions -#fi +if [ $osver = suse ] +then + . /etc/rc.status +else + . /etc/init.d/functions +fi case "$1" in "start") + echo -n "Starting sgraidmon " # Is sg module loaded? lsmod | grep sg >/dev/null if [ $? -ne 0 ] @@ -44,7 +47,9 @@ case "$1" in if [ "${rpid}" != "" ] then echo "sgraidmon is already started" - exit 1 + rc_failed 1 + rc_status -v + rc_exit fi # Could probably skip the 'mdevt Save' if it was already done once. # Get the first disk device configured in /etc/raidtab via getmd @@ -62,15 +67,29 @@ case "$1" in mdevt Save /dev/$rdev fi sgraidmon -b + rc_status -v touch /var/lock/subsys/sgraidmon ;; "stop") + echo -n "Stopping sgraidmon " rpid=`ps -ef |grep sgraidmon |grep -v grep |awk '{print $2}'` if [ "${rpid}" != "" ] then kill $rpid fi rm -f /var/lock/subsys/sgraidmon + rc_status -v + ;; +"status") + echo -n "Checking for sgraidmon " + rpid=`ps -ef |grep sgraidmon |grep -v grep |awk '{print $2}'` + if [ "${rpid}" != "" ] + then + echo -n "(pid $rpid)" + else + rc_failed 3 + fi + rc_status -v ;; *) echo "Usage: $0 start|stop" @@ -78,4 +97,5 @@ case "$1" in ;; esac -exit 0 +rc_exit + diff -Naurp scsirastools-1.6.4.orig/Makefile.am scsirastools-1.6.4/Makefile.am --- scsirastools-1.6.4.orig/Makefile.am 2011-08-23 13:26:05.000000000 +0000 +++ scsirastools-1.6.4/Makefile.am 2012-10-15 14:10:14.293365177 +0000 @@ -1,5 +1,5 @@ -SUBDIRS = mdadm.d src files doc +SUBDIRS = src files doc PKGDIR = /usr/src/redhat SOURCEDIR = $(PKGDIR)/SOURCES BUILDDIR = $(PKGDIR)/BUILD ++++++ scsirastools-stop-using-var-lock-subsys.patch ++++++ diff -Naurp scsirastools-1.6.4.orig/files/sgdisk scsirastools-1.6.4/files/sgdisk --- scsirastools-1.6.4.orig/files/sgdisk 2012-10-26 22:42:37.149405573 +0200 +++ scsirastools-1.6.4/files/sgdisk 2012-10-26 22:43:14.591209370 +0200 @@ -52,7 +52,6 @@ case "$1" in fi sgdiskmon -b rc_status -v - touch /var/lock/subsys/sgdiskmon ;; "stop") echo -n "Stopping sgdiskmon " @@ -62,7 +61,6 @@ case "$1" in echo -n "(pid $rpid) " kill $rpid fi - rm -f /var/lock/subsys/sgdiskmon rc_status -v ;; "status") diff -Naurp scsirastools-1.6.4.orig/files/sgraid scsirastools-1.6.4/files/sgraid --- scsirastools-1.6.4.orig/files/sgraid 2012-10-26 22:42:37.149405573 +0200 +++ scsirastools-1.6.4/files/sgraid 2012-10-26 22:43:08.884086862 +0200 @@ -68,7 +68,6 @@ case "$1" in fi sgraidmon -b rc_status -v - touch /var/lock/subsys/sgraidmon ;; "stop") echo -n "Stopping sgraidmon " @@ -77,7 +76,6 @@ case "$1" in then kill $rpid fi - rm -f /var/lock/subsys/sgraidmon rc_status -v ;; "status") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
