From 6dedca4cd35ea659f2d6fe725dfc3e5f007e30d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cliuxiaoping=E2=80=9D?= Date: Fri, 6 May 2022 15:32:09 +0800 Subject: [PATCH] Remove tail space --- 0001-add-meson-buildsystem-definitions.patch | 6 +++--- ...-Add-missing-validation-of-encoding-CVE-2022-25235.patch | 2 +- xmlrpc-c.spec | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/0001-add-meson-buildsystem-definitions.patch b/0001-add-meson-buildsystem-definitions.patch index ce1328f..ce1dfe0 100644 --- a/0001-add-meson-buildsystem-definitions.patch +++ b/0001-add-meson-buildsystem-definitions.patch @@ -91,9 +91,9 @@ index 00000000..e8a633e7 +#ifndef XMLRPC_C_CONFIG_H_INCULDED +#define XMLRPC_C_CONFIG_H_INCLUDED + -+/* This file, part of XML-RPC For C/C++, is meant to -+ define characteristics of this particular installation -+ that the other header files need in ++/* This file, part of XML-RPC For C/C++, is meant to ++ define characteristics of this particular installation ++ that the other header files need in + order to compile correctly when #included in Xmlrpc-c + user code. + diff --git a/0004-Add-missing-validation-of-encoding-CVE-2022-25235.patch b/0004-Add-missing-validation-of-encoding-CVE-2022-25235.patch index a11e792..095b9bd 100644 --- a/0004-Add-missing-validation-of-encoding-CVE-2022-25235.patch +++ b/0004-Add-missing-validation-of-encoding-CVE-2022-25235.patch @@ -45,7 +45,7 @@ index 7b31fbb..3b0c950 100644 -#define utf8_isInvalid2 isNever +static +int utf8_isInvalid2(const ENCODING *enc ATTR_UNUSED, const char *p) -+{ ++{ + return UTF8_INVALID2((const unsigned char *)p); +} diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec index f572796..6d3b3db 100644 --- a/xmlrpc-c.spec +++ b/xmlrpc-c.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global advanced_branch 1 # Upstream libxml2 backend is completely broken since 2015 @@ -6,7 +7,7 @@ Name: xmlrpc-c Version: 1.51.0 -Release: 5%{?dist}.1 +Release: 5%{anolis_release}%{?dist}.1 Summary: Lightweight RPC library based on XML and HTTP # See doc/COPYING for details. # The Python 1.5.2 license used by a few files is just BSD. @@ -192,6 +193,9 @@ This package contains some handy XML-RPC demo applications. %{_bindir}/xmlrpc_dumpserver %changelog +* Fri May 06 2022 Liu Xiaoping - 1.51.0-5.0.1.1 +- Remove tail space + * Thu Mar 03 2022 Rob Crittenden - 1.51.0-5.1 - Add missing validation of encoding (CVE-2022-25235) (#2058114) -- Gitee