!108 sync from openeuler

From: @duguhaotian
Reviewed-by: @jingxiaolu
Signed-off-by: @jingxiaolu

0001-modified-ipconfig.json-to-adapt-to-newest-version-of.patch

@@ -1,7 +1,7 @@
 From c3013bfda83f3bcdcf518f29ad942bd99b4a356c Mon Sep 17 00:00:00 2001
 From: chengzrz <czrzrichard@gmail.com>
 Date: Thu, 28 Oct 2021 03:18:15 -0400
-Subject: [PATCH 1/2] modified ipconfig.json to adapt to newest version of cni
+Subject: [PATCH 1/6] modified ipconfig.json to adapt to newest version of cni
  plugins
 
 ---

0002-disable-lxc_keep-with-oci-image.patch

@@ -1,7 +1,7 @@
 From 409f5bf06e782fe5cbcf01e463b114c973b33dcb Mon Sep 17 00:00:00 2001
 From: gaohuatao <gaohuatao@huawei.com>
 Date: Thu, 21 Oct 2021 12:11:00 +0800
-Subject: [PATCH 2/2] disable lxc_keep with oci image
+Subject: [PATCH 2/6] disable lxc_keep with oci image
 
 Signed-off-by: gaohuatao <gaohuatao@huawei.com>
 ---

0003-add-self-def-runtime-for-shimv2.patch

@@ -1,7 +1,7 @@
 From 456e7da83acd8e5ad6d478d41d5f6e81c5611964 Mon Sep 17 00:00:00 2001
 From: gaohuatao <gaohuatao@huawei.com>
 Date: Tue, 16 Nov 2021 11:35:11 +0800
-Subject: [PATCH 3/4] add self def runtime for shimv2
+Subject: [PATCH 3/6] add self def runtime for shimv2
 
 Signed-off-by: gaohuatao <gaohuatao@huawei.com>
 ---

0004-move-cri-runtimes-to-daemon.patch

@@ -1,7 +1,7 @@
 From 3297f92307fd8a733f5d72ad2a0a85f7e61fb473 Mon Sep 17 00:00:00 2001
 From: gaohuatao <gaohuatao@huawei.com>
 Date: Tue, 16 Nov 2021 18:53:33 +0800
-Subject: [PATCH 4/4] move cri runtimes to daemon
+Subject: [PATCH 4/6] move cri runtimes to daemon
 
 Signed-off-by: gaohuatao <gaohuatao@huawei.com>
 ---

0005-config-v2-and-inspect-were-modified-to-support-modif.patch

@@ -1,8 +1,8 @@
 From a4ad5c5d0a428d1e603e91d14585f942e0e7453c Mon Sep 17 00:00:00 2001
 From: chengzrz <czrzrichard@gmail.com>
 Date: Thu, 11 Nov 2021 16:47:58 +0800
-Subject: [PATCH] config-v2 and inspect were modified to support modifications
- on isulad
+Subject: [PATCH 5/6] config-v2 and inspect were modified to support
+ modifications on isulad
 
 Signed-off-by: chengzrz <czrzrichard@gmail.com>
 ---
@@ -44,5 +44,5 @@ index 66307bc..ef7792f 100644
              }
          }
 -- 
-2.25.1
+2.20.1
 

0006-support-null-value-in-json.patch

@@ -0,0 +1,25 @@
+From b6845431ea3aafc32419430bef4a3e59781d7133 Mon Sep 17 00:00:00 2001
+From: haozi007 <liuhao27@huawei.com>
+Date: Wed, 24 Nov 2021 07:38:39 +0000
+Subject: [PATCH 6/6] support null value in json
+
+Signed-off-by: haozi007 <liuhao27@huawei.com>
+---
+ third_party/libocispec/common_c.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/libocispec/common_c.py b/third_party/libocispec/common_c.py
+index 78224c7..968d5d2 100644
+--- a/third_party/libocispec/common_c.py
++++ b/third_party/libocispec/common_c.py
+@@ -126,6 +126,7 @@ static yajl_gen_status gen_yajl_val (yajl_val obj, yajl_gen g, parser_error *err
+         case yajl_t_false:
+             return yajl_gen_bool (g, false);
+         case yajl_t_null:
++            return yajl_gen_null(g);
+         case yajl_t_any:
+             return __stat;
+     }
+-- 
+2.20.1
+

lcr.spec

@@ -1,5 +1,5 @@
 %global _version 2.0.6
-%global _release 5
+%global _release 6
 %global _inner_name isula_libutils
 
 Name:      lcr
@@ -17,6 +17,7 @@ Patch2:	0002-disable-lxc_keep-with-oci-image.patch
 Patch3: 0003-add-self-def-runtime-for-shimv2.patch
 Patch4: 0004-move-cri-runtimes-to-daemon.patch
 Patch5: 0005-config-v2-and-inspect-were-modified-to-support-modif.patch
+Patch6: 0006-support-null-value-in-json.patch
 
 %define lxcver 4.0.3-2021012801
 
@@ -105,6 +106,12 @@ rm -rf %{buildroot}
 %{_includedir}/%{_inner_name}/*.h
 
 %changelog
+* Wed Nov 24 2021 haozi007 <liuhao27@huawei.com> - 2.0.6-6
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC: support null value in json
+
 * Tue Nov 23 2021 chengzeruizhi <chengzeruizhi@huawei.com> - 2.0.6-5
 - Type:enhancement
 - ID:NA