From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- net-dns/libidn/Manifest | 8 ++ net-dns/libidn/files/50libidn-gentoo.el | 12 ++ .../libidn/files/libidn-1.33-CVE-2017-14062.patch | 32 ++++++ net-dns/libidn/libidn-1.33-r1.ebuild | 125 +++++++++++++++++++++ net-dns/libidn/libidn-1.33.ebuild | 120 ++++++++++++++++++++ net-dns/libidn/metadata.xml | 8 ++ 6 files changed, 305 insertions(+) create mode 100644 net-dns/libidn/Manifest create mode 100644 net-dns/libidn/files/50libidn-gentoo.el create mode 100644 net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch create mode 100644 net-dns/libidn/libidn-1.33-r1.ebuild create mode 100644 net-dns/libidn/libidn-1.33.ebuild create mode 100644 net-dns/libidn/metadata.xml (limited to 'net-dns/libidn') diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest new file mode 100644 index 000000000000..cef06f0496fd --- /dev/null +++ b/net-dns/libidn/Manifest @@ -0,0 +1,8 @@ +AUX 50libidn-gentoo.el 455 SHA256 b8b5a7df3ef312b47ef44d7b5c9180e06e9d8b9cbe43fa67b8511296381ff937 SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501 WHIRLPOOL e2925be57973d4f2d9adebaa63bc9a2d63daa0c4ac571790fd564fe4b7a4d5d8db62a0e342a5043b28e2c506bb62f86e9f967e5a680dd50261fa1dfb4214b260 +AUX libidn-1.33-CVE-2017-14062.patch 938 SHA256 c640ebe93568bd2dc2cae2151fa91fb8f4d8190bf2bb3b353a638282ab44cef1 SHA512 a78a57fe5583cb02239fbff11d33b1ee1f84b91817c5376ed441173be5fa47337019b0b098a5134c19f1f62ab5efac0621dd8fc922ec09de21481b9905638f20 WHIRLPOOL e2c0dc34aee544d0a9a35c8afb7f79ed6f6bb5d81b5223b3cd85ee768a82e44eaee1c263137e853551fc059c60b89d479db3d3c73f5be3173701a3a4133cda06 +DIST libidn-1.33.tar.gz 3501056 SHA256 44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6 WHIRLPOOL 3b0c44742c2515e09eaf8f16f32f30bc37478a6273765d71dd9a9283f501998b6d85583cd38810bbdbd6103855e77831360010d707d29956798e3f5d066b0e82 +EBUILD libidn-1.33-r1.ebuild 2985 SHA256 6e0507865386f1d1afd5a8c518692003dd945c16ab2efb6e76f84a347c89695f SHA512 45744c90319efb5316a99f93322c28e9a5076fbcf6b76e7e5bcc7b169539811f4f5d6f15436d0294d5fcf4efa2a098dbf81e3623c00de1ba2b8e08dd860b8993 WHIRLPOOL 06d346aece8930d6c979e63ec571bc4eddc8ba1e2456de34cb3091f756cfcc10060680bb496290be0ac2e13ca9f0f710ebac74bfe757524fce1844f85c421d6e +EBUILD libidn-1.33.ebuild 2805 SHA256 6d70b0dda51adcedbe3fc41db8f9d998f7129935f1d8617c95c768164a6d1299 SHA512 863f325f2ed868a6b78d542fe584538d67ff6bbe99b1e181416b43c919cfdfc417bd92dc424657d0a632c838735826be7bbfdc82632e04cdeaf5e3bbd4351a15 WHIRLPOOL 20ec2d3960b38bbfc1d80e022855cb812c8e77d3fcc884fac4ecf34fbe44f3b4ee66c4f47797a822637512ad863931f6ddb6d80d6fbaea87f1c4862cc38435b6 +MISC ChangeLog 4866 SHA256 fafa50fd65a41bccaae966e981e3bfc745e1ff956ed3d66a8933933d87267fb1 SHA512 df837de9cd1ac3b0fd364801c147aac996ad42600bb449c85f41a500b535e2db290d17758efd670617567428a3f74b2c5692979580230a6b7f2cf6daacbf2d69 WHIRLPOOL b1d2f31a691277979c3586b9730e3c3c058870a7673fb42ab1585ef09d2dceb79a4adfbf0d597b33a28807f2b4fd84e0d0944dc6eae62c0100ac6489bc5589b9 +MISC ChangeLog-2015 26908 SHA256 f0e4fdf08e48c0b4d012acf9dad9d0555636c3c6a3db591f13632e4260eae940 SHA512 3b29c0708d0a48cfde5d018ae81977eb1f72bfaa45b9035273900975488d98a60989b5ad72c3062a5a1cc4cdc4d35cc0e0e37b093e070c480ab5b122d41dd9b1 WHIRLPOOL 2668887482e4a71b6e42032b35123735aa887cadb539ff1a1ef28b137845df3057cf2b085950595d40815ff4bfd15e748dfb44137636905c9526692597f2c74b +MISC metadata.xml 244 SHA256 a65bfec176330796e1eeb3bb589b78ff60a123b947537decd4705ea71ca4e906 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db WHIRLPOOL 1164de6a99d8931ca3ae60cbb397be80b802eb473943ef777dbe8473d8d665a5f93d8b99175709bf09d8af856b3ea7aaf7c95a87aad37e48b85c06e618431a1f diff --git a/net-dns/libidn/files/50libidn-gentoo.el b/net-dns/libidn/files/50libidn-gentoo.el new file mode 100644 index 000000000000..6ab280c64eb9 --- /dev/null +++ b/net-dns/libidn/files/50libidn-gentoo.el @@ -0,0 +1,12 @@ + +;;; libidn site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") +(autoload 'idna-to-ascii "idna" + "Returns an ASCII Compatible Encoding (ACE) of STR.") +(autoload 'idna-to-unicode "idna" + "Returns a possibly multibyte string after decoding STR.") +(autoload 'punycode-encode "punycode" + "Returns a Punycode encoding of STR.") +(autoload 'punycode-decode "punycode" + "Returns a possibly multibyte string which is the punycode decoding of STR.") 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 new file mode 100644 index 000000000000..2ddf3fdd6be2 --- /dev/null +++ b/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch @@ -0,0 +1,32 @@ +From e9e81b8063b095b02cf104bb992fa9bf9515b9d8 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Tim=20R=C3=BChsen?= +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 + diff --git a/net-dns/libidn/libidn-1.33-r1.ebuild b/net-dns/libidn/libidn-1.33-r1.ebuild new file mode 100644 index 000000000000..92d1d7c0723e --- /dev/null +++ b/net-dns/libidn/libidn-1.33-r1.ebuild @@ -0,0 +1,125 @@ +# 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 +) + +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* || die + touch doc/man/punycode* || 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 + dohtml -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.ebuild b/net-dns/libidn/libidn-1.33.ebuild new file mode 100644 index 000000000000..b494bad73965 --- /dev/null +++ b/net-dns/libidn/libidn-1.33.ebuild @@ -0,0 +1,120 @@ +# 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(-)] + ) +" + +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 + + eapply_user + + 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 + dohtml -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/metadata.xml b/net-dns/libidn/metadata.xml new file mode 100644 index 000000000000..f8bd6f3f34f9 --- /dev/null +++ b/net-dns/libidn/metadata.xml @@ -0,0 +1,8 @@ + + + + + jer@gentoo.org + Jeroen Roovers + + -- cgit v1.2.3