* Add PACKAGE: $packagename

* Add EXECUTABLE: $executable-name

13 files changed, 42 insertions, 11 deletions

diff --git a/packages/arpwatch.xml b/packages/arpwatch.xml
index 0a8d6b34..b244aace 100644
--- a/packages/arpwatch.xml
+++ b/packages/arpwatch.xml
@@ -32,7 +32,10 @@
                 config_lock();
                 global $config;
                 $fout = fopen("/usr/local/etc/rc.d/arpwatch.sh","w");
-                fwrite($fout, "# This file was automatically generated by the pfSense\n# package management system.\n\n");
+                fwrite($fout, "#!/bin/sh\n\n");
+                fwrite($fout, "# PACKAGE: Arpwatch\n");
+                fwrite($fout, "# EXECUTABLE: arpwatch\n");
+                fwrite($fout, "\n# This file was automatically generated by the pfSense\n# package management system.\n\n");
                 if(isset($config['installedpackages']['arpwatch']['config'])) {
                         $int = convert_friendly_interface_to_real_interface_name($config['installedpackages']['arpwatch']['config'][0]['interface']);
                 	fwrite($fout, "/usr/local/sbin/arpwatch -d -i " . $int . " &\n\n");
diff --git a/packages/assp.xml b/packages/assp.xml
index 5d69218c..e2b6888a 100644
--- a/packages/assp.xml
+++ b/packages/assp.xml
@@ -16,7 +16,9 @@
 	<custom_php_install_command>
 	    $fout = fopen("/usr/local/etc/rc.d/assp.sh","w");
 	    fwrite($fout, "#!/bin/sh\n\n");
-	    fwrite($fout, "# This file was automatically generated by the pfSense\n");
+            fwrite($fout, "# PACKAGE: assp\n");
+            fwrite($fout, "# EXECUTABLE: assp\n");
+            fwrite($fout, "# This file was automatically generated by the pfSense\n");
 	    fwrite($fout, "# package management system\n\n");
 	    fwrite($fout, "/usr/bin/perl /usr/local/assp/assp.pl &amp;\n\n");
 	    fclose($fout);
diff --git a/packages/doorman.xml b/packages/doorman.xml
index 1d0662ba..8607684b 100644
--- a/packages/doorman.xml
+++ b/packages/doorman.xml
@@ -67,6 +67,8 @@
 		global $config;
 		$fout = fopen("/usr/local/etc/rc.d/doormand.sh","w");
 		fwrite($fout, "#!/bin/sh\n\n/usr/local/sbin/doormand -D &amp;\n");
+                fwrite($fout, "# PACKAGE: doorman\n");
+                fwrite($fout, "# EXECUTABLE: doorman\n");                
 		fclose($fout);
 		chmod("/usr/local/etc/rc.d/doormand.sh", 0755);
 	</custom_php_install_command>
diff --git a/packages/freeradius.xml b/packages/freeradius.xml
index bc1b3fd5..4e995d3d 100644
--- a/packages/freeradius.xml
+++ b/packages/freeradius.xml
@@ -70,6 +70,8 @@
 		fclose($fout);
 		unlink_if_exists("/usr/local/etc/rc.d/radiusd*");
 		$fout = fopen("/usr/local/etc/rc.d/radiusd.sh","w");
+                fwrite($fout, "# PACKAGE: FreeRadius\n");
+                fwrite($fout, "# EXECUTABLE: radiusd\n");
 		fwrite($fout,"#!/bin/sh\n\n/usr/local/sbin/radiusd -X -d /usr/local/etc/raddb &amp;\n");
 		fclose($fout);
 		$fout = fopen("/usr/local/etc/radiusd.conf.dynamic","w");
diff --git a/packages/frickin.xml b/packages/frickin.xml
index 3b182121..c0226a91 100644
--- a/packages/frickin.xml
+++ b/packages/frickin.xml
@@ -11,6 +11,8 @@
 	<custom_php_install_command>
 	    $fout = fopen("/usr/local/etc/rc.d/frickin.sh", "w");
 	    fwrite($fout, "#!/bin/sh\n# This package was automatically generated\n# by the pfSense package system.\n\n");
+            fwrite($fout, "# PACKAGE: frickin\n");
+            fwrite($fout, "# EXECUTABLE: frickin\n");
 	    fwrite($fout, "/usr/local/bin/frickin");
 	    fwrite($fout, " -s 127.0.0.1");
 	    fwrite($fout, " -c 20");
diff --git a/packages/ifdepd.xml b/packages/ifdepd.xml
index 745374b4..69972f27 100644
--- a/packages/ifdepd.xml
+++ b/packages/ifdepd.xml
@@ -40,6 +40,8 @@
                 if($config['installedpackages']['ifdepd']['config'] != "") {
                         $fout = fopen("/usr/local/etc/rc.d/ifdepd.sh","w");
                         fwrite($fout, "#!/bin/sh\n\n");
+                        fwrite($fout, "# PACKAGE: ifdepd\n");
+                        fwrite($fout, "# EXECUTABLE: ifdepd\n");                        
                         if(isset($_POST['usedefaults'])) {
                                 $lan_int = $config['interfaces']['lan']['if'];
                                 $wan_int = $config['interfaces']['wan']['if'];
diff --git a/packages/ifstated.xml b/packages/ifstated.xml
index c3f2367a..515ac91c 100644
--- a/packages/ifstated.xml
+++ b/packages/ifstated.xml
@@ -63,6 +63,8 @@
 	global $config;
 	$fout = fopen("/usr/local/etc/rc.d/ifstated.sh","w");
 	fwrite($fout,"#!/bin/sh\n\n/usr/local/sbin/ifstated\n");
+	fwrite($fout, "# PACKAGE: IFStated\n");
+	fwrite($fout, "# EXECUTABLE: ifstated\n");
 	fclose($fout);
 	chmod("/usr/local/etc/rc.d/radiusd.sh", 0755);
     </custom_php_install_command>
diff --git a/packages/ntop/ntop.xml b/packages/ntop/ntop.xml
index 7fcb2a96..96b1700b 100644
--- a/packages/ntop/ntop.xml
+++ b/packages/ntop/ntop.xml
@@ -99,6 +99,8 @@
 	<custom_php_install_command>
 	    $fout = fopen("/usr/local/etc/rc.d/ntop.sh","w");
 	    fwrite($fout, "#!/bin/sh\n\n");
+	    fwrite($fout, "# PACKAGE: NTop\n");
+	    fwrite($fout, "# EXECUTABLE: ntop\n");		
 	    fwrite($fout, "/usr/local/bin/ntop -u root -d --ipv4 -M\n\n");
 	    fclose($fout);
 	    chmod("/usr/local/etc/rc.d/ntop.sh", 0555);
diff --git a/packages/pure-ftpd.xml b/packages/pure-ftpd.xml
index a2a321b2..52907300 100644
--- a/packages/pure-ftpd.xml
+++ b/packages/pure-ftpd.xml
@@ -69,6 +69,8 @@
 	<custom_php_install_command>
 		$fout = fopen("/usr/local/etc/rc.d/pure-ftpd.sh","w");
 		fwrite($fout, "#!/bin/sh\n\n");
+                fwrite($fout, "# PACKAGE: Pure-FTPD\n");
+                fwrite($fout, "# EXECUTABLE: pure-ftpd\n");
 		fwrite($fout, "/usr/local/sbin/pure-ftpd -A -B /usr/local/etc/pure-ftpd.conf\n");
 		fclose($fout);
 		chmod("/usr/local/etc/rc.d/pure-ftpd.sh", 0755);
diff --git a/packages/siproxd.xml b/packages/siproxd.xml
index 1b82a51d..ad203854 100644
--- a/packages/siproxd.xml
+++ b/packages/siproxd.xml
@@ -106,6 +106,8 @@
 	<custom_php_install_command>
 	mwexec("pkg_add -rv libosip2");
 	$fout = fopen("/usr/local/etc/rc.d/siproxd.sh","w");
+	fwrite($fout, "# PACKAGE: SipProxD\n");
+	fwrite($fout, "# EXECUTABLE: siproxd\n");
 	fwrite($fout, "#!/bin/sh\n\n/usr/local/sbin/siproxd\n");
 	fclose($fout);
 	</custom_php_install_command>
diff --git a/packages/spamd.xml b/packages/spamd.xml
index ada8a8ed..24241485 100644
--- a/packages/spamd.xml
+++ b/packages/spamd.xml
@@ -152,6 +152,8 @@
 	    system("/usr/libexec/spamlogd 2>/dev/null &amp;");
 	    $fd = fopen("/usr/local/etc/rc.d/spamd","w");
 	    fwrite($fd, "#!/bin/sh\n\n");
+	    fwrite($fout, "# PACKAGE: STunnel\n");
+	    fwrite($fout, "# EXECUTABLE: stunnel\n");
 	    fwrite($fd, "/usr/bin/killall spamd-setup 2>/dev/null\n");
 	    fwrite($fd, "/usr/local/sbin/spamd-setup &amp;\n");
 	    fwrite($fd, "/usr/local/libexec/spamlogd &amp;\n");
diff --git a/packages/squid.xml b/packages/squid.xml
index 324f3e86..9619f1e8 100644
--- a/packages/squid.xml
+++ b/packages/squid.xml
@@ -56,6 +56,8 @@
 		write_squid_static_config();
 		$fout = fopen("/usr/local/etc/rc.d/squid.sh","w");
 		fwrite($fout, "#!/bin/sh\n");
+                fwrite($fout, "# PACKAGE: Squid\n");
+                fwrite($fout, "# EXECUTABLE: squid\n");
 		fwrite($fout, "/usr/local/sbin/squid\n\n");
 		fclose($fout);
 		chmod("/usr/local/etc/rc.d/squid.sh", 755);
diff --git a/packages/stunnel.xml b/packages/stunnel.xml
index 1fa6fbb3..35332bff 100644
--- a/packages/stunnel.xml
+++ b/packages/stunnel.xml
@@ -72,17 +72,23 @@
 		</field>
 	</fields>
 	<custom_php_install_command>
-	  safe_mkdir("/usr/local/etc/stunnel");
-	  system("/usr/bin/openssl req -new -x509 -days 365 -nodes -out /usr/local/etc/stunnel/stunnel.pem -keyout /usr/local/etc/stunnel/stunnel.pem 2>/dev/null");
-	  chmod("/usr/local/etc/stunnel/stunnel.pem", 600);
-	  make_dirs("/var/tmp/stunnel/var/tmp");
-	  chmod("/var/tmp/stunnel/var/tmp/", 1777);
-	  copy("/usr/local/etc/rc.d/stunnel.sh.sample", "/usr/local/etc/rc.d/stunnel.sh");
-	  chmod("/usr/local/etc/rc.d/stunnel.sh", 0555);
+	    safe_mkdir("/usr/local/etc/stunnel");
+	    system("/usr/bin/openssl req -new -x509 -days 365 -nodes -out /usr/local/etc/stunnel/stunnel.pem -keyout /usr/local/etc/stunnel/stunnel.pem 2>/dev/null");
+	    chmod("/usr/local/etc/stunnel/stunnel.pem", 600);
+	    make_dirs("/var/tmp/stunnel/var/tmp");
+	    chmod("/var/tmp/stunnel/var/tmp/", 1777);
+	    copy("/usr/local/etc/rc.d/stunnel.sh.sample", "/usr/local/etc/rc.d/stunnel.sh");
+	    $fout = fopen("/usr/local/etc/rc.d/stunnel.sh","w");
+	    fwrite($fout, "#!/bin/sh\n");
+	    fwrite($fout, "# PACKAGE: STunnel\n");
+	    fwrite($fout, "# EXECUTABLE: stunnel\n");
+	    fwrite($fout, "/usr/local/sbin/stunnel /usr/local/etc/stunnel/stunnel.conf\n\n");
+	    fclose($fout);
+	    chmod("/usr/local/etc/rc.d/stunnel.sh", 0555);
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
-	  rmdir_recursive("/var/tmp/stunnel");
-	  rmdir_recursive("/usr/local/etc/stunnel*");
+	    rmdir_recursive("/var/tmp/stunnel");
+	    rmdir_recursive("/usr/local/etc/stunnel*");
 	</custom_php_deinstall_command>
 	<custom_add_php_command_late>
 	  conf_mount_rw();