Disable SSHv1 options

shellinabox-configure-c99.patch

@@ -1,21 +0,0 @@
-Define _GNU_SOURCE when probing for updwtmpx.  Otherwise, glibc's
-<utmpx.h> will not declare this function, and the configure probe
-fails with compilers which do not support implicit function
-declarations.
-
-Submitted upstream: <https://github.com/shellinabox/shellinabox/pull/514>
-
-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 <utmpx.h>],
-+  AC_TRY_LINK([#define _GNU_SOURCE
-+	      #include <utmpx.h>],
-               [updwtmpx(0, 0);],
-               [AC_DEFINE(HAVE_UPDWTMPX, 1,
-                          Define to 1 if you have support for updwtmpx)])

shellinabox-gcc11.patch

@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 05ab1bb..56e3b6a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -65,7 +65,7 @@ AC_TRY_LINK([#ifndef _XOPEN_SOURCE
- dnl Apparently, some systems define sigwait() but fail to implement it
- AC_TRY_LINK([#include <pthread.h>
-              #include <signal.h>],
--            [sigset_t s; int n; sigwait(&s, &n);],
-+            [sigset_t s; int n; sigemptyset (&s); sigwait(&s, &n);],
-             [AC_DEFINE(HAVE_SIGWAIT, 1,
-                        Define to 1 if you have a working sigwait)])
- 

shellinabox.spec

@@ -2,10 +2,9 @@
 
 Name:           shellinabox
 Version:        2.20
-Release:        27%{?dist}
+Release:        5%{?dist}
 Summary:        Web based AJAX terminal emulator
-# Automatically converted from old format: GPLv2 - review is highly recommended.
-License:        GPL-2.0-only
+License:        GPLv2
 URL:            https://github.com/%{name}/%{name}
 
 Source0:        https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -14,10 +13,7 @@ Source2:        shellinaboxd.service
 Source3:        shellinaboxd.init
 
 Patch0:         %{name}-ssh-options.patch
-Patch1:         %{name}-gcc11.patch
-Patch2: shellinabox-configure-c99.patch
 
-BuildRequires: make
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -25,6 +21,7 @@ BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
 
 Requires:       openssl
+Requires(pre):  shadow-utils
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:      systemd
@@ -48,14 +45,7 @@ browser plugins.
 
 %prep
 %setup -q
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
-
-# Create a sysusers.d config file
-cat >shellinabox.sysusers.conf <<EOF
-u shellinabox - 'Shellinabox' %{_sharedstatedir}/shellinabox -
-EOF
+%patch0 -p1
 
 %build
 autoreconf -vif
@@ -86,9 +76,12 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd
 
 %endif
 
-install -m0644 -D shellinabox.sysusers.conf %{buildroot}%{_sysusersdir}/shellinabox.conf
-
 %pre
+getent group %username >/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
+
 %if 0%{?fedora} || 0%{?rhel} >= 7
 
 %post
@@ -135,76 +128,8 @@ fi
 %{_initrddir}/shellinaboxd
 %endif
 %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name}
-%{_sysusersdir}/shellinabox.conf
 
 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.20-26
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 2.20-24
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Apr 26 2023 Florian Weimer <fweimer@redhat.com> - 2.20-20
-- Port configure script to C99
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.20-16
-- Rebuilt with OpenSSL 3.0.0
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.20-14
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Jeff Law <law@redhat.com> - 2.20-12
-- Initialize sigset in configure test
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
 * Thu Dec 07 2017 Simone Caronni <negativo17@gmail.com> - 2.20-5
 - Disable SSHv1 options.