From 331942e176ae5e366a08e799b5254d970585e3c7 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Fri, 9 Jan 2015 15:10:30 -0500
Subject: Fix incorrect command

---
 config/squidGuard/squidguard.xml              | 2 +-
 config/squidGuard/squidguard_configurator.inc | 2 +-
 pkg_config.10.xml                             | 2 +-
 pkg_config.8.xml                              | 2 +-
 pkg_config.8.xml.amd64                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/squidGuard/squidguard.xml b/config/squidGuard/squidguard.xml
index a41507a7..3a77edf3 100644
--- a/config/squidGuard/squidguard.xml
+++ b/config/squidGuard/squidguard.xml
@@ -6,7 +6,7 @@
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>squidguardgeneral</name>
-	<version>1.4_4 pkg v.1.9.7</version>
+	<version>1.4_4 pkg v.1.9.8</version>
 	<title>Proxy filter SquidGuard: General settings</title>
 	<include_file>/usr/local/pkg/squidguard.inc</include_file>
 	<!-- Installation -->
diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc
index f065e4cb..d3448c5d 100644
--- a/config/squidGuard/squidguard_configurator.inc
+++ b/config/squidGuard/squidguard_configurator.inc
@@ -2221,7 +2221,7 @@ function sg_update_blacklist($from_file)
                     # if $current_dbpath exists, then $val['path'] will created as subdir - !it's worng!
                     if (file_exists($current_dbpath))
                         mwexec("/bin/rm -R {$current_dbpath}");
-                    mwexec("/usr/bin/tar -f {$val['path']}/ {$current_dbpath}");
+                    mwexec("/bin/mv -f {$val['path']}/ {$current_dbpath}");
                     sg_addlog("sg_update_blacklist", "Move {$val['path']}/ -> {$current_dbpath}.", SQUIDGUARD_INFO);
                 }
             }
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index e5c0dcbc..9143e049 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -985,7 +985,7 @@
 		<website>http://www.squidGuard.org/</website>
 		<maintainer>dv_serg@mail.ru</maintainer>
 		<category>Network Management</category>
-		<version>1.4_4 pkg v.1.9.7</version>
+		<version>1.4_4 pkg v.1.9.8</version>
 		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<depends_on_package_pbi>squidguard-1.4_7-##ARCH##.pbi</depends_on_package_pbi>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 7c291e75..57ce59fd 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1268,7 +1268,7 @@
 		<website>http://www.squidGuard.org/</website>
 		<maintainer>dv_serg@mail.ru</maintainer>
 		<category>Network Management</category>
-		<version>1.4_4 pkg v.1.9.7</version>
+		<version>1.4_4 pkg v.1.9.8</version>
 		<status>Beta</status>
 		<required_version>1.1</required_version>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 6996c3ab..704e05b6 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1255,7 +1255,7 @@
 		<website>http://www.squidGuard.org/</website>
 		<maintainer>dv_serg@mail.ru</maintainer>
 		<category>Network Management</category>
-		<version>1.4_4 pkg v.1.9.7</version>
+		<version>1.4_4 pkg v.1.9.8</version>
 		<status>Beta</status>
 		<required_version>1.1</required_version>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-- 
cgit v1.2.3