Update to 0.12

* Security update for CVE-2013-6370 and CVE-2013-6371
* Update API version

0.12

  * Address security issues:
    * CVE-2013-6371: hash collision denial of service
    * CVE-2013-6370: buffer overflow if size_t is larger than int

  * Avoid potential overflow in json_object_get_double

  * Eliminate the mc_abort() function and MC_ABORT macro.

  * Make the json_tokener_errors array local.  It has been deprecated for
     a while, and json_tokener_error_desc() should be used instead.

  * change the floating point output format to %.17g so values with
     more than 6 digits show up in the output.

  * Remove the old libjson.so name compatibility support.  The library is
      only created as libjson-c.so now and headers are only installed
      into the ${prefix}/json-c directory.

  * When supported by the linker, add the -Bsymbolic-functions flag.

  * Various changes to fix the build on MSVC.

  * Make strict mode more strict:
    * number must not start with 0
    * no single-quote strings
    * no comments
    * trailing char not allowed
    * only allow lowercase literals

  * Added a json_object_new_double_s() convenience function to allow
    an exact string representation of a double to be specified when
    creating the object and use it in json_tokener_parse_ex() so
    a re-serialized object more exactly matches the input.

  * Add support NaN and Infinity

4 files changed, 13 insertions, 10 deletions

diff --git a/textproc/json-c/Makefile b/textproc/json-c/Makefile
index a160c78b6b4..918ed5a9d49 100644
--- a/textproc/json-c/Makefile
+++ b/textproc/json-c/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2013/11/29 17:57:07 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/04/20 00:09:04 ryoon Exp $
 
-DISTNAME=	json-c-0.11
-PKGREVISION=	1
+DISTNAME=	json-c-0.12
 CATEGORIES=	textproc
 MASTER_SITES=	https://s3.amazonaws.com/json-c_releases/releases/
 
@@ -20,6 +19,9 @@ PKGCONFIG_OVERRIDE+=	json-c.pc.in
 
 CONFIGURE_ARGS+=	--disable-oldname-compat
 
+# Workaround for https://github.com/json-c/json-c/pull/132
+BUILDLINK_TRANSFORM+=	rm:-Werror
+
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 CFLAGS+=	-Wno-tautological-compare -Wno-unused-value
diff --git a/textproc/json-c/PLIST b/textproc/json-c/PLIST
index eac4285f759..b641edd43a2 100644
--- a/textproc/json-c/PLIST
+++ b/textproc/json-c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/11/29 17:45:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/04/20 00:09:04 ryoon Exp $
 include/json-c/arraylist.h
 include/json-c/bits.h
 include/json-c/debug.h
@@ -13,5 +13,6 @@ include/json-c/json_tokener.h
 include/json-c/json_util.h
 include/json-c/linkhash.h
 include/json-c/printbuf.h
+include/json-c/random_seed.h
 lib/libjson-c.la
 lib/pkgconfig/json-c.pc
diff --git a/textproc/json-c/buildlink3.mk b/textproc/json-c/buildlink3.mk
index d3be7b4b7a9..f258754b8fd 100644
--- a/textproc/json-c/buildlink3.mk
+++ b/textproc/json-c/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2013/11/25 11:59:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2014/04/20 00:09:04 ryoon Exp $
 
 BUILDLINK_TREE+=	json-c
 
 .if !defined(JSON_C_BUILDLINK3_MK)
 JSON_C_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.json-c+=	json-c>=0.10
+BUILDLINK_API_DEPENDS.json-c+=	json-c>=0.12
 BUILDLINK_ABI_DEPENDS.json-c?=	json-c>=0.11
 BUILDLINK_PKGSRCDIR.json-c?=	../../textproc/json-c
 .endif	# JSON_C_BUILDLINK3_MK
diff --git a/textproc/json-c/distinfo b/textproc/json-c/distinfo
index 14e12d74363..f2fe54a1754 100644
--- a/textproc/json-c/distinfo
+++ b/textproc/json-c/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2013/11/25 11:59:08 wiz Exp $
+$NetBSD: distinfo,v 1.3 2014/04/20 00:09:04 ryoon Exp $
 
-SHA1 (json-c-0.11.tar.gz) = 5d0377d2cc4a1af324d5aeb5b63032d1d026aacd
-RMD160 (json-c-0.11.tar.gz) = 04a5e2619a9543dfef5f3d6f19e2606c4241c6e9
-Size (json-c-0.11.tar.gz) = 557263 bytes
+SHA1 (json-c-0.12.tar.gz) = 5580aad884076c219d41160cbd8bc12213d12c37
+RMD160 (json-c-0.12.tar.gz) = dd6b6560185dddca9b072a3d07af7899bd64cc45
+Size (json-c-0.12.tar.gz) = 501419 bytes