diff --git a/.gitignore b/.gitignore index 58aac05..5f24858 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /xmlrpc-c-1.49.02.tar.xz /xmlrpc-c-1.51.0.tar.xz /xmlrpc-1.51.08.tgz +/xmlrpc-c-1.59.02.tgz diff --git a/0001-xmlrpc_server_abyss-use-va_args-properly.patch b/0001-xmlrpc_server_abyss-use-va_args-properly.patch deleted file mode 100644 index f519d95..0000000 --- a/0001-xmlrpc_server_abyss-use-va_args-properly.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d31c2ffbf5181053330fa32e4f03c47283bd1448 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sat, 17 Dec 2016 10:28:31 +0100 -Subject: [PATCH 1/3] xmlrpc_server_abyss: use va_args properly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -../src/xmlrpc_server_abyss.c: In function ‘createServer’: -../src/xmlrpc_server_abyss.c:783:13: error: format not a string literal and no format arguments [-Werror=format-security] - xmlrpc_faultf(envP, error); - ^~~~~~~~~~~~~ - -Signed-off-by: Igor Gnatenko ---- - src/xmlrpc_server_abyss.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xmlrpc_server_abyss.c b/src/xmlrpc_server_abyss.c -index 8aacb4b..58f5ba0 100644 ---- a/src/xmlrpc_server_abyss.c -+++ b/src/xmlrpc_server_abyss.c -@@ -780,7 +780,7 @@ createServer(xmlrpc_env * const envP, - ServerInit2(abyssServerP, &error); - - if (error) { -- xmlrpc_faultf(envP, error); -+ xmlrpc_faultf(envP, "%s", error); - xmlrpc_strfree(error); - } - } --- -2.13.1 - diff --git a/0003-allow-30x-redirections.patch b/0003-allow-30x-redirections.patch index 7446fa6..2fef64d 100644 --- a/0003-allow-30x-redirections.patch +++ b/0003-allow-30x-redirections.patch @@ -12,6 +12,7 @@ index f0aafae..b5392a9 100644 --- a/lib/curl_transport/curltransaction.c +++ b/lib/curl_transport/curltransaction.c @@ -671,6 +671,10 @@ setupCurlSession(xmlrpc_env * const envP, + curl_easy_setopt(curlSessionP, CURLOPT_POST, 1); curl_easy_setopt(curlSessionP, CURLOPT_URL, transP->serverUrl); diff --git a/sources b/sources index c3151c1..7548335 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmlrpc-1.51.08.tgz) = df0d8e3730b529fb10fb2cf9511dc55143ad3c7b4cce5522b61ed0d212080f3ebf4b6aa8a28911ddbe90029fce6bea7df28ee51f36196900a855beff5bd3a1cd +SHA512 (xmlrpc-c-1.59.02.tgz) = 95bfc08d97af54d109e873b3f9e048d8c4779121408e3648ca43bc14cf502ec2d1a516c5b4fc62fc63dcbc6406f368d0285024f008a51af0eb2e2607c946ec5c diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec index 2f5a492..6fa9f95 100644 --- a/xmlrpc-c.spec +++ b/xmlrpc-c.spec @@ -1,28 +1,21 @@ -# Upstream libxml2 backend is completely broken since 2015 -# https://sourceforge.net/p/xmlrpc-c/patches/49/ +# Upstream libxml2 backend is completely broken since 2015 https://sourceforge.net/p/xmlrpc-c/patches/49/ %bcond_with libxml2 Name: xmlrpc-c -Version: 1.51.08 -Release: 3%{?dist} +Version: 1.59.02 +Release: 1%{?dist} 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. License: BSD and MIT URL: http://xmlrpc-c.sourceforge.net/ -Source: http://dl.sourceforge.net/sourceforge/xmlrpc-c/xmlrpc-%version.tgz -# generated by 'make svn-sources [SVN_VER=%%version SVN_REV=%%svnrev]'. Unfortunately, -# upstream does not tag versions so we must fetch from the branch and -# check which version was used for it -#%%{?advanced_branch:Source0: xmlrpc-c-%%version.tar.xz} +Source: http://dl.sourceforge.net/sourceforge/xmlrpc-c/xmlrpc-c-%version.tgz # Upstreamable patches -Patch101: 0001-xmlrpc_server_abyss-use-va_args-properly.patch Patch102: 0002-Use-proper-datatypes-for-long-long.patch Patch103: 0003-allow-30x-redirections.patch BuildRequires: git-core -BuildRequires: meson >= 0.36.0 BuildRequires: gcc BuildRequires: gcc-c++ %if %{with libxml2} @@ -112,7 +105,7 @@ This package contains some handy XML-RPC demo applications. %prep -%autosetup -Sgit -n xmlrpc-%{version} +%autosetup -Sgit %build @@ -184,6 +177,9 @@ This package contains some handy XML-RPC demo applications. %{_bindir}/xmlrpc_dumpserver %changelog +* Wed Jan 03 2024 Jonathan Wright - 1.59.02-1 +- Update to 1.59.02 rhbz#1694044 + * Sat Jul 22 2023 Fedora Release Engineering - 1.51.08-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild