Adam,
On Tue, Apr 15, 2014 at 09:25:11PM +0100, Adam D. Barratt wrote:
[...]
> Apologies for the huge delay in getting back to you regarding this.
> Please go ahead with the upload; thanks.
If you agree I'd like to fix 2 other bugs: #709240 and #714388
#709240 is fixed by a 2 lines patch (syntax error with Perl 5.14
present in Squeeze)
#714388 is fixed by adding a missing file
Attached is the debdiff.
Regards,
M.
--
Emmanuel Bouthenot
mail: kolter@{openics,debian}.org gpg: 4096R/0x929D42C3
xmpp: [email protected] irc: kolter@{freenode,oftc}
diff -Nru sympa-6.1.11~dfsg/debian/changelog sympa-6.1.11~dfsg/debian/changelog
--- sympa-6.1.11~dfsg/debian/changelog 2012-11-30 19:01:18.000000000 +0000
+++ sympa-6.1.11~dfsg/debian/changelog 2014-04-16 21:46:20.000000000 +0000
@@ -1,3 +1,15 @@
+sympa (6.1.11~dfsg-5+deb7u1) stable-proposed-updates; urgency=low
+
+ * Add a patch to raise a warning instead of an error when the CA
+ bundle file is not readable.
+ * Add a patch to fix CAS authentication issues (Closes: #720383)
+ * Fix SQLite upgrade patch to avoid errors with perl <= 5.14
+ (Closes: #709240)
+ * Add a patch to provide the missing template help_suspend.tt2
+ (Closes: #714388)
+
+ -- Emmanuel Bouthenot <[email protected]> Wed, 16 Apr 2014 21:45:53 +0000
+
sympa (6.1.11~dfsg-5) unstable; urgency=low
* Fix SQLite patch to avoid crash during installation from scratch and
diff -Nru sympa-6.1.11~dfsg/debian/patches/0001_fix_cas_authentication.patch
sympa-6.1.11~dfsg/debian/patches/0001_fix_cas_authentication.patch
--- sympa-6.1.11~dfsg/debian/patches/0001_fix_cas_authentication.patch
1970-01-01 00:00:00.000000000 +0000
+++ sympa-6.1.11~dfsg/debian/patches/0001_fix_cas_authentication.patch
2013-10-03 14:04:12.000000000 +0000
@@ -0,0 +1,18 @@
+Description: Fix CAS/LDAP authentication
+Author: F. Périchon
+Origin: upstream,
https://sourcesup.renater.fr/scm/viewvc.php?view=revision&root=sympa&revision=7917
+Bug-Debian: http://bug.debian.org/720383
+Last-Update: 2013-10-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/wwsympa/Auth.pm
++++ b/wwsympa/Auth.pm
+@@ -330,7 +330,7 @@
+ filter => $filter,
+ scope => $ldap->{'ldap_scope'},
+ timeout => $ldap->{'ldap_timeout'},
+- attrs => $ldap->{'ldap_email_attribute'}
++ attrs =>
[$ldap->{'ldap_email_attribute'}],
+ );
+ my $count = $emails->count();
+
diff -Nru sympa-6.1.11~dfsg/debian/patches/1011_fix_sqlite_db_upgrade
sympa-6.1.11~dfsg/debian/patches/1011_fix_sqlite_db_upgrade
--- sympa-6.1.11~dfsg/debian/patches/1011_fix_sqlite_db_upgrade 2012-11-30
16:32:19.000000000 +0000
+++ sympa-6.1.11~dfsg/debian/patches/1011_fix_sqlite_db_upgrade 2014-04-16
20:09:54.000000000 +0000
@@ -207,7 +207,7 @@
+ }
+ }
+ my $sqloldfields = join(", ",
@oldfields);
-+ my $sqlnewfieldstype = join(",
", map { "$_ $db_struct{$Conf::Conf{'db_type'}}{${t}}{$_}" } keys
$db_struct{$Conf::Conf{'db_type'}}{${t}});
++ my $sqlnewfieldstype = join(",
", map { "$_ $db_struct{$Conf::Conf{'db_type'}}{$t}{$_}" } keys
%{$db_struct{$Conf::Conf{'db_type'}}{$t}});
+
+ # SQLite doesn't support
changes on columns types hence we use a dirty workaround here:
+ # we create a temporary table
(a clone of the table containing the field to update)
@@ -246,8 +246,8 @@
+ &do_log('notice', $sqlcode);
+ $dbh->do($sqlcode);
+ # Update real structure
-+ foreach my $newfield (sort keys
$db_struct{$Conf::Conf{'db_type'}}{${t}}) {
-+
$real_struct{$t}{$newfield} =
$db_struct{$Conf::Conf{'db_type'}}{${t}}{$newfield};
++ foreach my $newfield (sort keys
%{$db_struct{$Conf::Conf{'db_type'}}{$t}}) {
++
$real_struct{$t}{$newfield} = $db_struct{$Conf::Conf{'db_type'}}{$t}{$newfield};
+ }
+ }
+ push @report, sprintf('Field %s in
table %s, structure updated', $f, $t);
diff -Nru
sympa-6.1.11~dfsg/debian/patches/2001_ca_bundle_check_as_warning.patch
sympa-6.1.11~dfsg/debian/patches/2001_ca_bundle_check_as_warning.patch
--- sympa-6.1.11~dfsg/debian/patches/2001_ca_bundle_check_as_warning.patch
1970-01-01 00:00:00.000000000 +0000
+++ sympa-6.1.11~dfsg/debian/patches/2001_ca_bundle_check_as_warning.patch
2013-10-03 13:48:51.000000000 +0000
@@ -0,0 +1,50 @@
+Description: Raise a warning instead of an error when the CA bundle file is
not readable.
+ For its internal usage (to make https request and verify smime mail
signatures) Sympa
+ needs access to the Certificates Authorities installed on the system.
+
+ Certificates Authorities are available in the package ca-certificates and
+ this package also provides a single file with all the CA concatenated.
+ The location of this file is /etc/ssl/certs/ca-certificates.crt
+
+ Sympa package provides a symlink from /usr/share/sympa/default/ca-bundle.crt
+ to /etc/ssl/certs/ca-certificates.crt
+
+ Recently, to fix bug #537051 the ca-certificates package maintainer has
+ decided to replace the CA bundle generation
+ (/etc/ssl/certs/ca-certificates.crt) in the postinst by a trigger.
+
+ During installation of Sympa, if ca-certificates is not present, it is
+ installed as a Sympa dependency but the sympa postinst will always be
+ executed before the ca-certificates triggers.
+ It means that Sympa start will fail with an error because
+ /etc/ssl/certs/ca-certificates.crt does not exists (not yet generated by the
+ ca-certificates trigger).
+
+ The following patch tries to detect if the CA bundle configured in sympa is a
+ symlink to /etc/ssl/certs/ca-certificates.crt. In that case, a warning raised
+ instead of en error.
+
+ This is a purely Debian specific fix, which is quite ugly but it works.
+
+ A better patch will be very much appreciated.
+Author: Emmanuel Bouthenot <[email protected]>
+Bug-Debian: http://bugs.debian.org/706965
+Forwarded: not-needed
+Last-Update: 2013-07-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/lib/Conf.pm
++++ b/src/lib/Conf.pm
+@@ -876,7 +876,11 @@
+
+ ## Check cafile and capath access
+ if (defined $Conf{'cafile'} && $Conf{'cafile'}) {
+- unless (-f $Conf{'cafile'} && -r $Conf{'cafile'}) {
++ my $debian_ca_bundle = '/etc/ssl/certs/ca-certificates.crt';
++ if (-l $Conf{'cafile'} && ! -r $Conf{'cafile'} &&
readlink($Conf{'cafile'}) == $debian_ca_bundle) {
++ &do_log('warning', 'cafile (%s) is a symlink to the Debian CA
certificates bundle (%s) which is not yet installed yet (see #706965)',
$Conf{'cafile'}, $debian_ca_bundle);
++ }
++ elsif (! -f $Conf{'cafile'} || ! -r $Conf{'cafile'}) {
+ &do_log('err', 'Cannot access cafile %s', $Conf{'cafile'});
+ unless (&List::send_notify_to_listmaster('cannot_access_cafile',
$Conf{'domain'}, [$Conf{'cafile'}])) {
+ &do_log('err', 'Unable to send notify "cannot access cafile" to
listmaster');
diff -Nru
sympa-6.1.11~dfsg/debian/patches/2008_add_missing_webtt2_helpsuspend.patch
sympa-6.1.11~dfsg/debian/patches/2008_add_missing_webtt2_helpsuspend.patch
--- sympa-6.1.11~dfsg/debian/patches/2008_add_missing_webtt2_helpsuspend.patch
1970-01-01 00:00:00.000000000 +0000
+++ sympa-6.1.11~dfsg/debian/patches/2008_add_missing_webtt2_helpsuspend.patch
2014-04-16 21:43:55.000000000 +0000
@@ -0,0 +1,48 @@
+Description: Add missing template help_suspend.tt2
+Author: Emmanuel Bouthenot <[email protected]>
+Bug-Debian: https://bugs.debian.org/714388
+Forwarded: not-needed
+Last-Update: 2014-04-16
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- /dev/null
++++ b/web_tt2/help_suspend.tt2
+@@ -0,0 +1,18 @@
++<!-- $Id$ -->
++
++<h3 class="block">[%|helploc%]Manage your subscriptions[%END%]</h2>
++
++ <h4>[%|helploc%]How does the suspension work?[%END%]</h3>
++ <p>[%|helploc%]In order to <strong>suspend your subscription</strong>
to one or more lists, follow these steps:[%END%]</p>
++ <ul>
++ <li>[%|helploc%]Select a start date through the calendar that
appears when you click on the "start date" field;[%END%]</li>
++ <li>[%|helploc%]if you wish, you can specify the date when
you want your subscription to resume. Do it using the "end date" field. You can
click on "indefinite." In this case, you will have to return to this page to
resume your subscription;[%END%]</li>
++ <li>[%|helploc%]Select the lists which you want to suspend
your subscription for. The "Toogle selection" button allows you to invert the
selection;[%END%]</li>
++ <li>[%|helploc%]Click on "Suspend my subscriptions" to
confirm the suspension.[%END%]</li>
++ </ul>
++ <p>[%|helploc%]<strong>To resume your subscription</strong> to one or
more lists, follow these steps:[%END%]</p>
++ <ul>
++ <li>[%|helploc%]Select the list(s) you want to reactivate.
The "Toogle selection" button allows you to invert the selection;[%END%]</li>
++ <li>[%|helploc%]Click "Resume".[%END%]</li>
++ </ul>
++<!-- end help_suspend.tt2 -->
+--- a/web_tt2/Makefile.am
++++ b/web_tt2/Makefile.am
+@@ -74,6 +74,7 @@
+ help_mail_commands.tt2 \
+ help_sendmsg.tt2 \
+ help_shared.tt2 \
++ help_suspend.tt2 \
+ help.tt2 \
+ help_user_options.tt2 \
+ help_user.tt2 \
+--- a/web_tt2/Makefile.in
++++ b/web_tt2/Makefile.in
+@@ -244,6 +244,7 @@
+ help_mail_commands.tt2 \
+ help_sendmsg.tt2 \
+ help_shared.tt2 \
++ help_suspend.tt2 \
+ help.tt2 \
+ help_user_options.tt2 \
+ help_user.tt2 \
diff -Nru sympa-6.1.11~dfsg/debian/patches/series
sympa-6.1.11~dfsg/debian/patches/series
--- sympa-6.1.11~dfsg/debian/patches/series 2012-05-21 12:23:32.000000000
+0000
+++ sympa-6.1.11~dfsg/debian/patches/series 2014-04-16 21:05:32.000000000
+0000
@@ -1,3 +1,4 @@
+0001_fix_cas_authentication.patch
1002_mysql_default_charset_engine.patch
1004_wizard_support_batch_and_display_mode.patch
1005_wizard_emit_cmd_and_newline_when_dying.patch
@@ -9,6 +10,7 @@
1012_fix_manpages_typos_and_whatis_entries.patch
1013_fix_wording_sympa_wizard_manpage.patch
1014_fix_unknown_parameter_ldap_force_canonical_email.patch
+2001_ca_bundle_check_as_warning.patch
2002_wizard_drop_localedir.patch
#2003_sanitize_make_all.patch
2004_pg_create_db.patch
@@ -16,3 +18,4 @@
#2991_sanitize_make_all.patch
2006_disable_cssupdated_email_on_update.patch
2007_fix_CVE-2012-2352.patch
+2008_add_missing_webtt2_helpsuspend.patch
