e-smith-ingo/sme8/e-smith-ingo-1.1-1.backends_php.patch

diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header
--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header        2005-09-01 12:41:12.000000000 -0500
+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header      2006-09-14 07:20:55.000000000 -0500
@@ -1,6 +1,6 @@
 //100header
 /**
- * $Horde: ingo/config/backends.php.dist,v 1.20 2004/11/09 10:35:37 jan Exp $
+ * $Horde: ingo/config/backends.php.dist,v 1.20.8.4 2006/02/02 22:57:31 jan Exp $
  *
  * Ingo works purely on a preferred mechanism for server selection. There are
  * a number of properties that you can set for each backend:
@@ -27,6 +27,7 @@
  * script:       The type of Ingo_Script driver this server uses.
  *               Valid options:
  *                   'imap'      --  IMAP client side filtering
+ *                   'maildrop'  --  Maildrop scripts
  *                   'procmail'  --  Procmail scripts
  *                   'sieve'     --  Sieve scripts
  *
diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop
--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop      1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop    2006-09-14 07:26:17.000000000 -0500
@@ -0,0 +1,43 @@
+//130maildrop
+/* Maildrop Example */
+//$backends['maildrop'] = array(
+//    'driver' => 'vfs',
+//    'preferred' => 'example.com',
+//    'hordeauth' => true,
+//    'params' => array(
+//        // Hostname of the VFS server
+//        'hostspec' => 'ftp.example.com',
+//        // Name of the maildrop config file to write
+//      'filename' => '.mailfilter',
+//        // Port of the VFS server  
+//        'port' => 21,
+//        // The VFS driver to use
+//        'vfstype' => 'ftp',
+//        // The VFS username to use, defaults to current user
+//        // 'username' => 'user',
+//        // The VFS password to use, defaults to current user's password
+//        // 'password' => 'secret',
+//        // The path to the .mailfilter filter file, defaults to the current
+//        // user's home directory.
+//        // You can use the following variables:
+//        //   %u = name of the current user
+//        //   %U = the 'username' from above
+//        // Example:
+//        //   '/data/maildrop/filters/%u/'
+//        //   This would be translated into:
+//        //   '/data/maildrop/filters/<logged_in_username>/.mailfilter'
+//        // 'vfs_path' => '/path/to/maildrop/',
+//    ),
+//    'script' => 'maildrop',
+//    'scriptparams' => array(
+//        // What path style does the IMAP server use ['mbox'|'maildir']?
+//        'path_style' => 'mbox',
+//        // An array of variables to append to every generated script.
+//        // Use if you need to set up specific environment variables.
+//        'variables' => array(
+//            // Example for the $PATH variable
+//            // 'PATH' => '/usr/bin'
+//        )
+//    )
+//);
+
diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/140procmail mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/140procmail
--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/140procmail      2005-09-01 14:47:19.000000000 -0500
+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/140procmail    2006-09-14 21:53:22.000000000 -0500
@@ -4,26 +4,42 @@
 //    'driver' => 'vfs',
 //    'preferred' => 'example.com',
 //    'hordeauth' => true,
-//    'params' => array(
+//    'params' => array(  
 //        // Hostname of the VFS server
 //        'hostspec' => 'ftp.example.com',
 //        // Name of the procmail config file to write
-//        'procmailrc' => '.procmailrc',
-//        // Port of the VFS server
+//        'filename' => '.procmailrc',
+//        // Port of the VFS server   
 //        'port' => 21,
 //        // The VFS driver to use
 //        'vfstype' => 'ftp'
+//        // The VFS username to use, defaults to current user
+//        // 'username' => 'user',
+//        // The VFS password to use, defaults to current user's password
+//        // 'password' => 'secret',
+//       // The path to the .procmailrc filter file, defaults to the current
+//        // user's home directory.
+//        // You can use the following variables:
+//        //   %u = name of the current user
+//        //   %U = the 'username' from above
+//        // Example:
+//        //   '/data/procmail/filters/%u/'
+//        //   This would be translated into:
+//        //   '/data/procmail/filters/<logged_in_username>/.procmailrc'
+//        // 'vfs_path' => '/path/to/procmail/',
 //    ),
 //    'script' => 'procmail',
 //    'scriptparams' => array(
 //        // What path style does the IMAP server use ['mbox'|'maildir']?
 //        'path_style' => 'mbox',
-//        // An array of variables to append to every generated script.
-//        // Use if you need to set up specific environment variables.
-//        'variables' => array(
+//       // An array of variables to append to every generated script.
+//        // Use if you need to set up specific environment variables. 
+//       'variables' => array(
 //            // Example for the $PATH variable
