[Pkg-sympa-commits] [sympa] 03/30: Refresh patches (most patches merged upstream)
Emmanuel Bouthenot
kolter at moszumanska.debian.org
Mon Sep 19 20:08:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
kolter pushed a commit to branch master
in repository sympa.
commit 4d57a9d53b73a1d00f3b143a0755e3815e8ef4d3
Author: Emmanuel Bouthenot <kolter at openics.org>
Date: Sun Jun 26 16:45:30 2016 +0200
Refresh patches (most patches merged upstream)
---
.../1002_mysql_default_charset_engine.patch | 120 ---------------------
...004_wizard_support_batch_and_display_mode.patch | 85 ---------------
...05_wizard_emit_cmd_and_newline_when_dying.patch | 54 ----------
..._wizard_probe_currently_supported_locales.patch | 4 +-
debian/patches/1011_fix_sqlite_support | 15 ---
debian/patches/1012_fix_manpages_issues.patch | 81 --------------
debian/patches/1015_locales_fallback.path | 17 ---
debian/patches/1016_fix_ldap_ssl | 77 -------------
.../2006_disable_cssupdated_email_on_update.patch | 22 ----
debian/patches/series | 8 --
10 files changed, 2 insertions(+), 481 deletions(-)
diff --git a/debian/patches/1002_mysql_default_charset_engine.patch b/debian/patches/1002_mysql_default_charset_engine.patch
deleted file mode 100644
index 94208fb..0000000
--- a/debian/patches/1002_mysql_default_charset_engine.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-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: 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 DEFAULT CHARSET=utf8;
-
- ## Connect to DB
- \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;
-
-
- -- --------------------------------------------------------
-@@ -193,7 +193,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;
-
-
- -- --------------------------------------------------------
-@@ -223,7 +223,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;
-
-
- -- --------------------------------------------------------
-@@ -243,4 +243,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/1004_wizard_support_batch_and_display_mode.patch b/debian/patches/1004_wizard_support_batch_and_display_mode.patch
deleted file mode 100644
index e8b66ec..0000000
--- a/debian/patches/1004_wizard_support_batch_and_display_mode.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: add batch and display modes to sympa_wizard.pl
-Author: Stefan Hornburg (Racke) <racke at linuxia.de>
-Last-Update: 2010-01-19
---- a/src/sympa_wizard.pl.in
-+++ b/src/sympa_wizard.pl.in
-@@ -82,10 +82,22 @@
- \%options,
- 'target=s',
- 'create=s',
-+ 'batch',
-+ 'display',
- 'check',
- 'help'
- );
-
-+my %user_param;
-+for (@ARGV) {
-+ # check for key/values settings
-+ if (/^([\w]+)+=(.+)/) {
-+ $user_param{$1} = $2;
-+ } else {
-+ die "Invalid commandline argument: $_";
-+ }
-+}
-+
- if ($options{help}) {
- pod2usage();
- } elsif ($options{create}) {
-@@ -175,6 +187,30 @@
- die("Unable to load sympa config file $sympa_conf");
- }
-
-+ if ($options{display}) {
-+ my ($var, $disp);
-+
-+ print "[SYMPA]\n";
-+ for (sort (keys (%Conf::Conf))) {
-+ $var = $Conf::Conf{$_};
-+
-+ if (ref($var) eq 'ARRAY') {
-+ $disp = join(',', @$var);
-+ } else {
-+ $disp = $var;
-+ }
-+
-+ print qq{$_="$disp"
-+ };
-+ }
-+ print "[WWSYMPA]\n";
-+ for (sort (keys (%$wwsconf))) {
-+ print qq{$_="$wwsconf->{$_}"
-+ };
-+ }
-+ exit 0;
-+ }
-+
- my (@new_wwsympa_conf, @new_sympa_conf);
-
- ## Edition mode
-@@ -183,7 +219,9 @@
-
- if ($param->{'title'}) {
- my $title = $param->{'title'};
-- printf "\n\n** $title **\n";
-+ unless ($options{batch}) {
-+ printf "\n\n** $title **\n";
-+ }
-
- ## write to conf file
- push @new_wwsympa_conf,
-@@ -208,7 +246,13 @@
- next;
- }
- my $new_value;
-- if ($param->{'edit'} eq '1') {
-+ if ($options{batch}) {
-+ if (exists $user_param{$name}) {
-+ $new_value = $user_param{$name};
-+ } else {
-+ $new_value = '';
-+ }
-+ } elsif ($param->{'edit'} eq '1') {
- printf "... $advice\n" unless ($advice eq '') ;
- printf "$name: $query \[$current_value\] : ";
- $new_value = <STDIN> ;
diff --git a/debian/patches/1005_wizard_emit_cmd_and_newline_when_dying.patch b/debian/patches/1005_wizard_emit_cmd_and_newline_when_dying.patch
deleted file mode 100644
index f8d6cb2..0000000
--- a/debian/patches/1005_wizard_emit_cmd_and_newline_when_dying.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: emit command name and newline when dying in sympa_wizard.pl
-Author: Stefan Hornburg (Racke) <racke at linuxia.de>
-Last-Update: 2011-05-07
---- a/src/sympa_wizard.pl.in
-+++ b/src/sympa_wizard.pl.in
-@@ -94,7 +94,7 @@
- if (/^([\w]+)+=(.+)/) {
- $user_param{$1} = $2;
- } else {
-- die "Invalid commandline argument: $_";
-+ die "$0: Invalid commandline argument: $_";
- }
- }
-
-@@ -129,7 +129,7 @@
- }
-
- unless (open (NEWF,"> $conf")){
-- die "Unable to open $conf : $!";
-+ die "$0: Unable to open $conf : $!";
- };
-
- if ($options{create} eq 'sympa.conf') {
-@@ -179,12 +179,12 @@
-
- ## Load config
- unless ($wwsconf = wwslib::load_config($wwsympa_conf)) {
-- die("Unable to load config file $wwsympa_conf");
-+ die("$0: Unable to load config file $wwsympa_conf");
- }
-
- ## Load sympa config (but not using database)
- unless (Conf::load( $sympa_conf,'nodb')) {
-- die("Unable to load sympa config file $sympa_conf");
-+ die("$0: Unable to load sympa config file $sympa_conf");
- }
-
- if ($options{display}) {
-@@ -319,13 +319,13 @@
-
- ## Write new config files
- unless (open (WWSYMPA,"> $wwsympa_conf")){
-- die "unable to open $wwsympa_conf : $!";
-+ die "$0: unable to open $wwsympa_conf : $!";
- };
-
- my $umask = umask 037;
- unless (open (SYMPA,"> $sympa_conf")){
- umask $umask;
-- die "unable to open $sympa_conf : $!";
-+ die "$0: unable to open $sympa_conf : $!";
- };
- umask $umask;
- chown [getpwnam(Sympa::Constants::USER)]->[2], [getgrnam(Sympa::Constants::GROUP)]->[2], $sympa_conf;
diff --git a/debian/patches/1007_wizard_probe_currently_supported_locales.patch b/debian/patches/1007_wizard_probe_currently_supported_locales.patch
index cd5a696..f4501ba 100644
--- a/debian/patches/1007_wizard_probe_currently_supported_locales.patch
+++ b/debian/patches/1007_wizard_probe_currently_supported_locales.patch
@@ -3,7 +3,7 @@ Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Last-Update: 2010-01-19
--- a/src/sympa_wizard.pl.in
+++ b/src/sympa_wizard.pl.in
-@@ -141,6 +141,8 @@
+@@ -143,6 +143,8 @@
#EOF
}
@@ -12,7 +12,7 @@ Last-Update: 2010-01-19
foreach my $param (@confdef::params) {
if ($param->{'title'}) {
-@@ -779,3 +781,46 @@
+@@ -781,3 +783,46 @@
$ENV{'LANG'} = $lang if (defined $lang);
}
diff --git a/debian/patches/1011_fix_sqlite_support b/debian/patches/1011_fix_sqlite_support
deleted file mode 100644
index 19da712..0000000
--- a/debian/patches/1011_fix_sqlite_support
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix SQLite DB schema upgrade
-Author: Emmanuel Bouthenot <kolter at debian.org>
-Bug-Debian: http://bugs.debian.org/642464
-Last-Update: 2013-06-15
---- a/src/etc/script/create_db.SQLite
-+++ b/src/etc/script/create_db.SQLite
-@@ -112,7 +112,7 @@
- status_list text,
- subject_list text,
- topics_list text,
-- web_archive_list integer,
-+ web_archive_list numeric,
- PRIMARY KEY (name_list, robot_list)
- );
-
diff --git a/debian/patches/1012_fix_manpages_issues.patch b/debian/patches/1012_fix_manpages_issues.patch
deleted file mode 100644
index c059260..0000000
--- a/debian/patches/1012_fix_manpages_issues.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Description: Fix typos and bad whatis entries in manpages
-Author: Emmanuel Bouthenot <kolter at debian.org>
-Last-Update: 2012-05-10
---- a/doc/man8/alias_manager.pod.in
-+++ b/doc/man8/alias_manager.pod.in
-@@ -1,3 +1,5 @@
-+=encoding utf8
-+
- =head1 NAME
-
- alias_manager, alias_manager.pl - manage Sympa aliases
---- a/doc/man8/archived.pod.in
-+++ b/doc/man8/archived.pod.in
-@@ -1,3 +1,5 @@
-+=encoding utf8
-+
- =head1 NAME
-
- archived, archived.pl - Mailing List Archiving Daemon for WWSympa
-@@ -40,7 +42,7 @@
-
- F<--spooldir--/outgoing/> outgoing Sympa directory.
-
--F<--defaultdir--/mhonarc-ressources> mhonarc ressource file
-+F<--defaultdir--/mhonarc-ressources> mhonarc resource file
-
- F<--WWSCONFIG--> WWSympa configuration file.
-
---- a/doc/man8/bounced.pod.in
-+++ b/doc/man8/bounced.pod.in
-@@ -1,3 +1,5 @@
-+=encoding utf8
-+
- =head1 NAME
-
- bounced, bounced.pl - Mailing List Bounce Processing Daemon for WWSympa
---- a/doc/man8/sympa.pod.in
-+++ b/doc/man8/sympa.pod.in
-@@ -1,3 +1,5 @@
-+=encoding utf8
-+
- =head1 NAME
-
- sympa, sympa.pl - A Modern Mailing List Manager
---- a/src/sympa_wizard.pl.in
-+++ b/src/sympa_wizard.pl.in
-@@ -21,27 +21,29 @@
- # You should have received a copy of the GNU General Public License
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-+=encoding utf8
-+
- =head1 NAME
-
--sympa_wizard.pl - help perform sympa initial setup
-+sympa_wizard, sympa_wizard.pl - help perform sympa initial setup
-
- =head1 SYNOPSIS
-
- =over
-
--=item sympa_wizard.pl
-+=item sympa_wizard
-
- Edit current sympa configuration
-
--=item sympa_wizard.pl [--target file] --create <sympa.conf|wwsympa.conf>
-+=item sympa_wizard [--target file] --create <sympa.conf|wwsympa.conf>
-
- Creates a new sympa or wwsympa configuration file
-
--=item sympa_wizard.pl --check
-+=item sympa_wizard --check
-
- check CPAN modules needed for running sympa
-
--=item sympa_wizard.pl --help
-+=item sympa_wizard --help
-
- Display usage instructions
-
diff --git a/debian/patches/1015_locales_fallback.path b/debian/patches/1015_locales_fallback.path
deleted file mode 100644
index cb397fb..0000000
--- a/debian/patches/1015_locales_fallback.path
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Make possible to fallback on C locale when no other locales are available.
-Author: Emmanuel Bouthenot <kolter at debian.org>
-Last-Update: 2013-06-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/lib/Language.pm
-+++ b/src/lib/Language.pm
-@@ -174,7 +174,8 @@
- $locale.'.UTF-8', ## UpperCase required for FreeBSD
- $locale_dashless, ## Required on HPUX
- $locale,
-- $lang
-+ $lang,
-+ 'C',
- ) {
- if (&setlocale($type, $try)) {
- $success = 1;
diff --git a/debian/patches/1016_fix_ldap_ssl b/debian/patches/1016_fix_ldap_ssl
deleted file mode 100644
index 4672e3f..0000000
--- a/debian/patches/1016_fix_ldap_ssl
+++ /dev/null
@@ -1,77 +0,0 @@
-Description: Improve SSL/TLS support (patch backported from 6.2 branch)
- - Fix LDAP support to use tlsv1 instead of tls
- - Globally support TLSv1.1 and TLSv1.2
-Origin: https://sourcesup.renater.fr/scm/viewvc.php?view=rev&root=sympa&revision=11980
-Bug-Debian: https://bugs.debian.org/783595
-Forwarded: not-needed
-Last-Update: 2015-07-31
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/lib/List.pm
-+++ b/src/lib/List.pm
-@@ -877,7 +877,8 @@
- 'gettext_id' => 'use SSL (LDAPS)',
- 'order' => 2.5,
- },
-- 'ssl_version' => {'format' => ['sslv2','sslv3','tls'],
-+ 'ssl_version' => {'format' => ['sslv2','sslv3','tlsv1','tlsv1_1','tlsv1_2'],
-+ 'synonym' => {'tls' => 'tlsv1'},
- 'default' => 'sslv3',
- 'gettext_id' => 'SSL version',
- 'order' => 2.5,
-@@ -1001,8 +1002,9 @@
- 'gettext_id' => 'use SSL (LDAPS)',
- 'order' => 2.5,
- },
-- 'ssl_version' => {'format' => ['sslv2','sslv3','tls'],
-- 'default' => '',
-+ 'ssl_version' => {'format' => ['sslv2','sslv3','tlsv1','tlsv1_1','tlsv1_2'],
-+ 'synonym' => {'tls' => 'tlsv1'},
-+ 'default' => 'sslv3',
- 'gettext_id' => 'SSL version',
- 'order' => 2.5,
- },
-@@ -1577,9 +1579,11 @@
- 'no' => {'gettext_id' => 'no'},
-
- # include_ldap_2level_query.ssl_version, include_ldap_query.ssl_version
-- 'sslv2' => {'gettext_id' => 'SSL version 2'},
-- 'sslv3' => {'gettext_id' => 'SSL version 3'},
-- 'tls' => {'gettext_id' => 'TLS'},
-+ 'sslv2' => {'gettext_id' => 'SSL version 2'},
-+ 'sslv3' => {'gettext_id' => 'SSL version 3'},
-+ 'tlsv1' => {'gettext_id' => 'TLS version 1'},
-+ 'tlsv1_1' => {'gettext_id' => 'TLS version 1.1'},
-+ 'tlsv1_2' => {'gettext_id' => 'TLS version 1.2'},
-
- # editor.reception, owner_include.reception, owner.reception,
- # editor_include.reception
---- a/src/lib/Conf.pm
-+++ b/src/lib/Conf.pm
-@@ -1141,7 +1141,7 @@
- 'scope' => 'base|one|sub',
- 'authentication_info_url' => 'http(s)?:/.*',
- 'use_ssl' => '1',
-- 'ssl_version' => 'sslv2/3|sslv2|sslv3|tlsv1',
-+ 'ssl_version' => 'sslv2/3|sslv2|sslv3|tlsv1|tlsv1_1|tlsv1_2',
- 'ssl_ciphers' => '[\w:]+' },
-
- 'user_table' => {'regexp' => '.*',
-@@ -1165,7 +1165,7 @@
- 'ldap_get_email_by_uid_filter' => '.+',
- 'ldap_email_attribute' => '\w+',
- 'ldap_use_ssl' => '1',
-- 'ldap_ssl_version' => 'sslv2/3|sslv2|sslv3|tlsv1',
-+ 'ldap_ssl_version' => 'sslv2/3|sslv2|sslv3|tlsv1|tlsv1_1|tlsv1_2',
- 'ldap_ssl_ciphers' => '[\w:]+'
- },
- 'generic_sso' => {'service_name' => '.+',
-@@ -1184,7 +1184,7 @@
- 'ldap_get_email_by_uid_filter' => '.+',
- 'ldap_email_attribute' => '\w+',
- 'ldap_use_ssl' => '1',
-- 'ldap_ssl_version' => 'sslv2/3|sslv2|sslv3|tlsv1',
-+ 'ldap_ssl_version' => 'sslv2/3|sslv2|sslv3|tlsv1|tlsv1_1|tlsv1_2',
- 'ldap_ssl_ciphers' => '[\w:]+',
- 'force_email_verify' => '1',
- 'internal_email_by_netid' => '1',
diff --git a/debian/patches/2006_disable_cssupdated_email_on_update.patch b/debian/patches/2006_disable_cssupdated_email_on_update.patch
deleted file mode 100644
index d9ed21a..0000000
--- a/debian/patches/2006_disable_cssupdated_email_on_update.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Disable email notification 'css updated' on each upgrade
-Author: Emmanuel Bouthenot <kolter at debian.org>
-Forwarded: no
-Bug: https://sourcesup.cru.fr/tracker/index.php?func=detail&aid=8057&group_id=23&atid=170
-Bug-Debian: http://bugs.debian.org/601662
-Last-Update: 2012-05-19
---- a/src/lib/Conf.pm
-+++ b/src/lib/Conf.pm
-@@ -1087,10 +1087,10 @@
- }
- }
- }
-- if ($css_updated) {
-+ #if ($css_updated) {
- ## Notify main listmaster
-- &List::send_notify_to_listmaster('css_updated', $Conf{'host'}, ["Static CSS files have been updated ; check log file for details"]);
-- }
-+ #&List::send_notify_to_listmaster('css_updated', $Conf{'host'}, ["Static CSS files have been updated ; check log file for details"]);
-+ #}
-
-
- return undef if ($config_err);
diff --git a/debian/patches/series b/debian/patches/series
index a4a04fe..2568978 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,2 @@
-1002_mysql_default_charset_engine.patch
-1004_wizard_support_batch_and_display_mode.patch
-1005_wizard_emit_cmd_and_newline_when_dying.patch
1007_wizard_probe_currently_supported_locales.patch
-1011_fix_sqlite_support
-1012_fix_manpages_issues.patch
-1015_locales_fallback.path
-1016_fix_ldap_ssl
2001_ca_bundle_check_as_warning.patch
-2006_disable_cssupdated_email_on_update.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/sympa.git
More information about the Pkg-sympa-commits
mailing list