commit c5dc4602dd5f2178c03cba46e7a3281070f6767e Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Wed Oct 25 20:06:36 2023 +0200
- rediffed patches; content_encoding patch still broken with openssl 3 links-content_encoding.patch | 25 ++++++++++++------------- links-gzip_fallback.patch | 16 ++++++++-------- links.spec | 4 +++- 3 files changed, 23 insertions(+), 22 deletions(-) --- diff --git a/links.spec b/links.spec index decedf7..457d4fa 100644 --- a/links.spec +++ b/links.spec @@ -1,4 +1,6 @@ -# TODO: update IPv6 support +# TODO: +# - fix content_encoding patch with openssl >= 1.1 +# - update IPv6 support Summary: Lynx-like text WWW browser Summary(es.UTF-8): El links es un browser para modo texto, similar a lynx Summary(pl.UTF-8): Podobna do Lynksa tekstowa przeglÄ…darka WWW diff --git a/links-content_encoding.patch b/links-content_encoding.patch index 8a9f4d0..18d43e8 100644 --- a/links-content_encoding.patch +++ b/links-content_encoding.patch @@ -181,9 +181,9 @@ + *z = NULL; + return output; +} ---- links-0.97/http.c Tue Mar 26 22:49:22 2002 -+++ links-0.97/http.c.new Thu Jul 4 20:02:21 2002 -@@ -262,6 +262,7 @@ +--- links-1.04/http.c.orig 2017-10-10 20:17:40.000000000 +0200 ++++ links-1.04/http.c 2020-09-06 08:17:04.818244745 +0200 +@@ -279,6 +279,7 @@ void http_send_header(struct connection } add_to_str(&hdr, &l, ")\r\n"); add_to_str(&hdr, &l, "Accept: */*\r\n"); @@ -191,12 +191,12 @@ if (!(accept_charset)) { int i; unsigned char *cs, *ac; -@@ -359,9 +360,24 @@ - int l = rb->len; - if (info->length >= 0 && info->length < l) l = info->length; +@@ -386,9 +387,24 @@ void read_http_data(struct connection *c + return; + } c->received += l; - if (add_fragment(c->cache, c->from, rb->data, l) == 1) c->tries = 0; -+ if (l) { ++ if (l > 0) { + if (c->gzip) { + int dl; + unsigned char *data = decompress_gzip(&c->z, rb->data, l, &dl); @@ -217,10 +217,10 @@ - c->from += l; kill_buffer_data(rb, l); if (!info->length && !rb->close) { - setcstate(c, S_OK); -@@ -405,9 +421,23 @@ - int l = info->chunk_remaining; - if (l > rb->len) l = rb->len; + http_end_request(c, 0, 0, S__OK); +@@ -435,9 +451,22 @@ void read_http_data(struct connection *c + return; + } c->received += l; - if (add_fragment(c->cache, c->from, rb->data, l) == 1) c->tries = 0; info->chunk_remaining -= l; @@ -240,11 +240,10 @@ + if (add_fragment(c->cache, c->from, rb->data, l) == 1) c->tries = 0; + c->from += l; + } -+ kill_buffer_data(rb, l); if (!info->chunk_remaining && rb->len >= 1) { if (rb->data[0] == 10) kill_buffer_data(rb, 1); -@@ -635,6 +665,19 @@ +@@ -667,6 +696,19 @@ void http_got_header(struct connection * if (!e->last_modified && (d = parse_http_header(e->head, "Date", NULL))) e->last_modified = d; if (info->length == -1 || (version < 11 && info->close)) rb->close = 1; diff --git a/links-gzip_fallback.patch b/links-gzip_fallback.patch index aeafbdc..aed3b95 100644 --- a/links-gzip_fallback.patch +++ b/links-gzip_fallback.patch @@ -1,6 +1,6 @@ ---- links-1.03/configure.in.orig 2013-06-21 20:16:45.722573508 +0200 -+++ links-1.03/configure.in 2013-06-21 20:48:49.859159434 +0200 -@@ -365,6 +365,9 @@ +--- links-1.04/configure.in.orig 2013-06-21 20:16:45.722573508 +0200 ++++ links-1.04/configure.in 2013-06-21 20:48:49.859159434 +0200 +@@ -486,6 +486,9 @@ else fi AC_MSG_RESULT($cf_result) @@ -9,7 +9,7 @@ + #ifdef HAVE_SSL ssld=yes - AC_ARG_WITH(ssl, [ --with-ssl(=directory) enable SSL support], [if test "$withval" = no; then disable_ssl=yes; else ssld="$withval"; fi]) + withval= --- links-1.04/file.c.orig 2018-03-31 18:29:41.000000000 +0200 +++ links-1.04/file.c 2020-09-06 12:21:37.464060729 +0200 @@ -224,6 +224,7 @@ void file_func(struct connection *c) @@ -92,10 +92,10 @@ } if (!c->cache) { if (get_cache_entry(c->url, &c->cache)) { ---- links-0.97/links.h Wed Jul 3 10:36:17 2002 -+++ links-0.97/links.h.new Wed Jul 3 10:44:18 2002 -@@ -97,6 +97,10 @@ - #include <openssl/ssl.h> +--- links-1.04/links.h.orig 2023-10-25 07:59:24.384129610 +0200 ++++ links-1.04/links.h 2023-10-25 08:01:46.170028157 +0200 +@@ -195,6 +195,10 @@ strtoq(const char *, char **, int); + #include <openssl/rand.h> #endif +#ifdef HAVE_ZLIB_H ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/links.git/commitdiff/c5dc4602dd5f2178c03cba46e7a3281070f6767e _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit