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

updated to 1.31.0

Browse Source
This commit is contained in:
Enrico Scholz 2012-07-01 14:16:54 +02:00
parent 0e9394f400
commit cd8280011f
6 changed files with 113 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/xmlrpc-c-1.30.6.tar.xz /xmlrpc-c-1.30.6.tar.xz
/xmlrpc-c-1.31.0.tar.xz

2
lastver
View File

@ -1 +1 @@
2328 2365

2
sources
View File

@ -1 +1 @@
547b4240059d2e0988f84314a3cabf60 xmlrpc-c-1.30.6.tar.xz 590e54981d832fbeb86f42313c47e022 xmlrpc-c-1.31.0.tar.xz

16
xmlrpc-c-30x-redirect.patch
View File

@ -1,27 +1,27 @@
From 07f7798d0b6c9b187dd6bfa567be74a224baf1fb Mon Sep 17 00:00:00 2001 From 255ebf4b1204124123971a3bb27741cccbb51692 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Thu, 29 Jul 2010 19:25:32 +0200 Date: Thu, 29 Jul 2010 19:25:32 +0200
Subject: [PATCH 5/5] allow 30x redirections Subject: [PATCH 5/8] allow 30x redirections
--- ---
lib/curl_transport/curltransaction.c | 4 ++++ lib/curl_transport/curltransaction.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-) 1 file changed, 4 insertions(+)
diff --git a/lib/curl_transport/curltransaction.c b/lib/curl_transport/curltransaction.c diff --git a/lib/curl_transport/curltransaction.c b/lib/curl_transport/curltransaction.c
index 3c75010..e1cfc64 100644 index 0f76fc2..6292aee 100644
--- a/lib/curl_transport/curltransaction.c --- a/lib/curl_transport/curltransaction.c
+++ b/lib/curl_transport/curltransaction.c +++ b/lib/curl_transport/curltransaction.c
@@ -495,6 +495,10 @@ setupCurlSession(xmlrpc_env * const envP, @@ -600,6 +600,10 @@ setupCurlSession(xmlrpc_env * const envP,
curl_easy_setopt(curlSessionP, CURLOPT_POST, 1); curl_easy_setopt(curlSessionP, CURLOPT_POST, 1);
curl_easy_setopt(curlSessionP, CURLOPT_URL, curlTransactionP->serverUrl); curl_easy_setopt(curlSessionP, CURLOPT_URL, transP->serverUrl);
+ curl_easy_setopt(curlSessionP, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curlSessionP, CURLOPT_FOLLOWLOCATION, 1);
+ curl_easy_setopt(curlSessionP, CURLOPT_MAXREDIRS, (long)10); + curl_easy_setopt(curlSessionP, CURLOPT_MAXREDIRS, (long)10);
+ curl_easy_setopt(curlSessionP, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); + curl_easy_setopt(curlSessionP, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ +
XMLRPC_MEMBLOCK_APPEND(char, envP, callXmlP, "\0", 1); XMLRPC_MEMBLOCK_APPEND(char, envP, transP->postDataP, "\0", 1);
if (!envP->fault_occurred) { if (!envP->fault_occurred) {
curl_easy_setopt(curlSessionP, CURLOPT_POSTFIELDS, curl_easy_setopt(curlSessionP, CURLOPT_POSTFIELDS,
-- --
1.7.1.1 1.7.10.4

135
xmlrpc-c-cmake.patch
View File

@ -1,29 +1,29 @@
From c86fa6d2bef36617385aebda3ee55da9a782b4d1 Mon Sep 17 00:00:00 2001 From 26a4d5168bb69474c3cc304f90592d37bf0be8fe Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Sat, 5 Apr 2008 10:55:02 +0200 Date: Sat, 5 Apr 2008 10:55:02 +0200
Subject: [PATCH 1/8] make -> cmake transition Subject: [PATCH 1/8] make -> cmake transition
cmake: updated cmake: updated
--- ---
CMakeLists.txt | 288 +++++++++++++++++++++++++++ CMakeLists.txt | 290 +++++++++++++++++++++++++++
cmake/try-attr.cc | 3 + cmake/try-attr.cc | 3 +
cmake/va-list-is-array.c | 9 + cmake/va-list-is-array.c | 9 +
examples/CMakeLists.txt | 63 ++++++ examples/CMakeLists.txt | 68 +++++++
examples/config.h | 1 + examples/config.h | 1 +
examples/cpp/CMakeLists.txt | 34 +++ examples/cpp/CMakeLists.txt | 34 ++++
include/CMakeLists.txt | 3 + include/CMakeLists.txt | 3 +
include/xmlrpc-c/CMakeLists.txt | 74 +++++++ include/xmlrpc-c/CMakeLists.txt | 74 +++++++
include/xmlrpc-c/config.h.cmake | 34 +++ include/xmlrpc-c/config.h.cmake | 34 ++++
lib/CMakeLists.txt | 12 + lib/CMakeLists.txt | 12 ++
lib/abyss/CMakeLists.txt | 3 + lib/abyss/CMakeLists.txt | 3 +
lib/abyss/src/CMakeLists.txt | 70 +++++++ lib/abyss/src/CMakeLists.txt | 70 +++++++
lib/abyss/src/xmlrpc_abyss.pc.cmake | 12 + lib/abyss/src/xmlrpc_abyss.pc.cmake | 12 ++
lib/curl_transport/CMakeLists.txt | 20 ++ lib/curl_transport/CMakeLists.txt | 20 ++
lib/expat/CMakeLists.txt | 9 + lib/expat/CMakeLists.txt | 9 +
lib/expat/gennmtab/CMakeLists.txt | 3 + lib/expat/gennmtab/CMakeLists.txt | 3 +
lib/expat/xmlparse/CMakeLists.txt | 7 + lib/expat/xmlparse/CMakeLists.txt | 7 +
lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake | 12 + lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake | 12 ++
lib/expat/xmltok/CMakeLists.txt | 23 ++ lib/expat/xmltok/CMakeLists.txt | 23 +++
lib/expat/xmltok/xmlrpc_xmltok.pc.cmake | 9 + lib/expat/xmltok/xmlrpc_xmltok.pc.cmake | 9 +
lib/libutil/CMakeLists.txt | 26 +++ lib/libutil/CMakeLists.txt | 26 +++
lib/libutil/xmlrpc_util.pc.cmake | 10 + lib/libutil/xmlrpc_util.pc.cmake | 10 +
@ -33,20 +33,21 @@ cmake: updated
src/CMakeLists.txt | 121 +++++++++++ src/CMakeLists.txt | 121 +++++++++++
src/cpp/CMakeLists.txt | 70 +++++++ src/cpp/CMakeLists.txt | 70 +++++++
src/cpp/test/CMakeLists.txt | 18 ++ src/cpp/test/CMakeLists.txt | 18 ++
src/cpp/xmlrpc++.pc.cmake | 12 + src/cpp/xmlrpc++.pc.cmake | 12 ++
src/cpp/xmlrpc_client++.pc.cmake | 12 + src/cpp/xmlrpc_client++.pc.cmake | 12 ++
src/cpp/xmlrpc_cpp.pc.cmake | 12 + src/cpp/xmlrpc_cpp.pc.cmake | 12 ++
src/cpp/xmlrpc_packetsocket.pc.cmake | 12 + src/cpp/xmlrpc_packetsocket.pc.cmake | 12 ++
src/cpp/xmlrpc_server++.pc.cmake | 12 + src/cpp/xmlrpc_server++.pc.cmake | 12 ++
src/cpp/xmlrpc_server_abyss++.pc.cmake | 12 + src/cpp/xmlrpc_server_abyss++.pc.cmake | 12 ++
src/cpp/xmlrpc_server_cgi++.pc.cmake | 12 + src/cpp/xmlrpc_server_cgi++.pc.cmake | 12 ++
src/cpp/xmlrpc_server_pstream++.pc.cmake | 12 + src/cpp/xmlrpc_server_pstream++.pc.cmake | 12 ++
src/xmlrpc.pc.cmake | 12 + src/xmlrpc.pc.cmake | 12 ++
src/xmlrpc_client.pc.cmake | 12 + src/xmlrpc_client.pc.cmake | 12 ++
src/xmlrpc_server.pc.cmake | 12 + src/xmlrpc_server.pc.cmake | 12 ++
src/xmlrpc_server_abyss.pc.cmake | 12 + src/xmlrpc_server_abyss.pc.cmake | 12 ++
src/xmlrpc_server_cgi.pc.cmake | 12 + src/xmlrpc_server_cgi.pc.cmake | 12 ++
test/CMakeLists.txt | 39 ++++ test/CMakeLists.txt | 41 ++++
test/cpp/CMakeLists.txt | 34 ++++
tools/CMakeLists.txt | 22 ++ tools/CMakeLists.txt | 22 ++
tools/binmode-rpc-kit/CMakeLists.txt | 1 + tools/binmode-rpc-kit/CMakeLists.txt | 1 +
tools/lib/CMakeLists.txt | 1 + tools/lib/CMakeLists.txt | 1 +
@ -63,8 +64,8 @@ cmake: updated
transport_config.h.cmake | 16 ++ transport_config.h.cmake | 16 ++
version.h.cmake | 5 + version.h.cmake | 5 +
xmlrpc-c-config | 105 ++++++++++ xmlrpc-c-config | 105 ++++++++++
xmlrpc_config.h.cmake | 177 ++++++++++++++++ xmlrpc_config.h.cmake | 183 +++++++++++++++++
59 files changed, 1587 insertions(+), 0 deletions(-) 60 files changed, 1636 insertions(+)
create mode 100644 CMakeLists.txt create mode 100644 CMakeLists.txt
create mode 100644 cmake/try-attr.cc create mode 100644 cmake/try-attr.cc
create mode 100644 cmake/va-list-is-array.c create mode 100644 cmake/va-list-is-array.c
@ -107,6 +108,7 @@ cmake: updated
create mode 100644 src/xmlrpc_server_abyss.pc.cmake create mode 100644 src/xmlrpc_server_abyss.pc.cmake
create mode 100644 src/xmlrpc_server_cgi.pc.cmake create mode 100644 src/xmlrpc_server_cgi.pc.cmake
create mode 100644 test/CMakeLists.txt create mode 100644 test/CMakeLists.txt
create mode 100644 test/cpp/CMakeLists.txt
create mode 100644 tools/CMakeLists.txt create mode 100644 tools/CMakeLists.txt
create mode 100644 tools/binmode-rpc-kit/CMakeLists.txt create mode 100644 tools/binmode-rpc-kit/CMakeLists.txt
create mode 100644 tools/lib/CMakeLists.txt create mode 100644 tools/lib/CMakeLists.txt
@ -127,10 +129,10 @@ cmake: updated
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..f2f114c index 0000000..2876dea
--- /dev/null --- /dev/null
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -0,0 +1,288 @@ @@ -0,0 +1,290 @@
+## -*- cmake -*- +## -*- cmake -*-
+project(xmlrpc-c) +project(xmlrpc-c)
+include(FindPkgConfig) +include(FindPkgConfig)
@ -145,8 +147,8 @@ index 0000000..f2f114c
+ +
+ +
+set(XMLRPC_C_VERSION_MAJOR "1" CACHE STRING "Version (major) of xmlrpc-c") +set(XMLRPC_C_VERSION_MAJOR "1" CACHE STRING "Version (major) of xmlrpc-c")
+set(XMLRPC_C_VERSION_MINOR "30" CACHE STRING "Version (minor) of xmlrpc-c") +set(XMLRPC_C_VERSION_MINOR "31" CACHE STRING "Version (minor) of xmlrpc-c")
+set(XMLRPC_C_VERSION_POINT "6" CACHE STRING "Version (point) of xmlrpc-c") +set(XMLRPC_C_VERSION_POINT "0" CACHE STRING "Version (point) of xmlrpc-c")
+ +
+set(XMLRPC_C_VERSION +set(XMLRPC_C_VERSION
+ "${XMLRPC_C_VERSION_MAJOR}.${XMLRPC_C_VERSION_MINOR}.${XMLRPC_C_VERSION_POINT}" + "${XMLRPC_C_VERSION_MAJOR}.${XMLRPC_C_VERSION_MINOR}.${XMLRPC_C_VERSION_POINT}"
@ -209,6 +211,8 @@ index 0000000..f2f114c
+ set(tmp 0) + set(tmp 0)
+ endif(WININET_CONFIG_EXECUTABLE) + endif(WININET_CONFIG_EXECUTABLE)
+ endif(DEFINED MUST_BUILD_WININET_CLIENT) + endif(DEFINED MUST_BUILD_WININET_CLIENT)
+
+ set(MSVCRT yes)
+else(WIN32) +else(WIN32)
+ set(tmp 0) + set(tmp 0)
+endif(WIN32) +endif(WIN32)
@ -445,10 +449,10 @@ index 0000000..1ad0bab
+int main() {} +int main() {}
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..4011f11 index 0000000..1535adf
--- /dev/null --- /dev/null
+++ b/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt
@@ -0,0 +1,63 @@ @@ -0,0 +1,68 @@
+# -*- cmake -*- +# -*- cmake -*-
+ +
+include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR})
@ -490,7 +494,9 @@ index 0000000..4011f11
+if(MUST_BUILD_CURL_CLIENT) +if(MUST_BUILD_CURL_CLIENT)
+ set(client_LIBS xmlrpc_client) + set(client_LIBS xmlrpc_client)
+ +
+ if(NOT DEFINED MSVCRT)
+ ensc_add_example(interrupted_client c client) + ensc_add_example(interrupted_client c client)
+ endif(NOT DEFINED MSVCRT)
+endif(MUST_BUILD_CURL_CLIENT) +endif(MUST_BUILD_CURL_CLIENT)
+ +
+if(ENABLE_CGI_SERVER) +if(ENABLE_CGI_SERVER)
@ -503,12 +509,15 @@ index 0000000..4011f11
+ set(abyss_server_LIBS xmlrpc_server_abyss) + set(abyss_server_LIBS xmlrpc_server_abyss)
+ +
+ ensc_add_example(compound_value_server c abyss_server) + ensc_add_example(compound_value_server c abyss_server)
+ ensc_add_example(interrupted_server c abyss_server)
+ ensc_add_example(xmlrpc_inetd_server c abyss_server) + ensc_add_example(xmlrpc_inetd_server c abyss_server)
+ ensc_add_example(xmlrpc_socket_server c abyss_server) + ensc_add_example(xmlrpc_socket_server c abyss_server)
+ ensc_add_example(xmlrpc_loop_server c abyss_server) + ensc_add_example(xmlrpc_loop_server c abyss_server)
+ ensc_add_example(xmlrpc_sample_add_server c abyss_server) + ensc_add_example(xmlrpc_sample_add_server c abyss_server)
+ ensc_add_example(xmlrpc_server_validatee c abyss_server) + ensc_add_example(xmlrpc_server_validatee c abyss_server)
+
+ if(NOT DEFINED MSVCRT)
+ ensc_add_example(interrupted_server c abyss_server)
+ endif(NOT DEFINED MSVCRT)
+endif(ENABLE_ABYSS_SERVER) +endif(ENABLE_ABYSS_SERVER)
+ +
+ensc_set_link_exe_flags(${example_TARGETS}) +ensc_set_link_exe_flags(${example_TARGETS})
@ -1033,7 +1042,7 @@ index 0000000..17535ab
+endif(MUST_BUILD_WININET_CLIENT) +endif(MUST_BUILD_WININET_CLIENT)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..e3635d2 index 0000000..f51e15b
--- /dev/null --- /dev/null
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -0,0 +1,121 @@ @@ -0,0 +1,121 @@
@ -1097,7 +1106,7 @@ index 0000000..e3635d2
+ xmlrpc_data.c xmlrpc_datetime.c xmlrpc_string.c + xmlrpc_data.c xmlrpc_datetime.c xmlrpc_string.c
+ xmlrpc_array.c xmlrpc_struct.c + xmlrpc_array.c xmlrpc_struct.c
+ xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c + xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c
+ xmlrpc_base64.c xmlrpc_authcookie.c) + xmlrpc_authcookie.c)
+ +
+set_target_properties(xmlrpc +set_target_properties(xmlrpc
+ PROPERTIES + PROPERTIES
@ -1494,10 +1503,10 @@ index 0000000..748b550
+Cflags: -I${includedir} +Cflags: -I${includedir}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..fdc6869 index 0000000..e712382
--- /dev/null --- /dev/null
+++ b/test/CMakeLists.txt +++ b/test/CMakeLists.txt
@@ -0,0 +1,39 @@ @@ -0,0 +1,41 @@
+# -*- cmake -*- +# -*- cmake -*-
+ +
+set(test_SOURCES +set(test_SOURCES
@ -1537,6 +1546,48 @@ index 0000000..fdc6869
+ +
+enable_testing() +enable_testing()
+add_test(runtests src-test) +add_test(runtests src-test)
+
+add_subdirectory(cpp)
diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt
new file mode 100644
index 0000000..15a7c3a
--- /dev/null
+++ b/test/cpp/CMakeLists.txt
@@ -0,0 +1,34 @@
+# -*- cmake -*-
+
+set(testcpp_SOURCES
+ test.cpp
+ base64.cpp
+ registry.cpp
+ server_abyss.cpp
+ server_pstream.cpp
+ tools.cpp
+ value.cpp
+ xml.cpp)
+
+if(MUST_BUILD_CLIENT)
+ list(APPEND testcpp_SOURCES testclient.cpp)
+ list(APPEND testcpp_LIBS xmlrpc_client++)
+else(MUST_BUILD_CLIENT)
+ list(APPEND testcpp_SOURCES testclient_dummy.c)
+endif(MUST_BUILD_CLIENT)
+
+if(DEFINED MSVCRT)
+ list(APPEND testcpp_SOURCES ${CMAKE_SOURCE_DIR}/Windows/socketpair.cpp)
+endif(DEFINED MSVCRT)
+
+add_executable(src-testcpp ${testcpp_SOURCES})
+target_link_libraries(src-testcpp
+ xmlrpc++
+ xmlrpc_server++
+ xmlrpc_server_abyss++
+ xmlrpc_server_pstream++
+ xmlrpc_cpp
+ util ${testcpp_LIBS})
+
+enable_testing()
+add_test(runtests src-testcpp)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..cd2a6d7 index 0000000..cd2a6d7
@ -1885,10 +1936,10 @@ index 0000000..50577fd
+exec pkg-config "$@" $comp +exec pkg-config "$@" $comp
diff --git a/xmlrpc_config.h.cmake b/xmlrpc_config.h.cmake diff --git a/xmlrpc_config.h.cmake b/xmlrpc_config.h.cmake
new file mode 100644 new file mode 100644
index 0000000..561afdc index 0000000..9eff724
--- /dev/null --- /dev/null
+++ b/xmlrpc_config.h.cmake +++ b/xmlrpc_config.h.cmake
@@ -0,0 +1,177 @@ @@ -0,0 +1,183 @@
+/* -*- c -*- */ +/* -*- c -*- */
+ +
+#ifndef H_XMLRPC_C_CONFIG_H +#ifndef H_XMLRPC_C_CONFIG_H
@ -2065,7 +2116,13 @@ index 0000000..561afdc
+ #define XMLRPC_S_IRUSR S_IRUSR + #define XMLRPC_S_IRUSR S_IRUSR
+#endif +#endif
+ +
+#if MSVCRT
+ #define XMLRPC_CHDIR _chdir
+#else
+ #define XMLRPC_CHDIR chdir
+#endif
+
+#endif +#endif
-- --
1.7.7.6 1.7.10.4

7
xmlrpc-c.spec
View File

@ -1,11 +1,11 @@
%global advanced_branch 1 %global advanced_branch 1
%global svnrev 2328 %global svnrev 2365
%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} %{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
Summary: A lightweight RPC library based on XML and HTTP Summary: A lightweight RPC library based on XML and HTTP
Name: xmlrpc-c Name: xmlrpc-c
Version: 1.30.6 Version: 1.31.0
Release: %release_func 1800.svn%svnrev Release: %release_func 1800.svn%svnrev
# See COPYING for details. # See COPYING for details.
# The Python 1.5.2 license used by a few files is just BSD. # The Python 1.5.2 license used by a few files is just BSD.
@ -236,6 +236,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sun Jul 1 2012 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 1.31.0-1800.svn2365
- updated to 1.31.0
* Wed Jun 6 2012 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 1.30.6-1800.svn2328 * Wed Jun 6 2012 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 1.30.6-1800.svn2328
- updated to 1.30.6 - updated to 1.30.6