From patchwork Mon Jul 28 20:58:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 374318 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 3BAA114007D for ; Tue, 29 Jul 2014 06:58:22 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 838908AFA0; Mon, 28 Jul 2014 20:58:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eWaKHNWT73CE; Mon, 28 Jul 2014 20:58:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8081A8B059; Mon, 28 Jul 2014 20:58:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B9BA01BFA19 for ; Mon, 28 Jul 2014 20:58:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B5EEC8B04F for ; Mon, 28 Jul 2014 20:58:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lEBpJYkB_ck1 for ; Mon, 28 Jul 2014 20:58:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 574628AF9A for ; Mon, 28 Jul 2014 20:58:14 +0000 (UTC) Received: by mail-wi0-f177.google.com with SMTP id ho1so5073092wib.4 for ; Mon, 28 Jul 2014 13:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=IMOvqqyx6nUtTzs2PX1NDbWus3DnXocQRZv1rwdMY8M=; b=PsEcoSXnysZ8NG6m8dvpTyw5qCk/gncSABzdGvcCJ6N/E5hA31se7S6J9HScdXheDU oo8vGdlPp2Yu7u72zv2yug4J7CQ8we5OnqZZfPtyR3k7wzazyCZ4RKVHJbxSwJWkdxHs 7z9KSDV/D45tBekEjSOxmB1oJHsiQRfYAY6rgQAPvqXPw2qTk6o9X3vHjLQ+mWFZOXeW yDBDF1tfKy/YPYCPTYEhbxcE+5u8bbLq7zIGFv0rTCiMile3gcJHWTWJ/1cipgtV9wdr RSEzDlA+y9HMu2hWF0KJJxS7dqqSHPW2zP8azZHQeB8moSKkmcmgvX+xDTbNbrZOcgAw TeDQ== X-Received: by 10.195.12.97 with SMTP id ep1mr51425423wjd.26.1406581092799; Mon, 28 Jul 2014 13:58:12 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id ex2sm35237156wic.24.2014.07.28.13.58.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Jul 2014 13:58:11 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 28 Jul 2014 22:58:08 +0200 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH 2/2] flickcurl: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Peter Korsgaard We need two patches from upstream git as flickr now requires https access. Signed-off-by: Peter Korsgaard [yann.morin.1998@free.fr: fix the kconfig recursive loop when selecting a SSL implementation] Signed-off-by: "Yann E. MORIN" --- package/Config.in | 1 + package/flickcurl/Config.in | 19 ++++++++++ ...ttps-for-all-service-endpoints.-HTTP-EOL-.patch | 40 ++++++++++++++++++++++ ...auth-services-are-on-https-www.flickr.com.patch | 30 ++++++++++++++++ package/flickcurl/flickcurl.mk | 23 +++++++++++++ 5 files changed, 113 insertions(+) create mode 100644 package/flickcurl/Config.in create mode 100644 package/flickcurl/flickcurl-0001-Switch-to-https-for-all-service-endpoints.-HTTP-EOL-.patch create mode 100644 package/flickcurl/flickcurl-0002-Oauth-services-are-on-https-www.flickr.com.patch create mode 100644 package/flickcurl/flickcurl.mk diff --git a/package/Config.in b/package/Config.in index 559b895..11087da 100644 --- a/package/Config.in +++ b/package/Config.in @@ -753,6 +753,7 @@ menu "Networking" source "package/cppzmq/Config.in" source "package/czmq/Config.in" source "package/filemq/Config.in" + source "package/flickcurl/Config.in" source "package/fmlib/Config.in" source "package/geoip/Config.in" source "package/glib-networking/Config.in" diff --git a/package/flickcurl/Config.in b/package/flickcurl/Config.in new file mode 100644 index 0000000..7b91710 --- /dev/null +++ b/package/flickcurl/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_FLICKCURL + bool "flickcurl" + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS || BR2_PACKAGE_LIBNSS) + select BR2_PACKAGE_CA_CERTIFICATES # runtime + help + Flickcurl is a C library for the Flickr API, handling + creating the requests, signing, token management, calling + the API, marshalling request parameters and decoding + responses. + + http://librdf.org/flickcurl/ + +config BR2_PACKAGE_FLICKCURL_UTILS + bool "flickcurl utilities" + depends on BR2_PACKAGE_FLICKCURL + help + Install flickcurl utilites (flickcurl + flickrdf) to target. diff --git a/package/flickcurl/flickcurl-0001-Switch-to-https-for-all-service-endpoints.-HTTP-EOL-.patch b/package/flickcurl/flickcurl-0001-Switch-to-https-for-all-service-endpoints.-HTTP-EOL-.patch new file mode 100644 index 0000000..576b611 --- /dev/null +++ b/package/flickcurl/flickcurl-0001-Switch-to-https-for-all-service-endpoints.-HTTP-EOL-.patch @@ -0,0 +1,40 @@ +From 1f5e208a4709a3030258024ea63834aab41bca3c Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 31 May 2014 12:10:35 -0700 +Subject: [PATCH] Switch to https for all service endpoints. HTTP EOL + 2014-06-27 + +2014-04-30 Flickr announced that it would be HTTPS only from 2014-06-27 +http://code.flickr.net/2014/04/30/flickr-api-going-ssl-only-on-june-27th-2014/ + +Signed-off-by: Peter Korsgaard +--- + src/common.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/common.c b/src/common.c +index ef05e08..245db18 100644 +--- a/src/common.c ++++ b/src/common.c +@@ -73,12 +73,12 @@ const char* const flickcurl_home_url_string = "http://librdf.org/flickcurl/"; + const char* const flickcurl_version_string = VERSION; + + +-const char* const flickcurl_flickr_service_uri = "http://www.flickr.com/services/rest/"; +-const char* const flickcurl_flickr_upload_service_uri = "http://api.flickr.com/services/upload/"; +-const char* const flickcurl_flickr_replace_service_uri = "http://api.flickr.com/services/replace/"; +-const char* const flickcurl_flickr_oauth_request_token_uri = "http://www.flickr.com/services/oauth/request_token"; +-const char* const flickcurl_flickr_oauth_authorize_uri = "http://www.flickr.com/services/oauth/authorize"; +-const char* const flickcurl_flickr_oauth_access_token_uri = "http://www.flickr.com/services/oauth/access_token"; ++const char* const flickcurl_flickr_service_uri = "https://api.flickr.com/services/rest/"; ++const char* const flickcurl_flickr_upload_service_uri = "https://up.flickr.com/services/upload/"; ++const char* const flickcurl_flickr_replace_service_uri = "https://up.flickr.com/services/replace/"; ++const char* const flickcurl_flickr_oauth_request_token_uri = "https://api.flickr.com/services/oauth/request_token"; ++const char* const flickcurl_flickr_oauth_authorize_uri = "https://api.flickr.com/services/oauth/authorize"; ++const char* const flickcurl_flickr_oauth_access_token_uri = "https://api.flickr.com/services/oauth/access_token"; + + + static void +-- +2.0.0 + diff --git a/package/flickcurl/flickcurl-0002-Oauth-services-are-on-https-www.flickr.com.patch b/package/flickcurl/flickcurl-0002-Oauth-services-are-on-https-www.flickr.com.patch new file mode 100644 index 0000000..1ed9af2 --- /dev/null +++ b/package/flickcurl/flickcurl-0002-Oauth-services-are-on-https-www.flickr.com.patch @@ -0,0 +1,30 @@ +From 3e65bbfc1c556ac8bd1d30db66d6e63957066b75 Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 31 May 2014 12:56:22 -0700 +Subject: [PATCH] Oauth services are on https www.flickr.com + +Signed-off-by: Peter Korsgaard +--- + src/common.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/common.c b/src/common.c +index 245db18..c697a7d 100644 +--- a/src/common.c ++++ b/src/common.c +@@ -76,9 +76,9 @@ const char* const flickcurl_version_string = VERSION; + const char* const flickcurl_flickr_service_uri = "https://api.flickr.com/services/rest/"; + const char* const flickcurl_flickr_upload_service_uri = "https://up.flickr.com/services/upload/"; + const char* const flickcurl_flickr_replace_service_uri = "https://up.flickr.com/services/replace/"; +-const char* const flickcurl_flickr_oauth_request_token_uri = "https://api.flickr.com/services/oauth/request_token"; +-const char* const flickcurl_flickr_oauth_authorize_uri = "https://api.flickr.com/services/oauth/authorize"; +-const char* const flickcurl_flickr_oauth_access_token_uri = "https://api.flickr.com/services/oauth/access_token"; ++const char* const flickcurl_flickr_oauth_request_token_uri = "https://www.flickr.com/services/oauth/request_token"; ++const char* const flickcurl_flickr_oauth_authorize_uri = "https://www.flickr.com/services/oauth/authorize"; ++const char* const flickcurl_flickr_oauth_access_token_uri = "https://www.flickr.com/services/oauth/access_token"; + + + static void +-- +2.0.0 + diff --git a/package/flickcurl/flickcurl.mk b/package/flickcurl/flickcurl.mk new file mode 100644 index 0000000..7fb212f --- /dev/null +++ b/package/flickcurl/flickcurl.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# flickcurl +# +################################################################################ + +FLICKCURL_VERSION = 1.25 +FLICKCURL_SITE = http://download.dajobe.org/flickcurl/ +FLICKCURL_LICENSE = LGPLv2.1+ or GPLv2+ or Apache 2.0+ +FLICKCURL_LICENSE_FILES = COPYING COPYING.LIB LICENSE-2.0.txt LICENSE.html +FLICKCURL_INSTALL_STAGING = YES +FLICKCURL_CONFIG_SCRIPTS = flickcurl-config +FLICKCURL_CONF_OPT = --without-curl-config --without-xml2-config --without-raptor +FLICKCURL_DEPENDENCIES = libcurl libxml2 openssl ca-certificates host-pkgconf + +ifeq ($(BR2_PACKAGE_FLICKCURL_UTILS),) +define FLICKCURL_REMOVE_UTILS + rm -f $(TARGET_DIR)/usr/bin/flickcurl $(TARGET_DIR)/usr/bin/flickrdf +endef +FLICKCURL_POST_INSTALL_TARGET_HOOKS += FLICKCURL_REMOVE_UTILS +endif + +$(eval $(autotools-package))