Merge pull request #969 from doktornotor/patch-15

3 files changed, 124 insertions, 145 deletions

diff --git a/config/test_package/test.inc b/config/test_package/test.inc
new file mode 100644
index 00000000..292f8d44
--- /dev/null
+++ b/config/test_package/test.inc
@@ -0,0 +1,40 @@
+<?php
+/*
+	test.inc
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2009 John Doe
+	Copyright (C) 2010-2012 Jane Roe
+	Copyright (C) 2014 Johnnie Doe
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+function sync_package_test() {
+	// Put your own code to execute on package reconfiguration here
+}
+
+function sync_package_test_reinstall() {
+	// Put your code to execute on package (re)install here
+}
+
+?>
diff --git a/config/test_package/test_package.php b/config/test_package/test_package.php
deleted file mode 100644
index 8d68cf39..00000000
--- a/config/test_package/test_package.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-/* DISABLE_PHP_LINT_CHECKING */
-
-class CommitTest {
-  function __construct() {
-  }
-
-  public function testFunction() {
-  }
-}
-
-
-?>
\ No newline at end of file
diff --git a/config/test_package/test_package.xml b/config/test_package/test_package.xml
index 3e268fee..b073dba5 100644
--- a/config/test_package/test_package.xml
+++ b/config/test_package/test_package.xml
@@ -2,212 +2,165 @@
 <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-        <copyright>
-        <![CDATA[
+	<copyright>
+<![CDATA[
 /* $Id$ */
-/* ========================================================================== */
+/* ====================================================================================== */
 /*
-    authng.xml
-    part of pfSense (http://www.pfSense.com)
-    Copyright (C) 2007 to whom it may belong
-    All rights reserved.
-
-    Based on m0n0wall (http://m0n0.ch/wall)
-    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-    All rights reserved.
-                                                                              */
-/* ========================================================================== */
+	test_package.xml
+	part of pfSense (https://www.pfSense.org/)
+	Copyright (C) 2009 John Doe
+	Copyright (C) 2010-2012 Jane Roe
+	Copyright (C) 2014 Johnnie Doe
+	Copyright (C) 2015 ESF, LLC
+	All rights reserved.
+*/
+/* ====================================================================================== */
 /*
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
 
-     1. Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
 
-     2. Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
 
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-        ]]>
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+/* ====================================================================================== */
+	]]>
         </copyright>
-    <description>Describe your package here</description>
-    <requirements>Describe your package requirements here</requirements>
-    <faq>Currently there are no FAQ items provided.</faq>
-	<name>Snort</name>
-	<version>2.6.0.2</version>
-	<title>Services: Snort</title>
-	<include_file>/usr/local/pkg/snort.inc</include_file>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
+	<name>Test</name>
+	<version>1.0</version>
+	<title>Services: Test</title>
+	<include_file>/usr/local/pkg/test.inc</include_file>
 	<menu>
-		<name>Snort</name>
-		<tooltiptext>Setup snort specific settings</tooltiptext>
+		<name>Test</name>
+		<tooltiptext>Setup test specific settings</tooltiptext>
 		<section>Services</section>
-		<url>/pkg_edit.php?xml=snort.xml&amp;id=0</url>
+		<url>/pkg_edit.php?xml=test_package.xml&amp;id=0</url>
 	</menu>
 	<service>
-		<name>snort</name>
-		<rcfile>snort.sh</rcfile>
-		<executable>snort</executable>
+		<name>test</name>
+		<rcfile>test.sh</rcfile>
+		<executable>test</executable>
 	</service>
 	<tabs>
 		<tab>
-			<text>Snort Settings</text>
-			<url>/pkg_edit.php?xml=snort.xml&amp;id=0</url>
+			<text>Test Settings</text>
+			<url>/pkg_edit.php?xml=test_package.xml&amp;id=0</url>
 			<active/>
 		</tab>
 		<tab>
-			<text>Update Snort Rules</text>
-			<url>/snort_download_rules.php</url>
-		</tab>
-		<tab>
-			<text>Snort Rulesets</text>
-			<url>/snort_rulesets.php</url>
-		</tab>
-		<tab>
-			<text>Snort Blocked</text>
-			<url>/snort_blocked.php</url>
+			<text>Update Test Rules</text>
+			<url>/test_download_rules.php</url>
 		</tab>
 		<tab>
-			<text>Snort Whitelist</text>
-			<url>/pkg.php?xml=snort_whitelist.xml</url>
+			<text>Test Whitelist</text>
+			<url>/pkg.php?xml=test_whitelist.xml</url>
 		</tab>
 		<tab>
-			<text>Snort Alerts</text>
-			<url>/snort_alerts.php</url>
+			<text>Test Alerts</text>
+			<url>/test_alerts.php</url>
 		</tab>
 	</tabs>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/snort/snort.inc</item>
+		<item>https://packages.pfsense.org/packages/config/test/test.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/bin/</prefix>
-		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/snort/bin/snort2c</item>
+		<item>https://packages.pfsense.org/packages/config/test/bin/test</item>
+		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/snort/snort_download_rules.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/snort/snort_rulesets.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/snort/snort_whitelist.xml</item>
+		<item>https://packages.pfsense.org/packages/config/test/test_download_rules.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/snort/snort_blocked.php</item>
+		<item>https://packages.pfsense.org/packages/config/test/test_alerts.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/snort/snort_check_for_rule_updates.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/www/</prefix>
-		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/snort/snort_alerts.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/pf/</prefix>
-		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/snort/snort_dynamic_ip_reload.php</item>
+		<item>https://packages.pfsense.org/packages/config/test/test_whitelist.xml</item>
 	</additional_files_needed>
 	<fields>
 		<field>
-			<fielddescr>Interface</fielddescr>
-			<fieldname>iface_array</fieldname>
-			<description>Select all WAN type interfaces</description>
+			<fielddescr>Test Interface</fielddescr>
+			<fieldname>interfaces</fieldname>
+			<description>Select all LAN type interfaces</description>
 			<type>interfaces_selection</type>
 			<size>3</size>
 			<value>lan</value>
 			<multiple>true</multiple>
+			<required>true</required>
 		</field>
 		<field>
 			<fielddescr>Performance</fielddescr>
 			<fieldname>performance</fieldname>
-			<description>ac method is the fastest startup but consumes more a lot more memory.  acs/ac-banded and ac-sparsebands/mwm/lowmem methods use quite a bit less.</description>
+			<description>Snail is slowest, warp is fastest.</description>
 			<type>select</type>
 			<options>
 				<option>
-					<name>lowmem</name>
-					<value>lowmem</value>
+					<name>Snail</name>
+					<value>snailvalue</value>
 				</option>
 				<option>
-					<name>ac-std</name>
-					<value>ac-std</value>
+					<name>Low</name>
+					<value>lowvalue</value>
 				</option>
 				<option>
-					<name>ac</name>
-					<value>ac</value>
+					<name>Standard</name>
+					<value>stdvalue</value>
 				</option>
 				<option>
-					<name>ac-banded</name>
-					<value>ac-banded</value>
+					<name>Fast</name>
+					<value>fastvalue</value>
 				</option>
 				<option>
-					<name>ac-sparsebands</name>
-					<value>ac-sparsebands</value>
-				</option>
-
-				<option>
-					<name>mwm</name>
-					<value>mwm</value>
-				</option>
-				<option>
-					<name>acs</name>
-					<value>acs</value>
+					<name>Warp</name>
+					<value>warpvalue</value>
 				</option>
 			</options>
 		</field>
 		<field>
-			<fielddescr>Oinkmaster code</fielddescr>
-			<fieldname>oinkmastercode</fieldname>
-			<description>Obtain a snort.org Oinkmaster code and paste here.</description>
-			<type>input</type>
-			<size>60</size>
-			<value></value>
-		</field>
-		<field>
-			<fielddescr>Block offenders</fielddescr>
-			<fieldname>blockoffenders</fieldname>
-			<description>Automatically block hosts that generate a snort alert.</description>
+			<fielddescr>Generate alerts</fielddescr>
+			<fieldname>testalerts</fieldname>
+			<description>Automatically generate alerts.</description>
 			<type>checkbox</type>
 			<size>60</size>
 		</field>
 		<field>
 			<fielddescr>Update rules automatically</fielddescr>
 			<fieldname>automaticrulesupdate</fieldname>
-			<description>Automatically check for and update rules once a week from snort.org.</description>
+			<description>Automatically check for and update rules once a week from example.org.</description>
 			<type>checkbox</type>
 		</field>
     </fields>
 	<custom_add_php_command>
-		sync_package_snort();
+		sync_package_test();
 	</custom_add_php_command>
 	<custom_php_resync_config_command>
-		sync_package_snort();
+		sync_package_test();
 	</custom_php_resync_config_command>
     <custom_php_install_command>
-		sync_package_snort_reinstall();
+		sync_package_test_reinstall();
     </custom_php_install_command>
-</packagegui>
\ No newline at end of file
+</packagegui>