rpms/xmlrpc-c
7
0
Fork 0
Code Issues Pull Requests Releases Activity

updated to 1.22.01

Browse Source
This commit is contained in:
ensc 2010-04-18 10:20:09 +00:00
parent f1cb8ffb9f
commit c5554ba82c
9 changed files with 60 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
xmlrpc-c-1.21.00.tar.bz2
xmlrpc-c-1.22.01.tar.bz2

2
lastver
View File

@ -1 +1 @@
1851
1907

2
sources
View File

@ -1 +1 @@
c0fe943c3097a50474de5728a1423b20 xmlrpc-c-1.21.00.tar.bz2
dcc57ac5af6d8d59549a68425267ad92 xmlrpc-c-1.22.01.tar.bz2

66
xmlrpc-c-cmake.patch
View File

@ -1,13 +1,13 @@
From ea80db5265eac761ecb90c92ee7712fcaf014730 Mon Sep 17 00:00:00 2001
From dcf6c3f2ee6b75441bf71df91b0999810e230423 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Sat, 5 Apr 2008 10:55:02 +0200
Subject: [PATCH 1/5] make -> cmake transition
---
CMakeLists.txt | 286 +++++++++++++++++++++++++++
CMakeLists.txt | 284 +++++++++++++++++++++++++++
cmake/try-attr.cc | 3 +
cmake/va-list-is-array.c | 9 +
examples/CMakeLists.txt | 57 ++++++
examples/CMakeLists.txt | 60 ++++++
examples/config.h | 1 +
examples/cpp/CMakeLists.txt | 34 ++++
include/CMakeLists.txt | 3 +
@ -29,7 +29,7 @@ Subject: [PATCH 1/5] make -> cmake transition
lib/libwww_transport/CMakeLists.txt | 7 +
lib/util/CMakeLists.txt | 17 ++
lib/wininet_transport/CMakeLists.txt | 7 +
src/CMakeLists.txt | 121 +++++++++++
src/CMakeLists.txt | 122 ++++++++++++
src/cpp/CMakeLists.txt | 70 +++++++
src/cpp/test/CMakeLists.txt | 17 ++
src/cpp/xmlrpc++.pc.cmake | 12 ++
@ -47,8 +47,8 @@ Subject: [PATCH 1/5] make -> cmake transition
src/xmlrpc_server_abyss.pc.cmake | 12 ++
src/xmlrpc_server_cgi.pc.cmake | 12 ++
tools/CMakeLists.txt | 21 ++
tools/binmode-rpc-kit/CMakeLists.txt | 2 +
tools/lib/CMakefiles.txt | 1 +
tools/binmode-rpc-kit/CMakeLists.txt | 1 +
tools/lib/CMakeLists.txt | 1 +
tools/turbocharger/CMakeLists.txt | 1 +
tools/xml-rpc-api2cpp/CMakeLists.txt | 15 ++
tools/xml-rpc-api2txt/CMakeLists.txt | 7 +
@ -60,9 +60,9 @@ Subject: [PATCH 1/5] make -> cmake transition
tools/xmlrpc_transport/config.h | 1 +
transport_config.h.cmake | 16 ++
version.h.cmake | 5 +
xmlrpc-c-config | 108 ++++++++++
xmlrpc-c-config | 105 ++++++++++
xmlrpc_config.h.cmake | 141 +++++++++++++
58 files changed, 1519 insertions(+), 0 deletions(-)
58 files changed, 1517 insertions(+), 0 deletions(-)
create mode 100644 CMakeLists.txt
create mode 100644 cmake/try-attr.cc
create mode 100644 cmake/va-list-is-array.c
@ -107,7 +107,7 @@ Subject: [PATCH 1/5] make -> cmake transition
create mode 100644 src/xmlrpc_server_cgi.pc.cmake
create mode 100644 tools/CMakeLists.txt
create mode 100644 tools/binmode-rpc-kit/CMakeLists.txt
create mode 100644 tools/lib/CMakefiles.txt
create mode 100644 tools/lib/CMakeLists.txt
create mode 100644 tools/turbocharger/CMakeLists.txt
create mode 100644 tools/xml-rpc-api2cpp/CMakeLists.txt
create mode 100644 tools/xml-rpc-api2txt/CMakeLists.txt
@ -124,10 +124,10 @@ Subject: [PATCH 1/5] make -> cmake transition
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..dd162fd
index 0000000..c51d35a
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,286 @@
@@ -0,0 +1,284 @@
+## -*- cmake -*-
+project(xmlrpc-c)
+include(FindPkgConfig)
@ -142,8 +142,8 @@ index 0000000..dd162fd
+
+
+set(XMLRPC_C_VERSION_MAJOR "1" CACHE STRING "Version (major) of xmlrpc-c")
+set(XMLRPC_C_VERSION_MINOR "21" CACHE STRING "Version (minor) of xmlrpc-c")
+set(XMLRPC_C_VERSION_POINT "00" CACHE STRING "Version (point) of xmlrpc-c")
+set(XMLRPC_C_VERSION_MINOR "22" CACHE STRING "Version (minor) of xmlrpc-c")
+set(XMLRPC_C_VERSION_POINT "01" CACHE STRING "Version (point) of xmlrpc-c")
+
+set(XMLRPC_C_VERSION
+ "${XMLRPC_C_VERSION_MAJOR}.${XMLRPC_C_VERSION_MINOR}.${XMLRPC_C_VERSION_POINT}"
@ -405,8 +405,6 @@ index 0000000..dd162fd
+enable_testing()
+
+add_subdirectory(lib)
+add_subdirectory(Windows)
+add_subdirectory(doc)
+add_subdirectory(examples)
+add_subdirectory(include)
+add_subdirectory(src)
@ -440,10 +438,10 @@ index 0000000..1ad0bab
+int main() {}
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 0000000..6e18556
index 0000000..cfe9f52
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,57 @@
@@ -0,0 +1,60 @@
+# -*- cmake -*-
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
@ -467,6 +465,9 @@ index 0000000..6e18556
+endif(ENABLE_CPLUSPLUS)
+
+
+set(base_LIBS xmlrpc)
+ensc_add_example(json c base)
+ensc_add_example(gen_sample_add_xml c base)
+
+if(MUST_BUILD_CLIENT)
+ set(client_LIBS xmlrpc_client)
@ -1014,10 +1015,10 @@ index 0000000..17535ab
+endif(MUST_BUILD_WININET_CLIENT)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..ae20515
index 0000000..7ac88b0
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,121 @@
@@ -0,0 +1,122 @@
+# -*- cmake -*-
+
+if(ENABLE_LIBXML2_BACKEND)
@ -1074,6 +1075,7 @@ index 0000000..ae20515
+### libxmlrpc.so
+add_library(xmlrpc SHARED
+ double.c parse_datetime.c parse_value.c resource.c trace.c version.c
+ json.c
+ ${xmlrpc_xml_parser}
+ xmlrpc_data.c xmlrpc_datetime.c xmlrpc_string.c
+ xmlrpc_array.c xmlrpc_struct.c
@ -1544,17 +1546,16 @@ index 0000000..0bc45a9
+endif()
diff --git a/tools/binmode-rpc-kit/CMakeLists.txt b/tools/binmode-rpc-kit/CMakeLists.txt
new file mode 100644
index 0000000..a707c75
index 0000000..342423d
--- /dev/null
+++ b/tools/binmode-rpc-kit/CMakeLists.txt
@@ -0,0 +1,2 @@
@@ -0,0 +1 @@
+# -*- cmake -*-
+
diff --git a/tools/lib/CMakefiles.txt b/tools/lib/CMakefiles.txt
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
new file mode 100644
index 0000000..342423d
--- /dev/null
+++ b/tools/lib/CMakefiles.txt
+++ b/tools/lib/CMakeLists.txt
@@ -0,0 +1 @@
+# -*- cmake -*-
diff --git a/tools/turbocharger/CMakeLists.txt b/tools/turbocharger/CMakeLists.txt
@ -1730,10 +1731,10 @@ index 0000000..0c964a3
+#define XMLRPC_VERSION_POINT @XMLRPC_C_VERSION_POINT_NUM@
diff --git a/xmlrpc-c-config b/xmlrpc-c-config
new file mode 100755
index 0000000..327fad7
index 0000000..50577fd
--- /dev/null
+++ b/xmlrpc-c-config
@@ -0,0 +1,108 @@
@@ -0,0 +1,105 @@
+#! /bin/sh
+
+comp=
@ -1808,8 +1809,7 @@ index 0000000..327fad7
+
+test -z "$need_pstream" || comp="$comp xmlrpc_server_pstream++"
+test -z "$need_packetsocket" || comp="$comp xmlrpc_packetsocket"
+
+dummy_comp=xmlrpc_client
+test -n "$comp" || comp="xmlrpc xmlrpc_util"
+
+case $1 in
+ (--features|--modules)
@ -1817,12 +1817,15 @@ index 0000000..327fad7
+ exit 0
+ ;;
+ (--version)
+ comp=xmlrpc
+ set -- --modversion
+ ;;
+ (--exec-prefix)
+ comp=xmlrpc
+ set -- --variable=prefix
+ ;;
+ (--*dir|--prefix)
+ comp=xmlrpc
+ set -- --variable=${1##--}
+ ;;
+ (--ldflags)
@ -1834,13 +1837,8 @@ index 0000000..327fad7
+ (--cflags)
+ set -- "$1"
+ ;;
+ (*)
+ dummy_comp=
+ ;;
+esac
+
+test x"$comp" != x || comp=$dummy_comp
+
+exec pkg-config "$@" $comp
diff --git a/xmlrpc_config.h.cmake b/xmlrpc_config.h.cmake
new file mode 100644
@ -1990,5 +1988,5 @@ index 0000000..1665576
+
+#endif
--
1.6.5.2
1.7.0.1

48
xmlrpc-c-longlong.patch
View File

@ -1,4 +1,4 @@
From 17701db33a5bbf34861a4fffb174dc62907a57f4 Mon Sep 17 00:00:00 2001
From b6be576a399456ad8c24c29d05d8f2145d54cbaf Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Sat, 5 Apr 2008 11:41:34 +0200
Subject: [PATCH 3/5] Use proper datatypes for 'long long'
@ -16,26 +16,23 @@ It is arguable whether 'int_least64_t' (and 'int_least32_t')
would be a better choice for 'int64_t' (and 'int32_t'), but
for now, the patch uses datatypes with exact widths.
---
include/xmlrpc-c/base.h | 10 ++++++----
include/xmlrpc-c/base.h | 5 +++--
src/cpp/param_list.cpp | 8 ++++----
src/cpp/value.cpp | 2 +-
3 files changed, 11 insertions(+), 9 deletions(-)
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/xmlrpc-c/base.h b/include/xmlrpc-c/base.h
index 42808c8..bb5c348 100644
index 80d6252..43b13c2 100644
--- a/include/xmlrpc-c/base.h
+++ b/include/xmlrpc-c/base.h
@@ -5,7 +5,9 @@
@@ -5,6 +5,7 @@
#include <stddef.h>
#include <stdarg.h>
+#include <stdint.h>
#include <time.h>
+#include <stdint.h>
#include <xmlrpc-c/util.h>
#include <xmlrpc-c/config.h>
/* Defines XMLRPC_HAVE_WCHAR, XMLRPC_INT64, XMLRPC_HAVE_TIMEVAL */
@@ -40,9 +42,9 @@ extern unsigned int const xmlrpc_version_point;
@@ -40,9 +41,9 @@ extern unsigned int const xmlrpc_version_point;
typedef signed int xmlrpc_int;
/* An integer of the type defined by XML-RPC <int>; i.e. 32 bit */
@ -47,24 +44,6 @@ index 42808c8..bb5c348 100644
/* An integer of the type defined by "XML-RPC" <i8>; i.e. 64 bit */
typedef int xmlrpc_bool;
/* A boolean (of the type defined by XML-RPC <boolean>, but there's
@@ -130,7 +132,7 @@ extern xmlrpc_type xmlrpc_value_type (xmlrpc_value* const value);
xmlrpc_value *
xmlrpc_int_new(xmlrpc_env * const envP,
- int const intValue);
+ xmlrpc_int32 const intValue);
xmlrpc_value *
xmlrpc_i8_new(xmlrpc_env * const envP,
@@ -139,7 +141,7 @@ xmlrpc_i8_new(xmlrpc_env * const envP,
void
xmlrpc_read_int(xmlrpc_env * const envP,
const xmlrpc_value * const valueP,
- int * const intValueP);
+ xmlrpc_int32 * const intValueP);
xmlrpc_value *
xmlrpc_bool_new(xmlrpc_env * const envP,
diff --git a/src/cpp/param_list.cpp b/src/cpp/param_list.cpp
index 67c636b..60f7df9 100644
--- a/src/cpp/param_list.cpp
@ -92,19 +71,6 @@ index 67c636b..60f7df9 100644
value_i8(this->paramVector[paramNumber])));
if (longlongvalue < minimum)
diff --git a/src/cpp/value.cpp b/src/cpp/value.cpp
index e952a5f..fa2e5ce 100644
--- a/src/cpp/value.cpp
+++ b/src/cpp/value.cpp
@@ -265,7 +265,7 @@ value_int::value_int(xmlrpc_c::value const baseValue) {
value_int::operator int() const {
- int retval;
+ xmlrpc_int32 retval;
env_wrap env;
xmlrpc_read_int(&env.env_c, this->cValueP, &retval);
--
1.6.5.2
1.7.0.1

14
xmlrpc-c-printf-size_t.patch
View File

@ -1,4 +1,4 @@
From 9244de2058c6e1119905de9cef5a0cd87c44a58f Mon Sep 17 00:00:00 2001
From f3bbca91caac29b6b8f332d92f06261e16c86ba2 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Mon, 25 Feb 2008 17:48:25 +0100
Subject: [PATCH 2/5] fixed broken format string modifiers for size_t typed arguments
@ -169,10 +169,10 @@ index eeb3414..36e62f6 100644
else {
struct mbrDecomp * const mbrP =
diff --git a/src/xmlrpc_parse.c b/src/xmlrpc_parse.c
index 197da97..20bc919 100644
index ea01638..7debbf2 100644
--- a/src/xmlrpc_parse.c
+++ b/src/xmlrpc_parse.c
@@ -46,7 +46,7 @@
@@ -59,7 +59,7 @@ setParseFault(xmlrpc_env * const envP,
do \
if (xml_element_children_size(elem) != (count)) \
XMLRPC_FAIL3(env, XMLRPC_PARSE_ERROR, \
@ -181,8 +181,8 @@ index 197da97..20bc919 100644
xml_element_name(elem), (count), \
xml_element_children_size(elem)); \
while (0)
@@ -296,7 +296,7 @@ xmlrpc_parse_call(xmlrpc_env * const envP,
if (xmlLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
@@ -298,7 +298,7 @@ xmlrpc_parse_call(xmlrpc_env * const envP,
if (xmlDataLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
xmlrpc_env_set_fault_formatted(
envP, XMLRPC_LIMIT_EXCEEDED_ERROR,
- "XML-RPC request too large. Max allowed is %u bytes",
@ -190,7 +190,7 @@ index 197da97..20bc919 100644
xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID));
else {
xml_element * callElemP;
@@ -548,8 +548,8 @@ xmlrpc_parse_response2(xmlrpc_env * const envP,
@@ -550,8 +550,8 @@ xmlrpc_parse_response2(xmlrpc_env * const envP,
if (xmlDataLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
xmlrpc_env_set_fault_formatted(
envP, XMLRPC_LIMIT_EXCEEDED_ERROR,
@ -281,5 +281,5 @@ index 1417708..0d6ec11 100644
else {
vector<unsigned char> byteString(valueString.length() / 2);
--
1.6.5.2
1.7.0.1

4
xmlrpc-c-uninit-curl.patch
View File

@ -1,4 +1,4 @@
From 2d65f75290dee356f8678f800cbdba62bc5e6660 Mon Sep 17 00:00:00 2001
From 0b4f92b8ebaf4c6c57b5f68f7a944ee8f4b6e964 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Sat, 21 Nov 2009 14:12:41 +0100
Subject: [PATCH 5/5] fixed unitialized variable
@ -24,5 +24,5 @@ index 019c401..4e592da 100644
curlTransactionP->serverUrl = strdup(serverP->serverUrl);
if (curlTransactionP->serverUrl == NULL)
--
1.6.5.2
1.7.0.1

4
xmlrpc-c-va_list.patch
View File

@ -1,4 +1,4 @@
From aa0c7af2685446c8950bb31c88811745cf2696eb Mon Sep 17 00:00:00 2001
From bcb249907be37baabdecc68b8f9889ddaeec21ba Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Sat, 15 Nov 2008 12:07:25 +0100
Subject: [PATCH 4/5] 'va_list' param must be non-const
@ -37,5 +37,5 @@ index 02e66c9..1e0ab12 100644
const char * faultDescription;
--
1.6.5.2
1.7.0.1

10
xmlrpc-c.spec
View File

@ -1,12 +1,13 @@
%global advanced_branch 1
%global svnrev 1851
%global svnrev 1907
%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
%{!?release_func:%global release_func() %1%{?dist}}
Summary: A lightweight RPC library based on XML and HTTP
Name: xmlrpc-c
Version: 1.21.00
Release: %release_func 1401.%svnrev
Version: 1.22.01
Release: %release_func 1400.svn%svnrev
# See COPYING for details.
# The Python 1.5.2 license used by a few files is just BSD.
License: BSD and MIT
@ -231,6 +232,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Apr 18 2010 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 1.22.01-1400.svn1907
- updated to 1.22.01 (svn 1907)
* Tue Feb 23 2010 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 1.21.00-1401.1851
- require the various subpackages explicitly for -devel; the ld linker
scripts broke rpm's autodetection (#567400)