diff -u checkgmail-1.13/debian/patches/00list checkgmail-1.13/debian/patches/00list --- checkgmail-1.13/debian/patches/00list +++ checkgmail-1.13/debian/patches/00list @@ -1,0 +2 @@ +20_upstream-logon-fix diff -u checkgmail-1.13/debian/changelog checkgmail-1.13/debian/changelog --- checkgmail-1.13/debian/changelog +++ checkgmail-1.13/debian/changelog @@ -1,3 +1,11 @@ +checkgmail (1.13-1ubuntu1.1) hardy-proposed; urgency=low + + * debian/patches + - Added 20_upstream-logon-fix.dpatch + + Fix for new Gmail login method from upstream svn. (LP: #250053) + + -- Andrew Starr-Bochicchio Sun, 07 Sep 2008 00:04:11 -0400 + checkgmail (1.13-1ubuntu1) hardy; urgency=low * Merge from Debian unstable (LP: #185077). Remaining Ubuntu changes: only in patch2: unchanged: --- checkgmail-1.13.orig/debian/patches/20_upstream-logon-fix.dpatch +++ checkgmail-1.13/debian/patches/20_upstream-logon-fix.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_upstream-logon-fix.dpatch by Andrew Starr-Bochicchio +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix for new Gmail login method from upstream svn: +## DP: http://checkgmail.svn.sourceforge.net/viewvc/checkgmail?view=rev&revision=33 + +@DPATCH@ +diff -urNad checkgmail-1.13~/checkgmail checkgmail-1.13/checkgmail +--- checkgmail-1.13~/checkgmail 2008-01-17 01:30:23.000000000 -0500 ++++ checkgmail-1.13/checkgmail 2008-09-07 00:02:24.000000000 -0400 +@@ -716,7 +716,12 @@ + unless ($hosted) { + # Normal Gmail login action ... + $error = http_get("https://www.google.com/accounts/ServiceLoginAuth?ltmpl=yj_wsad<mplcache=2&continue=https%3A%2F%2Fmail.google.com%2Fmail%3F&service=mail&rm=false<mpl=yj_wsad&Email=$URI_user&Passwd=$URI_passwd&rmShown=1&null=Sign+in", "LOGIN"); +- # $cookie_jar->scan(\&scan_at); ++ ++ $cookie_jar->scan(\&scan_at); ++ unless ($error || !$gmail_sid || !$gmail_gausr) { ++ $error = http_get("https://mail.google.com/mail/?auth=$gmail_sid&gausr=$gmail_gausr", 'GET'); ++ } ++ + # $error = http_get("https://mail.google.com/mail?nsr=0&auth=$gmail_sid&gausr=$gmail_gausr", "LOGIN"); + + } else { +