diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-04-27 10:15:29 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-04-27 10:15:29 -0300 |
| commit | 3a0d7845b25085754d83ac52757eb6649938ca17 (patch) | |
| tree | e5c38e103fa4653cc75b14fe1562c08d07eced13 | |
| parent | 7c10d4029c809d662156d5116be882ba2f8d6af9 (diff) | |
| download | pfsense-packages-3a0d7845b25085754d83ac52757eb6649938ca17.tar.gz pfsense-packages-3a0d7845b25085754d83ac52757eb6649938ca17.tar.bz2 pfsense-packages-3a0d7845b25085754d83ac52757eb6649938ca17.zip | |
pfBlockerNG: Do not delete countrycodes.tar.bz2 since it's part of the package and will be missed during port removal on 2.3+
| -rw-r--r-- | config/pfblockerng/pfblockerng.inc | 7 | ||||
| -rw-r--r-- | config/pfblockerng/pfblockerng.xml | 4 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc index 18e22871..d382c647 100644 --- a/config/pfblockerng/pfblockerng.inc +++ b/config/pfblockerng/pfblockerng.inc @@ -2422,10 +2422,9 @@ function pfblockerng_php_install_command() { // Remove previously used CC folder location if exists @rmdir_recursive("{$pfb['dbdir']}/cc"); - # Uncompress Country Code File and delete Archive after extraction. - @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"); + # Uncompress Country Code File + @copy("{$pfb['dbdir']}/countrycodes.tar.bz2", "{$pfb['ccdir']}/countrycodes.tar.bz2"); + exec("/usr/bin/tar -jx -C {$pfb['ccdif']} -f {$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...")); exec("/bin/sh /usr/local/pkg/pfblockerng/geoipupdate.sh all >> {$pfb['geolog']} 2>&1"); diff --git a/config/pfblockerng/pfblockerng.xml b/config/pfblockerng/pfblockerng.xml index 6f7e34ec..ed298925 100644 --- a/config/pfblockerng/pfblockerng.xml +++ b/config/pfblockerng/pfblockerng.xml @@ -49,7 +49,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>pfblockerng</name> - <version>1.0</version> + <version>1.07</version> <title>pfBlockerNG: General Settings</title> <include_file>/usr/local/pkg/pfblockerng/pfblockerng.inc</include_file> <menu> @@ -493,4 +493,4 @@ $pfb['save'] = TRUE; sync_package_pfblockerng(); </custom_php_resync_config_command> -</packagegui>
\ No newline at end of file +</packagegui> diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 269bd1f8..d7314352 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -125,7 +125,7 @@ <category>Firewall</category> <pkginfolink>https://forum.pfsense.org/index.php?topic=86212.0</pkginfolink> <config_file>https://packages.pfsense.org/packages/config/pfblockerng/pfblockerng.xml</config_file> - <version>1.06</version> + <version>1.07</version> <status>Stable</status> <required_version>2.2</required_version> <maintainer>BBCan177@gmail.com</maintainer> |