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 59cbe38697db109f4860e1117b8307b588957b6c (commit) via 4436bc0e2fa74e48b638838ea295fc307f0fc85b (commit) via d9f2ad84895b03abe10607d20d33ac4878eea561 (commit) via 4d5247bdd079493da9989941278d4172cde3bfbf (commit) via 33f297c92b917e9ffff0f18cbee5b0f2e5bd34cd (commit) from ea6d6642a9520469dd845b52a860017844f7c67b (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 59cbe38697db109f4860e1117b8307b588957b6c Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 9 12:29:44 2014 +0100

backup: Convert backups with old CCD files.

commit 4436bc0e2fa74e48b638838ea295fc307f0fc85b Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 9 12:27:07 2014 +0100

core75: Add OpenVPN CCD conversion to updater.

commit d9f2ad84895b03abe10607d20d33ac4878eea561 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 9 12:21:00 2014 +0100

Move openvpn CCD CN converter to scripts directory.

commit 4d5247bdd079493da9989941278d4172cde3bfbf Author: Alexander Marx amarx@ipfire.org Date: Thu Jan 9 11:47:44 2014 +0100

fix ccd config name for openvpn 2.3

commit 33f297c92b917e9ffff0f18cbee5b0f2e5bd34cd Author: Alexander Marx amarx@ipfire.org Date: Thu Jan 9 10:02:13 2014 +0100

fix ccd files for openvpn 2.3 update (core75)

-----------------------------------------------------------------------

Summary of changes: config/backup/backup.pl | 3 ++ 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} | 35 ++++++++++++++++++++-- 6 files changed, 41 insertions(+), 4 deletions(-) copy src/{initscripts/sysconfig/rc.local => scripts/convert-ovpn} (59%) mode change 100644 => 100755

Difference in files: diff --git a/config/backup/backup.pl b/config/backup/backup.pl index f9b8302..fd62672 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -64,6 +64,9 @@ elsif ($ARGV[0] eq 'restore') { system("cd / && tar -xvz -p -f /tmp/restore.ipf"); #Here some converter scripts to correct old Backups (before core 65) system("/usr/sbin/ovpn-ccd-convert"); + + # 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]");} diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 1e91b37..8bb65c3 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -72,6 +72,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 2f3ac4d..a7973a5 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -3990,7 +3990,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..1e99bce --- /dev/null +++ b/src/scripts/convert-ovpn @@ -0,0 +1,51 @@ +#!/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 # +# # +############################################################################### + +my %configovpn=(); +my $ccdpath="/var/ipfire/ovpn/ccd/"; +my $ovpnconfig="/var/ipfire/ovpn/ovpnconfig"; +require '/var/ipfire/general-functions.pl'; + +&General::readhasharray ($ovpnconfig,%configovpn); + +&check_config; + + +sub check_config +{ + print "\n"; + foreach my $key (sort keys %configovpn){ + if ($configovpn{$key}[3] eq 'host' && $configovpn{$key}[2]=~" "){ + my $ccdname=$configovpn{$key}[2]; + $ccdname =~ tr/ /_/; + chdir($ccdpath); + rename($ccdname,$configovpn{$key}[2]); + } + } +}

hooks/post-receive -- IPFire 2.x development tree