license: switch to GPLv2-or-later

cyphar · cyphar · commit fe191ef859c6 · 2023-09-20T23:20:27.000+10:00
Some folks have raised concerns about using GPLv3+ code in appliances
and the like when catatonit is used with Podman. Given there are plenty
of more liberally-licenced alternatives to catatonit it seems reasonable
to use the less-worry-inducing GPLv2.

Signed-off-by: Aleksa Sarai &lt;cyphar@cyphar.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,9 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
 # catatonit: a container init so simple it's effectively brain-dead
-# Copyright (C) 2018-2021 SUSE LLC
+# Copyright (C) 2018-2023 SUSE LLC
 #
-# This program is free software: you can redistribute it and/or modify
+# 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 3 of the License, or
+# 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,
diff --git a/COPYING b/COPYING
diff --git a/Makefile.am b/Makefile.am
@@ -1,9 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
 # catatonit: a container init so simple it's effectively brain-dead
-# Copyright (C) 2018 SUSE LLC
+# Copyright (C) 2018-2023 SUSE LLC
 #
-# This program is free software: you can redistribute it and/or modify
+# 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 3 of the License, or
+# 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,
diff --git a/README.md b/README.md
@@ -49,15 +49,15 @@ catatonit uses autotools for building, so building is a fairly standard:
 
 ### License ###
 
-catatonit is licensed under the GNU General Public License version 3 or later.
+catatonit is licensed under the GNU General Public License version 2 or later.
 
 ```
 catatonit: a container init so simple it's effectively brain-dead
-Copyright (C) 2018-2019 SUSE LLC
+Copyright (C) 2018-2023 SUSE LLC
 
-This program is free software: you can redistribute it and/or modify
+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 3 of the License, or
+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,
diff --git a/catatonit.c b/catatonit.c
@@ -1,10 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * catatonit: a container init so simple it's effectively brain-dead
- * Copyright (C) 2018-2021 SUSE LLC
+ * Copyright (C) 2018-2023 SUSE LLC
  *
- * This program is free software: you can redistribute it and/or modify
+ * 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 3 of the License, or
+ * 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,
diff --git a/config.h.in b/config.h.in
@@ -1,10 +1,11 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
 /*
  * catatonit: a container init so simple it's effectively brain-dead
- * Copyright (C) 2018 SUSE LLC
+ * Copyright (C) 2018-2023 SUSE LLC
  *
- * This program is free software: you can redistribute it and/or modify
+ * 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 3 of the License, or
+ * 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,
@@ -25,11 +26,11 @@
 #define PROGRAM_URL     "@PACKAGE_URL@"
 #define PROGRAM_LICENSE \
  PROGRAM_NAME ": a container init so simple it's effectively brain-dead\n" \
- "Copyright (C) 2018 SUSE LLC\n" \
+ "Copyright (C) 2018-2023 SUSE LLC\n" \
  "\n" \
- "This program is free software: you can redistribute it and/or modify\n" \
+ "This program is free software; you can redistribute it and/or modify\n" \
  "it under the terms of the GNU General Public License as published by\n" \
- "the Free Software Foundation, either version 3 of the License, or\n" \
+ "the Free Software Foundation, either version 2 of the License, or\n" \
  "(at your option) any later version.\n" \
  "\n" \
  "This program is distributed in the hope that it will be useful,\n" \
diff --git a/configure.ac b/configure.ac
@@ -1,9 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
 # catatonit: a container init so simple it's effectively brain-dead
-# Copyright (C) 2018 SUSE LLC
+# Copyright (C) 2018-2023 SUSE LLC
 #
-# This program is free software: you can redistribute it and/or modify
+# 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 3 of the License, or
+# 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,
