Replace license boilerplate with single line SPDX comments.

This gets rid of existing copyright templates in favor of just the
one-liner SPDX (Software Package Data Exchange) notice. All files are
licensed under the GPL-2.0, so the same tag is added to each file. No
copyright is changed by this commit.

Several files (mostly the very short ones) did not contain a license
text so far. By default all files without license information are
under the default license of this package, which is GPL version 2.
This commit adds the missing SPDX line so that now all files except
dss.css, index.html.in, INSTALL, NEWS and README have it.

We also remove author and copyright year, since the author is the same
everywhere, and the year hasn't been updated any more since at least
six years. Accurate information is available from the git log.

The COPYING file can also be removed because the license text at
https://spdx.org/licenses/GPL-2.0.html is immutable.

diff --git a/COPYING b/COPYING
deleted file mode 100644 (file)
index 3912109..0000000
--- a/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-                   GNU GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                           Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-\f
-                   GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-\f
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-\f
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-\f
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                           NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                    END OF TERMS AND CONDITIONS
-\f
-           How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

diff --git a/Makefile b/Makefile
index f5c34af7b590145c99d3a8ced9b2badfd7179048..4a8dcde993ac7262f415e5011506a8e89352811e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0

 PREFIX ?= /usr/local
 INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL)
 PREFIX ?= /usr/local
 INSTALL ?= install
 INSTALL_PROGRAM ?= $(INSTALL)

diff --git a/NEWS b/NEWS
index 0f9b6d27b860cef44cd4b3c68de75154a2c58da7..67e6a2c931c861c1c7c0300ec100b4ea1812610e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,9 @@
  - CFLAGS, CPPFLAGS and LDFLAGS can now be used to override the flags
  of the build system.
 
  - CFLAGS, CPPFLAGS and LDFLAGS can now be used to override the flags
  of the build system.
 

+ - Source code files are now annotated with the SPDX GPL-2.0 license
+ identifier.
+

  - The dss logo is now created with ImageMagick rather than dia.
 
 ------------------
  - The dss logo is now created with ImageMagick rather than dia.
 
 ------------------

diff --git a/daemon.c b/daemon.c
index 0b201a8aa07b617e6eaea506cae4f096dc377e8a..709785b437041654e3cacd2fd4f252aea8fa4173 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 
 /** \file daemon.c Some helpers for programs that detach from the console. */
 
 
 /** \file daemon.c Some helpers for programs that detach from the console. */
 

diff --git a/daemon.h b/daemon.h
index e36e37c196e2b253f938225c2fdb02d3686f3aff..6fab6abc8c3bf8b5a5b3349dca6a572c1d3c816d 100644 (file)
--- a/daemon.h
+++ b/daemon.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */

 
 /** \file daemon.h exported symbols from daemon.c */
 
 
 /** \file daemon.h exported symbols from daemon.c */
 

diff --git a/df.c b/df.c
index 82d14ba9863a5975fd0b9ef46313ec5fd720becf..7fb319e0ba866746d7e223a4114b0f4f986dc17e 100644 (file)
--- a/df.c
+++ b/df.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2008-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 #include <sys/statvfs.h>
 #include <stdio.h>
 #include <assert.h>
 #include <sys/statvfs.h>
 #include <stdio.h>
 #include <assert.h>

