[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, master, updated. debian/6.1.7_dfsg-2-21-gc52a261
Emmanuel Bouthenot
kolter at openics.org
Fri May 11 00:20:08 UTC 2012
The following commit has been merged in the master branch:
commit 1080c425e9e99536c0430e373c9d6c193bf3ca3d
Author: Emmanuel Bouthenot <kolter at openics.org>
Date: Thu May 10 19:20:00 2012 +0000
Refresh patches
diff --git a/debian/patches/1001_sympa.pl_add_prepare_db_option.patch b/debian/patches/1001_sympa.pl_add_prepare_db_option.patch
index d9b9ac8..a3077b1 100644
--- a/debian/patches/1001_sympa.pl_add_prepare_db_option.patch
+++ b/debian/patches/1001_sympa.pl_add_prepare_db_option.patch
@@ -3,24 +3,24 @@ Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Last-Update: 2010-01-19
--- a/src/sympa.pl.in
+++ b/src/sympa.pl.in
-@@ -80,6 +80,7 @@
- -k, --keepcopy=dir : keep a copy of incoming message
- -l, --lang=LANG : use a language catalog for Sympa
- -m, --mail : log calls to sendmail
+@@ -86,6 +86,7 @@
+ --lowercase : lowercase email addresses in database
+ --sync_list_db [--list=listname] : syncs filesystem list configs to the database cache of list configs, optionally sync an individual list if specified.
+ --md5_encode_password : rewrite password in database using md5 fingerprint. YOU CAN'T UNDO unless you save this table first
+ --prepare_db : prepares database
- --service=process_command|process_message|process_creation : process dedicated to messages distribution, commands or to automatic lists creation (default three of them)
- --dump=list\@dom|ALL : dumps subscribers
- --make_alias_file : create file in /tmp with all aliases (usefull when aliases.tpl is changed)
-@@ -126,7 +127,7 @@
+ --create_list --robot=robot_name --input_file=/path/to/file.xml
+ : create a list with the xml file under robot_name
+ --instantiate_family=family_name --robot=robot_name --input_file=/path/to/file.xml [--close_unknown] [--quiet]
+@@ -127,7 +128,7 @@
my %options;
unless (&GetOptions(\%main::options, 'dump=s', 'debug|d', ,'log_level=s','foreground', 'service=s','config|f=s',
- 'lang|l=s', 'mail|m', 'keepcopy|k=s', 'help', 'version', 'import=s','make_alias_file','lowercase','md5_encode_password',
+ 'lang|l=s', 'mail|m', 'keepcopy|k=s', 'help', 'version', 'import=s','make_alias_file','lowercase','sync_list_db','md5_encode_password',
- 'close_list=s','rename_list=s','new_listname=s','new_listrobot=s','purge_list=s','create_list','instantiate_family=s','robot=s','add_list=s','modify_list=s','close_family=s','md5_digest=s',
-+ 'close_list=s','rename_list=s','new_listname=s','new_listrobot=s','purge_list=s','prepare_db','create_list','instantiate_family=s','robot=s','add_list=s','modify_list=s','close_family=s','md5_digest=s',
++ 'close_list=s','rename_list=s','new_listname=s','new_listrobot=s','purge_list=s', 'prepare_db', 'create_list','instantiate_family=s','robot=s','add_list=s','modify_list=s','close_family=s','md5_digest=s',
'input_file=s','sync_include=s','upgrade','upgrade_shared','from=s','to=s','reload_list_config','list=s','quiet','close_unknown','test_database_message_buffer','conf_2_db')) {
&fatal_err("Unknown options.");
}
-@@ -144,6 +145,7 @@
+@@ -145,6 +146,7 @@
$main::options{'md5_encode_password'} ||
$main::options{'close_list'} ||
$main::options{'purge_list'} ||
@@ -28,12 +28,12 @@ Last-Update: 2010-01-19
$main::options{'create_list'} ||
$main::options{'rename_list'} ||
$main::options{'instantiate_family'} ||
-@@ -207,6 +209,10 @@
+@@ -209,6 +211,10 @@
}
+if ($main::options{'prepare_db'}) {
-+ exit 0;
++ exit 0;
+}
+
## Apply defaults to %List::pinfo
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 af79c1c..27fb6c0 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
-@@ -883,6 +883,13 @@
+@@ -888,6 +888,13 @@
edit => '1',
},
{
@@ -17,7 +17,7 @@ Last-Update: 2010-01-19
name => 'title',
default => 'Mailing lists service',
query => 'Title of main web page',
-@@ -899,6 +906,12 @@
+@@ -904,6 +911,12 @@
edit => '1',
},
{
diff --git a/debian/patches/1010_db_port.patch b/debian/patches/1010_db_port.patch
index 5f491d3..c79d664 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
-@@ -813,9 +813,10 @@
+@@ -818,9 +818,10 @@
},
{
name => 'db_port',
diff --git a/debian/patches/1011_fix_sqlite_db_upgrade b/debian/patches/1011_fix_sqlite_db_upgrade
index f77dcbb..adbeede 100644
--- a/debian/patches/1011_fix_sqlite_db_upgrade
+++ b/debian/patches/1011_fix_sqlite_db_upgrade
@@ -6,7 +6,7 @@ Bug-Debian: http://bugs.debian.org/642464
Last-Update: 2011-11-19
--- a/src/lib/Upgrade.pm
+++ b/src/lib/Upgrade.pm
-@@ -884,7 +884,7 @@
+@@ -902,7 +902,7 @@
'bounce_score_subscriber' => 'integer',
'bounce_address_subscriber' => 'text',
'custom_attribute_subscriber' => 'text',
@@ -15,7 +15,7 @@ Last-Update: 2011-11-19
'suspend_start_date_subscriber' => 'integer',
'suspend_end_date_subscriber' => 'integer'},
'admin_table' => {'list_admin' => 'text',
-@@ -956,11 +956,11 @@
+@@ -974,11 +974,11 @@
'messageid_bulkspool' => 'text',
'message_bulkspool' => 'text',
'lock_bulkspool' => 'integer',
@@ -31,4 +31,4 @@ Last-Update: 2011-11-19
+ 'dkim_header_list_bulkspool' => 'text'},
'conf_table' => {'robot_conf' => 'text',
'label_conf' => 'text',
- 'value_conf' => 'text'}});
+ 'value_conf' => 'text'},
--
sympa Debian packaging
More information about the Pkg-sympa-commits
mailing list