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

Contents of /rpms/e-smith-horde/sme7/e-smith-horde_3.3.5-upgrade.patch

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


Revision 1.1 - (show annotations) (download)
Wed Oct 14 02:17:44 2009 UTC (15 years 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-11_el4_sme, e-smith-horde-4_0_0-10_el4_sme, e-smith-horde-4_0_0-9_el4_sme, HEAD
Please see changelog

1 diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/events/actions/horde_upgrade mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/events/actions/horde_upgrade
2 --- e-smith-horde-4.0.0/root/etc/e-smith/events/actions/horde_upgrade 2009-10-08 12:59:55.000000000 -0500
3 +++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/events/actions/horde_upgrade 2009-10-08 12:59:27.000000000 -0500
4 @@ -46,6 +46,22 @@
5
6 # These are all safe to run multiple times
7
8 +my @statements = (
9 + "ALTER TABLE horde_datatree CHANGE COLUMN datatree_id datatree_id INT(11) UNSIGNED NOT NULL",
10 + "ALTER TABLE horde_datatree_attributes CHANGE COLUMN datatree_id datatree_id INT(11) UNSIGNED NOT NULL",
11 + "ALTER TABLE horde_vfs CHANGE COLUMN vfs_id vfs_id INT(11) UNSIGNED NOT NULL",
12 + "ALTER TABLE horde_prefs CHANGE COLUMN pref_uid pref_uid VARCHAR(200) NOT NULL",
13 + "DELETE FROM horde_prefs WHERE pref_name = 'last_login' AND pref_scope = 'imp'",
14 +);
15 +
16 +foreach my $statement (@statements)
17 +{
18 + $statement =
19 + $db_hordehandle->prepare("$statement")
20 + or die "prepare: $$statement: $DBI::errstr";
21 + $statement->execute or die "execute: $$statement: $DBI::errstr";
22 +}
23 +
24 # We now need to create some columns, but we need to first check
25 # whether they exist already
26 my $sth_horde_datatree = $db_hordehandle->prepare("show columns from horde_datatree");
27 @@ -92,29 +108,10 @@
28 $sth_horde_syncml_anchors ->execute;
29 my $horde_syncml_anchors = $sth_horde_syncml_anchors ->fetchall_hashref('Field');
30
31 -unless (defined $horde_prefs->{pref_uid})
32 -{
33 - # We need to be careful about this one as it will fail if the
34 - # column exists, so we check the error.
35 - my $statement =
36 - 'ALTER TABLE horde_prefs CHANGE COLUMN pref_uid pref_uid ' .
37 - 'VARCHAR(200) NOT NULL';
38 - $statement = $db_hordehandle->prepare($statement) or
39 - die "prepare: $$statement: $DBI::errstr";
40 - $statement->execute or die "execute: $$statement: $DBI::errstr";
41 -}
42 +my $sth_horde_signups = $db_hordehandle->prepare("show columns from horde_signups ");
43 +$sth_horde_signups ->execute;
44 +my $horde_signups = $sth_horde_signups ->fetchall_hashref('Field');
45
46 -unless (defined $horde_prefs->{pref_name})
47 -{
48 - # We need to be careful about this one as it will fail if the
49 - # column exists, so we check the error.
50 - my $statement =
51 - "DELETE FROM horde_prefs WHERE " .
52 - "pref_name = 'last_login' AND pref_scope = 'imp'";
53 - $statement = $db_hordehandle->prepare($statement) or
54 - die "prepare: $$statement: $DBI::errstr";
55 - $statement->execute or die "execute: $$statement: $DBI::errstr";
56 -}
57
58 unless (defined $horde_users->{user_soft_expiration_date})
59 {
60 @@ -135,6 +132,17 @@
61 $statement->execute or die "execute: $$statement: $DBI::errstr";
62 }
63
64 +unless (!defined $horde_signups->{signup_email})
65 +{
66 + # We need to be careful about this one as it will fail if the
67 + # column exists, so we check the error.
68 + my $statement =
69 + 'ALTER TABLE horde_signups DROP COLUMN signup_email';
70 + $statement = $db_hordehandle->prepare($statement) or
71 + die "prepare: $$statement: $DBI::errstr";
72 + $statement->execute or die "execute: $$statement: $DBI::errstr";
73 +}
74 +
75 # Create an index for group_uid if needed
76 unless ($horde_groups_members ->{group_uid}->{Key})
77 {
78 @@ -464,4 +472,3 @@
79 die "prepare: $$statement: $DBI::errstr";
80 $statement->execute or die "execute: $$statement: $DBI::errstr";
81 }
82 -
83 diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header
84 --- e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header 2009-10-08 12:59:55.000000000 -0500
85 +++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header 2009-10-08 08:50:29.000000000 -0500
86 @@ -1,4 +1,4 @@
87 //00header
88 /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
89 -// $Horde: horde/config/conf.xml,v 1.74.2.84 2009/04/04 12:30:51 jan Exp $
90 +// $Horde: horde/config/conf.xml,v 1.74.2.88 2009/09/02 08:21:46 jan Exp $
91
92 diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header
93 --- e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header 2009-10-08 12:59:55.000000000 -0500
94 +++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/00header 2009-10-08 08:51:01.000000000 -0500
95 @@ -1,6 +1,6 @@
96 // 00header
97 /**
98 - * $Horde: horde/config/mime_drivers.php.dist,v 1.97.6.12 2008/07/07 16:24:24 jan Exp $
99 + * $Horde: horde/config/mime_drivers.php.dist,v 1.97.6.13 2009/05/29 05:59:25 slusarz Exp $
100 *
101 * Decide which output drivers you want to activate for all Horde
102 * applications. Individual Horde applications can override these settings
103 diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/120simple mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/120simple
104 --- e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/120simple 2008-04-17 23:23:01.000000000 -0500
105 +++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/mime_drivers.php/120simple 2009-10-08 08:51:32.000000000 -0500
106 @@ -3,7 +3,7 @@
107 * Default text driver settings
108 */
109 $mime_drivers['horde']['simple'] = array(
110 - 'inline' => true,
111 + 'inline' => false,
112 'handles' => array(
113 'text/*'
114 ),
115 diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql mezzanine_patched_e-smith-horde-4.0.0/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql
116 --- e-smith-horde-4.0.0/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql 2009-10-08 12:59:55.000000000 -0500
117 +++ mezzanine_patched_e-smith-horde-4.0.0/root/home/httpd/html/horde/smeserver/horde_mysql_create_tables.sql 2009-10-08 09:48:14.000000000 -0500
118 @@ -1,4 +1,4 @@
119 --- $Horde: horde/scripts/sql/create.mysql.sql,v 1.4.6.22 2008/08/13 20:18:03 chuck Exp $
120 +-- $Horde: horde/scripts/sql/create.mysql.sql,v 1.4.6.25 2009/07/07 03:01:40 mrubinsk Exp $
121
122 CREATE DATABASE IF NOT EXISTS horde;
123
124 @@ -17,10 +17,8 @@
125 user_name VARCHAR(255) NOT NULL,
126 signup_date VARCHAR(255) NOT NULL,
127 signup_host VARCHAR(255) NOT NULL,
128 - signup_email VARCHAR(255) NOT NULL,
129 signup_data TEXT NOT NULL,
130 - UNIQUE KEY user_name (user_name),
131 - UNIQUE KEY signup_email (signup_email)
132 + PRIMARY KEY user_name (user_name)
133 );
134
135 CREATE TABLE IF NOT EXISTS horde_groups (
136 @@ -56,7 +54,7 @@
137 );
138
139 CREATE TABLE IF NOT EXISTS horde_datatree (
140 - datatree_id INT NOT NULL,
141 + datatree_id INT UNSIGNED NOT NULL,
142 group_uid VARCHAR(255) NOT NULL,
143 user_uid VARCHAR(255) NOT NULL,
144 datatree_name VARCHAR(255) NOT NULL,
145 @@ -69,7 +67,7 @@
146 );
147
148 CREATE TABLE IF NOT EXISTS horde_datatree_attributes (
149 - datatree_id INT NOT NULL,
150 + datatree_id INT UNSIGNED NOT NULL,
151 attribute_name VARCHAR(255) NOT NULL,
152 attribute_key VARCHAR(255) DEFAULT '' NOT NULL,
153 attribute_value TEXT
154 diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header
155 --- e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header 2009-10-08 14:01:50.000000000 -0500
156 +++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/registry.php/00header 2009-10-08 13:59:39.000000000 -0500
157 @@ -2,7 +2,7 @@
158 /**
159 * registry.php -- Horde application registry.
160 *
161 - * $Horde: horde/config/registry.php.dist,v 1.255.2.26 2008/07/07 12:17:08 jan Exp $
162 + * $Horde: horde/config/registry.php.dist,v 1.255.2.27 2009/07/24 08:58:06 jan Exp $
163 *
164 * This configuration file is used by Horde to determine which Horde
165 * applications are installed and where, as well as how they interact.

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