!6 update software to 0.1.10 in branch-LTS

Merge pull request !6 from zgzxx/openEuler-20.03-LTS

CVE-2019-3817-Fix-UAF-in-comps_objmrtree_unite-function.patch

@@ -1,91 +0,0 @@
-From e3a5d056633677959ad924a51758876d415e7046 Mon Sep 17 00:00:00 2001
-From: Riccardo Schirone <rschiron@redhat.com>
-Date: Mon, 21 Jan 2019 18:11:42 +0100
-Subject: [PATCH] Fix UAF in comps_objmrtree_unite function
-
-The added field is not used at all in many places and it is probably the
-left-over of some copy-paste.
-
-Signed-off-by: root <root@localhost.localdomain>
----
- libcomps/src/comps_mradix.c    | 2 --
- libcomps/src/comps_objmradix.c | 2 --
- libcomps/src/comps_objradix.c  | 2 --
- libcomps/src/comps_radix.c     | 1 -
- 4 files changed, 7 deletions(-)
-
-diff --git a/libcomps/src/comps_mradix.c b/libcomps/src/comps_mradix.c
-index 8ef9640..dfdee8e 100644
---- a/libcomps/src/comps_mradix.c
-+++ b/libcomps/src/comps_mradix.c
-@@ -177,7 +177,6 @@ void comps_mrtree_unite(COMPS_MRTree *rt1, COMPS_MRTree *rt2) {
-     struct Pair {
-         COMPS_HSList * subnodes;
-         char * key;
--        char added;
-     } *pair, *parent_pair;
- 
-     pair = malloc(sizeof(struct Pair));
-@@ -195,7 +194,6 @@ void comps_mrtree_unite(COMPS_MRTree *rt1, COMPS_MRTree *rt2) {
-         parent_pair = (struct Pair*) it->data;
-         free(it);
- 
--        pair->added = 0;
-         for (it = tmp_subnodes->first; it != NULL; it=it->next) {
-             pair = malloc(sizeof(struct Pair));
-             pair->subnodes = ((COMPS_MRTreeData*)it->data)->subnodes;
-diff --git a/libcomps/src/comps_objmradix.c b/libcomps/src/comps_objmradix.c
-index 9a2038b..22ad262 100644
---- a/libcomps/src/comps_objmradix.c
-+++ b/libcomps/src/comps_objmradix.c
-@@ -285,7 +285,6 @@ void comps_objmrtree_unite(COMPS_ObjMRTree *rt1, COMPS_ObjMRTree *rt2) {
-     struct Pair {
-         COMPS_HSList * subnodes;
-         char * key;
--        char added;
-     } *pair, *parent_pair;
- 
-     pair = malloc(sizeof(struct Pair));
-@@ -303,7 +302,6 @@ void comps_objmrtree_unite(COMPS_ObjMRTree *rt1, COMPS_ObjMRTree *rt2) {
-         parent_pair = (struct Pair*) it->data;
-         free(it);
- 
--        pair->added = 0;
-         for (it = tmp_subnodes->first; it != NULL; it=it->next) {
-             pair = malloc(sizeof(struct Pair));
-             pair->subnodes = ((COMPS_ObjMRTreeData*)it->data)->subnodes;
-diff --git a/libcomps/src/comps_objradix.c b/libcomps/src/comps_objradix.c
-index c657b75..840592a 100644
---- a/libcomps/src/comps_objradix.c
-+++ b/libcomps/src/comps_objradix.c
-@@ -692,7 +692,6 @@ void comps_objrtree_unite(COMPS_ObjRTree *rt1, COMPS_ObjRTree *rt2) {
-     struct Pair {
-         COMPS_HSList * subnodes;
-         char * key;
--        char added;
-     } *pair, *parent_pair;
- 
-     pair = malloc(sizeof(struct Pair));
-@@ -711,7 +711,6 @@ void comps_objrtree_unite(COMPS_ObjRTree *rt1, COMPS_ObjRTree *rt2) {
-         //printf("key-part:%s\n", parent_pair->key);
-         free(it);
- 
--        //pair->added = 0;
-         for (it = tmp_subnodes->first; it != NULL; it=it->next) {
-             pair = malloc(sizeof(struct Pair));
-             pair->subnodes = ((COMPS_ObjRTreeData*)it->data)->subnodes;
-diff --git a/libcomps/src/comps_radix.c b/libcomps/src/comps_radix.c
-index ada4fda..05dcaf2 100644
---- a/libcomps/src/comps_radix.c
-+++ b/libcomps/src/comps_radix.c
-@@ -529,7 +529,6 @@ void comps_rtree_unite(COMPS_RTree *rt1, COMPS_RTree *rt2) {
-     struct Pair {
-         COMPS_HSList * subnodes;
-         char * key;
--        char added;
-     } *pair, *parent_pair;
- 
-     pair = malloc(sizeof(struct Pair));
--- 
-2.19.1
-

libcomps.spec

@@ -2,16 +2,15 @@
 %define with_python3 1
 
 Name:           libcomps
-Version:        0.1.8
+Version:        0.1.10
-Release:        20
+Release:        1
 Summary:        Comps XML file manipulation library
 License:        GPLv2+
 URL:            https://github.com/rpm-software-management/libcomps
 Source0:        %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
 
-Patch6000:      CVE-2019-3817-Fix-UAF-in-comps_objmrtree_unite-function.patch
-
 BuildRequires:  gcc cmake zlib-devel libxml2-devel check-devel expat-devel
+Provides:       libcomps.so.0.1.6()(64bit)
 
 %description
 Libcomps is library for structure-like manipulation with content of
@@ -136,6 +135,12 @@ popd
 %endif
 
 %changelog
+* Sat Aug 1 2020 zhangguangzhi<zhangguangzhi3@huawei.com> - 0.1.10-1
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:Update to version 0.1.10
+
 * Thu Feb 20 2020 chengquan<chengquan3@huawei.com> - 0.1.8-20
 - Type:enhancement
 - ID:NA

libcomps.yaml

@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://github.com/rpm-software-management/libcomps
+tag_prefix: ^libcomps-
+seperator: "."