.gitignore

@@ -1 +1 @@
-SOURCES/smartmontools-7.1.tar.gz
+SOURCES/smartmontools-7.2.tar.gz

.smartmontools.metadata

@@ -1 +1 @@
-207dc2b50cab1c6fba7bc248665fbbe3189374e1 SOURCES/smartmontools-7.1.tar.gz
+8d68241096f6ed5b1bbcd8b427fa4a881c1f3e33 SOURCES/smartmontools-7.2.tar.gz

SOURCES/smartdnotify

@@ -3,7 +3,7 @@
 # Send mail
 if which mail >/dev/null 2>&1
 then
-  echo "$SMARTD_MESSAGE" | mail -s "$SMARTD_FAILTYPE" "$SMARTD_ADDRESS"
+  echo "$SMARTD_FULLMESSAGE" | mail -s "$SMARTD_SUBJECT" "$SMARTD_ADDRESS"
 fi
 
 # Notify desktop user

SOURCES/smartmontools-7.2-capnotify.patch

@@ -0,0 +1,32 @@
+diff -up smartmontools-7.2/smartd.cpp.capnotify smartmontools-7.2/smartd.cpp
+--- smartmontools-7.2/smartd.cpp.capnotify	2020-11-23 19:25:16.000000000 +0100
++++ smartmontools-7.2/smartd.cpp	2021-06-16 12:06:03.985526022 +0200
+@@ -1020,6 +1020,8 @@ static void capabilities_drop_now()
+   capng_clear(CAPNG_SELECT_BOTH);
+   capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_EFFECTIVE|CAPNG_PERMITTED),
+     CAP_SYS_ADMIN, CAP_MKNOD, CAP_SYS_RAWIO, -1);
++  capng_updatev(CAPNG_ADD, (capng_type_t)(CAPNG_BOUNDING_SET),
++    CAP_SETGID, CAP_SETUID, CAP_CHOWN, CAP_FOWNER, CAP_DAC_OVERRIDE, -1);
+   capng_apply(CAPNG_SELECT_BOTH);
+ }
+ 
+@@ -1030,9 +1032,8 @@ static void capabilities_check_config(de
+   for (unsigned i = 0; i < configs.size(); i++) {
+     dev_config & cfg = configs[i];
+     if (!cfg.emailaddress.empty() || !cfg.emailcmdline.empty()) {
+-      PrintOut(LOG_INFO, "Device: %s, --capabilites is set, mail will be suppressed.\n",
++      PrintOut(LOG_INFO, "Device: %s, --capabilites is set, mail notification may not work.\n",
+                cfg.name.c_str());
+-      cfg.emailaddress.clear(); cfg.emailcmdline.clear();
+     }
+   }
+ }
+@@ -1633,7 +1634,7 @@ static void Usage()
+ #ifdef HAVE_LIBCAP_NG
+   PrintOut(LOG_INFO,"  -C, --capabilities\n");
+   PrintOut(LOG_INFO,"        Drop unneeded Linux process capabilities.\n"
+-                    "        Warning: Mail notification does not work when used.\n\n");
++                    "        Warning: Mail notification may not work when used.\n\n");
+ #endif
+   PrintOut(LOG_INFO,"  -d, --debug\n");
+   PrintOut(LOG_INFO,"        Start smartd in debug mode\n\n");

SOURCES/smartmontools-7.2-permsfix.patch

