Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.

.gitignore

@@ -1,3 +1,7 @@
 /shellinabox-2.14.tar.gz
 /shellinabox-2.14-git88822c1f.tar.bz2
 /shellinabox-2.14-88822c1.tar.gz
+/shellinabox-2.17.tar.gz
+/shellinabox-2.18.tar.gz
+/shellinabox-2.19.tar.gz
+/shellinabox-2.20.tar.gz

shellinabox-configure-c99.patch

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,13 @@
+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-ssh-options.patch

@@ -0,0 +1,15 @@
+diff -Naur shellinabox-2.20.old/shellinabox/service.c shellinabox-2.20/shellinabox/service.c
+--- shellinabox-2.20.old/shellinabox/service.c	2017-12-07 16:51:32.422058845 +0100
++++ shellinabox-2.20/shellinabox/service.c	2017-12-07 16:52:51.979540100 +0100
+@@ -175,9 +175,9 @@
+           "-oHostbasedAuthentication=no -oIdentitiesOnly=yes "
+           "-oKbdInteractiveAuthentication=yes -oPasswordAuthentication=yes "
+           "-oPreferredAuthentications=keyboard-interactive,password "
+-          "-oPubkeyAuthentication=no -oRhostsRSAAuthentication=no "
+-          "-oRSAAuthentication=no -oStrictHostKeyChecking=no -oTunnel=no "
++          "-oPubkeyAuthentication=no -oStrictHostKeyChecking=no -oTunnel=no "
+           "-oUserKnownHostsFile=/dev/null -oVerifyHostKeyDNS=no "
++          "-oProxyCommand=none "
+ // beewoolie-2012.03.30: while it would be nice to disable this
+ //          feature, we cannot be sure that it is available on the
+ //          target server.  Removing it for the sake of Centos.

shellinabox.spec

@@ -1,50 +1,45 @@
-%global commit 88822c1f4c030d5f05ced097eb7b6668ff3d7c6f
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global username shellinabox
 
-%if 0%{?rhel} == 5
-%define _sharedstatedir /var/lib
-%endif
-
 Name:           shellinabox
-Version:        2.14
-Release:        24.git%{shortcommit}%{?dist}
+Version:        2.20
+Release:        30%{?dist}
 Summary:        Web based AJAX terminal emulator
-Group:          System Environment/Daemons
-License:        GPLv2
-URL:            https://github.com/pythonanywhere/shellinabox_fork
-Source0:        https://github.com/pythonanywhere/shellinabox_fork/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+# 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
 Source1:        shellinaboxd.sysconfig
 Source2:        shellinaboxd.service
 Source3:        shellinaboxd.init
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         %{name}-ssh-options.patch
+Patch1:         %{name}-gcc11.patch
+Patch2: shellinabox-configure-c99.patch
+
+BuildRequires: make
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
+
 Requires:       openssl
 
-%if 0%{?fedora} == 17
-Requires(post):         systemd-units
-Requires(preun):        systemd-units
-Requires(postun):       systemd-units
+%if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires:      systemd
+Requires(post):     systemd
+Requires(preun):    systemd
+Requires(postun):   systemd
 %endif
 
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-Requires(post):         systemd-sysv
-Requires(post):         systemd
-Requires(preun):        systemd
-Requires(postun):       systemd
+%if 0%{?rhel} == 6
+Requires(post):     /sbin/chkconfig
+Requires(preun):    /sbin/chkconfig
+Requires(preun):    /sbin/service
+Requires(postun):   /sbin/service
 %endif
 
-%if 0%{?rhel} == 5 || 0%{?rhel} == 6
-Requires(post):         /sbin/chkconfig
-Requires(preun):        /sbin/chkconfig
-Requires(preun):        /sbin/service
-Requires(postun):       /sbin/service
-%endif
-
-Requires(pre):          shadow-utils
-
 %description
 Shell In A Box implements a web server that can export arbitrary command line
 tools to a web based terminal emulator. This emulator is accessible to any
@@ -52,22 +47,29 @@ JavaScript and CSS enabled web browser and does not require any additional
 browser plugins.
 
 %prep
-%setup -qn %{name}_fork-%{commit}
+%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
 
 %build
