commit: cd5bba3d05be8d48c005b28c07fbbbef8bb5dcfa Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Nov 5 20:52:44 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Dec 7 14:36:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd5bba3d
net-dns/libidn: Drop old Closes: https://bugs.gentoo.org/697818 Closes: https://github.com/gentoo/gentoo/pull/13560 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-dns/libidn/Manifest | 2 - .../libidn/files/libidn-1.33-CVE-2017-14062.patch | 77 ------------- .../libidn/files/libidn-1.33-parallel-make.patch | 115 ------------------- net-dns/libidn/libidn-1.33-r2.ebuild | 122 --------------------- net-dns/libidn/libidn-1.33-r99.ebuild | 59 ---------- 5 files changed, 375 deletions(-) diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest index 4f4d621296f..fed1d9a4995 100644 --- a/net-dns/libidn/Manifest +++ b/net-dns/libidn/Manifest @@ -1,3 +1 @@ -DIST libidn-1.33-security_backports-01.tar.xz 3420 BLAKE2B c0311d83dee53b83bceab7777e9508ffdc2737e31eec71dc7e67b29ee75cdcef8558db0e89d857ed8c402980fdd7c3419fbb123eba91dddc2358a06684114811 SHA512 e925d20c9258b47821d444c563c75f09f003d1c6b367c934a808242ce4c259ff83e9d67e886cb3e832117df1cd9cae4b18417c48fbf9c77266ab379d3afcd4f4 -DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6 DIST libidn-1.35.tar.gz 4169217 BLAKE2B 809f9e854a4f2fcd3b2d5f7cdb34e2c68a0f00f5fcffc9002ead2d2d3dcee38022b3288f29716437f65f09e259e35cc98679d9c9d943423190cebb76fcbc94fa SHA512 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09 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 5c2e0a91b2e..00000000000 --- 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?= <[email protected]> -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?= <[email protected]> -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 2d237f3e27b..00000000000 --- 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?= <[email protected]> -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 deleted file mode 100644 index 3d0c3be3b44..00000000000 --- a/net-dns/libidn/libidn-1.33-r2.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2018 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-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 - ) -" -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 -} diff --git a/net-dns/libidn/libidn-1.33-r99.ebuild b/net-dns/libidn/libidn-1.33-r99.ebuild deleted file mode 100644 index d80feb1ef34..00000000000 --- a/net-dns/libidn/libidn-1.33-r99.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools multilib-minimal libtool - -DESCRIPTION="Internationalized Domain Names (IDN) implementation" -HOMEPAGE="https://www.gnu.org/software/libidn/"; -SRC_URI=" - mirror://gnu/libidn/${P}.tar.gz - https://dev.gentoo.org/~polynomial-c/${P}-security_backports-01.tar.xz -" - -LICENSE="GPL-2 GPL-3 LGPL-3" -SLOT="1.33" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND="!<${CATEGORY}/${PN}-1.35:0" - -PATCHES=( - "${FILESDIR}"/${PN}-1.33-parallel-make.patch -) - -src_prepare() { - default - - eapply "${WORKDIR}"/patches - - # breaks eautoreconf - sed '/AM_INIT_AUTOMAKE/s@ -Werror@@' -i configure.ac || die - # Breaks build because --disable-gtk-doc* gets ignored - sed '/^SUBDIRS/s@ doc@@' -i Makefile.am || die - eautoreconf - elibtoolize # for Solaris shared objects -} - -multilib_src_configure() { - local myeconfargs=( - --disable-java - --disable-csharp - --disable-nls - --disable-static - --disable-silent-rules - --disable-valgrind-tests - --with-packager-bug-reports="https://bugs.gentoo.org"; - --with-packager-version="r${PR}" - --with-packager="Gentoo" - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_test() { - # only run libidn specific tests and not gnulib tests (bug #539356) - emake -C tests check -} - -multilib_src_install() { - dolib.so lib/.libs/libidn.so.11* -}
