- Update to 1.2.19

- Various Makefile fixes and tweaks

PR:		ports/120267
Submitted by:	Janky Jay <ek@purplehat.org> (maintainer)

5 files changed, 608 insertions, 528 deletions

diff --git a/sysutils/syscp/Makefile b/sysutils/syscp/Makefile
index c119ee92250c..1bb62439ff5e 100644
--- a/sysutils/syscp/Makefile
+++ b/sysutils/syscp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	syscp
-PORTVERSION=	1.2.16
-PORTREVISION=	1
+PORTVERSION=	1.2.19
 CATEGORIES=	sysutils www
 MASTER_SITES=	http://nuernburg.files.syscp.org/releases/tgz/ \
 		http://canada.files.syscp.org/releases/tgz/ \
@@ -23,7 +22,7 @@ WRKSRC=		${WRKDIR}
 
 NO_BUILD=	yes
 
-SUB_FILES+=	pkg-message
+SUB_FILES+=	pkg-message pkg-deinstall
 
 USE_PHP=	gettext mysql pcre session xml
 
@@ -37,14 +36,20 @@ RUN_DEPENDS+=	mysql:${PORTSDIR}/databases/mysql50-server \
 		webalizer:${PORTSDIR}/www/webalizer
 
 post-patch:
-		${FIND} ${WRKSRC}/${PORTNAME} -name '*.orig' -delete
+	${FIND} ${WRKSRC}/${PORTNAME} -name '*.orig' -delete
+	@cd ${WRKSRC}/${PORTNAME}/lib && ${MV} userdata.inc.php userdata.inc.php.dist
 
 do-install:
-		cd ${WRKDIR}/${PORTNAME} && \
-		${FIND} . | ${CPIO} --quiet -pdm -L ${PREFIX}/www/${PORTNAME}
+	cd ${WRKDIR}/${PORTNAME} && \
+	${FIND} . | ${CPIO} --quiet -pdm -L ${WWWDIR}
 
 post-install:
-		@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/www/${PORTNAME}
-		${CAT} ${PKGMESSAGE}
+	@if [ ! -f ${WWWDIR}/lib/userdata.inc.php ]; then \
+	${CP} -p ${WWWDIR}/lib/userdata.inc.php.dist ${WWWDIR}/lib/userdata.inc.php ; fi
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	@${CHMOD} 0640 ${WWWDIR}/lib/userdata.inc.php
+	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST}
+	@${ECHO_CMD} '@exec ${CHMOD} 0640 ${WWWDIR}/lib/userdata.inc.php' >> ${TMPPLIST}
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/syscp/distinfo b/sysutils/syscp/distinfo
index c77abb2b84be..a87de7034c11 100644
--- a/sysutils/syscp/distinfo
+++ b/sysutils/syscp/distinfo
@@ -1,3 +1,3 @@
-MD5 (syscp-1.2.16.tar.gz) = bb061b2e8d90de810864e699c9887509
-SHA256 (syscp-1.2.16.tar.gz) = def35581c187f7f97c38bcd1a2858a7e76dd035b1f2a382f7fc5ecf065a21d94
-SIZE (syscp-1.2.16.tar.gz) = 354386
+MD5 (syscp-1.2.19.tar.gz) = 7d3128d9ddbaf01f4cd0dca212b8f229
+SHA256 (syscp-1.2.19.tar.gz) = 1305697c9a5997b97b58a7be7a5d1bfc4c993676396d161d53497eb1cc203570
+SIZE (syscp-1.2.19.tar.gz) = 349865
diff --git a/sysutils/syscp/files/patch-syscp-FBSD b/sysutils/syscp/files/patch-syscp-FBSD
index 3c7107850ed0..513f5372426b 100644
--- a/sysutils/syscp/files/patch-syscp-FBSD
+++ b/sysutils/syscp/files/patch-syscp-FBSD
@@ -1,177 +1,45 @@
 diff -Naur syscp.orig/admin_configfiles.php syscp/admin_configfiles.php
---- syscp.orig/admin_configfiles.php	Wed Jan 31 20:21:59 2007
-+++ syscp/admin_configfiles.php	Fri Dec 28 03:54:20 2007
-@@ -24,6 +24,97 @@
+--- syscp.orig/admin_configfiles.php	Sat Dec 29 19:01:45 2007
++++ syscp/admin_configfiles.php	Mon Feb  4 03:38:41 2008
+@@ -96,6 +96,7 @@
+ 			'<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD',
+ 			'<SQL_DB>' => $sql['db'],
+ 			'<SQL_HOST>' => $sql['host'],
++			'<ADMIN_EMAIL>' => $settings['panel']['adminmail'],
+ 			'<SERVERNAME>' => $settings['system']['hostname'],
+ 			'<SERVERIP>' => $settings['system']['ipaddress'],
+ 			'<VIRTUAL_MAILBOX_BASE>' => $settings['system']['vmail_homedir'],
+diff -Naur syscp.orig/install/install.php syscp/install/install.php
+--- syscp.orig/install/install.php	Thu Jan 24 16:05:49 2008
++++ syscp/install/install.php	Mon Feb  4 03:38:41 2008
+@@ -369,7 +369,7 @@
+ }
+ else
+ {
+-	$mysql_host = '127.0.0.1';
++	$mysql_host = 'localhost';
+ }
  
- 	$configfiles = Array
- 	(
-+		'freebsd_release' => Array
-+		(
-+			'label' => 'FreeBSD 6.2 (RELEASE)',
-+			'daemons' => Array
-+			(
-+				'apache' => Array
-+				(
-+					'label' => 'Apache Webserver (HTTP)',
-+					'commands' => Array
-+					(
-+						'touch '.$settings['system']['apacheconf_directory'].$settings['system']['apacheconf_filename'],
-+						'mkdir -p '.$settings['system']['documentroot_prefix'],
-+						'mkdir -p '.$settings['system']['logfiles_directory']
-+					),
-+					'restart' => Array
-+					(
-+						'/usr/local/etc/rc.d/apache' . ( $settings['system']['apacheversion'] == 'apache2' ? '22' : '' ) . ' graceful'
-+					)
-+				),
-+				'bind' => Array
-+				(
-+					'label' => 'Bind9 Nameserver (DNS)',
-+					'files' => Array
-+					(
-+						'etc_bind_default.zone' => '/var/named/etc/namedb/master/default.zone'
-+					),
-+					'commands' => Array
-+					(
-+						'echo "include \"syscp_bind.conf\";" >> '.$settings['system']['bindconf_directory'].'named.conf',
-+						'touch '.$settings['system']['bindconf_directory'].'syscp_bind.conf'
-+					),
-+					'restart' => Array
-+					(
-+						'/usr/sbin/rndc reload'
-+					)
-+				),
-+				'dovecot' => Array
-+				(
-+					'label' => 'Dovecot (POP3/IMAP)',
-+					'files' => Array
-+					(
-+						'etc_dovecot_conf' => '/usr/local/etc/dovecot.conf',
-+						'etc_dovecot_sql' => '/usr/local/etc/dovecot-sql.conf'
-+					),
-+					'restart' => Array
-+					(
-+						'/usr/local/etc/rc.d/dovecot restart',
-+					)
-+				),
-+				'postfix' => Array
-+				(
-+					'label' => 'Postfix (MTA)',
-+					'files' => Array
-+					(
-+						'etc_postfix_main.cf' => '/usr/local/etc/postfix/main.cf',
-+						'etc_postfix_mysql-virtual_alias_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_alias_maps.cf',
-+						'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_domains.cf',
-+						'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_maps.cf'
-+					),
-+					'commands' => Array
-+					(
-+						'mkdir -p '.$settings['system']['vmail_homedir'],
-+						'chown -R postfix:postfix '.$settings['system']['vmail_homedir']
-+					),
-+					'restart' => Array
-+					(
-+						'/usr/local/etc/rc.d/postfix reload'
-+					)
-+				),
-+				'proftpd' => Array
-+				(
-+					'label' => 'ProFTPd (FTP)',
-+					'files' => Array
-+					(
-+						'etc_proftpd.conf' => '/usr/local/etc/proftpd.conf'
-+					),
-+					'restart' => Array
-+					(
-+						'/usr/local/etc/rc.d/proftpd restart'
-+					)
-+				),
-+				'cron' => Array
-+				(
-+					'label' => 'Crond (cronscript)',
-+					'files' => Array
-+					(
-+						'etc_cron.d_syscp' => 'crontab -e (As root)'
-+					)
-+				)
-+			)
-+		),
- 		'debian_sarge' => Array
- 		(
- 			'label' => 'Debian 3.1 (Sarge)',
-@@ -361,6 +452,7 @@
- 				'<SQL_UNPRIVILEGED_PASSWORD>' => 'MYSQL_PASSWORD',
- 				'<SQL_DB>' => $sql['db'],
- 				'<SQL_HOST>' => $sql['host'],
-+				'<ADMIN_EMAIL>' => $settings['panel']['adminmail'],
- 				'<SERVERNAME>' => $settings['system']['hostname'],
- 				'<SERVERIP>' => $settings['system']['ipaddress'],
- 				'<VIRTUAL_MAILBOX_BASE>' => $settings['system']['vmail_homedir'],
-diff -Naur syscp.orig/customer_email.php syscp/customer_email.php
---- syscp.orig/customer_email.php	Wed Jan 31 20:21:59 2007
-+++ syscp/customer_email.php	Fri Dec 28 03:56:18 2007
-@@ -341,7 +341,7 @@
+ if(!empty($_POST['mysql_database']))
+@@ -582,10 +582,10 @@
  
- 						else
- 						{
--							$db->query("INSERT INTO `".TABLE_MAIL_USERS."` (`customerid`, `email`, `username`, `password`, `password_enc`, `homedir`, `maildir`, `uid`, `gid`, `domainid`, `postfix`) VALUES ('".(int)$userinfo['customerid']."', '".$db->escape($email_full)."', '".$db->escape($username)."', '".$db->escape($password)."', ENCRYPT('".$db->escape($password)."'), '".$db->escape($settings['system']['vmail_homedir'])."', '".$db->escape($userinfo['loginname'].'/'.$email_full.'/')."', '".(int)$settings['system']['vmail_uid']."', '".(int)$settings['system']['vmail_gid']."', '".(int)$result['domainid']."', 'y')");
-+							$db->query("INSERT INTO `".TABLE_MAIL_USERS."` (`customerid`, `email`, `username`, `password`, `homedir`, `maildir`, `uid`, `gid`, `domainid`, `postfix`) VALUES ('".(int)$userinfo['customerid']."', '".$db->escape($email_full)."', '".$db->escape($username)."', ENCRYPT('".$db->escape($password)."'), '".$db->escape($settings['system']['vmail_homedir'])."', '".$db->escape($userinfo['loginname'].'/'.$email_full.'/')."', '".(int)$settings['system']['vmail_uid']."', '".(int)$settings['system']['vmail_gid']."', '".(int)$result['domainid']."', 'y')");
- 							$popaccountid = $db->insert_id();
- 							$result['destination'] .= ' ' . $email_full;
- 							$db->query("UPDATE `".TABLE_MAIL_VIRTUAL."` SET `destination` = '".$db->escape(makeCorrectDestination($result['destination']))."', `popaccountid` = '".(int)$popaccountid."' WHERE `customerid`='".(int)$userinfo['customerid']."' AND `id`='".(int)$id."'");
-@@ -390,7 +390,7 @@
- 					}
- 					else
- 					{
--						$result=$db->query("UPDATE `".TABLE_MAIL_USERS."` SET `password` = '".$db->escape($password)."', `password_enc`=ENCRYPT('".$db->escape($password)."') WHERE `customerid`='".(int)$userinfo['customerid']."' AND `id`='".(int)$result['popaccountid']."'");
-+						$result=$db->query("UPDATE `".TABLE_MAIL_USERS."` SET `password`=ENCRYPT('".$db->escape($password)."') WHERE `customerid`='".(int)$userinfo['customerid']."' AND `id`='".(int)$result['popaccountid']."'");
- 						redirectTo ( $filename , Array ( 'page' => 'emails' , 'action' => 'edit' , 'id' => $id , 's' => $s ) ) ;
- 					}
- 				}
-diff -Naur syscp.orig/install/install.php syscp/install/install.php
---- syscp.orig/install/install.php	Wed Jan 31 20:21:59 2007
-+++ syscp/install/install.php	Fri Dec 28 03:54:20 2007
-@@ -316,7 +316,7 @@
- 	}
- 	else
+ 	if($apacheversion == "apache2")
  	{
--		$mysql_host = '127.0.0.1';
-+		$mysql_host = 'localhost';
+-		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/apache2/sites-enabled/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_vhost'");
+-		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/apache2/sites-enabled/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_diroptions'");
+-		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/apache2/syscp-htpasswd/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_htpasswddir'");
+-		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/init.d/apache2 reload' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'");
++		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/usr/local/etc/apache22/syscp/vhosts.conf' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_vhost'");
++		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/usr/local/etc/apache22/syscp/diroptions.conf' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_diroptions'");
++		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/usr/local/etc/apache22/syscp/htpasswd/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_htpasswddir'");
++		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/usr/local/etc/rc.d/apache22 graceful' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'");
  	}
  