@@ -0,0 +1,38 @@
+diff -up smartmontools-7.2/os_linux.cpp.permsfix smartmontools-7.2/os_linux.cpp
+--- smartmontools-7.2/os_linux.cpp.permsfix	2021-11-02 22:08:51.956425716 +0100
++++ smartmontools-7.2/os_linux.cpp	2021-11-02 22:09:55.928583584 +0100
+@@ -1022,7 +1022,7 @@ bool linux_aacraid_device::open()
+       return set_err(ENOENT, "aac entry not found in /proc/devices");
+ 
+     //Create misc device file in /dev/ used for communication with driver
+-    if(mknod(dev_name,S_IFCHR,makedev(mjr,aHost)))
++    if(mknod(dev_name,S_IFCHR|0600,makedev(mjr,aHost)))
+       return set_err(errno,"cannot create %s:%s",dev_name,strerror(errno));
+ 
+     afd = ::open(dev_name,O_RDWR);
+@@ -1298,14 +1298,14 @@ bool linux_megaraid_device::open()
+     while (fgets(line, sizeof(line), fp) != NULL) {
+       int n1 = 0;
+       if (sscanf(line, "%d megaraid_sas_ioctl%n", &mjr, &n1) == 1 && n1 == 22) {
+-        n1=mknod("/dev/megaraid_sas_ioctl_node", S_IFCHR, makedev(mjr, 0));
++        n1=mknod("/dev/megaraid_sas_ioctl_node", S_IFCHR|0600, makedev(mjr, 0));
+         if(report > 0)
+           pout("Creating /dev/megaraid_sas_ioctl_node = %d\n", n1 >= 0 ? 0 : errno);
+         if (n1 >= 0 || errno == EEXIST)
+           break;
+       }
+       else if (sscanf(line, "%d megadev%n", &mjr, &n1) == 1 && n1 == 11) {
+-        n1=mknod("/dev/megadev0", S_IFCHR, makedev(mjr, 0));
++        n1=mknod("/dev/megadev0", S_IFCHR|0600, makedev(mjr, 0));
+         if(report > 0)
+           pout("Creating /dev/megadev0 = %d\n", n1 >= 0 ? 0 : errno);
+         if (n1 >= 0 || errno == EEXIST)
+@@ -2970,7 +2970,7 @@ bool linux_smart_interface::get_dev_mega
+     n1=0;
+     if (sscanf(line, "%d megaraid_sas_ioctl%n", &mjr, &n1) == 1 && n1 == 22) {
+       scan_megasas = true;
+-      n1=mknod("/dev/megaraid_sas_ioctl_node", S_IFCHR, makedev(mjr, 0));
++      n1=mknod("/dev/megaraid_sas_ioctl_node", S_IFCHR|0600, makedev(mjr, 0));
+       if(scsi_debugmode > 0)
+         pout("Creating /dev/megaraid_sas_ioctl_node = %d\n", n1 >= 0 ? 0 : errno);
+       if (n1 >= 0 || errno == EEXIST)

SOURCES/smartmontools.sysconf

@@ -1,6 +1,6 @@
 # command line options for smartd
 # Add -s /var/lib/smartmontools to enable state persistence
-smartd_opts="-q never"
+smartd_opts="-q never --capabilities"
 
 # autogenerated config file options
 # smartd_conf_opts="-H -m root"

SPECS/smartmontools.spec

@@ -1,9 +1,8 @@
 Summary:	Tools for monitoring SMART capable hard disks
 Name:		smartmontools
-Version:	7.1
-Release:	1%{?dist}
+Version:	7.2
+Release:	6%{?dist}
 Epoch:		1
-Group:		System Environment/Base
 License:	GPLv2+
 URL:		http://smartmontools.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -15,16 +14,14 @@ Source5:	drivedb.h
 
 #fedora/rhel specific
 Patch1:		smartmontools-5.38-defaultconf.patch
+Patch2:	smartmontools-7.2-capnotify.patch
+Patch3:	smartmontools-7.2-permsfix.patch
 
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-#new rpm does not handle this (yet?)
-#Requires(triggerun):	systemd-units
-Requires(post):		systemd-units
-Requires(preun):	systemd-units
-Requires(postun):	systemd-units
-BuildRequires:	readline-devel ncurses-devel automake util-linux groff gettext
+BuildRequires: make
+BuildRequires:	gcc-c++ readline-devel ncurses-devel automake util-linux groff gettext
 BuildRequires:	libselinux-devel libcap-ng-devel
-BuildRequires:	systemd-units systemd-devel
+BuildRequires:	systemd systemd-devel
+%{?systemd_requires}
 
 %description
 The smartmontools package contains two utility programs (smartctl
@@ -37,24 +34,23 @@ failure.
 %prep
 %setup -q 
 %patch1 -p1 -b .defaultconf
-
-# update SOURCE5 on maintainer's machine prior commiting, there's no internet connection on builders
-curl %{UrlSource5} -o %{SOURCE5} ||:
+%patch2 -p1 -b .capnotify
+%patch3 -p1 -b .permsfix
 cp %{SOURCE5} .
 
 %build
 autoreconf -i
 %configure --with-selinux --with-libcap-ng=yes --with-libsystemd --with-systemdsystemunitdir=%{_unitdir} --sysconfdir=%{_sysconfdir}/%{name}/ --with-systemdenvfile=%{_sysconfdir}/sysconfig/%{name}
 
-%ifarch sparc64
-make CXXFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="-pie -Wl,-z,relro,-z,now"
-%else
-make CXXFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro,-z,now"
-%endif
+# update SOURCE5 on maintainer's machine prior commiting, there's no internet connection on builders
+%make_build update-smart-drivedb
+./update-smart-drivedb -s - -u sf drivedb.h ||:
+cp drivedb.h ../drivedb.h ||:
+
+%make_build CXXFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie -Wl,-z,relro,-z,now"
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 
 rm -f examplescripts/Makefile*
 chmod a-x -R examplescripts/*
@@ -62,26 +58,12 @@ install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmon
 install -D -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/smartdnotify
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/smartd_warning.d
 rm -rf $RPM_BUILD_ROOT/etc/{rc.d,init.d}
-rm -rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT/%{_sharedstatedir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
 
 %preun
 %systemd_preun smartd.service
 
-%pre
-if [ $1 = 2 ] # only during update
-then
-  # for Fedora 19-22
-  if [ -f %{_sysconfdir}/smartd.conf -a ! -e %{_sysconfdir}/%name ]
-  then
-    mkdir -p %{_sysconfdir}/%{name}
-    cp -p %{_sysconfdir}/smartd.conf %{_sysconfdir}/%{name}
-  fi
-fi
-
 %post
 %systemd_post smartd.service
 
@@ -89,9 +71,9 @@ fi
 %systemd_postun_with_restart smartd.service
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README
+%doc AUTHORS ChangeLog INSTALL NEWS README
 %doc TODO examplescripts smartd.conf
+%license COPYING
 %dir %{_sysconfdir}/%name
 %dir %{_sysconfdir}/%name/smartd_warning.d
 %config(noreplace) %{_sysconfdir}/%{name}/smartd.conf
@@ -108,8 +90,66 @@ fi
 %{_sharedstatedir}/%{name}
 
 %changelog
-* Wed Apr 22 2020 Michal Hlavinka <mhlavink@redhat.com> - 1:7.1-1
-- smartmontools updated to 7.1 (#1671154)
+* Wed Nov 03 2021 Michal Hlavinka <mhlavink@redhat.com> - 1:7.2-6
+- make notification work with capabilities (#1962593)
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:7.2-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:7.2-4
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jan 25 2021 Michal Hlavinka <mhlavink@redhat.com> - 1:7.2-2
+- make sure correct version of drivedb.h is used (#1918946)
+
+* Mon Jan 18 2021 Michal Hlavinka <mhlavink@redhat.com> - 1:7.2-1
+- smartmontools updated to 7.2
+
+* Mon Jan 18 2021 Michal Hlavinka <mhlavink@redhat.com> - 1:7.1-10
+- use capabilites by default
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 06 2020 Michal Hlavinka <mhlavink@redhat.com> - 1:7.1-7
+- smartmontools updated to 7.1
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Apr 12 2019 Daniel Axelrod <daxelrod@datto.com> - 1:7.0-6
+- Remove unused patches
+- Drop pre script for migrating from unsupported Fedora versions
+- Replace sed with configure switch
+
+* Wed Apr 03 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:7.0-5
+- revert smartd_warning related changes
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 03 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:7.0-3
+- update default config
+
+* Thu Jan 03 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:7.0-2
+- use smartd_warning plugin to notify users (bug #1647534)
+- spec cleanup
+
+* Thu Jan 03 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:7.0-1
+- smartmontools updated to 7.0
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Mar 07 2018 Michal Hlavinka <mhlavink@redhat.com> - 1:6.6-4
+- add gcc-c++ buildrequire
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild