From 7e7462beb655c1253cfadee9d8f85d1ee43a8ff8 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 6 Aug 2013 08:58:06 +0200 Subject: [PATCH 01/39] FTBFS rawhide, remove f17 --- shellinabox.spec | 62 +++++++++++++----------------------------------- 1 file changed, 17 insertions(+), 45 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 7dfd0f0..ccb30cd 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -8,7 +8,7 @@ Name: shellinabox Version: 2.14 -Release: 24.git%{shortcommit}%{?dist} +Release: 25.git%{shortcommit}%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -22,29 +22,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel BuildRequires: zlib-devel Requires: openssl +Requires(pre): shadow-utils -%if 0%{?fedora} == 17 -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -%endif - -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -Requires(post): systemd-sysv -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%if 0%{?fedora} || 0%{?rhel} >= 7 +BuildRequires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %endif %if 0%{?rhel} == 5 || 0%{?rhel} == 6 -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service +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 @@ -94,31 +87,7 @@ 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 @@ -149,7 +118,6 @@ fi %endif - %files %doc AUTHORS NEWS README README.Fedora GPL-2 COPYING %doc shellinabox/styles.css shellinabox/print-styles.css @@ -165,8 +133,12 @@ fi %endif %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} - %changelog +* Tue Aug 06 2013 Simone Caronni - 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. + * Tue Jun 11 2013 Simone Caronni - 2.14-24.git88822c1 - Fix SSL support (#973058). - SPEC file cleanup. From 61fa79776f87505af48473cc48a3760c3d6d66ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 23:56:50 +0000 Subject: [PATCH 02/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index f153295..32034f1 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -6,7 +6,7 @@ Name: shellinabox Version: 2.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -143,6 +143,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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). From d417e5a45c2522cac8f085c2abba729bef544977 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 13:23:25 +0000 Subject: [PATCH 03/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 32034f1..485b221 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -6,7 +6,7 @@ Name: shellinabox Version: 2.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -143,6 +143,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From a38ea4c4d601cab6cb6418fcaf4e3d3fc374fc9b Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 9 Mar 2017 13:45:50 +0100 Subject: [PATCH 04/39] Update to 2.20 --- shellinabox.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 485b221..01f475d 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -5,8 +5,8 @@ %endif Name: shellinabox -Version: 2.19 -Release: 3%{?dist} +Version: 2.20 +Release: 1%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -143,6 +143,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From 2dcadf87a1f90ff98144d7aeedaedd1e7814c87f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 23:56:50 +0000 Subject: [PATCH 05/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index f153295..32034f1 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -6,7 +6,7 @@ Name: shellinabox Version: 2.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -143,6 +143,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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). From 8e7b473894e089625b4e94e45a152e7082e7c876 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 13:23:25 +0000 Subject: [PATCH 06/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 32034f1..485b221 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -6,7 +6,7 @@ Name: shellinabox Version: 2.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -143,6 +143,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From e544d4c67979d0fef76ebd9c30f5fda44809aa64 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 9 Mar 2017 13:45:50 +0100 Subject: [PATCH 07/39] Update to 2.20 --- shellinabox.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 485b221..01f475d 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -5,8 +5,8 @@ %endif Name: shellinabox -Version: 2.19 -Release: 3%{?dist} +Version: 2.20 +Release: 1%{?dist} Summary: Web based AJAX terminal emulator Group: System Environment/Daemons License: GPLv2 @@ -143,6 +143,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From e012c7f28d0ecbdf8b288cecc72a74970258087a Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 9 Mar 2017 13:50:15 +0100 Subject: [PATCH 08/39] Udpate sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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/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 From 7d5b3fb7118bb479244801ae1a30c5377d0b89bd Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 9 Mar 2017 13:50:15 +0100 Subject: [PATCH 09/39] Udpate sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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/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 From f6c68951a5e82813f5439d65282ca40f027ccf61 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 5 Apr 2017 14:11:19 +0200 Subject: [PATCH 10/39] Remove support for RHEL/CentOS 5 --- shellinabox.spec | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 01f475d..d160013 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,17 +1,11 @@ %global username shellinabox -%if 0%{?rhel} == 5 -%define _sharedstatedir /var/lib -%endif - Name: shellinabox Version: 2.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web based AJAX terminal emulator -Group: System Environment/Daemons License: GPLv2 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 @@ -36,7 +30,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 @@ -60,8 +54,6 @@ make %{?_smp_mflags} chmod 644 %{name}/* %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}%{_sharedstatedir}/%{name} @@ -84,10 +76,6 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd %endif -%clean -rm -rf %{buildroot} - - %pre getent group %username >/dev/null || groupadd -r %username &>/dev/null || : getent passwd %username >/dev/null || useradd -r -s /sbin/nologin \ @@ -107,7 +95,7 @@ exit 0 %endif -%if 0%{?rhel} == 6 || 0%{?rhel} == 5 +%if 0%{?rhel} == 6 %post /sbin/chkconfig --add shellinaboxd @@ -127,7 +115,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 @@ -143,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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. From 2df8d785aec295abca3e66d129638a317c5f365c Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 5 Apr 2017 14:11:19 +0200 Subject: [PATCH 11/39] Remove support for RHEL/CentOS 5 --- shellinabox.spec | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/shellinabox.spec b/shellinabox.spec index 01f475d..d160013 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -1,17 +1,11 @@ %global username shellinabox -%if 0%{?rhel} == 5 -%define _sharedstatedir /var/lib -%endif - Name: shellinabox Version: 2.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web based AJAX terminal emulator -Group: System Environment/Daemons License: GPLv2 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 @@ -36,7 +30,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 @@ -60,8 +54,6 @@ make %{?_smp_mflags} chmod 644 %{name}/* %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}%{_sharedstatedir}/%{name} @@ -84,10 +76,6 @@ install -p -m 755 -D %{SOURCE3} %{buildroot}%{_initrddir}/shellinaboxd %endif -%clean -rm -rf %{buildroot} - - %pre getent group %username >/dev/null || groupadd -r %username &>/dev/null || : getent passwd %username >/dev/null || useradd -r -s /sbin/nologin \ @@ -107,7 +95,7 @@ exit 0 %endif -%if 0%{?rhel} == 6 || 0%{?rhel} == 5 +%if 0%{?rhel} == 6 %post /sbin/chkconfig --add shellinaboxd @@ -127,7 +115,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 @@ -143,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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. From faaf1261453d5feba7d3f38e3fdc353ff6b5e428 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 18:32:31 +0000 Subject: [PATCH 12/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index d160013..c45888d 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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. From 5528a67b538327d7f72d4b54544dc2b71a40d521 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 08:24:39 +0000 Subject: [PATCH 13/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index c45888d..7c7a5f0 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From 37c7e3d6d545a4d99a959f38ddc4c369a375de46 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 7 Dec 2017 16:54:21 +0100 Subject: [PATCH 14/39] Disable SSHv1 options --- shellinabox-ssh-options.patch | 16 ++++++++++------ shellinabox.spec | 5 ++++- 2 files changed, 14 insertions(+), 7 deletions(-) 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 7c7a5f0..f68243e 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From 2f6ba9bd583d840521173a6c731db85cbe0c1f0c Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 7 Dec 2017 16:54:21 +0100 Subject: [PATCH 15/39] Disable SSHv1 options --- shellinabox-ssh-options.patch | 16 ++++++++++------ shellinabox.spec | 11 ++++++++++- 2 files changed, 20 insertions(+), 7 deletions(-) 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 d160013..f68243e 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 2%{?dist} +Release: 5%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,15 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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. From 01500882f81e56ab51ff8578d1086530cfae9438 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 16:38:30 +0000 Subject: [PATCH 16/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 f68243e..2733f32 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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. From e72425def68c8adc7934e1300af6fab5c839ec76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:04:07 +0000 Subject: [PATCH 17/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 2733f32..1948aa8 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From 5a3ff32de4f60d93a4312ff0d2c08c846be32e81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:19:49 +0000 Subject: [PATCH 18/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 1948aa8..0e55252 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From 180ec9a4f07454001f99eb1ab2aa75bb38c0fd4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:13:21 +0000 Subject: [PATCH 19/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 0e55252..99eca43 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From 4da7932315ef149181f718ecdfa4d13a74698940 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:23:06 +0000 Subject: [PATCH 20/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 99eca43..eaab7d4 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From aabaa7085d4758be2ecfb37433451c13650f2c54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:39:48 +0000 Subject: [PATCH 21/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 eaab7d4..9af7910 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -130,6 +130,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From d87707c8844c8fb1d1773ae71c40d1293de089d8 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 29 Jul 2020 12:06:44 -0600 Subject: [PATCH 22/39] Initialize sigset in configure test --- shellinabox-gcc11.patch | 13 +++++++++++++ shellinabox.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 shellinabox-gcc11.patch 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.spec b/shellinabox.spec index 9af7910..087e6d4 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -13,6 +13,7 @@ Source2: shellinaboxd.service Source3: shellinaboxd.init Patch0: %{name}-ssh-options.patch +Patch1: %{name}-gcc11.patch BuildRequires: autoconf BuildRequires: automake @@ -46,6 +47,7 @@ browser plugins. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build autoreconf -vif @@ -130,6 +132,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From a57d5e4191e535cb154759ac1d62a614f6ceef93 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:27:15 +0000 Subject: [PATCH 23/39] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- shellinabox.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/shellinabox.spec b/shellinabox.spec index 087e6d4..607d2c2 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -15,6 +15,7 @@ Source3: shellinaboxd.init Patch0: %{name}-ssh-options.patch Patch1: %{name}-gcc11.patch +BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool From 446c2208c907430de493429f27efb428cb6e7204 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:19:39 +0000 Subject: [PATCH 24/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 607d2c2..93eedc5 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From f3612c826ce6eb73b02ea7eec56d8679025b2214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:19 +0100 Subject: [PATCH 25/39] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- shellinabox.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 93eedc5..f6b5db0 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,10 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From be6ca3853794c8456446be98d31c293aadd0e1ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:29:47 +0000 Subject: [PATCH 26/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 f6b5db0..1f338ed 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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. From 06049adb191cfd75c3679b6051892173a9626c23 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:14:58 +0200 Subject: [PATCH 27/39] Rebuilt with OpenSSL 3.0.0 --- shellinabox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shellinabox.spec b/shellinabox.spec index 1f338ed..999f443 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From b5b77d803e17383d914092a4025eb558447ee9cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:49:02 +0000 Subject: [PATCH 28/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 999f443..d545e5b 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From 7a8034503ca893785f2c0e3ea3caa3b6aa988da0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:31:20 +0000 Subject: [PATCH 29/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 d545e5b..79eb6fa 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From 3736b4d5030ff94104e684760b34a90cc2492c12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:10:00 +0000 Subject: [PATCH 30/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_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 79eb6fa..e82e640 100644 --- a/shellinabox.spec +++ b/shellinabox.spec @@ -2,7 +2,7 @@ Name: shellinabox Version: 2.20 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Web based AJAX terminal emulator License: GPLv2 URL: https://github.com/%{name}/%{name} @@ -133,6 +133,9 @@ fi %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name} %changelog +* 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 From 748cdd481ce7326700397b96b7f46b8d3c478799 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 26 Apr 2023 06:10:11 +0200 Subject: [PATCH 31/39] 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 32/39] 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 33/39] 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 34/39] 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 35/39] 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 36/39] 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 37/39] 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 38/39] 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 39/39] 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