- 	if(!empty($_POST['mysql_database']))
-@@ -491,9 +491,9 @@
- 		$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = '".$db->escape($apacheversion)."' WHERE `settinggroup` = 'system' AND `varname` = 'apacheversion'");
- 		if($apacheversion == "apache2")
- 		{
--			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = '/etc/apache2/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_directory'");
--			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = 'sites-available/99_syscp_vhosts.conf' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_filename'");
--			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = '/etc/init.d/apache2 reload' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'");
-+			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = '/usr/local/etc/apache22/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_directory'");
-+			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = 'Includes/syscp-vhosts.conf' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_filename'");
-+			$db->query("UPDATE `".TABLE_PANEL_SETTINGS."` SET `value` = '/usr/local/etc/rc.d/apache22 graceful' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'");
- 		}
- 
- 		// insert the lastcronrun to be the installation date
-@@ -681,4 +681,4 @@
- 	 * END INSTALL ---------------------------------------------------
- 	 */
- 
--?>
-\ No newline at end of file
-+?>
+ 	// insert the lastcronrun to be the installation date
 diff -Naur syscp.orig/install/syscp.sql syscp/install/syscp.sql
---- syscp.orig/install/syscp.sql	Tue Feb  6 21:20:28 2007
-+++ syscp/install/syscp.sql	Fri Dec 28 03:54:20 2007
-@@ -67,7 +67,6 @@
-   `email` varchar(255) NOT NULL default '',
-   `username` varchar(255) NOT NULL default '',
-   `password` varchar(128) NOT NULL default '',
--  `password_enc` varchar(128) NOT NULL default '',
-   `uid` int(11) NOT NULL default '0',
-   `gid` int(11) NOT NULL default '0',
-   `homedir` varchar(255) NOT NULL default '',
-@@ -390,17 +389,17 @@
+--- syscp.orig/install/syscp.sql	Sun Feb  3 16:10:09 2008
++++ syscp/install/syscp.sql	Mon Feb  4 03:38:41 2008
+@@ -404,16 +404,16 @@
  INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (7, 'customer', 'mysqlprefix', 'sql');
  INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (8, 'system', 'lastaccountnumber', '0');
  INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (9, 'system', 'lastguid', '9999');
@@ -180,9 +48,7 @@ diff -Naur syscp.orig/install/syscp.sql syscp/install/syscp.sql
 +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (10, 'system', 'documentroot_prefix', '/usr/local/customers/webs/');
 +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (11, 'system', 'logfiles_directory', '/usr/local/customers/logs/');
  INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (12, 'system', 'ipaddress', 'SERVERIP');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (13, 'system', 'apacheconf_directory', '/etc/apache/');
 -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (14, 'system', 'apachereload_command', '/etc/init.d/apache reload');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (13, 'system', 'apacheconf_directory', '/usr/local/etc/apache22/');
 +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (14, 'system', 'apachereload_command', '/usr/local/etc/rc.d/apache22 graceful');
  INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (15, 'system', 'last_traffic_run', '000000');
 -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (16, 'system', 'vmail_uid', '2000');
@@ -195,93 +61,236 @@ diff -Naur syscp.orig/install/syscp.sql syscp/install/syscp.sql
 +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/usr/local/customers/mail/');
 +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/var/named/etc/namedb/');
 +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/usr/sbin/rndc reload');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (21, 'system', 'binddefaultzone', 'default.zone');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '1.2.16');
+ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '1.2.19');
  INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME');
-@@ -411,11 +410,11 @@
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (28, 'panel', 'standardlanguage', 'English');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (29, 'system', 'mysql_access_host', 'localhost');
- INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (30, 'panel', 'pathedit', 'Manual');
--INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (31, 'system', 'apacheconf_filename', 'vhosts.conf');
-+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (31, 'system', 'apacheconf_filename', 'Includes/syscp-vhosts.conf');
+ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3');
+@@ -426,7 +426,7 @@
  INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (32, 'system', 'lastcronrun', '');
  INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (33, 'panel', 'paging', '20');
  INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (34, 'system', 'defaultip', '0');
 -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (35, 'system', 'apacheversion', 'apache1');
 +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (35, 'system', 'apacheversion', 'apache2');
  INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (36, 'system', 'phpappendopenbasedir', '/tmp/');
+ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (37, 'panel', 'natsorting', '1');
+ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (38, 'system', 'deactivateddocroot', '');
+@@ -438,9 +438,9 @@
+ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (44, 'system', 'mod_log_sql', '0');
+ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (45, 'system', 'mod_fcgid', '0');
+ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (46, 'panel', 'sendalternativemail', '0');
+-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (47, 'system', 'apacheconf_vhost', '/etc/apache/vhosts.conf');
+-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (48, 'system', 'apacheconf_diroptions', '/etc/apache/diroptions.conf');
+-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (49, 'system', 'apacheconf_htpasswddir', '/etc/apache/htpasswd/');
++INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (47, 'system', 'apacheconf_vhost', '/usr/local/etc/apache22/syscp/vhosts.conf');
++INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (48, 'system', 'apacheconf_diroptions', '/usr/local/etc/apache22/syscp/diroptions.conf');
++INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (49, 'system', 'apacheconf_htpasswddir', '/usr/local/etc/apache22/syscp/htpasswd/');
+ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (50, 'system', 'webalizer_quiet', '2');
+ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (51, 'ticket', 'noreply_email', 'NO-REPLY@SERVERNAME');
+ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (52, 'ticket', 'worktime_all', '1');
+diff -Naur syscp.orig/lib/configfiles_index.inc.php syscp/lib/configfiles_index.inc.php
+--- syscp.orig/lib/configfiles_index.inc.php	Thu Jan 31 19:58:08 2008
++++ syscp/lib/configfiles_index.inc.php	Mon Feb  4 03:59:45 2008
+@@ -16,6 +16,131 @@
+  */
  
- # --------------------------------------------------------
+ $configfiles = Array(
++	'freebsd_release' => Array(
++                'label' => 'FreeBSD (RELEASE)',
++                'services' => Array(
++                        'http' => Array(
++                                'label' => $lng['admin']['configfiles']['http'],
++                                'daemons' => Array(
++                                        'apache' => Array(
++                                                'label' => 'Apache',
++                                                'commands' => Array(
++							'mkdir -p ' . $settings['system']['apacheconf_htpasswddir'],
++                                                        'touch ' . $settings['system']['apacheconf_vhost'],
++                                                        'touch ' . $settings['system']['apacheconf_diroptions'],
++                                                        'mkdir -p ' . $settings['system']['documentroot_prefix'],
++                                                        'mkdir -p ' . $settings['system']['logfiles_directory'],
++							'echo "Include etc/apache22/syscp/vhosts.conf" >> /usr/local/etc/apache22/httpd.conf',
++                                                ),
++                                                'restart' => Array(
++                                                        '/usr/local/etc/rc.d/apache' . ($settings['system']['apacheversion'] == 'apache2' ? '22' : '') . ' graceful'
++                                                )
++                                        )
++                                )
++                        ),
++                        'dns' => Array(
++                                'label' => $lng['admin']['configfiles']['dns'],
++                                'daemons' => Array(
++                                        'bind' => Array(
++                                                'label' => 'Bind9',
++                                                'commands' => Array(
++                                                        'echo \'include "syscp_bind.conf";\' >> '.$settings['system']['bindconf_directory'].'named.conf',
++                                                        'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
++                                                ),
++                                                'restart' => Array(
++                                                        '/usr/sbin/rndc reload'
++                                                )
++                                        ),
++                                )
++                        ),
++                        'mail' => Array(
++                                'label' => $lng['admin']['configfiles']['mail'],
++                                'daemons' => Array(
++					'dovecot' => Array(
++                                                'label' => 'Dovecot',
++						'commands' => Array(
++                                                        'mkdir -p /etc/ssl/dovecot',
++							'cd /etc/ssl/dovecot',
++							'openssl req -new -x509 -nodes -out cert.pem -keyout key.pem -days 365',
++							'chmod 0600 *.pem'
++							),
++                                                'files' => Array(
++							'etc_dovecot.conf' => '/usr/local/etc/dovecot.conf',
++                                                        'etc_dovecot-sql.conf' => '/usr/local/etc/dovecot-sql.conf'
++                                                ),
++                                                'restart' => Array(
++                                                        '/usr/local/etc/rc.d/dovecot restart'
++                                                )
++                                        ),
++                                )
++                        ),
++                        'smtp' => Array(
++                                'label' => $lng['admin']['configfiles']['smtp'],
++                                'daemons' => Array(
++                                        'postfix' => Array(
++                                                'label' => 'Postfix',
++                                                'files' => Array(
++                                                        'etc_postfix_main.cf' => '/usr/local/etc/postfix/main.cf',
++							'etc_postfix_master.cf' => '/usr/local/etc/postfix/master.cf',
++                                                        'etc_postfix_mysql-virtual_alias_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_alias_maps.cf',
++                                                        'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_domains.cf',
++                                                        'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_maps.cf'
++                                                ),
++                                                'commands' => Array(
++                                                        'mkdir -p ' . $settings['system']['vmail_homedir'],
++                                                        'chown -R postfix:postfix ' . $settings['system']['vmail_homedir'],
++							'mkdir /usr/local/etc/postfix/ssl',
++							'cd /usr/local/etc/postfix/ssl',
++							'openssl req -new -x509 -nodes -out smtpd.pem -keyout smtpd.pem -days 3650',
++							'chmod 750 /usr/local/etc/postfix/ssl',
++							'chmod 640 /usr/local/etc/postfix/ssl/smtpd.pem',
++							'chgrp -R postfix /usr/local/etc/postfix/ssl',
++							'cd /usr/local/etc/postfix',
++							'touch mysql-virtual_alias_maps.cf',
++							'touch mysql-virtual_mailbox_domains.cf',
++							'touch  mysql-virtual_mailbox_maps.cf',
++							'chmod 640 /usr/local/etc/postfix/mysql-virtual_*',
++							'chgrp postfix /usr/local/etc/postfix/mysql-virtual_*'
++                                                ),
++                                                'restart' => Array(
++                                                        '/usr/local/etc/rc.d/postfix reload'
++                                                )
++                                        ),
++                                )
++                        ),
++                        'ftp' => Array(
++                                'label' => $lng['admin']['configfiles']['ftp'],
++                                'daemons' => Array(
++                                        'proftpd' => Array(
++                                                'label' => 'ProFTPd',
++						'commands' => Array(
++							'mkdir -p /etc/ssl/proftpd',
++							'cd /etc/ssl/proftpd',
++							'openssl req -new -x509 -days 365 -nodes -out cert.pem -keyout key.pem',
++							'chmod 640 *.pem'
++						),
++                                                'files' => Array(
++                                                        'etc_proftpd.conf' => '/usr/local/etc/proftpd.conf'
++                                                ),
++                                                'restart' => Array(
++                                                        '/usr/local/etc/rc.d/proftpd restart'
++                                                )
++                                        ),
++                                )
++                        ),
++                        'etc' => Array(
++                                'label' => $lng['admin']['configfiles']['etc'],
++                                'daemons' => Array(
++                                        'cron' => Array(
++                                                'label' => 'Crond (cronscript)',
++                                                'files' => Array(
++                                                        'cron_syscp' => 'crontab -e (As root)'
++                                                )
++                                        )
++                                )
++                        )
++                )
++        ),
+ 	'debian_sarge' => Array(
+ 		'label' => 'Debian 3.1 (Sarge)',
+ 		'services' => Array(
+@@ -368,4 +493,4 @@
+ 	)
+ );
+ 
+-?>
+\ No newline at end of file
++?>
 diff -Naur syscp.orig/scripts/cron_tasks.php syscp/scripts/cron_tasks.php
---- syscp.orig/scripts/cron_tasks.php	Fri Feb  2 21:10:26 2007
-+++ syscp/scripts/cron_tasks.php	Fri Dec 28 03:54:20 2007
-@@ -211,7 +211,7 @@
- 			{
- 				safe_exec('mkdir -p '.escapeshellarg($settings['system']['documentroot_prefix'].$row['data']['loginname'].'/webalizer'));
- 				safe_exec('mkdir -p '.escapeshellarg($settings['system']['vmail_homedir'].$row['data']['loginname']));
--				safe_exec('cp -a '.$pathtophpfiles.'/templates/misc/standardcustomer/* '.escapeshellarg($settings['system']['documentroot_prefix'].$row['data']['loginname'].'/'));
-+				safe_exec('cp -Rp '.$pathtophpfiles.'/templates/misc/standardcustomer/* '.escapeshellarg($settings['system']['documentroot_prefix'].$row['data']['loginname'].'/'));
- 				safe_exec('chown -R '.(int)$row['data']['uid'].':'.(int)$row['data']['gid'].' '.escapeshellarg($settings['system']['documentroot_prefix'].$row['data']['loginname']));
- 				safe_exec('chown -R '.(int)$settings['system']['vmail_uid'].':'.(int)$settings['system']['vmail_gid'].' '.escapeshellarg($settings['system']['vmail_homedir'].$row['data']['loginname']));
- 			}
-@@ -362,7 +362,7 @@
- 				$bindconf_file.='# Domain ID: '.$domain['id'].' - CustomerID: '.$domain['customerid'].' - CustomerLogin: '.$domain['loginname']."\n";
- 				$bindconf_file.='zone "'.$domain['domain'].'" in {'."\n";
- 				$bindconf_file.='	type master;'."\n";
--				$bindconf_file.='	file "'.$settings['system']['bindconf_directory'].$domain['zonefile'].'";'."\n";
-+				$bindconf_file.='	file "master/'.$domain['zonefile'].'";'."\n";
- 				$bindconf_file.='	allow-query { any; };'."\n";
- 				$bindconf_file.='};'."\n";
- 				$bindconf_file.="\n";
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/bind/etc_bind_default.zone syscp/templates/misc/configfiles/freebsd_release/bind/etc_bind_default.zone
---- syscp.orig/templates/misc/configfiles/freebsd_release/bind/etc_bind_default.zone	Thu Jan  1 00:00:00 1970
-+++ syscp/templates/misc/configfiles/freebsd_release/bind/etc_bind_default.zone	Fri Dec 28 03:54:20 2007
-@@ -0,0 +1,21 @@
-+$TTL 1W 
-+@ IN SOA ns root ( 
-+	2004060501 ; serial 
-+	8H ; refresh 
-+	2H ; retry 
-+	1W ; expiry 
-+	11h) ; minimum 
-+
-+        IN      NS      ns 
-+        IN      MX      10 mail 
-+
-+	IN      A       <SERVERIP> 
-+	IN      MX      10 mail 
-+
-+*       IN      A       <SERVERIP>
-+        IN      MX      10 mail 
-+
-+ns      IN      A       <SERVERIP> 
-+
-+mail    IN      A       <SERVERIP>
-+        IN      MX      10 mail 
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/cron/etc_cron.d_syscp syscp/templates/misc/configfiles/freebsd_release/cron/etc_cron.d_syscp
---- syscp.orig/templates/misc/configfiles/freebsd_release/cron/etc_cron.d_syscp	Thu Jan  1 00:00:00 1970
-+++ syscp/templates/misc/configfiles/freebsd_release/cron/etc_cron.d_syscp	Fri Dec 28 03:54:20 2007
-@@ -0,0 +1,8 @@
+--- syscp.orig/scripts/cron_tasks.php	Thu Jan 24 14:17:40 2008
++++ syscp/scripts/cron_tasks.php	Mon Feb  4 03:38:41 2008
+@@ -361,7 +361,7 @@
+ 		{
+ 			safe_exec('mkdir -p ' . escapeshellarg($settings['system']['documentroot_prefix'] . $row['data']['loginname'] . '/webalizer'));
+ 			safe_exec('mkdir -p ' . escapeshellarg($settings['system']['vmail_homedir'] . $row['data']['loginname']));
+-			safe_exec('cp -a ' . $pathtophpfiles . '/templates/misc/standardcustomer/* ' . escapeshellarg($settings['system']['documentroot_prefix'] . $row['data']['loginname'] . '/'));
++			safe_exec('cp -Rp ' . $pathtophpfiles . '/templates/misc/standardcustomer/* ' . escapeshellarg($settings['system']['documentroot_prefix'] . $row['data']['loginname'] . '/'));
+ 			safe_exec('chown -R ' . (int)$row['data']['uid'] . ':' . (int)$row['data']['gid'] . ' ' . escapeshellarg($settings['system']['documentroot_prefix'] . $row['data']['loginname']));
+ 			safe_exec('chown -R ' . (int)$settings['system']['vmail_uid'] . ':' . (int)$settings['system']['vmail_gid'] . ' ' . escapeshellarg($settings['system']['vmail_homedir'] . $row['data']['loginname']));
+ 		}
+@@ -721,7 +721,7 @@
+ 			$bindconf_file.= '# Domain ID: ' . $domain['id'] . ' - CustomerID: ' . $domain['customerid'] . ' - CustomerLogin: ' . $domain['loginname'] . "\n";
+ 			$bindconf_file.= 'zone "' . $domain['domain'] . '" in {' . "\n";
+ 			$bindconf_file.= '	type master;' . "\n";
+-			$bindconf_file.= '	file "' . $settings['system']['bindconf_directory'] . $domain['zonefile'] . '";' . "\n";
++			$bindconf_file.= '	file "master/'.$domain['zonefile'].'";'."\n";
+ 			$bindconf_file.= '	allow-query { any; };' . "\n";
+ 
+ 			if(count($nameservers) > 1)
+@@ -806,4 +806,4 @@
+  * END CRONSCRIPT FOOTER
+  */
+ 
+-?>
+\ No newline at end of file
++?>
+diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/cron/cron_syscp syscp/templates/misc/configfiles/freebsd_release/cron/cron_syscp
+--- syscp.orig/templates/misc/configfiles/freebsd_release/cron/cron_syscp	Thu Jan  1 00:00:00 1970
++++ syscp/templates/misc/configfiles/freebsd_release/cron/cron_syscp	Mon Feb  4 03:38:41 2008
+@@ -0,0 +1,10 @@
 +#
 +# Set PATH, otherwise restart-scripts won't find start-stop-daemon
 +#
-+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
++PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 +#
 +# Regular cron jobs for the syscp package
 +#
-+*/5 * * * *	/usr/local/bin/php -q -c /usr/local/etc /usr/local/www/syscp/scripts/cronscript.php
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_conf syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_conf
---- syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_conf	Thu Jan  1 00:00:00 1970
-+++ syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_conf	Fri Dec 28 03:56:36 2007
++*/5 * * * *	/usr/local/bin/php -q /usr/local/www/syscp/scripts/cron_tasks.php
++0 0 * * *	/usr/local/bin/php -q /usr/local/www/syscp/scripts/cron_traffic.php
++30 0 * * *	/usr/local/bin/php -q /usr/local/www/syscp/scripts/cron_ticketarchive.php
+diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot-sql.conf syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot-sql.conf
+--- syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot-sql.conf	Thu Jan  1 00:00:00 1970
++++ syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot-sql.conf	Mon Feb  4 03:38:41 2008
+@@ -0,0 +1,5 @@
++driver = mysql
++connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
++default_pass_scheme = CRYPT
++password_query = SELECT username AS user, password_enc AS password FROM mail_users WHERE username = '%u'
++user_query = SELECT CONCAT(homedir,maildir) AS home, concat('maildir:',homedir,maildir) AS mail, uid, gid FROM mail_users where username = '%u'
+diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot.conf syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot.conf
+--- syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot.conf	Thu Jan  1 00:00:00 1970
++++ syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot.conf	Mon Feb  4 03:38:41 2008
 @@ -0,0 +1,44 @@
 +base_dir = /var/run/dovecot/
-+protocols = imap pop3
++protocols = imap imaps pop3 pop3s
 +listen = *
 +disable_plaintext_auth = no
 +shutdown_clients = no
-+ssl_disable = yes
-+# ssl_cert_file = /etc/ssl/certs/dovecot.pem
-+# ssl_key_file = /etc/ssl/private/dovecot.pem
++ssl_disable = no
++ssl_cert_file = /etc/ssl/dovecot/cert.pem
++ssl_key_file = /etc/ssl/dovecot/key.pem
 +login_greeting = <SERVERNAME> Server Ready.
 +mail_extra_groups = mail
 +verbose_proctitle = yes
@@ -318,20 +327,11 @@ diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dov
 +    }
 +  }
 +}
-diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_sql syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_sql
---- syscp.orig/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_sql	Thu Jan  1 00:00:00 1970
-+++ syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_sql	Fri Dec 28 03:57:11 2007
-@@ -0,0 +1,5 @@
-+driver = mysql
-+connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
-+default_pass_scheme = CRYPT
-+password_query = SELECT password FROM mail_users WHERE username = '%u'
-+user_query = SELECT CONCAT(homedir,maildir) AS home, concat('maildir:',homedir,maildir) AS mail, uid, gid FROM mail_users where username = '%u'
 diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf
 --- syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf	Thu Jan  1 00:00:00 1970
-+++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf	Fri Dec 28 03:54:20 2007
-@@ -0,0 +1,71 @@
-+smtpd_banner = $myhostname ESMTP $mail_name (FreeBSD)
++++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf	Mon Feb  4 03:38:41 2008
+@@ -0,0 +1,81 @@
++smtpd_banner = $myhostname ESMTP
 +biff = no
 +append_dot_mydomain = no
 +mydestination = $myhostname $mydomain localhost localhost.$mydomain
@@ -355,6 +355,16 @@ diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_pos
 +broken_sasl_auth_clients = yes
 +smtpd_sasl_type = dovecot
 +smtpd_sasl_path = private/auth    
++smtp_use_tls = yes
++smtpd_use_tls = yes
++smtp_tls_note_starttls_offer = yes
++smtpd_tls_key_file = /usr/local/etc/postfix/ssl/smtpd.pem
++smtpd_tls_cert_file = /usr/local/etc/postfix/ssl/smtpd.pem
++smtpd_tls_CAfile = /usr/local/etc/postfix/ssl/smtpd.pem
++smtpd_tls_loglevel = 0
++smtpd_tls_received_header = yes
++smtpd_tls_session_cache_timeout = 3600s
++tls_random_source = dev:/dev/urandom
 +virtual_alias_maps = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_alias_maps.cf
 +virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
 +virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
@@ -402,9 +412,41 @@ diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_pos
 +manpage_directory = /usr/local/man
 +sample_directory = /usr/local/etc/postfix
 +readme_directory = no
+diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_master.cf syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_master.cf
+--- syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_master.cf	Thu Jan  1 00:00:00 1970
++++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_master.cf	Mon Feb  4 03:38:41 2008
+@@ -0,0 +1,28 @@
++smtp      inet  n       -       n       -       -       smtpd
++smtps     inet  n       -       n       -       -       smtpd
++  -o smtpd_tls_wrappermode=yes
++  -o smtpd_sasl_auth_enable=yes
++  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
++pickup    fifo  n       -       n       60      1       pickup
++cleanup   unix  n       -       n       -       0       cleanup
++qmgr      fifo  n       -       n       300     1       qmgr
++tlsmgr    unix  -       -       n       1000?   1       tlsmgr
++rewrite   unix  -       -       n       -       -       trivial-rewrite
++bounce    unix  -       -       n       -       0       bounce
++defer     unix  -       -       n       -       0       bounce
++trace     unix  -       -       n       -       0       bounce
++verify    unix  -       -       n       -       1       verify
++flush     unix  n       -       n       1000?   0       flush
++proxymap  unix  -       -       n       -       -       proxymap
++smtp      unix  -       -       n       -       -       smtp
++relay     unix  -       -       n       -       -       smtp
++	-o fallback_relay=
++showq     unix  n       -       n       -       -       showq
++error     unix  -       -       n       -       -       error
++retry     unix  -       -       n       -       -       error
++discard   unix  -       -       n       -       -       discard
++local     unix  -       n       n       -       -       local
++virtual   unix  -       n       n       -       -       virtual
++lmtp      unix  -       -       n       -       -       lmtp
++anvil     unix  -       -       n       -       1       anvil
++scache	  unix	-	-	n	-	1	scache
 diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_alias_maps.cf syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_alias_maps.cf
 --- syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_alias_maps.cf	Thu Jan  1 00:00:00 1970
