diff options
Diffstat (limited to 'network/elinks/patches')
-rw-r--r-- | network/elinks/patches/0001-gopher_html_links.patch | 21 | ||||
-rw-r--r-- | network/elinks/patches/0002-gopher_index_queries.patch | 161 | ||||
-rw-r--r-- | network/elinks/patches/0003-gopher_directory_links.patch | 59 | ||||
-rw-r--r-- | network/elinks/patches/0004-ssl_cert_verify.patch | 10 | ||||
-rw-r--r-- | network/elinks/patches/0005-gopher_newlines_tabs_entity.patch | 89 | ||||
-rw-r--r-- | network/elinks/patches/0006-gopher-indexes_nocr.patch | 19 | ||||
-rw-r--r-- | network/elinks/patches/0006-indexes_nocr.patch | 62 | ||||
-rw-r--r-- | network/elinks/patches/0007-gopher-move_null.patch | 16 | ||||
-rw-r--r-- | network/elinks/patches/0007-move_null.patch | 16 | ||||
-rw-r--r-- | network/elinks/patches/0008-gopher-html-entities.patch | 47 |
10 files changed, 213 insertions, 287 deletions
diff --git a/network/elinks/patches/0001-gopher_html_links.patch b/network/elinks/patches/0001-gopher_html_links.patch index c9ab73856d..38a2dd0b10 100644 --- a/network/elinks/patches/0001-gopher_html_links.patch +++ b/network/elinks/patches/0001-gopher_html_links.patch @@ -1,21 +1,18 @@ ################################################################ -# There is a problem that html links that contain URL:htpp://... -# aren't being followed. This fixes that issue and also chtml. -# Normally those kind of links go to a redirect page that the -# server generates, which then sends you on your way. -# dave@dawoodfall.net +# Fix for HTML links that contain URL:http:// +# dave@slackbuilds.org ############################################################### diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c --- a/src/protocol/gopher/gopher.c 2013-12-18 15:38:57.000000000 +0000 -+++ b/src/protocol/gopher/gopher.c 2017-11-15 23:10:19.758394411 +0000 ++++ b/src/protocol/gopher/gopher.c 2020-01-08 05:34:02.300498220 +0000 @@ -277,6 +277,10 @@ struct string command; enum gopher_entity entity = DEFAULT_GOPHER_ENTITY; unsigned char *selector = conn->uri->data; -+ unsigned char *URI = "hURI%3"; -+ unsigned char *URL = "hURL%3"; -+ unsigned char *CURI = "HURI%3"; -+ unsigned char *CURL = "HURL%3"; ++ unsigned char const* URI = "hURI%3"; ++ unsigned char const* URL = "hURL%3"; ++ unsigned char const* CURI = "HURI%3"; ++ unsigned char const* CURL = "HURL%3"; int selectorlen = conn->uri->datalen; struct gopher_entity_info *entity_info; size_t size; @@ -25,13 +22,13 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c + if(strstr(selector, URL) != NULL || strstr(selector, URI) != NULL) { + entity = GOPHER_HTML; -+ *selector++; ++ selector++; + selectorlen--; + } + + if(strstr(selector, CURL) != NULL || strstr(selector, CURI) != NULL) { + entity = GOPHER_CHTML; -+ *selector++; ++ selector++; + selectorlen--; + } + diff --git a/network/elinks/patches/0002-gopher_index_queries.patch b/network/elinks/patches/0002-gopher_index_queries.patch index ab970f60f7..662fd13a7f 100644 --- a/network/elinks/patches/0002-gopher_index_queries.patch +++ b/network/elinks/patches/0002-gopher_index_queries.patch @@ -1,77 +1,53 @@ ####################################################################### -# elinks by default generates its own search query form when it sees -# a type 7 index entity. The problem is that it didn't read the -# served results page and instead generated another search page after -# you had entered the first. This patch fixes that and in my tests it -# seems to work so far. -# dave@dawoodfall.net +# Fix for type 7 entities. +# dave@slackbuilds.org ####################################################################### -diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c ---- a/src/protocol/gopher/gopher.c 2017-11-24 19:12:52.495714437 +0000 -+++ b/src/protocol/gopher/gopher.c 2017-11-30 12:56:38.872336516 +0000 -@@ -43,6 +43,34 @@ - #include "util/memory.h" - #include "util/string.h" +diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-13 22:35:13.663935305 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-13 23:16:00.053003768 +0000 +@@ -197,7 +197,7 @@ + command->length = strlen(command->source); + } -+#ifdef HAVE_FCNTL_H -+#include <fcntl.h> /* OS/2 needs this after sys/types.h */ -+#endif -+ -+/* To enable logging for debugging purposes. */ -+#if 0 -+ -+#define LOGFILE "/tmp/log" -+ -+static void -+debug_log(unsigned char *data, int NL) -+{ -+ int fd = open(LOGFILE, O_WRONLY | O_APPEND | O_CREAT, 0622); -+ -+ if (fd == -1) return; -+ -+ set_bin(fd); -+ write(fd, data, strlen(data)); -+ if (NL) -+ write(fd, "\n", 1); -+ close(fd); -+} -+#undef LOGFILE -+ -+#else -+#define debug_log(data, len) -+#endif -+ - struct module gopher_protocol_module = struct_module( - /* name: */ N_("Gopher"), - /* options: */ NULL, -@@ -219,23 +247,31 @@ +-static struct connection_state init_gopher_index_cache_entry(struct connection *conn); ++/* static struct connection_state init_gopher_index_cache_entry(struct connection *conn); */ + + static struct connection_state + add_gopher_command(struct connection *conn, struct string *command, +@@ -205,7 +205,7 @@ + unsigned char *selector, int selectorlen) + { + unsigned char *query; +- int querylen; ++ int querylen = 0; + + if (!init_string(command)) + return connection_state(S_OUT_OF_MEM); +@@ -218,13 +218,14 @@ + /* Exclude '?' */ if (query) selectorlen -= 1; query = NULL; - querylen = 0; +- querylen = 0; - } else { - query += 1; + } else if (entity == GOPHER_INDEX) { -+ /* fix query size to not include the seach= part */ ++ /* fix query size to not include the search= part */ + query += 8; querylen = selector + selectorlen - query; /* Exclude '?' */ - selectorlen -= querylen + 1; -+ /* fix selector length to fit with query */ +- if (querylen >= 7 && !c_strncasecmp(query, "search=", 7)) { ++ /* fix selector length to fit with query */ + selectorlen -= querylen + 8; - if (querylen >= 7 && !c_strncasecmp(query, "search=", 7)) { ++ if (querylen >= 7 && !c_strncasecmp(query, "submit=", 7)) { query += 7; querylen -= 7; } -+ debug_log("selector:", 1); -+ debug_log(selector, 1); -+ debug_log("query:", 1); -+ debug_log(query, 1); - } - +@@ -233,9 +234,11 @@ switch (entity) { case GOPHER_INDEX: /* No search required? */ -+ /* Don't display the form page */ ++ /* Don't display the form page */ if (!query) { done_string(command); - return init_gopher_index_cache_entry(conn); @@ -80,41 +56,58 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c } add_uri_decoded(command, selector, selectorlen, 0); -@@ -343,6 +379,10 @@ - gopher->entity = entity_info; - gopher->commandlen = command.length; - -+debug_log("439 gopher->entity:", 1); -+debug_log(gopher->entity, 1); -+debug_log("437 command.source:", 1); -+debug_log(command.source, 1); - memcpy(gopher->command, command.source, command.length); - done_string(&command); - -@@ -377,7 +417,7 @@ +@@ -371,13 +374,14 @@ + add_gopher_search_field(struct string *buffer, const unsigned char *text, + const unsigned char *addr) + { ++ /* Not *every* query is a search! */ + add_format_to_string(buffer, + "<form action=\"%s\">" + "<table>" "<td> </td>" "<td>%s:</td>" - "<td><input maxlength=\"256\" name=\"search\" value=\"\"></td>" +- "<td><input maxlength=\"256\" name=\"search\" value=\"\"></td>" - "<td><input type=submit value=\"Search\"></td>" ++ "<td><input maxlength=\"256\" name=\"submit\" value=\"\"></td>" + "<td><input type=submit value=\"Submit\"></td>" "</table>" "</form>", addr, text); -@@ -726,7 +766,8 @@ - /* Now read the data from the socket */ - switch (gopher->entity->type) { - case GOPHER_DIRECTORY: -- case GOPHER_INDEX: -+/* Don't do directory list for cgi output (7) -+ case GOPHER_INDEX: */ - state = read_gopher_directory_data(conn, rb); - break; +@@ -662,6 +666,7 @@ + } + + /* Display a Gopher Index document. */ ++/* Use the page that the gopher site sends us + static struct connection_state + init_gopher_index_cache_entry(struct connection *conn) + { +@@ -674,9 +679,9 @@ + + where = get_uri_string(conn->uri, URI_PUBLIC); + +- /* TODO: Use different function when using UTF-8 ++ TODO: Use different function when using UTF-8 + * in terminal (decode_uri_for_display replaces +- * bytes of UTF-8 characters width '*'). */ ++ * bytes of UTF-8 characters width '*'). * + if (where) decode_uri_for_display(where); + + add_format_to_string(&buffer, +@@ -695,7 +700,7 @@ + + mem_free_if(where); + +- /* FIXME: I think this needs a form or something */ ++ * FIXME: I think this needs a form or something * -@@ -738,6 +779,7 @@ - state = connection_state(S_GOPHER_CSO_ERROR); - break; + add_fragment(conn->cached, conn->from, buffer.source, buffer.length); + conn->from += buffer.length; +@@ -707,7 +712,7 @@ + ? connection_state(S_OK) + : connection_state(S_OUT_OF_MEM); + } +- ++*/ -+ case GOPHER_INDEX: - case GOPHER_SOUND: - case GOPHER_PLUS_SOUND: - case GOPHER_PLUS_MOVIE: + static void + read_gopher_response_data(struct socket *socket, struct read_buffer *rb) diff --git a/network/elinks/patches/0003-gopher_directory_links.patch b/network/elinks/patches/0003-gopher_directory_links.patch index dc80ef3728..15a89fac2f 100644 --- a/network/elinks/patches/0003-gopher_directory_links.patch +++ b/network/elinks/patches/0003-gopher_directory_links.patch @@ -1,42 +1,22 @@ ####################################################################### -# elinks does not follow links to directories on other servers -# properly. This adds a '/' before the '1' at the start of a link and -# removes any trailing 1. -# dave@dawoodfall.net +# Fix remote directory links. +# dave@slackbuilds.org ####################################################################### -diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c ---- a/src/protocol/gopher/gopher.c 2017-12-17 01:54:27.941645180 +0000 -+++ b/src/protocol/gopher/gopher.c 2017-12-17 21:52:05.072454433 +0000 -@@ -317,6 +317,9 @@ - unsigned char *URL = "hURL%3"; - unsigned char *CURI = "HURI%3"; - unsigned char *CURL = "HURL%3"; -+ unsigned char *DIR = "1"; -+ unsigned char *SLASHDIR = "/1"; -+ unsigned char *SLASHPOS; - int selectorlen = conn->uri->datalen; - struct gopher_entity_info *entity_info; - size_t size; -@@ -354,6 +357,26 @@ +diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-13 23:22:18.918292198 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-13 23:21:00.631960039 +0000 +@@ -321,6 +321,18 @@ selectorlen++; } -+ if (entity_info->type == '1') -+ { -+ if (strstr(selector, DIR) == selector) -+ { -+ *selector++; ++ if (entity_info->type == '1') { ++ if (strchr(selector, '1') == (char *) selector) { ++ selector++; + selectorlen--; + } -+ else -+ { -+ SLASHPOS = strstr(selector, SLASHDIR); -+ if (SLASHPOS != NULL) -+ { -+ if (strlen(SLASHPOS) == 2) -+ { -+ selectorlen--; -+ } ++ else { ++ if ((char *) selector == "/1") { ++ selectorlen--; + } + } + } @@ -44,18 +24,3 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c state = add_gopher_command(conn, &command, entity, selector, selectorlen); if (!is_in_state(state, S_CONN)) return state; -@@ -379,10 +402,10 @@ - gopher->entity = entity_info; - gopher->commandlen = command.length; - --debug_log("439 gopher->entity:", 1); --debug_log(gopher->entity, 1); --debug_log("437 command.source:", 1); --debug_log(command.source, 1); -+ debug_log("439 gopher->entity: ", 0); -+ debug_log(gopher->entity, 1); -+ debug_log("437 command.source: ", 0); -+ debug_log(command.source, 1); - memcpy(gopher->command, command.source, command.length); - done_string(&command); - diff --git a/network/elinks/patches/0004-ssl_cert_verify.patch b/network/elinks/patches/0004-ssl_cert_verify.patch index 4629da564a..3b56e1ae40 100644 --- a/network/elinks/patches/0004-ssl_cert_verify.patch +++ b/network/elinks/patches/0004-ssl_cert_verify.patch @@ -1,10 +1,8 @@ ############################################################################## -# elinks does not verify ssl host names with openssl -# This is a modifed version of the patch here that fixes that issue: +# Verify SSL host names with OpenSSL. +# Turn on verification by default. # http://lists.linuxfromscratch.org/pipermail/elinks-dev/2015-June/002099.html -# This patch turns on verification by default, and differentiates -# between host verification fail and normal SSL errors. -# dave@dawoodfall.net +# dave@slackbuilds.org ############################################################################## --- a/configure.in 2017-12-21 15:58:12.470247050 +0000 +++ b/configure.in 2017-12-21 16:10:27.406938487 +0000 @@ -75,7 +73,7 @@ diff -Naur a/src/network/ssl/socket.c b/src/network/ssl/socket.c default: socket->no_tls = !socket->no_tls; - socket->ops->retry(socket, connection_state(S_SSL_ERROR)); -+ if (SSL_VERIFY_FAIL_IF_NO_PEER_CERT != NULL) ++ if (SSL_VERIFY_FAIL_IF_NO_PEER_CERT) + socket->ops->retry(socket, connection_state(S_SSL_CERTFAIL)); + else + socket->ops->retry(socket, connection_state(S_SSL_ERROR)); diff --git a/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch b/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch index f93b0d5431..b255fb4f98 100644 --- a/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch +++ b/network/elinks/patches/0005-gopher_newlines_tabs_entity.patch @@ -1,12 +1,13 @@ ##################################################################### -# Some fixes for having line feeds in text without a carriage return. +# Fix line feeds without carriage returns. # Make sure that only lines with tabs are treated as links. # Support links that don't begin with a '/'. +# dave@slackbuilds.org ##################################################################### -diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c ---- a/src/protocol/gopher/gopher.c 2017-12-28 15:08:54.310546900 +0000 -+++ b/src/protocol/gopher/gopher.c 2017-12-28 20:26:00.635193897 +0000 -@@ -326,7 +326,7 @@ +diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-14 03:19:39.956296190 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-14 03:20:05.295045232 +0000 +@@ -290,7 +290,7 @@ /* Get entity type, and selector string. */ /* Pick up gopher_entity */ @@ -15,73 +16,41 @@ diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c entity = *selector++; selectorlen--; } -@@ -357,8 +357,7 @@ - selectorlen++; +@@ -333,6 +333,18 @@ + } } -- if (entity_info->type == '1') -- { + if (entity_info->type == '1') { - if (strstr(selector, DIR) == selector) - { - *selector++; -@@ -402,9 +401,9 @@ - gopher->entity = entity_info; - gopher->commandlen = command.length; - -- debug_log("439 gopher->entity: ", 0); -+ debug_log("404 gopher->entity: ", 0); - debug_log(gopher->entity, 1); -- debug_log("437 command.source: ", 0); -+ debug_log("406 command.source: ", 0); - debug_log(command.source, 1); - memcpy(gopher->command, command.source, command.length); - done_string(&command); -@@ -486,6 +485,7 @@ - unsigned char *host = NULL; - unsigned char *port = NULL; - enum gopher_entity entity = *name++; -+ int link = 0; - - if (!entity) { - add_char_to_string(buffer, '\n'); -@@ -495,6 +495,7 @@ - if (*name) { - selector = strchr(name, ASCII_TAB); - if (selector) { -+ link = 1; - /* Terminate name */ - *selector++ = '\0'; - -@@ -565,7 +566,7 @@ - switch (entity) { - case GOPHER_WWW: - /* Gopher pointer to W3 */ -- if (selector) { -+ if (selector && link == 1) { - add_gopher_link(buffer, name, selector); - break; - } -@@ -617,7 +618,8 @@ ++ if (strchr(selector, '1') == (char *) selector) { ++ selector++; ++ selectorlen--; ++ } ++ else { ++ if ((char *) selector == "/1") { ++ selectorlen--; ++ } ++ } ++ } ++ + state = add_gopher_command(conn, &command, entity, selector, selectorlen); + if (!is_in_state(state, S_CONN)) + return state; +@@ -570,7 +582,8 @@ } else if (address.length > 0 && strlcmp(address.source, address.length - 1, - "gopher://error.host:1/", -1)) { + "gopher://error.host:1/", -1) -+ && link == 1) { ++ && selector) { add_gopher_link(buffer, name, address.source); } else { -@@ -639,6 +641,12 @@ +@@ -590,7 +603,7 @@ + get_gopher_line_end(unsigned char *data, int datalen) + { for (; datalen > 1; data++, datalen--) - if (data[0] == ASCII_CR && data[1] == ASCII_LF) +- if (data[0] == ASCII_CR && data[1] == ASCII_LF) ++ if (data[0] == ASCII_CR || data[0] == ASCII_LF) return data + 2; -+ else -+ if(data[0] == ASCII_CR) -+ return data + 2; -+ else -+ if(data[0] == ASCII_LF) -+ return data + 2; return NULL; - } diff --git a/network/elinks/patches/0006-gopher-indexes_nocr.patch b/network/elinks/patches/0006-gopher-indexes_nocr.patch new file mode 100644 index 0000000000..9e4a441db6 --- /dev/null +++ b/network/elinks/patches/0006-gopher-indexes_nocr.patch @@ -0,0 +1,19 @@ +####################################################################### +# Fix index listings with only LF and no CRs. +# dave@slackbuilds.org +####################################################################### +diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-14 06:42:11.030536586 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-14 06:42:26.710000886 +0000 +@@ -757,6 +757,11 @@ + switch (gopher->entity->type) { + case GOPHER_DIRECTORY: + case GOPHER_INDEX: ++ /* Lines with no carriage returns */ ++ if (strchr(rb->data, ASCII_CR) == NULL) { ++ strncat(rb->data, "\r\n", 2); ++ rb->length += 3; ++ } + state = read_gopher_directory_data(conn, rb); + break; + diff --git a/network/elinks/patches/0006-indexes_nocr.patch b/network/elinks/patches/0006-indexes_nocr.patch deleted file mode 100644 index 5c68cee8ca..0000000000 --- a/network/elinks/patches/0006-indexes_nocr.patch +++ /dev/null @@ -1,62 +0,0 @@ -####################################################################### -# Fixes index listings with only LF and no CRs. -# dave@dawoodfall.net -####################################################################### -diff -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c ---- a/src/protocol/gopher/gopher.c 2017-12-29 17:14:24.247093626 +0000 -+++ b/src/protocol/gopher/gopher.c 2017-12-29 17:12:08.496272595 +0000 -@@ -638,15 +638,16 @@ - static unsigned char * - get_gopher_line_end(unsigned char *data, int datalen) - { -- for (; datalen > 1; data++, datalen--) -- if (data[0] == ASCII_CR && data[1] == ASCII_LF) -+ for (; datalen > 1; data++, datalen--) { -+ if (data[0] == ASCII_CR && data[1] == ASCII_LF) - return data + 2; - else - if(data[0] == ASCII_CR) -- return data + 2; -- else -- if(data[0] == ASCII_LF) -- return data + 2; -+ return data + 1; -+ else -+ if(data[0] == ASCII_LF) -+ return data + 1; -+ } - - return NULL; - } -@@ -796,9 +797,21 @@ - - /* Now read the data from the socket */ - switch (gopher->entity->type) { -+ case GOPHER_INDEX: -+ /* Lines with no carriage returns */ -+ if (strchr(rb->data, ASCII_CR) == NULL) { -+ unsigned char *tmp; -+ tmp = malloc(rb->length + 3); -+ memcpy(tmp, "i", 1); -+ memcpy(tmp+1, rb->data, rb->length); -+ tmp[rb->length]= '\r'; -+ tmp[rb->length+1]= '\n'; -+ rb->length+=3; -+ memcpy(rb->data, tmp, rb->length); -+ free(tmp); -+ } -+ - case GOPHER_DIRECTORY: --/* Don't do directory list for cgi output (7) -- case GOPHER_INDEX: */ - state = read_gopher_directory_data(conn, rb); - break; - -@@ -810,7 +823,6 @@ - state = connection_state(S_GOPHER_CSO_ERROR); - break; - -- case GOPHER_INDEX: - case GOPHER_SOUND: - case GOPHER_PLUS_SOUND: - case GOPHER_PLUS_MOVIE: diff --git a/network/elinks/patches/0007-gopher-move_null.patch b/network/elinks/patches/0007-gopher-move_null.patch new file mode 100644 index 0000000000..8f259e55cf --- /dev/null +++ b/network/elinks/patches/0007-gopher-move_null.patch @@ -0,0 +1,16 @@ +################################################################### +# Move the null terminator one char forwards. +# dave@slackbuilds.org +################################################################### +diff -Naur -x .git bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-14 03:24:11.259323801 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-14 03:24:49.452454019 +0000 +@@ -615,7 +615,7 @@ + assert(line < end); + + /* Just to be safe NUL terminate the line */ +- end[-2] = 0; ++ end[-1] = 0; + + return line[0] == '.' && !line[1] ? NULL : line; + } diff --git a/network/elinks/patches/0007-move_null.patch b/network/elinks/patches/0007-move_null.patch deleted file mode 100644 index 9d8037cc37..0000000000 --- a/network/elinks/patches/0007-move_null.patch +++ /dev/null @@ -1,16 +0,0 @@ -################################################################### -# Move the added null terminator one char forwards -# dave@dawoodfall.net -################################################################### -diff --exclude .git -Naur a/src/protocol/gopher/gopher.c b/src/protocol/gopher/gopher.c ---- a/src/protocol/gopher/gopher.c 2017-12-29 17:15:39.521209968 +0000 -+++ b/src/protocol/gopher/gopher.c 2018-01-17 05:46:45.660258482 +0000 -@@ -658,7 +658,7 @@ - assert(line < end); - - /* Just to be safe NUL terminate the line */ -- end[-2] = 0; -+ end[-1] = 0; - - return line[0] == '.' && !line[1] ? NULL : line; - } diff --git a/network/elinks/patches/0008-gopher-html-entities.patch b/network/elinks/patches/0008-gopher-html-entities.patch new file mode 100644 index 0000000000..750d1a49de --- /dev/null +++ b/network/elinks/patches/0008-gopher-html-entities.patch @@ -0,0 +1,47 @@ +################################################################### +# Encode < > to HTML. +################################################################### +diff -Naur '--exclude=.git' bb/src/protocol/gopher/gopher.c cc/src/protocol/gopher/gopher.c +--- bb/src/protocol/gopher/gopher.c 2020-01-14 03:26:41.791778387 +0000 ++++ cc/src/protocol/gopher/gopher.c 2020-01-14 06:19:56.964025440 +0000 +@@ -620,6 +620,25 @@ + return line[0] == '.' && !line[1] ? NULL : line; + } + ++/* substring replacement */ ++static void ++str_replace(char * in_string, char * s_string, char * r_string) ++{ ++ /* max == replace all characters */ ++ char temp[strlen(in_string) * (strlen(r_string) - strlen(s_string)) + 1]; ++ char * pos; ++ ++ if (!(pos = strstr(in_string, s_string))) ++ return; ++ ++ strncpy(temp, in_string, pos - in_string); ++ temp[pos - in_string] = 0; ++ sprintf(temp + (pos - in_string), "%s%s", r_string, pos + 1); ++ in_string[0] = 0; ++ strcpy(in_string, temp); ++ return str_replace(in_string, s_string, r_string); ++} ++ + /* Parse a Gopher Menu document */ + static struct connection_state + read_gopher_directory_data(struct connection *conn, struct read_buffer *rb) +@@ -639,6 +658,14 @@ + return connection_state(S_OUT_OF_MEM); + } + ++ /* Lines with characters that need to be converted to html */ ++ if (strstr(rb->data, "<")) { ++ str_replace(rb->data, "<", "<"); ++ } ++ if (strstr(rb->data, ">")) { ++ str_replace(rb->data, ">", ">"); ++ } ++ + while ((end = get_gopher_line_end(rb->data, rb->length))) { + unsigned char *line = check_gopher_last_line(rb->data, end); + |