Compare commits

...
Sign in to create a new pull request.

14 commits

Author SHA1 Message Date
Simone Caronni
2f6ba9bd58 Disable SSHv1 options 2017-12-07 16:59:42 +01:00
Simone Caronni
2df8d785ae Remove support for RHEL/CentOS 5 2017-04-05 14:11:51 +02:00
Simone Caronni
7d5b3fb711 Udpate sources 2017-03-09 13:50:45 +01:00
Simone Caronni
e544d4c679 Update to 2.20 2017-03-09 13:48:27 +01:00
Fedora Release Engineering
8e7b473894 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-03-09 13:48:22 +01:00
Fedora Release Engineering
2dcadf87a1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2017-03-09 13:48:17 +01:00
Simone Caronni
cc48aa4463 Merge branch 'master' into el6 2015-12-11 11:32:38 +01:00
Simone Caronni
f651658089 Merge branch 'master' into el6 2015-09-01 16:14:51 +02:00
Simone Caronni
d7ffa93320 Merge branch 'master' into el6 2015-08-31 13:16:46 +02:00
Simone Caronni
5ff7993a40 Merge branch 'master' into el6 2015-08-26 18:51:45 +02:00
Simone Caronni
7c1d4d0007 Merge branch 'master' into el6 2015-08-26 18:32:58 +02:00
Simone Caronni
0c99cf5614 Merge branch 'master' into el6 2014-06-11 11:43:24 +02:00
Simone Caronni
881b8d3523 Merge branch 'master' into el6 2013-08-06 09:03:10 +02:00
Simone Caronni
7e7462beb6 FTBFS rawhide, remove f17 2013-08-06 08:58:06 +02:00
4 changed files with 37 additions and 24 deletions

1
.gitignore vendored
View file

@ -4,3 +4,4 @@
/shellinabox-2.17.tar.gz
/shellinabox-2.18.tar.gz
/shellinabox-2.19.tar.gz
/shellinabox-2.20.tar.gz

View file

@ -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

View file

@ -1,17 +1,11 @@
%global username shellinabox
%if 0%{?rhel} == 5
%define _sharedstatedir /var/lib
%endif
Name: shellinabox
Version: 2.19
Release: 1%{?dist}
Version: 2.20
Release: 5%{?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,27 @@ fi
%attr(750,%{username},%{username}) %{_sharedstatedir}/%{name}
%changelog
* 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).

View file

@ -1 +1 @@
bf2d85f6328f83dda7f8c5ac749187f5 shellinabox-2.19.tar.gz
SHA512 (shellinabox-2.20.tar.gz) = 369fb6e0041fc3eb52a533f14d1f856a71ec1bf166441e25a5d61bb129f2db5de6b61205ddd0cb08d53384baaf4e087bd2c549f7919b96ee465d4cc3318d2237