Revision: 7352
http://sourceforge.net/p/ipcop/svn/7352
Author: owes
Date: 2014-03-21 20:57:35 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
Update openssh to 6.6p1. Adds new EdDSA key. TODO: check /etc config files.
Modified Paths:
--------------
ipcop/trunk/config/cfgroot/backup-include
ipcop/trunk/config/rootfiles/common/openssh
ipcop/trunk/html/cgi-bin/remote.cgi
ipcop/trunk/lfs/openssh
ipcop/trunk/src/rc.d/rc.sysinit
ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
ipcop/trunk/updates/2.1.3/information.xml
ipcop/trunk/updates/2.1.3/setup
Modified: ipcop/trunk/config/cfgroot/backup-include
===================================================================
--- ipcop/trunk/config/cfgroot/backup-include 2014-03-21 20:45:56 UTC (rev
7351)
+++ ipcop/trunk/config/cfgroot/backup-include 2014-03-21 20:57:35 UTC (rev
7352)
@@ -9,6 +9,8 @@
/etc/rc.d/rc.firewall.local
/etc/ssh/ssh_host_dsa_key
/etc/ssh/ssh_host_dsa_key.pub
+/etc/ssh/ssh_host_ed25519_key
+/etc/ssh/ssh_host_ed25519_key.pub
/etc/ssh/ssh_host_key
/etc/ssh/ssh_host_key.pub
/etc/ssh/ssh_host_rsa_key
Modified: ipcop/trunk/config/rootfiles/common/openssh
===================================================================
--- ipcop/trunk/config/rootfiles/common/openssh 2014-03-21 20:45:56 UTC (rev
7351)
+++ ipcop/trunk/config/rootfiles/common/openssh 2014-03-21 20:57:35 UTC (rev
7352)
@@ -3,6 +3,8 @@
etc/ssh/ssh_config
#etc/ssh/ssh_host_dsa_key
#etc/ssh/ssh_host_dsa_key.pub
+#etc/ssh/ssh_host_ed25519_key
+#etc/ssh/ssh_host_ed25519_key.pub
#etc/ssh/ssh_host_key
#etc/ssh/ssh_host_key.pub
#etc/ssh/ssh_host_rsa_key
Modified: ipcop/trunk/html/cgi-bin/remote.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/remote.cgi 2014-03-21 20:45:56 UTC (rev 7351)
+++ ipcop/trunk/html/cgi-bin/remote.cgi 2014-03-21 20:57:35 UTC (rev 7352)
@@ -1,11 +1,26 @@
#!/usr/bin/perl
#
-# SmoothWall CGIs
+# This file is part of the IPCop Firewall.
#
-# This code is distributed under the terms of the GPL
+# IPCop is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
+# IPCop is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
+#
+# remote.cgi originally (2001) from the Smoothwall project
# (c) The SmoothWall Team
#
+# Changes since 2001
+# (c) 2001-2014, the IPCop team
+#
# $Id$
#
@@ -144,6 +159,7 @@
&viewkey("/etc/ssh/ssh_host_key.pub", "RSA1");
&viewkey("/etc/ssh/ssh_host_rsa_key.pub", "RSA2");
&viewkey("/etc/ssh/ssh_host_dsa_key.pub", "DSA");
+&viewkey("/etc/ssh/ssh_host_ed25519_key.pub", "EdDSA");
&viewkey("/etc/ssh/authorized_keys", "x");
&viewkey("/root/.ssh/authorized_keys", "x");
Modified: ipcop/trunk/lfs/openssh
===================================================================
--- ipcop/trunk/lfs/openssh 2014-03-21 20:45:56 UTC (rev 7351)
+++ ipcop/trunk/lfs/openssh 2014-03-21 20:57:35 UTC (rev 7352)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = openssh
-VER = 6.4p1
+VER = 6.6p1
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a62b88b884df0b09b8a8c5789ac9e51b
+$(DL_FILE)_MD5 = 3e9800e6bca1fbac0eea4d41baa7f239
install : $(TARGET)
Modified: ipcop/trunk/src/rc.d/rc.sysinit
===================================================================
--- ipcop/trunk/src/rc.d/rc.sysinit 2014-03-21 20:45:56 UTC (rev 7351)
+++ ipcop/trunk/src/rc.d/rc.sysinit 2014-03-21 20:57:35 UTC (rev 7352)
@@ -319,6 +319,11 @@
/usr/bin/ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -N ""
test_ok
fi
+if [ ! -e /etc/ssh/ssh_host_ed25519_key ]; then
+ echo -ne "Generating SSH EdDSA key. This may take several minutes ... "
+ /usr/bin/ssh-keygen -q -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N ""
+ test_ok
+fi
if [ ! -e /var/ipcop/backup/backup.key ]; then
echo -ne "Generating backup key. This may take several minutes ... "
Modified: ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
===================================================================
--- ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-21 20:45:56 UTC
(rev 7351)
+++ ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-21 20:57:35 UTC
(rev 7352)
@@ -3,6 +3,7 @@
/etc/rc.d/rc.sysinit
/home/httpd/cgi-bin/logproxy.cgi
/home/httpd/cgi-bin/proxy.cgi
+/home/httpd/cgi-bin/remote.cgi
/home/httpd/cgi-bin/updates.cgi
/home/httpd/cgi-bin/urlfilter.cgi
/usr/lib/ipcop/firewall-lib.pl
@@ -189,6 +190,12 @@
/usr/lib/libldap-2.4.so.2
/usr/lib/libldap-2.4.so.2.10.2
##
+## openssh-6.6p1
+/usr/bin/scp
+/usr/bin/ssh-keygen
+/usr/sbin/sftp-server
+/usr/sbin/sshd
+##
## openssl-1.0.1f
/usr/bin/openssl
/usr/lib/libcrypto.so
Modified: ipcop/trunk/updates/2.1.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.3/information.xml 2014-03-21 20:45:56 UTC (rev
7351)
+++ ipcop/trunk/updates/2.1.3/information.xml 2014-03-21 20:57:35 UTC (rev
7352)
@@ -9,7 +9,7 @@
Upgrade apcid to 2.0.22, bind to 9.9.5, cairo to 1.12.16, coreutils to
8.22, db to 6.0.30, e2fsprogs to 1.42.9, ethtool to 3.13,
fcron to 3.1.2, freetype to 2.5.3, glib to 2.38.2, gnupg to 1.4.16,
iproute2 to 3.12.0, libgcrypt to 1.6.1, libgpg-error to 1.12, libnl to
3.2.24, libpng to 1.6.10, logrotate to 3.8.7,
- openldap to 2.4.39, openssl to 1.0.1f,
+ openldap to 2.4.39, openssh to 6.6p1, openssl to 1.0.1f,
pango to 1.36.3, pcre to 8.34, procps to 3.3.9, psmisc to 22.21,
readline to 6.3, sqlite to 3.8.4.1,
squid-langpack to 20140220, tzdata to 2014a, ulogd to 2.0.3,
util-linux to 2.24.1.</description>
<previousversion>2.1.2</previousversion>
Modified: ipcop/trunk/updates/2.1.3/setup
===================================================================
--- ipcop/trunk/updates/2.1.3/setup 2014-03-21 20:45:56 UTC (rev 7351)
+++ ipcop/trunk/updates/2.1.3/setup 2014-03-21 20:57:35 UTC (rev 7352)
@@ -155,6 +155,9 @@
# Cannot unpack to symlinked /var/log on FLASH installation, so copy here
cp /var/ipcop/traffic/empty-ulogd.db /var/log/traffic/ulogd.db
+# Use new sshd
+/usr/local/bin/restartssh
+
# Restart fcrond to activate new version
/usr/bin/killall fcron
# We need a small pause to give fcron time to stop
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
