Hello community,
here is the log from the commit of package smartmontools
checked in at Tue Oct 28 00:39:53 CET 2008.
--------
--- smartmontools/smartmontools.changes 2008-09-02 15:08:08.000000000 +0200
+++ /d/STABLE/smartmontools/smartmontools.changes 2008-10-27 18:50:44.000000000 +0100
@@ -1,0 +2,18 @@
+Fri Oct 24 18:12:18 CEST 2008 - sbrabec@suse.cz
+
+- Updated to the latest CVS snapshot:
+ * DEVICESCAN works again with SATA (bnc#436567)
+ * knowndrives updates, now using full regexps
+ * support for local drive database entries from optional file
+ * support for scheduled self tests
+ * smartd persistent state and delayed test scheduling support
+ * support for disks behind MegaRAID controllers
+ * Improve min/max temperature recording in conjunction with '-s'.
+ * new options to -l
+ * code cleanup and other fixes
+- Init script updated to support "unused" state (bnc#436567).
+- Added "rescan" to the init script to force rescanning of devices.
+- Enabled selinux support to create /dev/tw[ae] with correct
+ contexts.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
sm5-20080818.tar.bz2
New:
----
sm5-20081027.tar.bz2
smartmontools-init-update.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smartmontools.spec ++++++
--- /var/tmp/diff_new_pack.K11040/_old 2008-10-28 00:39:15.000000000 +0100
+++ /var/tmp/diff_new_pack.K11040/_new 2008-10-28 00:39:15.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package smartmontools (Version 5.38.0.20080818)
+# spec file for package smartmontools (Version 5.38.0.20081027)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -21,15 +21,16 @@
Name: smartmontools
License: GPL v2 or later
Group: Hardware/Other
-Version: 5.38.0.20080818
-Release: 7
+Version: 5.38.0.20081027
+Release: 1
#Source: %{name}-%{version}.tar.bz2
-Source: sm5-20080818.tar.bz2
+Source: sm5-20081027.tar.bz2
Source1: README.SATA
Patch: smartmontools-powersave-notify.patch
Patch1: smartmontools-default-enabled.patch
Patch2: smartmontools-lsb-init-script.patch
Patch4: smartmontools-removable.patch
+Patch5: smartmontools-init-update.patch
PreReq: %insserv_prereq %fillup_prereq coreutils
%if %suse_version > 1000
%if %suse_version <= 1100
@@ -45,7 +46,7 @@
%endif
Url: http://smartmontools.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: gcc-c++ libstdc++-devel
+BuildRequires: gcc-c++ libselinux-devel libstdc++-devel
Summary: Monitor for S.M.A.R.T. Disks and Devices
Obsoletes: smartctl smartd ucsc-smartsuite smartsuite
@@ -82,6 +83,7 @@
%patch
%endif
%endif
+%patch5
%build
./autogen.sh
@@ -94,8 +96,11 @@
export CPPFLAGS=-I/usr/src/linux/include
%endif
%configure\
- --with-docdir=%{_defaultdocdir}/%{name}
-make %{?jobs:-j%jobs}
+ --with-docdir=%{_defaultdocdir}/%{name}\
+ --enable-drivedb\
+ --enable-savestates\
+ --with-selinux
+make %{?jobs:-j%jobs} BUILD_INFO='"(openSUSE RPM)"'
%install
%makeinstall
@@ -115,11 +120,15 @@
%if %suse_version < 1010
cp README.SATA $RPM_BUILD_ROOT%{_datadir}/doc/packages/%{name}/
%endif
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/smartmontools
#remove installed files we don't want to package
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
+rm -r $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
%if %suse_version > 1020
ln -sf %{_datadir}/doc/licenses/md5/$(md5sum COPYING | sed 's/ .*//') $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYING
%endif
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/smart_drivedb.h < 1000
%if %suse_version <= 1100
%{_prefix}/lib/smartmontools
@@ -165,9 +176,25 @@
%{_sbindir}/*
%config(noreplace) %{_sysconfdir}/default/*
%{_sysconfdir}/init.d/*
-%config(noreplace) %{_sysconfdir}/*.conf
+%config(noreplace) %{_sysconfdir}/smart_drivedb.h
+%config(noreplace) %{_sysconfdir}/smartd.conf
%changelog
+* Fri Oct 24 2008 sbrabec@suse.cz
+- Updated to the latest CVS snapshot:
+ * DEVICESCAN works again with SATA (bnc#436567)
+ * knowndrives updates, now using full regexps
+ * support for local drive database entries from optional file
+ * support for scheduled self tests
+ * smartd persistent state and delayed test scheduling support
+ * support for disks behind MegaRAID controllers
+ * Improve min/max temperature recording in conjunction with '-s'.
+ * new options to -l
+ * code cleanup and other fixes
+- Init script updated to support "unused" state (bnc#436567).
+- Added "rescan" to the init script to force rescanning of devices.
+- Enabled selinux support to create /dev/tw[ae] with correct
+ contexts.
* Tue Sep 02 2008 sbrabec@suse.cz
- Desktop neutral powersave-notify is no longer available.
Use "wall" to report expected disc failures.
++++++ sm5-20080818.tar.bz2 -> sm5-20081027.tar.bz2 ++++++
++++ 14805 lines of diff (skipped)
++++++ smartmontools-init-update.patch ++++++
--- smartd.initd.in
+++ smartd.initd.in
@@ -137,7 +137,7 @@
# SuSE
elif [ -f /etc/SuSE-release ] ; then
test -x $SMARTD_BIN || exit 5
-
+
# Existence of config file is optional
SMARTD_CONFIG=/etc/smartd.conf
@@ -147,48 +147,61 @@
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_status check and set local and overall rc status
- # rc_status -v ditto but be verbose in local rc status
- # rc_status -v -r ditto and clear the local rc status
+ # rc_status -v be verbose in local rc status and clear it afterwards
+ # rc_status -v -r ditto and clear both the local and overall rc status
+ # rc_status -s display "skipped" and exit with status 3
+ # rc_status -u display "unused" and exit with status 3
# rc_failed set local and overall rc status to failed
- # rc_reset clear local rc status (overall remains)
+ # rc_failed <num> set local and overall rc status to <num>
+ # rc_reset clear both the local and overall rc status
# rc_exit exit appropriate to overall rc status
+ # rc_active checks whether a service is activated by symlinks
. /etc/rc.status
-
- # First reset status of this service
+
+ # Reset status of this service
rc_reset
-
+
# Return values acc. to LSB for all commands but status:
- # 0 - success
- # 1 - misc error
- # 2 - invalid or excess args
- # 3 - unimplemented feature (e.g. reload)
- # 4 - insufficient privilege
- # 5 - program not installed
- # 6 - program not configured
+ # 0 - success
+ # 1 - generic or unspecified error
+ # 2 - invalid or excess argument(s)
+ # 3 - unimplemented feature (e.g. "reload")
+ # 4 - user had insufficient privileges
+ # 5 - program is not installed
+ # 6 - program is not configured
+ # 7 - program is not running
+ # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
#
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
- # with force-reload (in case signalling is not supported) are
+ # with force-reload (in case signaling is not supported) are
# considered a success.
+
case "$1" in
start)
echo -n "Starting smartd "
- ## Start daemon with startproc(8). If this fails
- ## the echo return value is set appropriate.
-
- # startproc should return 0, even if service is
- # already running to match LSB spec.
- startproc $SMARTD_BIN $smartd_opts
-
- # Remember status and be verbose
- rc_status -v
+ ## Start daemon with startproc(8). If this fails
+ ## the return value is set appropriately by startproc.
+
+ # We don't use startproc - we need to check for return code 17.
+ if ! /sbin/checkproc $SMARTD_BIN ; then
+ $SMARTD_BIN $smartd_opts
+ # Remember status and be verbose
+ if test $? -ne 17 ; then
+ rc_status -v
+ else
+ rc_status -u
+ fi
+ else
+ rc_reset
+ rc_status -v
+ fi
;;
stop)
echo -n "Shutting down smartd "
- killproc -TERM $SMARTD_BIN
-
- # Remember status and be verbose
- rc_status -v
+ /sbin/killproc -TERM $SMARTD_BIN
+ # Remember status and be verbose
+ rc_status -v
;;
try-restart|condrestart)
## Do a restart only if the service was active before.
@@ -199,51 +212,60 @@
fi
$0 status
if test $? = 0; then
- $0 restart
- else
+ $0 restart
+ else
rc_reset # Not running is not a failure.
fi
# Remember status and be quiet
rc_status
;;
- restart | force-reload)
+ restart)
$0 stop
$0 start
+ # Remember status and be quiet
+ rc_status
+ ;;
+ force-reload|reload)
+ echo -n "Reload service smartd "
+ /sbin/killproc -HUP $SMARTD_BIN
+ rc_status -v
;;
- reload)
- ## Like force-reload, but if daemon does not support
- ## signaling, do nothing (!)
- rc_failed 3
+ rescan)
+ ## Rescan devices to be monitored (smartd specific function)
+ echo -n "Rescanning devices for service smartd "
+ /sbin/killproc -USR1 $SMARTD_BIN
rc_status -v
;;
status)
- echo -n "Checking for service smartd "
- ## Check status with checkproc(8), if process is running
- ## checkproc will return with exit status 0.
-
- # Status has a slightly different for the status command:
- # 0 - service running
- # 1 - service dead, but /var/run/ pid file exists
- # 2 - service dead, but /var/lock/ lock file exists
- # 3 - service not running
-
- # NOTE: checkproc returns LSB compliant status values.
- checkproc $SMARTD_BIN
- rc_status -v
- ;;
- probe)
+ echo -n "Checking for service smartd "
+ ## Check status with checkproc(8), if process is running
+ ## checkproc will return with exit status 0.
+
+ # Return value is slightly different for the status command:
+ # 0 - service up and running
+ # 1 - service dead, but /var/run/ pid file exists
+ # 2 - service dead, but /var/lock/ lock file exists
+ # 3 - service not running (unused)
+ # 4 - service status unknown :-(
+ # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
+
+ # NOTE: checkproc returns LSB compliant status values.
+ /sbin/checkproc $SMARTD_BIN
+ rc_status -v
+ ;;
+ probe)
## Optional: Probe for the necessity of a reload, print out the
## argument to this init script which is required for a reload.
## Note: probe is not (yet) part of LSB (as of 1.2)
+ ## Note: probe is not (yet) part of LSB (as of 1.9)
test $SMARTD_CONFIG -nt /var/run/smartd.pid && echo reload
;;
- *)
- echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
+ *)
+ echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|rescan|probe}"
exit 1
;;
esac
-
rc_exit
# Debian case
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org