update to 1.51.08, remove meson build

2022-12-12 13:23:53 -06:00 · 2022-12-12 13:23:53 -06:00 · 398566348e
commit 398566348e
parent c5b672b392
6 changed files with 27 additions and 1778 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,3 +3,4 @@
 /xmlrpc-c-1.48.0.tar.xz
 /xmlrpc-c-1.49.02.tar.xz
 /xmlrpc-c-1.51.0.tar.xz
+/xmlrpc-1.51.08.tgz
--- a/0001-Remove-trace-statements-accidentally-committed-with-.patch
+++ b/0001-Remove-trace-statements-accidentally-committed-with-.patch
@ -1,83 +0,0 @@
-From 78e995f9f2958fc54e2a559a52c81684dc3460cf Mon Sep 17 00:00:00 2001
-From: giraffedata <giraffedata@98333e67-4a24-44d7-a75c-e53540dd3050>
-Date: Sun, 21 Jan 2018 22:27:31 +0000
-Subject: [PATCH] Remove trace statements accidentally committed with 2977
-
-git-svn-id: https://svn.code.sf.net/p/xmlrpc-c/code/trunk@2981 98333e67-4a24-44d7-a75c-e53540dd3050
---
- src/cpp/value.cpp   | 8 --------
- src/xmlrpc_string.c | 5 -----
- 2 files changed, 13 deletions(-)
-
-diff --git a/src/cpp/value.cpp b/src/cpp/value.cpp
-index e2c12372..b319430e 100644
--- a/src/cpp/value.cpp
-+++ b/src/cpp/value.cpp
-@@ -1,4 +1,3 @@
-#include <iostream>
- /*****************************************************************************
-                                 value.cpp
- ******************************************************************************
-@@ -622,13 +621,9 @@ public:
- 
-         switch (nlCode) {
-         case value_string::nlCode_all:
-            cerr << "Going to call xmlrpc_string_new_lp" << endl;
-            cerr << "length = " << cppvalue.length() << ", value = "
-                 << cppvalue.c_str() << endl;
-             this->valueP = xmlrpc_string_new_lp(&env.env_c,
-                                                 cppvalue.length(),
-                                                 cppvalue.c_str());
-            cerr << "Back from xmlrpc_string_new_lp" << endl;
-             break;
-         case value_string::nlCode_lf:
-             this->valueP = xmlrpc_string_new_lp_cr(&env.env_c,
-@@ -661,12 +656,9 @@ value_string::value_string(std::string          const& cppvalue,
- 
- value_string::value_string(std::string const& cppvalue) {
- 
-    cerr << "value_string constructor entered" << endl;
-     cNewStringWrapper wrapper(cppvalue, nlCode_all);
-    cerr << "wrapper constructed" << endl;
- 
-     this->instantiate(wrapper.valueP);
-    cerr << "value_string constructor exiting" << endl;
- }
- 
- 
-diff --git a/src/xmlrpc_string.c b/src/xmlrpc_string.c
-index 2da61e4e..e6e00716 100644
--- a/src/xmlrpc_string.c
-+++ b/src/xmlrpc_string.c
-@@ -1,4 +1,3 @@
-#include <stdio.h>
- /*=============================================================================
-                               xmlrpc_string
- ===============================================================================
-@@ -746,15 +745,12 @@ stringNew(xmlrpc_env *     const envP,
-           enum crTreatment const crTreatment,
-           xmlrpc_value **  const valPP) {
- 
-    fprintf(stderr, "stringNew entered\n");
-     xmlrpc_value * valP;
- 
-     xmlrpc_validate_utf8(envP, value, length);
- 
-     if (!envP->fault_occurred) {
-        fprintf(stderr, "Going to xmlrpc_createXmlrpcValue\n");
-         xmlrpc_createXmlrpcValue(envP, &valP);
-        fprintf(stderr, "Back from createXmlrpcValue\n");
- 
-         if (!envP->fault_occurred) {
-             valP->_type = XMLRPC_TYPE_STRING;
-@@ -774,7 +770,6 @@ stringNew(xmlrpc_env *     const envP,
-                 *valPP = valP;
-         }
-     }
-    fprintf(stderr, "stringNew exiting\n");
- }
- 
- 
-- 
-2.17.0
-
--- a/0001-add-meson-buildsystem-definitions.patch
+++ b/0001-add-meson-buildsystem-definitions.patch
--- a/0002-chmod-x-xml-rpc-api2txt.patch
+++ b/0002-chmod-x-xml-rpc-api2txt.patch
@ -1,16 +0,0 @@
-From d97ec6e652690a321d7ce8c81aa30f87d9c0de8f Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-Date: Mon, 19 Dec 2016 21:33:47 +0100
-Subject: [PATCH 2/2] chmod +x xml-rpc-api2txt
-
-It's script which is installing into $bindir, so it must be executable.
-
-Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
- tools/xml-rpc-api2txt/xml-rpc-api2txt | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 tools/xml-rpc-api2txt/xml-rpc-api2txt
-
-diff --git a/tools/xml-rpc-api2txt/xml-rpc-api2txt b/tools/xml-rpc-api2txt/xml-rpc-api2txt
-old mode 100644
-new mode 100755
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (xmlrpc-c-1.51.0.tar.xz) = 23b0a2fd15ee8ee48d19ed2e329d1a81d3f5ed9b9c0948da736202dddcada1c0fdd378013392ef8e1a2380a2e83ea779d4d3f4f925ca7aab82d335f5c74c211e
+SHA512 (xmlrpc-1.51.08.tgz) = df0d8e3730b529fb10fb2cf9511dc55143ad3c7b4cce5522b61ed0d212080f3ebf4b6aa8a28911ddbe90029fce6bea7df28ee51f36196900a855beff5bd3a1cd
--- a/xmlrpc-c.spec
+++ b/xmlrpc-c.spec
@ -1,38 +1,25 @@
-%global advanced_branch 1
-
 # 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.0
-Release:        17%{?dist}
+Version:        1.51.08
+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/
-%{!?advanced_branch:Source0: http://dl.sourceforge.net/sourceforge/xmlrpc-c/xmlrpc-%version.tgz}
+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}
+#%%{?advanced_branch:Source0: xmlrpc-c-%%version.tar.xz}

 # 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
-#Patch104:       xmlrpc-c-printf-size_t.patch
-#Patch105:       xmlrpc-c-check-vasprintf-return-value.patch
-
-# Backported patches
-# https://sourceforge.net/p/xmlrpc-c/code/2981/
-# Fixes RHBZ #1541868
-Patch201:       0001-Remove-trace-statements-accidentally-committed-with-.patch
-
-# Meson buildsystem, see https://blogs.gnome.org/ignatenko/2016/12/17/meson-%E2%99%A5-xmlrpc-c/
-Patch1001:      0001-add-meson-buildsystem-definitions.patch
-Patch1002:      0002-chmod-x-xml-rpc-api2txt.patch

 BuildRequires:  git-core
 BuildRequires:  meson >= 0.36.0
@ -125,19 +112,24 @@ This package contains some handy XML-RPC demo applications.


 %prep
-%autosetup -Sgit
+%autosetup -Sgit -n xmlrpc-%{version}
+

 %build
-%meson %{?with_libxml2:-Dlibxml2-backend=true}
-%meson_build
+%configure
+%make_build
+# build order matters and multiple threads break it
+%make_build -j1 -C tools
+

 %install
-%meson_install
+%make_install
+%make_install -C tools
+
+
+%check
+#%%make_test

-%ldconfig_scriptlets
-%ldconfig_scriptlets client
-%ldconfig_scriptlets c++
-%ldconfig_scriptlets client++

 %files
 %license doc/COPYING lib/abyss/license.txt
@ -145,13 +137,14 @@ This package contains some handy XML-RPC demo applications.
 %if ! %{with libxml2}
 %{_libdir}/libxmlrpc_xml*.so.*
 %endif
-%{_libdir}/libxmlrpc_openssl.so.*
 %{_libdir}/libxmlrpc.so.*
 %{_libdir}/libxmlrpc_util.so.*
 %{_libdir}/libxmlrpc_abyss.so.*
 %{_libdir}/libxmlrpc_server.so.*
 %{_libdir}/libxmlrpc_server_abyss.so.*
 %{_libdir}/libxmlrpc_server_cgi.so.*
+%exclude %{_libdir}/libxmlrpc*.a
+

 %files client
 %{_libdir}/libxmlrpc_client.so.*
@ -191,6 +184,12 @@ This package contains some handy XML-RPC demo applications.
 %{_bindir}/xmlrpc_dumpserver

 %changelog
+* Tue Dec 06 2022 Jonathan Wright <jonathan@almalinux.org> - 1.51.08-1
+- update to 1.51.08
+- Remove meson build code, follow upstream build methods
+- rhbz#2009098
+- rhbz#2010890
+
 * Tue Dec 06 2022 Jonathan Wright <jonathan@almalinux.org> - 1.51.0-17
 - Merge PR from yselkowitz to fix meson builds