Enable spamd package on 2.0 fix several paths with the move of files to the new directory also unlink the previous configuration file before linking anew one.

3 files changed, 29 insertions, 8 deletions

diff --git a/config/spamd/spamd.inc b/config/spamd/spamd.inc
index c33e589c..e6b89051 100644
--- a/config/spamd/spamd.inc
+++ b/config/spamd/spamd.inc
@@ -153,6 +153,7 @@ function sync_package_spamd() {
 	log_error("Restart cron");	
 	mwexec("killall -HUP cron");
 	log_error("Setting up spamd.conf symlink");	
+	mwexec("rm -f /usr/local/etc/spamd/spamd.conf");
 	mwexec("ln -s /etc/spamd.conf /usr/local/etc/spamd/spamd.conf");
 	log_error("Stopping spamd");
 	mwexec("/usr/local/etc/rc.d/spamd.sh stop");
@@ -245,7 +246,10 @@ function custom_php_install_command() {
 	system("touch /var/db/whitelist.txt");
 	system("touch /var/db/blacklist.txt");
 	sync_package_spamd();
+	conf_mount_rw();
 	exec("/usr/sbin/pw usermod _spamd -g proxy -G _spamd,proxy");
+	exec("/bin/cp /usr/local/etc/spamd/spamd.conf.sample /usr/local/etc/spamd/spamd.conf");
+	conf_mount_ro();
 }
 
 function custom_php_deinstall_command() {
diff --git a/config/spamd/spamd.xml b/config/spamd/spamd.xml
index 5bbc5d71..b03cd737 100644
--- a/config/spamd/spamd.xml
+++ b/config/spamd/spamd.xml
@@ -95,42 +95,42 @@
     	<additional_files_needed>
 	    <prefix>/usr/local/www/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/spamd_rules.php</item>
+	    <item>http://www.pfsense.com/packages/config/spamd/spamd_rules.php</item>
 	</additional_files_needed>
     	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/spamd_whitelist.xml</item>
+	    <item>http://www.pfsense.com/packages/config/spamd/spamd_whitelist.xml</item>
 	</additional_files_needed>
     	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/spamd_outlook.xml</item>
+	    <item>http://www.pfsense.com/packages/config/spamd/spamd_outlook.xml</item>
 	</additional_files_needed>
     	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/spamd.inc</item>
+	    <item>http://www.pfsense.com/packages/config/spamd/spamd.inc</item>
 	</additional_files_needed>
     	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/spamd_settings.xml</item>
+	    <item>http://www.pfsense.com/packages/config/spamd/spamd_settings.xml</item>
 	</additional_files_needed>
     <additional_files_needed>
 	    <prefix>/usr/local/www/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/spamd_db.php</item>
+	    <item>http://www.pfsense.com/packages/config/spamd/spamd_db.php</item>
 	</additional_files_needed>
     <additional_files_needed>
 	    <prefix>/usr/local/www/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/spamd_db_ext.php</item>
+	    <item>http://www.pfsense.com/packages/config/spamd/spamd_db_ext.php</item>
 	</additional_files_needed>
     <additional_files_needed>
 	    <prefix>/usr/local/bin/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/spamd_gather_stats.php</item>
+	    <item>http://www.pfsense.com/packages/config/spamd/spamd_gather_stats.php</item>
 	</additional_files_needed>	
 
 	<!-- fields gets invoked when the user adds or edits a item.   the following items
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 581b6648..997caefc 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -270,6 +270,23 @@
       <configurationfile>/snort.xml</configurationfile>
 	  <after_install_info>This is the Snort-dev branch and is stable as of Alpha.</after_install_info>
     </package>
+	<package>
+		<name>spamd</name>
+		<website>http://www.openbsd.org/spamd/</website>
+		<descr>Tarpits like spamd are fake SMTP servers, which accept connections but don't deliver mail. Instead, they keep the connections open and reply very slowly. If the peer is patient enough to actually complete the SMTP dialogue (which will take ten minutes or more), the tarpit returns a 'temporary error' code (4xx), which indicates that the mail could not be delivered successfully and that the sender should keep the mail in their queue and retry again later.</descr>
+		<category>Services</category>
+		<config_file>http://www.pfsense.com/packages/config/spamd/spamd.xml</config_file>
+		<depends_on_package_base_url>http://files.pfsense.org/packages/80/All/</depends_on_package_base_url>
+		<depends_on_package>spamd-4.5.0_3.tbz</depends_on_package>
+		<version>4.5.0_4</version>
+		<status>Beta</status>
+		<required_version>1.2.1</required_version>
+		<configurationfile>spamd.xml</configurationfile>
+		<logging>
+			<facilityname>spamd</facilityname>
+			<logfilename>spamd.log</logfilename>
+		</logging>
+	</package>
     <package>
       <name>siproxd</name>
       <website>http://siproxd.sourceforge.net/</website>