sync from upstream

Signed-off-by: jikai <jikai11@huawei.com>
(cherry picked from commit 7497c2f883d3e5238af5c18bb4273eb2e70ea2f6)

0001-add-systemd-cgroup-field-in-isulad-and-shim-config.patch

@@ -0,0 +1,42 @@
+From 3bcb8f3f60abb6ab6cde999cadb6a836744d4104 Mon Sep 17 00:00:00 2001
+From: jikai <jikai11@huawei.com>
+Date: Thu, 11 Jan 2024 19:00:19 +0800
+Subject: [PATCH 1/3] add systemd-cgroup field in isulad and shim config
+
+Signed-off-by: jikai <jikai11@huawei.com>
+---
+ src/json/schema/isulad-daemon-configs.json     | 3 +++
+ src/json/schema/shim/client/process-state.json | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/json/schema/isulad-daemon-configs.json b/src/json/schema/isulad-daemon-configs.json
+index 7a8657c..46cf9e2 100644
+--- a/src/json/schema/isulad-daemon-configs.json
++++ b/src/json/schema/isulad-daemon-configs.json
+@@ -173,6 +173,9 @@
+         },
+         "enable-cri-v1": {
+             "type": "boolean"
++        },
++        "systemd-cgroup": {
++            "type": "boolean"
+         }
+     }
+ }
+diff --git a/src/json/schema/shim/client/process-state.json b/src/json/schema/shim/client/process-state.json
+index 2383b43..15dbe91 100644
+--- a/src/json/schema/shim/client/process-state.json
++++ b/src/json/schema/shim/client/process-state.json
+@@ -204,6 +204,9 @@
+         },
+         "logMaxsize": {
+             "type": "int64"
++        },
++        "systemdCgroup": {
++            "type": "boolean"
+         }
+     }
+ }
+-- 
+2.33.0
+

0003-add-swap-usage-fields-in-shim-stats-and-container-in.patch

@@ -0,0 +1,53 @@
+From 299f54b13a85855540e6d28e9c9bfefb7bc66f14 Mon Sep 17 00:00:00 2001
+From: jikai <jikai11@huawei.com>
+Date: Fri, 12 Jan 2024 11:30:34 +0800
+Subject: [PATCH 3/3] add swap usage fields in shim stats and container info
+
+Signed-off-by: jikai <jikai11@huawei.com>
+---
+ src/json/schema/container/info.json            |  6 ++++++
+ src/json/schema/shim/client/runtime-stats.json | 11 +++++++++++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/src/json/schema/container/info.json b/src/json/schema/container/info.json
+index 53d8a91..3bf1033 100644
+--- a/src/json/schema/container/info.json
++++ b/src/json/schema/container/info.json
+@@ -79,6 +79,12 @@
+     },
+     "timestamp": {
+       "type": "uint64"
++    },
++    "swap_used": {
++      "type": "uint64"
++    },
++    "swap_limit": {
++      "type": "uint64"
+     }
+   }
+ }
+diff --git a/src/json/schema/shim/client/runtime-stats.json b/src/json/schema/shim/client/runtime-stats.json
+index 35cfe64..9d92a81 100644
+--- a/src/json/schema/shim/client/runtime-stats.json
++++ b/src/json/schema/shim/client/runtime-stats.json
+@@ -63,6 +63,17 @@
+                                     "$ref": "../../defs.json#/definitions/uint64"
+                                 }
+                             }
++                        },
++                        "swap": {
++                            "type": "object",
++                            "properties": {
++                                "usage": {
++                                    "$ref": "../../defs.json#/definitions/uint64"
++                                },
++                                "limit": {
++                                    "$ref": "../../defs.json#/definitions/uint64"
++                                }
++                            }
+                         }
+                     }
+                 },
+-- 
+2.33.0
+

lcr.spec

@@ -1,5 +1,5 @@
 %global _version 2.1.4
-%global _release 1
+%global _release 2
 %global _inner_name isula_libutils
 %global enable_lxc 1
 
@@ -13,6 +13,10 @@ Group:     Applications/System
 License:   LGPLv2.1+
 BuildRoot: %{_tmppath}/lcr-%{version}
 
+Patch0001: 0001-add-systemd-cgroup-field-in-isulad-and-shim-config.patch
+Patch0002: 0002-Add-http-parser-as-third-party-component.patch
+Patch0003: 0003-add-swap-usage-fields-in-shim-stats-and-container-in.patch
+
 %define lxcver_lower 4.0.3-2022102400
 %define lxcver_upper 5.0.3
 
@@ -127,6 +131,12 @@ rm -rf %{buildroot}
 %{_includedir}/lcr/utils_compile.h
 
 %changelog
+* Tue Mar 19 2024 jikai<jikai11@huawei.com> - 2.1.4-2
+- Type:enhancement
+- CVE:NA
+- SUG:NA
+- DESC:sync from upstream
+
 * Tue Jan 30 2024 jikai<jikai11@huawei.com> - 2.1.4-1
 - Type:enhancement
 - CVE:NA