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, fifteen has been updated via 9063a04e94587fc38f410ec2234275417de201ad (commit) via 42dbdb2088b7877ad1626d19db47089e07996b37 (commit) via 59cbe38697db109f4860e1117b8307b588957b6c (commit) via 4436bc0e2fa74e48b638838ea295fc307f0fc85b (commit) via d9f2ad84895b03abe10607d20d33ac4878eea561 (commit) via 4d5247bdd079493da9989941278d4172cde3bfbf (commit) via 33f297c92b917e9ffff0f18cbee5b0f2e5bd34cd (commit) from df5a6ef76f2fad5aa08ec2959348f9eed9a48d70 (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 9063a04e94587fc38f410ec2234275417de201ad Merge: df5a6ef 42dbdb2 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 9 13:31:25 2014 +0100
Merge branch 'master' into fifteen
Conflicts: config/backup/backup.pl
-----------------------------------------------------------------------
Summary of changes: config/backup/backup.pl | 4 ++ config/rootfiles/common/stage2 | 1 + config/rootfiles/core/75/filelists/files | 2 + config/rootfiles/core/75/update.sh | 3 ++ html/cgi-bin/ovpnmain.cgi | 1 - .../sysconfig/rc.local => scripts/convert-ovpn} | 44 ++++++++++++++++++++-- 6 files changed, 51 insertions(+), 4 deletions(-) copy src/{initscripts/sysconfig/rc.local => scripts/convert-ovpn} (53%) mode change 100644 => 100755
Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index a56a698..3172d6d 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -125,6 +125,10 @@ elsif ($ARGV[0] eq 'restore') { } system("/usr/local/bin/firewallctrl"); } + + # Convert old OpenVPN CCD files (CN change, core 75). + system("/usr/local/bin/convert-ovpn"); +} elsif ($ARGV[0] eq 'restoreaddon') { if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");} system("cd / && tar -xvz -p -f /var/ipfire/backup/addons/backup/$ARGV[1]"); diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index a53ecaf..114592a 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -77,6 +77,7 @@ usr/lib/libstdc++.so.6 usr/local/bin/backupiso usr/local/bin/connscheduler usr/local/bin/consort.sh +usr/local/bin/convert-ovpn usr/local/bin/dialctrl.pl usr/local/bin/hddshutdown usr/local/bin/httpscert diff --git a/config/rootfiles/core/75/filelists/files b/config/rootfiles/core/75/filelists/files index 460db7d..9d4fbe4 100644 --- a/config/rootfiles/core/75/filelists/files +++ b/config/rootfiles/core/75/filelists/files @@ -3,5 +3,7 @@ etc/issue opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/ovpnmain.cgi usr/lib/openvpn/verify +usr/local/bin/convert-ovpn +var/ipfire/backup/bin/backup.pl var/ipfire/header.pl var/ipfire/langs diff --git a/config/rootfiles/core/75/update.sh b/config/rootfiles/core/75/update.sh index 3fd00fe..94bec74 100644 --- a/config/rootfiles/core/75/update.sh +++ b/config/rootfiles/core/75/update.sh @@ -44,6 +44,9 @@ if [ -r "/var/ipfire/ovpn/server.conf" ]; then -i /var/ipfire/ovpn/server.conf fi
+# Convert CCD files. +/usr/local/bin/convert-ovpn + # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 6516c45..5dd943f 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3947,7 +3947,6 @@ if ($cgiparams{'TYPE'} eq 'net') { if ( -e "${General::swroot}/ovpn/ccd/$confighash{$key}[2]"){ unlink "${General::swroot}/ovpn/ccd/$cgiparams{'CERT_NAME'}"; } - $confighash{$key}[2] =~ s/ /_/gi; open ( CCDRWCONF,'>',"${General::swroot}/ovpn/ccd/$confighash{$key}[2]") or die "Unable to create clientconfigfile $!"; print CCDRWCONF "# OpenVPN clientconfig from ccd extension by Copymaster#\n\n"; if($cgiparams{'CHECK1'} eq 'dynamic'){ diff --git a/src/scripts/convert-ovpn b/src/scripts/convert-ovpn new file mode 100755 index 0000000..58921a5 --- /dev/null +++ b/src/scripts/convert-ovpn @@ -0,0 +1,60 @@ +#!/usr/bin/perl + +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2013 Alexander Marx amarx@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 # +# 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/. # +# # +############################################################################### +# # +# This script converts old openvpn ccd files with underscore # +# to files with spaces to make them working with openvpn 2.3 again # +# STEP1: read ovpnconfig and verify cert names # +# STEP2: if neccessary convert ccd file # +# # +############################################################################### + +require '/var/ipfire/general-functions.pl'; + +my %configovpn=(); +my $ccdpath="/var/ipfire/ovpn/ccd/"; +my $ovpnconfig="/var/ipfire/ovpn/ovpnconfig"; + +&General::readhasharray ($ovpnconfig,%configovpn); + +&check_config(); + +sub check_config { + print "Converting CCD files...\n"; + chdir($ccdpath); + + foreach my $key (sort keys %configovpn){ + # Skip everything else but roadwarrior connections. + next if ($configovpn{$key}[3] ne 'host'); + + # Skip all connections with no space in the CN name. + next if ($configovpn{$key}[2] !~ " "); + + my $ccdname = $configovpn{$key}[2]; + $ccdname =~ tr/ /_/; + + # Rename the CCD file if one with the old format exists. + if (-e "$ccdname") { + print " Renaming $ccdname -> $configovpn{$key}[2]...\n"; + rename($ccdname, $configovpn{$key}[2]); + } + } +}
hooks/post-receive -- IPFire 2.x development tree