-+++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_alias_maps.cf	Fri Dec 28 03:54:20 2007
++++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_alias_maps.cf	Mon Feb  4 03:38:41 2008
 @@ -0,0 +1,8 @@
 +user = <SQL_UNPRIVILEGED_USER>
 +password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -416,7 +458,7 @@ diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_pos
 +hosts = <SQL_HOST> 
 diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
 --- syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf	Thu Jan  1 00:00:00 1970
-+++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf	Fri Dec 28 03:54:20 2007
++++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf	Mon Feb  4 03:38:41 2008
 @@ -0,0 +1,8 @@
 +user = <SQL_UNPRIVILEGED_USER>
 +password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -428,7 +470,7 @@ diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_pos
 +hosts = <SQL_HOST> 
 diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
 --- syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf	Thu Jan  1 00:00:00 1970
-+++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf	Fri Dec 28 03:54:20 2007
++++ syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf	Mon Feb  4 03:38:41 2008
 @@ -0,0 +1,7 @@
 +user = <SQL_UNPRIVILEGED_USER>
 +password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -439,72 +481,62 @@ diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/postfix/etc_pos
 +hosts = <SQL_HOST> 
 diff -Naur syscp.orig/templates/misc/configfiles/freebsd_release/proftpd/etc_proftpd.conf syscp/templates/misc/configfiles/freebsd_release/proftpd/etc_proftpd.conf
 --- syscp.orig/templates/misc/configfiles/freebsd_release/proftpd/etc_proftpd.conf	Thu Jan  1 00:00:00 1970
-+++ syscp/templates/misc/configfiles/freebsd_release/proftpd/etc_proftpd.conf	Fri Dec 28 03:54:20 2007
-@@ -0,0 +1,67 @@
++++ syscp/templates/misc/configfiles/freebsd_release/proftpd/etc_proftpd.conf	Mon Feb  4 03:38:41 2008
+@@ -0,0 +1,57 @@
 +ServerName                      "<SERVERNAME> FTP Server"
 +ServerType                      standalone
-+
-+# Log level
++ServerIdent                     off
++# DisplayConnect                  /etc/issue
 +# emerg, alert, crit (empfohlen), error, warn. notice, info, debug
 +SyslogLevel                     emerg
 +SystemLog                       /var/log/xferlog
 +LogFormat                       auth    "%v [%P] %h %t \"%r\" %s"
 +ExtendedLog                     /var/log/xferlog        AUTH auth
-+
 +DeferWelcome                    off
-+
 +MultilineRFC2228                on
 +DefaultServer                   on
 +ShowSymlinks                    on
 +AllowOverwrite                  on
-+
 +TimeoutNoTransfer               600
 +TimeoutStalled                  600
 +TimeoutIdle                     1200
-+
 +DisplayLogin                    welcome.msg
 +DisplayChdir                    .message
 +ListOptions                     "-l"
-+
 +DenyFilter                      \*.*/
-+
 +Port                            21
 +MaxInstances                    30
-+
-+# Set the user and group that the server normally runs at.
 +User                            nobody
 +Group                           nogroup