-//            // 'PATH' => '/usr/bin'
-//        )
+//            // 'PATH' => '/usr/bin',
+//           // Example for the $DEFAULT variable
+//            // 'DEFAULT' => '$HOME/Maildir',
+//       )
 //    )
-//);
+//);   
 
diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve
--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve 2005-09-01 14:46:38.000000000 -0500
+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve       2006-09-14 21:54:30.000000000 -0500
@@ -4,15 +4,20 @@
 //    'driver' => 'timsieved',
 //    'preferred' => 'example.com',
 //    'hordeauth' => true,
-//    'params' => array(
+//    'params' => array(  
 //        // Hostname of the timsieved server
-//        'hostspec' => 'mail.example.com',
+//        'hostspec' => 'mail.example.com',  
 //        // Login type of the server
 //        'logintype' => 'PLAIN',
 //        // Port number of the timsieved server
 //        'port' => 2000,
 //        // Name of the sieve script
-//        'scriptname' => 'ingo'
+//        'scriptname' => 'ingo',
+//        // The following settings can be used to specify an administration
+//        // user to update all users' scripts.
+//        // 'admin' => 'cyrus',
+//        // 'password' => '*****',
+//        // 'username' => Auth::getAuth(),
 //    ),
 //    'script' => 'sieve',
 //    'scriptparams' => array()
