diff --git a/core/tools/pkg/fosiki/debian/patches/00list b/core/tools/pkg/fosiki/debian/patches/00list index b658e8a77e..83665b33f2 100644 --- a/core/tools/pkg/fosiki/debian/patches/00list +++ b/core/tools/pkg/fosiki/debian/patches/00list @@ -1,2 +1,2 @@ configure_backup.dpatch -configure_dont_install.dpatch +Item12382-ssl-email-failure.dpatch diff --git a/core/tools/pkg/fosiki/debian/patches/Item12382-ssl-email-failure.dpatch b/core/tools/pkg/fosiki/debian/patches/Item12382-ssl-email-failure.dpatch new file mode 100755 index 0000000000..9b16f5ff50 --- /dev/null +++ b/core/tools/pkg/fosiki/debian/patches/Item12382-ssl-email-failure.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## Item12382-ssl-email-failure.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' foswiki-1.1.7~/lib/Foswiki/Net.pm foswiki-1.1.7/lib/Foswiki/Net.pm +--- foswiki-1.1.7~/lib/Foswiki/Net.pm 2013-02-01 11:52:05.000000000 +1000 ++++ foswiki-1.1.7/lib/Foswiki/Net.pm 2013-02-12 10:37:23.000000000 +1000 +@@ -591,8 +591,8 @@ + if ( $this->{MAIL_METHOD} eq 'Net::SMTP::SSL' ) { + + package Foswiki::Net::Mail; +- our @ISA = @Net::SMTP::ISA; +- ++ our @ISA; ++ @ISA = @Net::SMTP::ISA unless defined @ISA; + @Net::SMTP::ISA = __PACKAGE__; + + sub new { diff --git a/core/tools/pkg/fosiki/debian/patches/configure_backup.dpatch b/core/tools/pkg/fosiki/debian/patches/configure_backup.dpatch deleted file mode 100755 index 855d12a414..0000000000 --- a/core/tools/pkg/fosiki/debian/patches/configure_backup.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## configure_backup.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' foswiki-1.1.6~/lib/Foswiki/Configure/FoswikiCfg.pm foswiki-1.1.6/lib/Foswiki/Configure/FoswikiCfg.pm ---- foswiki-1.1.6~/lib/Foswiki/Configure/FoswikiCfg.pm 2012-12-12 13:49:29.000000000 +1000 -+++ foswiki-1.1.6/lib/Foswiki/Configure/FoswikiCfg.pm 2012-12-12 13:50:15.000000000 +1000 -@@ -446,7 +446,7 @@ - chown $uid, $gid, $backup; - } - else { -- die "Unable to open $lsc.$n for write: $!\n"; -+ print STDERR "Unable to open $lsc.$n for write: $!\n"; - } - umask($um); - last;