aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-02-10 20:22:42 -0200
committerRenato Botelho <garga@FreeBSD.org>2015-02-10 20:22:42 -0200
commit13b36fee54dd7f7b5e59d0b338960e264077bf43 (patch)
tree49e50d5bc419b3021ebcfef35546ee4eaec68efd /config
parentd09b446a62d3e6cb3f5ea4ef4cb5391050bf226e (diff)
parent14421b9e9165ce9c1618c9a310aec0f24ea48491 (diff)
downloadpfsense-packages-13b36fee54dd7f7b5e59d0b338960e264077bf43.tar.gz
pfsense-packages-13b36fee54dd7f7b5e59d0b338960e264077bf43.tar.bz2
pfsense-packages-13b36fee54dd7f7b5e59d0b338960e264077bf43.zip
Merge pull request #812 from BBcan177/pfBlockerNG_020415_2
Diffstat (limited to 'config')
-rw-r--r--config/pfblockerng/countrycodes.tar.bz2bin841191 -> 571736 bytes
-rw-r--r--config/pfblockerng/pfblockerng.inc3
-rw-r--r--config/pfblockerng/pfblockerng.xml2
3 files changed, 3 insertions, 2 deletions
diff --git a/config/pfblockerng/countrycodes.tar.bz2 b/config/pfblockerng/countrycodes.tar.bz2
index afebf58a..12cc1b5b 100644
--- a/config/pfblockerng/countrycodes.tar.bz2
+++ b/config/pfblockerng/countrycodes.tar.bz2
Binary files differ
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc
index 0eb3ff43..793bf7a4 100644
--- a/config/pfblockerng/pfblockerng.inc
+++ b/config/pfblockerng/pfblockerng.inc
@@ -2343,7 +2343,8 @@ function pfblockerng_php_install_command() {
@rmdir_recursive("{$pfb['dbdir']}/cc");
# Uncompress Country Code File and delete Archive after extraction.
- exec("cd /{$pfb['ccdir']}; /usr/bin/tar -jxvf {$pfb['ccdir']}/countrycodes.tar.bz2");
+ @rename("{$pfb['dbdir']}/countrycodes.tar.bz2", "{$pfb['ccdir']}/countrycodes.tar.bz2");
+ exec("cd {$pfb['ccdir']}; /usr/bin/tar -jxvf {$pfb['ccdir']}/countrycodes.tar.bz2");
unlink_if_exists("{$pfb['ccdir']}/countrycodes.tar.bz2");
# Download MaxMind Files and Create Country Code files and Build Continent XML Files
update_output_window(gettext("Downloading MaxMind Country Databases. This may take a minute..."));
diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml
index e2f4b508..7c548921 100644
--- a/config/pfblockerng/pfblockerng.xml
+++ b/config/pfblockerng/pfblockerng.xml
@@ -131,7 +131,7 @@
</additional_files_needed>
<additional_files_needed>
<item>https://packages.pfsense.org/packages/config/pfblockerng/countrycodes.tar.bz2</item>
- <prefix>/var/db/pfblockerng/cc/</prefix>
+ <prefix>/var/db/pfblockerng/</prefix>
<chmod>0444</chmod>
</additional_files_needed>
<additional_files_needed>