[grilo-plugins/f20-gnome-3-12] Use SSL for Flickr API (GNOME #730812)

[Debarshi Ray]

commit 55fcb5fb40526950ca99403b158d949d999b918f
Author: Debarshi Ray <debarshir at gnome.org>
Date:   Fri May 30 11:10:32 2014 +0200

    Use SSL for Flickr API (GNOME #730812)

 0001-flickr-Use-SSL.patch |   54 +++++++++++++++++++++++++++++++++++++++++++++
 grilo-plugins.spec        |    9 ++++++-
 2 files changed, 62 insertions(+), 1 deletions(-)
---
diff --git a/0001-flickr-Use-SSL.patch b/0001-flickr-Use-SSL.patch
new file mode 100644
index 0000000..fc4fee3
--- /dev/null
+++ b/0001-flickr-Use-SSL.patch
@@ -0,0 +1,54 @@
+From 7d673dffdd92f15ff116099954d7d682565e0c11 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at gnome.org>
+Date: Tue, 27 May 2014 14:28:10 +0200
+Subject: [PATCH] flickr: Use SSL
+
+https://bugzilla.gnome.org/show_bug.cgi?id=730812
+---
+ src/flickr/flickr-oauth.h | 4 ++--
+ src/flickr/gflickr.c      | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/flickr/flickr-oauth.h b/src/flickr/flickr-oauth.h
+index 9ff563b..c15b321 100644
+--- a/src/flickr/flickr-oauth.h
++++ b/src/flickr/flickr-oauth.h
+@@ -23,8 +23,8 @@
+ #ifndef FLICKR_OAUTH_H
+ #define FLICKR_OAUTH_H
+ 
+-#define FLICKR_API_URL "http://api.flickr.com/services/rest"
+-#define FLICKR_OAUTH_AUTHPOINT "http://www.flickr.com/services/oauth/authorize"
++#define FLICKR_API_URL "https://api.flickr.com/services/rest"
++#define FLICKR_OAUTH_AUTHPOINT "https://www.flickr.com/services/oauth/authorize"
+ 
+ /* OAuth definitions */
+ #define FLICKR_OAUTH_SIGNATURE_METHOD "HMAC-SHA1"
+diff --git a/src/flickr/gflickr.c b/src/flickr/gflickr.c
+index 6d88d11..09a8843 100644
+--- a/src/flickr/gflickr.c
++++ b/src/flickr/gflickr.c
+@@ -18,16 +18,16 @@
+ #define GRL_LOG_DOMAIN_DEFAULT flickr_log_domain
+ 
+ #define FLICKR_PHOTO_ORIG_URL                           \
+-  "http://farm%s.static.flickr.com/%s/%s_%s_o.%s"
++  "https://farm%s.static.flickr.com/%s/%s_%s_o.%s"
+ 
+ #define FLICKR_PHOTO_SMALL_URL                          \
+-  "http://farm%s.static.flickr.com/%s/%s_%s_n.jpg"
++  "https://farm%s.static.flickr.com/%s/%s_%s_n.jpg"
+ 
+ #define FLICKR_PHOTO_THUMB_URL                          \
+-  "http://farm%s.static.flickr.com/%s/%s_%s_t.jpg"
++  "https://farm%s.static.flickr.com/%s/%s_%s_t.jpg"
+ 
+ #define FLICKR_PHOTO_LARGEST_URL                        \
+-  "http://farm%s.static.flickr.com/%s/%s_%s_b.jpg"
++  "https://farm%s.static.flickr.com/%s/%s_%s_b.jpg"
+ 
+ 
+ #define FLICKR_PHOTOS_SEARCH_METHOD       "flickr.photos.search"
+-- 
+1.9.3
+
diff --git a/grilo-plugins.spec b/grilo-plugins.spec
index a0265fc..737fc50 100644
--- a/grilo-plugins.spec
+++ b/grilo-plugins.spec
@@ -7,7 +7,7 @@
 
 Name:		grilo-plugins
 Version:	0.2.12
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Plugins for the Grilo framework
 
 Group:		Applications/Multimedia
@@ -15,6 +15,9 @@ License:	LGPLv2+
 Url:		https://live.gnome.org/Grilo
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/grilo-plugins/%{release_version}/grilo-plugins-%{version}.tar.xz
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=730812
+Patch0:		0001-flickr-Use-SSL.patch
+
 BuildRequires:	avahi-gobject-devel
 BuildRequires:	grilo-devel >= %{grilo_version}
 BuildRequires:	glib2-devel
@@ -67,6 +70,7 @@ This package contains plugins to get information from theses sources:
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure				\
@@ -116,6 +120,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/*
 %{_libdir}/grilo-%{release_version}/*.xml
 
 %changelog
+* Fri May 30 2014 Debarshi Ray <rishi at fedoraproject.org> - 0.2.12-3
+- Use SSL for Flickr API (GNOME #730812)
+
 * Wed Apr 02 2014 Kalev Lember <kalevlember at gmail.com> - 0.2.12-2
 - Build additional freebox, lua-factory and pocket plugins