From 744fe5ed4415f7524da2814a28bc64519e820c4d Mon Sep 17 00:00:00 2001
From: Corey Farrell <git@cfware.com>
Date: Fri, 9 Feb 2018 12:31:18 -0500
Subject: [PATCH] jansson 2.11

---
 CHANGES         | 42 ++++++++++++++++++++++++++++++++++++++++++
 CMakeLists.txt  |  4 ++--
 configure.ac    |  2 +-
 doc/conf.py     |  2 +-
 src/Makefile.am |  2 +-
 src/jansson.h   |  4 ++--
 6 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index ef4e850..78d4590 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,45 @@
+Version 2.11
+============
+
+Released 2018-02-09
+
+* New features:
+
+  - Add `json_pack()` format specifiers s*, o* and O* for values that
+    can be omitted if null (#339).
+
+  - Add `json_error_code()` to retrieve numeric error codes (#365, #380,
+    #381).
+
+  - Enable thread safety for `json_dump()` on all systems.  Enable thread
+    safe `json_decref()` and `json_incref()` for modern compilers (#389).
+
+  - Add `json_sprintf()` and `json_vsprintf()` (#393).
+
+* Bug Fixes:
+
+  - Fix incorrect report of success from `json_dump_file()` when an error
+    is returned by `fclose()` (#359).
+
+  - Make json_equal() const-correct (#344).
+
+  - Fix incomplete stealing of references by `json_pack()` (#374).
+
+* Build:
+
+  - Work around gcc's -Wimplicit-fallthrough.
+
+  - Fix CMake detection of `sys/types.h` header (#375).
+
+  - Fix `jansson.pc` generated by CMake to be more consistent with the one
+    generated using GNU Autotools (#368).
+
+* Other:
+
+  - Miscellaneous documentation fixes (#356, #378, #395).
+
+  - Remove unnecessary reference actions from parsers (#377).
+
 Version 2.10
 ============
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10032d5..16cf552 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,10 +86,10 @@ endif (WIN32)
 # set (JANSSON_VERSION "2.3.1")
 # set (JANSSON_SOVERSION 2)
 
-set(JANSSON_DISPLAY_VERSION "2.10")
+set(JANSSON_DISPLAY_VERSION "2.11")
 
 # This is what is required to match the same numbers as automake's
-set(JANSSON_VERSION "4.10.0")
+set(JANSSON_VERSION "4.11.0")
 set(JANSSON_SOVERSION 4)
 
 # for CheckFunctionKeywords
diff --git a/configure.ac b/configure.ac
index fa0f005..4ab9d3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([jansson], [2.10], [petri@digip.org])
+AC_INIT([jansson], [2.11], [petri@digip.org])
 
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([1.10 foreign])
diff --git a/doc/conf.py b/doc/conf.py
index 5a66f3d..ded8ead 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -48,7 +48,7 @@ copyright = u'2009-2016, Petri Lehtinen'
 # built documents.
 #
 # The short X.Y version.
-version = '2.10'
+version = '2.11'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5516927..f823195 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,4 +24,4 @@ libjansson_la_SOURCES = \
 libjansson_la_LDFLAGS = \
 	-no-undefined \
 	-export-symbols-regex '^json_' \
-	-version-info 14:0:10
+	-version-info 15:0:11
diff --git a/src/jansson.h b/src/jansson.h
index 82709eb..f8d57bd 100644
--- a/src/jansson.h
+++ b/src/jansson.h
@@ -21,11 +21,11 @@ extern "C" {
 /* version */
 
 #define JANSSON_MAJOR_VERSION  2
-#define JANSSON_MINOR_VERSION  10
+#define JANSSON_MINOR_VERSION  11
 #define JANSSON_MICRO_VERSION  0
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.10"
+#define JANSSON_VERSION  "2.11"
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */