diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /net-dns/libidn/files | |
parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) |
gentoo resync : 15.12.2019
Diffstat (limited to 'net-dns/libidn/files')
-rw-r--r-- | net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch | 77 | ||||
-rw-r--r-- | net-dns/libidn/files/libidn-1.33-parallel-make.patch | 115 |
2 files changed, 0 insertions, 192 deletions
diff --git a/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch b/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch deleted file mode 100644 index 5c2e0a91b2e3..000000000000 --- a/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch +++ /dev/null @@ -1,77 +0,0 @@ -From e9e81b8063b095b02cf104bb992fa9bf9515b9d8 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Fri, 1 Sep 2017 10:04:48 +0200 -Subject: [PATCH] lib/punycode.c (decode_digit): Fix integer overflow - -This fix is a backport from libidn2 and addresses -CVE-2017-14062. ---- - lib/punycode.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/punycode.c b/lib/punycode.c -index 86819a7..49250a1 100644 ---- a/lib/punycode.c -+++ b/lib/punycode.c -@@ -88,10 +88,10 @@ enum - /* point (for use in representing integers) in the range 0 to */ - /* base-1, or base if cp does not represent a value. */ - --static punycode_uint --decode_digit (punycode_uint cp) -+static unsigned -+decode_digit (int cp) - { -- return cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 : -+ return (unsigned) cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 : - cp - 97 < 26 ? cp - 97 : base; - } - --- -1.9.1 - -From 6c8a9375641ca283b50f9680c90dcd57f9c44798 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Wed, 4 Oct 2017 15:22:43 +0200 -Subject: [PATCH] lib/punycode.c (decode_digit): Really fix integer overflow - -The fix in commit e9e81b8063b095b02cf104bb992fa9bf9515b9d8 -was incomplete. - -Reported-by: Christian Weisgerber ---- - lib/punycode.c | 4 ++-- - tests/tst_idna.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/punycode.c b/lib/punycode.c -index 49250a1..d475b6d 100644 ---- a/lib/punycode.c -+++ b/lib/punycode.c -@@ -91,8 +91,8 @@ enum - static unsigned - decode_digit (int cp) - { -- return (unsigned) cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 : -- cp - 97 < 26 ? cp - 97 : base; -+ return (unsigned) (cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 : -+ cp - 97 < 26 ? cp - 97 : base); - } - - /* encode_digit(d,flag) returns the basic code point whose value */ -diff --git a/tests/tst_idna.c b/tests/tst_idna.c -index 4ac046f..7fb58b9 100644 ---- a/tests/tst_idna.c -+++ b/tests/tst_idna.c -@@ -211,7 +211,7 @@ static const struct idna idna[] = { - 'x', 'n', '-', '-', 'f', 'o', 0x3067}, - IDNA_ACE_PREFIX "too long too long too long too long too long too " - "long too long too long too long too long ", 0, -- IDNA_CONTAINS_ACE_PREFIX, IDNA_PUNYCODE_ERROR} -+ IDNA_CONTAINS_ACE_PREFIX, IDNA_INVALID_LENGTH} - }; - - void --- -1.9.1 - diff --git a/net-dns/libidn/files/libidn-1.33-parallel-make.patch b/net-dns/libidn/files/libidn-1.33-parallel-make.patch deleted file mode 100644 index 2d237f3e27b1..000000000000 --- a/net-dns/libidn/files/libidn-1.33-parallel-make.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 4709e64fef29ca8ddd5b0878e3126640bd1480c2 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de> -Date: Wed, 4 Oct 2017 15:02:49 +0200 -Subject: [PATCH] * src/Makefile.am: Fix rule for parallel builds - ---- - src/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 6832c20..218d52e 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -35,7 +35,8 @@ libidn_cmd_la_SOURCES = idn.ggo idn_cmd.c idn_cmd.h - libidn_cmd_la_LIBADD = ../gl/libgnu.la - libidn_cmd_la_CFLAGS = - --idn_cmd.c idn_cmd.h: idn.ggo Makefile.am -+# pattern rule (%) needed for parallel make (-j) -+idn_cmd%c idn_cmd%h: idn.ggo - gengetopt --unamed-opts --no-handle-version --no-handle-help \ - --set-package="idn" \ - --input $^ --file-name idn_cmd --- -1.9.1 - ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -1,7 +1,7 @@ --# Makefile.in generated by automake 1.14.1 from Makefile.am. -+# Makefile.in generated by automake 1.15.1 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994-2013 Free Software Foundation, Inc. -+# Copyright (C) 1994-2017 Free Software Foundation, Inc. - - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -34,7 +34,17 @@ - - - VPATH = @srcdir@ --am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -+am__is_gnu_make = { \ -+ if test -z '$(MAKELEVEL)'; then \ -+ false; \ -+ elif test -n '$(MAKE_HOST)'; then \ -+ true; \ -+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ -+ true; \ -+ else \ -+ false; \ -+ fi; \ -+} - am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ -@@ -99,8 +109,6 @@ - host_triplet = @host@ - bin_PROGRAMS = idn$(EXEEXT) - subdir = src --DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ -- $(top_srcdir)/build-aux/depcomp $(dist_lisp_DATA) - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/lib/gl/m4/ctype.m4 \ - $(top_srcdir)/lib/gl/m4/gnulib-comp.m4 \ -@@ -184,6 +192,8 @@ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/configure.ac - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -+DIST_COMMON = $(srcdir)/Makefile.am $(dist_lisp_DATA) \ -+ $(am__DIST_COMMON) - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = -@@ -294,6 +304,8 @@ - done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags -+am__DIST_COMMON = $(srcdir)/Makefile.in \ -+ $(top_srcdir)/build-aux/depcomp - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ALLOCA = @ALLOCA@ -@@ -863,6 +875,7 @@ - LT_AGE = @LT_AGE@ - LT_CURRENT = @LT_CURRENT@ - LT_REVISION = @LT_REVISION@ -+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ - MAKEINFO = @MAKEINFO@ - MANIFEST_TOOL = @MANIFEST_TOOL@ - MKDIR_P = @MKDIR_P@ -@@ -1200,7 +1213,6 @@ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile --.PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ -@@ -1562,10 +1574,13 @@ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-dist_lispDATA - -+.PRECIOUS: Makefile -+ - - idn.c: $(BUILT_SOURCES) - --idn_cmd.c idn_cmd.h: idn.ggo Makefile.am -+# pattern rule (%) needed for parallel make (-j) -+idn_cmd%c idn_cmd%h: idn.ggo - gengetopt --unamed-opts --no-handle-version --no-handle-help \ - --set-package="idn" \ - --input $^ --file-name idn_cmd |