Attachment 179602 Details for Bug 216785 – patch

[patch] patch

lynx.patch (text/plain), 4.30 KB, created by Piotr Kubaj on 2017-02-04 15:47:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2017-02-04 15:47:50 UTC

Size: 4.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 433169)
>+++ Makefile	(working copy)
>@@ -15,6 +15,8 @@
> 
> LICENSE=	GPLv2
> 
>+LIB_DEPENDS=	libidn.so:dns/libidn
>+
> CONFLICTS=	lynx-2.8.[8-9]d*
> 
> USES=		cpe ncurses shebangfix tar:bzip2
>Index: files/patch-CVE-2016-9179
>===================================================================
>--- files/patch-CVE-2016-9179	(revision 433169)
>+++ files/patch-CVE-2016-9179	(working copy)
>@@ -6,9 +6,9 @@
> for the unstable lynx2.8.9. Removed the at_sign, and made sure that
> the user id is correctly stripped of all non valid inputs.
> 
>---- WWW/Library/Implementation/HTTCP.c_orig	2016-12-01 15:07:39.487753520 +0000
>-+++ WWW/Library/Implementation/HTTCP.c	2016-12-01 15:10:20.291328282 +0000
>-@@ -1792,7 +1792,6 @@
>+--- WWW/Library/Implementation/HTTCP.c.orig	2013-12-18 01:56:13 UTC
>++++ WWW/Library/Implementation/HTTCP.c
>+@@ -1792,7 +1792,6 @@ int HTDoConnect(const char *url,
>      int status = 0;
>      char *line = NULL;
>      char *p1 = NULL;
>@@ -16,7 +16,7 @@
>      char *host = NULL;
>  
>  #ifdef INET6
>-@@ -1814,14 +1813,8 @@
>+@@ -1814,14 +1813,8 @@ int HTDoConnect(const char *url,
>       * Get node name and optional port number.
>       */
>      p1 = HTParse(url, "", PARSE_HOST);
>@@ -32,40 +32,10 @@
>      FREE(p1);
>  
>      HTSprintf0(&line, "%s%s", WWW_FIND_MESSAGE, host);
>---- WWW/Library/Implementation/HTTP.c_orig	2016-12-01 15:13:24.171404704 +0000
>-+++ WWW/Library/Implementation/HTTP.c	2016-12-01 15:19:59.699276204 +0000
>-@@ -426,7 +426,7 @@
>- /*
>-  * Strip any username from the given string so we retain only the host.
>-  */
>--static void strip_userid(char *host)
>-+void strip_userid(char *host, int parse_only)
>- {
>-     char *p1 = host;
>-     char *p2 = StrChr(host, '@');
>-@@ -439,7 +439,8 @@
>+--- WWW/Library/Implementation/HTUtils.h.orig	2014-02-05 00:50:18 UTC
>++++ WWW/Library/Implementation/HTUtils.h
>+@@ -801,6 +801,8 @@ extern "C" {
>  
>- 	    CTRACE((tfp, "parsed:%s\n", fake));
>- 	    HTSprintf0(&msg, gettext("Address contains a username: %s"), host);
>--	    HTAlert(msg);
>-+           if (msg !=0 && !parse_only)
>-+	        HTAlert(msg);
>- 	    FREE(msg);
>- 	}
>- 	while ((*p1++ = *p2++) != '\0') {
>-@@ -1081,7 +1082,7 @@
>- 	char *host = NULL;
>- 
>- 	if ((host = HTParse(anAnchor->address, "", PARSE_HOST)) != NULL) {
>--	    strip_userid(host);
>-+	    strip_userid(host, TRUE);
>- 	    HTBprintf(&command, "Host: %s%c%c", host, CR, LF);
>- 	    FREE(host);
>- 	}
>---- WWW/Library/Implementation/HTUtils.h_orig	2016-12-01 15:21:38.919699987 +0000
>-+++ WWW/Library/Implementation/HTUtils.h	2016-12-01 15:22:57.870511104 +0000
>-@@ -801,6 +801,8 @@
>- 
>      extern FILE *TraceFP(void);
>  
> +    extern void strip_userid(char *host, int warn);
>@@ -73,9 +43,9 @@
>  #ifdef USE_SSL
>      extern SSL *HTGetSSLHandle(void);
>      extern void HTSSLInitPRNG(void);
>---- src/LYUtils.c_orig	2016-12-01 15:25:21.769447171 +0000
>-+++ src/LYUtils.c	2016-12-01 15:28:31.901411555 +0000
>-@@ -4693,6 +4693,7 @@
>+--- src/LYUtils.c.orig	2014-03-09 21:43:10 UTC
>++++ src/LYUtils.c
>+@@ -4693,6 +4693,7 @@ BOOLEAN LYExpandHostForURL(char **Alloca
>       * Do a DNS test on the potential host field as presently trimmed.  - FM
>       */
>      StrAllocCopy(host, Str);
>Index: files/patch-makefile.in
>===================================================================
>--- files/patch-makefile.in	(revision 433169)
>+++ files/patch-makefile.in	(working copy)
>@@ -1,5 +1,6 @@
>-Index: makefile.in
>-@@ -433,7 +433,9 @@
>+--- makefile.in.orig	2014-03-09 21:43:10 UTC
>++++ makefile.in
>+@@ -413,7 +413,9 @@ install-help : $(CFG2HTML) help_files.se
>  	else \
>  		cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
>  	fi'
>@@ -10,7 +11,7 @@
>  	@ECHO_CC@sed	-e '/^HELPFILE:http/s!^!#!' \
>  		-e '/^#HELPFILE:file/s!#!!' \
>  		$(SYSCONFDIR)/lynx.tmp | \
>-@@ -441,9 +443,11 @@
>+@@ -421,9 +423,11 @@ install-help : $(CFG2HTML) help_files.se
>  	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc  $(helpdir) | \
>  	sed	-e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
>  		-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \
>@@ -24,7 +25,7 @@
>  
>  LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
>  	@echo Creating $@
>-@@ -465,17 +469,17 @@
>+@@ -445,17 +449,17 @@ cfg_defs.h : $(scripts_dir)/cfg_defs.sh 
>  	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
>  
>  install-cfg : $(SYSCONFDIR)

Actions: View | Diff

Attachments on bug 216785: 179602 | 179673 | 179809