Merge branch 'openSUSE:main' into killpg-env

.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,

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,

README.md

@@ -50,15 +50,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,

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,
@@ -35,7 +36,7 @@
 #include <limits.h>
 #include <dirent.h>
 
-#ifdef HAVE_CLOSE_RANGE
+#ifdef HAVE_LINUX_CLOSE_RANGE_H
 # include <linux/close_range.h>
 #else
 # include <sys/syscall.h>

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" \

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,
@@ -15,14 +17,14 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.69])
-AC_INIT([catatonit], [0.1.7+dev], [https://bugs.opensuse.org/], [], [https://github.com/openSUSE/catatonit/])
+AC_INIT([catatonit], [0.2.0+dev], [https://bugs.opensuse.org/], [], [https://github.com/openSUSE/catatonit/])
 AM_INIT_AUTOMAKE([-Wall foreign])
 
 LT_PREREQ([2.4.2])
 LT_INIT([disable-shared])
 
 AC_CHECK_HEADERS([errno.h fcntl.h signal.h stdarg.h stdio.h stdlib.h unistd.h])
-AC_CHECK_HEADERS([sys/prctl.h sys/signalfd.h sys/stat.h sys/types.h sys/wait.h])
+AC_CHECK_HEADERS([linux/close_range.h sys/prctl.h sys/signalfd.h sys/stat.h sys/types.h sys/wait.h])
 
 AC_CHECK_FUNCS([close_range])