diff -Nur -x '*.orig' -x '*.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/170ldapsieve mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/170ldapsieve
--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/170ldapsieve     1969-12-31 18:00:00.000000000 -0600
+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/170ldapsieve   2006-09-14 21:57:44.000000000 -0500
@@ -0,0 +1,61 @@
+//170ldapsieve
+/* Sun ONE/JES Example (LDAP/Sieve) */
+//$backends['ldapsieve'] = array(
+//    'driver' => 'ldap',
+//    'preferred' => 'example.com',
+//    'hordeauth' => false,
+//    'params' => array(
+//        //
+//        // Hostname of the ldap server
+//        //
+//        'hostspec' => 'ldap.example.com',
+//        //
+//        // Port number of the timsieved server
+//        //
+//        'port' => 389,
+//        //
+//        // LDAP Protocol Version (default = 2).  3 is required for TLS.
+//        //
+//        'version' => 3,
+//        //
+//        // Whether or not to use TLS.  If using TLS, you MUST configure
+//        // OpenLDAP (either /etc/ldap.conf or /etc/ldap/ldap.conf) with the CA
+//        // certificate which signed the certificate of the server to which you
+//        // are connecting.  e.g.:
+//        //
+//        // TLS_CACERT /usr/share/ca-certificates/mozilla/Equifax_Secure_CA.crt
+//        //
+//       // You MAY have problems if you are using TLS and your server is
+//        // configured to make random referrals, since some OpenLDAP libraries
+//        // appear to check the certificate against the original domain name,
+//       // and not the referred-to domain.  This can be worked around by
+//        // putting the following directive in the ldap.conf:
+//        // 
+//        // TLS_REQCERT never
+//        // 
+//        'tls' => true,
+//        //
+//        // Bind DN (for bind and script distinguished names, %u is replaced
+//        // with username, and %d is replaced with the internet domain
+//        // components (e.g. "dc=example, dc=com") if available).
+//        // 
+//        'bind_dn' => 'cn=ingo, ou=applications, dc=example, dc=com',
+//        //
+//        // Bind password.  If not provided, user's password is used (useful
+//       // when bind_dn contains %u).
+//        // 
+//        'bind_password' => 'secret',
+//        //
+//        // How to find user object.
+//        // 
+//        'script_base' => 'ou=People, dc=example, dc=com',
+//        'script_filter' => '(uid=%u)',
+//        //
+//        // Attribute script is stored in.  Will not touch non-Ingo scripts.
+//        // 
+//        'script_attribute' => 'mailSieveRuleSource'
+//    ),
+//    'script' => 'sieve',
+//    'scriptparams' => array()
+//);
+
1	slords	1.1	diff -Nur -x '.orig' -x '.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header
2			--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header 2005-09-01 12:41:12.000000000 -0500
3			+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/100header 2006-09-14 07:20:55.000000000 -0500
4			@@ -1,6 +1,6 @@
5			//100header
6			/**
7			- * $Horde: ingo/config/backends.php.dist,v 1.20 2004/11/09 10:35:37 jan Exp $
8			+ * $Horde: ingo/config/backends.php.dist,v 1.20.8.4 2006/02/02 22:57:31 jan Exp $
9			*
10			* Ingo works purely on a preferred mechanism for server selection. There are
11			* a number of properties that you can set for each backend:
12			@@ -27,6 +27,7 @@
13			* script: The type of Ingo_Script driver this server uses.
14			* Valid options:
15			* 'imap' -- IMAP client side filtering
16			+ * 'maildrop' -- Maildrop scripts
17			* 'procmail' -- Procmail scripts
18			* 'sieve' -- Sieve scripts
19			*
20			diff -Nur -x '.orig' -x '.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop
21			--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop 1969-12-31 18:00:00.000000000 -0600
22			+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/130maildrop 2006-09-14 07:26:17.000000000 -0500
23			@@ -0,0 +1,43 @@
24			+//130maildrop
25			+/* Maildrop Example */
26			+//$backends['maildrop'] = array(
27			+// 'driver' => 'vfs',
28			+// 'preferred' => 'example.com',
29			+// 'hordeauth' => true,
30			+// 'params' => array(
31			+// // Hostname of the VFS server
32			+// 'hostspec' => 'ftp.example.com',
33			+// // Name of the maildrop config file to write
34			+// 'filename' => '.mailfilter',
35			+// // Port of the VFS server
36			+// 'port' => 21,
37			+// // The VFS driver to use
38			+// 'vfstype' => 'ftp',
39			+// // The VFS username to use, defaults to current user
40			+// // 'username' => 'user',
41			+// // The VFS password to use, defaults to current user's password
42			+// // 'password' => 'secret',
43			+// // The path to the .mailfilter filter file, defaults to the current
44			+// // user's home directory.
45			+// // You can use the following variables:
46			+// // %u = name of the current user
47			+// // %U = the 'username' from above
48			+// // Example:
49			+// // '/data/maildrop/filters/%u/'
50			+// // This would be translated into:
51			+// // '/data/maildrop/filters/<logged_in_username>/.mailfilter'
52			+// // 'vfs_path' => '/path/to/maildrop/',
53			+// ),
54			+// 'script' => 'maildrop',
55			+// 'scriptparams' => array(
56			+// // What path style does the IMAP server use ['mbox'\|'maildir']?
57			+// 'path_style' => 'mbox',
58			+// // An array of variables to append to every generated script.
59			+// // Use if you need to set up specific environment variables.
60			+// 'variables' => array(
61			+// // Example for the $PATH variable
62			+// // 'PATH' => '/usr/bin'
63			+// )
64			+// )
65			+//);
66			+
67			diff -Nur -x '.orig' -x '.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/140procmail mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/140procmail
68			--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/140procmail 2005-09-01 14:47:19.000000000 -0500
69			+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/140procmail 2006-09-14 21:53:22.000000000 -0500
70			@@ -4,26 +4,42 @@
71			// 'driver' => 'vfs',
72			// 'preferred' => 'example.com',
73			// 'hordeauth' => true,
74			-// 'params' => array(
75			+// 'params' => array(
76			// // Hostname of the VFS server
77			// 'hostspec' => 'ftp.example.com',
78			// // Name of the procmail config file to write
79			-// 'procmailrc' => '.procmailrc',
80			-// // Port of the VFS server
81			+// 'filename' => '.procmailrc',
82			+// // Port of the VFS server
83			// 'port' => 21,
84			// // The VFS driver to use
85			// 'vfstype' => 'ftp'
86			+// // The VFS username to use, defaults to current user
87			+// // 'username' => 'user',
88			+// // The VFS password to use, defaults to current user's password
89			+// // 'password' => 'secret',
90			+// // The path to the .procmailrc filter file, defaults to the current
91			+// // user's home directory.
92			+// // You can use the following variables:
93			+// // %u = name of the current user
94			+// // %U = the 'username' from above
95			+// // Example:
96			+// // '/data/procmail/filters/%u/'
97			+// // This would be translated into:
98			+// // '/data/procmail/filters/<logged_in_username>/.procmailrc'
99			+// // 'vfs_path' => '/path/to/procmail/',
100			// ),
101			// 'script' => 'procmail',
102			// 'scriptparams' => array(
103			// // What path style does the IMAP server use ['mbox'\|'maildir']?
104			// 'path_style' => 'mbox',
105			-// // An array of variables to append to every generated script.
106			-// // Use if you need to set up specific environment variables.
107			-// 'variables' => array(
108			+// // An array of variables to append to every generated script.
109			+// // Use if you need to set up specific environment variables.
110			+// 'variables' => array(
111			// // Example for the $PATH variable
112			-// // 'PATH' => '/usr/bin'
113			-// )
114			+// // 'PATH' => '/usr/bin',
115			+// // Example for the $DEFAULT variable
116			+// // 'DEFAULT' => '$HOME/Maildir',
117			+// )
118			// )
119			-//);
120			+//);
121
122			diff -Nur -x '.orig' -x '.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve
123			--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve 2005-09-01 14:46:38.000000000 -0500
124			+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/160sieve 2006-09-14 21:54:30.000000000 -0500
125			@@ -4,15 +4,20 @@
126			// 'driver' => 'timsieved',
127			// 'preferred' => 'example.com',
128			// 'hordeauth' => true,
129			-// 'params' => array(
130			+// 'params' => array(
131			// // Hostname of the timsieved server
132			-// 'hostspec' => 'mail.example.com',
133			+// 'hostspec' => 'mail.example.com',
134			// // Login type of the server
135			// 'logintype' => 'PLAIN',
136			// // Port number of the timsieved server
137			// 'port' => 2000,
138			// // Name of the sieve script
139			-// 'scriptname' => 'ingo'
140			+// 'scriptname' => 'ingo',
141			+// // The following settings can be used to specify an administration
142			+// // user to update all users' scripts.
143			+// // 'admin' => 'cyrus',
144			+// // 'password' => '*****',
145			+// // 'username' => Auth::getAuth(),
146			// ),
147			// 'script' => 'sieve',
148			// 'scriptparams' => array()
149			diff -Nur -x '.orig' -x '.rej' e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/170ldapsieve mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/170ldapsieve
150			--- e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/170ldapsieve 1969-12-31 18:00:00.000000000 -0600
151			+++ mezzanine_patched_e-smith-ingo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/ingo/config/backends.php/170ldapsieve 2006-09-14 21:57:44.000000000 -0500
152			@@ -0,0 +1,61 @@
153			+//170ldapsieve
154			+/* Sun ONE/JES Example (LDAP/Sieve) */
155			+//$backends['ldapsieve'] = array(
156			+// 'driver' => 'ldap',
157			+// 'preferred' => 'example.com',
158			+// 'hordeauth' => false,
159			+// 'params' => array(
160			+// //
161			+// // Hostname of the ldap server
162			+// //
163			+// 'hostspec' => 'ldap.example.com',
164			+// //
165			+// // Port number of the timsieved server
166			+// //
167			+// 'port' => 389,
168			+// //
169			+// // LDAP Protocol Version (default = 2). 3 is required for TLS.
170			+// //
171			+// 'version' => 3,
172			+// //
173			+// // Whether or not to use TLS. If using TLS, you MUST configure
174			+// // OpenLDAP (either /etc/ldap.conf or /etc/ldap/ldap.conf) with the CA
175			+// // certificate which signed the certificate of the server to which you
176			+// // are connecting. e.g.:
177			+// //
178			+// // TLS_CACERT /usr/share/ca-certificates/mozilla/Equifax_Secure_CA.crt
179			+// //
180			+// // You MAY have problems if you are using TLS and your server is
181			+// // configured to make random referrals, since some OpenLDAP libraries
182			+// // appear to check the certificate against the original domain name,
183			+// // and not the referred-to domain. This can be worked around by
184			+// // putting the following directive in the ldap.conf:
185			+// //
186			+// // TLS_REQCERT never
187			+// //
188			+// 'tls' => true,
189			+// //
190			+// // Bind DN (for bind and script distinguished names, %u is replaced
191			+// // with username, and %d is replaced with the internet domain
192			+// // components (e.g. "dc=example, dc=com") if available).
193			+// //
194			+// 'bind_dn' => 'cn=ingo, ou=applications, dc=example, dc=com',
195			+// //
196			+// // Bind password. If not provided, user's password is used (useful
197			+// // when bind_dn contains %u).
198			+// //
199			+// 'bind_password' => 'secret',
200			+// //
201			+// // How to find user object.
202			+// //
203			+// 'script_base' => 'ou=People, dc=example, dc=com',
204			+// 'script_filter' => '(uid=%u)',
205			+// //
206			+// // Attribute script is stored in. Will not touch non-Ingo scripts.
207			+// //
208			+// 'script_attribute' => 'mailSieveRuleSource'
209			+// ),
210			+// 'script' => 'sieve',
211			+// 'scriptparams' => array()
212			+//);
213			+