Merge branch 'master' into el5

shellinabox-ssh-options.patch

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

@@ -8,7 +8,7 @@
 
 Name:           shellinabox
 Version:        2.14
-Release:        25.git%{shortcommit}%{?dist}
+Release:        27.git%{shortcommit}%{?dist}
 Summary:        Web based AJAX terminal emulator
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -17,6 +17,7 @@ Source0:        https://github.com/pythonanywhere/shellinabox_fork/archive/%{com
 Source1:        shellinaboxd.sysconfig
 Source2:        shellinaboxd.service
 Source3:        shellinaboxd.init
+Patch0:         %{name}-ssh-options.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
@@ -46,6 +47,7 @@ browser plugins.
 
 %prep
 %setup -qn %{name}_fork-%{commit}
+%patch0 -p1
 
 %build
 %configure --disable-runtime-loading
@@ -134,6 +136,12 @@ fi
 %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name}
 
 %changelog
+* 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.