On Sat, Nov 16, 2013 at 10:55:50PM -0500, Mike Erdely wrote: > It updates GetLive to 3.0 and supports Outlook.com. > It includes two changes checked into the project CVS but aren't in the > release to fix login page changes on Outlook.com. > > ok?
And now a diff that doesn't remove ${LOCALBASE} from its patches. Index: Makefile =================================================================== RCS file: /cvs/ports/mail/p5-GetLive/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile 11 Mar 2013 11:23:52 -0000 1.14 +++ Makefile 18 Nov 2013 16:53:20 -0000 @@ -2,8 +2,8 @@ COMMENT= automatically fetch hotmail.com email -DISTNAME= GetLive_2_4 -PKGNAME= p5-GetLive-2.4 +DISTNAME= GetLive_3_0 +PKGNAME= p5-GetLive-3.0 PKG_ARCH= * CATEGORIES= mail perl5 EXTRACT_SUFX= .tgz @@ -18,7 +18,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE: RUN_DEPENDS= devel/p5-Net-Server \ net/curl>=7.15.5 \ mail/procmail \ - www/p5-URI + www/p5-HTML-Parser \ + www/p5-URI \ + www/p5-WWW-Mechanize-GZip \ + www/p5-libwww NO_BUILD= Yes NO_TEST= Yes Index: distinfo =================================================================== RCS file: /cvs/ports/mail/p5-GetLive/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 20 Sep 2011 13:43:37 -0000 1.7 +++ distinfo 18 Nov 2013 16:53:20 -0000 @@ -1,5 +1,2 @@ -MD5 (GetLive_2_4.tgz) = Ek4sX0pLHXsYi2BXr7hpfg== -RMD160 (GetLive_2_4.tgz) = uLNSaPrhFmNZWNDR4nfHgJC0Rg4= -SHA1 (GetLive_2_4.tgz) = wQC3zHR4mbNMFu3N6fabhNmsbkI= -SHA256 (GetLive_2_4.tgz) = Wk43+E8d9tmo8iGfU5Y2b6T9i8lYGruCtLUtxUSRYtI= -SIZE (GetLive_2_4.tgz) = 29524 +SHA256 (GetLive_3_0.tgz) = 2DPZamX49O8gkXyyheUBijY29MXvdYVk3yS4HEVwGTA= +SIZE (GetLive_3_0.tgz) = 27311 Index: patches/patch-GetLive_pl =================================================================== RCS file: /cvs/ports/mail/p5-GetLive/patches/patch-GetLive_pl,v retrieving revision 1.7 diff -u -p -r1.7 patch-GetLive_pl --- patches/patch-GetLive_pl 5 May 2011 13:37:04 -0000 1.7 +++ patches/patch-GetLive_pl 18 Nov 2013 16:53:20 -0000 @@ -1,9 +1,9 @@ -Diff from GetLive CVS to incorporate Hotmail site changes. +Diff from GetLive CVS to incorporate Outlook.com site changes. $OpenBSD: patch-GetLive_pl,v 1.7 2011/05/05 13:37:04 gsoares Exp $ ---- GetLive.pl.orig Mon May 2 14:49:46 2011 -+++ GetLive.pl Mon May 2 15:02:56 2011 -@@ -91,7 +91,7 @@ sub new { +--- GetLive.pl.orig Tue Apr 2 17:10:46 2013 ++++ GetLive.pl Sat Nov 16 22:27:39 2013 +@@ -92,7 +92,7 @@ sub new { $Self->{'Login'} = ""; $Self->{'Domain'} = "hotmail.com"; $Self->{'Password'} = ""; @@ -12,3 +12,34 @@ $OpenBSD: patch-GetLive_pl,v 1.7 2011/05 $Self->{'DownloadedIdsFile'} = ""; # Local file with Ids of already downloaded messages. $Self->{'MarkRead'} = "No"; # No,Yes : But never when downloaded before ! $Self->{'Delete'} = "No"; # No,Yes : But never when downloaded before ! +@@ -398,6 +398,8 @@ sub GetPage { + + $Self->Log("Response headers : \n" . $Response->headers_as_string(), MinVerbosity => 100); + ++ $Self->Log("Response content : \n" . $Response->content(), MinVerbosity => 100); ++ + return ($Response->content(),uri_unescape($Response->request->uri)); + } + +@@ -457,16 +459,15 @@ sub Login { + my $Domain = $Self->{'Domain'}; + my ($LoginUrl) = $LoginPageAsString =~ m{'(https://login.live.com/ppsecure/post.srf.*?)'}; + +- if ($LoginPageAsString !~ m/F:'(P.*?)'/s) { +- $Self->Log("Page doesn't contain PPSX in the expected place.\n",stderr => 1); +- return 0; ++ if ($LoginPageAsString !~ m/[F|AP]:'(P.*?)'/s) { ++ $PostData{"PPSX"} = "Pass"; ++ } else { ++ $Self->Log("PPSX detected as '$1'.\n", MinVerbosity => 10 ); ++ $PostData{"PPSX"} = $1; + } + + # End of Michael Kelly patch. + +- $Self->Log("PPSX detected as '$1'.\n", MinVerbosity => 10 ); +- $PostData{"PPSX"} = $1; +- + # PPFT is a normal (ie non JS) hidden input type. + if( $LoginPageAsString !~ m/<\s*input\s+.*name=\"PPFT\"(\s+id="\S+")?\s+value=\"(\S*)\"/ ) { + Self->Log("Page doesn't contain input field PPFT as expected.\n",stderr => 1); Index: patches/patch-Manual =================================================================== RCS file: /cvs/ports/mail/p5-GetLive/patches/patch-Manual,v retrieving revision 1.4 diff -u -p -r1.4 patch-Manual --- patches/patch-Manual 21 Jul 2010 02:21:52 -0000 1.4 +++ patches/patch-Manual 18 Nov 2013 16:53:20 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Manual,v 1.4 2010/07/21 02:21:52 merdely Exp $ ---- Manual.orig Tue Jul 20 22:15:44 2010 -+++ Manual Tue Jul 20 22:16:11 2010 -@@ -51,7 +51,7 @@ Following are the possible options : +--- Manual.orig Tue Apr 2 17:10:46 2013 ++++ Manual Sat Nov 16 22:22:20 2013 +@@ -44,7 +44,7 @@ Following are the possible options : web page via curl (the webpage fetcher behind the scenes) CurlBin = CommandForCurl ('curl -k' by default).