rpms/smartmontools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- warn about disabled mail only if capabilities are enabled

Browse Source
This commit is contained in:
Michal Hlavinka 2009-10-12 15:07:07 +00:00
parent 1423d95f4f
commit 5ec8254a72
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
smartmontools-5.38-lowcap.patch
View File

@ -1,6 +1,6 @@
diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
--- smartmontools-5.38/configure.in.lowcap 2009-10-09 10:19:22.395700024 +0200 --- smartmontools-5.38/configure.in.lowcap 2009-10-12 17:00:53.889673785 +0200
+++ smartmontools-5.38/configure.in 2009-10-09 10:19:22.431698988 +0200 +++ smartmontools-5.38/configure.in 2009-10-12 17:00:53.896678618 +0200
@@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then @@ -143,6 +143,40 @@ if test "$with_selinux" = "yes"; then
AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled]) AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
fi fi
@ -44,7 +44,7 @@ diff -up smartmontools-5.38/configure.in.lowcap smartmontools-5.38/configure.in
if test "$mandir" = '${prefix}/man'; then if test "$mandir" = '${prefix}/man'; then
diff -up smartmontools-5.38/Makefile.am.lowcap smartmontools-5.38/Makefile.am diff -up smartmontools-5.38/Makefile.am.lowcap smartmontools-5.38/Makefile.am
--- smartmontools-5.38/Makefile.am.lowcap 2007-04-01 18:49:44.000000000 +0200 --- smartmontools-5.38/Makefile.am.lowcap 2007-04-01 18:49:44.000000000 +0200
+++ smartmontools-5.38/Makefile.am 2009-10-09 10:19:22.434699065 +0200 +++ smartmontools-5.38/Makefile.am 2009-10-12 17:00:53.896678618 +0200
@@ -35,7 +35,7 @@ smartd_SOURCES = smartd.cpp \ @@ -35,7 +35,7 @@ smartd_SOURCES = smartd.cpp \
utility.cpp \ utility.cpp \
utility.h utility.h
@ -56,7 +56,7 @@ diff -up smartmontools-5.38/Makefile.am.lowcap smartmontools-5.38/Makefile.am
EXTRA_smartd_SOURCES = os_darwin.cpp \ EXTRA_smartd_SOURCES = os_darwin.cpp \
diff -up smartmontools-5.38/smartd.8.in.lowcap smartmontools-5.38/smartd.8.in diff -up smartmontools-5.38/smartd.8.in.lowcap smartmontools-5.38/smartd.8.in
--- smartmontools-5.38/smartd.8.in.lowcap 2008-03-04 23:09:47.000000000 +0100 --- smartmontools-5.38/smartd.8.in.lowcap 2008-03-04 23:09:47.000000000 +0100
+++ smartmontools-5.38/smartd.8.in 2009-10-09 10:19:22.439699030 +0200 +++ smartmontools-5.38/smartd.8.in 2009-10-12 17:00:53.902672971 +0200
@@ -145,6 +145,12 @@ input. This is useful for commands like: @@ -145,6 +145,12 @@ input. This is useful for commands like:
to perform quick and simple checks without a configuration file. to perform quick and simple checks without a configuration file.
@ -71,8 +71,8 @@ diff -up smartmontools-5.38/smartd.8.in.lowcap smartmontools-5.38/smartd.8.in
Runs \fBsmartd\fP in "debug" mode. In this mode, it displays status Runs \fBsmartd\fP in "debug" mode. In this mode, it displays status
information to STDOUT rather than logging it to SYSLOG and does not information to STDOUT rather than logging it to SYSLOG and does not
diff -up smartmontools-5.38/smartd.cpp.lowcap smartmontools-5.38/smartd.cpp diff -up smartmontools-5.38/smartd.cpp.lowcap smartmontools-5.38/smartd.cpp
--- smartmontools-5.38/smartd.cpp.lowcap 2009-10-09 10:19:22.312699527 +0200 --- smartmontools-5.38/smartd.cpp.lowcap 2009-10-12 17:00:53.883672847 +0200
+++ smartmontools-5.38/smartd.cpp 2009-10-09 10:43:45.294698988 +0200 +++ smartmontools-5.38/smartd.cpp 2009-10-12 17:04:18.600547796 +0200
@@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi @@ -74,6 +74,10 @@ extern "C" int __stdcall FreeConsole(voi
#include <io.h> // setmode() #include <io.h> // setmode()
#endif // __CYGWIN__ #endif // __CYGWIN__
@ -119,7 +119,7 @@ diff -up smartmontools-5.38/smartd.cpp.lowcap smartmontools-5.38/smartd.cpp
+#ifdef HAVE_LIBCAP_NG +#ifdef HAVE_LIBCAP_NG
+ PrintOut(LOG_INFO," -C, --usecapabilities\n"); + PrintOut(LOG_INFO," -C, --usecapabilities\n");
+ PrintOut(LOG_INFO," Use possix capabilities (EXPERIMENTAL).\n" + PrintOut(LOG_INFO," Use possix capabilities (EXPERIMENTAL).\n"
+ " Warning: Mail notification does not work when used.\n"); + " Warning: Mail notification does not work when used.\n\n");
+#endif +#endif
#ifdef _WIN32 #ifdef _WIN32
PrintOut(LOG_INFO," --service\n"); PrintOut(LOG_INFO," --service\n");
@ -183,20 +183,23 @@ diff -up smartmontools-5.38/smartd.cpp.lowcap smartmontools-5.38/smartd.cpp
// the main loop of the code // the main loop of the code
while (1){ while (1){
@@ -4482,7 +4527,15 @@ static int smartd_main(int argc, char ** @@ -4482,7 +4527,18 @@ static int smartd_main(int argc, char **
PrintTestSchedule(ATAandSCSIdevlist); PrintTestSchedule(ATAandSCSIdevlist);
EXIT(0); EXIT(0);
} }
- -
+#ifdef HAVE_LIBCAP_NG
+ for(int i=numdevata+numdevscsi; i>1; i--) {
+ if (ATAandSCSIdevlist[i-1]->mailwarn) {
+ PrintOut(LOG_WARNING,"Mail can't be enabled together with --usecapabilities. All mail will be suppressed.\n");
+ break;
+ }
+ }
+ +
+#ifdef HAVE_LIBCAP_NG
+ if (enable_capabilities) {
+ for(int i=0; i<numdevata+numdevscsi; i++) {
+ if (ATAandSCSIdevlist[i]->mailwarn) {
+ PrintOut(LOG_WARNING,"Mail can't be enabled together with --usecapabilities. All mail will be suppressed.\n");
+ break;
+ }
+ }
+ }
+#endif +#endif
+
// reset signal // reset signal
caughtsigHUP=0; caughtsigHUP=0;
} }

5
smartmontools.spec
View File

@ -1,7 +1,7 @@
Summary: Tools for monitoring SMART capable hard disks Summary: Tools for monitoring SMART capable hard disks
Name: smartmontools Name: smartmontools
Version: 5.38 Version: 5.38
Release: 20%{?dist} Release: 21%{?dist}
Epoch: 1 Epoch: 1
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
@ -79,6 +79,9 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/smartmontools %config(noreplace) %{_sysconfdir}/sysconfig/smartmontools
%changelog %changelog
* Mon Oct 12 2009 Michal Hlavinka <mhlavink@redhat.com> - 1:5.38-21
- warn about disabled mail only if capabilities are enabled
* Fri Oct 09 2009 Michal Hlavinka <mhlavink@redhat.com> - 1:5.38-20 * Fri Oct 09 2009 Michal Hlavinka <mhlavink@redhat.com> - 1:5.38-20
- fix init script for case when no action was specified - fix init script for case when no action was specified