e-smith-ingo/sme8/e-smith-ingo_ingo-1.2.2.patch

diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-2.0.0/root/etc/e-smith/events/actions/ingo_upgrade mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/events/actions/ingo_upgrade
--- e-smith-ingo-2.0.0/root/etc/e-smith/events/actions/ingo_upgrade     2008-05-29 23:16:57.000000000 -0500
+++ mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/events/actions/ingo_upgrade   2009-10-08 20:44:27.000000000 -0500
@@ -46,6 +46,18 @@
 
 # These are all safe to run multiple times
 
+my @statements = (
+    "ALTER TABLE ingo_shares_groups CHANGE group_uid group_uid VARCHAR(255)",
+);
+
+foreach my $statement (@statements)
+{
+    $statement =
+        $db_ingohandle->prepare("$statement")
+            or die "prepare: $$statement: $DBI::errstr";
+    $statement->execute or die "execute: $$statement: $DBI::errstr";
+}
+
 # We now need to create some columns, but we need to first check
 # whether they exist already
 my $sth = $db_ingohandle->prepare("show columns from ingo_rules");
@@ -68,18 +80,6 @@
 $sth4->execute;
 my $ingo_shares_users = $sth4->fetchall_hashref('Field');
 
-
-#unless (!defined $ingo_memos->{memo_modified})
-#{
-#    # We need to be careful about this one as it will fail if the 
-#    # column exists, so we check the error. 
-#    my $statement = 
-#        'ALTER TABLE ingo_memos DROP COLUMN memo_modified';
-#    $statement = $db_ingohandle->prepare($statement) or 
-#        die "prepare: $$statement: $DBI::errstr";
-#    $statement->execute or die "execute: $$statement: $DBI::errstr";
-#}
-
 # Create an index for rule_owner if needed
 unless ($ingo_rules->{rule_owner}->{Key})
 {
diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/130AppRegistryIngo mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/130AppRegistryIngo
--- e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/130AppRegistryIngo  2008-04-10 21:21:47.000000000 -0500
+++ mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/130AppRegistryIngo        2009-10-08 20:05:14.000000000 -0500
@@ -4,7 +4,7 @@
     'webroot' => $this->applications['horde']['webroot'] . '/ingo',
     'name' => _("Filters"),
     'status' => 'active',
-    'provides' => array('mail/blacklistFrom', 'mail/showBlacklist', 'mail/whitelistFrom', 'mail/showWhitelist', 'mail/applyFilters', 'mail/canApplyFilters', 'mail/showFilters'),
+    'provides' => array('filter', 'mail/blacklistFrom', 'mail/showBlacklist', 'mail/whitelistFrom', 'mail/showWhitelist', 'mail/applyFilters', 'mail/canApplyFilters', 'mail/showFilters'),
     'menu_parent' => 'imp'
 );
 
diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header
--- e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header      2008-05-24 18:01:41.000000000 -0500
+++ mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header    2009-10-08 20:40:45.000000000 -0500
@@ -1,6 +1,6 @@
 //100header
 /**
- * $Horde: ingo/config/backends.php.dist,v 1.20.8.11 2008/05/02 03:54:53 chuck Exp $
+ * $Horde: ingo/config/backends.php.dist,v 1.20.8.12 2008/12/15 02:33:07 chuck Exp $
  *
  * Ingo works purely on a preferred mechanism for server selection. There are
  * a number of properties that you can set for each backend:
diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop
--- e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop    2008-04-10 21:41:08.000000000 -0500
+++ mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop  2009-10-08 20:42:16.000000000 -0500
@@ -18,11 +18,12 @@
 //        // owner's home directory.
 //        // You can use the following variables:
 //        //   %u = name of the filters' owner   
+//        //   %d = domain name of the filters' owner
 //        //   %U = the 'username' from above    
 //        // Example:
-//        //   '/data/maildrop/filters/%u'
+//        //   '/data/maildrop/filters/%d/%u'
 //        //   This would be translated into:
-//        //   '/data/maildrop/filters/<filter_owners_username>/.mailfilter'
+//        //   '/data/maildrop/filters/<filter_owners_domainname>/<filter_owners_username>/.mailfilter'
 //        // 'vfs_path' => '/path/to/maildrop',
 //        
 //        // VFS: FTP example
diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-2.0.0/root/home/httpd/html/horde/smeserver/ingo.sql mezzanine_patched_e-smith-ingo-2.0.0/root/home/httpd/html/horde/smeserver/ingo.sql
--- e-smith-ingo-2.0.0/root/home/httpd/html/horde/smeserver/ingo.sql    2008-06-18 23:00:14.000000000 -0500
+++ mezzanine_patched_e-smith-ingo-2.0.0/root/home/httpd/html/horde/smeserver/ingo.sql  2009-10-08 20:43:24.000000000 -0500
@@ -71,7 +71,7 @@
 
 CREATE TABLE IF NOT EXISTS ingo_shares_groups (
     share_id INT NOT NULL,
-    group_uid INT NOT NULL,
+    group_uid VARCHAR(255) NOT NULL,
     perm SMALLINT NOT NULL
 );
 
1	mrjhb3	1.1	diff -Nur -x '.orig' -x '.rej' e-smith-ingo-2.0.0/root/etc/e-smith/events/actions/ingo_upgrade mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/events/actions/ingo_upgrade
2			--- e-smith-ingo-2.0.0/root/etc/e-smith/events/actions/ingo_upgrade 2008-05-29 23:16:57.000000000 -0500
3			+++ mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/events/actions/ingo_upgrade 2009-10-08 20:44:27.000000000 -0500
4			@@ -46,6 +46,18 @@
5
6			# These are all safe to run multiple times
7
8			+my @statements = (
9			+ "ALTER TABLE ingo_shares_groups CHANGE group_uid group_uid VARCHAR(255)",
10			+);
11			+
12			+foreach my $statement (@statements)
13			+{
14			+ $statement =
15			+ $db_ingohandle->prepare("$statement")
16			+ or die "prepare: $$statement: $DBI::errstr";
17			+ $statement->execute or die "execute: $$statement: $DBI::errstr";
18			+}
19			+
20			# We now need to create some columns, but we need to first check
21			# whether they exist already
22			my $sth = $db_ingohandle->prepare("show columns from ingo_rules");
23			@@ -68,18 +80,6 @@
24			$sth4->execute;
25			my $ingo_shares_users = $sth4->fetchall_hashref('Field');
26
27			-
28			-#unless (!defined $ingo_memos->{memo_modified})
29			-#{
30			-# # We need to be careful about this one as it will fail if the
31			-# # column exists, so we check the error.
32			-# my $statement =
33			-# 'ALTER TABLE ingo_memos DROP COLUMN memo_modified';
34			-# $statement = $db_ingohandle->prepare($statement) or
35			-# die "prepare: $$statement: $DBI::errstr";
36			-# $statement->execute or die "execute: $$statement: $DBI::errstr";
37			-#}
38			-
39			# Create an index for rule_owner if needed
40			unless ($ingo_rules->{rule_owner}->{Key})
41			{
42			diff -Nur -x '.orig' -x '.rej' e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/130AppRegistryIngo mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/130AppRegistryIngo
43			--- e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/130AppRegistryIngo 2008-04-10 21:21:47.000000000 -0500
44			+++ mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/130AppRegistryIngo 2009-10-08 20:05:14.000000000 -0500
45			@@ -4,7 +4,7 @@
46			'webroot' => $this->applications['horde']['webroot'] . '/ingo',
47			'name' => _("Filters"),
48			'status' => 'active',
49			- 'provides' => array('mail/blacklistFrom', 'mail/showBlacklist', 'mail/whitelistFrom', 'mail/showWhitelist', 'mail/applyFilters', 'mail/canApplyFilters', 'mail/showFilters'),
50			+ 'provides' => array('filter', 'mail/blacklistFrom', 'mail/showBlacklist', 'mail/whitelistFrom', 'mail/showWhitelist', 'mail/applyFilters', 'mail/canApplyFilters', 'mail/showFilters'),
51			'menu_parent' => 'imp'
52			);
53
54			diff -Nur -x '.orig' -x '.rej' e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header
55			--- e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header 2008-05-24 18:01:41.000000000 -0500
56			+++ mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header 2009-10-08 20:40:45.000000000 -0500
57			@@ -1,6 +1,6 @@
58			//100header
59			/**
60			- * $Horde: ingo/config/backends.php.dist,v 1.20.8.11 2008/05/02 03:54:53 chuck Exp $
61			+ * $Horde: ingo/config/backends.php.dist,v 1.20.8.12 2008/12/15 02:33:07 chuck Exp $
62			*
63			* Ingo works purely on a preferred mechanism for server selection. There are
64			* a number of properties that you can set for each backend:
65			diff -Nur -x '.orig' -x '.rej' e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop
66			--- e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop 2008-04-10 21:41:08.000000000 -0500
67			+++ mezzanine_patched_e-smith-ingo-2.0.0/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop 2009-10-08 20:42:16.000000000 -0500
68			@@ -18,11 +18,12 @@
69			// // owner's home directory.
70			// // You can use the following variables:
71			// // %u = name of the filters' owner
72			+// // %d = domain name of the filters' owner
73			// // %U = the 'username' from above
74			// // Example:
75			-// // '/data/maildrop/filters/%u'
76			+// // '/data/maildrop/filters/%d/%u'
77			// // This would be translated into:
78			-// // '/data/maildrop/filters/<filter_owners_username>/.mailfilter'
79			+// // '/data/maildrop/filters/<filter_owners_domainname>/<filter_owners_username>/.mailfilter'
80			// // 'vfs_path' => '/path/to/maildrop',
81			//
82			// // VFS: FTP example
83			diff -Nur -x '.orig' -x '.rej' e-smith-ingo-2.0.0/root/home/httpd/html/horde/smeserver/ingo.sql mezzanine_patched_e-smith-ingo-2.0.0/root/home/httpd/html/horde/smeserver/ingo.sql
84			--- e-smith-ingo-2.0.0/root/home/httpd/html/horde/smeserver/ingo.sql 2008-06-18 23:00:14.000000000 -0500
85			+++ mezzanine_patched_e-smith-ingo-2.0.0/root/home/httpd/html/horde/smeserver/ingo.sql 2009-10-08 20:43:24.000000000 -0500
86			@@ -71,7 +71,7 @@
87
88			CREATE TABLE IF NOT EXISTS ingo_shares_groups (
89			share_id INT NOT NULL,
90			- group_uid INT NOT NULL,
91			+ group_uid VARCHAR(255) NOT NULL,
92			perm SMALLINT NOT NULL
93			);
94