@@ -1,4 +1,4 @@
-From b621a313e0bc67803abfba18e1ae15e7a8b9b59f Mon Sep 17 00:00:00 2001
+From 898fd4115be5cdd848db99fe85e1d0d7f1b3fa02 Mon Sep 17 00:00:00 2001
From: Oleksiy Obitotskyy <oobitots@cisco.com>
Date: Mon, 22 Feb 2021 17:21:33 +0200
Subject: [PATCH] smartmontools: Improve reproducibility
@@ -8,18 +8,18 @@ https://github.com/smartmontools/smartmontools/commit/24838916b4c0e91f5c897d44fc
Upstream-Status: Backported
Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
+
---
- ChangeLog | 8 ++++++++
- configure.ac | 12 ++++++++++++
- utility.cpp | 10 ++++++++++
- 3 files changed, 30 insertions(+)
+ ChangeLog | 8 ++++++++
+ 1 file changed, 8 insertions(+)
diff --git a/ChangeLog b/ChangeLog
-index 39eac2d..6a3b4ee 100644
+index 5f0930a..4c5a91e 100644
--- a/ChangeLog
+++ b/ChangeLog
-@@ -1,5 +1,13 @@
- $Id: ChangeLog 5155 2020-12-30 16:49:18Z chrfranke $
+@@ -705,6 +705,14 @@ $Id: ChangeLog 5338 2022-02-28 16:34:26Z chrfranke $
+
+ Happy New Year! Update copyright year in version info.
+2021-02-07 Christian Franke <franke@computer.org>
+
@@ -32,53 +32,3 @@ index 39eac2d..6a3b4ee 100644
2020-12-30 Christian Franke <franke@computer.org>
smartmontools 7.2
-diff --git a/configure.ac b/configure.ac
-index ee6f0e5..c37c9bc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,6 +61,18 @@ case "${host}" in
- ;;
- esac
-
-+AC_MSG_CHECKING([whether reproducible build is selected (SOURCE_DATE_EPOCH)])
-+res=no
-+if test -n "$SOURCE_DATE_EPOCH"; then
-+ res=yes
-+ test -z "`echo "$SOURCE_DATE_EPOCH" | sed 's,[[0-9]]*,,'`" || res=error
-+fi
-+AC_MSG_RESULT([$res])
-+case $res in
-+ error) AC_MSG_ERROR([Malformed SOURCE_DATE_EPOCH]) ;;
-+ yes) CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-DSOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH" ;;
-+esac
-+
- # Check for SVN.
- AC_MSG_CHECKING([whether this is a build from SVN])
- is_svn_build=no
-diff --git a/utility.cpp b/utility.cpp
-index 0483c6f..8ab38c9 100644
---- a/utility.cpp
-+++ b/utility.cpp
-@@ -134,9 +134,19 @@ std::string format_version_info(const char * prog_name, bool full /*= false*/)
- #endif
- "\n"
- "smartmontools configure arguments:"
-+#ifdef SOURCE_DATE_EPOCH
-+ " [hidden in reproducible builds]\n"
-+ "reproducible build SOURCE_DATE_EPOCH: "
-+#endif
- ;
-+#ifdef SOURCE_DATE_EPOCH
-+ char ts[32]; struct tm tmbuf;
-+ strftime(ts, sizeof(ts), "%Y-%m-%d %H:%M:%S", time_to_tm_local(&tmbuf, SOURCE_DATE_EPOCH));
-+ info += strprintf("%u (%s)", (unsigned)SOURCE_DATE_EPOCH, ts);
-+#else
- info += (sizeof(SMARTMONTOOLS_CONFIGURE_ARGS) > 1 ?
- SMARTMONTOOLS_CONFIGURE_ARGS : " [no arguments given]");
-+#endif
- info += '\n';
-
- return info;
-2.25.1
-
similarity index 93%
rename from meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb
rename to meta-oe/recipes-extended/smartmontools/smartmontools_7.3.bb
@@ -23,8 +23,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'libcap-ng selinux', d)
PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng"
PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux"
-SRC_URI[md5sum] = "e8d134c69ae4959a05cb56b31172ffb1"
-SRC_URI[sha256sum] = "5cd98a27e6393168bc6aaea070d9e1cd551b0f898c52f66b2ff2e5d274118cd6"
+SRC_URI[sha256sum] = "a544f8808d0c58cfb0e7424ca1841cb858a974922b035d505d4e4c248be3a22b"
inherit autotools update-rc.d systemd
0001-configure.ac-Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch refreshed for new version. Changelog: ========= - smartctl '-j': Many additions to the JSON output for SCSI/SAS devices. - smartctl '-j': JSON output always includes timestamp, regardless of '-i'. - smartctl '-i' and '--identify': ATA ACS-5 enhancements. - smartctl '-l defects': additionally works for SCSI Pending Defects log subpage. - smartctl '-l envrep': Prints SCSI Environmental Reporting log subpage. - smartctl '-l scterc[,R,W],p': Gets/sets the persistent power-on values. - smartctl '-l scterc,reset': Restores to manufacturer's default values. - smartctl '-l tapedevstat': Prints SCSI Tape Device Statistics log page. - smartctl '-l tapealert': Prints SCSI Tape Alert log page. - smartctl '-l zdevstat': Prints SCSI Zoned Block Device Statistics log subpage. - smartctl '-H': No longer checks and clears the SCSI Tape Alert log page unless the option is given twice. - smartctl '-H': No longer sets bit 2 of exit status if ATA attributes are available. - smartctl '-H': Checks new NVME 1.4 status bit. - smartctl '-n POWERMODE': ATA: Optionally exits immediately if unsupported. - smartctl: Support for Zoned block device characteristics and statistics. - smartctl: Various fixes related to SCSI supported log pages and subpages. - smartd: Fixed code execution vulnerability in conjunction with GNU mailutils < 3.13. - smartd '-u USER[:GROUP]': Runs the warning script as a non-privileged user. - smartd '--capabilities': No longer suppresses mail notification. - smartd '--capabilities=mail': Adds capabilities required for exim MTA. - smartd '-q *nodev0*': Three new options to change the exit status to 0 if there are no devices to monitor. - smartd '-s' and '-A': Allows one to disable preconfigured files with '-'. - smartd: Fixed handling of multiple email addresses in conjunction with plugin scripts. Added new environment variable SMARTD_ADDRESS_ORIG. - smartd: No longer writes 'smartd -D' output to syslog on syntax error. - smartd.conf '-c i=N': Allows one to specify device specific check intervals. - SCSI: Retry on UNIT ATTENTION when fetching capacity. - NVMe/USB: Device type '-d sntasmedia' for ASMedia ASM2362 USB to NVMe bridges. - VERSION information in drive database files of all branches. - smartctl and smartd print drive database VERSION information. - HDD, SSD and USB additions to drive database. - update-smart-drivedb: Now checks VERSION information to prevent downgrades. - update-smart-drivedb '--force': Overrides the VERSION check. - update-smart-drivedb '--file' and '--url': Updates from local files or other URLs. - update-smart-drivedb '-q': Suppresses info messages. - update-smart-drivedb: Added long option variants for all short options. - update-smart-drivedb: Prevents dangling gpg-agents and temp directories. - update-smart-drivedb '--install': Installs runtime drivedb.h from location specified by ... - configure '--with-drivedbinstdir: drivedb.h package install location. - configure: SOURCE_DATE_EPOCH prevents inclusion of configure arguments in executables. - configure: Check for '-fstack-protector' now includes the required libs. - Dropped restriction to C++98, a C++11 compiler is now required. - Linux: Device scan range enhanced to '/dev/sdzz'. - Linux: Fixed access to '-d aacraid' and '-d megaraid' devices from smartd if '--capabilities' is used. - Linux: '-d cciss,N' is no longer required for non-RAID hpsa devices. - Darwin: smartctl '-s apm,N' is now supported. - OpenBSD: Fixed too short command timeouts. - OpenBSD: Fixed device name used for autodetection. - OpenBSD: Fixed SAT autodetection of sd* devices. - FreeBSD: Added direct access ('-d megaraid,N') and scanning for LSI RAID on 'mfi' and 'mrsas' controllers. - Windows: smartd '-u restricted': Runs the warning script with a restricted access token. - Windows: New script 'update-smartd-drivedb.ps1' provides gpg verification and replaces 'update-smartd-drivedb.exe'. - Windows: Disabled '-d aacraid' support due to unresolved bugs. Added '-d accraid,...,force' flag to try anyway. Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- ...Define-SOURCE_DATE_EPOCH-in-CPPFLAGS.patch | 66 +++---------------- ...rtmontools_7.2.bb => smartmontools_7.3.bb} | 3 +- 2 files changed, 9 insertions(+), 60 deletions(-) rename meta-oe/recipes-extended/smartmontools/{smartmontools_7.2.bb => smartmontools_7.3.bb} (93%)