From 59e68d7e89734df1dc77a384b2879daa81b574b08041458b89b1f230a074c7e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Sep 2024 16:13:03 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main catatonit revision 1475bb4095860414b9c150689b26249f --- 99bb9048f.patch | 36 ------------------------------------ catatonit-0.1.7.tar.xz | 3 --- catatonit-0.1.7.tar.xz.asc | 17 ----------------- catatonit-0.2.0.tar.xz | 3 +++ catatonit-0.2.0.tar.xz.asc | 17 +++++++++++++++++ catatonit.changes | 10 +++++++++- catatonit.spec | 7 +++---- 7 files changed, 32 insertions(+), 61 deletions(-) delete mode 100644 99bb9048f.patch delete mode 100644 catatonit-0.1.7.tar.xz delete mode 100644 catatonit-0.1.7.tar.xz.asc create mode 100644 catatonit-0.2.0.tar.xz create mode 100644 catatonit-0.2.0.tar.xz.asc diff --git a/99bb9048f.patch b/99bb9048f.patch deleted file mode 100644 index 06c3092..0000000 --- a/99bb9048f.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 99bb9048f532257f3a2c3856cfa19fe957ab6cec Mon Sep 17 00:00:00 2001 -From: Antonio Terceiro -Date: Thu, 4 Nov 2021 07:37:13 -0300 -Subject: [PATCH] configure.ac: call AM_INIT_AUTOMAKE only once - -That second call seems to be there since the beginning, and autoconf -2.69 was fine with it. autoconf 2.71 doesn't allow it anymore: - - $ ./autogen.sh - autoreconf: export WARNINGS= - autoreconf: Entering directory '.' - autoreconf: configure.ac: not using Gettext - autoreconf: running: aclocal --force - configure.ac:34: error: AM_INIT_AUTOMAKE expanded multiple times - /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... - configure.ac:19: the top level - /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... - configure.ac:34: the top level - autom4te: error: /usr/bin/m4 failed with exit status: 1 - aclocal: error: /usr/bin/autom4te failed with exit status: 1 - autoreconf: error: aclocal failed with exit status: 1 - -Signed-off-by: Antonio Terceiro ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 12c9186..94c5c84 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,4 +31,3 @@ AC_FUNC_FORK - - AC_CONFIG_FILES([Makefile config.h]) - AC_OUTPUT --AM_INIT_AUTOMAKE diff --git a/catatonit-0.1.7.tar.xz b/catatonit-0.1.7.tar.xz deleted file mode 100644 index 27af26a..0000000 --- a/catatonit-0.1.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ea6cb8c7feeca2cf101e7f794dab6eeb192cde177ecc7714d2939655d3d8997 -size 20052 diff --git a/catatonit-0.1.7.tar.xz.asc b/catatonit-0.1.7.tar.xz.asc deleted file mode 100644 index c90546f..0000000 --- a/catatonit-0.1.7.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJDBAABCAAtFiEEXzbGxhtUYBJKdfWmnhiqJn3bjbQFAmF/daIPHGFzYXJhaUBz -dXNlLmRlAAoJEJ4YqiZ92420N4QP/i47N53mZku98HPqzZxgq7wpCPWsWIv0Fyxv -jkqsWsI1wwnLZoP3Q5RmR6Qqtv5bRpmOIN0p8qpXGHjZD4cGK1gsP4s5szVl3ecb -VnSDwtdFK+b76amgKWsgLe/3m4xwSNWONGPOy66MSmZIYWTEGpnEN7qsz4QQ2ORW -f6dYa2kjO+bY9Fg3nqO18iXAXYWZw2t5lIiUSG8fG5QFt676EyGnPuMnpXR+XiSk -pCbA+4v4l/Ix4OlJZgmS96dqvPc91OAMlX4xhfPjJhyR/j+YSrTm63Fd3NxlXCIa -x0AIU9WO4DK/cYVthq33ZaM56xcqMSAh7iTh2kkUvCRJZxyhOG+/0eEaTtLWpt/O -Hg5W1Mk4tzk+F2fNHTazcWc6aaRNvAZUnl0IveJkyjlDshi1r7vMKz7wRTZ2ZrBe -P83Z0y8HjjWu6Ij9W3xRLUpgZ2IsF+e3EEt1JUapvH/6U2R5D+fIXltb0HS1vhVC -XQiZQO5nQJ3r0E5r1V4UtwiprtdRpr+3rIDa7HemHPutClGmkW1w5+KmxDFu3Sms -YVW1aDWjhYXFvY1A8UKs5UtX3p1QNmFPh5+NWFUIK6yuFV39cLmRNWLcXCYuaz6W -siADqcAiMVWbt6yVEwrQ4yyv6v/pW8sMdBC+MqQs97RwEmN5lxHz6sdMkv5oVR/7 -U5xkovR3 -=05Kh ------END PGP SIGNATURE----- diff --git a/catatonit-0.2.0.tar.xz b/catatonit-0.2.0.tar.xz new file mode 100644 index 0000000..f8b1e47 --- /dev/null +++ b/catatonit-0.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9843c2b47421f0f1959b18b786f736cde1fbf124b1d1fa0d292be2773d2d2b90 +size 15564 diff --git a/catatonit-0.2.0.tar.xz.asc b/catatonit-0.2.0.tar.xz.asc new file mode 100644 index 0000000..005013e --- /dev/null +++ b/catatonit-0.2.0.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJDBAABCAAtFiEEXzbGxhtUYBJKdfWmnhiqJn3bjbQFAmUaWnwPHGFzYXJhaUBz +dXNlLmRlAAoJEJ4YqiZ92420CvIQAIxZ1qxHYsdT8QTQkt7UkfXn13OrDOEoVEEp +z+m5+2uYoJNUu2KYGdiofPcH3qiu5+wMKJ/q3Py7EELz8MH3hLb0yiKzOPX6mXxa +kzH8zkF7ArhF29b3Ztp8PN58iEXeX4kiCJ+b7Sl9sikMukZ01JxBtjsi94Q3VAxc +Bq/rOxTsX/j+UpoNv5UJLYop1a842BraVMUyB7TJ4X5tSB+/hs/uGiyPmI6WW8Gk +6Ga/M8JIsQfQqkVmaq+l1pVMzhGEMb4xL07tBY47zGD0KLfgahZFq6AV/ECTUyfw +hEd3lk9yKUfo2TXULJrTyXBJBTl283DgU/AgA1SSW9uN1ngwrD6M8kRniAvCMLTE +VvY8+YKqJoOfHI/fVEb7XFTrJYkMirBKOCPF3wi6JEbfsnD3Eoq7yaR2tkdhY2UJ +Vp+0bXgwwksTzY2vu8XuzOHpOJbB7qw9owHmeTpgjXEAqpczckpuSpkD2YCGNxuG +tj9FO6Ac7dm0NkK0A9sM9oVX0JWskKX2TOS6Qqn3yy9Hgsh/lKwwXkLOEjpIxCwh +zvIiyFP+7yB/hlH+dhrbovAkHLx7GyQN/fdFZ39YwoEXC3wxnALF9xipFfIx2A5E +EhCE9C06EZFj3qSmPW7vMFaSvsvpIqauiCsbAe+QZptzrdj+j9ucvoHCBBt+q/TV +bJHTi865 +=tBQq +-----END PGP SIGNATURE----- diff --git a/catatonit.changes b/catatonit.changes index ee8b054..139fd1c 100644 --- a/catatonit.changes +++ b/catatonit.changes @@ -1,10 +1,18 @@ +------------------------------------------------------------------- +Mon Oct 2 05:48:52 UTC 2023 - Aleksa Sarai + +- Update to catatonit v0.2.0. + * Change license to GPL-2.0-or-later. +- Remove upstreamed patches: + - 99bb9048f.patch + ------------------------------------------------------------------- Mon Apr 11 09:57:33 UTC 2022 - Richard Brown - Update to catatont v0.1.7 - This release adds the ability for catatonit to be used as the only process in a pause container, by passing the -P flag (in this mode no -subprocess is spawned and thus no signal forwarding is done). +subprocess is spawned and thus no signal forwarding is done). ------------------------------------------------------------------- Thu Nov 25 14:28:41 UTC 2021 - Dominique Leuenberger diff --git a/catatonit.spec b/catatonit.spec index b401540..d568859 100644 --- a/catatonit.spec +++ b/catatonit.spec @@ -1,7 +1,7 @@ # # spec file for package catatonit # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,16 @@ Name: catatonit -Version: 0.1.7 +Version: 0.2.0 Release: 0 Summary: A signal-forwarding process manager for containers -License: GPL-3.0-or-later +License: GPL-2.0-or-later Group: System/Management URL: https://github.com/openSUSE/catatonit Source0: https://github.com/openSUSE/catatonit/releases/download/v%{version}/%{name}.tar.xz#/%{name}-%{version}.tar.xz Source1: https://github.com/openSUSE/catatonit/releases/download/v%{version}/%{name}.tar.xz.asc#/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring Source3: %{name}-rpmlintrc -Patch0: https://github.com/openSUSE/catatonit/commit/99bb9048f.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: file