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 851a984121f4a20d646de229c7901258fe5605d2 (commit) via b013822b996302d7c3344019fe555d60280ef5c2 (commit) via a54ec49e18e2a77ab0003fbae92ae31068f8d9fc (commit) via c4e106d181124550af7c9bd81e07e9eee4b985ee (commit) via b3c1c8342cf336b949b849579bce76b2de83cfde (commit) via 0c89de671678acb83c46df6600382b076535cd10 (commit) via fde9c9dd035ebd5a24527e1b99069d3df5a03d13 (commit) from 07e1b6c0afaf2cc7ee42c6d7a2a58bfda5d33af0 (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 851a984121f4a20d646de229c7901258fe5605d2 Merge: b013822 07e1b6c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Apr 22 18:25:25 2015 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit b013822b996302d7c3344019fe555d60280ef5c2 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Wed Apr 22 18:18:38 2015 +0200

Rename Locale::Country to Locale::Codes::Country in various scripts.

The new Locale-Country version needs to be loaded and used by specifing Locale::Codes::Country since an upstream API change. Adjusting various perl scripts to use the module in the proper way again.

commit a54ec49e18e2a77ab0003fbae92ae31068f8d9fc Merge: c4e106d 2b4830c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Apr 21 19:20:26 2015 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit c4e106d181124550af7c9bd81e07e9eee4b985ee Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Apr 21 19:16:26 2015 +0200

Revert "Revert "perl-Locale-Country: Update country codes to version 3.33.""

This reverts commit cbc5a4374fd19c8657792f14813da52b801fd681.

commit b3c1c8342cf336b949b849579bce76b2de83cfde Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Apr 21 19:16:03 2015 +0200

Revert "Revert roofile update for Locale-Country."

This reverts commit 91d6b6ef07fc9915dcb2ca8ed0147118615b690d.

commit 0c89de671678acb83c46df6600382b076535cd10 Merge: fde9c9d 1245aa7 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Apr 20 19:03:52 2015 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit fde9c9dd035ebd5a24527e1b99069d3df5a03d13 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Apr 19 12:51:44 2015 +0200

ovpnmain.cgi: Update the certificate revocation list when a connection has been deleted.

Reference #10554.

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

Summary of changes: config/cfgroot/general-functions.pl | 2 +- config/cfgroot/geoip-functions.pl | 4 +-- config/rootfiles/common/Locale-Country | 63 +++++++++++++++++++++++++++------- html/cgi-bin/country.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 2 ++ html/cgi-bin/tor.cgi | 6 ++-- lfs/Locale-Country | 4 +-- 7 files changed, 61 insertions(+), 22 deletions(-)

Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 29f7e8c..2b5cd19 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -17,7 +17,7 @@ package General; use strict; use Socket; use IO::Socket; -use Locale::Country; +use Locale::Codes::Country; use Net::SSLeay; use Net::IPv4Addr qw(:all); $|=1; # line buffering diff --git a/config/cfgroot/geoip-functions.pl b/config/cfgroot/geoip-functions.pl index 68b6f50..85a8dc8 100644 --- a/config/cfgroot/geoip-functions.pl +++ b/config/cfgroot/geoip-functions.pl @@ -23,7 +23,7 @@

package GeoIP;

-use Locale::Country; +use Locale::Codes::Country;

# Function to get the flag icon for a specified country code. sub get_flag_icon($) { @@ -81,7 +81,7 @@ sub get_full_country_name($) { elsif ($code eq "yu") { $name = "Yugoslavia" } else { # Use perl built-in module to get the country code. - $name = &Locale::Country::code2country($code); + $name = &Locale::Codes::Country::code2country($code); }

return $name; diff --git a/config/rootfiles/common/Locale-Country b/config/rootfiles/common/Locale-Country index bbe51ee..0ed312f 100644 --- a/config/rootfiles/common/Locale-Country +++ b/config/rootfiles/common/Locale-Country @@ -1,13 +1,50 @@ -#usr/lib/perl5/site_perl/5.12.3/Locale -usr/lib/perl5/site_perl/5.12.3/Locale/Constants.pm -usr/lib/perl5/site_perl/5.12.3/Locale/Constants.pod -usr/lib/perl5/site_perl/5.12.3/Locale/Country.pm -usr/lib/perl5/site_perl/5.12.3/Locale/Country.pod -usr/lib/perl5/site_perl/5.12.3/Locale/Currency.pm -usr/lib/perl5/site_perl/5.12.3/Locale/Currency.pod -usr/lib/perl5/site_perl/5.12.3/Locale/Language.pm -usr/lib/perl5/site_perl/5.12.3/Locale/Language.pod -usr/lib/perl5/site_perl/5.12.3/Locale/Script.pm -usr/lib/perl5/site_perl/5.12.3/Locale/Script.pod -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Locale-Codes -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Locale-Codes/.packlist +#usr/lib/perl5/5.12.3/Locale/Codes +usr/lib/perl5/5.12.3/Locale/Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes.pod +usr/lib/perl5/5.12.3/Locale/Codes/API.pod +usr/lib/perl5/5.12.3/Locale/Codes/Changes.pod +usr/lib/perl5/5.12.3/Locale/Codes/Constants.pm +usr/lib/perl5/5.12.3/Locale/Codes/Constants.pod +usr/lib/perl5/5.12.3/Locale/Codes/Country.pm +usr/lib/perl5/5.12.3/Locale/Codes/Country.pod +usr/lib/perl5/5.12.3/Locale/Codes/Country_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/Country_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/Currency.pm +usr/lib/perl5/5.12.3/Locale/Codes/Currency.pod +usr/lib/perl5/5.12.3/Locale/Codes/Currency_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/Currency_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangExt.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangExt.pod +usr/lib/perl5/5.12.3/Locale/Codes/LangExt_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangExt_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangFam.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangFam.pod +usr/lib/perl5/5.12.3/Locale/Codes/LangFam_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangFam_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangVar.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangVar.pod +usr/lib/perl5/5.12.3/Locale/Codes/LangVar_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/LangVar_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/Language.pm +usr/lib/perl5/5.12.3/Locale/Codes/Language.pod +usr/lib/perl5/5.12.3/Locale/Codes/Language_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/Language_Retired.pm +usr/lib/perl5/5.12.3/Locale/Codes/Script.pm +usr/lib/perl5/5.12.3/Locale/Codes/Script.pod +usr/lib/perl5/5.12.3/Locale/Codes/Script_Codes.pm +usr/lib/perl5/5.12.3/Locale/Codes/Script_Retired.pm +#usr/lib/perl5/5.12.3/i586-linux-thread-multi/auto/Locale +#usr/lib/perl5/5.12.3/i586-linux-thread-multi/auto/Locale/Codes +#usr/lib/perl5/5.12.3/i586-linux-thread-multi/auto/Locale/Codes/.packlist +#usr/share/man/man3/Locale::Codes.3 +#usr/share/man/man3/Locale::Codes::API.3 +#usr/share/man/man3/Locale::Codes::Changes.3 +#usr/share/man/man3/Locale::Codes::Constants.3 +#usr/share/man/man3/Locale::Codes::Country.3 +#usr/share/man/man3/Locale::Codes::Currency.3 +#usr/share/man/man3/Locale::Codes::LangExt.3 +#usr/share/man/man3/Locale::Codes::LangFam.3 +#usr/share/man/man3/Locale::Codes::LangFam_Retired.3 +#usr/share/man/man3/Locale::Codes::LangVar.3 +#usr/share/man/man3/Locale::Codes::Language.3 +#usr/share/man/man3/Locale::Codes::Script.3 diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index 76035fb..65ce154 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -21,7 +21,7 @@

use strict;

-use Locale::Country; +use Locale::Codes::Country;

my $flagdir = '/srv/web/ipfire/html/images/flags'; my $lines = '1'; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 6bf7b2b..fb52e68 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2346,7 +2346,9 @@ else &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", %confighash);

if ($confighash{$cgiparams{'KEY'}}) { + # Revoke certificate if certificate was deleted and rewrite the CRL my $temp = `/usr/bin/openssl ca -revoke ${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[1]cert.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`; + my $tempA = `/usr/bin/openssl ca -gencrl -out ${General::swroot}/ovpn/crls/cacrl.pem -config ${General::swroot}/ovpn/openssl/ovpn.cnf`;

### # m.a.d net2net diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index 228b5d4..e00bc5f 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -20,7 +20,7 @@ ###############################################################################

use strict; -use Locale::Country; +use Locale::Codes::Country;

# enable only the following on debugging purpose use warnings; @@ -323,9 +323,9 @@ END <option value=''>- $Lang::tr{'tor exit country any'} -</option> END

- my @country_names = Locale::Country::all_country_names(); + my @country_names = Locale::Codes::Country::all_country_names(); foreach my $country_name (sort @country_names) { - my $country_code = Locale::Country::country2code($country_name); + my $country_code = Locale::Codes::Country::country2code($country_name); $country_code = uc($country_code); print "<option value='$country_code'";

diff --git a/lfs/Locale-Country b/lfs/Locale-Country index b2c1455..02bf7a0 100644 --- a/lfs/Locale-Country +++ b/lfs/Locale-Country @@ -24,7 +24,7 @@

include Config

-VER = 2.07 +VER = 3.33

THISAPP = Locale-Codes-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = af0537cc4a882096d0320612c440df6d +$(DL_FILE)_MD5 = bc7496f97889de8504e80addaa0ee40c

install : $(TARGET)

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