From 108f6480a0afc48b08a92f0d978cb7fc84d23048 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Tue, 13 Aug 2019 18:14:13 -0500 Subject: user/netsurf: bump to 3.9 --- user/netsurf/APKBUILD | 10 ++- user/netsurf/curl.patch | 161 ------------------------------------------------ 2 files changed, 4 insertions(+), 167 deletions(-) delete mode 100644 user/netsurf/curl.patch (limited to 'user/netsurf') diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD index 917c71be5..e6f799627 100644 --- a/user/netsurf/APKBUILD +++ b/user/netsurf/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman # Maintainer: Kiyoshi Aman pkgname=netsurf -pkgver=3.8 -pkgrel=1 +pkgver=3.9 +pkgrel=0 pkgdesc="Modern, lightweight GTK-based browser" url="http://www.netsurf-browser.org/" arch="all" @@ -14,7 +14,6 @@ makedepends="curl-dev zlib-dev bison flex libjpeg-turbo-dev libpng-dev perl-html-parser" source="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz Makefile.config - curl.patch " builddir="$srcdir/netsurf-all-$pkgver" @@ -31,6 +30,5 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install } -sha512sums="cc040566b2ae4bda1fa15f75f246b2977f17b1f0adc747ddf86a9f8873bc25dce46cacce8e3d80146e72cc0227b1642c9da8b39a73ca2b5bb254334a25b8136a netsurf-all-3.8.tar.gz -cb5f7ca711c4a015a49acc25882b9b95e151d69e68a21d1df068f107b2372dc7493a25c0dfc1ef0cf42ceb16ba47ceb1002f6d37c2424512b183b508ee41357e Makefile.config -594c82f550ac04ea86807a7b2d634e10b24156439588d2d1917f67a8962ae872ab50289400d7f779ba0711a6758aee4bd442d7318fe6f271945e60242285c2bb curl.patch" +sha512sums="3223b0a3bc9721ea1a5a81bbabdda11e1d0f63850074a5dea3ea8999e53c92f07228f58befbf10359c028965131426888a8b9595d6c3cd7a5cde33ca256cf987 netsurf-all-3.9.tar.gz +cb5f7ca711c4a015a49acc25882b9b95e151d69e68a21d1df068f107b2372dc7493a25c0dfc1ef0cf42ceb16ba47ceb1002f6d37c2424512b183b508ee41357e Makefile.config" diff --git a/user/netsurf/curl.patch b/user/netsurf/curl.patch deleted file mode 100644 index c76a4dfa1..000000000 --- a/user/netsurf/curl.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 65b16f4c54eba748ee4c8b6580e6f08fc27534f8 Mon Sep 17 00:00:00 2001 -From: Michael Drake -Date: Mon, 6 May 2019 17:12:14 +0100 -Subject: Curl fetcher: Force HTTP1.1 to fix HTTP2 crash. - -On ubuntu 19.4, curl is built with HTTP2 support, and we -segfault. - -==18174== Invalid read of size 1 -==18174== at 0x4ACCE7D: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4B054B1: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AD398A: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AD7A0B: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AE93EE: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AEA8A8: curl_multi_perform (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x1F2EF7: fetch_curl_poll (curl.c:1209) -==18174== by 0x1EEC5C: fetcher_poll (fetch.c:271) -==18174== by 0x2A1ED4: schedule_run (schedule.c:160) -==18174== by 0x15F941: framebuffer_run (gui.c:596) -==18174== by 0x15F941: main (gui.c:2206) -==18174== Address 0x9de95a8 is 3,224 bytes inside a block of size 6,304 free'd -==18174== at 0x483997B: free (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) -==18174== by 0x4AD497B: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AE158C: curl_easy_cleanup (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x1F30DE: fetch_curl_cache_handle (curl.c:761) -==18174== by 0x1F30DE: fetch_curl_stop (curl.c:840) -==18174== by 0x1F30DE: fetch_curl_done (curl.c:1122) -==18174== by 0x1F30DE: fetch_curl_poll (curl.c:1223) -==18174== by 0x1EEC5C: fetcher_poll (fetch.c:271) -==18174== by 0x2A1ED4: schedule_run (schedule.c:160) -==18174== by 0x15F941: framebuffer_run (gui.c:596) -==18174== by 0x15F941: main (gui.c:2206) -==18174== Block was alloc'd at -==18174== at 0x483AB35: calloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) -==18174== by 0x4AE165F: curl_easy_duphandle (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x1F15EB: fetch_curl_get_handle (curl.c:738) -==18174== by 0x1F15EB: fetch_curl_start (curl.c:750) -==18174== by 0x1EEB22: fetch_dispatch_job (fetch.c:156) -==18174== by 0x1EEB22: fetch_choose_and_dispatch (fetch.c:187) -==18174== by 0x1EEB22: fetch_dispatch_jobs (fetch.c:247) -==18174== by 0x1EF1BB: fetch_start (fetch.c:573) -==18174== by 0x26C779: llcache_object_refetch (llcache.c:916) -==18174== by 0x26D5E4: llcache_object_fetch (llcache.c:979) -==18174== by 0x26D5E4: llcache_object_retrieve_from_cache (llcache.c:1767) -==18174== by 0x26D5E4: llcache_object_retrieve (llcache.c:1865) -==18174== by 0x26E42C: llcache_fetch_redirect (llcache.c:2110) -==18174== by 0x26E42C: llcache_fetch_callback (llcache.c:2810) -==18174== by 0x1F1295: fetch_curl_process_headers (curl.c:922) -==18174== by 0x1F13A0: fetch_curl_data (curl.c:1324) -==18174== by 0x4ACD4C3: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) -==18174== by 0x4AE00DA: ??? (in /usr/lib/x86_64-linux-gnu/libcurl.so.4.5.0) ---- - content/fetchers/curl.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c -index 7ce7c5b48..4602f6aea 100644 ---- a/netsurf/content/fetchers/curl.c -+++ b/netsurf/content/fetchers/curl.c -@@ -1519,6 +1519,10 @@ nserror fetch_curl_register(void) - if (nsoption_bool(suppress_curl_debug)) { - SETOPT(CURLOPT_DEBUGFUNCTION, fetch_curl_ignore_debug); - } -+ -+ /* Currently we explode if curl uses HTTP2, so force 1.1. */ -+ SETOPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); -+ - SETOPT(CURLOPT_WRITEFUNCTION, fetch_curl_data); - SETOPT(CURLOPT_HEADERFUNCTION, fetch_curl_header); - SETOPT(CURLOPT_PROGRESSFUNCTION, fetch_curl_progress); --- -cgit v1.2.1 - - -From 3d80e825e1c77ece19c21ed1cc568049856a44de Mon Sep 17 00:00:00 2001 -From: Daniel Silverstone -Date: Wed, 5 Jun 2019 19:51:47 +0100 -Subject: content/fetchers/curl.c: Defer fetch start if inside cURL - -In order to cope better with modern cURL which prevents making -cURL calls when inside a callback from within cURL, defer fetch -start when we are processing in `fetch_curl_data()`. - -Signed-off-by: Daniel Silverstone ---- - content/fetchers/curl.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -(limited to 'content/fetchers/curl.c') - -diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c -index 63b9ea115..c039429a5 100644 ---- a/netsurf/content/fetchers/curl.c -+++ b/content/fetchers/curl.c -@@ -142,6 +142,9 @@ static char fetch_error_buffer[CURL_ERROR_SIZE]; - /** Proxy authentication details. */ - static char fetch_proxy_userpwd[100]; - -+/** Interlock to prevent initiation during callbacks */ -+static bool inside_curl = false; -+ - - /* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed - * LibreSSL declares its OpenSSL version as 2.1 but only supports the old way -@@ -710,6 +713,9 @@ fetch_curl_initiate_fetch(struct curl_fetch_info *fetch, CURL *handle) - code = fetch_curl_set_options(fetch); - if (code != CURLE_OK) { - fetch->curl_handle = 0; -+ /* The handle maybe went bad, eat it */ -+ NSLOG(netsurf, WARNING, "cURL handle maybe went bad, retry later"); -+ curl_easy_cleanup(handle); - return false; - } - -@@ -747,6 +753,10 @@ static CURL *fetch_curl_get_handle(lwc_string *host) - static bool fetch_curl_start(void *vfetch) - { - struct curl_fetch_info *fetch = (struct curl_fetch_info*)vfetch; -+ if (inside_curl) { -+ NSLOG(netsurf, DEBUG, "Deferring fetch because we're inside cURL"); -+ return false; -+ } - return fetch_curl_initiate_fetch(fetch, - fetch_curl_get_handle(fetch->host)); - } -@@ -1317,6 +1327,9 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f) - CURLcode code; - fetch_msg msg; - -+ assert(inside_curl == false); -+ inside_curl = true; -+ - /* ensure we only have to get this information once */ - if (!f->http_code) { - code = curl_easy_getinfo(f->curl_handle, CURLINFO_HTTP_CODE, -@@ -1330,11 +1343,13 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f) - */ - if (f->http_code == 401) { - f->http_code = 0; -+ inside_curl = false; - return size * nmemb; - } - - if (f->abort || (!f->had_headers && fetch_curl_process_headers(f))) { - f->stopped = true; -+ inside_curl = false; - return 0; - } - -@@ -1344,6 +1359,7 @@ static size_t fetch_curl_data(char *data, size_t size, size_t nmemb, void *_f) - msg.data.header_or_data.len = size * nmemb; - fetch_send_callback(&msg, f->fetch_handle); - -+ inside_curl = false; - if (f->abort) { - f->stopped = true; - return 0; --- -cgit v1.2.1 - - -- cgit v1.2.3-60-g2f50