Pullup ticket #4795 - requested by he

devel/libidn: security update

Revisions pulled up:
- devel/libidn/Makefile                                         1.93-1.94
- devel/libidn/distinfo                                         1.60-1.61

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Thu Jul  9 14:02:04 UTC 2015

   Modified Files:
   	pkgsrc/devel/libidn: Makefile distinfo

   Log Message:
   Update to 1.31:

   * Version 1.31 (released 2015-07-08) [bet

   ** libidn: stringprep_utf8_to_ucs4 now rejects invalid UTF-8. CVE-2015-2059
   This function has always been documented to not validate that the
   input UTF-8 string is actually valid UTF-8.  Like the rest of the API,
   when you call a function that works on UTF-8 data, you have to pass it
   valid UTF-8 data.  Application writers appear to have difficulties
   using interfaces designed like that, as bugs triggered by invalid
   UTF-8 has been identified in a number of projects (jabberd2, gnutls,
   wget, and curl).  While we could introduce a new API to perform UTF-8
   validation, so that applications can easily implement the proper
   checks, this appear error prone because there is a risk that the check
   will be forgotten.  Instead, we took the more radical approach of
   modifying the documentation and the implementation of the API.  The
   intention is that all functions that accepts UTF-8 data should
   validate it before use.  This will solve the problem for applications,
   without needing to change them.  This change has the unfortunate
   side-effect that Surrogate codes (see section 5.5 of RFC 3454) no
   longer trigger the STRINGPREP_CONTAINS_PROHIBITED error code but
   instead will trigger the newly introduced STRINGPREP_ICONV_ERROR error
   code, as the gnulib/libunistring-based code that we use to test
   UTF-8-compliance rejects Surrogate codes.  We hope that this is an
   acceptable cost to live with in order to improve application security.
   We welcome feedback on this solution, and we are marking this release
   as beta rather than stable to signal that we may reconsider this
   approach if people disagree.  Reported by several people including
   Thijs Alkemade, Gustavo Grieco, Daniel Stenberg, and Nikos
   Mavrogiannopoulos.

   ** libidn: Added STRINGPREP_ICONV_ERROR error code.

   ** libidn: Workaround valgrind/gcc/glibc issue.
   Valgrind reported a 'Invalid read of size 4' that was caused by
   optimized strlen implementation.  Reported and patch by Alessandro
   Ghedini <alessandro@ghedini.me>.

   ** build: Use LOG_COMPILER instead of TESTS_ENVIRONMENT to fix valgrind use.
   Errors caught by valgrind did not always trigger 'make check' failures
   before.

   ** i18n: Updated Danish translation.
   Thanks to Joe Hansen.

   ** API and ABI is backwards compatible with the previous version.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Thu Aug  6 07:54:57 UTC 2015

   Modified Files:
   	pkgsrc/devel/libidn: Makefile distinfo

   Log Message:
   Update to 1.32:

   * Version 1.32 (released 2015-08-01) [beta]

   ** libidn: Fix crash in idna_to_unicode_8z8z and idna_to_unicode_8zlz.
   This problem was introduced in 1.31.  Reported by Adam Sampson.

   ** API and ABI is backwards compatible with the previous version.

2 files changed, 6 insertions, 7 deletions

diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index 1790dfa38e3..4958bf3c0c0 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.92 2015/06/12 10:48:51 wiz Exp $
+# $NetBSD: Makefile,v 1.92.2.1 2015/08/24 18:45:09 tron Exp $
 
-DISTNAME=	libidn-1.30
-PKGREVISION=	1
+DISTNAME=	libidn-1.32
 CATEGORIES=	devel
 MASTER_SITES=	ftp://alpha.gnu.org/pub/gnu/libidn/ \
 		${MASTER_SITE_GNU:=libidn/}
diff --git a/devel/libidn/distinfo b/devel/libidn/distinfo
index 7487852188a..3567895e966 100644
--- a/devel/libidn/distinfo
+++ b/devel/libidn/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.59 2015/03/05 21:05:14 wiz Exp $
+$NetBSD: distinfo,v 1.59.4.1 2015/08/24 18:45:09 tron Exp $
 
-SHA1 (libidn-1.30.tar.gz) = 557e1e37f0978e975b21bcdc243c198cb708bb75
-RMD160 (libidn-1.30.tar.gz) = 8fb47a04c456ed586e7a3b2fe0b45bb15943770d
-Size (libidn-1.30.tar.gz) = 3474545 bytes
+SHA1 (libidn-1.32.tar.gz) = ddd018611b98af7c67d434aa42d15d39f45129f5
+RMD160 (libidn-1.32.tar.gz) = 35564ab88310df83d0527c10ca07850a9219b86a
+Size (libidn-1.32.tar.gz) = 3483155 bytes
 SHA1 (patch-aa) = 569ffa945fb8f1aef509db6bcadbe1e63ba5df87