From 407525b571b48cfd65e1ad7a02d250a927c967c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Dec 2017 03:04:39 +0000 Subject: gentoo resync : 01.12.2017 --- net-dns/libidn/Manifest | 6 +- .../libidn/files/libidn-1.33-CVE-2017-14062.patch | 45 ++++++++ .../libidn/files/libidn-1.33-parallel-make.patch | 115 +++++++++++++++++++ net-dns/libidn/libidn-1.33-r2.ebuild | 126 +++++++++++++++++++++ 4 files changed, 290 insertions(+), 2 deletions(-) create mode 100644 net-dns/libidn/files/libidn-1.33-parallel-make.patch create mode 100644 net-dns/libidn/libidn-1.33-r2.ebuild (limited to 'net-dns/libidn') diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest index e1bcd73501c6..79294f0e34da 100644 --- a/net-dns/libidn/Manifest +++ b/net-dns/libidn/Manifest @@ -1,6 +1,8 @@ AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d06251b07ee2fd3ecbac16347d633644f30dc7428e5bdf9747b0a4d51d7541601d3fbd4be6f9f746693f SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501 -AUX libidn-1.33-CVE-2017-14062.patch 938 BLAKE2B df990e1f45dd055707bf1918a63444000588ca877e754d9909b062370fca99004654e0439be4e68a13214135a90ec47719679f5794c8b32fa709c4c3abbaa811 SHA512 a78a57fe5583cb02239fbff11d33b1ee1f84b91817c5376ed441173be5fa47337019b0b098a5134c19f1f62ab5efac0621dd8fc922ec09de21481b9905638f20 -DIST libidn-1.33.tar.gz 3501056 SHA256 44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6 WHIRLPOOL 3b0c44742c2515e09eaf8f16f32f30bc37478a6273765d71dd9a9283f501998b6d85583cd38810bbdbd6103855e77831360010d707d29956798e3f5d066b0e82 +AUX libidn-1.33-CVE-2017-14062.patch 2348 BLAKE2B 4f9606d25405d950f23444886e423008d928991b23c5a05a8de794eea18f236aa8f4b53b7945f4340aa3b2f4f7aa9c63d5dadaf3bc0513ee3f5e27ecb9040a7a SHA512 25e6ff17d2d6886fec51db7e9584bbb7aff9b717c23accf7c956611f1bf4c965cc5f51837367c410b7c8c29c58170e94e2e0146e9e2921b3a0c5bc411bcddfbb +AUX libidn-1.33-parallel-make.patch 3584 BLAKE2B fbd1f372b11bc1da38bdeb3a8c0f01708339e0a7c23da7f22b450985a2b69c31887a5f686430e5014d1a5c116ae7e03b922c0350f3926e5a43e5cbc6cdbbfb83 SHA512 de98b4122c272bcd38a673beab8da56fac5b4c877d4bc0930505979addf4cc4e85fcf065ee9044d1196e83b1d2d5389ee8dceac4ffe7bf623a3f3c7bc7aca4f1 +DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6 EBUILD libidn-1.33-r1.ebuild 2985 BLAKE2B 55e2923d045ba06bb02ac9a56cbe3c05f8828cc088062fb90a809d9522612a27714314bc7f6151a2812ba4bb43c08113f6f24401863888c68e74814ef9d532c5 SHA512 e63496fa71b9ad23a725f0be9dbbf864970a506fc92033efa178c92d515cf21785ebeccf33065b7c096e052a1f0c60c4c9d5dd98586b0ed5ae0f17d7808daa14 +EBUILD libidn-1.33-r2.ebuild 3033 BLAKE2B 5dcb80c32820b2e70ec0e49a4bcbae937024152a63857defbfe72eeeb6bd9b14fafd1b9ac2f564faf4062073800d240e1bd02f4933d77bc1a48a3819652bb18d SHA512 74f704b27b17b215de6908cfd6b1c853892a856010200052bfcd74f0969d9c652e3306fca092890f4de0ac8dc03ea8f19c5fd0e0f44742544b5e29cc32be078c EBUILD libidn-1.33.ebuild 2805 BLAKE2B 6a59cccf9c5152341e304217d6a5e162158b0b8c3fcc8f60b74f1aebf1c76493d1542f67eb278ddfb0db5c942bee992b7706e694179318685f62ae065ea54f54 SHA512 863f325f2ed868a6b78d542fe584538d67ff6bbe99b1e181416b43c919cfdfc417bd92dc424657d0a632c838735826be7bbfdc82632e04cdeaf5e3bbd4351a15 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db 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 index 2ddf3fdd6be2..5c2e0a91b2e3 100644 --- a/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch +++ b/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch @@ -30,3 +30,48 @@ index 86819a7..49250a1 100644 -- 1.9.1 +From 6c8a9375641ca283b50f9680c90dcd57f9c44798 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Tim=20R=C3=BChsen?= +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 new file mode 100644 index 000000000000..2d237f3e27b1 --- /dev/null +++ b/net-dns/libidn/files/libidn-1.33-parallel-make.patch @@ -0,0 +1,115 @@ +From 4709e64fef29ca8ddd5b0878e3126640bd1480c2 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Tim=20R=C3=BChsen?= +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 diff --git a/net-dns/libidn/libidn-1.33-r2.ebuild b/net-dns/libidn/libidn-1.33-r2.ebuild new file mode 100644 index 000000000000..5e498c6299e0 --- /dev/null +++ b/net-dns/libidn/libidn-1.33-r2.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal libtool + +DESCRIPTION="Internationalized Domain Names (IDN) implementation" +HOMEPAGE="https://www.gnu.org/software/libidn/" +SRC_URI="mirror://gnu/libidn/${P}.tar.gz" + +LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc emacs java mono nls static-libs" + +DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO ) +COMMON_DEPEND=" + emacs? ( virtual/emacs ) + mono? ( >=dev-lang/mono-0.95 ) +" +DEPEND="${COMMON_DEPEND} + nls? ( + >=sys-devel/gettext-0.17 + ) + java? ( + >=virtual/jdk-1.5 + ) +" +RDEPEND="${COMMON_DEPEND} + nls? ( + >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] + ) + java? ( + >=virtual/jre-1.5 + ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) +" +PATCHES=( + "${FILESDIR}"/${PN}-1.33-CVE-2017-14062.patch + "${FILESDIR}"/${PN}-1.33-parallel-make.patch +) + +pkg_setup() { + mono-env_pkg_setup + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + + # bundled, with wrong bytecode + rm "${S}/java/${P}.jar" || die + + # prevent triggering doc updates after punycode.c patch + touch doc/texi/punycode* doc/man/punycode* doc/libidn.info || die + + elibtoolize # for Solaris shared objects +} + +multilib_src_configure() { + ECONF_SOURCE=${S} GJDOC=javadoc \ + econf \ + $(multilib_native_use_enable java) \ + $(multilib_native_use_enable mono csharp mono) \ + $(use_enable nls) \ + $(use_enable static-libs static) \ + --disable-silent-rules \ + --disable-valgrind-tests \ + --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \ + --with-packager-bug-reports="https://bugs.gentoo.org" \ + --with-packager-version="r${PR}" \ + --with-packager="Gentoo" +} + +multilib_src_compile() { + default + + if multilib_is_native_abi; then + use emacs && elisp-compile "${S}"/src/*.el + use java && use doc && emake -C java/src/main/java javadoc + fi +} + +multilib_src_test() { + # only run libidn specific tests and not gnulib tests (bug #539356) + emake -C tests check +} + +multilib_src_install() { + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use java; then + java-pkg_newjar java/${P}.jar ${PN}.jar + rm -r "${ED}"/usr/share/java || die + use doc && java-pkg_dojavadoc "${S}"/doc/java + fi +} + +multilib_src_install_all() { + if use emacs; then + # *.el are installed by the build system + elisp-install ${PN} "${S}"/src/*.elc + elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" + else + rm -r "${ED}/usr/share/emacs" || die + fi + + einstalldocs + + if use doc ; then + dodoc -r doc/reference/html/ + fi + + prune_libtool_files +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} -- cgit v1.2.3