Skip to contentSkip to conversation

package/libcurl: Remove autoreconf

PATCH New Bernd Kuhls 2 participants 4 messages Sep 28, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libcurl: Remove autoreconf

When libcurl-0001-build-link-curl-to-NSS-libraries-when-NSS-support.patch was removed the corresponding autoreconf was left behind:
http://git.buildroot.net/buildroot/commit/?id=9185b64ed5599622cb89ca4ee6ee29440b02ec8a

---
 package/libcurl/libcurl.mk |    2 --
 1 file changed, 2 deletions(-)
package/libcurl/libcurl.mk +0 -2
index 610efc1..74584a6 100644
@@ -14,8 +14,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \
 LIBCURL_LICENSE = ICS
 LIBCURL_LICENSE_FILES = COPYING
 LIBCURL_INSTALL_STAGING = YES
-# For libcurl-0001-build-link-curl-to-NSS-libraries-when-NSS-support.patch
-LIBCURL_AUTORECONF = YES
 
 # We disable NTLM support because it uses fork(), which doesn't work
 # on non-MMU platforms. Moreover, this authentication method is
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/2 package/libcurl: Backport patch to fix xbmc-related timeout bug

For details see
https://github.com/OpenELEC/OpenELEC.tv/commit/82d923895a311e514f6a916ce4d7e06edd2caabb#commitcomment-7952726

---
 package/libcurl/libcurl-0001-fixtimeout.patch |   37 +++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/libcurl/libcurl-0001-fixtimeout.patch
package/libcurl/libcurl-0001-fixtimeout.patch new file +37 -0
new file mode 100644
index 0000000..f897ca4
@@ -0,0 +1,37 @@
+This fixes a timeout problem with xbmc.
+
+Backported from upstream:
+https://github.com/bagder/curl/commit/d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+
+From d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Tue, 23 Sep 2014 11:44:03 +0200
+Subject: [PATCH] threaded-resolver: revert Curl_expire_latest() switch
+
+The switch to using Curl_expire_latest() in commit cacdc27f52b was a
+mistake and was against the advice even mentioned in that commit. The
+comparison in asyn-thread.c:Curl_resolver_is_resolved() makes
+Curl_expire() the suitable function to use.
+
+Bug: http://curl.haxx.se/bug/view.cgi?id=1426
+Reported-By: graysky
+---
+ lib/asyn-thread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
+index e4ad32b..6cdc9ad 100644
+--- a/lib/asyn-thread.c
++++ b/lib/asyn-thread.c
+@@ -541,7 +541,7 @@ CURLcode Curl_resolver_is_resolved(struct connectdata *conn,
+       td->poll_interval = 250;
+ 
+     td->interval_end = elapsed + td->poll_interval;
+-    Curl_expire_latest(conn->data, td->poll_interval);
++    Curl_expire(conn->data, td->poll_interval);
+   }
+ 
+   return CURLE_OK;
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 1/2 package/libcurl: Remove autoreconf

In reply to Bernd Kuhls
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

When libcurl-0001-build-link-curl-to-NSS-libraries-when-NSS-support.patch was removed the corresponding autoreconf was left behind:
http://git.buildroot.net/buildroot/commit/?id=9185b64ed5599622cb89ca4ee6ee29440b02ec8a

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard