From 748cdd481ce7326700397b96b7f46b8d3c478799 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 26 Apr 2023 06:10:11 +0200 Subject: [PATCH 1/9] Port configure script to C99 Related to: --- shellinabox-configure-c99.patch | 21 +++++++++++++++++++++ shellinabox.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 shellinabox-configure-c99.patch diff --git a/shellinabox-configure-c99.patch b/shellinabox-configure-c99.patch new file mode 100644 index 0000000..382dbbd --- /dev/null +++ b/shellinabox-configure-c99.patch @@ -0,0 +1,21 @@ +Define _GNU_SOURCE when probing for updwtmpx. Otherwise, glibc's + will not declare this function, and the configure probe +fails with compilers which do not support implicit function +declarations. + +Submitted upstream: + +diff --git a/configure.ac b/configure.ac +index 56e3b6a2b510851f..d05d1216dd4a397f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -154,7 +154,8 @@ if test "x$enable_utmp" != xno; then + [updwtmp(0, 0);], + [AC_DEFINE(HAVE_UPDWTMP, 1, + Define to 1 if you have support for updwtmp)]) +- AC_TRY_LINK([#include ], ++ AC_TRY_LINK([#define _GNU_SOURCE ++ #include ], + [updwtmpx(0, 0);], + [AC_DEFINE(HAVE_UPDWTMPX, 1, + Define to 1 if you have support for updwtmpx)]) diff --git a/shellinabox.spec b/shellinabox.spec index e82e640..c4c5427 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -14,6 +14,7 @@ Source3: shellinaboxd.init Patch0: %{name}-ssh-options.patch Patch1: %{name}-gcc11.patch +Patch2: shellinabox-configure-c99.patch BuildRequires: make BuildRequires: autoconf @@ -49,6 +50,7 @@ browser plugins. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build autoreconf -vif @@ -133,6 +135,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Wed Apr 26 2023 Florian Weimer - 2.20-20 +- Port configure script to C99 + * Sat Jan 21 2023 Fedora Release Engineering - 2.20-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f832b3487f9258aa33fc8c26c9d362c15f928285 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:34:32 +0000 Subject: [PATCH 2/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index c4c5427..22116df 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -135,6 +135,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.20-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Apr 26 2023 Florian Weimer - 2.20-20 - Port configure script to C99 From 14567ede3f95b93156a4923fbba4ee00a8afddea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:55:28 +0000 Subject: [PATCH 3/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 22116df..7c0a9d5 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -135,6 +135,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.20-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.20-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ce2b12de6f98e047ce8305aa455871e45297edf5 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 4/9] Eliminate use of obsolete %patchN syntax (#2283636) --- shellinabox.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 7c0a9d5..366de59 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -48,9 +48,9 @@ browser plugins. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 %build autoreconf -vif From 6638880dd6e59fc996b1fce5b3a80d15451e3945 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:26:34 +0000 Subject: [PATCH 5/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 366de59..3bdbe53 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -135,6 +135,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.20-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.20-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b1fc9ce25c0fd7e875da3d6e8c67d59f5fad21f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 12:13:47 +0200 Subject: [PATCH 6/9] convert GPLv2 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- shellinabox.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 3bdbe53..58c5121 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,9 +2,10 @@ Name: shellinabox Version: 2.20 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Web based AJAX terminal emulator -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: https://github.com/%{name}/%{name} Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -135,6 +136,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Mon Jul 29 2024 Miroslav Suchý - 2.20-24 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.20-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1bf3a14bceb31356b2cafdcad6a4ec36cc5735e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:35:12 +0000 Subject: [PATCH 7/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 58c5121..e66ebd6 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Web based AJAX terminal emulator # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -136,6 +136,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.20-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jul 29 2024 Miroslav Suchý - 2.20-24 - convert license to SPDX From 5cbe08c0520bed4d284e5d8c8d3a63b601944cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 16:44:36 +0100 Subject: [PATCH 8/9] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- shellinabox.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index e66ebd6..6409471 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Web based AJAX terminal emulator # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -25,7 +25,6 @@ BuildRequires: openssl-devel BuildRequires: zlib-devel Requires: openssl -Requires(pre): shadow-utils %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: systemd @@ -53,6 +52,11 @@ browser plugins. %patch -P1 -p1 %patch -P2 -p1 +# Create a sysusers.d config file +cat >shellinabox.sysusers.conf </dev/null || groupadd -r %username &>/dev/null || : -getent passwd %username >/dev/null || useradd -r -s /sbin/nologin \ - -d %{_sharedstatedir}/shellinabox -M -c 'Shellinabox' -g %username %username &>/dev/null || : -exit 0 +install -m0644 -D shellinabox.sysusers.conf %{buildroot}%{_sysusersdir}/shellinabox.conf +%pre %if 0%{?fedora} || 0%{?rhel} >= 7 %post @@ -134,8 +135,12 @@ fi %{_initrddir}/shellinaboxd %endif %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} +%{_sysusersdir}/shellinabox.conf %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.20-26 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sun Jan 19 2025 Fedora Release Engineering - 2.20-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 71d1feb27a065e2055fd93c0d432aaaa37ac9dde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:14:16 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 6409471..45af159 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Web based AJAX terminal emulator # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -138,6 +138,9 @@ fi %{_sysusersdir}/shellinabox.conf %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.20-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.20-26 - Add sysusers.d config file to allow rpm to create users/groups automatically