[gwibber/f19] fix twitter auth issues by forcing https (bz1067533)

[Tom Callaway]

commit 1946181ff599b38a99dd301df40bb766bb6fe44e
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Mar 25 11:57:46 2014 -0400

    fix twitter auth issues by forcing https (bz1067533)

 gwibber-3.4.2-twitter-https.patch |   33 +++++++++++++++++++++++++++++++++
 gwibber.spec                      |    9 ++++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/gwibber-3.4.2-twitter-https.patch b/gwibber-3.4.2-twitter-https.patch
new file mode 100644
index 0000000..657fd66
--- /dev/null
+++ b/gwibber-3.4.2-twitter-https.patch
@@ -0,0 +1,33 @@
+diff -up gwibber-3.4.2/gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py.https gwibber-3.4.2/gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py
+--- gwibber-3.4.2/gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py.https	2014-03-25 11:49:23.094079937 -0400
++++ gwibber-3.4.2/gwibber/microblog/plugins/twitter/gtk/twitter/__init__.py	2014-03-25 11:49:45.510927930 -0400
+@@ -75,7 +75,7 @@ class AccountWidget(Gtk.VBox):
+     tokendata = urllib2.urlopen(request.http_url, request.to_postdata()).read()
+     self.token = oauth.OAuthToken.from_string(tokendata)
+ 
+-    url = "http://api.twitter.com/oauth/authorize?oauth_token=" + self.token.key
++    url = "https://api.twitter.com/oauth/authorize?oauth_token=" + self.token.key
+ 
+     web.load_uri(url)
+     web.connect("title-changed", self.on_twitter_auth_title_change)
+@@ -141,7 +141,7 @@ class AccountWidget(Gtk.VBox):
+       apireq = oauth.OAuthRequest.from_consumer_and_token(
+         self.consumer, atok,
+         http_method="GET",
+-        http_url="http://api.twitter.com/1.1/account/verify_credentials.json", parameters=None)
++        http_url="https://api.twitter.com/1.1/account/verify_credentials.json", parameters=None)
+ 
+       apireq.sign_request(sigmeth, self.consumer, atok)
+ 
+diff -up gwibber-3.4.2/gwibber/microblog/plugins/twitter/__init__.py.https gwibber-3.4.2/gwibber/microblog/plugins/twitter/__init__.py
+--- gwibber-3.4.2/gwibber/microblog/plugins/twitter/__init__.py.https	2014-03-25 11:48:16.194533594 -0400
++++ gwibber-3.4.2/gwibber/microblog/plugins/twitter/__init__.py	2014-03-25 11:49:13.052148031 -0400
+@@ -401,7 +401,7 @@ class Client ():
+     else: return []
+ 
+   def _search(self, **args):
+-    data = network.Download("http://search.twitter.com/search.json", util.compact(args))
++    data = network.Download("https://search.twitter.com/search.json", util.compact(args))
+     data = data.get_json()["results"]
+ 
+     if type(data) != list:
diff --git a/gwibber.spec b/gwibber.spec
index b3a0bbf..31fcf01 100644
--- a/gwibber.spec
+++ b/gwibber.spec
@@ -2,7 +2,7 @@
 
 Name:           gwibber
 Version:        3.4.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Epoch:          1
 Summary:        An open source microblogging client for GNOME developed with Python and GTK
 Group:          Applications/Internet
@@ -78,6 +78,9 @@ Patch62:	gwibber-3.4.2-scroll-events.patch
 # Drop support for "identi.ca" (it's dead, Jim)
 Patch63:	gwibber-3.4.2-no-identica.patch
 
+# use https for twitter (bz1067533)
+Patch64:	gwibber-3.4.2-twitter-https.patch
+
 Requires:	libsoup, python-pycurl
 Requires:	python 
 Requires:	dbus-python >= 0.80.2
@@ -165,6 +168,7 @@ Development files for gwibber's libraries.
 %patch61 -p1 -b .timeout5
 %patch62 -p1 -b .scrollfixes
 %patch63 -p1 -b .noidentica
+%patch64 -p1 -b .https
 
 # Kill dead things (identi.ca)
 rm -rf gwibber/microblog/plugins/identica
@@ -254,6 +258,9 @@ fi
 %{_datadir}/vala/vapi/gwibber*
 
 %changelog
+* Tue Mar 25 2014 Tom Callaway <spot at fedoraproject.org> - 3.4.2-11
+- fix twitter auth issues by forcing https (bz1067533)
+
 * Mon Dec 30 2013 Tom Callaway <spot at fedoraproject.org> - 3.4.2-10
 - Fixes from Fabrice Bellet
  - Fix scroll events handling