--
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
+
--- /dev/null
+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 Makefile.am
+ gengetopt --unamed-opts --no-handle-version --no-handle-help \
+ --set-package="idn" \
+ --input $^ --file-name idn_cmd
+--
+1.9.1
+
--- /dev/null
+# 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
+}
projects / gentoo.git / commitdiff