From 19fb7b8cca9ec13fe84eb74877f616eb365973db Mon Sep 17 00:00:00 2001 From: chrfranke Date: Sun, 19 Aug 2018 18:45:53 +0000 Subject: [PATCH] Add SPDX-License-Identifier to all files with GPL header (#919). Remove GPL headers. Remove outdated info about smartsuite. git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools@4760 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- ChangeLog | 3 +++ README | 4 +++- aacraid.h | 9 +-------- atacmdnames.cpp | 9 +-------- atacmdnames.h | 10 +--------- atacmds.cpp | 14 +------------- atacmds.h | 14 +------------- ataidentify.cpp | 9 +-------- ataidentify.h | 9 +-------- ataprint.cpp | 14 +------------- ataprint.h | 14 +------------- dev_areca.cpp | 9 +-------- dev_areca.h | 9 +-------- dev_ata_cmd_set.cpp | 9 +-------- dev_ata_cmd_set.h | 9 +-------- dev_intelliprop.cpp | 9 +-------- dev_intelliprop.h | 9 +-------- dev_interface.cpp | 9 +-------- dev_interface.h | 9 +-------- dev_legacy.cpp | 9 +-------- dev_tunnelled.h | 9 +-------- drivedb.h | 9 +-------- examplescripts/README | 12 +----------- json.cpp | 9 +-------- json.h | 9 +-------- knowndrives.cpp | 9 +-------- knowndrives.h | 9 +-------- nvmecmds.cpp | 9 +-------- nvmecmds.h | 22 +--------------------- nvmeprint.cpp | 9 +-------- nvmeprint.h | 9 +-------- os_darwin.cpp | 9 +-------- os_darwin.h | 15 +-------------- os_freebsd.cpp | 9 +-------- os_freebsd.h | 15 +-------------- os_generic.cpp | 9 +-------- os_generic.h | 15 +-------------- os_linux.cpp | 14 +------------- os_linux.h | 16 +--------------- os_netbsd.cpp | 10 +--------- os_netbsd.h | 15 +-------------- os_openbsd.cpp | 10 +--------- os_openbsd.h | 15 +-------------- os_os2.cpp | 9 +-------- os_os2.h | 9 +-------- os_qnxnto.h | 15 +-------------- os_solaris.cpp | 10 +--------- os_solaris.h | 15 +-------------- os_solaris_ata.s | 14 +------------- os_win32.cpp | 9 +-------- os_win32/daemon_win32.cpp | 9 +-------- os_win32/daemon_win32.h | 9 +-------- os_win32/installer.nsi | 8 +------- os_win32/runcmd.c | 9 +-------- os_win32/smartd_mailer.ps1 | 8 +------- os_win32/smartd_warning.cmd | 8 +------- os_win32/syslog.h | 10 +--------- os_win32/syslog_win32.cpp | 9 +-------- os_win32/syslogevt.mc | 10 +--------- os_win32/update-smart-drivedb.nsi | 8 +------- os_win32/wmiquery.cpp | 9 +-------- os_win32/wmiquery.h | 9 +-------- os_win32/wtssendmsg.c | 9 +-------- scsiata.cpp | 10 +--------- scsicmds.cpp | 13 +------------ scsicmds.h | 13 +------------ scsiprint.cpp | 15 +-------------- scsiprint.h | 15 +-------------- smartctl.8.in | 15 ++------------- smartctl.cpp | 14 +------------- smartctl.h | 15 +-------------- smartd.8.in | 15 ++------------- smartd.conf.5.in | 15 ++------------- smartd.cpp | 14 +------------- smartd.cygwin.initd.in | 8 +------- smartd.initd.in | 13 +------------ smartd_warning.sh.in | 8 +------- update-smart-drivedb.8.in | 10 ++-------- update-smart-drivedb.in | 8 +------- utility.cpp | 14 +------------- utility.h | 14 +------------- 81 files changed, 89 insertions(+), 793 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c3ff8f49..8e0f4dd10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ $Id$ 2018-08-19 Christian Franke + Add SPDX-License-Identifier to all files with GPL header (#919). + Remove GPL headers. Remove outdated info about smartsuite. + getopt/*, regex/*: Replace with current version from glibc 2.28 (2018-08-01). Add _GETOPT/REGEX*_STANDALONE configurations. Makefile.am, os_win32/vc14/smart*.vcxproj*: Set *_STANDALONE. diff --git a/README b/README index 10239b7dd..583e1d030 100644 --- a/README +++ b/README @@ -20,7 +20,7 @@ You will find a mailing list for support and other questions at: == COPYING == Copyright (C) 2002-9 Bruce Allen -Copyright (C) 2004-15 Christian Franke +Copyright (C) 2004-18 Christian Franke This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -30,6 +30,8 @@ version. You should have received a copy of the GNU General Public License (for example COPYING). If not, see . +SPDX-License-Identifier: GPL-2.0-or-later + == CREDITS == See AUTHORS file. diff --git a/aacraid.h b/aacraid.h index d62fbca0c..5bc4d63a6 100644 --- a/aacraid.h +++ b/aacraid.h @@ -2,14 +2,7 @@ * Copyright (C) 2014 Raghava Aditya * Copyright (C) 2015 Nidhi Malhotra * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ // Check windows diff --git a/atacmdnames.cpp b/atacmdnames.cpp index d503a150f..073fb22f1 100644 --- a/atacmdnames.cpp +++ b/atacmdnames.cpp @@ -6,14 +6,7 @@ * Copyright (C) 2003-8 Philip Williams * Copyright (C) 2012 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "atacmdnames.h" diff --git a/atacmdnames.h b/atacmdnames.h index 8c2eb0faa..f3f4d4ce1 100644 --- a/atacmdnames.h +++ b/atacmdnames.h @@ -8,15 +8,7 @@ * * Copyright (C) 2003-8 Philip Williams * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef ATACMDNAMES_H_ diff --git a/atacmds.cpp b/atacmds.cpp index b85fb309c..ae677074f 100644 --- a/atacmds.cpp +++ b/atacmds.cpp @@ -8,19 +8,7 @@ * Copyright (C) 1999-2000 Michael Cornwell * Copyright (C) 2000 Andre Hedrick * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/atacmds.h b/atacmds.h index 7b217638f..e71c96465 100644 --- a/atacmds.h +++ b/atacmds.h @@ -7,19 +7,7 @@ * Copyright (C) 2008-17 Christian Franke * Copyright (C) 1999-2000 Michael Cornwell * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef ATACMDS_H_ diff --git a/ataidentify.cpp b/ataidentify.cpp index bd94a89c6..ff7c7a938 100644 --- a/ataidentify.cpp +++ b/ataidentify.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2012-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/ataidentify.h b/ataidentify.h index 6f65f1971..cbdac661f 100644 --- a/ataidentify.h +++ b/ataidentify.h @@ -5,14 +5,7 @@ * * Copyright (C) 2012 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef ATAIDENTIFY_H diff --git a/ataprint.cpp b/ataprint.cpp index d92bb6f2c..cd891cc3b 100644 --- a/ataprint.cpp +++ b/ataprint.cpp @@ -7,19 +7,7 @@ * Copyright (C) 2008-18 Christian Franke * Copyright (C) 1999-2000 Michael Cornwell * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/ataprint.h b/ataprint.h index baf56eeb1..a1a367d9a 100644 --- a/ataprint.h +++ b/ataprint.h @@ -7,19 +7,7 @@ * Copyright (C) 2008-17 Christian Franke * Copyright (C) 1999-2000 Michael Cornwell * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef ATAPRINT_H_ diff --git a/dev_areca.cpp b/dev_areca.cpp index aa5fbdc39..07c401637 100644 --- a/dev_areca.cpp +++ b/dev_areca.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2012 Hank Wu * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/dev_areca.h b/dev_areca.h index 0047b2a89..53f832201 100644 --- a/dev_areca.h +++ b/dev_areca.h @@ -5,14 +5,7 @@ * * Copyright (C) 2012 Hank Wu * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef DEV_ARECA_H diff --git a/dev_ata_cmd_set.cpp b/dev_ata_cmd_set.cpp index f92e4db3d..ce6bfec01 100644 --- a/dev_ata_cmd_set.cpp +++ b/dev_ata_cmd_set.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2008-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/dev_ata_cmd_set.h b/dev_ata_cmd_set.h index e4aa4185c..02641d910 100644 --- a/dev_ata_cmd_set.h +++ b/dev_ata_cmd_set.h @@ -5,14 +5,7 @@ * * Copyright (C) 2008 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef DEV_ATA_CMD_SET_H diff --git a/dev_intelliprop.cpp b/dev_intelliprop.cpp index aaf83315c..02738a7f0 100644 --- a/dev_intelliprop.cpp +++ b/dev_intelliprop.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2016 Casey Biemiller * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/dev_intelliprop.h b/dev_intelliprop.h index db299837d..5ce734d12 100644 --- a/dev_intelliprop.h +++ b/dev_intelliprop.h @@ -5,14 +5,7 @@ * * Copyright (C) 2012 Hank Wu * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef DEV_INTELLIPROP_H diff --git a/dev_interface.cpp b/dev_interface.cpp index 1224ffb5e..2cfe22c16 100644 --- a/dev_interface.cpp +++ b/dev_interface.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2008-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/dev_interface.h b/dev_interface.h index 7bc4b8891..23e2af6ba 100644 --- a/dev_interface.h +++ b/dev_interface.h @@ -5,14 +5,7 @@ * * Copyright (C) 2008-16 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef DEV_INTERFACE_H diff --git a/dev_legacy.cpp b/dev_legacy.cpp index 9dc418c15..21672e22f 100644 --- a/dev_legacy.cpp +++ b/dev_legacy.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2008-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/dev_tunnelled.h b/dev_tunnelled.h index 53e527d20..a89a333c0 100644 --- a/dev_tunnelled.h +++ b/dev_tunnelled.h @@ -5,14 +5,7 @@ * * Copyright (C) 2008 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef DEV_TUNNELLED_H diff --git a/drivedb.h b/drivedb.h index 636e6c09c..59dda1798 100644 --- a/drivedb.h +++ b/drivedb.h @@ -6,14 +6,7 @@ * Copyright (C) 2003-11 Philip Williams, Bruce Allen * Copyright (C) 2008-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/examplescripts/README b/examplescripts/README index 01f8960c5..0dc134da6 100644 --- a/examplescripts/README +++ b/examplescripts/README @@ -5,18 +5,8 @@ # Copyright (C) 2003-08 Bruce Allen # Copyright (C) 2009-18 Christian Franke # -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2, or (at your option) any later -# version. -# -# You should have received a copy of the GNU General Public License (for -# example COPYING). If not, see . +# SPDX-License-Identifier: GPL-2.0-or-later # -# This code was originally developed as a Senior Thesis by Michael Cornwell -# at the Concurrent Systems Laboratory (now part of the Storage Systems -# Research Center), Jack Baskin School of Engineering, University of -# California, Santa Cruz. http://ssrc.soe.ucsc.edu/ This directory contains executable shell scripts, that are intended for use with the diff --git a/json.cpp b/json.cpp index 0f1d9cb42..014380268 100644 --- a/json.cpp +++ b/json.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2017-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/json.h b/json.h index cff82df95..ea4f17082 100644 --- a/json.h +++ b/json.h @@ -5,14 +5,7 @@ * * Copyright (C) 2017-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef JSON_H_CVSID diff --git a/knowndrives.cpp b/knowndrives.cpp index 7eaa7fc13..9cee006ef 100644 --- a/knowndrives.cpp +++ b/knowndrives.cpp @@ -6,14 +6,7 @@ * Copyright (C) 2003-11 Philip Williams, Bruce Allen * Copyright (C) 2008-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/knowndrives.h b/knowndrives.h index ecd30d056..a1c461cef 100644 --- a/knowndrives.h +++ b/knowndrives.h @@ -6,14 +6,7 @@ * Copyright (C) 2003-11 Philip Williams, Bruce Allen * Copyright (C) 2008-15 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef KNOWNDRIVES_H_ diff --git a/nvmecmds.cpp b/nvmecmds.cpp index 6a7b050c8..577422579 100644 --- a/nvmecmds.cpp +++ b/nvmecmds.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2016 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/nvmecmds.h b/nvmecmds.h index a8dd4172d..350df51fd 100644 --- a/nvmecmds.h +++ b/nvmecmds.h @@ -8,14 +8,7 @@ * Original code from : * Copyright (C) 2011-2014 Intel Corporation * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef NVMECMDS_H @@ -33,19 +26,6 @@ namespace smartmontools { //////////////////////////////////////////////////////////////////////////// // BEGIN: From -/* - * Definitions for the NVM Express 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. - */ struct nvme_error_log_page { uint64_t error_count; diff --git a/nvmeprint.cpp b/nvmeprint.cpp index 9b65f479e..65da8103e 100644 --- a/nvmeprint.cpp +++ b/nvmeprint.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2016-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/nvmeprint.h b/nvmeprint.h index d9275bf8a..b08857f4e 100644 --- a/nvmeprint.h +++ b/nvmeprint.h @@ -5,14 +5,7 @@ * * Copyright (C) 2016 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef NVMEPRINT_H diff --git a/os_darwin.cpp b/os_darwin.cpp index 71b690415..c405a94f1 100644 --- a/os_darwin.cpp +++ b/os_darwin.cpp @@ -6,14 +6,7 @@ * Copyright (C) 2004-8 Geoffrey Keating * Copyright (C) 2014 Alex Samorukov * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * along with smartmontools. If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include diff --git a/os_darwin.h b/os_darwin.h index 15d898a7a..e07f38b11 100644 --- a/os_darwin.h +++ b/os_darwin.h @@ -5,20 +5,7 @@ * * Copyright (C) 2004-8 Geoff Keating * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef OS_DARWIN_H_ diff --git a/os_freebsd.cpp b/os_freebsd.cpp index 4582971e8..f05c2ba12 100644 --- a/os_freebsd.cpp +++ b/os_freebsd.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2003-10 Eduard Martinescu * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include diff --git a/os_freebsd.h b/os_freebsd.h index 16fabff1f..aa727dd28 100644 --- a/os_freebsd.h +++ b/os_freebsd.h @@ -5,20 +5,7 @@ * * Copyright (C) 2003-8 Eduard Martinescu * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ /*- diff --git a/os_generic.cpp b/os_generic.cpp index 805e3898d..e63da634e 100644 --- a/os_generic.cpp +++ b/os_generic.cpp @@ -7,14 +7,7 @@ * Copyright (C) 2003-8 Bruce Allen * Copyright (C) 2008-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/os_generic.h b/os_generic.h index faaf835a0..71929ea21 100644 --- a/os_generic.h +++ b/os_generic.h @@ -6,20 +6,7 @@ * Copyright (C) YEAR YOUR_NAME * Copyright (C) 2003-8 Bruce Allen * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ // In the three following lines, change 'GENERIC' to your OS name diff --git a/os_linux.cpp b/os_linux.cpp index 219351efb..042651f77 100644 --- a/os_linux.cpp +++ b/os_linux.cpp @@ -34,19 +34,7 @@ * Copyright (C) 1999-2000 Michael Cornwell * Copyright (C) 2000 Andre Hedrick * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ // This file contains the linux-specific IOCTL parts of diff --git a/os_linux.h b/os_linux.h index edc695303..fe7f7ae73 100644 --- a/os_linux.h +++ b/os_linux.h @@ -17,21 +17,7 @@ * Kernel compatablity By: Andre Hedrick * Non-Copyright (C) 2000 Andre Hedrick * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/os_netbsd.cpp b/os_netbsd.cpp index 65ff23cb9..addc7155e 100644 --- a/os_netbsd.cpp +++ b/os_netbsd.cpp @@ -6,15 +6,7 @@ * Copyright (C) 2003-8 Sergey Svishchev * Copyright (C) 2016 Kimihiro Nonaka * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/os_netbsd.h b/os_netbsd.h index 232100da5..01324b931 100644 --- a/os_netbsd.h +++ b/os_netbsd.h @@ -5,20 +5,7 @@ * * Copyright (C) 2003-8 Sergey Svishchev * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef OS_NETBSD_H_ diff --git a/os_openbsd.cpp b/os_openbsd.cpp index 97ee2a410..1c816ef27 100644 --- a/os_openbsd.cpp +++ b/os_openbsd.cpp @@ -7,15 +7,7 @@ * * Derived from os_netbsd.cpp by Sergey Svishchev, Copyright (C) 2003-8 * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/os_openbsd.h b/os_openbsd.h index 099eea319..b7bcf107e 100644 --- a/os_openbsd.h +++ b/os_openbsd.h @@ -7,20 +7,7 @@ * * Derived from os_netbsd.c by Sergey Svishchev, Copyright (C) 2003-8 * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef OS_OPENBSD_H_ diff --git a/os_os2.cpp b/os_os2.cpp index 858926563..6a403b8e0 100644 --- a/os_os2.cpp +++ b/os_os2.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2004-8 Yuri Dario * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: GPL-2.0-or-later */ /* diff --git a/os_os2.h b/os_os2.h index 8d009ba42..6ef7f7a67 100644 --- a/os_os2.h +++ b/os_os2.h @@ -5,14 +5,7 @@ * * Copyright (C) 2004-8 Yuri Dario * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef OS_OS2_H_ diff --git a/os_qnxnto.h b/os_qnxnto.h index f499fef53..f916816f8 100644 --- a/os_qnxnto.h +++ b/os_qnxnto.h @@ -6,20 +6,7 @@ * Copyright (C) Joerg Hering * Copyright (C) 2003-8 Bruce Allen * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef OS_QNXNTO_H_ #define OS_QNXNTO_H_ diff --git a/os_solaris.cpp b/os_solaris.cpp index c85d0f025..30ae8f679 100644 --- a/os_solaris.cpp +++ b/os_solaris.cpp @@ -6,15 +6,7 @@ * Copyright (C) 2003-08 SAWADA Keiji * Copyright (C) 2003-15 Casper Dik * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include diff --git a/os_solaris.h b/os_solaris.h index 9f8e9ee19..4afc179ca 100644 --- a/os_solaris.h +++ b/os_solaris.h @@ -6,20 +6,7 @@ * Copyright (C) 2003-8 SAWADA Keiji * Copyright (C) 2003-8 Casper Dik * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef OS_SOLARIS_H_ diff --git a/os_solaris_ata.s b/os_solaris_ata.s index b384473cc..f5d3f0fb9 100644 --- a/os_solaris_ata.s +++ b/os_solaris_ata.s @@ -5,19 +5,7 @@ ! ! Copyright (C) 2003-8 SAWADA Keiji ! -! This program is free software; you can redistribute it and/or modify -! it under the terms of the GNU General Public License as published by -! the Free Software Foundation; either version 2 of the License, or -! (at your option) any later version. -! -! This program is distributed in the hope that 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. -! -! You should have received a copy of the GNU General Public License -! along with this program; if not, write to the Free Software Foundation, -! Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +! SPDX-License-Identifier: GPL-2.0-or-later ! ! ! -------------------------------------------------------- diff --git a/os_win32.cpp b/os_win32.cpp index 64fb831a0..449cecb1f 100644 --- a/os_win32.cpp +++ b/os_win32.cpp @@ -11,14 +11,7 @@ * Original Areca code: * Copyright (C) 2012 Hank Wu * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/os_win32/daemon_win32.cpp b/os_win32/daemon_win32.cpp index 4da41d97e..94cc5b05c 100644 --- a/os_win32/daemon_win32.cpp +++ b/os_win32/daemon_win32.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2004-14 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #define WINVER 0x0600 diff --git a/os_win32/daemon_win32.h b/os_win32/daemon_win32.h index 24e8e79e7..7cbc42ccc 100644 --- a/os_win32/daemon_win32.h +++ b/os_win32/daemon_win32.h @@ -5,14 +5,7 @@ * * Copyright (C) 2004-12 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef DAEMON_WIN32_H diff --git a/os_win32/installer.nsi b/os_win32/installer.nsi index 532e57089..bffc51e3e 100644 --- a/os_win32/installer.nsi +++ b/os_win32/installer.nsi @@ -5,13 +5,7 @@ ; ; Copyright (C) 2006-17 Christian Franke ; -; This program is free software; you can redistribute it and/or modify -; it under the terms of the GNU General Public License as published by -; the Free Software Foundation; either version 2, or (at your option) -; any later version. -; -; You should have received a copy of the GNU General Public License -; (for example COPYING); If not, see . +; SPDX-License-Identifier: GPL-2.0-or-later ; ; $Id$ ; diff --git a/os_win32/runcmd.c b/os_win32/runcmd.c index d3e420595..8c68f0246 100644 --- a/os_win32/runcmd.c +++ b/os_win32/runcmd.c @@ -5,14 +5,7 @@ * * Copyright (C) 2011 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ char svnid[] = "$Id$"; diff --git a/os_win32/smartd_mailer.ps1 b/os_win32/smartd_mailer.ps1 index 1ef126298..c08d99668 100644 --- a/os_win32/smartd_mailer.ps1 +++ b/os_win32/smartd_mailer.ps1 @@ -5,13 +5,7 @@ # # Copyright (C) 2016 Christian Franke # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# You should have received a copy of the GNU General Public License -# (for example COPYING); If not, see . +# SPDX-License-Identifier: GPL-2.0-or-later # # $Id$ # diff --git a/os_win32/smartd_warning.cmd b/os_win32/smartd_warning.cmd index b1bb4a1ee..91d2694a5 100644 --- a/os_win32/smartd_warning.cmd +++ b/os_win32/smartd_warning.cmd @@ -6,13 +6,7 @@ :: :: Copyright (C) 2012-17 Christian Franke :: -:: This program is free software; you can redistribute it and/or modify -:: it under the terms of the GNU General Public License as published by -:: the Free Software Foundation; either version 2, or (at your option) -:: any later version. -:: -:: You should have received a copy of the GNU General Public License -:: (for example COPYING); If not, see . +:: SPDX-License-Identifier: GPL-2.0-or-later :: :: $Id$ :: diff --git a/os_win32/syslog.h b/os_win32/syslog.h index 30cd79daf..425ecb59d 100644 --- a/os_win32/syslog.h +++ b/os_win32/syslog.h @@ -5,15 +5,7 @@ * * Copyright (C) 2004-8 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef SYSLOG_H diff --git a/os_win32/syslog_win32.cpp b/os_win32/syslog_win32.cpp index 38530fb88..f78c91590 100644 --- a/os_win32/syslog_win32.cpp +++ b/os_win32/syslog_win32.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2004-15 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ // Win32 Emulation of syslog() for smartd diff --git a/os_win32/syslogevt.mc b/os_win32/syslogevt.mc index 11fca796f..8448b3e0c 100644 --- a/os_win32/syslogevt.mc +++ b/os_win32/syslogevt.mc @@ -5,15 +5,7 @@ ; * ; * Copyright (C) 2004-10 Christian Franke ; * -; * This program is free software; you can redistribute it and/or modify -; * it under the terms of the GNU General Public License as published by -; * the Free Software Foundation; either version 2, or (at your option) -; * any later version. -; * -; * You should have received a copy of the GNU General Public License -; * (for example COPYING); if not, write to the Free Software Foundation, -; * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -; * +; * SPDX-License-Identifier: GPL-2.0-or-later ; */ ; ;// $Id$ diff --git a/os_win32/update-smart-drivedb.nsi b/os_win32/update-smart-drivedb.nsi index 3ab73d630..b209ee882 100644 --- a/os_win32/update-smart-drivedb.nsi +++ b/os_win32/update-smart-drivedb.nsi @@ -5,13 +5,7 @@ ; ; Copyright (C) 2011-13 Christian Franke ; -; This program is free software; you can redistribute it and/or modify -; it under the terms of the GNU General Public License as published by -; the Free Software Foundation; either version 2, or (at your option) -; any later version. -; -; You should have received a copy of the GNU General Public License -; (for example COPYING); If not, see . +; SPDX-License-Identifier: GPL-2.0-or-later ; ; $Id$ ; diff --git a/os_win32/wmiquery.cpp b/os_win32/wmiquery.cpp index bac6d91fa..6f3fa035c 100644 --- a/os_win32/wmiquery.cpp +++ b/os_win32/wmiquery.cpp @@ -5,14 +5,7 @@ * * Copyright (C) 2011-13 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/os_win32/wmiquery.h b/os_win32/wmiquery.h index 47438ea55..07e5d6cb9 100644 --- a/os_win32/wmiquery.h +++ b/os_win32/wmiquery.h @@ -5,14 +5,7 @@ * * Copyright (C) 2011-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef WMIQUERY_H diff --git a/os_win32/wtssendmsg.c b/os_win32/wtssendmsg.c index 901eb4973..d5f3d66cd 100644 --- a/os_win32/wtssendmsg.c +++ b/os_win32/wtssendmsg.c @@ -5,14 +5,7 @@ * * Copyright (C) 2012 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #define WINVER 0x0500 diff --git a/scsiata.cpp b/scsiata.cpp index f4afda90c..0f84a84d2 100644 --- a/scsiata.cpp +++ b/scsiata.cpp @@ -6,15 +6,7 @@ * Copyright (C) 2006-15 Douglas Gilbert * Copyright (C) 2009-18 Christian Franke * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * + * SPDX-License-Identifier: GPL-2.0-or-later * The code in this file is based on the SCSI to ATA Translation (SAT) * draft found at http://www.t10.org . The original draft used for this * code is sat-r08.pdf which is not too far away from becoming a diff --git a/scsicmds.cpp b/scsicmds.cpp index c0a097d2f..66052a9e2 100644 --- a/scsicmds.cpp +++ b/scsicmds.cpp @@ -7,18 +7,7 @@ * Copyright (C) 1999-2000 Michael Cornwell * Copyright (C) 2003-18 Douglas Gilbert * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ + * SPDX-License-Identifier: GPL-2.0-or-later * * * In the SCSI world "SMART" is a dead or withdrawn standard. In recent diff --git a/scsicmds.h b/scsicmds.h index 104781421..a3fa6f808 100644 --- a/scsicmds.h +++ b/scsicmds.h @@ -7,19 +7,8 @@ * Copyright (C) 2000 Michael Cornwell * Copyright (C) 2003-18 Douglas Gilbert * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. + * SPDX-License-Identifier: GPL-2.0-or-later * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ * * N.B. What was formerly known as "SMART" are now called "informational * exceptions" in recent t10.org drafts (i.e. recent SCSI). diff --git a/scsiprint.cpp b/scsiprint.cpp index 2f3cc8186..cca0dcccc 100644 --- a/scsiprint.cpp +++ b/scsiprint.cpp @@ -7,20 +7,7 @@ * Copyright (C) 2000 Michael Cornwell * Copyright (C) 2003-18 Douglas Gilbert * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/scsiprint.h b/scsiprint.h index a413e234b..9e3e50064 100644 --- a/scsiprint.h +++ b/scsiprint.h @@ -9,20 +9,7 @@ * Additional SCSI work: * Copyright (C) 2003-18 Douglas Gilbert * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ diff --git a/smartctl.8.in b/smartctl.8.in index 4238f8ac5..ea17c2243 100644 --- a/smartctl.8.in +++ b/smartctl.8.in @@ -2,20 +2,9 @@ Copyright (C) 2002-10 Bruce Allen Copyright (C) 2004-18 Christian Franke -$Id$ - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. +SPDX-License-Identifier: GPL-2.0-or-later -You should have received a copy of the GNU General Public License -(for example COPYING); If not, see . - -This code was originally developed as a Senior Thesis by Michael Cornwell -at the Concurrent Systems Laboratory (now part of the Storage Systems -Research Center), Jack Baskin School of Engineering, University of -California, Santa Cruz. http://ssrc.soe.ucsc.edu/ +$Id$ .. .\" Macros borrowed from pages generated with Pod::Man diff --git a/smartctl.cpp b/smartctl.cpp index a4e07fa73..9e5836320 100644 --- a/smartctl.cpp +++ b/smartctl.cpp @@ -7,19 +7,7 @@ * Copyright (C) 2008-18 Christian Franke * Copyright (C) 2000 Michael Cornwell * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/smartctl.h b/smartctl.h index 8307ca6f6..318b26c65 100644 --- a/smartctl.h +++ b/smartctl.h @@ -7,20 +7,7 @@ * Copyright (C) 2008-17 Christian Franke * Copyright (C) 2000 Michael Cornwell * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef SMARTCTL_H_ diff --git a/smartd.8.in b/smartd.8.in index ba60c59fd..14e9a136a 100644 --- a/smartd.8.in +++ b/smartd.8.in @@ -2,20 +2,9 @@ Copyright (C) 2002-10 Bruce Allen Copyright (C) 2004-17 Christian Franke -$Id$ - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. +SPDX-License-Identifier: GPL-2.0-or-later -You should have received a copy of the GNU General Public License -(for example COPYING); If not, see . - -This code was originally developed as a Senior Thesis by Michael Cornwell -at the Concurrent Systems Laboratory (now part of the Storage Systems -Research Center), Jack Baskin School of Engineering, University of -California, Santa Cruz. http://ssrc.soe.ucsc.edu/ +$Id$ .. .\" Macros borrowed from pages generated with Pod::Man diff --git a/smartd.conf.5.in b/smartd.conf.5.in index cfb34865e..76fb7aeb5 100644 --- a/smartd.conf.5.in +++ b/smartd.conf.5.in @@ -2,20 +2,9 @@ Copyright (C) 2002-10 Bruce Allen Copyright (C) 2004-18 Christian Franke -$Id$ - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. +SPDX-License-Identifier: GPL-2.0-or-later -You should have received a copy of the GNU General Public License -(for example COPYING); If not, see . - -This code was originally developed as a Senior Thesis by Michael Cornwell -at the Concurrent Systems Laboratory (now part of the Storage Systems -Research Center), Jack Baskin School of Engineering, University of -California, Santa Cruz. http://ssrc.soe.ucsc.edu/ +$Id$ .. .\" Macros borrowed from pages generated with Pod::Man diff --git a/smartd.cpp b/smartd.cpp index cd190d9b0..75f0b8157 100644 --- a/smartd.cpp +++ b/smartd.cpp @@ -6,19 +6,7 @@ * Copyright (C) 2000 Michael Cornwell * Copyright (C) 2008 Oliver Bock * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" diff --git a/smartd.cygwin.initd.in b/smartd.cygwin.initd.in index 84ef0bd55..18e81ed75 100644 --- a/smartd.cygwin.initd.in +++ b/smartd.cygwin.initd.in @@ -6,13 +6,7 @@ # # Copyright (C) 2004-17 Christian Franke # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# You should have received a copy of the GNU General Public License -# (for example COPYING); If not, see . +# SPDX-License-Identifier: GPL-2.0-or-later # # $Id$ # diff --git a/smartd.initd.in b/smartd.initd.in index eef688b96..d4da241b9 100644 --- a/smartd.initd.in +++ b/smartd.initd.in @@ -2,6 +2,7 @@ # smartmontools init file for smartd # Copyright (C) 2002-8 Bruce Allen +# SPDX-License-Identifier: GPL-2.0-or-later # $Id$ # For RedHat and cousins: @@ -22,18 +23,6 @@ # Description: Start S.M.A.R.T. disk and tape monitor. ### END INIT INFO -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2, or (at your option) any later -# version. -# You should have received a copy of the GNU General Public License (for -# example COPYING); if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# This code was originally developed as a Senior Thesis by Michael Cornwell -# at the Concurrent Systems Laboratory (now part of the Storage Systems -# Research Center), Jack Baskin School of Engineering, University of -# California, Santa Cruz. http://ssrc.soe.ucsc.edu/. - # Uncomment the line below to pass options to smartd on startup. # Note that distribution specific configuration files like # /etc/{default,sysconfig}/smartmontools might override these diff --git a/smartd_warning.sh.in b/smartd_warning.sh.in index 721383682..f4613dd43 100644 --- a/smartd_warning.sh.in +++ b/smartd_warning.sh.in @@ -6,13 +6,7 @@ # # Copyright (C) 2012-16 Christian Franke # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# You should have received a copy of the GNU General Public License -# (for example COPYING); If not, see . +# SPDX-License-Identifier: GPL-2.0-or-later # # $Id$ # diff --git a/update-smart-drivedb.8.in b/update-smart-drivedb.8.in index 94c374dc8..266840c5c 100644 --- a/update-smart-drivedb.8.in +++ b/update-smart-drivedb.8.in @@ -2,15 +2,9 @@ Copyright (C) 2013 Hannes von Haugwitz Copyright (C) 2014-17 Christian Franke -$Id$ - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. +SPDX-License-Identifier: GPL-2.0-or-later -You should have received a copy of the GNU General Public License -(for example COPYING); If not, see . +$Id$ .. .\" Macros borrowed from pages generated with Pod::Man diff --git a/update-smart-drivedb.in b/update-smart-drivedb.in index e4a85029f..3445e94fd 100644 --- a/update-smart-drivedb.in +++ b/update-smart-drivedb.in @@ -6,13 +6,7 @@ # # Copyright (C) 2010-17 Christian Franke # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# You should have received a copy of the GNU General Public License -# (for example COPYING); If not, see . +# SPDX-License-Identifier: GPL-2.0-or-later # # $Id$ # diff --git a/utility.cpp b/utility.cpp index 4ce9cbc3d..c5ac50fd3 100644 --- a/utility.cpp +++ b/utility.cpp @@ -7,19 +7,7 @@ * Copyright (C) 2008-18 Christian Franke * Copyright (C) 2000 Michael Cornwell * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ // THIS FILE IS INTENDED FOR UTILITY ROUTINES THAT ARE APPLICABLE TO diff --git a/utility.h b/utility.h index 7e3f99150..8284bde17 100644 --- a/utility.h +++ b/utility.h @@ -7,19 +7,7 @@ * Copyright (C) 2008-18 Christian Franke * Copyright (C) 2000 Michael Cornwell * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * You should have received a copy of the GNU General Public License - * (for example COPYING); If not, see . - * - * This code was originally developed as a Senior Thesis by Michael Cornwell - * at the Concurrent Systems Laboratory (now part of the Storage Systems - * Research Center), Jack Baskin School of Engineering, University of - * California, Santa Cruz. http://ssrc.soe.ucsc.edu/ - * + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef UTILITY_H_