From 7e7462beb655c1253cfadee9d8f85d1ee43a8ff8 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 6 Aug 2013 08:58:06 +0200 Subject: [PATCH 1/7] 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 2dcadf87a1f90ff98144d7aeedaedd1e7814c87f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 23:56:50 +0000 Subject: [PATCH 2/7] - 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 3/7] - 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 4/7] 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 7d5b3fb7118bb479244801ae1a30c5377d0b89bd Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 9 Mar 2017 13:50:15 +0100 Subject: [PATCH 5/7] 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 2df8d785aec295abca3e66d129638a317c5f365c Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 5 Apr 2017 14:11:19 +0200 Subject: [PATCH 6/7] 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 2f6ba9bd583d840521173a6c731db85cbe0c1f0c Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 7 Dec 2017 16:54:21 +0100 Subject: [PATCH 7/7] 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.