Hello community, here is the log from the commit of package smartmontools for openSUSE:Factory checked in at 2019-08-08 14:21:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smartmontools (Old) and /work/SRC/openSUSE:Factory/.smartmontools.new.9556 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smartmontools" Thu Aug 8 14:21:39 2019 rev:79 rq:721334 version:7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/smartmontools/smartmontools.changes 2018-10-11 11:39:06.271271622 +0200 +++ /work/SRC/openSUSE:Factory/.smartmontools.new.9556/smartmontools.changes 2019-08-08 14:21:43.984364392 +0200 @@ -1,0 +2,45 @@ +Tue Aug 6 18:50:22 CEST 2019 - [email protected] + +- Fix license of nvme_ioctl.h + (https://www.smartmontools.org/ticket/1226, + smartmontools-nvme_ioctl_h-license.patch). + +------------------------------------------------------------------- +Tue Jun 4 09:42:28 UTC 2019 - [email protected] + +- Update to 7.0 version + - smartctl + * New options '-j' and '--json[=giosu]' to enable experimental + JSON output mode. Also supports an alternative flat format + suitable for grep ('--json=g'). + * '-l devstat': Fix for logs with 256 sectors. + * '-l error': Prints SCSI Pending Defects log page if supported. + * '-H': Prints SCSI Format Status log page if supported. + * '-x': Now includes '-l defects'. + * New option '-d scsi+TYPE' to disable SAT auto detection for + 'aacraid' and 'cciss'. + - NVMe/USB: Device type '-d sntjmicron' for NVMe drives behind + JMicron USB to NVMe bridges. + - NVMe: SMART/Health Information and Error Information are always + read with broadcast NSID. + - SCSI: Various improvements for the decoding of log pages. + - SCSI: Improved handling of READ CAPACITY command. + - SCSI: Support for SAS host managed drives. + - update-smart-drivedb: New option '-u github'. + - update-smart-drivedb: New signing key. + - HDD, SSD and USB additions to drive database. + - Always use '-d sat' for USB vendor IDs with known SAT support. + - Linux + * Device scan with '-d by-id' scans '/dev/disk/by-id/*' symlinks. + * Dropped device scan support for devfs. + * Fixed device scan with multiple '-d TYPE' options. + * Fixed device scan crash on missing '/proc/devices'. + * USB ID detection also for '/dev/sgN'. + * smartd: Could now run as systemd service with 'Type=notify' set. +- Drop upstreamed patches: + * smartmontools-scsiata-scsi_only.patch + * smartmontools-systemd-no-syslog.patch +- Update smartmontools-drivedb.h to the latest version from the + upstream branch RELEASE_7_0_DRIVEDB. + +------------------------------------------------------------------- @@ -61,4 +105,0 @@ - - configure: New options '--with-gnupg', '--with-scriptpath' and - '--with-update-smart-drivedb=X.Y' - - configure: Checks for C++11 support option and requires - '--with[out]-cxx11-option' if option unknown or no C++11 support. @@ -72,20 +112,0 @@ - - Darwin: Initial NVMe support based on undocumented API. - - FreeBSD: - * Fix panic on INVARIANTS enabled kernel. - * Improve ATA SMART STATUS check for legacy controllers. - * Compile fix for FreeBSD-11 and newer. - - NetBSD: - * NVMe support. - * Full 28-bit ATA support. - * Compile fix. - * Use a raw disk device file. - - OpenBSD: Compile fix. - - OS/2: Support for the OS2AHCI driver, updating source code, - adding autoscan support, adding self-test support. - - Windows fixes: - * Support for Windows 10 NVMe driver (stornvme.sys). - * Fix CSMI access for IRST driver 15.2. - * smartd: Ability to run PowerShell scripts with '-M exec'. - * smartd: New PowerShell script to send smartd warning emails - without external tools. - * package now provides PDF man pages. @@ -130 +151 @@ - * default device scanning result. + default device scanning result. @@ -144,5 +164,0 @@ - * configure option '--without-update-smart-drivedb' to disable - update-smart-drivedb script. - * configure options '--disable-drivedb', '--enable-savestates', - '--enable-attributelog' and '--with-docdir' are no longer supported. - * autoconf < 2.60 and automake < 1.10 are no longer supported. @@ -152,12 +167,0 @@ - * Darwin: New support files for package installer. - * New makefile target 'install-darwin' builds DMG image. - * Solaris: Auto detection of SATA devices behind SAT layer. - * Solaris SPARC: Legacy ATA support disabled by default. - New configure option '--with-solaris-sparc-ata' enables it. - File os_solaris_ata.s is no longer included in source tarball. - * Windows: Auto detection of USB devices specified by drive letter. - * Windows: Device scanning does no longer ignore unknown USB devices. - * Windows: Prevent drive spin up by '-n standby' check. - * Windows: New application manifests indicating Win 10 support. - * Windows smartd: '-m [sys]msgbox' is no longer supported. - * Windows installer: Defaults to 64-bit version on 64-bit Windows. @@ -173,3 +177,3 @@ - pub rsa2048/0xDF0F1A49C4A4903A 2014-12-31 [verfällt: 2016-12-31] - Schl.-Fingerabdruck = F41F 01FC 0784 4958 4FFC CF57 DF0F 1A49 C4A4 903A - uid [ unbekannt] Smartmontools Signing Key (through 2016) <[email protected]> + pub rsa2048/0xDF0F1A49C4A4903A 2014-12-31 [expires: 2016-12-31] + Key fingerprint = F41F 01FC 0784 4958 4FFC CF57 DF0F 1A49 C4A4 903A + uid [ unkown] Smartmontools Signing Key (through 2016) <[email protected]> @@ -182 +186 @@ - * Device type ' *d usbprolific' for Prolific PL2571/277x USB bridges. + * Device type '-d usbprolific' for Prolific PL2571/277x USB bridges. @@ -184,4 +188,4 @@ - * smartctl ' *i' and ' * *identify': ATA ACS *4 and SATA 3.2 enhancements. - * smartctl ' *l xerror': Support for logs with more than 255 pages. - * smartctl ' *l devstat': Prints ACS *3 DSN flags. - * smartctl ' *l devstat': Read via SMART command if GP log is not + * smartctl '-i' and '--identify': ATA ACS-4 and SATA 3.2 enhancements. + * smartctl '-l xerror': Support for logs with more than 255 pages. + * smartctl '-l devstat': Prints ACS-3 DSN flags. + * smartctl '-l devstat': Read via SMART command if GP log is not @@ -189 +193 @@ - * smartctl ' *l scttempsts': Prints SCT SMART STATUS (ACS *4) and + * smartctl '-l scttempsts': Prints SCT SMART STATUS (ACS-4) and @@ -191,7 +194,0 @@ - * configure option ' * *with *systemdenvfile=auto' as new default. - * configure options ' * *disable *drivedb', ' * *enable *savestates' - and ' * *enable *attributelog' are deprecated. - * Corresponding ' * *with **' options are enhanced accordingly. - * Configure option ' * *with *docdir' is deprecated. - * autoconf < 2.60 and automake < 1.10 are deprecated. - (all of the above still work but a warning is printed if used) @@ -201,5 +197,0 @@ - * Darwin: ' *S' command implemented, ' *l devstat' should work now. - * Cygwin: Compile fix. - * Windows: Device type ' *d aacraid' for AACRAID controllers. - * Windows: SAT autodetection based on IOCTL_STORAGE_QUERY_PROPERTY. - * Windows installer: Fix possible loss of user PATH environment variable. Old: ---- smartmontools-6.6.tar.gz smartmontools-6.6.tar.gz.asc smartmontools-scsiata-scsi_only.patch smartmontools-systemd-no-syslog.patch New: ---- smartmontools-7.0.tar.gz smartmontools-7.0.tar.gz.asc smartmontools-nvme_ioctl_h-license.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smartmontools.spec ++++++ --- /var/tmp/diff_new_pack.VUQdlx/_old 2019-08-08 14:21:44.588364300 +0200 +++ /var/tmp/diff_new_pack.VUQdlx/_new 2019-08-08 14:21:44.588364300 +0200 @@ -1,7 +1,7 @@ # # spec file for package smartmontools # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %endif Name: smartmontools -Version: 6.6 +Version: 7.0 Release: 0 Source: https://sourceforge.net/projects/smartmontools/files/smartmontools/%{version}/%{name}-%{version}.tar.gz Source1: https://sourceforge.net/projects/smartmontools/files/smartmontools/%{version}/%{name}-%{version}.tar.gz.asc @@ -43,10 +43,8 @@ Patch10: smartmontools-var-lock-subsys.patch # PATCH-FEATURE-OPENSUSE smartd-service-novm.patch [email protected] -- Do not start smartd in virtual environment. Patch11: smartd-service-novm.patch -# PATCH-FIX-OPENSUSE smartmontools-systemd-no-syslog.patch bsc983938 [email protected] -- syslog.target does not exist any more. -Patch12: smartmontools-systemd-no-syslog.patch -# PATCH-FIX-UPSTREAM smartmontools-scsiata-scsi_only.patch bsc1038271 smartmontools871 [email protected] -- Make possible to disable broken SAT support by -d scsi+cciss,N. -Patch16: smartmontools-scsiata-scsi_only.patch +# PATCH-FIX-LEGAL smartmontools-nvme_ioctl_h-license.patch https://www.smartmontools.org/ticket/1226 [email protected] -- Fix license of nvme_ioctl.h. +Patch12: smartmontools-nvme_ioctl_h-license.patch Requires(pre): %fillup_prereq # Needed by generate_smartd_opt: Requires(pre): coreutils @@ -55,6 +53,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libcap-ng-devel BuildRequires: libselinux-devel +BuildRequires: systemd-devel BuildRequires: pkgconfig(systemd) %{?systemd_requires} Summary: Monitor for SMART devices @@ -82,8 +81,7 @@ %patch4 %patch10 -p1 %patch11 -%patch12 -p1 -%patch16 -p0 +%patch12 # # PATCH-FEATURE-OPENSUSE (sed on smartd.service.in) [email protected] -- Use generated smartd_opts (from SUSE sysconfig file). Systemd smartd.service cannot be smart enough to parse SUSE sysconfig file and generate smartd_opts on fly. And we do not want to launch shell just for it in every boot. sed "s:/usr/local/etc/sysconfig/smartmontools:%{_localstatedir}/lib/smartmontools/smartd_opts:" <smartd.service.in >smartd.service.in.new @@ -114,6 +112,7 @@ %configure\ --docdir=%{_defaultdocdir}/%{name}\ --with-selinux\ + --with-libsystemd\ --with-systemdsystemunitdir=%{_unitdir}\ --with-drivedb\ --with-savestates \ ++++++ smartd-service-novm.patch ++++++ --- /var/tmp/diff_new_pack.VUQdlx/_old 2019-08-08 14:21:44.604364297 +0200 +++ /var/tmp/diff_new_pack.VUQdlx/_new 2019-08-08 14:21:44.604364297 +0200 @@ -1,12 +1,10 @@ -Index: smartd.service.in -================================================================================ --- smartd.service.in +++ smartd.service.in -@@ -2,6 +2,7 @@ +@@ -1,6 +1,7 @@ + [Unit] Description=Self Monitoring and Reporting Technology (SMART) Daemon Documentation=man:smartd(8) man:smartd.conf(5) - After=syslog.target +ConditionVirtualization=false [Service] - EnvironmentFile=-/usr/local/etc/sysconfig/smartmontools + Type=notify ++++++ smartmontools-6.6.tar.gz -> smartmontools-7.0.tar.gz ++++++ ++++ 40637 lines of diff (skipped) ++++++ smartmontools-drivedb.h ++++++ ++++ 1806 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/smartmontools/smartmontools-drivedb.h ++++ and /work/SRC/openSUSE:Factory/.smartmontools.new.9556/smartmontools-drivedb.h ++++++ smartmontools-drivedb_h-update.sh ++++++ --- /var/tmp/diff_new_pack.VUQdlx/_old 2019-08-08 14:21:44.856364259 +0200 +++ /var/tmp/diff_new_pack.VUQdlx/_new 2019-08-08 14:21:44.868364257 +0200 @@ -20,13 +20,13 @@ tar -zxf ../smartmontools-$VERSION.tar.gz smartmontools-$VERSION/update-smart-drivedb.in smartmontools-$VERSION/configure smartmontools-$VERSION/drivedb.h # There can be script update. # TODO: This patch can be generated automatically. -if test -f ./smartmontools-update-smart-drivedb.patch ; then +if test -f ../smartmontools-update-smart-drivedb.patch ; then patch -p0 <../smartmontools-update-smart-drivedb.patch fi # Extract expression that derives DRIVEDB_BRANCH from the version string # (from configure, to not include autoconf square brackets): -eval "$(sed -n '/^DRIVEDB_BRANCH=/,/`/p' <smartmontools-$VERSION/configure)" +eval "$(sed -n -e '/^[^ ]*drivedb_version=/p; /^DRIVEDB_BRANCH=/,/`/p' <smartmontools-$VERSION/configure)" if test -z "$DRIVEDB_BRANCH"; then echo "Unable to derive DRIVEDB_BRANCH from VERSION=$VERSION." cd - >/dev/null @@ -45,18 +45,19 @@ s:@PACKAGE@:smartmontools:g s:@VERSION@:$VERSION:g s:@DRIVEDB_BRANCH@:$DRIVEDB_BRANCH:g - s:^DEST=.*$:DEST=smartmontools-drivedb.h: + s:@ENABLE_SCRIPTPATH_TRUE@:#:g + s:@ENABLE_SCRIPTPATH_FALSE@::g + s:@gnupg@:/usr/bin/gpg: + s:^DRIVEDB=.*$:DRIVEDB=smartmontools-drivedb.h: s:@drivedbdir@:.:g s:@os_dltools@:curl wget lynx:g - s:exit 0:rm -f \"\$DEST.lastcheck\" ; exit 0: - # Verification of the downloaded drivedb.h has to be done by the packaged smartctl. Skip it on the host system, and run it as part of %build stage. - /# Check syntax/,/Keep old file if identical/d " <smartmontools-$VERSION/update-smart-drivedb.in >update-smart-drivedb-wd - -source ./update-smart-drivedb-wd +chmod +x update-smart-drivedb-wd +# Verification of the downloaded drivedb.h has to be done by the packaged smartctl. +# Skip it on the host system, and run it as part of %build stage. +./update-smart-drivedb-wd -u trac -s - rm -f "$DEST.lastcheck" rm -f "$DEST.old" -BRANCHNAME=${location#branches/} UPD_TIME=$(date -d "$(sed -n 's/^.*$Id: drivedb.h [0-9][0-9]* \([^ ]* [^ ]*\) .*$/\1/p' <smartmontools-drivedb.h)" +%s) ++++++ smartmontools-nvme_ioctl_h-license.patch ++++++ >From 16323135a0923af1a1ce18d5f474cad3f4f6f941 Mon Sep 17 00:00:00 2001 From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Sun, 4 Aug 2019 14:39:24 +0000 Subject: [PATCH] linux_nvme_ioctl.h: Replace with current version from Linux kernel sources (include/uapi/linux/nvme_ioctl.h fadccd8 2019-02-20). This version adds Linux-syscall-note to its GPL-2.0 (only) license. This should fix the GPL-2.0-or-later licensing problem (#1226). git-svn-id: https://svn.code.sf.net/p/smartmontools/code@4935 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- trunk/smartmontools/ChangeLog | 7 +++++++ trunk/smartmontools/linux_nvme_ioctl.h | 11 ++--------- 2 files changed, 9 insertions(+), 9 deletions(-) Index: ChangeLog =================================================================== --- ChangeLog.orig +++ ChangeLog @@ -1,5 +1,12 @@ $Id: ChangeLog 4883 2018-12-30 14:48:54Z chrfranke $ +2019-08-04 Christian Franke <[email protected]> + + linux_nvme_ioctl.h: Replace with current version from Linux kernel + sources (include/uapi/linux/nvme_ioctl.h fadccd8 2019-02-20). + This version adds Linux-syscall-note to its GPL-2.0 (only) license. + This should fix the GPL-2.0-or-later licensing problem (#1226). + 2018-12-30 Christian Franke <[email protected]> smartmontools 7.0 Index: linux_nvme_ioctl.h =================================================================== --- linux_nvme_ioctl.h.orig +++ linux_nvme_ioctl.h @@ -1,15 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * Definitions for the NVM Express ioctl interface * Copyright (c) 2011-2014, Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. */ #ifndef _UAPI_LINUX_NVME_IOCTL_H @@ -61,5 +53,6 @@ struct nvme_passthru_cmd { #define NVME_IOCTL_IO_CMD _IOWR('N', 0x43, struct nvme_passthru_cmd) #define NVME_IOCTL_RESET _IO('N', 0x44) #define NVME_IOCTL_SUBSYS_RESET _IO('N', 0x45) +#define NVME_IOCTL_RESCAN _IO('N', 0x46) #endif /* _UAPI_LINUX_NVME_IOCTL_H */ ++++++ smartmontools-var-lock-subsys.patch ++++++ --- /var/tmp/diff_new_pack.VUQdlx/_old 2019-08-08 14:21:44.888364254 +0200 +++ /var/tmp/diff_new_pack.VUQdlx/_new 2019-08-08 14:21:44.892364253 +0200 @@ -2,7 +2,7 @@ =================================================================== --- smartmontools-5.42.orig/smartd.initd.in +++ smartmontools-5.42/smartd.initd.in -@@ -62,7 +62,7 @@ if [ -f /etc/redhat-release -o -f /etc/y +@@ -50,7 +50,7 @@ if [ -f /etc/redhat-release -o -f /etc/y RETVAL=0 prog=smartd
