From 731bee596d700e756b42706dbd004b9360d618d8 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sat, 30 Jun 2012 21:27:53 +0000
Subject: [PATCH] more fixes from Net::SMTP::TLS::ButMaintained (via Mikolaj
 Kucharski, thanks).

---
 net/p5-Net-SMTP-TLS/Makefile                      |  4 ++--
 .../patches/patch-lib_Net_SMTP_TLS_pm             | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/net/p5-Net-SMTP-TLS/Makefile b/net/p5-Net-SMTP-TLS/Makefile
index dcee22dd6ab..350f67b3bf4 100644
--- a/net/p5-Net-SMTP-TLS/Makefile
+++ b/net/p5-Net-SMTP-TLS/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2011/12/14 14:58:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2012/06/30 21:27:53 sthen Exp $
 
 COMMENT=	Perl module for SMTP with TLS/AUTH support
 
 MODULES=	cpan
 DISTNAME=	Net-SMTP-TLS-0.12
-REVISION=	1
+REVISION=	2
 CATEGORIES=	net mail
 
 # perl
diff --git a/net/p5-Net-SMTP-TLS/patches/patch-lib_Net_SMTP_TLS_pm b/net/p5-Net-SMTP-TLS/patches/patch-lib_Net_SMTP_TLS_pm
index 83f3575f2bf..54209347d16 100644
--- a/net/p5-Net-SMTP-TLS/patches/patch-lib_Net_SMTP_TLS_pm
+++ b/net/p5-Net-SMTP-TLS/patches/patch-lib_Net_SMTP_TLS_pm
@@ -1,9 +1,9 @@
-$OpenBSD: patch-lib_Net_SMTP_TLS_pm,v 1.1 2011/12/14 14:58:57 sthen Exp $
+$OpenBSD: patch-lib_Net_SMTP_TLS_pm,v 1.2 2012/06/30 21:27:53 sthen Exp $
 
-Add fixes from Net::SMTP::TLS::ButMaintained 0.18
+Add fixes from Net::SMTP::TLS::ButMaintained 0.18 and 0.19
 
 --- lib/Net/SMTP/TLS.pm.orig	Tue Jan 17 14:36:34 2006
-+++ lib/Net/SMTP/TLS.pm	Wed Dec 14 14:57:11 2011
++++ lib/Net/SMTP/TLS.pm	Sat Jun 30 19:45:08 2012
 @@ -115,10 +115,14 @@ sub new {
  	
  	my $me	= bless \%args, $pkg;
@@ -20,6 +20,15 @@ Add fixes from Net::SMTP::TLS::ButMaintained 0.18
  	$me->hello(); # the first hello, 2nd after starttls
  	$me->starttls() if not $args{NoTLS}; # why we're here, after all
  	$me->login() if($me->{User} and $me->{Password});
+@@ -179,7 +183,7 @@ sub starttls {
+ 		croak "Invalid response for STARTTLS: $num $txt\n";
+ 	}
+ 	if(not IO::Socket::SSL::socket_to_SSL($me->{sock},
+-		SSL_version	=>	"SSLv3 TLSv1")){
++		SSL_version	=>	"TLSv1")){
+ 			croak "Couldn't start TLS: ".IO::Socket::SSL::errstr."\n";
+ 	}
+ 	$me->hello();
 @@ -251,7 +255,7 @@ sub auth_PLAIN{
  	my $me	= shift;
  	my $user= $me->{User};