diff --git a/.gitignore b/.gitignore index ee2d75a..0ebbd76 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xmlrpc-c-1.25.1.tar.xz /xmlrpc-c-1.26.0.tar.xz /xmlrpc-c-1.26.3.tar.xz +/xmlrpc-c-1.27.0.tar.xz diff --git a/lastver b/lastver index 6881443..9cf5084 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -2134 +2145 diff --git a/sources b/sources index 436f187..702288d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -265e3efabe5f228269a75dc49a23732b xmlrpc-c-1.26.3.tar.xz +a6bf32e29353362cbc59f05d1cc5c8ad xmlrpc-c-1.27.0.tar.xz diff --git a/xmlrpc-c-cmake.patch b/xmlrpc-c-cmake.patch index 0b0ade3..b542e60 100644 --- a/xmlrpc-c-cmake.patch +++ b/xmlrpc-c-cmake.patch @@ -1,52 +1,52 @@ -From 8410940833027653f6b58866e1468f5dc42dae0e Mon Sep 17 00:00:00 2001 +From c819f1eed7853ae0e8d2f9e53e69f4704f08da5f Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 5 Apr 2008 10:55:02 +0200 Subject: [PATCH 1/8] make -> cmake transition cmake: updated --- - CMakeLists.txt | 284 +++++++++++++++++++++++++++ + CMakeLists.txt | 288 +++++++++++++++++++++++++++ cmake/try-attr.cc | 3 + cmake/va-list-is-array.c | 9 + examples/CMakeLists.txt | 62 ++++++ examples/config.h | 1 + - examples/cpp/CMakeLists.txt | 34 ++++ + examples/cpp/CMakeLists.txt | 34 +++ include/CMakeLists.txt | 3 + include/xmlrpc-c/CMakeLists.txt | 74 +++++++ include/xmlrpc-c/config.h.cmake | 32 +++ - lib/CMakeLists.txt | 12 ++ + lib/CMakeLists.txt | 12 + lib/abyss/CMakeLists.txt | 3 + - lib/abyss/src/CMakeLists.txt | 66 ++++++ - lib/abyss/src/xmlrpc_abyss.pc.cmake | 12 ++ + lib/abyss/src/CMakeLists.txt | 70 +++++++ + lib/abyss/src/xmlrpc_abyss.pc.cmake | 12 + lib/curl_transport/CMakeLists.txt | 20 ++ lib/expat/CMakeLists.txt | 9 + lib/expat/gennmtab/CMakeLists.txt | 3 + lib/expat/xmlparse/CMakeLists.txt | 7 + - lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake | 12 ++ - lib/expat/xmltok/CMakeLists.txt | 23 +++ + lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake | 12 + + lib/expat/xmltok/CMakeLists.txt | 23 ++ lib/expat/xmltok/xmlrpc_xmltok.pc.cmake | 9 + lib/libutil/CMakeLists.txt | 26 +++ lib/libutil/xmlrpc_util.pc.cmake | 10 + lib/libwww_transport/CMakeLists.txt | 7 + lib/util/CMakeLists.txt | 17 ++ lib/wininet_transport/CMakeLists.txt | 7 + - src/CMakeLists.txt | 122 ++++++++++++ + src/CMakeLists.txt | 121 +++++++++++ src/cpp/CMakeLists.txt | 70 +++++++ src/cpp/test/CMakeLists.txt | 18 ++ - src/cpp/xmlrpc++.pc.cmake | 12 ++ - src/cpp/xmlrpc_client++.pc.cmake | 12 ++ - src/cpp/xmlrpc_cpp.pc.cmake | 12 ++ - src/cpp/xmlrpc_packetsocket.pc.cmake | 12 ++ - src/cpp/xmlrpc_server++.pc.cmake | 12 ++ - src/cpp/xmlrpc_server_abyss++.pc.cmake | 12 ++ - src/cpp/xmlrpc_server_cgi++.pc.cmake | 12 ++ - src/cpp/xmlrpc_server_pstream++.pc.cmake | 12 ++ - src/test/CMakeLists.txt | 39 ++++ - src/xmlrpc.pc.cmake | 12 ++ - src/xmlrpc_client.pc.cmake | 12 ++ - src/xmlrpc_server.pc.cmake | 12 ++ - src/xmlrpc_server_abyss.pc.cmake | 12 ++ - src/xmlrpc_server_cgi.pc.cmake | 12 ++ + src/cpp/xmlrpc++.pc.cmake | 12 + + src/cpp/xmlrpc_client++.pc.cmake | 12 + + src/cpp/xmlrpc_cpp.pc.cmake | 12 + + src/cpp/xmlrpc_packetsocket.pc.cmake | 12 + + src/cpp/xmlrpc_server++.pc.cmake | 12 + + src/cpp/xmlrpc_server_abyss++.pc.cmake | 12 + + src/cpp/xmlrpc_server_cgi++.pc.cmake | 12 + + src/cpp/xmlrpc_server_pstream++.pc.cmake | 12 + + src/xmlrpc.pc.cmake | 12 + + src/xmlrpc_client.pc.cmake | 12 + + src/xmlrpc_server.pc.cmake | 12 + + src/xmlrpc_server_abyss.pc.cmake | 12 + + src/xmlrpc_server_cgi.pc.cmake | 12 + + test/CMakeLists.txt | 39 ++++ tools/CMakeLists.txt | 21 ++ tools/binmode-rpc-kit/CMakeLists.txt | 1 + tools/lib/CMakeLists.txt | 1 + @@ -62,8 +62,8 @@ cmake: updated transport_config.h.cmake | 16 ++ version.h.cmake | 5 + xmlrpc-c-config | 105 ++++++++++ - xmlrpc_config.h.cmake | 147 ++++++++++++++ - 58 files changed, 1530 insertions(+), 0 deletions(-) + xmlrpc_config.h.cmake | 156 +++++++++++++++ + 58 files changed, 1546 insertions(+), 0 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 cmake/try-attr.cc create mode 100644 cmake/va-list-is-array.c @@ -100,12 +100,12 @@ cmake: updated create mode 100644 src/cpp/xmlrpc_server_abyss++.pc.cmake create mode 100644 src/cpp/xmlrpc_server_cgi++.pc.cmake create mode 100644 src/cpp/xmlrpc_server_pstream++.pc.cmake - create mode 100644 src/test/CMakeLists.txt create mode 100644 src/xmlrpc.pc.cmake create mode 100644 src/xmlrpc_client.pc.cmake create mode 100644 src/xmlrpc_server.pc.cmake create mode 100644 src/xmlrpc_server_abyss.pc.cmake create mode 100644 src/xmlrpc_server_cgi.pc.cmake + create mode 100644 test/CMakeLists.txt create mode 100644 tools/CMakeLists.txt create mode 100644 tools/binmode-rpc-kit/CMakeLists.txt create mode 100644 tools/lib/CMakeLists.txt @@ -125,10 +125,10 @@ cmake: updated diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 -index 0000000..3bb9e03 +index 0000000..740a713 --- /dev/null +++ b/CMakeLists.txt -@@ -0,0 +1,284 @@ +@@ -0,0 +1,288 @@ +## -*- cmake -*- +project(xmlrpc-c) +include(FindPkgConfig) @@ -143,8 +143,8 @@ index 0000000..3bb9e03 + + +set(XMLRPC_C_VERSION_MAJOR "1" CACHE STRING "Version (major) of xmlrpc-c") -+set(XMLRPC_C_VERSION_MINOR "26" CACHE STRING "Version (minor) of xmlrpc-c") -+set(XMLRPC_C_VERSION_POINT "3" CACHE STRING "Version (point) of xmlrpc-c") ++set(XMLRPC_C_VERSION_MINOR "27" CACHE STRING "Version (minor) of xmlrpc-c") ++set(XMLRPC_C_VERSION_POINT "0" CACHE STRING "Version (point) of xmlrpc-c") + +set(XMLRPC_C_VERSION + "${XMLRPC_C_VERSION_MAJOR}.${XMLRPC_C_VERSION_MINOR}.${XMLRPC_C_VERSION_POINT}" @@ -336,8 +336,11 @@ index 0000000..3bb9e03 + +if(WIN32) + set(DIRECTORY_SEPARATOR "\\") ++ set(THREAD_LIBS "") +else(WIN32) + set(DIRECTORY_SEPARATOR "/") ++ set(THREAD_LIBS "pthread") ++ set(THREAD_LIBS_PKGCONFIG "-lpthread") +endif(WIN32) + +check_include_file(sys/filio.h HAVE_SYS_FILIO_H) @@ -405,6 +408,7 @@ index 0000000..3bb9e03 + +enable_testing() + ++add_subdirectory(test) +add_subdirectory(lib) +add_subdirectory(examples) +add_subdirectory(include) @@ -708,10 +712,10 @@ index 0000000..2358061 +SUBDIRS(src) diff --git a/lib/abyss/src/CMakeLists.txt b/lib/abyss/src/CMakeLists.txt new file mode 100644 -index 0000000..e7f89bf +index 0000000..b1813bb --- /dev/null +++ b/lib/abyss/src/CMakeLists.txt -@@ -0,0 +1,66 @@ +@@ -0,0 +1,70 @@ +## -*- cmake -*- + +set(xmlrpc_abyss_SOURCES @@ -741,8 +745,6 @@ index 0000000..e7f89bf + session.h + socket.c + socket.h -+ socket_unix.c -+ socket_unix.h + thread.h + token.c + token.h @@ -751,19 +753,25 @@ index 0000000..e7f89bf + +add_definitions(-D_UNIX) + -+if(ENABLE_ABYSS_THREADS) -+ list(APPEND xmlrpc_abyss_SOURCES thread_pthread.c) -+else(ENABLE_ABYSS_THREADS) -+ list(APPEND xmlrpc_abyss_SOURCES thread_fork.c) -+endif(ENABLE_ABYSS_THREADS) ++if(WIN32) ++ list(APPEND xmlrpc_abyss_SOURCES thread_windows.c) ++else(WIN32) ++ list(APPEND xmlrpc_abyss_SOURCES socket_unix.c socket_unix.h) ++ ++ if(ENABLE_ABYSS_THREADS) ++ list(APPEND xmlrpc_abyss_SOURCES thread_pthread.c) ++ else(ENABLE_ABYSS_THREADS) ++ list(APPEND xmlrpc_abyss_SOURCES thread_fork.c) ++ endif(ENABLE_ABYSS_THREADS) ++endif(WIN32) + +add_library(xmlrpc_abyss SHARED ${xmlrpc_abyss_SOURCES}) +target_link_libraries(xmlrpc_abyss xmlrpc_util) + +if(ENABLE_ABYSS_THREADS) + set_target_properties(xmlrpc_abyss PROPERTIES DEFINE_SYMBOL _THREAD) -+ target_link_libraries(xmlrpc_abyss pthread) -+ ensc_pkgconfig_lib(xmlrpc_abyss "-lpthread") ++ target_link_libraries(xmlrpc_abyss ${THREAD_LIBS}) ++ ensc_pkgconfig_lib(xmlrpc_abyss "${THREAD_LIBS_PKGCONFIG}") +endif(ENABLE_ABYSS_THREADS) + +install(TARGETS xmlrpc_abyss @@ -780,7 +788,7 @@ index 0000000..e7f89bf +ensc_pkgconfig(xmlrpc_abyss) diff --git a/lib/abyss/src/xmlrpc_abyss.pc.cmake b/lib/abyss/src/xmlrpc_abyss.pc.cmake new file mode 100644 -index 0000000..fae7af3 +index 0000000..b0dbcc9 --- /dev/null +++ b/lib/abyss/src/xmlrpc_abyss.pc.cmake @@ -0,0 +1,12 @@ @@ -789,12 +797,12 @@ index 0000000..fae7af3 +libdir=@libdir@ +includedir=@includedir@ + -+Name: xmlrpc_abyss ++Name: xmlrpc_abyss +Description: XMLRPC Abyss base library +Version: @XMLRPC_C_VERSION@ + +Requires.private: xmlrpc_util -+Libs: -L${libdir} -lxmlrpc_abyss @xmlrpc_abyss_pkgconfig_libs@ ++Libs: -L${libdir} -lxmlrpc_abyss @xmlrpc_abyss_pkgconfig_libs@ +Cflags: diff --git a/lib/curl_transport/CMakeLists.txt b/lib/curl_transport/CMakeLists.txt new file mode 100644 @@ -955,7 +963,7 @@ index 0000000..25ba487 +ensc_pkgconfig(xmlrpc_util) diff --git a/lib/libutil/xmlrpc_util.pc.cmake b/lib/libutil/xmlrpc_util.pc.cmake new file mode 100644 -index 0000000..3d2968e +index 0000000..d4e01bf --- /dev/null +++ b/lib/libutil/xmlrpc_util.pc.cmake @@ -0,0 +1,10 @@ @@ -963,11 +971,11 @@ index 0000000..3d2968e +libdir=@libdir@ +includedir=@includedir@ + -+Name: xmlrpc_util ++Name: xmlrpc_util +Description: XMLRPC utility library +Version: @XMLRPC_C_VERSION@ + -+Libs: -L${libdir} -lxmlrpc_util ++Libs: -L${libdir} -lxmlrpc_util +Cflags: -I${includedir} diff --git a/lib/libwww_transport/CMakeLists.txt b/lib/libwww_transport/CMakeLists.txt new file mode 100644 @@ -1020,10 +1028,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..7ac88b0 +index 0000000..4f760bc --- /dev/null +++ b/src/CMakeLists.txt -@@ -0,0 +1,122 @@ +@@ -0,0 +1,121 @@ +# -*- cmake -*- + +if(ENABLE_LIBXML2_BACKEND) @@ -1073,7 +1081,6 @@ index 0000000..7ac88b0 + + +add_subdirectory(cpp) -+add_subdirectory(test) + + + @@ -1248,7 +1255,7 @@ index 0000000..dffd36c +add_test(runtests src-test) diff --git a/src/cpp/xmlrpc++.pc.cmake b/src/cpp/xmlrpc++.pc.cmake new file mode 100644 -index 0000000..3bfa992 +index 0000000..e99d81e --- /dev/null +++ b/src/cpp/xmlrpc++.pc.cmake @@ -0,0 +1,12 @@ @@ -1257,16 +1264,16 @@ index 0000000..3bfa992 +libdir=@libdir@ +includedir=@includedir@ + -+Name: xmlrpc++ ++Name: xmlrpc++ +Description: XMLRPC C++ Base library +Version: @XMLRPC_C_VERSION@ + +Requires.private: xmlrpc xmlrpc_util -+Libs: -L${libdir} -lxmlrpc++ ++Libs: -L${libdir} -lxmlrpc++ +Cflags: -I${includedir} diff --git a/src/cpp/xmlrpc_client++.pc.cmake b/src/cpp/xmlrpc_client++.pc.cmake new file mode 100644 -index 0000000..bd6766b +index 0000000..fe1f835 --- /dev/null +++ b/src/cpp/xmlrpc_client++.pc.cmake @@ -0,0 +1,12 @@ @@ -1275,16 +1282,16 @@ index 0000000..bd6766b +libdir=@libdir@ +includedir=@includedir@ + -+Name: xmlrpc_client++ ++Name: xmlrpc_client++ +Description: XMLRPC C++ Client library +Version: @XMLRPC_C_VERSION@ + +Requires.private: xmlrpc++ xmlrpc_client xmlrpc_packetsocket xmlrpc xmlrpc_util -+Libs: -L${libdir} -lxmlrpc_client++ ++Libs: -L${libdir} -lxmlrpc_client++ +Cflags: -I${includedir} diff --git a/src/cpp/xmlrpc_cpp.pc.cmake b/src/cpp/xmlrpc_cpp.pc.cmake new file mode 100644 -index 0000000..8acc22f +index 0000000..9f94252 --- /dev/null +++ b/src/cpp/xmlrpc_cpp.pc.cmake @@ -0,0 +1,12 @@ @@ -1293,16 +1300,16 @@ index 0000000..8acc22f +libdir=@libdir@ +includedir=@includedir@ + -+Name: xmlrpc_cpp ++Name: xmlrpc_cpp +Description: XMLRPC CPP library +Version: @XMLRPC_C_VERSION@ + +Requires.private: xmlrpc xmlrpc_server xmlrpc_util -+Libs: -L${libdir} -lxmlrpc_cpp ++Libs: -L${libdir} -lxmlrpc_cpp +Cflags: -I${includedir} diff --git a/src/cpp/xmlrpc_packetsocket.pc.cmake b/src/cpp/xmlrpc_packetsocket.pc.cmake new file mode 100644 -index 0000000..4a8aedc +index 0000000..e168da3 --- /dev/null +++ b/src/cpp/xmlrpc_packetsocket.pc.cmake @@ -0,0 +1,12 @@ @@ -1311,16 +1318,16 @@ index 0000000..4a8aedc +libdir=@libdir@ +includedir=@includedir@ + -+Name: xmlrpc_packetsocket ++Name: xmlrpc_packetsocket +Description: XMLRPC C++ packsetsocket library +Version: @XMLRPC_C_VERSION@ + +Requires.private: xmlrpc++ -+Libs: -L${libdir} -lxmlrpc_packetsocket ++Libs: -L${libdir} -lxmlrpc_packetsocket +Cflags: -I${includedir} diff --git a/src/cpp/xmlrpc_server++.pc.cmake b/src/cpp/xmlrpc_server++.pc.cmake new file mode 100644 -index 0000000..c769d54 +index 0000000..5080b63 --- /dev/null +++ b/src/cpp/xmlrpc_server++.pc.cmake @@ -0,0 +1,12 @@ @@ -1329,16 +1336,16 @@ index 0000000..c769d54 +libdir=@libdir@ +includedir=@includedir@ + -+Name: xmlrpc_server++ ++Name: xmlrpc_server++ +Description: XMLRPC C++ Server library +Version: @XMLRPC_C_VERSION@ + +Requires.private: xmlrpc++ xmlrpc_server xmlrpc xmlrpc_util -+Libs: -L${libdir} -lxmlrpc_server++ ++Libs: -L${libdir} -lxmlrpc_server++ +Cflags: -I${includedir} diff --git a/src/cpp/xmlrpc_server_abyss++.pc.cmake b/src/cpp/xmlrpc_server_abyss++.pc.cmake new file mode 100644 -index 0000000..b325eff +index 0000000..f1d2198 --- /dev/null +++ b/src/cpp/xmlrpc_server_abyss++.pc.cmake @@ -0,0 +1,12 @@ @@ -1347,16 +1354,16 @@ index 0000000..b325eff +libdir=@libdir@ +includedir=@includedir@ + -+Name: xmlrpc_server_abyss++ ++Name: xmlrpc_server_abyss++ +Description: XMLRPC C++ Abyss-Server library +Version: @XMLRPC_C_VERSION@ + +Requires.private: xmlrpc_server++ xmlrpc_server_abyss xmlrpc++ xmlrpc_abyss xmlrpc_util -+Libs: -L${libdir} -lxmlrpc_server_abyss++ ++Libs: -L${libdir} -lxmlrpc_server_abyss++ +Cflags: -I${includedir} diff --git a/src/cpp/xmlrpc_server_cgi++.pc.cmake b/src/cpp/xmlrpc_server_cgi++.pc.cmake new file mode 100644 -index 0000000..72a3726 +index 0000000..9021564 --- /dev/null +++ b/src/cpp/xmlrpc_server_cgi++.pc.cmake @@ -0,0 +1,12 @@ @@ -1365,16 +1372,16 @@ index 0000000..72a3726 +libdir=@libdir@ +includedir=@includedir@ + -+Name: xmlrpc_server_cgi++ ++Name: xmlrpc_server_cgi++ +Description: XMLRPC C++ CGI-Server library +Version: @XMLRPC_C_VERSION@ + +Requires.private: xmlrpc_server++ xmlrpc++ xmlrpc -+Libs: -L${libdir} -lxmlrpc_server_cgi++ ++Libs: -L${libdir} -lxmlrpc_server_cgi++ +Cflags: -I${includedir} diff --git a/src/cpp/xmlrpc_server_pstream++.pc.cmake b/src/cpp/xmlrpc_server_pstream++.pc.cmake new file mode 100644 -index 0000000..da5639d +index 0000000..9b4819f --- /dev/null +++ b/src/cpp/xmlrpc_server_pstream++.pc.cmake @@ -0,0 +1,12 @@ @@ -1383,18 +1390,108 @@ index 0000000..da5639d +libdir=@libdir@ +includedir=@includedir@ + -+Name: xmlrpc_server_pstream++ ++Name: xmlrpc_server_pstream++ +Description: XMLRPC C++ pstream-Server library +Version: @XMLRPC_C_VERSION@ + +Requires.private: xmlrpc_server++ xmlrpc_packetsocket xmlrpc++ -+Libs: -L${libdir} -lxmlrpc_server_pstream++ ++Libs: -L${libdir} -lxmlrpc_server_pstream++ +Cflags: -I${includedir} -diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +diff --git a/src/xmlrpc.pc.cmake b/src/xmlrpc.pc.cmake +new file mode 100644 +index 0000000..7c098b8 +--- /dev/null ++++ b/src/xmlrpc.pc.cmake +@@ -0,0 +1,12 @@ ++bindir=@bindir@ ++prefix=@prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: xmlrpc ++Description: XMLRPC base library ++Version: @XMLRPC_C_VERSION@ ++ ++Requires.private: @xmlrpc_pkgconfig_req@ xmlrpc_util ++Libs: -L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@ ++Cflags: -I${includedir} +diff --git a/src/xmlrpc_client.pc.cmake b/src/xmlrpc_client.pc.cmake +new file mode 100644 +index 0000000..61543d4 +--- /dev/null ++++ b/src/xmlrpc_client.pc.cmake +@@ -0,0 +1,12 @@ ++bindir=@bindir@ ++prefix=@prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: xmlrpc_client ++Description: XMLRPC client library ++Version: @XMLRPC_C_VERSION@ ++ ++Requires.private: xmlrpc @xmlrpc_client_pkgconfig_req@ xmlrpc_util ++Libs: -L${libdir} -lxmlrpc_client @client_libwww_LIBS@ @client_wininet_LIBS@ ++Cflags: -I${includedir} +diff --git a/src/xmlrpc_server.pc.cmake b/src/xmlrpc_server.pc.cmake +new file mode 100644 +index 0000000..cade53d +--- /dev/null ++++ b/src/xmlrpc_server.pc.cmake +@@ -0,0 +1,12 @@ ++bindir=@bindir@ ++prefix=@prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: xmlrpc_server ++Description: XMLRPC Server library ++Version: @XMLRPC_C_VERSION@ ++ ++Requires.private: xmlrpc xmlrpc_util ++Libs: -L${libdir} -lxmlrpc_server ++Cflags: -I${includedir} +diff --git a/src/xmlrpc_server_abyss.pc.cmake b/src/xmlrpc_server_abyss.pc.cmake +new file mode 100644 +index 0000000..198c780 +--- /dev/null ++++ b/src/xmlrpc_server_abyss.pc.cmake +@@ -0,0 +1,12 @@ ++bindir=@bindir@ ++prefix=@prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: xmlrpc_server_abyss ++Description: XMLRPC Server Abyss library ++Version: @XMLRPC_C_VERSION@ ++ ++Requires.private: xmlrpc_server xmlrpc_abyss xmlrpc xmlrpc_util ++Libs: -L${libdir} -lxmlrpc_server_abyss ++Cflags: -I${includedir} +diff --git a/src/xmlrpc_server_cgi.pc.cmake b/src/xmlrpc_server_cgi.pc.cmake +new file mode 100644 +index 0000000..748b550 +--- /dev/null ++++ b/src/xmlrpc_server_cgi.pc.cmake +@@ -0,0 +1,12 @@ ++bindir=@bindir@ ++prefix=@prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: xmlrpc_server_cgi ++Description: XMLRPC CGI-Server library ++Version: @XMLRPC_C_VERSION@ ++ ++Requires.private: xmlrpc_server xmlrpc xmlrpc_util ++Libs: -L${libdir} -lxmlrpc_server_cgi ++Cflags: -I${includedir} +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..fdc6869 --- /dev/null -+++ b/src/test/CMakeLists.txt ++++ b/test/CMakeLists.txt @@ -0,0 +1,39 @@ +# -*- cmake -*- + @@ -1435,96 +1532,6 @@ index 0000000..fdc6869 + +enable_testing() +add_test(runtests src-test) -diff --git a/src/xmlrpc.pc.cmake b/src/xmlrpc.pc.cmake -new file mode 100644 -index 0000000..4c92f93 ---- /dev/null -+++ b/src/xmlrpc.pc.cmake -@@ -0,0 +1,12 @@ -+bindir=@bindir@ -+prefix=@prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: xmlrpc -+Description: XMLRPC base library -+Version: @XMLRPC_C_VERSION@ -+ -+Requires.private: @xmlrpc_pkgconfig_req@ xmlrpc_util -+Libs: -L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@ -+Cflags: -I${includedir} -diff --git a/src/xmlrpc_client.pc.cmake b/src/xmlrpc_client.pc.cmake -new file mode 100644 -index 0000000..7f28a15 ---- /dev/null -+++ b/src/xmlrpc_client.pc.cmake -@@ -0,0 +1,12 @@ -+bindir=@bindir@ -+prefix=@prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: xmlrpc_client -+Description: XMLRPC client library -+Version: @XMLRPC_C_VERSION@ -+ -+Requires.private: xmlrpc @xmlrpc_client_pkgconfig_req@ xmlrpc_util -+Libs: -L${libdir} -lxmlrpc_client @client_libwww_LIBS@ @client_wininet_LIBS@ -+Cflags: -I${includedir} -diff --git a/src/xmlrpc_server.pc.cmake b/src/xmlrpc_server.pc.cmake -new file mode 100644 -index 0000000..d5c334e ---- /dev/null -+++ b/src/xmlrpc_server.pc.cmake -@@ -0,0 +1,12 @@ -+bindir=@bindir@ -+prefix=@prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: xmlrpc_server -+Description: XMLRPC Server library -+Version: @XMLRPC_C_VERSION@ -+ -+Requires.private: xmlrpc xmlrpc_util -+Libs: -L${libdir} -lxmlrpc_server -+Cflags: -I${includedir} -diff --git a/src/xmlrpc_server_abyss.pc.cmake b/src/xmlrpc_server_abyss.pc.cmake -new file mode 100644 -index 0000000..48fa0b1 ---- /dev/null -+++ b/src/xmlrpc_server_abyss.pc.cmake -@@ -0,0 +1,12 @@ -+bindir=@bindir@ -+prefix=@prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: xmlrpc_server_abyss -+Description: XMLRPC Server Abyss library -+Version: @XMLRPC_C_VERSION@ -+ -+Requires.private: xmlrpc_server xmlrpc_abyss xmlrpc xmlrpc_util -+Libs: -L${libdir} -lxmlrpc_server_abyss -+Cflags: -I${includedir} -diff --git a/src/xmlrpc_server_cgi.pc.cmake b/src/xmlrpc_server_cgi.pc.cmake -new file mode 100644 -index 0000000..4d174ef ---- /dev/null -+++ b/src/xmlrpc_server_cgi.pc.cmake -@@ -0,0 +1,12 @@ -+bindir=@bindir@ -+prefix=@prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: xmlrpc_server_cgi -+Description: XMLRPC CGI-Server library -+Version: @XMLRPC_C_VERSION@ -+ -+Requires.private: xmlrpc_server xmlrpc xmlrpc_util -+Libs: -L${libdir} -lxmlrpc_server_cgi -+Cflags: -I${includedir} diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt new file mode 100644 index 0000000..0bc45a9 @@ -1850,10 +1857,10 @@ index 0000000..50577fd +exec pkg-config "$@" $comp diff --git a/xmlrpc_config.h.cmake b/xmlrpc_config.h.cmake new file mode 100644 -index 0000000..2859749 +index 0000000..9594e69 --- /dev/null +++ b/xmlrpc_config.h.cmake -@@ -0,0 +1,147 @@ +@@ -0,0 +1,156 @@ +/* -*- c -*- */ + +#ifndef H_XMLRPC_C_CONFIG_H @@ -1908,9 +1915,15 @@ index 0000000..2859749 + +/* MSVCRT means we're using the Microsoft Visual C++ runtime library */ + -+#ifdef _MSC_VER -+/* The compiler is Microsoft Visual C++. */ ++#if defined(_MSC_VER) ++ /* The compiler is Microsoft Visual C++ */ + #define MSVCRT _MSC_VER ++#elif defined(__MINGW32__) ++ /* The compiler is Mingw, which is the Windows version of the GNU ++ compiler. Programs built with this normally use the Microsoft Visual ++ C++ runtime library. ++ */ ++ #define MSVCRT 1 +#else + #define MSVCRT 0 +#endif @@ -1938,6 +1951,9 @@ index 0000000..2859749 + +#define HAVE_PTHREAD 1 + ++/* Note that the return value of XMLRPC_VSNPRINTF is int on Windows, ++ ssize_t on POSIX. ++*/ +#if MSVCRT + #define XMLRPC_VSNPRINTF _vsnprintf +#else @@ -1958,7 +1974,7 @@ index 0000000..2859749 + #define XMLRPC_CLOSESOCKET close +#endif + -+#if defined(_MSC_VER) ++#if defined(_MSC_VER) && (_MSC_VER >= 1400) +/* Starting with MSVC 8, the runtime library defines various POSIX functions + such as strdup() whose names violate the ISO C standard (the standard + says the strXXX names are reserved for the standard), but warns you of @@ -2002,5 +2018,5 @@ index 0000000..2859749 + +#endif -- -1.7.4 +1.7.5.4 diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec index 410fa16..fda090f 100644 --- a/xmlrpc-c.spec +++ b/xmlrpc-c.spec @@ -1,11 +1,11 @@ %global advanced_branch 1 -%global svnrev 2134 +%global svnrev 2145 %{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} Summary: A lightweight RPC library based on XML and HTTP Name: xmlrpc-c -Version: 1.26.3 +Version: 1.27.0 Release: %release_func 1600.svn%svnrev # See COPYING for details. # The Python 1.5.2 license used by a few files is just BSD. @@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 27 2011 Enrico Scholz - 1.27.0-1600.svn2145 +- updated to 1.27.0 + * Mon Jun 13 2011 Enrico Scholz - 1.26.3-1600.svn2134 - updated to 1.26.3 - removed default-constructor patch; issue is solved upstream