-+
 +<Directory /*>
-+# Umask 022 is a good standard umask to prevent new files and dirs
-+# (second parm) from being group and world writable.
 +  Umask                         022  022
-+# Normally, we want files to be overwriteable.
 +  AllowOverwrite                on
 +</Directory>
-+
 +DefaultRoot ~
 +RequireValidShell off
-+
 +AuthOrder mod_sql.c
-+
 +SQLAuthTypes Crypt
 +SQLAuthenticate users groups
 +SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD>
 +SQLUserInfo ftp_users username password uid gid homedir shell
 +SQLGroupInfo ftp_groups groupname gid members
 +SQLUserWhereClause "login_enabled = 'y'"
-+
 +SQLLog PASS login
 +SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users
-+
 +SQLLog RETR download
 +SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users
-+
 +SQLLog STOR upload
 +SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users
-+
 +<IfModule mod_delay.c>
 +  DelayEngine off
 +</IfModule>
-+ 
++<IfModule mod_tls.c>
++   TLSEngine on
++   TLSLog /var/log/xferlog
++   TLSProtocol SSLv23
++   TLSRequired off
++   TLSRSACertificateFile /etc/ssl/proftpd/cert.pem
++   TLSRSACertificateKeyFile /etc/ssl/proftpd/key.pem
++   TLSVerifyClient off
++   TLSRenegotiate required off
++</IfModule> 
diff --git a/sysutils/syscp/pkg-deinstall b/sysutils/syscp/files/pkg-deinstall.in
index 49e769ce1bff..2f7e1f9e770d 100644
--- a/sysutils/syscp/pkg-deinstall
+++ b/sysutils/syscp/files/pkg-deinstall.in
@@ -1,4 +1,8 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
+
 if [ "$2" = DEINSTALL ]; then
 	echo "==============================================================================="
 	echo "If you are permanently removing this port, run:"
diff --git a/sysutils/syscp/pkg-plist b/sysutils/syscp/pkg-plist
index f883ddee2e1e..25a69bf0bacd 100644
--- a/sysutils/syscp/pkg-plist
+++ b/sysutils/syscp/pkg-plist
@@ -1,242 +1,281 @@
-www/syscp/COPYING
-www/syscp/admin_admins.php
-www/syscp/admin_configfiles.php
-www/syscp/admin_customers.php
-www/syscp/admin_domains.php
-www/syscp/admin_index.php
-www/syscp/admin_ipsandports.php
-www/syscp/admin_settings.php
-www/syscp/admin_templates.php
-www/syscp/customer_domains.php
-www/syscp/customer_email.php
-www/syscp/customer_extras.php
-www/syscp/customer_ftp.php
-www/syscp/customer_index.php
-www/syscp/customer_mysql.php
-www/syscp/images/ball.gif
-www/syscp/images/changelanguage.gif
-www/syscp/images/endsection.gif
-www/syscp/images/error.gif
-www/syscp/images/footer.gif
-www/syscp/images/header.gif
-www/syscp/images/header_r.gif
-www/syscp/images/login.gif
-www/syscp/images/logininternal.gif
-www/syscp/images/order_asc.gif
-www/syscp/images/order_desc.gif
-www/syscp/images/section.gif
-www/syscp/images/shadow.gif
-www/syscp/images/subsection.gif
-www/syscp/images/title.gif
-www/syscp/images/valid-css.gif
-www/syscp/images/valid-xhtml10.gif
-www/syscp/index.php
-www/syscp/install/install.php
-www/syscp/install/lng/english.lng.php
-www/syscp/install/lng/french.lng.php
-www/syscp/install/lng/german.lng.php
-www/syscp/install/scripts/htpasswd-htaccess-remover.php
-www/syscp/install/scripts/language-check.php
-www/syscp/install/syscp.sql
-www/syscp/install/updatesql.php
-www/syscp/install/updatesql_1.0-1.2.inc.php
-www/syscp/install/updatesql_1.0.inc.php
-www/syscp/install/updatesql_1.2.inc.php
-www/syscp/lib/class_idna_convert_wrapper.php
-www/syscp/lib/class_mysqldb.php
-www/syscp/lib/class_paging.php
-www/syscp/lib/functions.php
-www/syscp/lib/idna_convert.class.php
-www/syscp/lib/init.php
-www/syscp/lib/tables.inc.php
-www/syscp/lng/bulgarian.lng.php
-www/syscp/lng/catalan.lng.php
-www/syscp/lng/danish.lng.php
-www/syscp/lng/dutch.lng.php
-www/syscp/lng/english.lng.php
-www/syscp/lng/french.lng.php
-www/syscp/lng/german.lng.php
-www/syscp/lng/hungarian.lng.php
-www/syscp/lng/italian.lng.php
-www/syscp/lng/portugues.lng.php
-www/syscp/lng/russian.lng.php
-www/syscp/lng/slovak.lng.php
-www/syscp/lng/spanish.lng.php
-www/syscp/lng/zh-cn.lng.php
-www/syscp/scripts/cron_tasks.php
-www/syscp/scripts/cron_traffic.php
-www/syscp/scripts/cronscript.php
-www/syscp/templates/admin/admins/admins.tpl
-www/syscp/templates/admin/admins/admins_add.tpl
-www/syscp/templates/admin/admins/admins_admin.tpl
-www/syscp/templates/admin/admins/admins_edit.tpl
-www/syscp/templates/admin/configfiles/choose.tpl
-www/syscp/templates/admin/configfiles/choose_daemon.tpl
-www/syscp/templates/admin/configfiles/choose_distribution.tpl
-www/syscp/templates/admin/configfiles/configfiles.tpl
-www/syscp/templates/admin/configfiles/configfiles_file.tpl
-www/syscp/templates/admin/customers/customers.tpl
-www/syscp/templates/admin/customers/customers_add.tpl
-www/syscp/templates/admin/customers/customers_customer.tpl
-www/syscp/templates/admin/customers/customers_edit.tpl
-www/syscp/templates/admin/domains/domains.tpl
-www/syscp/templates/admin/domains/domains_add.tpl
-www/syscp/templates/admin/domains/domains_domain.tpl
-www/syscp/templates/admin/domains/domains_edit.tpl
-www/syscp/templates/admin/index/change_language.tpl
-www/syscp/templates/admin/index/change_password.tpl
-www/syscp/templates/admin/index/index.tpl
-www/syscp/templates/admin/ipsandports/ipsandports.tpl
-www/syscp/templates/admin/ipsandports/ipsandports_add.tpl
-www/syscp/templates/admin/ipsandports/ipsandports_edit.tpl
-www/syscp/templates/admin/ipsandports/ipsandports_ipandport.tpl
-www/syscp/templates/admin/settings/settings.tpl
-www/syscp/templates/admin/templates/templates.tpl
-www/syscp/templates/admin/templates/templates_add_1.tpl
-www/syscp/templates/admin/templates/templates_add_2.tpl
-www/syscp/templates/admin/templates/templates_edit.tpl
-www/syscp/templates/admin/templates/templates_template.tpl
-www/syscp/templates/customer/domains/domainlist.tpl
-www/syscp/templates/customer/domains/domains.tpl
-www/syscp/templates/customer/domains/domains_add.tpl
-www/syscp/templates/customer/domains/domains_delimiter.tpl
-www/syscp/templates/customer/domains/domains_domain.tpl
-www/syscp/templates/customer/domains/domains_edit.tpl
-www/syscp/templates/customer/email/account_add.tpl
-www/syscp/templates/customer/email/account_changepw.tpl
-www/syscp/templates/customer/email/email.tpl
-www/syscp/templates/customer/email/emails.tpl
-www/syscp/templates/customer/email/emails_add.tpl
-www/syscp/templates/customer/email/emails_domain.tpl
-www/syscp/templates/customer/email/emails_edit.tpl
-www/syscp/templates/customer/email/emails_edit_forwarder.tpl
-www/syscp/templates/customer/email/emails_email.tpl
-www/syscp/templates/customer/email/forwarder_add.tpl
-www/syscp/templates/customer/extras/extras.tpl
-www/syscp/templates/customer/extras/htaccess.tpl
-www/syscp/templates/customer/extras/htaccess_add.tpl
-www/syscp/templates/customer/extras/htaccess_edit.tpl
-www/syscp/templates/customer/extras/htaccess_htaccess.tpl
-www/syscp/templates/customer/extras/htpasswds.tpl
-www/syscp/templates/customer/extras/htpasswds_add.tpl
-www/syscp/templates/customer/extras/htpasswds_edit.tpl
-www/syscp/templates/customer/extras/htpasswds_htpasswd.tpl
-www/syscp/templates/customer/ftp/accounts.tpl
-www/syscp/templates/customer/ftp/accounts_account.tpl
-www/syscp/templates/customer/ftp/accounts_add.tpl
-www/syscp/templates/customer/ftp/accounts_edit.tpl
-www/syscp/templates/customer/ftp/ftp.tpl
-www/syscp/templates/customer/index/change_language.tpl
-www/syscp/templates/customer/index/change_password.tpl
-www/syscp/templates/customer/index/index.tpl
-www/syscp/templates/customer/mysql/mysql.tpl
-www/syscp/templates/customer/mysql/mysqls.tpl
-www/syscp/templates/customer/mysql/mysqls_add.tpl
-www/syscp/templates/customer/mysql/mysqls_database.tpl
-www/syscp/templates/customer/mysql/mysqls_edit.tpl
-www/syscp/templates/footer.tpl
-www/syscp/templates/header.tpl
-www/syscp/templates/login/login.tpl
-www/syscp/templates/main.css
-www/syscp/templates/misc/configfiles/debian_etch/bind/etc_bind_default.zone
-www/syscp/templates/misc/configfiles/debian_etch/courier/etc_courier_authdaemonrc
-www/syscp/templates/misc/configfiles/debian_etch/courier/etc_courier_authmysqlrc
-www/syscp/templates/misc/configfiles/debian_etch/cron/etc_cron.d_syscp
-www/syscp/templates/misc/configfiles/debian_etch/cron/etc_php4_syscpcron_php.ini
-www/syscp/templates/misc/configfiles/debian_etch/postfix/etc_postfix_main.cf
-www/syscp/templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_alias_maps.cf
-www/syscp/templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
-www/syscp/templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
-www/syscp/templates/misc/configfiles/debian_etch/postfix/etc_postfix_sasl_smtpd.conf
-www/syscp/templates/misc/configfiles/debian_etch/proftpd/etc_proftpd_modules.conf
-www/syscp/templates/misc/configfiles/debian_etch/proftpd/etc_proftpd_proftpd.conf
-www/syscp/templates/misc/configfiles/debian_sarge/bind/etc_bind_default.zone
-www/syscp/templates/misc/configfiles/debian_sarge/courier/etc_courier_authdaemonrc
-www/syscp/templates/misc/configfiles/debian_sarge/courier/etc_courier_authmysqlrc
-www/syscp/templates/misc/configfiles/debian_sarge/cron/etc_cron.d_syscp
-www/syscp/templates/misc/configfiles/debian_sarge/cron/etc_php4_syscpcron_php.ini
-www/syscp/templates/misc/configfiles/debian_sarge/postfix/etc_postfix_main.cf
-www/syscp/templates/misc/configfiles/debian_sarge/postfix/etc_postfix_mysql-virtual_alias_maps.cf
-www/syscp/templates/misc/configfiles/debian_sarge/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
-www/syscp/templates/misc/configfiles/debian_sarge/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
-www/syscp/templates/misc/configfiles/debian_sarge/postfix/etc_postfix_sasl_smtpd.conf
-www/syscp/templates/misc/configfiles/debian_sarge/proftpd/etc_proftpd.conf
-www/syscp/templates/misc/configfiles/freebsd_release/bind/etc_bind_default.zone
-www/syscp/templates/misc/configfiles/freebsd_release/cron/etc_cron.d_syscp
-www/syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_conf
-www/syscp/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot_sql
-www/syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf
-www/syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_alias_maps.cf
-www/syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
-www/syscp/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
-www/syscp/templates/misc/configfiles/freebsd_release/proftpd/etc_proftpd.conf
-www/syscp/templates/misc/configfiles/suse_linux_10_0/bind/etc_bind_default.zone
-www/syscp/templates/misc/configfiles/suse_linux_10_0/courier/etc_authlib_authdaemonrc
-www/syscp/templates/misc/configfiles/suse_linux_10_0/courier/etc_authlib_authmysqlrc
-www/syscp/templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_syscp
-www/syscp/templates/misc/configfiles/suse_linux_10_0/cron/etc_php5_syscpcron_php.ini
-www/syscp/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_main.cf
-www/syscp/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf
-www/syscp/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
-www/syscp/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
-www/syscp/templates/misc/configfiles/suse_linux_10_0/postfix/usr_lib_sasl2_smtpd.conf
-www/syscp/templates/misc/configfiles/suse_linux_10_0/proftpd/etc_proftpd_modules.conf
-www/syscp/templates/misc/configfiles/suse_linux_10_0/proftpd/etc_proftpd_proftpd.conf
-www/syscp/templates/misc/error.tpl
-www/syscp/templates/misc/question_yesno.tpl
-www/syscp/templates/misc/standardcustomer/index.html
-www/syscp/templates/navigation_element.tpl
-www/syscp/templates/navigation_link.tpl
-@dirrm www/syscp/templates/misc/standardcustomer
-@dirrm www/syscp/templates/misc/configfiles/suse_linux_10_0/proftpd
-@dirrm www/syscp/templates/misc/configfiles/suse_linux_10_0/postfix
-@dirrm www/syscp/templates/misc/configfiles/suse_linux_10_0/cron
-@dirrm www/syscp/templates/misc/configfiles/suse_linux_10_0/courier
-@dirrm www/syscp/templates/misc/configfiles/suse_linux_10_0/bind
-@dirrm www/syscp/templates/misc/configfiles/suse_linux_10_0
-@dirrm www/syscp/templates/misc/configfiles/freebsd_release/proftpd
-@dirrm www/syscp/templates/misc/configfiles/freebsd_release/postfix
-@dirrm www/syscp/templates/misc/configfiles/freebsd_release/dovecot
-@dirrm www/syscp/templates/misc/configfiles/freebsd_release/cron
-@dirrm www/syscp/templates/misc/configfiles/freebsd_release/bind
-@dirrm www/syscp/templates/misc/configfiles/freebsd_release
-@dirrm www/syscp/templates/misc/configfiles/debian_sarge/proftpd
-@dirrm www/syscp/templates/misc/configfiles/debian_sarge/postfix
-@dirrm www/syscp/templates/misc/configfiles/debian_sarge/cron
-@dirrm www/syscp/templates/misc/configfiles/debian_sarge/courier
-@dirrm www/syscp/templates/misc/configfiles/debian_sarge/bind
-@dirrm www/syscp/templates/misc/configfiles/debian_sarge
-@dirrm www/syscp/templates/misc/configfiles/debian_etch/proftpd
-@dirrm www/syscp/templates/misc/configfiles/debian_etch/postfix
-@dirrm www/syscp/templates/misc/configfiles/debian_etch/cron
-@dirrm www/syscp/templates/misc/configfiles/debian_etch/courier
-@dirrm www/syscp/templates/misc/configfiles/debian_etch/bind
-@dirrm www/syscp/templates/misc/configfiles/debian_etch
-@dirrm www/syscp/templates/misc/configfiles
-@dirrm www/syscp/templates/misc
-@dirrm www/syscp/templates/login
-@dirrm www/syscp/templates/customer/mysql
-@dirrm www/syscp/templates/customer/index
-@dirrm www/syscp/templates/customer/ftp
-@dirrm www/syscp/templates/customer/extras
-@dirrm www/syscp/templates/customer/email
-@dirrm www/syscp/templates/customer/domains
-@dirrm www/syscp/templates/customer
-@dirrm www/syscp/templates/admin/templates
-@dirrm www/syscp/templates/admin/settings
-@dirrm www/syscp/templates/admin/ipsandports
-@dirrm www/syscp/templates/admin/index
-@dirrm www/syscp/templates/admin/domains
-@dirrm www/syscp/templates/admin/customers
-@dirrm www/syscp/templates/admin/configfiles
-@dirrm www/syscp/templates/admin/admins
-@dirrm www/syscp/templates/admin
-@dirrm www/syscp/templates
-@dirrm www/syscp/scripts
-@dirrm www/syscp/lng
-@dirrm www/syscp/lib
-@dirrm www/syscp/install/scripts
-@dirrm www/syscp/install/lng
-@dirrm www/syscp/install
-@dirrm www/syscp/images
-@dirrm www/syscp
+%%WWWDIR%%/COPYING
+%%WWWDIR%%/admin_admins.php
+%%WWWDIR%%/admin_configfiles.php
+%%WWWDIR%%/admin_customers.php
+%%WWWDIR%%/admin_domains.php
+%%WWWDIR%%/admin_index.php
+%%WWWDIR%%/admin_ipsandports.php
+%%WWWDIR%%/admin_settings.php
+%%WWWDIR%%/admin_templates.php
+%%WWWDIR%%/admin_tickets.php
+%%WWWDIR%%/customer_domains.php
+%%WWWDIR%%/customer_email.php
+%%WWWDIR%%/customer_extras.php
+%%WWWDIR%%/customer_ftp.php
+%%WWWDIR%%/customer_index.php
+%%WWWDIR%%/customer_mysql.php
+%%WWWDIR%%/customer_tickets.php
+%%WWWDIR%%/images/ball.gif
+%%WWWDIR%%/images/changelanguage.gif
+%%WWWDIR%%/images/endsection.gif
+%%WWWDIR%%/images/error.gif
+%%WWWDIR%%/images/footer.gif
+%%WWWDIR%%/images/header.gif
+%%WWWDIR%%/images/header_r.gif
+%%WWWDIR%%/images/login.gif
+%%WWWDIR%%/images/logininternal.gif
+%%WWWDIR%%/images/order_asc.gif
+%%WWWDIR%%/images/order_desc.gif
+%%WWWDIR%%/images/section.gif
+%%WWWDIR%%/images/shadow.gif
+%%WWWDIR%%/images/subsection.gif
+%%WWWDIR%%/images/title.gif
+%%WWWDIR%%/images/valid-css.gif
+%%WWWDIR%%/images/valid-xhtml10.gif
+%%WWWDIR%%/index.php
+%%WWWDIR%%/install/install.php
+%%WWWDIR%%/install/lng/english.lng.php
+%%WWWDIR%%/install/lng/french.lng.php
+%%WWWDIR%%/install/lng/german.lng.php
+%%WWWDIR%%/install/scripts/htpasswd-htaccess-remover.php
+%%WWWDIR%%/install/scripts/language-check.php
+%%WWWDIR%%/install/syscp.sql
+%%WWWDIR%%/install/updatesql.php
+%%WWWDIR%%/install/updatesql_1.0-1.2.inc.php
+%%WWWDIR%%/install/updatesql_1.0.inc.php
+%%WWWDIR%%/install/updatesql_1.2.inc.php
+%%WWWDIR%%/lib/class_idna_convert_wrapper.php
+%%WWWDIR%%/lib/class_mysqldb.php
+%%WWWDIR%%/lib/class_paging.php
+%%WWWDIR%%/lib/class_ticket.php
+%%WWWDIR%%/lib/configfiles_index.inc.php
+%%WWWDIR%%/lib/cron_init.php
+%%WWWDIR%%/lib/cron_shutdown.php
+%%WWWDIR%%/lib/functions.php
+%%WWWDIR%%/lib/idna_convert.class.php
+%%WWWDIR%%/lib/init.php
+%%WWWDIR%%/lib/npdata.ser
+%%WWWDIR%%/lib/tables.inc.php
+@unexec if cmp -s %D/www/syscp/lib/userdata.inc.php.dist %D/www/syscp/lib/userdata.inc.php; then rm -f %D/www/syscp/lib/userdata.inc.php; fi
+%%WWWDIR%%/lib/userdata.inc.php.dist
+@exec if [ ! -f %D/www/syscp/lib/userdata.inc.php ] ; then cp -p %D/%F %B/userdata.inc.php; fi
+%%WWWDIR%%/lng/bulgarian.lng.php
+%%WWWDIR%%/lng/catalan.lng.php
+%%WWWDIR%%/lng/danish.lng.php
+%%WWWDIR%%/lng/dutch.lng.php
+%%WWWDIR%%/lng/english.lng.php
+%%WWWDIR%%/lng/french.lng.php
+%%WWWDIR%%/lng/german.lng.php
+%%WWWDIR%%/lng/hungarian.lng.php
+%%WWWDIR%%/lng/italian.lng.php
+%%WWWDIR%%/lng/portugues.lng.php
+%%WWWDIR%%/lng/russian.lng.php
+%%WWWDIR%%/lng/slovak.lng.php
+%%WWWDIR%%/lng/spanish.lng.php
+%%WWWDIR%%/lng/zh-cn.lng.php
+%%WWWDIR%%/scripts/cron_legacy.php
+%%WWWDIR%%/scripts/cron_tasks.inc.fcgi_create.php
+%%WWWDIR%%/scripts/cron_tasks.php
+%%WWWDIR%%/scripts/cron_ticketarchive.php
+%%WWWDIR%%/scripts/cron_traffic.inc.functions.php
+%%WWWDIR%%/scripts/cron_traffic.php
+%%WWWDIR%%/scripts/cron_traffic_report.php
+%%WWWDIR%%/templates/admin/admins/admins.tpl
+%%WWWDIR%%/templates/admin/admins/admins_add.tpl
+%%WWWDIR%%/templates/admin/admins/admins_admin.tpl
+%%WWWDIR%%/templates/admin/admins/admins_edit.tpl
+%%WWWDIR%%/templates/admin/configfiles/choose.tpl
+%%WWWDIR%%/templates/admin/configfiles/choose_daemon.tpl
+%%WWWDIR%%/templates/admin/configfiles/choose_distribution.tpl
+%%WWWDIR%%/templates/admin/configfiles/choose_service.tpl
+%%WWWDIR%%/templates/admin/configfiles/configfiles.tpl
+%%WWWDIR%%/templates/admin/configfiles/configfiles_file.tpl
+%%WWWDIR%%/templates/admin/configfiles/wizard.tpl
+%%WWWDIR%%/templates/admin/customers/customers.tpl
+%%WWWDIR%%/templates/admin/customers/customers_add.tpl
+%%WWWDIR%%/templates/admin/customers/customers_customer.tpl
+%%WWWDIR%%/templates/admin/customers/customers_edit.tpl
+%%WWWDIR%%/templates/admin/domains/domains.tpl
+%%WWWDIR%%/templates/admin/domains/domains_add.tpl
+%%WWWDIR%%/templates/admin/domains/domains_domain.tpl
+%%WWWDIR%%/templates/admin/domains/domains_edit.tpl
+%%WWWDIR%%/templates/admin/index/change_language.tpl
+%%WWWDIR%%/templates/admin/index/change_password.tpl
+%%WWWDIR%%/templates/admin/index/index.tpl
+%%WWWDIR%%/templates/admin/ipsandports/ipsandports.tpl
+%%WWWDIR%%/templates/admin/ipsandports/ipsandports_add.tpl
+%%WWWDIR%%/templates/admin/ipsandports/ipsandports_edit.tpl
+%%WWWDIR%%/templates/admin/ipsandports/ipsandports_ipandport.tpl
+%%WWWDIR%%/templates/admin/settings/settings.tpl
+%%WWWDIR%%/templates/admin/settings/updatecounters.tpl
+%%WWWDIR%%/templates/admin/settings/updatecounters_row_admin.tpl
+%%WWWDIR%%/templates/admin/settings/updatecounters_row_customer.tpl
+%%WWWDIR%%/templates/admin/templates/templates.tpl
+%%WWWDIR%%/templates/admin/templates/templates_add_1.tpl
+%%WWWDIR%%/templates/admin/templates/templates_add_2.tpl
+%%WWWDIR%%/templates/admin/templates/templates_edit.tpl
+%%WWWDIR%%/templates/admin/templates/templates_template.tpl
+%%WWWDIR%%/templates/admin/ticket/archive.tpl
+%%WWWDIR%%/templates/admin/ticket/archived_tickets.tpl
+%%WWWDIR%%/templates/admin/ticket/archivesearch.tpl
+%%WWWDIR%%/templates/admin/ticket/categories.tpl
+%%WWWDIR%%/templates/admin/ticket/tickets.tpl
+%%WWWDIR%%/templates/admin/ticket/tickets_categories.tpl
+%%WWWDIR%%/templates/admin/ticket/tickets_customer.tpl
+%%WWWDIR%%/templates/admin/ticket/tickets_editcategory.tpl
+%%WWWDIR%%/templates/admin/ticket/tickets_new.tpl
+%%WWWDIR%%/templates/admin/ticket/tickets_newcategory.tpl
+%%WWWDIR%%/templates/admin/ticket/tickets_reply.tpl
+%%WWWDIR%%/templates/admin/ticket/tickets_tickets.tpl
+%%WWWDIR%%/templates/admin/ticket/tickets_tickets_list.tpl
+%%WWWDIR%%/templates/admin/ticket/tickets_tickets_main.tpl
+%%WWWDIR%%/templates/admin/ticket/tickets_view.tpl
+%%WWWDIR%%/templates/customer/domains/domainlist.tpl
+%%WWWDIR%%/templates/customer/domains/domains.tpl
+%%WWWDIR%%/templates/customer/domains/domains_add.tpl
+%%WWWDIR%%/templates/customer/domains/domains_delimiter.tpl
+%%WWWDIR%%/templates/customer/domains/domains_domain.tpl
+%%WWWDIR%%/templates/customer/domains/domains_edit.tpl
+%%WWWDIR%%/templates/customer/email/account_add.tpl
+%%WWWDIR%%/templates/customer/email/account_changepw.tpl
+%%WWWDIR%%/templates/customer/email/email.tpl
+%%WWWDIR%%/templates/customer/email/emails.tpl
+%%WWWDIR%%/templates/customer/email/emails_add.tpl
+%%WWWDIR%%/templates/customer/email/emails_domain.tpl
+%%WWWDIR%%/templates/customer/email/emails_edit.tpl
+%%WWWDIR%%/templates/customer/email/emails_edit_forwarder.tpl
+%%WWWDIR%%/templates/customer/email/emails_email.tpl
+%%WWWDIR%%/templates/customer/email/forwarder_add.tpl
+%%WWWDIR%%/templates/customer/extras/extras.tpl
+%%WWWDIR%%/templates/customer/extras/htaccess.tpl
+%%WWWDIR%%/templates/customer/extras/htaccess_add.tpl
+%%WWWDIR%%/templates/customer/extras/htaccess_edit.tpl
+%%WWWDIR%%/templates/customer/extras/htaccess_htaccess.tpl
+%%WWWDIR%%/templates/customer/extras/htpasswds.tpl
+%%WWWDIR%%/templates/customer/extras/htpasswds_add.tpl
+%%WWWDIR%%/templates/customer/extras/htpasswds_edit.tpl
+%%WWWDIR%%/templates/customer/extras/htpasswds_htpasswd.tpl
+%%WWWDIR%%/templates/customer/ftp/accounts.tpl
+%%WWWDIR%%/templates/customer/ftp/accounts_account.tpl
+%%WWWDIR%%/templates/customer/ftp/accounts_add.tpl
+%%WWWDIR%%/templates/customer/ftp/accounts_edit.tpl
+%%WWWDIR%%/templates/customer/ftp/ftp.tpl
+%%WWWDIR%%/templates/customer/index/change_language.tpl
+%%WWWDIR%%/templates/customer/index/change_password.tpl
+%%WWWDIR%%/templates/customer/index/index.tpl
+%%WWWDIR%%/templates/customer/mysql/mysql.tpl
+%%WWWDIR%%/templates/customer/mysql/mysqls.tpl
+%%WWWDIR%%/templates/customer/mysql/mysqls_add.tpl
+%%WWWDIR%%/templates/customer/mysql/mysqls_database.tpl
+%%WWWDIR%%/templates/customer/mysql/mysqls_edit.tpl
+%%WWWDIR%%/templates/customer/ticket/ticket.tpl
+%%WWWDIR%%/templates/customer/ticket/tickets.tpl
+%%WWWDIR%%/templates/customer/ticket/tickets_new.tpl
+%%WWWDIR%%/templates/customer/ticket/tickets_reply.tpl
+%%WWWDIR%%/templates/customer/ticket/tickets_tickets.tpl
+%%WWWDIR%%/templates/customer/ticket/tickets_tickets_list.tpl
+%%WWWDIR%%/templates/customer/ticket/tickets_tickets_main.tpl
+%%WWWDIR%%/templates/footer.tpl
+%%WWWDIR%%/templates/header.tpl
+%%WWWDIR%%/templates/login/login.tpl
+%%WWWDIR%%/templates/main.css
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/courier/etc_courier_authdaemonrc
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/courier/etc_courier_authmysqlrc
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/cron/etc_cron.d_syscp
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot-sql.conf
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot.conf
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/postfix/etc_postfix_main.cf
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_alias_maps.cf
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/postfix/etc_postfix_sasl_smtpd.conf
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/proftpd/etc_proftpd_modules.conf
+%%WWWDIR%%/templates/misc/configfiles/debian_etch/proftpd/etc_proftpd_proftpd.conf
+%%WWWDIR%%/templates/misc/configfiles/debian_sarge/courier/etc_courier_authdaemonrc
+%%WWWDIR%%/templates/misc/configfiles/debian_sarge/courier/etc_courier_authmysqlrc
+%%WWWDIR%%/templates/misc/configfiles/debian_sarge/cron/etc_cron.d_syscp
+%%WWWDIR%%/templates/misc/configfiles/debian_sarge/postfix/etc_postfix_main.cf
+%%WWWDIR%%/templates/misc/configfiles/debian_sarge/postfix/etc_postfix_mysql-virtual_alias_maps.cf
+%%WWWDIR%%/templates/misc/configfiles/debian_sarge/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
+%%WWWDIR%%/templates/misc/configfiles/debian_sarge/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
+%%WWWDIR%%/templates/misc/configfiles/debian_sarge/postfix/etc_postfix_sasl_smtpd.conf
+%%WWWDIR%%/templates/misc/configfiles/debian_sarge/proftpd/etc_proftpd.conf
+%%WWWDIR%%/templates/misc/configfiles/freebsd_release/cron/cron_syscp
+%%WWWDIR%%/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot-sql.conf
+%%WWWDIR%%/templates/misc/configfiles/freebsd_release/dovecot/etc_dovecot.conf
+%%WWWDIR%%/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_main.cf
+%%WWWDIR%%/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_master.cf
+%%WWWDIR%%/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_alias_maps.cf
+%%WWWDIR%%/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
+%%WWWDIR%%/templates/misc/configfiles/freebsd_release/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
+%%WWWDIR%%/templates/misc/configfiles/freebsd_release/proftpd/etc_proftpd.conf
+%%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/courier/etc_authlib_authdaemonrc
+%%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/courier/etc_authlib_authmysqlrc
+%%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/cron/etc_cron.d_syscp
+%%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_main.cf
+%%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_alias_maps.cf
+%%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf
+%%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf
+%%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/postfix/usr_lib_sasl2_smtpd.conf
+%%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/proftpd/etc_proftpd_modules.conf
+%%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/proftpd/etc_proftpd_proftpd.conf
+%%WWWDIR%%/templates/misc/error.tpl
+%%WWWDIR%%/templates/misc/question_yesno.tpl
+%%WWWDIR%%/templates/misc/standardcustomer/index.html
+%%WWWDIR%%/templates/navigation_element.tpl
+%%WWWDIR%%/templates/navigation_link.tpl
+@dirrm %%WWWDIR%%/templates/misc/standardcustomer
+@dirrm %%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/proftpd
+@dirrm %%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/postfix
+@dirrm %%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/cron
+@dirrm %%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/courier
+@dirrm %%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0/bind
+@dirrm %%WWWDIR%%/templates/misc/configfiles/suse_linux_10_0
+@dirrm %%WWWDIR%%/templates/misc/configfiles/freebsd_release/proftpd
+@dirrm %%WWWDIR%%/templates/misc/configfiles/freebsd_release/postfix
+@dirrm %%WWWDIR%%/templates/misc/configfiles/freebsd_release/dovecot
+@dirrm %%WWWDIR%%/templates/misc/configfiles/freebsd_release/cron
+@dirrm %%WWWDIR%%/templates/misc/configfiles/freebsd_release
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_sarge/proftpd
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_sarge/postfix
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_sarge/cron
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_sarge/courier
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_sarge/bind
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_sarge
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_etch/proftpd
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_etch/postfix
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_etch/dovecot
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_etch/cron
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_etch/courier
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_etch/bind
+@dirrm %%WWWDIR%%/templates/misc/configfiles/debian_etch
+@dirrm %%WWWDIR%%/templates/misc/configfiles
+@dirrm %%WWWDIR%%/templates/misc
+@dirrm %%WWWDIR%%/templates/login
+@dirrm %%WWWDIR%%/templates/customer/ticket
+@dirrm %%WWWDIR%%/templates/customer/mysql
+@dirrm %%WWWDIR%%/templates/customer/index
+@dirrm %%WWWDIR%%/templates/customer/ftp
+@dirrm %%WWWDIR%%/templates/customer/extras
+@dirrm %%WWWDIR%%/templates/customer/email
+@dirrm %%WWWDIR%%/templates/customer/domains
+@dirrm %%WWWDIR%%/templates/customer
+@dirrm %%WWWDIR%%/templates/admin/ticket
+@dirrm %%WWWDIR%%/templates/admin/templates
+@dirrm %%WWWDIR%%/templates/admin/settings
+@dirrm %%WWWDIR%%/templates/admin/ipsandports
+@dirrm %%WWWDIR%%/templates/admin/index
+@dirrm %%WWWDIR%%/templates/admin/domains
+@dirrm %%WWWDIR%%/templates/admin/customers
+@dirrm %%WWWDIR%%/templates/admin/configfiles
+@dirrm %%WWWDIR%%/templates/admin/admins
+@dirrm %%WWWDIR%%/templates/admin
+@dirrm %%WWWDIR%%/templates
+@dirrm %%WWWDIR%%/scripts
+@dirrm %%WWWDIR%%/lng
+@dirrmtry %%WWWDIR%%/lib
+@dirrm %%WWWDIR%%/install/scripts
+@dirrm %%WWWDIR%%/install/lng
+@dirrm %%WWWDIR%%/install
+@dirrm %%WWWDIR%%/images
+@dirrmtry %%WWWDIR%%