[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, master, updated. debian/6.1.11_dfsg-5-12-gc847c76
Emmanuel Bouthenot
kolter at openics.org
Sun Jul 21 17:47:32 UTC 2013
The following commit has been merged in the master branch:
commit b15577a227bfa707d8260dd9e10d9d2b9a7bc5f3
Author: Emmanuel Bouthenot <kolter at openics.org>
Date: Sat Jun 15 08:45:59 2013 +0000
Refresh patches
diff --git a/debian/patches/1002_mysql_default_charset_engine.patch b/debian/patches/1002_mysql_default_charset_engine.patch
index 0b1737e..2411aa6 100644
--- a/debian/patches/1002_mysql_default_charset_engine.patch
+++ b/debian/patches/1002_mysql_default_charset_engine.patch
@@ -2,110 +2,119 @@ Description: Add default charset and engine to MySQL schema
Forwarded: https://sourcesup.cru.fr/tracker/index.php?func=detail&aid=7828
Author: Emmanuel Bouthenot <kolter at debian.org>
Bug-Debian: http://bugs.debian.org/574646
-Last-Update: 2011-05-29
+Last-Update: 2013-06-15
--- a/src/etc/script/create_db.mysql
+++ b/src/etc/script/create_db.mysql
@@ -1,6 +1,6 @@
## MySQL Database creation script
-CREATE DATABASE sympa;
-+CREATE DATABASE sympa ENGINE=MyISAM DEFAULT CHARSET=utf8;
++CREATE DATABASE sympa DEFAULT CHARSET=utf8;
## Connect to DB
- \r sympa
-@@ -17,7 +17,7 @@
- attributes_user text,
- data_user text,
- PRIMARY KEY (email_user)
--);
-+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE subscriber_table (
- list_subscriber varchar (50) NOT NULL,
-@@ -41,7 +41,7 @@
- suspend_end_date_subscriber int(11),
- PRIMARY KEY (robot_subscriber, list_subscriber, user_subscriber),
- INDEX user_index (user_subscriber)
--);
-+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE admin_table (
- list_admin varchar(50) NOT NULL,
-@@ -60,7 +60,7 @@
- profile_admin enum('privileged','normal'),
- PRIMARY KEY (robot_admin, list_admin, role_admin, user_admin),
- INDEX user_index (user_admin)
--);
-+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE exclusion_table (
- list_exclusion varchar(50) NOT NULL,
-@@ -68,7 +68,7 @@
- date_exclusion int(11),
- PRIMARY KEY (list_exclusion, user_exclusion),
- INDEX user_index (user_exclusion)
--);
-+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE netidmap_table (
- netid_netidmap varchar (100) NOT NULL,
-@@ -76,7 +76,7 @@
- robot_netidmap varchar (80) NOT NULL,
- email_netidmap varchar (100),
- PRIMARY KEY (netid_netidmap, serviceid_netidmap, robot_netidmap)
--);
-+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE logs_table (
- id_logs bigint(20) NOT NULL,
-@@ -93,7 +93,7 @@
- client_logs varchar(100),
- daemon_logs varchar(10) NOT NULL,
- PRIMARY KEY (id_logs)
--);
-+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
- CREATE TABLE session_table (
-@@ -106,7 +106,7 @@
- hit_session int(11),
- data_session text,
- PRIMARY KEY (id_session)
--);
-+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE one_time_ticket_table (
- ticket_one_time_ticket varchar(30),
-@@ -117,7 +117,7 @@
- remote_addr_one_time_ticket varchar(60),
- status_one_time_ticket varchar(60),
- PRIMARY KEY (ticket_one_time_ticket)
--);
-+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
- CREATE TABLE bulkmailer_table (
- messagekey_bulkmailer varchar(80) NOT NULL,
-@@ -135,7 +135,7 @@
- delivery_date_bulkmailer int(11),
- lock_bulkmailer varchar(30) default NULL,
- PRIMARY KEY (messagekey_bulkmailer,packetid_bulkmailer)
--);
-+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
- CREATE TABLE `bulkspool_table` (
-@@ -149,7 +149,7 @@
- `dkim_d_bulkspool` varchar(50) default NULL COMMENT 'The DKIM signature "d=" tag',
- `dkim_header_list_bulkspool` varchar(500) default NULL COMMENT 'The list of header part of the signed datas',
- PRIMARY KEY (`messagekey_bulkspool`)
--);
-+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
- CREATE TABLE conf_table (
-@@ -157,4 +157,4 @@
- label_conf varchar(80) default NULL,
- value_conf varchar(300) default NULL,
- PRIMARY KEY (robot_conf,label_conf)
--);
-+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+ \r sympa
+@@ -28,7 +28,7 @@
+ visibility_admin varchar(20),
+ PRIMARY KEY (robot_admin, list_admin, role_admin, user_admin),
+ INDEX admin_user_index ( user_admin )
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
+
+
+ -- --------------------------------------------------------
+@@ -52,7 +52,7 @@
+ robot_bulkmailer varchar(80),
+ verp_bulkmailer int(1),
+ PRIMARY KEY (messagekey_bulkmailer, packetid_bulkmailer)
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
+
+
+ -- --------------------------------------------------------
+@@ -70,7 +70,7 @@
+ messageid_bulkspool varchar(200),
+ messagekey_bulkspool varchar(33) NOT NULL,
+ PRIMARY KEY (messagekey_bulkspool)
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
+
+
+ -- --------------------------------------------------------
+@@ -83,7 +83,7 @@
+ robot_conf varchar(80),
+ value_conf varchar(300),
+ PRIMARY KEY (robot_conf, label_conf)
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
+
+
+ -- --------------------------------------------------------
+@@ -98,7 +98,7 @@
+ robot_exclusion varchar(50) NOT NULL,
+ user_exclusion varchar(100) NOT NULL,
+ PRIMARY KEY (list_exclusion, user_exclusion, robot_exclusion)
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
+
+
+ -- --------------------------------------------------------
+@@ -119,7 +119,7 @@
+ topics_list varchar(100),
+ web_archive_list tinyint(1),
+ PRIMARY KEY (name_list, robot_list)
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
+
+
+ -- --------------------------------------------------------
+@@ -142,7 +142,7 @@
+ target_email_logs varchar(100),
+ user_email_logs varchar(100),
+ PRIMARY KEY (id_logs)
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
+
+
+ -- --------------------------------------------------------
+@@ -156,7 +156,7 @@
+ robot_netidmap varchar(80) NOT NULL,
+ serviceid_netidmap varchar(100) NOT NULL,
+ PRIMARY KEY (netid_netidmap, serviceid_netidmap, robot_netidmap)
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
+
+
+ -- --------------------------------------------------------
+@@ -173,7 +173,7 @@
+ status_one_time_ticket varchar(60),
+ ticket_one_time_ticket varchar(30),
+ PRIMARY KEY (ticket_one_time_ticket)
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
+
+
+ -- --------------------------------------------------------
+@@ -191,7 +191,7 @@
+ robot_session varchar(80),
+ start_date_session int(11) NOT NULL,
+ PRIMARY KEY (id_session)
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
+
+
+ -- --------------------------------------------------------
+@@ -221,7 +221,7 @@
+ visibility_subscriber varchar(20),
+ PRIMARY KEY (robot_subscriber, list_subscriber, user_subscriber),
+ INDEX subscriber_user_index ( user_subscriber )
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
+
+
+ -- --------------------------------------------------------
+@@ -241,4 +241,4 @@
+ password_user varchar(40),
+ wrong_login_count_user int(11),
+ PRIMARY KEY (email_user)
+- ) DEFAULT CHARACTER SET utf8;
++ ) ENGINE=MyISAM DEFAULT CHARACTER SET utf8;
diff --git a/debian/patches/1006_wizard_add_soap_url_and_archive_default_index.patch b/debian/patches/1006_wizard_add_soap_url_and_archive_default_index.patch
index 27fb6c0..df88720 100644
--- a/debian/patches/1006_wizard_add_soap_url_and_archive_default_index.patch
+++ b/debian/patches/1006_wizard_add_soap_url_and_archive_default_index.patch
@@ -3,7 +3,7 @@ Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Last-Update: 2010-01-19
--- a/src/lib/confdef.pm
+++ b/src/lib/confdef.pm
-@@ -888,6 +888,13 @@
+@@ -901,6 +901,13 @@
edit => '1',
},
{
@@ -17,7 +17,7 @@ Last-Update: 2010-01-19
name => 'title',
default => 'Mailing lists service',
query => 'Title of main web page',
-@@ -904,6 +911,12 @@
+@@ -917,6 +924,12 @@
edit => '1',
},
{
diff --git a/debian/patches/1010_db_port.patch b/debian/patches/1010_db_port.patch
index c79d664..40fe925 100644
--- a/debian/patches/1010_db_port.patch
+++ b/debian/patches/1010_db_port.patch
@@ -3,7 +3,7 @@ Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Last-Update: 2010-04-11
--- a/src/lib/confdef.pm
+++ b/src/lib/confdef.pm
-@@ -818,9 +818,10 @@
+@@ -831,9 +831,10 @@
},
{
name => 'db_port',
diff --git a/debian/patches/1011_fix_sqlite_db_upgrade b/debian/patches/1011_fix_sqlite_db_upgrade
index b191fa1..62fad47 100644
--- a/debian/patches/1011_fix_sqlite_db_upgrade
+++ b/debian/patches/1011_fix_sqlite_db_upgrade
@@ -1,103 +1,10 @@
Description: Fix SQLite DB schema upgrade
-Author: Marcin Deranek <marcin.deranek at slonko.net>
-Origin: other, https://sourcesup.cru.fr/tracker/download.php/23/167/7571/1004/sympa-6.1.sqlite.patch
-Bug: https://sourcesup.cru.fr/tracker/?group_id=23&atid=167&func=detail&aid=7571
+Author: Emmanuel Bouthenot <kolter at debian.org>
Bug-Debian: http://bugs.debian.org/642464
-Last-Update: 2011-11-19
+Last-Update: 2013-06-15
--- a/src/lib/Upgrade.pm
+++ b/src/lib/Upgrade.pm
-@@ -902,7 +902,7 @@
- 'bounce_score_subscriber' => 'integer',
- 'bounce_address_subscriber' => 'text',
- 'custom_attribute_subscriber' => 'text',
-- 'suspend_subscriber' => "boolean",
-+ 'suspend_subscriber' => 'numeric',
- 'suspend_start_date_subscriber' => 'integer',
- 'suspend_end_date_subscriber' => 'integer'},
- 'admin_table' => {'list_admin' => 'text',
-@@ -963,8 +963,8 @@
- 'returnpath_bulkmailer' => 'text',
- 'robot_bulkmailer' => 'text',
- 'listname_bulkmailer' => 'text',
-- 'verp_bulkmailer' => 'integer',
-- 'merge_bulkmailer' => 'integer',
-+ 'verp_bulkmailer' => 'numeric',
-+ 'merge_bulkmailer' => 'numeric',
- 'priority_message_bulkmailer' => 'integer',
- 'priority_packet_bulkmailer' => 'integer',
- 'reception_date_bulkmailer' => 'integer',
-@@ -973,26 +973,26 @@
- 'bulkspool_table' => {'messagekey_bulkspool' => 'text',
- 'messageid_bulkspool' => 'text',
- 'message_bulkspool' => 'text',
-- 'lock_bulkspool' => 'integer',
-- 'dkim_privatekey_bulkspool' => 'varchar(1000)',
-- 'dkim_selector_bulkspool' => 'varchar(50)',
-- 'dkim_d_bulkspool' => 'varchar(50)',
-- 'dkim_i_bulkspool' => 'varchar(100)',
-- 'dkim_header_list_bulkspool' => 'varchar(500)'},
-+ 'lock_bulkspool' => 'numeric',
-+ 'dkim_privatekey_bulkspool' => 'text',
-+ 'dkim_selector_bulkspool' => 'text',
-+ 'dkim_d_bulkspool' => 'text',
-+ 'dkim_i_bulkspool' => 'text',
-+ 'dkim_header_list_bulkspool' => 'text'},
- 'conf_table' => {'robot_conf' => 'text',
- 'label_conf' => 'text',
- 'value_conf' => 'text'},
-- 'list_table' => {'name_list'=>'varchar(100)',
-- 'path_list'=>'varchar(100)',
-- 'robot_list'=>'varchar(100)',
-- 'status_list'=>"enum('open','closed','pending','error_config','family_closed')",
-- 'creation_email_list'=>'varchar(100)',
-- 'creation_epoch_list'=>'datetime',
-- 'subject_list'=>'varchar(100)',
-- 'web_archive_list'=>'tinyint(1)',
-- 'topics_list'=>'varchar(100)',
-- 'editors_list'=>'varchar(100)',
-- 'owners_list'=>'varchar(100)'}
-+ 'list_table' => {'name_list' => 'text',
-+ 'path_list' => 'text',
-+ 'robot_list' => 'text',
-+ 'status_list' => 'text',
-+ 'creation_email_list' => 'text',
-+ 'creation_epoch_list' => 'numeric',
-+ 'subject_list' => 'text',
-+ 'web_archive_list' => 'integer',
-+ 'topics_list' => 'text',
-+ 'editors_list' => 'text',
-+ 'owners_list' => 'text'}
- });
-
- my %not_null = ('email_user' => 1,
-@@ -1005,7 +1005,6 @@
- 'user_admin' => 1,
- 'role_admin' => 1,
- 'date_admin' => 1,
-- 'list_exclusion' => 1,
- 'user_exclusion' => 1,
- 'robot_exclusion' => 1,
- 'netid_netidmap' => 1,
-@@ -1022,16 +1021,8 @@
- 'messagekey_bulkmailer' => 1,
- 'packetid_bulkmailer' => 1,
- 'messagekey_bulkspool' => 1,
-- 'name_list'=>1,
-- 'path_list'=>1,
-- 'robot_list'=>1,
-- 'status_list'=>1,
-- 'creation_email_list'=>1,
-- 'subject_list'=>1,
-- 'web_archive_list'=>1,
-- 'topics_list'=>1,
-- 'owners_list'=>1,
-- 'editors_list'=>1
-+ 'name_list'=>1,
-+ 'robot_list'=>1,
- );
-
- my %primary = ('user_table' => ['email_user'],
-@@ -1158,7 +1149,27 @@
+@@ -1149,7 +1149,27 @@
$t =~ s/^"main"\.//; # needed for SQLite 3
$t =~ s/^.*\"([^"]+)\"$/$1/;
}
@@ -126,19 +33,7 @@ Last-Update: 2011-11-19
foreach my $t (@tables) {
next unless (defined $db_struct{$Conf::Conf{'db_type'}}{$t});
-@@ -1265,7 +1276,10 @@
- my $options;
- ## To prevent "Cannot add a NOT NULL column with default value NULL" errors
- if ($not_null{$f}) {
-- $options .= 'NOT NULL';
-+ $options .= 'NOT NULL';
-+ if ($Conf::Conf{'db_type'} eq 'SQLite') {
-+ $options .= ' DEFAULT ""';
-+ }
- }
-
- unless ($dbh->do("ALTER TABLE $t ADD $f $db_struct{$Conf::Conf{'db_type'}}{$t}{$f} $options")) {
-@@ -1278,6 +1292,7 @@
+@@ -1270,6 +1290,7 @@
&do_log('info', 'Field %s added to table %s', $f, $t);
$added_fields{$f} = 1;
@@ -146,7 +41,7 @@ Last-Update: 2011-11-19
## Remove temporary DB field
if ($real_struct{$t}{'temporary'}) {
unless ($dbh->do("ALTER TABLE $t DROP temporary")) {
-@@ -1285,43 +1300,93 @@
+@@ -1277,43 +1298,93 @@
}
delete $real_struct{$t}{'temporary'};
}
@@ -167,14 +62,6 @@ Last-Update: 2011-11-19
- my $options;
- if ($not_null{$f}) {
- $options .= 'NOT NULL';
-- }
--
-- push @report, sprintf("ALTER TABLE $t CHANGE $f $f $db_struct{$Conf::Conf{'db_type'}}{$t}{$f} $options");
-- &do_log('notice', "ALTER TABLE $t CHANGE $f $f $db_struct{$Conf::Conf{'db_type'}}{$t}{$f} $options");
-- unless ($dbh->do("ALTER TABLE $t CHANGE $f $f $db_struct{$Conf::Conf{'db_type'}}{$t}{$f} $options")) {
-- &do_log('err', 'Could not change field \'%s\' in table\'%s\'.', $f, $t);
-- &do_log('err', 'Sympa\'s database structure may have change since last update ; please check RELEASE_NOTES');
-- return undef;
+ if ($Conf::Conf{'update_db_field_types'} eq 'auto') {
+ if (grep $_ eq $Conf::Conf{'db_type'}, qw(SQLite mysql)) {
+ unless (&check_db_field_type(effective_format => $real_struct{$t}{$f},
@@ -255,6 +142,14 @@ Last-Update: 2011-11-19
+ }
}
-
+- push @report, sprintf("ALTER TABLE $t CHANGE $f $f $db_struct{$Conf::Conf{'db_type'}}{$t}{$f} $options");
+- &do_log('notice', "ALTER TABLE $t CHANGE $f $f $db_struct{$Conf::Conf{'db_type'}}{$t}{$f} $options");
+- unless ($dbh->do("ALTER TABLE $t CHANGE $f $f $db_struct{$Conf::Conf{'db_type'}}{$t}{$f} $options")) {
+- &do_log('err', 'Could not change field \'%s\' in table\'%s\'.', $f, $t);
+- &do_log('err', 'Sympa\'s database structure may have change since last update ; please check RELEASE_NOTES');
+- return undef;
+- }
+-
- push @report, sprintf('Field %s in table %s, structure updated', $f, $t);
- &do_log('info', 'Field %s in table %s, structure updated', $f, $t);
- }
@@ -270,7 +165,7 @@ Last-Update: 2011-11-19
if ($Conf::Conf{'db_type'} eq 'mysql') {
## Check that primary key has the right structure.
my $should_update;
-@@ -1460,7 +1525,7 @@
+@@ -1452,7 +1523,7 @@
## drop previous index
my $success;
foreach my $field (@{$primary{$t}}) {
@@ -279,7 +174,7 @@ Last-Update: 2011-11-19
next;
}
$success = 1; last;
-@@ -1474,7 +1539,7 @@
+@@ -1466,7 +1537,7 @@
}
## Add INDEX
@@ -288,171 +183,3 @@ Last-Update: 2011-11-19
&do_log('err', 'Could not set INDEX on field \'%s\', table\'%s\'.', $fields, $t);
return undef;
}
---- a/src/etc/script/create_db.SQLite
-+++ b/src/etc/script/create_db.SQLite
-@@ -18,51 +18,50 @@
- user_subscriber text NOT NULL,
- custom_attribute_subscriber text,
- robot_subscriber text NOT NULL,
-- date_subscriber timestamp NOT NULL,
-- update_subscriber timestamp,
-+ date_subscriber numeric NOT NULL,
-+ update_subscriber numeric,
- visibility_subscriber text,
- reception_subscriber text,
- topics_subscriber text,
- bounce_subscriber text,
- bounce_address_subscriber text,
- comment_subscriber text,
-- subscribed_subscriber boolean,
-- included_subscriber boolean,
-+ subscribed_subscriber numeric,
-+ included_subscriber numeric,
- include_sources_subscriber text,
- bounce_score_subscriber integer,
-- suspend_subscriber boolean,
-+ suspend_subscriber numeric,
- suspend_start_date_subscriber integer,
- suspend_end_date_subscriber integer,
- PRIMARY KEY (robot_subscriber, list_subscriber, user_subscriber)
- );
--CREATE INDEX subscriber_idx ON subscriber_table (user_subscriber,list_subscriber,robot_subscriber);
-
- CREATE TABLE admin_table (
- list_admin text NOT NULL,
- user_admin text NOT NULL,
- robot_admin text NOT NULL,
- role_admin text NOT NULL,
-- date_admin timestamp NOT NULL,
-- update_admin timestamp,
-+ date_admin numeric NOT NULL,
-+ update_admin numeric,
- reception_admin text,
- visibility_admin text,
- comment_admin text,
-- subscribed_admin boolean,
-- included_admin boolean,
-+ subscribed_admin numeric,
-+ included_admin numeric,
- include_sources_admin text,
- info_admin text,
- profile_admin text,
- PRIMARY KEY (robot_admin, list_admin, role_admin, user_admin)
- );
--CREATE INDEX admin_idx ON admin_table(list_admin, user_admin, robot_admin, role_admin);
-+CREATE INDEX admin_user_index ON admin_table ( user_admin );
-
- CREATE TABLE exclusion_table (
-- list_exclusion text,
-- user_exclusion text,
-+ list_exclusion text NOT NULL,
-+ user_exclusion text NOT NULL,
-+ robot_exclusion text NOT NULL,
- date_exclusion integer,
-- PRIMARY KEY (list_exclusion, user_exclusion)
-+ PRIMARY KEY (list_exclusion, user_exclusion, robot_exclusion)
- );
--CREATE INDEX exclusion_idx ON exclusion_table(list_exclusion, user_exclusion);
-
- CREATE TABLE netidmap_table (
- netid_netidmap text NOT NULL,
-@@ -89,7 +88,6 @@
- daemon_logs text NOT NULL,
- PRIMARY KEY (id_logs)
- );
--CREATE INDEX logs_idx ON logs_table(id_logs);
-
- CREATE TABLE session_table (
- id_session text NOT NULL,
-@@ -102,10 +100,9 @@
- data_session text,
- PRIMARY KEY (id_session)
- );
--CREATE INDEX session_idx ON session_table(id_session);
-
- CREATE TABLE one_time_ticket_table (
-- ticket_one_time_ticket text NOT NULL,
-+ ticket_one_time_ticket text,
- robot_one_time_ticket text,
- email_one_time_ticket text,
- date_one_time_ticket integer,
-@@ -114,45 +111,56 @@
- status_one_time_ticket text,
- PRIMARY KEY (ticket_one_time_ticket)
- );
--CREATE INDEX one_time_ticket_idx ON one_time_ticket_table(ticket_one_time_ticket);
-
- CREATE TABLE bulkmailer_table(
-- messagekey_bulkmailer varchar(80) NOT NULL,
-- packetid_bulkmailer varchar(33) NOT NULL,
-- messageid_bulkmailer varchar(100),
-+ messagekey_bulkmailer text NOT NULL,
-+ packetid_bulkmailer text NOT NULL,
-+ messageid_bulkmailer text,
- receipients_bulkmailer text,
-- returnpath_bulkmailer varchar(100),
-- robot_bulkmailer varchar(80),
-- listname_bulkmailer varchar(50),
-- verp_bulkmailer integer,
-- merge_bulkmailer integer,
-+ returnpath_bulkmailer text,
-+ robot_bulkmailer text,
-+ listname_bulkmailer text,
-+ verp_bulkmailer numeric,
-+ merge_bulkmailer numeric,
- priority_message_bulkmailer integer,
- priority_packet_bulkmailer integer,
- reception_date_bulkmailer integer,
- delivery_date_bulkmailer integer,
-- lock_bulkmailer varchar(30),
-+ lock_bulkmailer text,
- PRIMARY KEY (messagekey_bulkmailer, packetid_bulkmailer)
- );
--CREATE INDEX bulkmailer_idx ON bulkmailer_table(messagekey_bulkmailer,packetid_bulkmailer);
-
- CREATE TABLE bulkspool_table (
-- messagekey_bulkspool varchar(33) NOT NULL,
-- messageid_bulkspool varchar(100),
-+ messagekey_bulkspool text NOT NULL,
-+ messageid_bulkspool text,
- message_bulkspool text,
-- lock_bulkspool integer,
-- dkim_privatekey_bulkspool varchar(100),
-- dkim_selector_bulkspool varchar(50),
-- dkim_d_bulkspool varchar(50),
-- dkim_i_bulkspool varchar(50),
-+ lock_bulkspool numeric,
-+ dkim_privatekey_bulkspool text,
-+ dkim_selector_bulkspool text,
-+ dkim_d_bulkspool text,
-+ dkim_i_bulkspool text,
- dkim_header_list_bulkspool varchar(500),
- PRIMARY KEY (messagekey_bulkspool)
- );
--CREATE INDEX bulkspool_idx ON bulkspool_table(messagekey_bulkspool);
-
- CREATE TABLE conf_table (
-- robot_conf text DEFAULT NULL,
-- label_conf text DEFAULT NULL,
-- value_conf text DEFAULT NULL,
-+ robot_conf text,
-+ label_conf text,
-+ value_conf text,
- PRIMARY KEY (robot_conf,label_conf)
- );
--CREATE INDEX conf_idx ON conf_table(robot_conf,label_conf);
-+
-+CREATE TABLE list_table (
-+ creation_email_list text,
-+ creation_epoch_list numeric,
-+ editors_list text,
-+ name_list text NOT NULL,
-+ owners_list text,
-+ path_list text,
-+ robot_list text NOT NULL,
-+ status_list text,
-+ subject_list text,
-+ topics_list text,
-+ web_archive_list integer,
-+ PRIMARY KEY (name_list, robot_list)
-+);
diff --git a/debian/patches/2004_pg_create_db.patch b/debian/patches/2004_pg_create_db.patch
index bafec80..bb77903 100644
--- a/debian/patches/2004_pg_create_db.patch
+++ b/debian/patches/2004_pg_create_db.patch
@@ -1,97 +1,16 @@
Description: PostgreSQL Database creation script improvements.
-Author: Stefan Hornburg (Racke) <racke at linuxia.de>
-Last-Update: 2010-04-12
+Author: Emmanuel Bouthenot <kolter at debian.org>
+Last-Update: 2013-06-15
--- a/src/etc/script/create_db.Pg
+++ b/src/etc/script/create_db.Pg
-@@ -1,11 +1,5 @@
- -- PostgreSQL Database creation script
+@@ -1,10 +1,5 @@
+ -- POSTGRESQL Database creation script
-CREATE DATABASE sympa;
-
--- Connect to DB
--\connect sympa
+-\connect sympa
-
--DROP TABLE user_table;
- CREATE TABLE user_table (
- email_user varchar (100) NOT NULL,
- gecos_user varchar (150),
-@@ -20,7 +14,6 @@
- CONSTRAINT ind_user PRIMARY KEY (email_user)
- );
--DROP TABLE subscriber_table;
- CREATE TABLE subscriber_table (
- list_subscriber varchar (50) NOT NULL,
- user_subscriber varchar (100) NOT NULL,
-@@ -47,7 +40,6 @@
- CREATE INDEX subscriber_idx2 ON subscriber_table (user_subscriber);
-
-
--DROP TABLE admin_table;
- CREATE TABLE admin_table (
- list_admin varchar(50) NOT NULL,
- user_admin varchar(100) NOT NULL,
-@@ -68,7 +60,6 @@
- CREATE INDEX admin_idx ON admin_table(robot_admin, list_admin, role_admin, user_admin);
- CREATE INDEX admin_idx2 ON admin_table(user_admin);
-
--DROP TABLE exclusion_table;
- CREATE TABLE exclusion_table (
- list_exclusion varchar(50),
- user_exclusion varchar(100),
-@@ -77,7 +68,6 @@
- );
- CREATE INDEX exclusion_idx ON exclusion_table(list_exclusion, user_exclusion);
-
--DROP TABLE netidmap_table;
- CREATE TABLE netidmap_table (
- netid_netidmap varchar (100) NOT NULL,
- serviceid_netidmap varchar (100) NOT NULL,
-@@ -87,7 +77,6 @@
- );
- CREATE INDEX netidmap_idx ON netidmap_table(netid_netidmap, serviceid_netidmap, robot_netidmap);
-
--DROP TABLE logs_table;
- CREATE TABLE logs_table (
- id_logs bigint NOT NULL,
- date_logs int4 NOT NULL,
-@@ -106,7 +95,6 @@
- );
- CREATE INDEX logs_idx ON logs_table(id_logs);
-
--DROP TABLE session_table;
- CREATE TABLE session_table (
- id_session int8 NOT NULL,
- start_date_session int4 NOT NULL,
-@@ -121,7 +109,6 @@
- CREATE INDEX session_idx ON session_table(id_session);
-
-
--DROP TABLE one_time_ticket_table;
- CREATE TABLE one_time_ticket_table (
- ticket_one_time_ticket varchar(30),
- robot_one_time_ticket varchar(80),
-@@ -134,7 +121,6 @@
- );
- CREATE INDEX one_time_ticket_idx ON one_time_ticket_table(ticket_one_time_ticket);
-
--DROP TABLE bulkmailer_table;
- CREATE TABLE bulkmailer_table(
- messagekey_bulkmailer varchar(80),
- packetid_bulkmailer varchar(33),
-@@ -155,7 +141,6 @@
- CREATE INDEX messagekey_bulkmailer_idx ON bulkmailer_table(messagekey_bulkmailer);
- CREATE INDEX packetid_bulkmailer_idx ON bulkmailer_table(packetid_bulkmailer);
-
--DROP TABLE bulkspool_table;
- CREATE TABLE bulkspool_table (
- messagekey_bulkspool varchar(33),
- messageid_bulkspool varchar(100),
-@@ -170,7 +155,6 @@
- );
- CREATE INDEX messagekey_bulkspool_idx ON bulkspool_table(messagekey_bulkspool);
-
--DROP TABLE conf_table;
- CREATE TABLE conf_table (
- robot_conf varchar(80),
- label_conf varchar(80),
+ -- --------------------------------------------------------
+ --
diff --git a/debian/patches/2006_disable_cssupdated_email_on_update.patch b/debian/patches/2006_disable_cssupdated_email_on_update.patch
index 9ad4d40..8c6503e 100644
--- a/debian/patches/2006_disable_cssupdated_email_on_update.patch
+++ b/debian/patches/2006_disable_cssupdated_email_on_update.patch
@@ -6,7 +6,7 @@ Bug-Debian: http://bugs.debian.org/601662
Last-Update: 2012-05-19
--- a/src/lib/Conf.pm
+++ b/src/lib/Conf.pm
-@@ -1004,10 +1004,10 @@
+@@ -1048,10 +1048,10 @@
}
}
}
diff --git a/debian/patches/2007_fix_CVE-2012-2352.patch b/debian/patches/2007_fix_CVE-2012-2352.patch
deleted file mode 100644
index f9e431a..0000000
--- a/debian/patches/2007_fix_CVE-2012-2352.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Properly fix CVE-2012-2352
-Author: Emmanuel Bouthenot <kolter at debian.org>
-Bug-Debian: http://bugs.debian.org/672893
-Last-Update: 2012-05-20
---- a/wwsympa/wwsympa.fcgi.in
-+++ b/wwsympa/wwsympa.fcgi.in
-@@ -573,7 +573,9 @@
- ## Defines the required privileges to access privileged actions
- ## You can define a set ofequiivalent privileges in the ARRAYREF
- my %required_privileges = ('admin' => ['owner','editor'],
-+ 'arc_delete' => ['owner'],
- 'arc_download' => ['owner'],
-+ 'arc_manage' => ['owner'],
- 'blacklist' => ['owner','editor'],
- 'close_list' => ['privileged_owner'],
- 'close_list_request' => ['privileged_owner'],
-@@ -2240,6 +2242,7 @@
- &wwslog('info',"missing parameter '$arg_name'");
- &web_db_log({'status' => 'error',
- 'error_type' => 'missing_parameter'});
-+ delete $param->{'list'};
- return undef;
- }
- }
-@@ -2261,6 +2264,7 @@
- &wwslog('info','authorization failed, insufficient privileges');
- &web_db_log({'status' => 'error',
- 'error_type' => 'authorization'});
-+ delete $param->{'list'};
- return undef;
- }
- }
diff --git a/debian/patches/series b/debian/patches/series
index 7e00a1e..4dc01bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,9 +10,8 @@
1013_fix_wording_sympa_wizard_manpage.patch
1014_fix_unknown_parameter_ldap_force_canonical_email.patch
2002_wizard_drop_localedir.patch
-#2003_sanitize_make_all.patch
2004_pg_create_db.patch
+#2003_sanitize_make_all.patch
2005_disable_build_non_dfsg_po_files.patch
#2991_sanitize_make_all.patch
2006_disable_cssupdated_email_on_update.patch
-2007_fix_CVE-2012-2352.patch
--
sympa Debian packaging
More information about the Pkg-sympa-commits
mailing list