From 83284cac1c5e173c44e66a7699779d8e076eb130 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 31 Mar 2018 15:51:56 -0300 Subject: [PATCH] libidn: update to 1.34. --- srcpkgs/libidn/patches/CVE-2017-14062.patch | 31 --------------------- srcpkgs/libidn/template | 13 +++++---- 2 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/libidn/patches/CVE-2017-14062.patch diff --git a/srcpkgs/libidn/patches/CVE-2017-14062.patch b/srcpkgs/libidn/patches/CVE-2017-14062.patch deleted file mode 100644 index 33c8b3df2e4..00000000000 --- a/srcpkgs/libidn/patches/CVE-2017-14062.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 ---- lib/punycode.c -+++ 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/srcpkgs/libidn/template b/srcpkgs/libidn/template index bfe99405537..e1476a7980a 100644 --- a/srcpkgs/libidn/template +++ b/srcpkgs/libidn/template @@ -1,16 +1,17 @@ # Template build file for 'libidn'. pkgname=libidn -version=1.33 -revision=2 +version=1.34 +revision=1 build_style=gnu-configure -configure_args="--disable-csharp --disable-java --disable-static --enable-threads=posix" -hostmakedepends="perl pkg-config automake libtool gettext-devel" +configure_args="--disable-csharp --disable-java --disable-static + --enable-threads=posix" +hostmakedepends="perl pkg-config gettext-devel automake libtool" short_desc="Internationalized string handling library" maintainer="Juan RP " homepage="http://www.gnu.org/software/libidn/" -license="GPL-3, LGPL-2.1" +license="GPL-3.0-or-later, LGPL-2.1-or-later" distfiles="${GNU_SITE}/libidn/libidn-${version}.tar.gz" -checksum=44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 +checksum=3719e2975f2fb28605df3479c380af2cf4ab4e919e1506527e4c7670afff6e3c pre_configure() { autoreconf -fi