summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCHTEKK <CHTEKK@localhost>2010-03-30 12:47:24 +0000
committerCHTEKK <CHTEKK@localhost>2010-03-30 12:47:24 +0000
commita6ec986eb1452ead17ddc002629ea31934dc132d (patch)
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904 /syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch
parentUpdate EiffelStudio and Traffic ebuilds (usefull for ETHZ students). (diff)
downloadchtekk-master.tar.gz
chtekk-master.tar.bz2
chtekk-master.zip
Empty dev overlay, as I'm retiring from Gentoo.HEADmaster
apps can now be found at http://projects.longitekk.com:8000/Projects/browser/gentoo-ebuilds vda can now be found at http://vda.sourceforge.net/ and http://vda-ng.longitekk.com:8000/VDA-NG/browser (out-of-date) syscp can now be found up-to-date directly from upstream: http://wiki.syscp.org/docs/syscp-howto-gentoo-en coda and versioncp are out-of-date, broken trial runs of some stuff, so they just get deleted svn path=/; revision=104
Diffstat (limited to 'syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch')
-rw-r--r--syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch83
1 files changed, 0 insertions, 83 deletions
diff --git a/syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch b/syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch
deleted file mode 100644
index 288f2a6..0000000
--- a/syscp/patches/syscp-patches/syscp-1.2.13-gentoo-compatibility.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Nru syscp/admin_customers.php syscp-gentoo-comp/admin_customers.php
---- syscp/admin_customers.php 2006-03-25 23:38:00.000000000 +0100
-+++ syscp-gentoo-comp/admin_customers.php 2006-03-26 00:39:05.000000000 +0100
-@@ -421,7 +421,7 @@
- $db->query(
- "INSERT INTO `".TABLE_PANEL_DOMAINS."` " .
- "(`domain`, `customerid`, `adminid`, `parentdomainid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " .
-- "VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '0', '0', '1', '1', '0', '')"
-+ "VALUES ('$loginname.{$settings['system']['hostname']}', '$customerid', '{$userinfo['adminid']}', '-1', '$documentroot', '', '1', '1', '1', '1', '0', '')"
- );
- $domainid=$db->insert_id();
- $db->query(
-@@ -552,7 +552,7 @@
- $db->query(
- "INSERT INTO `".TABLE_PANEL_DOMAINS."` " .
- "(`domain`, `customerid`, `adminid`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " .
-- "VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '0', '0', '1', '1', '0', '')"
-+ "VALUES ('{$result['loginname']}.{$settings['system']['hostname']}', '{$result['customerid']}', '{$userinfo['adminid']}', '{$result['documentroot']}', '', '1', '1', '1', '1', '0', '')"
- );
- $domainid=$db->insert_id();
- $db->query(
-diff -Nru syscp/admin_domains.php syscp-gentoo-comp/admin_domains.php
---- syscp/admin_domains.php 2006-03-25 23:38:00.000000000 +0100
-+++ syscp-gentoo-comp/admin_domains.php 2006-03-26 00:39:05.000000000 +0100
-@@ -390,9 +390,9 @@
- {
- $domains.=makeoption($idna_convert->decode($row_domain['domain']).' ('.$row_domain['loginname'].')',$row_domain['id']);
- }
-- $isbinddomain=makeyesno('isbinddomain', '1', '0', '1');
-+ $isbinddomain=makeyesno('isbinddomain', '1', '0', '0');
- $isemaildomain=makeyesno('isemaildomain', '1', '0', '1');
-- $subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', '0');
-+ $subcanemaildomain=makeyesno('subcanemaildomain', '1', '0', '1');
- $caneditdomain=makeyesno('caneditdomain', '1', '0', '1');
- $openbasedir=makeyesno('openbasedir', '1', '0', '1');
- $safemode=makeyesno('safemode', '1', '0', '1');
-diff -Nru syscp/customer_email.php syscp-gentoo-comp/customer_email.php
---- syscp/customer_email.php 2006-03-25 23:38:00.000000000 +0100
-+++ syscp-gentoo-comp/customer_email.php 2006-03-26 00:39:05.000000000 +0100
-@@ -285,7 +285,7 @@
-
- else
- {
-- $db->query("INSERT INTO `".TABLE_MAIL_USERS."` (`customerid`, `email`, `username`, `password`, `password_enc`, `homedir`, `maildir`, `uid`, `gid`, `domainid`, `postfix`) VALUES ('".$userinfo['customerid']."', '$email_full', '$username', '$password', ENCRYPT('$password'), '".$settings['system']['vmail_homedir']."', '".$userinfo['loginname']."/$email_full/', '".$settings['system']['vmail_uid']."', '".$settings['system']['vmail_gid']."', '".$result['domainid']."', 'y')");
-+ $db->query("INSERT INTO `".TABLE_MAIL_USERS."` (`customerid`, `email`, `username`, `password`, `password_enc`, `homedir`, `maildir`, `uid`, `gid`, `domainid`, `postfix`) VALUES ('".$userinfo['customerid']."', '$email_full', '$username', '', ENCRYPT('$password'), '".$settings['system']['vmail_homedir']."', '".$userinfo['loginname']."/$email_full/', '".$settings['system']['vmail_uid']."', '".$settings['system']['vmail_gid']."', '".$result['domainid']."', 'y')");
- $popaccountid = $db->insert_id();
- $result['destination'] .= ' ' . $email_full;
- $db->query("UPDATE `".TABLE_MAIL_VIRTUAL."` SET `destination` = '".makeCorrectDestination($result['destination'])."', `popaccountid` = '$popaccountid' WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'");
-@@ -333,7 +333,7 @@
- }
- else
- {
-- $result=$db->query("UPDATE `".TABLE_MAIL_USERS."` SET `password` = '$password', `password_enc`=ENCRYPT('$password') WHERE `customerid`='".$userinfo['customerid']."' AND `id`='".$result['popaccountid']."'");
-+ $result=$db->query("UPDATE `".TABLE_MAIL_USERS."` SET `password` = '', `password_enc`=ENCRYPT('$password') WHERE `customerid`='".$userinfo['customerid']."' AND `id`='".$result['popaccountid']."'");
- redirectTo ( $filename , Array ( 'page' => 'emails' , 'action' => 'edit' , 'id' => $id , 's' => $s ) ) ;
- }
- }
-diff -Nru syscp/scripts/cron_tasks.php syscp-gentoo-comp/scripts/cron_tasks.php
---- syscp/scripts/cron_tasks.php 2006-03-25 23:38:02.000000000 +0100
-+++ syscp-gentoo-comp/scripts/cron_tasks.php 2006-03-26 00:39:05.000000000 +0100
-@@ -70,10 +70,10 @@
- }
- $vhosts_file.="\n";
-
-- $vhosts_file.='# DummyHost for DefaultSite'."\n";
-- $vhosts_file.='<VirtualHost '.$settings['system']['ipaddress'].':80>'."\n";
-- $vhosts_file.='ServerName '.$settings['system']['hostname']."\n";
-- $vhosts_file.='</VirtualHost>'."\n"."\n";
-+// $vhosts_file.='# DummyHost for DefaultSite'."\n";
-+// $vhosts_file.='<VirtualHost '.$settings['system']['ipaddress'].':80>'."\n";
-+// $vhosts_file.='ServerName '.$settings['system']['hostname']."\n";
-+// $vhosts_file.='</VirtualHost>'."\n"."\n";
-
- $result_domains=$db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`documentroot`, CONCAT(`ip`.`ip`,':',`ip`.`port`) AS `ipandport`, `d`.`parentdomainid`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot` FROM `".TABLE_PANEL_DOMAINS."` `d` LEFT JOIN `".TABLE_PANEL_CUSTOMERS."` `c` USING(`customerid`) LEFT JOIN `".TABLE_PANEL_DOMAINS."` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) LEFT JOIN `".TABLE_PANEL_IPSANDPORTS."` `ip` ON (`d`.`ipandport` = `ip`.`id`) WHERE `d`.`deactivated` <> '1' AND `d`.`aliasdomain` IS NULL ORDER BY `d`.`iswildcarddomain`, `d`.`domain` ASC");
- while($domain=$db->fetch_array($result_domains))
-@@ -172,6 +172,7 @@
- safe_exec('cp -a '.$pathtophpfiles.'/templates/misc/standardcustomer/* "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'/"');
- safe_exec('chown -R '.$row['data']['uid'].':'.$row['data']['gid'].' "'.$settings['system']['documentroot_prefix'].$row['data']['loginname'].'"');
- safe_exec('chown -R '.$settings['system']['vmail_uid'].':'.$settings['system']['vmail_gid'].' "'.$settings['system']['vmail_homedir'].$row['data']['loginname'].'"');
-+ safe_exec('chmod 0750 "'.$settings['system']['vmail_homedir'].$row['data']['loginname'].'"');
- }
- }
-