/[smeserver]/rpms/e-smith-horde/sme7/e-smith-horde_3.3-upgrade.patch
ViewVC logotype

Annotation of /rpms/e-smith-horde/sme7/e-smith-horde_3.3-upgrade.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Sat Dec 6 21:23:41 2008 UTC (15 years, 10 months ago) by mrjhb3
Branch: MAIN
CVS Tags: e-smith-horde-4_0_0-12_el4_sme, e-smith-horde-4_0_0-8_el4_sme, e-smith-horde-4_0_0-7_el4_sme, e-smith-horde-4_0_0-2_el4_sme, e-smith-horde-4_0_0-11_el4_sme, e-smith-horde-4_0_0-4_el4_sme, e-smith-horde-4_0_0-5_el4_sme, e-smith-horde-4_0_0-10_el4_sme, e-smith-horde-4_0_0-6_el4_sme, e-smith-horde-4_0_0-9_el4_sme, HEAD
Please see changelog

1 mrjhb3 1.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-3.2/root/etc/e-smith/db/configuration/migrate/HordeSecret mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/db/configuration/migrate/HordeSecret
2     --- e-smith-horde-3.2/root/etc/e-smith/db/configuration/migrate/HordeSecret 1969-12-31 18:00:00.000000000 -0600
3     +++ mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/db/configuration/migrate/HordeSecret 2008-10-04 14:01:26.000000000 -0500
4     @@ -0,0 +1,32 @@
5     +{
6     + my $horderec = $DB->get('horde')
7     + || $DB->new_record('horde', {type => 'service'});
8     + my $horde_secret = $horderec->prop('SecretKey');
9     + if (not $horde_secret or length($horde_secret) < 57)
10     + {
11     + use MIME::Base64 qw(encode_base64);
12     +
13     + $horde_secret = "not set due to error";
14     + if ( open( RANDOM, "/dev/urandom" ) )
15     + {
16     + my $buf;
17     + # 57 bytes is a full line of Base64 coding, and contains
18     + # 456 bits of randomness - given a perfectly random /dev/random
19     + if ( read( RANDOM, $buf, 57 ) != 57 )
20     + {
21     + warn("Short read from /dev/random: $!");
22     + }
23     + else
24     + {
25     + $horde_secret = encode_base64($buf);
26     + chomp $horde_secret;
27     + }
28     + close RANDOM;
29     + }
30     + else
31     + {
32     + warn "Could not open /dev/urandom: $!";
33     + }
34     + $horderec->set_prop('SecretKey', $horde_secret);
35     + }
36     +}
37     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header
38     --- e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header 2008-10-04 14:35:08.000000000 -0500
39     +++ mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header 2008-10-04 13:38:33.000000000 -0500
40     @@ -1,4 +1,4 @@
41     //00header
42     /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
43     -// $Horde: horde/config/conf.xml,v 1.74.2.69 2008/06/05 09:05:50 jan Exp $
44     +// $Horde: horde/config/conf.xml,v 1.74.2.78 2008/09/12 10:01:41 jan Exp $
45    
46     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings
47     --- e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings 2008-04-17 23:11:38.000000000 -0500
48     +++ mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings 2008-10-04 14:04:42.000000000 -0500
49     @@ -3,10 +3,18 @@
50     $conf['debug_level'] = E_ALL;
51     $conf['max_exec_time'] = 0;
52     $conf['compress_pages'] = true;
53     +{
54     + $horderec = $DB->get('horde');
55     + $horde_secret = $horderec->prop('SecretKey') || 'horde';
56     + return '';
57     +}
58     +$conf['secret_key'] = '{$horde_secret}';
59     $conf['umask'] = 077;
60     $conf['use_ssl'] = 2;
61     $conf['server']['name'] = $_SERVER['SERVER_NAME'];
62     $conf['server']['port'] = $_SERVER['SERVER_PORT'];
63     +$conf['urls']['token_lifetime'] = 30;
64     +$conf['urls']['hmac_lifetime'] = 30;
65     $conf['urls']['pretty'] = false;
66     $conf['safe_ips'] = array();
67     $conf['session']['name'] = 'Horde';
68     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/210CacheSystem mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/210CacheSystem
69     --- e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/210CacheSystem 2008-05-26 17:18:43.000000000 -0500
70     +++ mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/210CacheSystem 2008-10-04 14:26:19.000000000 -0500
71     @@ -1,7 +1,6 @@
72     //210CacheSystem
73     $conf['cache']['default_lifetime'] = 1800;
74     +$conf['cache']['driver'] = 'file';
75     $conf['cache']['params']['dir'] = Horde::getTempDir();
76     $conf['cache']['params']['sub'] = 0;
77     -$conf['cache']['driver'] = 'file';
78     -$conf['token']['driver'] = 'none';
79    
80     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header
81     --- e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header 2008-04-17 23:15:56.000000000 -0500
82     +++ mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header 2008-10-04 13:21:09.000000000 -0500
83     @@ -1,6 +1,6 @@
84     // 00header
85     /**
86     - * $Horde: horde/config/mime_drivers.php.dist,v 1.97.6.10 2007/12/20 15:01:22 jan Exp $
87     + * $Horde: horde/config/mime_drivers.php.dist,v 1.97.6.12 2008/07/07 16:24:24 jan Exp $
88     *
89     * Decide which output drivers you want to activate for all Horde
90     * applications. Individual Horde applications can override these settings
91     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/136smil mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/136smil
92     --- e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/136smil 2008-04-17 23:27:50.000000000 -0500
93     +++ mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/136smil 2008-10-04 13:24:43.000000000 -0500
94     @@ -1,6 +1,5 @@
95     // 135smil
96     /**
97     -/**
98     * Default smil driver settings
99     */
100     $mime_drivers['horde']['smil'] = array(
101     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/280vcard mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/280vcard
102     --- e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/280vcard 2008-04-17 23:42:11.000000000 -0500
103     +++ mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/280vcard 2008-10-04 13:28:25.000000000 -0500
104     @@ -4,7 +4,7 @@
105     */
106     $mime_drivers['horde']['vcard'] = array(
107     'handles' => array(
108     - 'text/x-vcard', 'text/x-vcalendar'
109     + 'text/vcard', 'text/x-vcard', 'text/directory'
110     ),
111     'icons' => array(
112     'default' => 'vcard.png'
113     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header
114     --- e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header 2008-10-04 14:35:08.000000000 -0500
115     +++ mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header 2008-10-04 12:45:34.000000000 -0500
116     @@ -2,7 +2,7 @@
117     /**
118     * registry.php -- Horde application registry.
119     *
120     - * $Horde: horde/config/registry.php.dist,v 1.255.2.25 2008/05/25 21:39:05 chuck Exp $
121     + * $Horde: horde/config/registry.php.dist,v 1.255.2.26 2008/07/07 12:17:08 jan Exp $
122     *
123     * This configuration file is used by Horde to determine which Horde
124     * applications are installed and where, as well as how they interact.
125     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/795AppRegistryNic mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/795AppRegistryNic
126     --- e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/795AppRegistryNic 2008-04-19 08:16:27.000000000 -0500
127     +++ mezzanine_patched_e-smith-horde-3.2/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/795AppRegistryNic 2008-10-04 12:53:33.000000000 -0500
128     @@ -1,4 +1,4 @@
129     -// 360AppRegistryNic
130     +// 795AppRegistryNic
131     $this->applications['nic'] = array(
132     'fileroot' => dirname(__FILE__) . '/../nic',
133     'webroot' => $this->applications['horde']['webroot'] . '/nic',
134     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-3.2/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql mezzanine_patched_e-smith-horde-3.2/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql
135     --- e-smith-horde-3.2/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql 2008-06-07 21:26:55.000000000 -0500
136     +++ mezzanine_patched_e-smith-horde-3.2/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql 2008-10-04 12:40:47.000000000 -0500
137     @@ -1,4 +1,4 @@
138     --- $Horde: horde/scripts/sql/create.mysql.sql,v 1.4.6.20 2008/05/16 21:42:04 bklang Exp $
139     +-- $Horde: horde/scripts/sql/create.mysql.sql,v 1.4.6.22 2008/08/13 20:18:03 chuck Exp $
140    
141     CREATE DATABASE IF NOT EXISTS horde;
142    
143     @@ -13,6 +13,16 @@
144     PRIMARY KEY (user_uid)
145     );
146    
147     +CREATE TABLE horde_signups (
148     + user_name VARCHAR(255) NOT NULL,
149     + signup_date VARCHAR(255) NOT NULL,
150     + signup_host VARCHAR(255) NOT NULL,
151     + signup_email VARCHAR(255) NOT NULL,
152     + signup_data TEXT NOT NULL,
153     + UNIQUE KEY user_name (user_name),
154     + UNIQUE KEY signup_email (signup_email)
155     +);
156     +
157     CREATE TABLE IF NOT EXISTS horde_groups (
158     group_uid INT(10) UNSIGNED NOT NULL,
159     group_name VARCHAR(255) NOT NULL,
160     @@ -74,8 +84,8 @@
161     );
162    
163     CREATE TABLE IF NOT EXISTS horde_vfs (
164     - vfs_id BIGINT NOT NULL,
165     - vfs_type SMALLINT NOT NULL,
166     + vfs_id INT UNSIGNED NOT NULL,
167     + vfs_type SMALLINT UNSIGNED NOT NULL,
168     vfs_path VARCHAR(255) NOT NULL,
169     vfs_name VARCHAR(255) NOT NULL,
170     vfs_modified BIGINT NOT NULL,
171     @@ -86,7 +96,7 @@
172     );
173    
174     CREATE TABLE IF NOT EXISTS horde_histories (
175     - history_id BIGINT NOT NULL,
176     + history_id INT UNSIGNED NOT NULL,
177     object_uid VARCHAR(255) NOT NULL,
178     history_action VARCHAR(32) NOT NULL,
179     history_ts BIGINT NOT NULL,
180     @@ -99,7 +109,7 @@
181    
182     CREATE TABLE IF NOT EXISTS horde_sessionhandler (
183     session_id VARCHAR(32) NOT NULL,
184     - session_lastmodified INT NOT NULL,
185     + session_lastmodified BIGINT NOT NULL,
186     session_data LONGBLOB,
187    
188     PRIMARY KEY (session_id)
189     @@ -153,10 +163,9 @@
190     lock_origin_timestamp BIGINT NOT NULL,
191     lock_update_timestamp BIGINT NOT NULL,
192     lock_expiry_timestamp BIGINT NOT NULL,
193     - lock_type TINYINT NOT NULL,
194     + lock_type TINYINT UNSIGNED NOT NULL,
195    
196     PRIMARY KEY (lock_id)
197     -
198     );
199    
200    
201     diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-3.2/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql mezzanine_patched_e-smith-horde-3.2/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql
202     --- e-smith-horde-3.2/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql 2008-10-17 18:01:52.000000000 -0500
203     +++ mezzanine_patched_e-smith-horde-3.2/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql 2008-10-17 17:59:55.000000000 -0500
204     @@ -13,7 +13,7 @@
205     PRIMARY KEY (user_uid)
206     );
207    
208     -CREATE TABLE horde_signups (
209     +CREATE TABLE IF NOT EXISTS horde_signups (
210     user_name VARCHAR(255) NOT NULL,
211     signup_date VARCHAR(255) NOT NULL,
212     signup_host VARCHAR(255) NOT NULL,

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed