Skip to content

Commit

Permalink
Item12389: update patches for 1.1.7
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/branches/Release01x01@16529 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
SvenDowideit authored and SvenDowideit committed Feb 12, 2013
1 parent 512a145 commit b635990
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion core/tools/pkg/fosiki/debian/patches/00list
@@ -1,2 +1,2 @@
configure_backup.dpatch
configure_dont_install.dpatch
Item12382-ssl-email-failure.dpatch
@@ -0,0 +1,21 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## Item12382-ssl-email-failure.dpatch by <root@>
##
## 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 {
19 changes: 0 additions & 19 deletions core/tools/pkg/fosiki/debian/patches/configure_backup.dpatch

This file was deleted.

0 comments on commit b635990

Please sign in to comment.