+autoreconf -vif
 %configure --disable-runtime-loading
 make %{?_smp_mflags}
 chmod 644 %{name}/*
 
 %install
-rm -rf %{buildroot}
-
+mkdir -p %{buildroot}%{_datadir}/%{name}
 mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
+
 install -p -m 755 -D shellinaboxd %{buildroot}%{_sbindir}/shellinaboxd
 install -p -m 644 -D shellinaboxd.1 %{buildroot}%{_mandir}/man1/shellinaboxd.1
 install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/shellinaboxd
-
-mkdir -p %{buildroot}%{_datadir}/%{name}
 install -p -m 644 shellinabox/white-on-black.css %{buildroot}%{_datadir}/%{name}
 install -p -m 644 shellinabox/color.css %{buildroot}%{_datadir}/%{name}
 install -p -m 644 shellinabox/monochrome.css %{buildroot}%{_datadir}/%{name}
@@ -84,41 +86,10 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd
 
 %endif
 
-%clean
-rm -rf %{buildroot}
-
+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} == 17
-
-%post
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-
-%preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable shellinaboxd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop shellinaboxd.service > /dev/null 2>&1 || :
-fi
-
-%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart shellinaboxd.service >/dev/null 2>&1 || :
-fi
-
-%endif
-
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} >= 7
 
 %post
 %systemd_post shellinaboxd.service
@@ -131,7 +102,7 @@ fi
 
 %endif
 
-%if 0%{?rhel} == 6 || 0%{?rhel} == 5
+%if 0%{?rhel} == 6
 
 %post
 /sbin/chkconfig --add shellinaboxd
@@ -149,9 +120,9 @@ fi
 
 %endif
 
-
 %files
-%doc AUTHORS NEWS README README.Fedora GPL-2 COPYING
+%{!?_licensedir:%global license %%doc}
+%doc AUTHORS NEWS README README.Fedora
 %doc shellinabox/styles.css shellinabox/print-styles.css
 %doc shellinabox/shell_in_a_box.js
 %config(noreplace) %{_sysconfdir}/sysconfig/shellinaboxd
@@ -164,9 +135,147 @@ fi
 %{_initrddir}/shellinaboxd
 %endif
 %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name}
-
+%{_sysusersdir}/shellinabox.conf
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 2.20-29
+- Rebuilt for openssl 4.0
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* 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.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu Mar 09 2017 Simone Caronni <negativo17@gmail.com> - 2.20-2
+- Remove support for RHEL/CentOS 5.
+
+* Thu Mar 09 2017 Simone Caronni <negativo17@gmail.com> - 2.20-1
+- Update to 2.20.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Dec 11 2015 Simone Caronni <negativo17@gmail.com> - 2.19-1
+- Update to 2.19. Fixes CVE-2015-8400 (#1287577).
+
+* Mon Aug 31 2015 Simone Caronni <negativo17@gmail.com> - 2.18-1
+- Update to 2.18.
+- Remove upstreamed patches.
+
+* Mon Aug 31 2015 Simone Caronni <negativo17@gmail.com> - 2.17-3
+- Backport patch from upstream:
+  https://github.com/shellinabox/shellinabox/pull/340
+
+* Wed Aug 26 2015 Simone Caronni <negativo17@gmail.com> - 2.17-2
+- Add license macro.
+- Install files manually, as this simplifies installation of docs in versioned
+  documentation dirs (CentOS/RHEL).
+
+* Wed Aug 26 2015 Simone Caronni <negativo17@gmail.com> - 2.17-1
+- Update for new GitHub packaging guidelines.
+- Update source from new repository.
+- Use make install target now that the source has it.
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.14-29.git88822c1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.14-28.git88822c1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Jun 11 2014 Simone Caronni <negativo17@gmail.com> - 2.14-27.git88822c1
+- Add additional ssh option ProxyCommand=none (#1013974).
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.14-26.git88822c1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Aug 06 2013 Simone Caronni <negativo17@gmail.com> - 2.14-25.git88822c1
+- Add systemd to BuildRequires; not default on Fedora 20+.
+- Remove Fedora 17 conditionals, distribution EOL.
+- Remove systemd-sysv dependency as per new packaging guidelines.
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.14-25.git88822c1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Tue Jun 11 2013 Simone Caronni <negativo17@gmail.com> - 2.14-24.git88822c1
 - Fix SSL support (#973058).
 - SPEC file cleanup.

sources

@@ -1 +1 @@
-c5829959b5064398d65096281539f3f2  shellinabox-2.14-88822c1.tar.gz
+SHA512 (shellinabox-2.20.tar.gz) = 369fb6e0041fc3eb52a533f14d1f856a71ec1bf166441e25a5d61bb129f2db5de6b61205ddd0cb08d53384baaf4e087bd2c549f7919b96ee465d4cc3318d2237