diff --git a/df.h b/df.h
index 156dec1584022de1b5a514c50ec7a42fdf753a22..390134d4cf345e73d7088d7c389cad02869490c4 100644 (file)
--- a/df.h
+++ b/df.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */

 struct disk_space {
        unsigned total_mb;
        unsigned free_mb;
 struct disk_space {
        unsigned total_mb;
        unsigned free_mb;

diff --git a/dss.c b/dss.c
index 491b8aa791fdafc29589ec08eae878e9e67039be..a782a2e26b5562c0293e5b38d425be480610ba04 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2008-2011 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/dss.suite b/dss.suite
index f02c825223d55aaf7275a567ef93a352a7523bf5..03e147414d475cc10f1176f434acd98d1dea3e57 100644 (file)
--- a/dss.suite
+++ b/dss.suite
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+

 [suite dss]
 caption = Subcommands
 
 [suite dss]
 caption = Subcommands
 

diff --git a/err.h b/err.h
index 2280010a39764156dbb25a13a0653db6f2681a81..9505dfcc99f718ce1f8fe540401446e1dff82e8e 100644 (file)
--- a/err.h
+++ b/err.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 extern char *dss_errlist[];
 extern char *dss_error_txt;
 
 extern char *dss_errlist[];
 extern char *dss_error_txt;
 

diff --git a/exec.c b/exec.c
index 920ea0e2e9086bee1b5d82e72a8f051ad32efd3a..9e0565dc5e08cd0905fd70de01ca0c9b8a100a0e 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2003-2011 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 
 /** \file exec.c Helper functions for spawning new processes. */
 
 
 /** \file exec.c Helper functions for spawning new processes. */
 

diff --git a/exec.h b/exec.h
index 31efc272460adeacce6edf6376058530311940ec..4d6ee88c28998eef5393306193ac6fe947f48eda 100644 (file)
--- a/exec.h
+++ b/exec.h
@@ -1,2 +1,3 @@
+/* SPDX-License-Identifier: GPL-2.0 */

 void dss_exec(pid_t *pid, const char *file, char *const *const args);
 void dss_exec_cmdline_pid(pid_t *pid, const char *cmdline);
 void dss_exec(pid_t *pid, const char *file, char *const *const args);
 void dss_exec_cmdline_pid(pid_t *pid, const char *cmdline);

diff --git a/file.c b/file.c
index d606c16e15242a4ed9069cd1929428ec42bbcd02..cd1e43ef7c32c835266bdd3ae73ac34f614371a0 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 
 #include <stdio.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <unistd.h>

diff --git a/file.h b/file.h
index f82643a57fe961d3d1f67c837b69f794670188d0..d8f1092ee18d78544aedbfdf3a75732161e50532 100644 (file)
--- a/file.h
+++ b/file.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 int for_each_subdir(int (*func)(const char *, void *), void *private_data);
 __must_check int mark_fd_nonblocking(int fd);
 static inline int dss_rename(const char *old_path, const char *new_path)
 int for_each_subdir(int (*func)(const char *, void *), void *private_data);
 __must_check int mark_fd_nonblocking(int fd);
 static inline int dss_rename(const char *old_path, const char *new_path)

diff --git a/gcc-compat.h b/gcc-compat.h
index 258a3cb279b7e9045da566a17f9f7d8f52f6b40d..1ce032da387f721059014ea5eafc102294d134b3 100644 (file)
--- a/gcc-compat.h
+++ b/gcc-compat.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */

 #define HAVE_GNUC(maj, min) \
        defined(__GNUC__) && \
        (__GNUC__ > maj || (__GNUC__ == maj && __GNUC_MINOR__ >= min))
 #define HAVE_GNUC(maj, min) \
        defined(__GNUC__) && \
        (__GNUC__ > maj || (__GNUC__ == maj && __GNUC_MINOR__ >= min))

diff --git a/ipc.c b/ipc.c
index 183c76e9b4ad0b46ee2910207f12626fbb7087ca..f54faa39eb2fee4e3097cddb849910f0fce3f86c 100644 (file)
--- a/ipc.c
+++ b/ipc.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+

 #include <sys/wait.h>
 #include <stdio.h>
 #include <inttypes.h>
 #include <sys/wait.h>
 #include <stdio.h>
 #include <inttypes.h>

diff --git a/ipc.h b/ipc.h
index 8646a8e1a718d2060431dea26b3e8372a2c1b3b8..b5d6451ea8f59185682df68238c0d937e1d8a7b8 100644 (file)
--- a/ipc.h
+++ b/ipc.h
@@ -1,2 +1,3 @@
+/* SPDX-License-Identifier: GPL-2.0 */

 int lock_dss(char *config_file);
 int get_dss_pid(char *config_file, pid_t *pid);
 int lock_dss(char *config_file);
 int get_dss_pid(char *config_file, pid_t *pid);

diff --git a/log.h b/log.h
index 78ccc1b30b2a55114e55634ca32c09c486c8cbfe..7dd50434313b5acfa9009878089aae785ec27846 100644 (file)
--- a/log.h
+++ b/log.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 
 /** debug loglevel, gets really noisy */
 #define DEBUG 1
 
 /** debug loglevel, gets really noisy */
 #define DEBUG 1

diff --git a/mklogo b/mklogo
index 54c8c95473c37ceb995282222b14135ac411fb66..d4705ba7b9f91ae37df8f6f87cce30bfe8284833 100755 (executable)
--- a/mklogo
+++ b/mklogo
@@ -1,4 +1,5 @@
 #!/bin/bash
 #!/bin/bash

+# SPDX-License-Identifier: GPL-2.0

 
 # Script for Image Magick that writes the dss logo in png format
 # to stdout.
 
 # Script for Image Magick that writes the dss logo in png format
 # to stdout.

diff --git a/sig.c b/sig.c
index 99d3dd34d7ca20c1018e8984d2a362906e07a42a..fe7fcede927b574391ce0cf4ee8e5035916d4fd1 100644 (file)
--- a/sig.c
+++ b/sig.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2004-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 
 #include <string.h>
 #include <errno.h>
 
 #include <string.h>
 #include <errno.h>

diff --git a/sig.h b/sig.h
index 912eec2e09baea8058cf1df840f02f7f76b108ef..2c646ad189cdefb4ee03f243f80ce295fc435954 100644 (file)
--- a/sig.h
+++ b/sig.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2007-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 
 int signal_init(void);
 int install_sighandler(int);
 
 int signal_init(void);
 int install_sighandler(int);

diff --git a/snap.c b/snap.c
index 2ec195653c8ce65091b31f512010326649387bf1..8de76d459da1a8844a452fa576d706014b229be9 100644 (file)
--- a/snap.c
+++ b/snap.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2008-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 #include <stdlib.h>
 #include <assert.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <inttypes.h>

diff --git a/snap.h b/snap.h
index 489b67a2fbbb39f69533e50bfc996b1c7db20525..27045a3ca5542ad1c3a72b7b3ed667ab5b583fd2 100644 (file)
--- a/snap.h
+++ b/snap.h
@@ -1,9 +1,4 @@
-/*
- * Copyright (C) 2008-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
-
+/* SPDX-License-Identifier: GPL-2.0 */

 
 /** The possible states for snapshot creation/removal. */
 #define HOOK_STATUS_ARRAY \
 
 /** The possible states for snapshot creation/removal. */
 #define HOOK_STATUS_ARRAY \

diff --git a/str.c b/str.c
index cca898d6aa0e4fdcf05eaea528b7d223ef054ccf..623def1fd9b7aa7ee72f221aa6759fcf74b70948 100644 (file)
--- a/str.c
+++ b/str.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2004-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* SPDX-License-Identifier: GPL-2.0 */

 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/str.h b/str.h
index 0f158fe972c56aaf0e62be389670ad68976c054d..b7f26350ccb5941ced169d6b893ff18b38fcaee1 100644 (file)
--- a/str.h
+++ b/str.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+

 __must_check __malloc void *dss_realloc(void *p, size_t size);
 __must_check __malloc void *dss_malloc(size_t size);
 __must_check __malloc void *dss_calloc(size_t size);
 __must_check __malloc void *dss_realloc(void *p, size_t size);
 __must_check __malloc void *dss_malloc(size_t size);
 __must_check __malloc void *dss_calloc(size_t size);

diff --git a/tv.c b/tv.c
index f954cef0c9a1342fedc4d2a49851ad56ca11aa9e..538202c9fe99dd1326b2fb19aee2168dcbf0ec20 100644 (file)
--- a/tv.c
+++ b/tv.c
@@ -1,9 +1,4 @@
-/*
- * Copyright (C) 2005-2010 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
-
+/* SPDX-License-Identifier: GPL-2.0 */

 #include <sys/time.h>
 #include <time.h>
 #include <inttypes.h>
 #include <sys/time.h>
 #include <time.h>
 #include <inttypes.h>

diff --git a/tv.h b/tv.h
index c61a848a81aa568aa54a9546c2ebf515623ab58b..ca49b1db96c68e4a917c3e1664868c061f79e372 100644 (file)
--- a/tv.h
+++ b/tv.h
@@ -1,2 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+

 int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *diff);
 int64_t get_current_time(void);
 int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *diff);
 int64_t get_current_time(void);