IPFire-SCM September 2011

ipfire-scm@lists.ipfire.org

1 participants
47 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 25fadf991c85ced2b12b5b7a7dea83915d0436ca
by git＠ipfire.org 18 Sep '11

18 Sep '11

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 25fadf991c85ced2b12b5b7a7dea83915d0436ca (commit) via 9e6810e8c663f02c68ebbc2f572e8eca5871f71a (commit) from cd0c0a0de72e975c87426642d09897aaf3d293e9 (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 25fadf991c85ced2b12b5b7a7dea83915d0436ca Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 18 13:34:47 2011 +0200 transmission: New package. commit 9e6810e8c663f02c68ebbc2f572e8eca5871f71a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 18 13:32:30 2011 +0200 libevent2: New package. Needs to be added to core update 54. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/initscripts | 1 + config/rootfiles/common/libevent2 | 45 ++++++++++++++ config/rootfiles/packages/transmission | 66 +++++++++++++++++++++ config/transmission/settings.json | 62 +++++++++++++++++++ lfs/{libevent => libevent2} | 4 +- lfs/{rtorrent => transmission} | 23 ++++--- make.sh | 2 + src/initscripts/init.d/{template => transmission} | 17 ++---- src/paks/{motion => transmission}/install.sh | 18 +++++- src/paks/{nut => transmission}/uninstall.sh | 7 +- src/paks/{asterisk => transmission}/update.sh | 1 + 11 files changed, 217 insertions(+), 29 deletions(-) create mode 100644 config/rootfiles/common/libevent2 create mode 100644 config/rootfiles/packages/transmission create mode 100644 config/transmission/settings.json copy lfs/{libevent => libevent2} (97%) copy lfs/{rtorrent => transmission} (86%) copy src/initscripts/init.d/{template => transmission} (64%) copy src/paks/{motion => transmission}/install.sh (79%) copy src/paks/{nut => transmission}/uninstall.sh (95%) copy src/paks/{asterisk => transmission}/update.sh (99%) Difference in files: diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 9393aec..fe9cc31 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -118,6 +118,7 @@ etc/rc.d/init.d/teamspeak etc/rc.d/init.d/template #etc/rc.d/init.d/tftpd etc/rc.d/init.d/tmpfs +#etc/rc.d/init.d/transmission etc/rc.d/init.d/udev etc/rc.d/init.d/udev_retry etc/rc.d/init.d/upnpd diff --git a/config/rootfiles/common/libevent2 b/config/rootfiles/common/libevent2 new file mode 100644 index 0000000..fb3d8bd --- /dev/null +++ b/config/rootfiles/common/libevent2 @@ -0,0 +1,45 @@ +#usr/include/event2 +#usr/include/event2/buffer.h +#usr/include/event2/buffer_compat.h +#usr/include/event2/bufferevent.h +#usr/include/event2/bufferevent_compat.h +#usr/include/event2/bufferevent_ssl.h +#usr/include/event2/bufferevent_struct.h +#usr/include/event2/dns.h +#usr/include/event2/dns_compat.h +#usr/include/event2/dns_struct.h +#usr/include/event2/event-config.h +#usr/include/event2/event.h +#usr/include/event2/event_compat.h +#usr/include/event2/event_struct.h +#usr/include/event2/http.h +#usr/include/event2/http_compat.h +#usr/include/event2/http_struct.h +#usr/include/event2/keyvalq_struct.h +#usr/include/event2/listener.h +#usr/include/event2/rpc.h +#usr/include/event2/rpc_compat.h +#usr/include/event2/rpc_struct.h +#usr/include/event2/tag.h +#usr/include/event2/tag_compat.h +#usr/include/event2/thread.h +#usr/include/event2/util.h +usr/lib/libevent-2.0.so.5 +usr/lib/libevent-2.0.so.5.1.2 +usr/lib/libevent_core-2.0.so.5 +usr/lib/libevent_core-2.0.so.5.1.2 +usr/lib/libevent_extra-2.0.so.5 +usr/lib/libevent_extra-2.0.so.5.1.2 +usr/lib/libevent_openssl-2.0.so.5 +usr/lib/libevent_openssl-2.0.so.5.1.2 +#usr/lib/libevent_openssl.a +#usr/lib/libevent_openssl.la +#usr/lib/libevent_openssl.so +usr/lib/libevent_pthreads-2.0.so.5 +usr/lib/libevent_pthreads-2.0.so.5.1.2 +#usr/lib/libevent_pthreads.a +#usr/lib/libevent_pthreads.la +#usr/lib/libevent_pthreads.so +#usr/lib/pkgconfig/libevent.pc +#usr/lib/pkgconfig/libevent_openssl.pc +#usr/lib/pkgconfig/libevent_pthreads.pc diff --git a/config/rootfiles/packages/transmission b/config/rootfiles/packages/transmission new file mode 100644 index 0000000..a784341 --- /dev/null +++ b/config/rootfiles/packages/transmission @@ -0,0 +1,66 @@ +#etc/transmission +etc/transmission/settings.json +usr/bin/transmission-cli +usr/bin/transmission-create +usr/bin/transmission-daemon +usr/bin/transmission-edit +usr/bin/transmission-remote +usr/bin/transmission-show +#usr/share/man/man1/transmission-cli.1 +#usr/share/man/man1/transmission-create.1 +#usr/share/man/man1/transmission-daemon.1 +#usr/share/man/man1/transmission-edit.1 +#usr/share/man/man1/transmission-remote.1 +#usr/share/man/man1/transmission-show.1 +usr/share/transmission +#usr/share/transmission/web +#usr/share/transmission/web/LICENSE +#usr/share/transmission/web/images +#usr/share/transmission/web/images/buttons +#usr/share/transmission/web/images/buttons/cancel.png +#usr/share/transmission/web/images/buttons/file_priority_buttons.png +#usr/share/transmission/web/images/buttons/file_wanted_buttons.png +#usr/share/transmission/web/images/buttons/info_activity.png +#usr/share/transmission/web/images/buttons/info_files.png +#usr/share/transmission/web/images/buttons/info_general.png +#usr/share/transmission/web/images/buttons/info_peers.png +#usr/share/transmission/web/images/buttons/info_trackers.png +#usr/share/transmission/web/images/buttons/tab_backgrounds.png +#usr/share/transmission/web/images/buttons/tab_backgrounds_highlight.png +#usr/share/transmission/web/images/buttons/toolbar_buttons.png +#usr/share/transmission/web/images/buttons/torrent_buttons.png +#usr/share/transmission/web/images/favicon.ico +#usr/share/transmission/web/images/favicon.png +#usr/share/transmission/web/images/graphics +#usr/share/transmission/web/images/graphics/chrome.png +#usr/share/transmission/web/images/graphics/filter_bar.png +#usr/share/transmission/web/images/graphics/filter_icon.png +#usr/share/transmission/web/images/graphics/iphone_chrome.png +#usr/share/transmission/web/images/graphics/lock_icon.png +#usr/share/transmission/web/images/graphics/logo.png +#usr/share/transmission/web/images/graphics/transfer_arrows.png +#usr/share/transmission/web/images/graphics/wait20.gif +#usr/share/transmission/web/images/progress +#usr/share/transmission/web/images/progress/progress.png +#usr/share/transmission/web/images/webclip-icon.png +#usr/share/transmission/web/index.html +#usr/share/transmission/web/javascript +#usr/share/transmission/web/javascript/common.js +#usr/share/transmission/web/javascript/dialog.js +#usr/share/transmission/web/javascript/formatter.js +#usr/share/transmission/web/javascript/jquery +#usr/share/transmission/web/javascript/jquery/jquery.contextmenu.min.js +#usr/share/transmission/web/javascript/jquery/jquery.form.js +#usr/share/transmission/web/javascript/jquery/jquery.form.min.js +#usr/share/transmission/web/javascript/jquery/jquery.min.js +#usr/share/transmission/web/javascript/jquery/jquery.transmenu.min.js +#usr/share/transmission/web/javascript/jquery/json.min.js +#usr/share/transmission/web/javascript/menu.js +#usr/share/transmission/web/javascript/torrent.js +#usr/share/transmission/web/javascript/transmission.js +#usr/share/transmission/web/javascript/transmission.remote.js +#usr/share/transmission/web/stylesheets +#usr/share/transmission/web/stylesheets/common.css +#usr/share/transmission/web/stylesheets/ie6.css +#usr/share/transmission/web/stylesheets/ie7.css +#usr/share/transmission/web/stylesheets/iphone.css diff --git a/config/transmission/settings.json b/config/transmission/settings.json new file mode 100644 index 0000000..a5dbdaf --- /dev/null +++ b/config/transmission/settings.json @@ -0,0 +1,62 @@ +{ + "alt-speed-down": 512, + "alt-speed-enabled": true, + "alt-speed-time-begin": 540, + "alt-speed-time-day": 127, + "alt-speed-time-enabled": false, + "alt-speed-time-end": 1020, + "alt-speed-up": 10, + "bind-address-ipv4": "0.0.0.0", + "bind-address-ipv6": "::", + "blocklist-enabled": false, + "cache-size-mb": 2, + "dht-enabled": true, + "download-dir": "/var/transmission/downloads", + "encryption": 1, + "idle-seeding-limit": 30, + "idle-seeding-limit-enabled": false, + "incomplete-dir": "/var/transmission/incomplete", + "incomplete-dir-enabled": true, + "lazy-bitfield-enabled": true, + "lpd-enabled": false, + "message-level": 2, + "open-file-limit": 32, + "peer-limit-global": 240, + "peer-limit-per-torrent": 60, + "peer-port": 6969, + "peer-port-random-high": 65535, + "peer-port-random-low": 49152, + "peer-port-random-on-start": false, + "peer-socket-tos": 0, + "pex-enabled": true, + "port-forwarding-enabled": true, + "preallocation": 1, + "proxy": "", + "proxy-auth-enabled": false, + "proxy-auth-password": "", + "proxy-auth-username": "", + "proxy-enabled": false, + "proxy-port": 80, + "proxy-type": 0, + "ratio-limit": 2, + "ratio-limit-enabled": false, + "rename-partial-files": true, + "rpc-authentication-required": false, + "rpc-bind-address": "0.0.0.0", + "rpc-enabled": true, + "rpc-password": "{b518093d8e833b34c139cea744e335ab70d827dcQSnFbsNU", + "rpc-port": 9091, + "rpc-username": "", + "rpc-whitelist": "127.0.0.1", + "rpc-whitelist-enabled": false, + "script-torrent-done-enabled": false, + "script-torrent-done-filename": "", + "speed-limit-down": 768, + "speed-limit-down-enabled": true, + "speed-limit-up": 20, + "speed-limit-up-enabled": true, + "start-added-torrents": true, + "trash-original-torrent-files": false, + "umask": 18, + "upload-slots-per-torrent": 14 +} diff --git a/lfs/libevent2 b/lfs/libevent2 new file mode 100644 index 0000000..1fbc7db --- /dev/null +++ b/lfs/libevent2 @@ -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.0.13-stable + +THISAPP = libevent-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = af786b4b3f790c9d3279792edf7867fc + +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/lfs/transmission b/lfs/transmission new file mode 100644 index 0000000..7ce4b83 --- /dev/null +++ b/lfs/transmission @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2009 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.33 + +THISAPP = transmission-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = transmission +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 76df2b002e9e243f2e4607b40c019974 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# 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 axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --disable-static + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + + # Install configuration files. + -mkdir -pv /etc/transmission + cp -vf $(DIR_SRC)/config/transmission/* /etc/transmission/ + chown -Rv nobody.nobody /etc/transmission + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 99fc86f..4fbbf0c 100755 --- a/make.sh +++ b/make.sh @@ -585,6 +585,7 @@ buildipfire() { ipfiremake rsync ipfiremake tcpwrapper ipfiremake libevent + ipfiremake libevent2 ipfiremake portmap ipfiremake nfs ipfiremake nmap @@ -700,6 +701,7 @@ buildipfire() { ipfiremake python-xattr ipfiremake intltool ipfiremake pakfire3-deps + ipfiremake transmission 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/initscripts/init.d/transmission b/src/initscripts/init.d/transmission new file mode 100644 index 0000000..2ad7d48 --- /dev/null +++ b/src/initscripts/init.d/transmission @@ -0,0 +1,45 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/ +# +# Description : +# +# Authors : +# +# Version : 00.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + boot_mesg "Starting transmission daemon..." + transmission-daemon -g /etc/transmission + ;; + + stop) + boot_mesg "Stopping transmission daemon..." + killall transmission-daemon + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc transmission-daemon + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/ diff --git a/src/paks/transmission/install.sh b/src/paks/transmission/install.sh new file mode 100644 index 0000000..c5907d4 --- /dev/null +++ b/src/paks/transmission/install.sh @@ -0,0 +1,41 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +extract_files + +# Create download directories if they do not yet exist. +mkdir -p /var/transmission/{downloads,incomplete} 2>/dev/null + +# Adjust permissions. +chown nobody.nobody /etc/transmission /var/transmission + +# Start the service. +/etc/init.d/transmission start + +ln -sf ../init.d/transmission /etc/rc.d/rc0.d/K20transmission +ln -sf ../init.d/transmission /etc/rc.d/rc3.d/S99transmission +ln -sf ../init.d/transmission /etc/rc.d/rc6.d/K20transmission + +exit 0 diff --git a/src/paks/transmission/uninstall.sh b/src/paks/transmission/uninstall.sh new file mode 100644 index 0000000..5a2e708 --- /dev/null +++ b/src/paks/transmission/uninstall.sh @@ -0,0 +1,30 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +remove_files + +# Remove all start links. +rm -rf /etc/rc.d/rc*.d/*transmission + +exit 0 diff --git a/src/paks/transmission/update.sh b/src/paks/transmission/update.sh new file mode 100644 index 0000000..c6485bf --- /dev/null +++ b/src/paks/transmission/update.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +./uninstall.sh +./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, LinuxUser, created. b3a57e5eeed234aa1d1e2fe492f0779f154a0ece
by git＠ipfire.org 17 Sep '11

17 Sep '11

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, LinuxUser has been created at b3a57e5eeed234aa1d1e2fe492f0779f154a0ece (commit) - Log ----------------------------------------------------------------- commit b3a57e5eeed234aa1d1e2fe492f0779f154a0ece Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 16 22:23:00 2011 +0200 LinuxUser branding. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. fa0bb39f77d3e5bbb5e178dd911f2347d6356277
by git＠ipfire.org 16 Sep '11

16 Sep '11

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, master has been updated via fa0bb39f77d3e5bbb5e178dd911f2347d6356277 (commit) from 736d1ed96ec00bafb3635f67673796151de02774 (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 fa0bb39f77d3e5bbb5e178dd911f2347d6356277 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 16 21:20:32 2011 +0200 close core53. ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 3743867..67464d5 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number CORE="53" # Core Level (Filename) -PAKFIRE_CORE="52" # Core Level (PAKFIRE) +PAKFIRE_CORE="53" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 736d1ed96ec00bafb3635f67673796151de02774
by git＠ipfire.org 16 Sep '11

16 Sep '11

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, master has been updated via 736d1ed96ec00bafb3635f67673796151de02774 (commit) via 509d6c572633e475520f2ab4ba5da36a026678ec (commit) via cd0c0a0de72e975c87426642d09897aaf3d293e9 (commit) via 42a1655807987cc2c51cd06cfa832dbf4de0639a (commit) from c0c9df130fbb3c5080755822d227277627605196 (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 736d1ed96ec00bafb3635f67673796151de02774 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 16 19:46:03 2011 +0200 apache2: update to 2.2.21. commit 509d6c572633e475520f2ab4ba5da36a026678ec Merge: c0c9df1 cd0c0a0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 16 19:40:44 2011 +0200 Merge commit 'origin/next' Conflicts: html/cgi-bin/ovpnmain.cgi ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{50 => 53}/filelists/apache2 | 0 config/rootfiles/core/53/update.sh | 2 + doc/language_issues.de | 9 ++-- doc/language_issues.en | 9 ++-- doc/language_issues.es | 19 ++++++-- doc/language_issues.fr | 19 ++++++-- doc/language_issues.pl | 19 ++++++-- doc/language_issues.ru | 18 +++++-- doc/language_missings | 49 ++++++++++++++++++++ html/cgi-bin/ovpnmain.cgi | 26 +++++----- langs/de/cgi-bin/de.pl | 16 +++++- langs/en/cgi-bin/en.pl | 16 +++++- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- lfs/apache2 | 4 +- 16 files changed, 163 insertions(+), 49 deletions(-) copy config/rootfiles/core/{50 => 53}/filelists/apache2 (100%) Difference in files: diff --git a/config/rootfiles/core/53/filelists/apache2 b/config/rootfiles/core/53/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/core/53/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh index 10b45b9..fbf1995 100644 --- a/config/rootfiles/core/53/update.sh +++ b/config/rootfiles/core/53/update.sh @@ -36,6 +36,7 @@ done #Stop services /etc/init.d/ipsec stop +/etc/init.d/apache stop # # Remove old strongswan libs @@ -65,6 +66,7 @@ sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_r # #Start services +/etc/init.d/apache start if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then /etc/init.d/ipsec start fi diff --git a/doc/language_issues.de b/doc/language_issues.de index 0f1b918..d182dbb 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -97,6 +96,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -169,6 +169,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -196,7 +197,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -245,6 +245,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -278,8 +279,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -457,8 +456,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes diff --git a/doc/language_issues.en b/doc/language_issues.en index bffff80..3ae364c 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -490,8 +489,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes diff --git a/doc/language_issues.es b/doc/language_issues.es index 0ef2eac..6b2ab8e 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -491,8 +490,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs @@ -517,6 +518,16 @@ WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id WARNING: untranslated string: minute WARNING: untranslated string: new +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 00cb462..b1a94a1 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -492,8 +491,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes @@ -519,6 +520,16 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: pakfire ago WARNING: untranslated string: route config changed diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 0ef2eac..6b2ab8e 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -491,8 +490,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs @@ -517,6 +518,16 @@ WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id WARNING: untranslated string: minute WARNING: untranslated string: new +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 9add81b..ee67873 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -174,7 +173,6 @@ WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update -WARNING: translation string unused: frequency WARNING: translation string unused: fritzdsl help WARNING: translation string unused: fritzdsl upload WARNING: translation string unused: from email adr @@ -221,7 +219,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -304,8 +301,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -495,6 +490,7 @@ WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes +WARNING: untranslated string: disk access per WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount WARNING: untranslated string: extrahd install or load driver @@ -502,9 +498,21 @@ WARNING: untranslated string: extrahd maybe the device is in use WARNING: untranslated string: extrahd to WARNING: untranslated string: extrahd to root WARNING: untranslated string: extrahd you cant mount +WARNING: untranslated string: incoming traffic in bytes per second WARNING: untranslated string: minute WARNING: untranslated string: new +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall reserved groupname +WARNING: untranslated string: outgoing traffic in bytes per second WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_missings b/doc/language_missings index 5dc1dae..16e3ba5 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -31,6 +31,16 @@ < minute < ntp common settings < ntp sync +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used < snort working < static routes < system information @@ -83,6 +93,16 @@ < fireinfo why read more < fireinfo your profile id < minute +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used < outgoing firewall add ip group < outgoing firewall add mac group < outgoing firewall edit ip group @@ -117,6 +137,16 @@ < extrahd unable to write < extrahd you cant mount < minute +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used < static routes < vpn keyexchange ############################################################################ @@ -126,6 +156,8 @@ # Checking cgi-bin translations for language: ru # ############################################################################ < Add a route +< day-graph +< disk access per < Edit an existing route < extrahd because there is already a device mounted < extrahd cant umount @@ -136,6 +168,23 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< frequency +< hour-graph +< incoming traffic in bytes per second < minute +< month-graph +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used +< outgoing traffic in bytes per second < static routes < vpn keyexchange +< week-graph +< year-graph diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 165f351..b6c5fc0 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2607,49 +2607,49 @@ if ($confighash{$cgiparams{'KEY'}}) { if ($cgiparams{'TYPE'} eq 'net') { if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { - $errormessage = 'The Destination Port is used by the OpenVPN Server please change'; + $errormessage = $Lang::tr{'openvpn destination port used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ($cgiparams{'OVPN_SUBNET'} eq $vpnsettings{'DOVPN_SUBNET'}) { - $errormessage = 'The OpenVPN Subnet is used by the OpenVPN Server please change'; + $errormessage = $Lang::tr{'openvpn subnet is used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'MSSFIX'} eq 'on')) { - $errormessage = 'mssfix only allowed with udp'; + $errormessage = $Lang::tr{'openvpn mssfix allowed with udp'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'FRAGMENT'} ne '')) { - $errormessage = 'fragment only allowed with udp'; + $errormessage = $Lang::tr{'openvpn fragment allowed with udp'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { - $errormessage = 'Prefix not allowed for Local Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + $errormessage = $Lang::tr{'openvpn prefix local subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'OVPN_SUBNET'})) { - $errormessage = 'Prefix not allowed for OpenVPN Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + $errormessage = $Lang::tr{'openvpn prefix openvpn subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'REMOTE_SUBNET'})) { - $errormessage = 'Prefix not allowed for Remote Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + $errormessage = $Lang::tr{'openvpn prefix remote subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; @@ -3182,8 +3182,8 @@ if ($cgiparams{'TYPE'} eq 'net') { <td width='25%'> </td> <td width='25%'> </td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td> - <td><select name='SIDE'><option value='server' $selected{'SIDE'}{'server'}>OpenVPN Server</option> - <option value='client' $selected{'SIDE'}{'client'}>OpenVPN Client</option></select></td> + <td><select name='SIDE'><option value='server' $selected{'SIDE'}{'server'}>$Lang::tr{'openvpn server'}</option> + <option value='client' $selected{'SIDE'}{'client'}>$Lang::tr{'openvpn client'}</option></select></td> <td class='boldbase'>$Lang::tr{'remote host/ip'}:</td> <td><input type='TEXT' name='REMOTE' value='$cgiparams{'REMOTE'}' /></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td> @@ -3205,9 +3205,9 @@ if ($cgiparams{'TYPE'} eq 'net') { <tr><td class='boldbase' nowrap='nowrap'>mssfix  <img src='/blob.gif' /></td> <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td> - <tr><td class='boldbase' nowrap='nowrap'>Fragment  <img src='/blob.gif' /></td> + <tr><td class='boldbase' nowrap='nowrap'>fragment  <img src='/blob.gif' /></td> <td><input type='TEXT' name='FRAGMENT' VALUE='$cgiparams{'FRAGMENT'}'size='5' /></td> - <td>Default: <span class="base">1300</span></td> + <td>$Lang::tr{'openvpn default'}: <span class="base">1300</span></td> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'} <img src='/blob.gif' /></td> <td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></TD> @@ -3727,7 +3727,7 @@ END my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; if ($confighash{$key}[0] eq 'off') { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'disabled'}</font></b></td></tr></table>"; + $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'openvpn disabled'}</font></b></td></tr></table>"; } else { ### @@ -3750,7 +3750,7 @@ END # $p->close(); if (-e "/var/run/$confighash{$key}[1]n2n.pid") { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'enabledtitle'}</font></b></td></tr></table>"; + $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'openvpn enabled'}</font></b></td></tr></table>"; } } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f7aef31..727470f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -551,9 +551,9 @@ 'date' => 'Datum', 'date not in logs' => 'Für den gesuchten Tag existiert kein (oder nur ein unvollständiges) Log', 'day' => 'Tag', -'day-graph' => 'Tag', 'day after' => 'Tag danach', 'day before' => 'Tag davor', +'day-graph' => 'Tag', 'days' => 'Tage', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'Tragen Sie Ihre ID (oder ID Liste durch ; getrennt) in das Feld "Hostname" ein', @@ -1283,9 +1283,19 @@ 'only red' => 'Nur ROT', 'open to all' => 'Überschreibe externen Zugang zu ALL', 'openssl produced an error' => 'OpenSSL hat einen Fehler verursacht', -'openvpn client' => 'OpenVPN Client', +'openvpn client' => 'OpenVPN-Client', +'openvpn default' => 'Vorgabe', +'openvpn destination port used' => 'Der Zielport wird bereits von einer anderen OpenVPN-Server-Instanz genutzt.', +'openvpn disabled' => 'DEAKTIVIERT', +'openvpn enabled' => 'AKTIVIERT', +'openvpn fragment allowed with udp' => '"fragment" kann nur in Kombination mit dem UDP-Protokoll genutzt werden.', 'openvpn log' => 'OpenVPN Log', -'openvpn server' => 'OpenVPN Server', +'openvpn mssfix allowed with udp' => '"mssfix" kann nur in Kombination mit dem UDP-Protokoll genutzt werden.', +'openvpn prefix local subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim lokalen Subnetz ein wie z.B. 255.255.255.0.', +'openvpn prefix openvpn subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim OpenVPN-Subnetz ein wie z.B. 255.255.255.0.', +'openvpn prefix remote subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim entfernten Subnetz ein wie z.B. 255.255.255.0.', +'openvpn server' => 'OpenVPN-Server', +'openvpn subnet is used' => 'Das angegebene Subnetz wird bereits von einer anderen OpenVPN-Server-Instanz genutzt.', 'optional at cmd' => 'zusätzlicher Modembefehl', 'optional data' => '3. Optionale Einstellungen', 'options' => 'Optionen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 62925ce..16df2b9 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -572,9 +572,9 @@ 'date' => 'Date', 'date not in logs' => 'No (or only partial) logs exist for the day queried', 'day' => 'Day', -'day-graph' => 'Day', 'day after' => 'Day after', 'day before' => 'Day before', +'day-graph' => 'Day', 'days' => 'days.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'In the field for hostname enter your ID (or a list of IDs seperated by;)', @@ -1311,9 +1311,19 @@ 'only red' => 'Only RED', 'open to all' => 'Override external access to ALL', 'openssl produced an error' => 'OpenSSL produced an error', -'openvpn client' => 'OpenVPN Client', +'openvpn client' => 'OpenVPN client', +'openvpn default' => 'Default', +'openvpn destination port used' => 'The destination port is already used by another OpenVPN server.', +'openvpn disabled' => 'DISABLED', +'openvpn enabled' => 'ENABLED', +'openvpn fragment allowed with udp' => 'Using fragment is only allowed when using the UDP protocol.', 'openvpn log' => 'OpenVPN Log', -'openvpn server' => 'OpenVPN Server', +'openvpn mssfix allowed with udp' => 'Using "mssfix" is only allowed when using the UDP protocol.', +'openvpn prefix local subnet' => 'Using the prefix notation is not supported for the local subnet. Please enter a subnet mask like 255.255.255.0.', +'openvpn prefix openvpn subnet' => 'Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0.', +'openvpn prefix remote subnet' => 'Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.', +'openvpn server' => 'OpenVPN server', +'openvpn subnet is used' => 'The given subnet is used by another OpenVPN server.', 'optional at cmd' => 'optional AT command', 'optional data' => '3. Optional Settings:', 'options' => 'Options', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index d410a56..365630a 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -570,9 +570,9 @@ 'date' => 'Fecha', 'date not in logs' => 'No existen (o sólo parcialmente) registros del dia solicitado', 'day' => 'Día', -'day-graph' => 'Dia', 'day after' => 'Día después', 'day before' => 'Día anterior', +'day-graph' => 'Dia', 'days' => 'dias.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => '"En el campo nombre de host introduzca si ID (o una lista de Ids separados por ; )"', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index daeb9f2..04edb25 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -572,9 +572,9 @@ 'date' => 'Date', 'date not in logs' => 'Aucun (ou imcomplet) rapport n\'existe pour le jour demandé', 'day' => 'Jour', -'day-graph' => 'Jour', 'day after' => 'Jour d\'après', 'day before' => 'Jour d\'avant', +'day-graph' => 'Jour', 'days' => 'jours.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'Entrez votre identifiant dans ce champ pour noms d\'hôtes (ou une liste d\'identifiants séparés par des ;)', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 14160de..12439e4 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -572,9 +572,9 @@ 'date' => 'Data', 'date not in logs' => 'Brak (lub tylko część) logów dla podanej daty', 'day' => 'Dzien', -'day-graph' => 'Dzien', 'day after' => 'Dzień po', 'day before' => 'Dzień przed', +'day-graph' => 'Dzien', 'days' => 'dni.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'W polu nazwa hosta wprowadź twoje ID (lub listę ID oddzielanych średnikami)', diff --git a/lfs/apache2 b/lfs/apache2 index c5fd754..f548271 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@ include Config -VER = 2.2.20 +VER = 2.2.21 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch -$(DL_FILE)_MD5 = 1ac251431c8c4285f6b085c1d156bb56 +$(DL_FILE)_MD5 = 1696ae62cd879ab1d4dd9ff021a470f2 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. cd0c0a0de72e975c87426642d09897aaf3d293e9
by git＠ipfire.org 16 Sep '11

16 Sep '11

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 cd0c0a0de72e975c87426642d09897aaf3d293e9 (commit) from 42a1655807987cc2c51cd06cfa832dbf4de0639a (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 cd0c0a0de72e975c87426642d09897aaf3d293e9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Sep 16 11:12:09 2011 +0200 Localize new OpenVPN features. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 9 ++++--- doc/language_issues.en | 9 ++++--- doc/language_issues.es | 19 +++++++++++++--- doc/language_issues.fr | 19 +++++++++++++--- doc/language_issues.pl | 19 +++++++++++++--- doc/language_issues.ru | 18 ++++++++++++---- doc/language_missings | 49 +++++++++++++++++++++++++++++++++++++++++++++ html/cgi-bin/ovpnmain.cgi | 32 ++++++++++++++-------------- langs/de/cgi-bin/de.pl | 16 ++++++++++++-- langs/en/cgi-bin/en.pl | 16 ++++++++++++-- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- 13 files changed, 162 insertions(+), 50 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 0f1b918..d182dbb 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -97,6 +96,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -169,6 +169,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -196,7 +197,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -245,6 +245,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -278,8 +279,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -457,8 +456,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes diff --git a/doc/language_issues.en b/doc/language_issues.en index bffff80..3ae364c 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -490,8 +489,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes diff --git a/doc/language_issues.es b/doc/language_issues.es index 0ef2eac..6b2ab8e 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -491,8 +490,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs @@ -517,6 +518,16 @@ WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id WARNING: untranslated string: minute WARNING: untranslated string: new +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 00cb462..b1a94a1 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -492,8 +491,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes @@ -519,6 +520,16 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: pakfire ago WARNING: untranslated string: route config changed diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 0ef2eac..6b2ab8e 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks WARNING: translation string unused: custom services WARNING: translation string unused: daily firewallhits WARNING: translation string unused: dat without key +WARNING: translation string unused: day-graph WARNING: translation string unused: dbfile WARNING: translation string unused: ddns help dnsmadeeasy WARNING: translation string unused: ddns help freedns @@ -195,6 +195,7 @@ WARNING: translation string unused: hint WARNING: translation string unused: host WARNING: translation string unused: host configuration WARNING: translation string unused: hostname and domain already in use +WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type @@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3 WARNING: translation string unused: modem on com4 WARNING: translation string unused: modem on com5 WARNING: translation string unused: modulation +WARNING: translation string unused: month-graph WARNING: translation string unused: monthly firewallhits WARNING: translation string unused: monthly start day bad WARNING: translation string unused: monthly traffic bad @@ -306,8 +307,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -491,8 +490,10 @@ WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration +WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: xtaccess bad transfert +WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs @@ -517,6 +518,16 @@ WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id WARNING: untranslated string: minute WARNING: untranslated string: new +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 9add81b..ee67873 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1,4 +1,3 @@ -WARNING: translation string unused: Act as WARNING: translation string unused: Client status and controlc WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile @@ -174,7 +173,6 @@ WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update -WARNING: translation string unused: frequency WARNING: translation string unused: fritzdsl help WARNING: translation string unused: fritzdsl upload WARNING: translation string unused: from email adr @@ -221,7 +219,6 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invert WARNING: translation string unused: ip address in use WARNING: translation string unused: ipfire side -WARNING: translation string unused: ipfire side is invalid WARNING: translation string unused: iptable rules WARNING: translation string unused: isdn WARNING: translation string unused: isdn settings @@ -304,8 +301,6 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red -WARNING: translation string unused: openvpn client -WARNING: translation string unused: openvpn server WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning @@ -495,6 +490,7 @@ WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes +WARNING: untranslated string: disk access per WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount WARNING: untranslated string: extrahd install or load driver @@ -502,9 +498,21 @@ WARNING: untranslated string: extrahd maybe the device is in use WARNING: untranslated string: extrahd to WARNING: untranslated string: extrahd to root WARNING: untranslated string: extrahd you cant mount +WARNING: untranslated string: incoming traffic in bytes per second WARNING: untranslated string: minute WARNING: untranslated string: new +WARNING: untranslated string: openvpn default +WARNING: untranslated string: openvpn destination port used +WARNING: untranslated string: openvpn disabled +WARNING: untranslated string: openvpn enabled +WARNING: untranslated string: openvpn fragment allowed with udp +WARNING: untranslated string: openvpn mssfix allowed with udp +WARNING: untranslated string: openvpn prefix local subnet +WARNING: untranslated string: openvpn prefix openvpn subnet +WARNING: untranslated string: openvpn prefix remote subnet +WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: outgoing firewall reserved groupname +WARNING: untranslated string: outgoing traffic in bytes per second WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_missings b/doc/language_missings index 5dc1dae..16e3ba5 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -31,6 +31,16 @@ < minute < ntp common settings < ntp sync +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used < snort working < static routes < system information @@ -83,6 +93,16 @@ < fireinfo why read more < fireinfo your profile id < minute +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used < outgoing firewall add ip group < outgoing firewall add mac group < outgoing firewall edit ip group @@ -117,6 +137,16 @@ < extrahd unable to write < extrahd you cant mount < minute +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used < static routes < vpn keyexchange ############################################################################ @@ -126,6 +156,8 @@ # Checking cgi-bin translations for language: ru # ############################################################################ < Add a route +< day-graph +< disk access per < Edit an existing route < extrahd because there is already a device mounted < extrahd cant umount @@ -136,6 +168,23 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< frequency +< hour-graph +< incoming traffic in bytes per second < minute +< month-graph +< openvpn default +< openvpn destination port used +< openvpn disabled +< openvpn enabled +< openvpn fragment allowed with udp +< openvpn mssfix allowed with udp +< openvpn prefix local subnet +< openvpn prefix openvpn subnet +< openvpn prefix remote subnet +< openvpn subnet is used +< outgoing traffic in bytes per second < static routes < vpn keyexchange +< week-graph +< year-graph diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index b66299b..b6c5fc0 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -33,8 +33,8 @@ require "${General::swroot}/header.pl"; require "${General::swroot}/countries.pl"; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::colourgreen} ); undef (@dummy); @@ -2607,49 +2607,49 @@ if ($confighash{$cgiparams{'KEY'}}) { if ($cgiparams{'TYPE'} eq 'net') { if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { - $errormessage = 'The Destination Port is used by the OpenVPN Server please change'; + $errormessage = $Lang::tr{'openvpn destination port used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ($cgiparams{'OVPN_SUBNET'} eq $vpnsettings{'DOVPN_SUBNET'}) { - $errormessage = 'The OpenVPN Subnet is used by the OpenVPN Server please change'; + $errormessage = $Lang::tr{'openvpn subnet is used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'MSSFIX'} eq 'on')) { - $errormessage = 'mssfix only allowed with udp'; + $errormessage = $Lang::tr{'openvpn mssfix allowed with udp'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'FRAGMENT'} ne '')) { - $errormessage = 'fragment only allowed with udp'; + $errormessage = $Lang::tr{'openvpn fragment allowed with udp'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { - $errormessage = 'Prefix not allowed for Local Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + $errormessage = $Lang::tr{'openvpn prefix local subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'OVPN_SUBNET'})) { - $errormessage = 'Prefix not allowed for OpenVPN Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + $errormessage = $Lang::tr{'openvpn prefix openvpn subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } if ( &validdotmask ($cgiparams{'REMOTE_SUBNET'})) { - $errormessage = 'Prefix not allowed for Remote Subnet. Please enter Subnet Mask e.g. 255.255.255.0'; + $errormessage = $Lang::tr{'openvpn prefix remote subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; @@ -3182,8 +3182,8 @@ if ($cgiparams{'TYPE'} eq 'net') { <td width='25%'> </td> <td width='25%'> </td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td> - <td><select name='SIDE'><option value='server' $selected{'SIDE'}{'server'}>OpenVPN Server</option> - <option value='client' $selected{'SIDE'}{'client'}>OpenVPN Client</option></select></td> + <td><select name='SIDE'><option value='server' $selected{'SIDE'}{'server'}>$Lang::tr{'openvpn server'}</option> + <option value='client' $selected{'SIDE'}{'client'}>$Lang::tr{'openvpn client'}</option></select></td> <td class='boldbase'>$Lang::tr{'remote host/ip'}:</td> <td><input type='TEXT' name='REMOTE' value='$cgiparams{'REMOTE'}' /></td></tr> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td> @@ -3205,9 +3205,9 @@ if ($cgiparams{'TYPE'} eq 'net') { <tr><td class='boldbase' nowrap='nowrap'>mssfix  <img src='/blob.gif' /></td> <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td> - <tr><td class='boldbase' nowrap='nowrap'>Fragment  <img src='/blob.gif' /></td> + <tr><td class='boldbase' nowrap='nowrap'>fragment  <img src='/blob.gif' /></td> <td><input type='TEXT' name='FRAGMENT' VALUE='$cgiparams{'FRAGMENT'}'size='5' /></td> - <td>Default: <span class="base">1300</span></td> + <td>$Lang::tr{'openvpn default'}: <span class="base">1300</span></td> <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'} <img src='/blob.gif' /></td> <td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></TD> @@ -3727,7 +3727,7 @@ END my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; if ($confighash{$key}[0] eq 'off') { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; + $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'openvpn disabled'}</font></b></td></tr></table>"; } else { ### @@ -3750,7 +3750,7 @@ END # $p->close(); if (-e "/var/run/$confighash{$key}[1]n2n.pid") { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; + $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'openvpn enabled'}</font></b></td></tr></table>"; } } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f7aef31..727470f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -551,9 +551,9 @@ 'date' => 'Datum', 'date not in logs' => 'Für den gesuchten Tag existiert kein (oder nur ein unvollständiges) Log', 'day' => 'Tag', -'day-graph' => 'Tag', 'day after' => 'Tag danach', 'day before' => 'Tag davor', +'day-graph' => 'Tag', 'days' => 'Tage', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'Tragen Sie Ihre ID (oder ID Liste durch ; getrennt) in das Feld "Hostname" ein', @@ -1283,9 +1283,19 @@ 'only red' => 'Nur ROT', 'open to all' => 'Überschreibe externen Zugang zu ALL', 'openssl produced an error' => 'OpenSSL hat einen Fehler verursacht', -'openvpn client' => 'OpenVPN Client', +'openvpn client' => 'OpenVPN-Client', +'openvpn default' => 'Vorgabe', +'openvpn destination port used' => 'Der Zielport wird bereits von einer anderen OpenVPN-Server-Instanz genutzt.', +'openvpn disabled' => 'DEAKTIVIERT', +'openvpn enabled' => 'AKTIVIERT', +'openvpn fragment allowed with udp' => '"fragment" kann nur in Kombination mit dem UDP-Protokoll genutzt werden.', 'openvpn log' => 'OpenVPN Log', -'openvpn server' => 'OpenVPN Server', +'openvpn mssfix allowed with udp' => '"mssfix" kann nur in Kombination mit dem UDP-Protokoll genutzt werden.', +'openvpn prefix local subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim lokalen Subnetz ein wie z.B. 255.255.255.0.', +'openvpn prefix openvpn subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim OpenVPN-Subnetz ein wie z.B. 255.255.255.0.', +'openvpn prefix remote subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim entfernten Subnetz ein wie z.B. 255.255.255.0.', +'openvpn server' => 'OpenVPN-Server', +'openvpn subnet is used' => 'Das angegebene Subnetz wird bereits von einer anderen OpenVPN-Server-Instanz genutzt.', 'optional at cmd' => 'zusätzlicher Modembefehl', 'optional data' => '3. Optionale Einstellungen', 'options' => 'Optionen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 62925ce..16df2b9 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -572,9 +572,9 @@ 'date' => 'Date', 'date not in logs' => 'No (or only partial) logs exist for the day queried', 'day' => 'Day', -'day-graph' => 'Day', 'day after' => 'Day after', 'day before' => 'Day before', +'day-graph' => 'Day', 'days' => 'days.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'In the field for hostname enter your ID (or a list of IDs seperated by;)', @@ -1311,9 +1311,19 @@ 'only red' => 'Only RED', 'open to all' => 'Override external access to ALL', 'openssl produced an error' => 'OpenSSL produced an error', -'openvpn client' => 'OpenVPN Client', +'openvpn client' => 'OpenVPN client', +'openvpn default' => 'Default', +'openvpn destination port used' => 'The destination port is already used by another OpenVPN server.', +'openvpn disabled' => 'DISABLED', +'openvpn enabled' => 'ENABLED', +'openvpn fragment allowed with udp' => 'Using fragment is only allowed when using the UDP protocol.', 'openvpn log' => 'OpenVPN Log', -'openvpn server' => 'OpenVPN Server', +'openvpn mssfix allowed with udp' => 'Using "mssfix" is only allowed when using the UDP protocol.', +'openvpn prefix local subnet' => 'Using the prefix notation is not supported for the local subnet. Please enter a subnet mask like 255.255.255.0.', +'openvpn prefix openvpn subnet' => 'Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0.', +'openvpn prefix remote subnet' => 'Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.', +'openvpn server' => 'OpenVPN server', +'openvpn subnet is used' => 'The given subnet is used by another OpenVPN server.', 'optional at cmd' => 'optional AT command', 'optional data' => '3. Optional Settings:', 'options' => 'Options', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index d410a56..365630a 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -570,9 +570,9 @@ 'date' => 'Fecha', 'date not in logs' => 'No existen (o sólo parcialmente) registros del dia solicitado', 'day' => 'Día', -'day-graph' => 'Dia', 'day after' => 'Día después', 'day before' => 'Día anterior', +'day-graph' => 'Dia', 'days' => 'dias.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => '"En el campo nombre de host introduzca si ID (o una lista de Ids separados por ; )"', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index daeb9f2..04edb25 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -572,9 +572,9 @@ 'date' => 'Date', 'date not in logs' => 'Aucun (ou imcomplet) rapport n\'existe pour le jour demandé', 'day' => 'Jour', -'day-graph' => 'Jour', 'day after' => 'Jour d\'après', 'day before' => 'Jour d\'avant', +'day-graph' => 'Jour', 'days' => 'jours.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'Entrez votre identifiant dans ce champ pour noms d\'hôtes (ou une liste d\'identifiants séparés par des ;)', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 14160de..12439e4 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -572,9 +572,9 @@ 'date' => 'Data', 'date not in logs' => 'Brak (lub tylko część) logów dla podanej daty', 'day' => 'Dzien', -'day-graph' => 'Dzien', 'day after' => 'Dzień po', 'day before' => 'Dzień przed', +'day-graph' => 'Dzien', 'days' => 'dni.', 'dbfile' => 'Dbfile', 'ddns help dnsmadeeasy' => 'W polu nazwa hosta wprowadź twoje ID (lub listę ID oddzielanych średnikami)', hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c0c9df130fbb3c5080755822d227277627605196
by git＠ipfire.org 13 Sep '11

13 Sep '11

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, master has been updated via c0c9df130fbb3c5080755822d227277627605196 (commit) via 828aaba2ac9d211f76ac9fef95e1dbd19c2315cb (commit) from f1f39aea071c0660f87cbd04b385bb77cb70cf00 (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 c0c9df130fbb3c5080755822d227277627605196 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 13 20:44:48 2011 +0200 Remove OpenVPN changes in index.cgi. commit 828aaba2ac9d211f76ac9fef95e1dbd19c2315cb Author: Alfred Haas <alfred.haas(a)ipfire.org> Date: Tue Sep 13 21:07:28 2011 +0200 ovpnmain.cgi: disabed debug output. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/index.cgi | 19 ------------------- html/cgi-bin/ovpnmain.cgi | 6 +++--- 2 files changed, 3 insertions(+), 22 deletions(-) Difference in files: diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 0ef95ba..b325250 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -390,25 +390,6 @@ END END } -### -# m.a.d n2n -### - -if ( -d "${General::swroot}/ovpn/n2nconf") { -my %confighash=(); -&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); -foreach my $dkey (keys %confighash) { -if ($confighash{$dkey}[0] eq 'on' && $confighash{$dkey}[3] eq 'net') { -my @n2novpnet = split(/\//,$confighash{$dkey}[27]); - print <<END; - <tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br> - <td width='30%' align='center'> $n2novpnet[0] - <td width='45%' align='center'><font color=$Header::colourblue>$confighash{$dkey}[6]</font> -END -} -} - } - # Fireinfo if ( ! -e "/var/ipfire/main/send_profile") { $warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>"; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index ea52f85..165f351 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -33,8 +33,8 @@ require "${General::swroot}/header.pl"; require "${General::swroot}/countries.pl"; # enable only the following on debugging purpose -use warnings; -use CGI::Carp 'fatalsToBrowser'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::colourgreen} ); undef (@dummy); hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 42a1655807987cc2c51cd06cfa832dbf4de0639a
by git＠ipfire.org 13 Sep '11

13 Sep '11

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 42a1655807987cc2c51cd06cfa832dbf4de0639a (commit) from 60f396d77d0d67b37e43ba622611a8f90633567f (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 42a1655807987cc2c51cd06cfa832dbf4de0639a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 13 20:44:48 2011 +0200 Remove OpenVPN changes in index.cgi. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/index.cgi | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) Difference in files: diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 0ef95ba..b325250 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -390,25 +390,6 @@ END END } -### -# m.a.d n2n -### - -if ( -d "${General::swroot}/ovpn/n2nconf") { -my %confighash=(); -&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); -foreach my $dkey (keys %confighash) { -if ($confighash{$dkey}[0] eq 'on' && $confighash{$dkey}[3] eq 'net') { -my @n2novpnet = split(/\//,$confighash{$dkey}[27]); - print <<END; - <tr><td align='center' bgcolor='$Header::colourvpn' width='25%'><a href="/cgi-bin/ovpnmain.cgi"><font size='2' color='white'><b>OpenVPN n2n</b></font></a><br> - <td width='30%' align='center'> $n2novpnet[0] - <td width='45%' align='center'><font color=$Header::colourblue>$confighash{$dkey}[6]</font> -END -} -} - } - # Fireinfo if ( ! -e "/var/ipfire/main/send_profile") { $warnmessage .= "<li><a style='color: white;' href='fireinfo.cgi'>$Lang::tr{'fireinfo please enable'}</a></li>"; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f1f39aea071c0660f87cbd04b385bb77cb70cf00
by git＠ipfire.org 13 Sep '11

13 Sep '11

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, master has been updated via f1f39aea071c0660f87cbd04b385bb77cb70cf00 (commit) via 7589902e644345a8b383d604cf5e16c786352f59 (commit) via 38ce4769ab38fdef7fc5892b4fe554de968d8d47 (commit) via 0f0db884a9bc1524c69c040cd84b8f23bb2c85dd (commit) from 1a140b78980fe0f488e25a3b2dd92256e3751ab0 (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 f1f39aea071c0660f87cbd04b385bb77cb70cf00 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 13 19:05:04 2011 +0200 ovpnmain.cgi: change connected/disconnected to enabled/disabled at n2n connections. commit 7589902e644345a8b383d604cf5e16c786352f59 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 13 14:25:44 2011 +0200 strongswan: import micha's new strongswan gateway detection. commit 38ce4769ab38fdef7fc5892b4fe554de968d8d47 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 13 14:09:59 2011 +0200 core53: add log.dat to updater. commit 0f0db884a9bc1524c69c040cd84b8f23bb2c85dd Author: Alfred Haas <alfred.haas(a)ipfire.org> Date: Tue Sep 13 14:06:58 2011 +0200 log.dat: add n2n to openvpn log. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/53/filelists/files | 1 + html/cgi-bin/logs.cgi/log.dat | 2 +- html/cgi-bin/ovpnmain.cgi | 4 +- lfs/strongswan | 2 +- ..._ipfire.patch => strongswan-4.5.3_ipfire.patch} | 110 +++++++++++++++----- 5 files changed, 88 insertions(+), 31 deletions(-) rename src/patches/{strongswan-4.4.0_ipfire.patch => strongswan-4.5.3_ipfire.patch} (83%) Difference in files: diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files index 3e71a05..2d47486 100644 --- a/config/rootfiles/core/53/filelists/files +++ b/config/rootfiles/core/53/filelists/files @@ -13,6 +13,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat var/ipfire/langs/ usr/local/bin/ipsecctrl usr/local/bin/openvpnctrl diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index c0da266..e2d0244 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -61,7 +61,7 @@ my %sections = ( 'auth' => '(\w+$pam_unix$\[.*\]: )', 'kernel' => '(kernel: (?!DROP_))', 'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )', - 'openvpn' => '(openvpnserver)\[.*\]: ', + 'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )', 'pakfire' => '(pakfire:) ', 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ' ); diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index b66299b..ea52f85 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3727,7 +3727,7 @@ END my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; if ($confighash{$key}[0] eq 'off') { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>"; + $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'disabled'}</font></b></td></tr></table>"; } else { ### @@ -3750,7 +3750,7 @@ END # $p->close(); if (-e "/var/run/$confighash{$key}[1]n2n.pid") { - $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b></td></tr></table>"; + $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'enabledtitle'}</font></b></td></tr></table>"; } } diff --git a/lfs/strongswan b/lfs/strongswan index 1efd283..cb97bf7 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.4.0_ipfire.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" \ --enable-cisco-quirks \ diff --git a/src/patches/strongswan-4.4.0_ipfire.patch b/src/patches/strongswan-4.4.0_ipfire.patch deleted file mode 100644 index 298a1e3..0000000 --- a/src/patches/strongswan-4.4.0_ipfire.patch +++ /dev/null @@ -1,286 +0,0 @@ -diff -Naur strongswan-4.4.0.org/src/_updown/_updown.in strongswan-4.4.0/src/_updown/_updown.in ---- strongswan-4.4.0.org/src/_updown/_updown.in 2010-03-15 21:52:51.000000000 +0100 -+++ strongswan-4.4.0/src/_updown/_updown.in 2010-05-15 13:33:40.000000000 +0200 -@@ -374,12 +374,12 @@ - # connection to me, with (left/right)firewall=yes, coming up - # This is used only by the default updown script, not by your custom - # ones, so do not mess with it; see CAUTION comment up at top. -- iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT -- iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ -- -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT -+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50 - # - # log IPsec host connection setup - if [ $VPN_LOGGING ] -@@ -387,10 +387,10 @@ - if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] - then - logger -t $TAG -p $FAC_PRIO \ -- "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" -+ "host+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" - else - logger -t $TAG -p $FAC_PRIO \ -- "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" -+ "host+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" - fi - fi - ;; -@@ -398,12 +398,12 @@ - # connection to me, with (left/right)firewall=yes, going down - # This is used only by the default updown script, not by your custom - # ones, so do not mess with it; see CAUTION comment up at top. -- iptables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT -- iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ -- -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT -+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50 - # - # log IPsec host connection teardown - if [ $VPN_LOGGING ] -@@ -411,10 +411,10 @@ - if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] - then - logger -t $TAG -p $FAC_PRIO -- \ -- "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" -+ "host- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" - else - logger -t $TAG -p $FAC_PRIO -- \ -- "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" -+ "host- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" - fi - fi - ;; -@@ -424,10 +424,10 @@ - # ones, so do not mess with it; see CAUTION comment up at top. - if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ] - then -- iptables -I FORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ iptables -I IPSECFORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_MY_CLIENT $S_MY_PORT \ -- -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT -- iptables -I FORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50 -+ iptables -I IPSECFORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT - fi -@@ -436,12 +436,12 @@ - # or sometimes host access via the internal IP is needed - if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] - then -- iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT -- iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_MY_CLIENT $S_MY_PORT \ -- -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT -+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50 - fi - # - # log IPsec client connection setup -@@ -450,12 +450,38 @@ - if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] - then - logger -t $TAG -p $FAC_PRIO \ -- "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" -+ "client+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" - else - logger -t $TAG -p $FAC_PRIO \ -- "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" -+ "client+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" - fi - fi -+ -+ # -+ # Open Firewall for IPinIP + AH + ESP Traffic -+ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p IP \ -+ -s $PLUTO_PEER $S_PEER_PORT \ -+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT -+ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p AH \ -+ -s $PLUTO_PEER $S_PEER_PORT \ -+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT -+ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p ESP \ -+ -s $PLUTO_PEER $S_PEER_PORT \ -+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT -+ if [ $VPN_LOGGING ] -+ then -+ logger -t $TAG -p $FAC_PRIO \ -+ "tunnel+ $PLUTO_PEER -- $PLUTO_ME" -+ fi -+ -+ # Add source nat so also the gateway can access the other nets -+ src=$(/sbin/ip route|grep $PLUTO_MY_CLIENT|(read net key_dev dev key_proto key_kernel key_scope key_link key_src src; echo $src)) -+ iptables -t nat -A IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src -+ logger -t $TAG -p $FAC_PRIO \ -+ "snat+ $PLUTO_INTERFACE-$PLUTO_ME : $PLUTO_PEER_CLIENT - $src" -+ -+ # Flush routing cache -+ ip route flush cache - ;; - down-client:iptables) - # connection to client subnet, with (left/right)firewall=yes, going down -@@ -463,11 +489,11 @@ - # ones, so do not mess with it; see CAUTION comment up at top. - if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ] - then -- iptables -D FORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ iptables -D IPSECFORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_MY_CLIENT $S_MY_PORT \ - -d $PLUTO_PEER_CLIENT $D_PEER_PORT \ -- $IPSEC_POLICY_OUT -j ACCEPT -- iptables -D FORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ $IPSEC_POLICY_OUT -j MARK --set-mark 50 -+ iptables -D IPSECFORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_MY_CLIENT $D_MY_PORT \ - $IPSEC_POLICY_IN -j ACCEPT -@@ -477,14 +503,14 @@ - # or sometimes host access via the internal IP is needed - if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] - then -- iptables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_MY_CLIENT $D_MY_PORT \ - $IPSEC_POLICY_IN -j ACCEPT -- iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_MY_CLIENT $S_MY_PORT \ - -d $PLUTO_PEER_CLIENT $D_PEER_PORT \ -- $IPSEC_POLICY_OUT -j ACCEPT -+ $IPSEC_POLICY_OUT -j MARK --set-mark 50 - fi - # - # log IPsec client connection teardown -@@ -493,12 +519,38 @@ - if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] - then - logger -t $TAG -p $FAC_PRIO -- \ -- "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" -+ "client- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" - else - logger -t $TAG -p $FAC_PRIO -- \ -- "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" -+ "client- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" - fi - fi -+ -+ # -+ # Close Firewall for IPinIP + AH + ESP Traffic -+ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p IP \ -+ -s $PLUTO_PEER $S_PEER_PORT \ -+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT -+ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p AH \ -+ -s $PLUTO_PEER $S_PEER_PORT \ -+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT -+ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p ESP \ -+ -s $PLUTO_PEER $S_PEER_PORT \ -+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT -+ if [ $VPN_LOGGING ] -+ then -+ logger -t $TAG -p $FAC_PRIO \ -+ "tunnel- $PLUTO_PEER -- $PLUTO_ME" -+ fi -+ -+ # remove source nat -+ src=$(/sbin/ip route|grep $PLUTO_MY_CLIENT|(read net key_dev dev key_proto key_kernel key_scope key_link key_src src; echo $src)) -+ iptables -t nat -D IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src -+ logger -t $TAG -p $FAC_PRIO \ -+ "snat- $PLUTO_INTERFACE-$PLUTO_ME : $PLUTO_PEER_CLIENT - $src" -+ -+ # Flush routing cache -+ ip route flush cache - ;; - # - # IPv6 -@@ -533,10 +585,10 @@ - # connection to me, with (left/right)firewall=yes, coming up - # This is used only by the default updown script, not by your custom - # ones, so do not mess with it; see CAUTION comment up at top. -- ip6tables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ ip6tables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT -- ip6tables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ ip6tables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ - -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT - # -@@ -557,10 +609,10 @@ - # connection to me, with (left/right)firewall=yes, going down - # This is used only by the default updown script, not by your custom - # ones, so do not mess with it; see CAUTION comment up at top. -- ip6tables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ ip6tables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT -- ip6tables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ ip6tables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ - -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT - # -@@ -583,10 +635,10 @@ - # ones, so do not mess with it; see CAUTION comment up at top. - if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ] - then -- ip6tables -I FORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ ip6tables -I IPSECFORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_MY_CLIENT $S_MY_PORT \ - -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT -- ip6tables -I FORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ ip6tables -I IPSECFORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT - fi -@@ -595,10 +647,10 @@ - # or sometimes host access via the internal IP is needed - if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] - then -- ip6tables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ ip6tables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT -- ip6tables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ ip6tables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_MY_CLIENT $S_MY_PORT \ - -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT - fi -@@ -622,11 +674,11 @@ - # ones, so do not mess with it; see CAUTION comment up at top. - if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ] - then -- ip6tables -D FORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ ip6tables -D IPSECFORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_MY_CLIENT $S_MY_PORT \ - -d $PLUTO_PEER_CLIENT $D_PEER_PORT \ - $IPSEC_POLICY_OUT -j ACCEPT -- ip6tables -D FORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ ip6tables -D IPSECFORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_MY_CLIENT $D_MY_PORT \ - $IPSEC_POLICY_IN -j ACCEPT -@@ -636,11 +688,11 @@ - # or sometimes host access via the internal IP is needed - if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] - then -- ip6tables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ -+ ip6tables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ - -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ - -d $PLUTO_MY_CLIENT $D_MY_PORT \ - $IPSEC_POLICY_IN -j ACCEPT -- ip6tables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ -+ ip6tables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ - -s $PLUTO_MY_CLIENT $S_MY_PORT \ - -d $PLUTO_PEER_CLIENT $D_PEER_PORT \ - $IPSEC_POLICY_OUT -j ACCEPT diff --git a/src/patches/strongswan-4.5.3_ipfire.patch b/src/patches/strongswan-4.5.3_ipfire.patch new file mode 100644 index 0000000..2ba975b --- /dev/null +++ b/src/patches/strongswan-4.5.3_ipfire.patch @@ -0,0 +1,342 @@ +diff -Naur strongswan-4.5.3.org/src/_updown/_updown.in strongswan-4.5.3/src/_updown/_updown.in +--- strongswan-4.5.3.org/src/_updown/_updown.in 2010-10-22 16:33:30.000000000 +0200 ++++ strongswan-4.5.3/src/_updown/_updown.in 2011-09-13 14:19:31.000000000 +0200 +@@ -183,6 +183,29 @@ + ;; + esac + ++function ip_encode() { ++ local IFS=. ++ ++ local int=0 ++ for field in $1; do ++ int=$(( $(( $int << 8 )) | $field )) ++ done ++ ++ echo $int ++} ++ ++function ip_in_subnet() { ++ local netmask ++ netmask=$(_netmask $2) ++ [ $(( $(ip_encode $1) & $netmask)) = $(( $(ip_encode ${2%/*}) & $netmask )) ] ++} ++ ++function _netmask() { ++ local vlsm ++ vlsm=${1#*/} ++ [ $vlsm -eq 0 ] && echo 0 || echo $(( -1 << $(( 32 - $vlsm )) )) ++} ++ + # utility functions for route manipulation + # Meddling with this stuff should not be necessary and requires great care. + uproute() { +@@ -387,12 +410,12 @@ + # connection to me, with (left/right)firewall=yes, coming up + # This is used only by the default updown script, not by your custom + # ones, so do not mess with it; see CAUTION comment up at top. +- iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT +- iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ +- -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT ++ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50 + # + # log IPsec host connection setup + if [ $VPN_LOGGING ] +@@ -400,10 +423,10 @@ + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] + then + logger -t $TAG -p $FAC_PRIO \ +- "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" ++ "host+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" + else + logger -t $TAG -p $FAC_PRIO \ +- "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" ++ "host+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" + fi + fi + ;; +@@ -411,12 +434,12 @@ + # connection to me, with (left/right)firewall=yes, going down + # This is used only by the default updown script, not by your custom + # ones, so do not mess with it; see CAUTION comment up at top. +- iptables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT +- iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ +- -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT ++ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50 + # + # log IPsec host connection teardown + if [ $VPN_LOGGING ] +@@ -424,10 +447,10 @@ + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] + then + logger -t $TAG -p $FAC_PRIO -- \ +- "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" ++ "host- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME" + else + logger -t $TAG -p $FAC_PRIO -- \ +- "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" ++ "host- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME" + fi + fi + ;; +@@ -437,10 +460,10 @@ + # ones, so do not mess with it; see CAUTION comment up at top. + if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ] + then +- iptables -I FORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ iptables -I IPSECFORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_MY_CLIENT $S_MY_PORT \ +- -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT +- iptables -I FORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50 ++ iptables -I IPSECFORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT + fi +@@ -449,12 +472,12 @@ + # or sometimes host access via the internal IP is needed + if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] + then +- iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT +- iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_MY_CLIENT $S_MY_PORT \ +- -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT ++ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50 + fi + # + # log IPsec client connection setup +@@ -463,12 +486,51 @@ + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] + then + logger -t $TAG -p $FAC_PRIO \ +- "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" ++ "client+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" + else + logger -t $TAG -p $FAC_PRIO \ +- "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" ++ "client+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" + fi + fi ++ ++ # ++ # Open Firewall for IPinIP + AH + ESP Traffic ++ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p IP \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p AH \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p ESP \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ if [ $VPN_LOGGING ] ++ then ++ logger -t $TAG -p $FAC_PRIO \ ++ "tunnel+ $PLUTO_PEER -- $PLUTO_ME" ++ fi ++ ++ # Add source nat so also the gateway can access the other nets ++ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) ++ for _src in ${GREEN_ADDRESS} ${BLUE_ADDRESS} ${ORANGE_ADDRESS}; do ++ ip_in_subnet "${_src}" "${PLUTO_MY_CLIENT}" ++ if [ $? -eq 0 ]; then ++ src=${_src} ++ break ++ fi ++ done ++ ++ if [ -n "${src}" ]; then ++ iptables -t nat -A IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src ++ logger -t $TAG -p $FAC_PRIO \ ++ "snat+ $PLUTO_INTERFACE-$PLUTO_ME : $PLUTO_PEER_CLIENT - $src" ++ else ++ logger -t $TAG -p $FAC_PRIO \ ++ "Cannot create NAT rule because no IP of the IPFire does match the subnet. $PLUTO_MY_CLIENT" ++ fi ++ ++ # Flush routing cache ++ ip route flush cache + ;; + down-client:iptables) + # connection to client subnet, with (left/right)firewall=yes, going down +@@ -476,11 +538,11 @@ + # ones, so do not mess with it; see CAUTION comment up at top. + if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ] + then +- iptables -D FORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ iptables -D IPSECFORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_MY_CLIENT $S_MY_PORT \ + -d $PLUTO_PEER_CLIENT $D_PEER_PORT \ +- $IPSEC_POLICY_OUT -j ACCEPT +- iptables -D FORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ $IPSEC_POLICY_OUT -j MARK --set-mark 50 ++ iptables -D IPSECFORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_MY_CLIENT $D_MY_PORT \ + $IPSEC_POLICY_IN -j ACCEPT +@@ -490,14 +552,14 @@ + # or sometimes host access via the internal IP is needed + if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] + then +- iptables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_MY_CLIENT $D_MY_PORT \ + $IPSEC_POLICY_IN -j ACCEPT +- iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_MY_CLIENT $S_MY_PORT \ + -d $PLUTO_PEER_CLIENT $D_PEER_PORT \ +- $IPSEC_POLICY_OUT -j ACCEPT ++ $IPSEC_POLICY_OUT -j MARK --set-mark 50 + fi + # + # log IPsec client connection teardown +@@ -506,12 +568,51 @@ + if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ] + then + logger -t $TAG -p $FAC_PRIO -- \ +- "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" ++ "client- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" + else + logger -t $TAG -p $FAC_PRIO -- \ +- "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" ++ "client- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT" + fi + fi ++ ++ # ++ # Close Firewall for IPinIP + AH + ESP Traffic ++ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p IP \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p AH \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p ESP \ ++ -s $PLUTO_PEER $S_PEER_PORT \ ++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT ++ if [ $VPN_LOGGING ] ++ then ++ logger -t $TAG -p $FAC_PRIO \ ++ "tunnel- $PLUTO_PEER -- $PLUTO_ME" ++ fi ++ ++ # remove source nat ++ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) ++ for _src in ${GREEN_ADDRESS} ${BLUE_ADDRESS} ${ORANGE_ADDRESS}; do ++ ip_in_subnet "${_src}" "${PLUTO_MY_CLIENT}" ++ if [ $? -eq 0 ]; then ++ src=${_src} ++ break ++ fi ++ done ++ ++ if [ -n "${src}" ]; then ++ iptables -t nat -D IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src ++ logger -t $TAG -p $FAC_PRIO \ ++ "snat- $PLUTO_INTERFACE-$PLUTO_ME : $PLUTO_PEER_CLIENT - $src" ++ else ++ logger -t $TAG -p $FAC_PRIO \ ++ "Cannot remove NAT rule because no IP of the IPFire does match the subnet." ++ fi ++ ++ # Flush routing cache ++ ip route flush cache + ;; + # + # IPv6 +@@ -546,10 +647,10 @@ + # connection to me, with (left/right)firewall=yes, coming up + # This is used only by the default updown script, not by your custom + # ones, so do not mess with it; see CAUTION comment up at top. +- ip6tables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ ip6tables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT +- ip6tables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ ip6tables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ + -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT + # +@@ -570,10 +671,10 @@ + # connection to me, with (left/right)firewall=yes, going down + # This is used only by the default updown script, not by your custom + # ones, so do not mess with it; see CAUTION comment up at top. +- ip6tables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ ip6tables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT +- ip6tables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ ip6tables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \ + -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT + # +@@ -596,10 +697,10 @@ + # ones, so do not mess with it; see CAUTION comment up at top. + if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ] + then +- ip6tables -I FORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ ip6tables -I IPSECFORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_MY_CLIENT $S_MY_PORT \ + -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT +- ip6tables -I FORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ ip6tables -I IPSECFORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT + fi +@@ -608,10 +709,10 @@ + # or sometimes host access via the internal IP is needed + if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] + then +- ip6tables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ ip6tables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT +- ip6tables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ ip6tables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_MY_CLIENT $S_MY_PORT \ + -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT + fi +@@ -635,11 +736,11 @@ + # ones, so do not mess with it; see CAUTION comment up at top. + if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ] + then +- ip6tables -D FORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ ip6tables -D IPSECFORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_MY_CLIENT $S_MY_PORT \ + -d $PLUTO_PEER_CLIENT $D_PEER_PORT \ + $IPSEC_POLICY_OUT -j ACCEPT +- ip6tables -D FORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ ip6tables -D IPSECFORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_MY_CLIENT $D_MY_PORT \ + $IPSEC_POLICY_IN -j ACCEPT +@@ -649,11 +750,11 @@ + # or sometimes host access via the internal IP is needed + if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ] + then +- ip6tables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ ++ ip6tables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \ + -s $PLUTO_PEER_CLIENT $S_PEER_PORT \ + -d $PLUTO_MY_CLIENT $D_MY_PORT \ + $IPSEC_POLICY_IN -j ACCEPT +- ip6tables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ ++ ip6tables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \ + -s $PLUTO_MY_CLIENT $S_MY_PORT \ + -d $PLUTO_PEER_CLIENT $D_PEER_PORT \ + $IPSEC_POLICY_OUT -j ACCEPT hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 1a140b78980fe0f488e25a3b2dd92256e3751ab0
by git＠ipfire.org 12 Sep '11

12 Sep '11

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, master has been updated via 1a140b78980fe0f488e25a3b2dd92256e3751ab0 (commit) via 79231dc50fd71d392ae0f6d54cfb8ec8de2bbcfe (commit) via a01ce24dae2a6ce2438c2dd603de05af4eecbbbe (commit) via 84f23fd9bf9d915473b49ec759099be26c903a07 (commit) via 60f396d77d0d67b37e43ba622611a8f90633567f (commit) from 39017f76e77fb77fd47c17cc89da69f3b3f0e946 (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 1a140b78980fe0f488e25a3b2dd92256e3751ab0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 12 23:47:15 2011 +0200 core53: add setup to updater. commit 79231dc50fd71d392ae0f6d54cfb8ec8de2bbcfe Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 12 23:46:02 2011 +0200 core53: add all langs to updater. commit a01ce24dae2a6ce2438c2dd603de05af4eecbbbe Merge: 84f23fd 60f396d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 12 23:44:44 2011 +0200 Merge commit 'origin/next' commit 84f23fd9bf9d915473b49ec759099be26c903a07 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 12 23:43:57 2011 +0200 gcc: fix linker detection patch. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/53/filelists/files | 7 +- html/cgi-bin/ovpnmain.cgi | 138 ++++++++++--------- .../gcc-4.1.2-fix_linker_version_detection.patch | 2 +- 3 files changed, 76 insertions(+), 71 deletions(-) Difference in files: diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files index cdd78c2..3e71a05 100644 --- a/config/rootfiles/core/53/filelists/files +++ b/config/rootfiles/core/53/filelists/files @@ -13,15 +13,12 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/routing.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi -var/ipfire/langs/de.pl -var/ipfire/langs/en.pl -var/ipfire/langs/es.pl -var/ipfire/langs/fr.pl -var/ipfire/langs/pl.pl +var/ipfire/langs/ usr/local/bin/ipsecctrl usr/local/bin/openvpnctrl usr/local/bin/vpn-watch usr/local/bin/rebuildroutes +usr/local/sbin/setup var/ipfire/main/routing var/ipfire/menu.d/30-network.menu opt/pakfire/etc/pakfire.conf diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index db2f2c1..b66299b 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -558,32 +558,35 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "persist-tun\n"; print SERVERCONF "persist-key\n"; print SERVERCONF "script-security 2\n"; - print SERVERCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; + print SERVERCONF "# IP/DNS for remote Server Gateway\n"; print SERVERCONF "remote $cgiparams{'REMOTE'}\n"; print SERVERCONF "float\n"; - print SERVERCONF "# IP address of the n2n VPN Subnet\n"; + print SERVERCONF "# IP adresses of the VPN Subnet\n"; print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; - print SERVERCONF "# Client gateway network\n"; + print SERVERCONF "# Client Gateway Network\n"; print SERVERCONF "route @remsubnet[0] @remsubnet[1]\n"; - print SERVERCONF "# tun device\n"; + print SERVERCONF "# tun Device\n"; print SERVERCONF "dev tun\n"; - print SERVERCONF "#Port and protocol\n"; + print SERVERCONF "# Port and Protokol\n"; print SERVERCONF "port $cgiparams{'DEST_PORT'}\n"; - print SERVERCONF "proto $cgiparams{'PROTOCOL'}\n"; - print SERVERCONF "# Paketsize\n"; + + if ($cgiparams{'PROTOCOL'} eq 'tcp') { + print SERVERCONF "proto tcp-server\n"; + print SERVERCONF "# Packet size\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; - print SERVERCONF "tun-mtu $tunmtu\n"; - if ($cgiparams{'PROTOCOL'} eq 'udp') { - if ($cgiparams{'FRAGMENT'} eq '') { - print SERVERCONF "fragment 1300\r\n"; - } else { - print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n" - } - if ($cgiparams{'MSSFIX'} eq 'on') { - print SERVERCONF "mssfix\n"; + print SERVERCONF "tun-mtu $tunmtu\n"; } + + if ($cgiparams{'PROTOCOL'} eq 'udp') { + print SERVERCONF "proto udp\n"; + print SERVERCONF "# Paketsize\n"; + if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; + print SERVERCONF "tun-mtu $tunmtu\n"; + if ($cgiparams{'FRAGMENT'} ne '') {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n";} } - print SERVERCONF "# Auth Server\n"; + + print SERVERCONF "# Auth. Server\n"; print SERVERCONF "tls-server\n"; print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n"; @@ -592,17 +595,17 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "# Cipher\n"; print SERVERCONF "cipher AES-256-CBC\n"; if ($cgiparams{'COMPLZO'} eq 'on') { - print SERVERCONF "# Enable compession\n"; + print SERVERCONF "# Enable Compression\n"; print SERVERCONF "comp-lzo\r\n"; } - print SERVERCONF "# Debug level\n"; + print SERVERCONF "# Debug Level\n"; print SERVERCONF "verb 3\n"; print SERVERCONF "# Tunnel check\n"; print SERVERCONF "keepalive 10 60\n"; - print SERVERCONF "# start as daemon\n"; + print SERVERCONF "# Start as daemon\n"; print SERVERCONF "daemon $cgiparams{'NAME'}n2n\n"; print SERVERCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print SERVERCONF "# Activate Management Interface on Port\n"; + print SERVERCONF "# Activate Management Interface and Port\n"; print SERVERCONF "#management localhost 4711\n"; close(SERVERCONF); @@ -633,48 +636,52 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; + print CLIENTCONF "# IP/DNS for remote Server Gateway\n"; print CLIENTCONF "remote $cgiparams{'REMOTE'}\n"; print CLIENTCONF "float\n"; - print CLIENTCONF "# IP address of the n2n VPN Subnet\n"; + print CLIENTCONF "# IP adresses of the VPN Subnet\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; - print CLIENTCONF "# Server gateway network\n"; + print CLIENTCONF "# Server Gateway Network\n"; print CLIENTCONF "route @remsubnet[0] @remsubnet[1]\n"; - print CLIENTCONF "# tun device\n"; + print CLIENTCONF "# tun Device\n"; print CLIENTCONF "dev tun\n"; - print CLIENTCONF "#Port and protocol\n"; + print CLIENTCONF "# Port and Protokol\n"; print CLIENTCONF "port $cgiparams{'DEST_PORT'}\n"; - print CLIENTCONF "proto $cgiparams{'PROTOCOL'}\n"; - print CLIENTCONF "# Paketsize\n"; + + if ($cgiparams{'PROTOCOL'} eq 'tcp') { + print CLIENTCONF "proto tcp-client\n"; + print CLIENTCONF "# Packet size\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; - print CLIENTCONF "tun-mtu $tunmtu\n"; - if ($cgiparams{'PROTOCOL'} eq 'udp') { - if ($cgiparams{'FRAGMENT'} eq '') { - print CLIENTCONF "fragment 1300\r\n"; - } else { - print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n" - } - if ($cgiparams{'MSSFIX'} eq 'on') { - print CLIENTCONF "mssfix\n"; + print CLIENTCONF "tun-mtu $tunmtu\n"; + print CLIENTCONF "ns-cert-type server\n"; } + + if ($cgiparams{'PROTOCOL'} eq 'udp') { + print CLIENTCONF "proto udp\n"; + print CLIENTCONF "# Paketsize\n"; + if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; + print CLIENTCONF "tun-mtu $tunmtu\n"; + if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n";} } + print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; print CLIENTCONF "# Cipher\n"; print CLIENTCONF "cipher AES-256-CBC\n"; print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}.p12\r\n"; if ($cgiparams{'COMPLZO'} eq 'on') { - print CLIENTCONF "# Enable compession\n"; + print CLIENTCONF "# Enable Compression\n"; print CLIENTCONF "comp-lzo\r\n"; } print CLIENTCONF "# Debug Level\n"; print CLIENTCONF "verb 3\n"; print CLIENTCONF "# Tunnel check\n"; print CLIENTCONF "keepalive 10 60\n"; - print CLIENTCONF "# Start sa daemon\n"; + print CLIENTCONF "# Start as daemon\n"; print CLIENTCONF "daemon $cgiparams{'NAME'}n2n\n"; print CLIENTCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print CLIENTCONF "# Activate Management Interface on Port\n"; + print CLIENTCONF "# Activate Management Interface and Port\n"; print CLIENTCONF "# management localhost 4711\n"; close(CLIENTCONF); @@ -1558,31 +1565,35 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; + print CLIENTCONF "# IP/DNS for remote Server Gateway\n"; print CLIENTCONF "remote $vpnsettings{'VPN_IP'}\n"; print CLIENTCONF "float\n"; - print CLIENTCONF "# IP adress of the VPN Subnet\n"; + print CLIENTCONF "# IP adresses of the VPN Subnet\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; print CLIENTCONF "# Server Gateway Network\n"; print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; print CLIENTCONF "# tun Device\n"; print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\n"; - print CLIENTCONF "#Port and Protokoll\n"; + print CLIENTCONF "# Port and Protokoll\n"; print CLIENTCONF "port $confighash{$cgiparams{'KEY'}}[29]\n"; - print CLIENTCONF "proto $confighash{$cgiparams{'KEY'}}[28]\n"; - print CLIENTCONF "# Paketsize\n"; + + if ($confighash{$cgiparams{'KEY'}}[28] eq 'tcp') { + print CLIENTCONF "proto tcp-client\n"; + print CLIENTCONF "# Packet size\n"; if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1400'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; - print CLIENTCONF "tun-mtu $tunmtu\n"; - if ($confighash{$cgiparams{'KEY'}}[28] eq 'udp') { - if ($cgiparams{'FRAGMENT'} eq '') { - print CLIENTCONF "fragment 1300\r\n"; - } else { - print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n" - } - if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') { - print CLIENTCONF "mssfix\n"; + print CLIENTCONF "tun-mtu $tunmtu\n"; + print CLIENTCONF "ns-cert-type server\n"; } + + if ($confighash{$cgiparams{'KEY'}}[28] eq 'udp') { + print CLIENTCONF "proto udp\n"; + print CLIENTCONF "# Paketsize\n"; + if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1500'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; + print CLIENTCONF "tun-mtu $tunmtu\n"; + if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') {print CLIENTCONF "mssfix\n";} } + print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; print CLIENTCONF "# Cipher\n"; @@ -1906,8 +1917,8 @@ ADV_ERROR: <tr> <td class='base'>fragment <br></td> <td><input type='TEXT' name='FRAGMENT' value='$cgiparams{'FRAGMENT'}' size='10' /></td> - <td>Default: <span class="base">1300</span></td> - </tr> + <td>Default: <span class="base">1300</span></td> + </tr> <tr> <td class='base'>mssfix</td> <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td> @@ -2315,7 +2326,8 @@ END my $complzoactive; my $mssfixactive; my $n2nfragment; -my @n2nproto = split(/ /, (grep { /^proto/ } @firen2nconf)[0]); +my @n2nproto2 = split(/ /, (grep { /^proto/ } @firen2nconf)[0]); +my @n2nproto = split(/-/, @n2nproto2[1]); my @n2nport = split(/ /, (grep { /^port/ } @firen2nconf)[0]); my @n2ntunmtu = split(/ /, (grep { /^tun-mtu/ } @firen2nconf)[0]); my @n2ncomplzo = grep { /^comp-lzo/ } @firen2nconf; @@ -2329,6 +2341,7 @@ my @n2novpnsub = split(/\./,$n2novpnsuball[1]); my @n2nremsub = split(/ /, (grep { /^route/ } @firen2nconf)[0]); my @n2nlocalsub = split(/ /, (grep { /^# remsub/ } @firen2nconf)[0]); + ### # m.a.d delete CR and LF from arrays for this chomp doesnt work ### @@ -2337,7 +2350,7 @@ $n2nremote[1] =~ s/\n|\r//g; $n2novpnsub[0] =~ s/\n|\r//g; $n2novpnsub[1] =~ s/\n|\r//g; $n2novpnsub[2] =~ s/\n|\r//g; -$n2nproto[1] =~ s/\n|\r//g; +$n2nproto[0] =~ s/\n|\r//g; $n2nport[1] =~ s/\n|\r//g; $n2ntunmtu[1] =~ s/\n|\r//g; $n2nremsub[1] =~ s/\n|\r//g; @@ -2412,7 +2425,7 @@ foreach my $dkey (keys %confighash) { $confighash{$key}[25] = 'IPFire n2n Client'; $confighash{$key}[26] = 'red'; $confighash{$key}[27] = "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0"; - $confighash{$key}[28] = $n2nproto[1]; + $confighash{$key}[28] = $n2nproto[0]; $confighash{$key}[29] = $n2nport[1]; $confighash{$key}[30] = $complzoactive; $confighash{$key}[31] = $n2ntunmtu[1]; @@ -2684,8 +2697,7 @@ if ($cgiparams{'TYPE'} eq 'net') { if (&valid_dns_host($cgiparams{'REMOTE'})) { $warnmessage = "$Lang::tr{'check vpn lr'} $cgiparams{'REMOTE'}. $Lang::tr{'dns check failed'}"; if ($cgiparams{'TYPE'} eq 'net') { - unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } } } @@ -3012,11 +3024,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; $confighash{$key}[10] = $cgiparams{'REMOTE'}; $confighash{$key}[23] = $cgiparams{'MSSFIX'}; - if ($cgiparams{'FRAGMENT'} eq '') { - $confighash{$key}[24] = '1300'; - } else { $confighash{$key}[24] = $cgiparams{'FRAGMENT'}; - } $confighash{$key}[25] = $cgiparams{'REMARK'}; $confighash{$key}[26] = $cgiparams{'INTERFACE'}; # new fields diff --git a/src/patches/gcc-4.1.2-fix_linker_version_detection.patch b/src/patches/gcc-4.1.2-fix_linker_version_detection.patch index c2f43be..36a756c 100644 --- a/src/patches/gcc-4.1.2-fix_linker_version_detection.patch +++ b/src/patches/gcc-4.1.2-fix_linker_version_detection.patch @@ -6,7 +6,7 @@ diff -Naur gcc-4.1.2.org/libstdc++-v3/configure gcc-4.1.2/libstdc++-v3/configure ldver=`$LD --version 2>/dev/null | head -1 | \ - sed -e 's/GNU ld version $[0-9.][0-9.]*$.*/\1/'` -+ sed -e 's/GNU ld (GNU binutils) $[0-9.][0-9.]*$.*/\1/'` ++ sed -e 's/GNU ld .*) $[0-9.][0-9.]*$.*/\1/'` glibcxx_gnu_ld_version=`echo $ldver | \ $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 60f396d77d0d67b37e43ba622611a8f90633567f
by git＠ipfire.org 12 Sep '11

12 Sep '11

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 60f396d77d0d67b37e43ba622611a8f90633567f (commit) from b0dcbdeae448d3fc852c9ee9a4e5e6b9ab75fd34 (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 60f396d77d0d67b37e43ba622611a8f90633567f Author: Alfred Haas <alfred.haas(a)ipfire.org> Date: Mon Sep 12 12:23:08 2011 +0200 Update of ovpnmain.cgi. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 138 ++++++++++++++++++++++++--------------------- 1 files changed, 73 insertions(+), 65 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index db2f2c1..b66299b 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -558,32 +558,35 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "persist-tun\n"; print SERVERCONF "persist-key\n"; print SERVERCONF "script-security 2\n"; - print SERVERCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; + print SERVERCONF "# IP/DNS for remote Server Gateway\n"; print SERVERCONF "remote $cgiparams{'REMOTE'}\n"; print SERVERCONF "float\n"; - print SERVERCONF "# IP address of the n2n VPN Subnet\n"; + print SERVERCONF "# IP adresses of the VPN Subnet\n"; print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; - print SERVERCONF "# Client gateway network\n"; + print SERVERCONF "# Client Gateway Network\n"; print SERVERCONF "route @remsubnet[0] @remsubnet[1]\n"; - print SERVERCONF "# tun device\n"; + print SERVERCONF "# tun Device\n"; print SERVERCONF "dev tun\n"; - print SERVERCONF "#Port and protocol\n"; + print SERVERCONF "# Port and Protokol\n"; print SERVERCONF "port $cgiparams{'DEST_PORT'}\n"; - print SERVERCONF "proto $cgiparams{'PROTOCOL'}\n"; - print SERVERCONF "# Paketsize\n"; + + if ($cgiparams{'PROTOCOL'} eq 'tcp') { + print SERVERCONF "proto tcp-server\n"; + print SERVERCONF "# Packet size\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; - print SERVERCONF "tun-mtu $tunmtu\n"; - if ($cgiparams{'PROTOCOL'} eq 'udp') { - if ($cgiparams{'FRAGMENT'} eq '') { - print SERVERCONF "fragment 1300\r\n"; - } else { - print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n" - } - if ($cgiparams{'MSSFIX'} eq 'on') { - print SERVERCONF "mssfix\n"; + print SERVERCONF "tun-mtu $tunmtu\n"; } + + if ($cgiparams{'PROTOCOL'} eq 'udp') { + print SERVERCONF "proto udp\n"; + print SERVERCONF "# Paketsize\n"; + if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; + print SERVERCONF "tun-mtu $tunmtu\n"; + if ($cgiparams{'FRAGMENT'} ne '') {print SERVERCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n";} } - print SERVERCONF "# Auth Server\n"; + + print SERVERCONF "# Auth. Server\n"; print SERVERCONF "tls-server\n"; print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; print SERVERCONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n"; @@ -592,17 +595,17 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print SERVERCONF "# Cipher\n"; print SERVERCONF "cipher AES-256-CBC\n"; if ($cgiparams{'COMPLZO'} eq 'on') { - print SERVERCONF "# Enable compession\n"; + print SERVERCONF "# Enable Compression\n"; print SERVERCONF "comp-lzo\r\n"; } - print SERVERCONF "# Debug level\n"; + print SERVERCONF "# Debug Level\n"; print SERVERCONF "verb 3\n"; print SERVERCONF "# Tunnel check\n"; print SERVERCONF "keepalive 10 60\n"; - print SERVERCONF "# start as daemon\n"; + print SERVERCONF "# Start as daemon\n"; print SERVERCONF "daemon $cgiparams{'NAME'}n2n\n"; print SERVERCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print SERVERCONF "# Activate Management Interface on Port\n"; + print SERVERCONF "# Activate Management Interface and Port\n"; print SERVERCONF "#management localhost 4711\n"; close(SERVERCONF); @@ -633,48 +636,52 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; + print CLIENTCONF "# IP/DNS for remote Server Gateway\n"; print CLIENTCONF "remote $cgiparams{'REMOTE'}\n"; print CLIENTCONF "float\n"; - print CLIENTCONF "# IP address of the n2n VPN Subnet\n"; + print CLIENTCONF "# IP adresses of the VPN Subnet\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; - print CLIENTCONF "# Server gateway network\n"; + print CLIENTCONF "# Server Gateway Network\n"; print CLIENTCONF "route @remsubnet[0] @remsubnet[1]\n"; - print CLIENTCONF "# tun device\n"; + print CLIENTCONF "# tun Device\n"; print CLIENTCONF "dev tun\n"; - print CLIENTCONF "#Port and protocol\n"; + print CLIENTCONF "# Port and Protokol\n"; print CLIENTCONF "port $cgiparams{'DEST_PORT'}\n"; - print CLIENTCONF "proto $cgiparams{'PROTOCOL'}\n"; - print CLIENTCONF "# Paketsize\n"; + + if ($cgiparams{'PROTOCOL'} eq 'tcp') { + print CLIENTCONF "proto tcp-client\n"; + print CLIENTCONF "# Packet size\n"; if ($cgiparams{'MTU'} eq '') {$tunmtu = '1400'} else {$tunmtu = $cgiparams{'MTU'}}; - print CLIENTCONF "tun-mtu $tunmtu\n"; - if ($cgiparams{'PROTOCOL'} eq 'udp') { - if ($cgiparams{'FRAGMENT'} eq '') { - print CLIENTCONF "fragment 1300\r\n"; - } else { - print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n" - } - if ($cgiparams{'MSSFIX'} eq 'on') { - print CLIENTCONF "mssfix\n"; + print CLIENTCONF "tun-mtu $tunmtu\n"; + print CLIENTCONF "ns-cert-type server\n"; } + + if ($cgiparams{'PROTOCOL'} eq 'udp') { + print CLIENTCONF "proto udp\n"; + print CLIENTCONF "# Paketsize\n"; + if ($cgiparams{'MTU'} eq '') {$tunmtu = '1500'} else {$tunmtu = $cgiparams{'MTU'}}; + print CLIENTCONF "tun-mtu $tunmtu\n"; + if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n";} } + print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; print CLIENTCONF "# Cipher\n"; print CLIENTCONF "cipher AES-256-CBC\n"; print CLIENTCONF "pkcs12 ${General::swroot}/ovpn/certs/$cgiparams{'NAME'}.p12\r\n"; if ($cgiparams{'COMPLZO'} eq 'on') { - print CLIENTCONF "# Enable compession\n"; + print CLIENTCONF "# Enable Compression\n"; print CLIENTCONF "comp-lzo\r\n"; } print CLIENTCONF "# Debug Level\n"; print CLIENTCONF "verb 3\n"; print CLIENTCONF "# Tunnel check\n"; print CLIENTCONF "keepalive 10 60\n"; - print CLIENTCONF "# Start sa daemon\n"; + print CLIENTCONF "# Start as daemon\n"; print CLIENTCONF "daemon $cgiparams{'NAME'}n2n\n"; print CLIENTCONF "writepid /var/run/$cgiparams{'NAME'}n2n.pid\n"; - print CLIENTCONF "# Activate Management Interface on Port\n"; + print CLIENTCONF "# Activate Management Interface and Port\n"; print CLIENTCONF "# management localhost 4711\n"; close(CLIENTCONF); @@ -1558,31 +1565,35 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ print CLIENTCONF "persist-tun\n"; print CLIENTCONF "persist-key\n"; print CLIENTCONF "script-security 2\n"; - print CLIENTCONF "# IP/DNS for the Server Gateway - g2g Mode\n"; + print CLIENTCONF "# IP/DNS for remote Server Gateway\n"; print CLIENTCONF "remote $vpnsettings{'VPN_IP'}\n"; print CLIENTCONF "float\n"; - print CLIENTCONF "# IP adress of the VPN Subnet\n"; + print CLIENTCONF "# IP adresses of the VPN Subnet\n"; print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; print CLIENTCONF "# Server Gateway Network\n"; print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; print CLIENTCONF "# tun Device\n"; print CLIENTCONF "dev $vpnsettings{'DDEVICE'}\n"; - print CLIENTCONF "#Port and Protokoll\n"; + print CLIENTCONF "# Port and Protokoll\n"; print CLIENTCONF "port $confighash{$cgiparams{'KEY'}}[29]\n"; - print CLIENTCONF "proto $confighash{$cgiparams{'KEY'}}[28]\n"; - print CLIENTCONF "# Paketsize\n"; + + if ($confighash{$cgiparams{'KEY'}}[28] eq 'tcp') { + print CLIENTCONF "proto tcp-client\n"; + print CLIENTCONF "# Packet size\n"; if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1400'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; - print CLIENTCONF "tun-mtu $tunmtu\n"; - if ($confighash{$cgiparams{'KEY'}}[28] eq 'udp') { - if ($cgiparams{'FRAGMENT'} eq '') { - print CLIENTCONF "fragment 1300\r\n"; - } else { - print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n" - } - if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') { - print CLIENTCONF "mssfix\n"; + print CLIENTCONF "tun-mtu $tunmtu\n"; + print CLIENTCONF "ns-cert-type server\n"; } + + if ($confighash{$cgiparams{'KEY'}}[28] eq 'udp') { + print CLIENTCONF "proto udp\n"; + print CLIENTCONF "# Paketsize\n"; + if ($confighash{$cgiparams{'KEY'}}[31] eq '') {$tunmtu = '1500'} else {$tunmtu = $confighash{$cgiparams{'KEY'}}[31]}; + print CLIENTCONF "tun-mtu $tunmtu\n"; + if ($cgiparams{'FRAGMENT'} ne '') {print CLIENTCONF "fragment $cgiparams{'FRAGMENT'}\n";} + if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') {print CLIENTCONF "mssfix\n";} } + print CLIENTCONF "# Auth. Client\n"; print CLIENTCONF "tls-client\n"; print CLIENTCONF "# Cipher\n"; @@ -1906,8 +1917,8 @@ ADV_ERROR: <tr> <td class='base'>fragment <br></td> <td><input type='TEXT' name='FRAGMENT' value='$cgiparams{'FRAGMENT'}' size='10' /></td> - <td>Default: <span class="base">1300</span></td> - </tr> + <td>Default: <span class="base">1300</span></td> + </tr> <tr> <td class='base'>mssfix</td> <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td> @@ -2315,7 +2326,8 @@ END my $complzoactive; my $mssfixactive; my $n2nfragment; -my @n2nproto = split(/ /, (grep { /^proto/ } @firen2nconf)[0]); +my @n2nproto2 = split(/ /, (grep { /^proto/ } @firen2nconf)[0]); +my @n2nproto = split(/-/, @n2nproto2[1]); my @n2nport = split(/ /, (grep { /^port/ } @firen2nconf)[0]); my @n2ntunmtu = split(/ /, (grep { /^tun-mtu/ } @firen2nconf)[0]); my @n2ncomplzo = grep { /^comp-lzo/ } @firen2nconf; @@ -2329,6 +2341,7 @@ my @n2novpnsub = split(/\./,$n2novpnsuball[1]); my @n2nremsub = split(/ /, (grep { /^route/ } @firen2nconf)[0]); my @n2nlocalsub = split(/ /, (grep { /^# remsub/ } @firen2nconf)[0]); + ### # m.a.d delete CR and LF from arrays for this chomp doesnt work ### @@ -2337,7 +2350,7 @@ $n2nremote[1] =~ s/\n|\r//g; $n2novpnsub[0] =~ s/\n|\r//g; $n2novpnsub[1] =~ s/\n|\r//g; $n2novpnsub[2] =~ s/\n|\r//g; -$n2nproto[1] =~ s/\n|\r//g; +$n2nproto[0] =~ s/\n|\r//g; $n2nport[1] =~ s/\n|\r//g; $n2ntunmtu[1] =~ s/\n|\r//g; $n2nremsub[1] =~ s/\n|\r//g; @@ -2412,7 +2425,7 @@ foreach my $dkey (keys %confighash) { $confighash{$key}[25] = 'IPFire n2n Client'; $confighash{$key}[26] = 'red'; $confighash{$key}[27] = "$n2novpnsub[0].$n2novpnsub[1].$n2novpnsub[2].0/255.255.255.0"; - $confighash{$key}[28] = $n2nproto[1]; + $confighash{$key}[28] = $n2nproto[0]; $confighash{$key}[29] = $n2nport[1]; $confighash{$key}[30] = $complzoactive; $confighash{$key}[31] = $n2ntunmtu[1]; @@ -2684,8 +2697,7 @@ if ($cgiparams{'TYPE'} eq 'net') { if (&valid_dns_host($cgiparams{'REMOTE'})) { $warnmessage = "$Lang::tr{'check vpn lr'} $cgiparams{'REMOTE'}. $Lang::tr{'dns check failed'}"; if ($cgiparams{'TYPE'} eq 'net') { - unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + } } } @@ -3012,11 +3024,7 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[8] = $cgiparams{'LOCAL_SUBNET'}; $confighash{$key}[10] = $cgiparams{'REMOTE'}; $confighash{$key}[23] = $cgiparams{'MSSFIX'}; - if ($cgiparams{'FRAGMENT'} eq '') { - $confighash{$key}[24] = '1300'; - } else { $confighash{$key}[24] = $cgiparams{'FRAGMENT'}; - } $confighash{$key}[25] = $cgiparams{'REMARK'}; $confighash{$key}[26] = $cgiparams{'INTERFACE'}; # new fields hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM September 2011