This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 90d082f432e2763ddf16c22a7b95327b56b3d452 (commit) via 4ef2ecc27eb2591d20ed83165131687df907ce46 (commit) via 6c1220f5b81ef688912456d1c45f6ac87a3fdf3f (commit) from dbf157bbaa613a356b3ca5f6d294147f1daded2e (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 90d082f432e2763ddf16c22a7b95327b56b3d452 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 20 22:04:56 2010 +0100
New package: eject.
commit 4ef2ecc27eb2591d20ed83165131687df907ce46 Author: Jan Paul Tuecking earl@ipfire.org Date: Sat Feb 20 01:21:13 2010 +0100
Added checkbox to remote.cgi to change ssh port
commit 6c1220f5b81ef688912456d1c45f6ac87a3fdf3f Author: Jan Paul Tuecking earl@ipfire.org Date: Sat Feb 20 01:07:25 2010 +0100
Added the possibility to change the ssh port from 222 back to standart port 22
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/remote.cgi | 31 ++++++++++++++++++++++++------- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + langs/fr/cgi-bin/fr.pl | 1 + lfs/{ethtool => eject} | 8 ++++---- make.sh | 1 + src/misc-progs/sshctrl.c | 9 +++++++-- 7 files changed, 39 insertions(+), 13 deletions(-) copy lfs/{ethtool => eject} (96%)
Difference in files: diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index e760e7a..4d6eb19 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -37,7 +37,7 @@ my $counter = 0; &Header::showhttpheaders();
$remotesettings{'ENABLE_SSH'} = 'off'; -$remotesettings{'ENABLE_SSH_PROTOCOL1'} = 'off'; +$remotesettings{'ENABLE_SSH_PORTOCOL1'} = 'off'; $remotesettings{'ENABLE_SSH_PORTFW'} = 'off'; $remotesettings{'ACTION'} = ''; &Header::getcgihash(%remotesettings); @@ -66,7 +66,7 @@ if ( (($remotesettings{'ACTION'} eq $Lang::tr{'save'}) || ($remotesettings{'ACTI unlink "${General::swroot}/remote/enablessh"; }
- if ($remotesettings{'ENABLE_SSH_PROTOCOL1'} eq 'on') + if ($remotesettings{'ENABLE_SSH_PORTOCOL1'} eq 'on') { &General::log($Lang::tr{'ssh1 enabled'}); } @@ -74,6 +74,16 @@ if ( (($remotesettings{'ACTION'} eq $Lang::tr{'save'}) || ($remotesettings{'ACTI { &General::log($Lang::tr{'ssh1 disabled'}); } + + if ($remotesettings{'SSH_PORT'} eq 'on') + { + &General::log("SSH Port 22"); + } + else + { + &General::log("SSH Port 222"); + } + if ( $remotesettings{'ACTION'} eq $Lang::tr{'ssh tempstart15'} || $remotesettings{'ACTION'} eq $Lang::tr{'ssh tempstart30'} ){ if ($remotesettings{'ENABLE_SSH'} eq 'off') { @@ -101,9 +111,9 @@ else { $checked{'ENABLE_SSH'}{'off'} = ''; $checked{'ENABLE_SSH'}{'on'} = ''; $checked{'ENABLE_SSH'}{$remotesettings{'ENABLE_SSH'}} = "checked='checked'"; -$checked{'ENABLE_SSH_PROTOCOL1'}{'off'} = ''; -$checked{'ENABLE_SSH_PROTOCOL1'}{'on'} = ''; -$checked{'ENABLE_SSH_PROTOCOL1'}{$remotesettings{'ENABLE_SSH_PROTOCOL1'}} = "checked='checked'"; +$checked{'ENABLE_SSH_PORTOCOL1'}{'off'} = ''; +$checked{'ENABLE_SSH_PORTOCOL1'}{'on'} = ''; +$checked{'ENABLE_SSH_PORTOCOL1'}{$remotesettings{'ENABLE_SSH_PORTOCOL1'}} = "checked='checked'"; $checked{'ENABLE_SSH_PORTFW'}{'off'} = ''; $checked{'ENABLE_SSH_PORTFW'}{'on'} = ''; $checked{'ENABLE_SSH_PORTFW'}{$remotesettings{'ENABLE_SSH_PORTFW'}} = "checked='checked'"; @@ -113,7 +123,9 @@ $checked{'ENABLE_SSH_PASSWORDS'}{$remotesettings{'ENABLE_SSH_PASSWORDS'}} = "che $checked{'ENABLE_SSH_KEYS'}{'off'} = ''; $checked{'ENABLE_SSH_KEYS'}{'on'} = ''; $checked{'ENABLE_SSH_KEYS'}{$remotesettings{'ENABLE_SSH_KEYS'}} = "checked='checked'"; - +$checked{'SSH_PORT'}{'off'} = ''; +$checked{'SSH_PORT'}{'on'} = ''; +$checked{'SSH_PORT'}{$remotesettings{'SSH_PORT'}} = "checked='checked'";
&Header::openpage($Lang::tr{'remote access'}, 1, '');
@@ -136,7 +148,7 @@ print <<END </tr> <tr> <td> </td> - <td><input type='checkbox' name='ENABLE_SSH_PROTOCOL1' $checked{'ENABLE_SSH_PROTOCOL1'}{'on'} /></td> + <td><input type='checkbox' name='ENABLE_SSH_PORTOCOL1' $checked{'ENABLE_SSH_PORTOCOL1'}{'on'} /></td> <td width='100%' class='base'>$Lang::tr{'ssh1 support'}</td> </tr> <tr> @@ -155,6 +167,11 @@ print <<END <td width='100%' class='base'>$Lang::tr{'ssh keys'}</td> </tr> <tr> + <td> </td> + <td><input type='checkbox' name='SSH_PORT' $checked{'SSH_PORT'}{'on'} /></td> + <td width='100%' class='base'>$Lang::tr{'ssh port'}</td> +</tr> +<tr> <td align='center' colspan='3'><hr /> <input type='submit' name='ACTION' value='$Lang::tr{'ssh tempstart15'}' /> <input type='submit' name='ACTION' value='$Lang::tr{'ssh tempstart30'}' /> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index bc95648..147b79a 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1563,6 +1563,7 @@ 'ssh keys' => 'Authentifizierung auf Basis öffentlicher Schlüssel zulassen', 'ssh no auth' => 'Sie haben keinerlei Authentifizierungverfahren zugelassen; dies wird Ihre Anmeldung verhindern', 'ssh passwords' => 'Passwortbasierte Authentifizierung zulassen', +'ssh port' => 'SSH Port auf 22 setzen (Standard ist 222)', 'ssh portfw' => 'TCP-Weiterleitung zulassen', 'ssh tempstart15' => 'SSH-Deamon in 15 Minuten beenden', 'ssh tempstart30' => 'SSH-Deamon in 30 Minuten beenden', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7e5ba5e..22f3561 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1595,6 +1595,7 @@ 'ssh keys' => 'Allow public key based authentication', 'ssh no auth' => 'You have not allowed any authentication methods; this will stop you logging in', 'ssh passwords' => 'Allow password based authentication', +'ssh port' => 'SSH port set to 22 (default is 222)', 'ssh portfw' => 'Allow TCP forwarding', 'ssh tempstart15' => 'Stop SSH demon in 15 minutes', 'ssh tempstart30' => 'Stop SSH demon in 30 minutes', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 7e5ba5e..22f3561 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1595,6 +1595,7 @@ 'ssh keys' => 'Allow public key based authentication', 'ssh no auth' => 'You have not allowed any authentication methods; this will stop you logging in', 'ssh passwords' => 'Allow password based authentication', +'ssh port' => 'SSH port set to 22 (default is 222)', 'ssh portfw' => 'Allow TCP forwarding', 'ssh tempstart15' => 'Stop SSH demon in 15 minutes', 'ssh tempstart30' => 'Stop SSH demon in 30 minutes', diff --git a/lfs/eject b/lfs/eject new file mode 100644 index 0000000..8683194 --- /dev/null +++ b/lfs/eject @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program 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 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.1.5 + +THISAPP = eject-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/eject +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b96a6d4263122f1711db12701d79f738 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 62f0a55..c7a6924 100755 --- a/make.sh +++ b/make.sh @@ -633,6 +633,7 @@ buildipfire() { ipfiremake usb_modeswitch ipfiremake zerofree ipfiremake mdadm + ipfiremake eject echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/misc-progs/sshctrl.c b/src/misc-progs/sshctrl.c index 52515ea..0bdc583 100644 --- a/src/misc-progs/sshctrl.c +++ b/src/misc-progs/sshctrl.c @@ -70,9 +70,14 @@ int main(int argc, char *argv[]) strlcat(command, "s/^PasswordAuthentication .*$/PasswordAuthentication yes/;", STRING_SIZE - 1 );
if(findkey(kv, "ENABLE_SSH_PORTFW", buffer) && !strcmp(buffer,"on")) - strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding yes/", STRING_SIZE - 1 ); + strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding yes/;", STRING_SIZE - 1 ); else - strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding no/", STRING_SIZE - 1 ); + strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding no/;", STRING_SIZE - 1 ); + + if(findkey(kv, "SSH_PORT", buffer) && !strcmp(buffer,"on")) + strlcat(command, "s/^Port .*$/Port 22/", STRING_SIZE - 1 ); + else + strlcat(command, "s/^Port .*$/Port 222/", STRING_SIZE - 1 );
freekeyvalues(kv);
hooks/post-receive -- IPFire 2.x development tree