diff --git a/.gitignore b/.gitignore index b2727ff..00894cf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /shellinabox-2.17.tar.gz /shellinabox-2.18.tar.gz /shellinabox-2.19.tar.gz +/shellinabox-2.20.tar.gz 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-gcc11.patch b/shellinabox-gcc11.patch new file mode 100644 index 0000000..2b1c8a8 --- /dev/null +++ b/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 + #include ], +- [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)]) + diff --git a/shellinabox-ssh-options.patch b/shellinabox-ssh-options.patch index a115a7c..7517087 100644 --- a/shellinabox-ssh-options.patch +++ b/shellinabox-ssh-options.patch @@ -1,9 +1,13 @@ -diff -Naur shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f.old/shellinabox/service.c shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f/shellinabox/service.c ---- shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f.old/shellinabox/service.c 2014-06-11 11:34:52.304810724 +0200 -+++ shellinabox_fork-88822c1f4c030d5f05ced097eb7b6668ff3d7c6f/shellinabox/service.c 2014-06-11 11:35:18.733619259 +0200 -@@ -159,6 +159,7 @@ - "-oPubkeyAuthentication=no -oRhostsRSAAuthentication=no " - "-oRSAAuthentication=no -oStrictHostKeyChecking=no -oTunnel=no " +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 diff --git a/shellinabox.spec b/shellinabox.spec index f153295..45af159 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,17 +1,12 @@ %global username shellinabox -%if 0%{?rhel} == 5 -%define _sharedstatedir /var/lib -%endif - Name: shellinabox -Version: 2.19 -Release: 1%{?dist} +Version: 2.20 +Release: 27%{?dist} Summary: Web based AJAX terminal emulator -Group: System Environment/Daemons -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: https://github.com/%{name}/%{name} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: shellinaboxd.sysconfig @@ -19,7 +14,10 @@ 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 @@ -27,7 +25,6 @@ BuildRequires: openssl-devel BuildRequires: zlib-devel Requires: openssl -Requires(pre): shadow-utils %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: systemd @@ -36,7 +33,7 @@ Requires(preun): systemd Requires(postun): systemd %endif -%if 0%{?rhel} == 5 || 0%{?rhel} == 6 +%if 0%{?rhel} == 6 Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -51,7 +48,14 @@ browser plugins. %prep %setup -q -%patch0 -p1 +%patch -P0 -p1 +%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 - %if 0%{?fedora} || 0%{?rhel} >= 7 %post @@ -107,7 +102,7 @@ exit 0 %endif -%if 0%{?rhel} == 6 || 0%{?rhel} == 5 +%if 0%{?rhel} == 6 %post /sbin/chkconfig --add shellinaboxd @@ -127,7 +122,6 @@ fi %files %{!?_licensedir:%global license %%doc} -%license GPL-2 COPYING %doc AUTHORS NEWS README README.Fedora %doc shellinabox/styles.css shellinabox/print-styles.css %doc shellinabox/shell_in_a_box.js @@ -141,8 +135,97 @@ fi %{_initrddir}/shellinaboxd %endif %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} +%{_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 + +* 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 + +* 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 + +* 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 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.20-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.20-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.20-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Sep 14 2021 Sahana Prasad - 2.20-16 +- Rebuilt with OpenSSL 3.0.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.20-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.20-14 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Wed Jan 27 2021 Fedora Release Engineering - 2.20-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Jeff Law - 2.20-12 +- Initialize sigset in configure test + +* Wed Jul 29 2020 Fedora Release Engineering - 2.20-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 2.20-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 2.20-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 2.20-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.20-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Dec 07 2017 Simone Caronni - 2.20-5 +- Disable SSHv1 options. + +* Thu Aug 03 2017 Fedora Release Engineering - 2.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Mar 09 2017 Simone Caronni - 2.20-2 +- Remove support for RHEL/CentOS 5. + +* Thu Mar 09 2017 Simone Caronni - 2.20-1 +- Update to 2.20. + +* Sat Feb 11 2017 Fedora Release Engineering - 2.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 2.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Dec 11 2015 Simone Caronni - 2.19-1 - Update to 2.19. Fixes CVE-2015-8400 (#1287577). diff --git a/sources b/sources index 7ffc3a1..b8808d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf2d85f6328f83dda7f8c5ac749187f5 shellinabox-2.19.tar.gz +SHA512 (shellinabox-2.20.tar.gz) = 369fb6e0041fc3eb52a533f14d1f856a71ec1bf166441e25a5d61bb129f2db5de6b61205ddd0cb08d53384baaf4e087bd2c549f7919b96ee465d4cc3318d2237