rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
bsp/buildroot/package/lua-curl/0001-Fix-build-with-curl-7.62.0.patch
View File

@@ -1,58 +0,0 @@
From 4e3764ecf2b2c3f62475579fee6af4a753729f07 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Thu, 1 Nov 2018 19:12:20 +0200
Subject: [PATCH] Fix build with curl 7.62.0
Fixes #134.
curl 7.62.0 deprecates the CURLE_SSL_CACERT error code, and unifies it
with CURLE_PEER_FAILED_VERIFICATION. Adjust the errors list to match.
This fixes the following build failure:
src/lcerr_easy.h: In function 'lcurl_err_easy_mnemo':
src/lcerror.c:32:22: error: duplicate case value
#define ERR_ENTRY(E) case CURLE_##E: return #E;
^
src/lcerr_easy.h:74:1: note: in expansion of macro 'ERR_ENTRY'
ERR_ENTRY ( SSL_CACERT )
^~~~~~~~~
src/lcerror.c:32:22: note: previously used here
#define ERR_ENTRY(E) case CURLE_##E: return #E;
^
src/lcerr_easy.h:65:1: note: in expansion of macro 'ERR_ENTRY'
ERR_ENTRY ( PEER_FAILED_VERIFICATION )
^~~~~~~~~
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: https://github.com/Lua-cURL/Lua-cURLv3/pull/136
diff --git a/src/lcerr_easy.h b/src/lcerr_easy.h
index 94ad143c3bfe..895c6d87d72f 100644
--- a/Lua-cURLv3-0.3.7/src/lcerr_easy.h
+++ b/Lua-cURLv3-0.3.7/src/lcerr_easy.h
@@ -62,7 +62,11 @@ ERR_ENTRY ( UNKNOWN_TELNET_OPTION ) /* User specified an unknown option */
#endif
ERR_ENTRY ( TELNET_OPTION_SYNTAX )
ERR_ENTRY ( OBSOLETE50 )
+#if LCURL_CURL_VER_GE(7,62,0)
+ERR_ENTRY ( OBSOLETE51 )
+#else
ERR_ENTRY ( PEER_FAILED_VERIFICATION )
+#endif
ERR_ENTRY ( GOT_NOTHING )
ERR_ENTRY ( SSL_ENGINE_NOTFOUND )
ERR_ENTRY ( SSL_ENGINE_SETFAILED )
@@ -71,7 +75,11 @@ ERR_ENTRY ( RECV_ERROR )
ERR_ENTRY ( OBSOLETE57 )
ERR_ENTRY ( SSL_CERTPROBLEM )
ERR_ENTRY ( SSL_CIPHER )
+#if LCURL_CURL_VER_GE(7,62,0)
+ERR_ENTRY ( PEER_FAILED_VERIFICATION )
+#else
ERR_ENTRY ( SSL_CACERT )
+#endif
ERR_ENTRY ( BAD_CONTENT_ENCODING )
ERR_ENTRY ( LDAP_INVALID_URL )
ERR_ENTRY ( FILESIZE_EXCEEDED )

40
bsp/buildroot/package/lua-curl/0001-add-variant-definition-of-lcurl_url_t.patch Normal file
View File

@@ -0,0 +1,40 @@
From 28ac0c5e642c9f7e3091a60268745f7cab4cc92b Mon Sep 17 00:00:00 2001
From: Francois Perrad <francois.perrad@gadz.org>
Date: Sat, 23 Feb 2019 15:23:26 +0100
Subject: [PATCH] add variant definition of lcurl_url_t
like in lceasy.h
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
src/lcurlapi.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Lua-cURLv3-0.3.9/src/lcurlapi.h b/Lua-cURLv3-0.3.9/src/lcurlapi.h
index 4dd4672..862c94f 100644
--- a/Lua-cURLv3-0.3.9/src/lcurlapi.h
+++ b/Lua-cURLv3-0.3.9/src/lcurlapi.h
@@ -19,11 +19,20 @@
#if LCURL_CURL_VER_GE(7,62,0)
+#if LCURL_CC_SUPPORT_FORWARD_TYPEDEF
typedef struct lcurl_url_tag {
CURLU *url;
int err_mode;
}lcurl_url_t;
+#else
+struct lcurl_url_tag {
+ CURLU *url;
+
+ int err_mode;
+};
+#define lcurl_url_t struct lcurl_url_tag
+#endif
int lcurl_url_create(lua_State *L, int error_mode);
--
2.17.1

5
bsp/buildroot/package/lua-curl/lua-curl.hash
View File

@@ -1,2 +1,3 @@
# Locally calculated
sha256 4cc6389bf5d4a868cc1e6017733b9b6306f2fc8b5083aa928d66399195697f34 lua-curl-0.3.7-1.src.rock
# computed by luarocks/buildroot
sha256 ec761e800cec630ff0e78f100e1a61246c35823073014de65f1af0a85bfe1dc0 lua-curl-0.3.9-1.src.rock
sha256 264807cb89f960808fed1ef9922aed9d9f8437764e836d8e594e66db7be9c54c Lua-cURLv3-0.3.9/LICENSE

2
bsp/buildroot/package/lua-curl/lua-curl.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
LUA_CURL_VERSION_UPSTREAM = 0.3.7
LUA_CURL_VERSION_UPSTREAM = 0.3.9
LUA_CURL_VERSION = $(LUA_CURL_VERSION_UPSTREAM)-1
LUA_CURL_SUBDIR = Lua-cURLv3-$(LUA_CURL_VERSION_UPSTREAM)
LUA_CURL_LICENSE = MIT