rpms/xmlrpc-c/F-12 xmlrpc-c-verbose-curl.patch, NONE, 1.1 xmlrpc-c-uninit-curl.patch, NONE, 1.1 xmlrpc-c.spec, 1.36, 1.37 xmlrpc-c-va_list.patch, 1.2, 1.3 xmlrpc-c-printf-size_t.patch, 1.2, 1.3 xmlrpc-c-longlong.patch, 1.2, 1.3 xmlrpc-c-cmake.patch, 1.2, 1.3 verinfo, 1.2, 1.3 sources, 1.19, 1.20 lastver, 1.9, 1.10 Makefile, 1.6, 1.7 .cvsignore, 1.10, 1.11
ensc
ensc at fedoraproject.org
Sat Nov 21 19:44:04 UTC 2009
Author: ensc
Update of /cvs/extras/rpms/xmlrpc-c/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1941
Modified Files:
xmlrpc-c.spec xmlrpc-c-va_list.patch
xmlrpc-c-printf-size_t.patch xmlrpc-c-longlong.patch
xmlrpc-c-cmake.patch verinfo sources lastver Makefile
.cvsignore
Added Files:
xmlrpc-c-verbose-curl.patch xmlrpc-c-uninit-curl.patch
Log Message:
updated
xmlrpc-c-verbose-curl.patch:
curltransaction.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE xmlrpc-c-verbose-curl.patch ---
>From 0277702903f889ecda64adac4da41a5e48402e94 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 21 Nov 2009 14:21:13 +0100
Subject: [PATCH 6/6] added option to make curl verbose
With this patch, when the $XMLRPC_TRACE_CURL environment variable is
set, verbose curl output/debugging will be enabled. Based upon a
patch from John Dennis <jdennis AT redhat.com>
---
lib/curl_transport/curltransaction.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/lib/curl_transport/curltransaction.c b/lib/curl_transport/curltransaction.c
index efcbcb0..abf243f 100644
--- a/lib/curl_transport/curltransaction.c
+++ b/lib/curl_transport/curltransaction.c
@@ -457,6 +457,9 @@ setupCurlSession(xmlrpc_env * const envP,
curl_easy_setopt(curlSessionP, CURLOPT_SSL_CIPHER_LIST,
curlSetupP->sslCipherList);
+ if (getenv("XMLRPC_TRACE_CURL"))
+ curl_easy_setopt(curlSessionP, CURLOPT_VERBOSE, 1l);
+
if (curlSetupP->timeout)
setCurlTimeout(curlSessionP, curlSetupP->timeout);
--
1.6.5.2
xmlrpc-c-uninit-curl.patch:
curltransaction.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xmlrpc-c-uninit-curl.patch ---
>From a0ccb4970ef73af2fb5f8b5366d1b4738c99ab57 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 21 Nov 2009 14:12:41 +0100
Subject: [PATCH 5/6] fixed unitialized variable
Reported by Nikola Pajkovsky <npajkovs AT redhat.com>:
Problem shows up only when you compiled xmlrpc with nss and try to
connect to server with wrong certificate.
---
lib/curl_transport/curltransaction.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/lib/curl_transport/curltransaction.c b/lib/curl_transport/curltransaction.c
index 630f318..efcbcb0 100644
--- a/lib/curl_transport/curltransaction.c
+++ b/lib/curl_transport/curltransaction.c
@@ -509,6 +509,7 @@ curlTransaction_create(xmlrpc_env * const envP,
curlTransactionP->curlSessionP = curlSessionP;
curlTransactionP->userContextP = userContextP;
curlTransactionP->progress = progress;
+ curlTransactionP->curlError[0] = '\0';
curlTransactionP->serverUrl = strdup(serverP->serverUrl);
if (curlTransactionP->serverUrl == NULL)
--
1.6.5.2
Index: xmlrpc-c.spec
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-12/xmlrpc-c.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- xmlrpc-c.spec 27 Jul 2009 08:12:19 -0000 1.36
+++ xmlrpc-c.spec 21 Nov 2009 19:44:03 -0000 1.37
@@ -1,17 +1,17 @@
%global advanced_branch 1
-%global svnrev 1582
+%global svnrev 1840
%{!?release_func:%global release_func() %1%{?dist}}
Summary: A lightweight RPC library based on XML and HTTP
Name: xmlrpc-c
-Version: 1.16.6
-Release: %release_func 3.%svnrev
+Version: 1.16.24
+Release: %release_func 1200.%svnrev
# See COPYING for details.
# The Python 1.5.2 license used by a few files is just BSD.
License: BSD and MIT
Group: System Environment/Libraries
-URL: http://xmlrpc-c.sourceforge.net/
+URL: http://xmlrpc-c.sourceforge.net/
%{!?advanced_branch:Source0: 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
@@ -21,6 +21,8 @@ Patch100: xmlrpc-c-cmake.patch
Patch102: xmlrpc-c-printf-size_t.patch
Patch105: xmlrpc-c-longlong.patch
Patch106: xmlrpc-c-va_list.patch
+Patch107: xmlrpc-c-uninit-curl.patch
+Patch108: xmlrpc-c-verbose-curl.patch
BuildRoot: %_tmppath/%name-%version-%release-root
@@ -107,6 +109,8 @@ This package contains some handy XML-RPC
%patch102 -p1
%patch105 -p1
%patch106 -p1
+%patch107 -p1
+%patch108 -p1
## not needed...
rm doc/{INSTALL,configure_doc}
@@ -117,6 +121,7 @@ mkdir -p fedora
cd fedora
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="-Wl,-as-needed"
cmake .. \
-D_lib:STRING=%_lib \
-DMUST_BUILD_CURL_CLIENT:BOOL=ON \
@@ -205,9 +210,17 @@ rm -rf $RPM_BUILD_ROOT
%_bindir/xmlrpc_transport
%_bindir/xml-rpc-api2cpp
%_bindir/xmlrpc_cpp_proxy
+%_bindir/xmlrpc_pstream
%changelog
+* Sat Nov 21 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.16.24-1200.1840
+- updated to 1.16.24
+- rediffed patches
+- added patch fix handling of wrong certificates (Nikola Pajkovsky)
+- added support for $XMLRPC_TRACE_CURL env (John Dennis)
+- fixed 'xmlrpc-c-config --help' output (#531910)
+
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.16.6-3.1582
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
xmlrpc-c-va_list.patch:
include/xmlrpc-c/util.h | 2 +-
lib/libutil/error.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
Index: xmlrpc-c-va_list.patch
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-12/xmlrpc-c-va_list.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xmlrpc-c-va_list.patch 11 Dec 2008 08:37:36 -0000 1.2
+++ xmlrpc-c-va_list.patch 21 Nov 2009 19:44:03 -0000 1.3
@@ -1,7 +1,7 @@
-From 9ea7a544eef6498ea061696a594c50acc137ab40 Mon Sep 17 00:00:00 2001
+From 47085ceed017191f4d23c96f8a7763a2c4185e33 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 15 Nov 2008 12:07:25 +0100
-Subject: [PATCH] 'va_list' param must be non-const
+Subject: [PATCH 4/6] 'va_list' param must be non-const
vasprintf(3) uses a non-const 'va_list ap' parameter.
Hence, do not accept a 'const' on in the wrapper function.
@@ -37,5 +37,5 @@ index fd964d0..b182308 100644
const char * faultDescription;
--
-1.6.0.4
+1.6.5.2
xmlrpc-c-printf-size_t.patch:
lib/abyss/src/socket_unix.c | 4 ++--
lib/libutil/memblock.c | 2 +-
src/cpp/server_cgi.cpp | 2 +-
src/xmlrpc_data.c | 2 +-
src/xmlrpc_datetime.c | 2 +-
src/xmlrpc_decompose.c | 4 ++--
src/xmlrpc_parse.c | 8 ++++----
src/xmlrpc_server_abyss.c | 2 +-
src/xmlrpc_string.c | 8 ++++----
tools/xmlrpc/xmlrpc.c | 3 +--
10 files changed, 18 insertions(+), 19 deletions(-)
Index: xmlrpc-c-printf-size_t.patch
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-12/xmlrpc-c-printf-size_t.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xmlrpc-c-printf-size_t.patch 11 Dec 2008 08:37:36 -0000 1.2
+++ xmlrpc-c-printf-size_t.patch 21 Nov 2009 19:44:03 -0000 1.3
@@ -1,7 +1,7 @@
-From f9eeb8d7996aa84456bd4ce1f17d71f7d65fc4da Mon Sep 17 00:00:00 2001
+From c59e7ef4f6d8ec2c058f26a4ba053aff53205193 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Mon, 25 Feb 2008 17:48:25 +0100
-Subject: [PATCH] fixed broken format string modifiers for size_t typed arguments
+Subject: [PATCH 2/6] fixed broken format string modifiers for size_t typed arguments
---
lib/abyss/src/socket_unix.c | 4 ++--
@@ -139,7 +139,7 @@ index 43d9d54..6638654 100644
else {
xmlrpc_env env;
diff --git a/src/xmlrpc_server_abyss.c b/src/xmlrpc_server_abyss.c
-index 64cd133..551298a 100644
+index 2c3e9bd..386cdf0 100644
--- a/src/xmlrpc_server_abyss.c
+++ b/src/xmlrpc_server_abyss.c
@@ -464,7 +464,7 @@ processCall(TSession * const abyssSessionP,
@@ -205,5 +205,5 @@ index 1bdc44c..c4e0618 100644
else {
size_t const byteStringSize = strlen(valueString)/2;
--
-1.6.0.4
+1.6.5.2
xmlrpc-c-longlong.patch:
include/xmlrpc-c/base.h | 10 ++++++----
src/cpp/param_list.cpp | 8 ++++----
src/cpp/value.cpp | 3 +--
3 files changed, 11 insertions(+), 10 deletions(-)
Index: xmlrpc-c-longlong.patch
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-12/xmlrpc-c-longlong.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xmlrpc-c-longlong.patch 11 Dec 2008 08:37:36 -0000 1.2
+++ xmlrpc-c-longlong.patch 21 Nov 2009 19:44:03 -0000 1.3
@@ -1,7 +1,7 @@
-From c589ecbb9258837fa8825a004b98bf8a46b2381c Mon Sep 17 00:00:00 2001
+From d4b574adcb6dd1854ea2e78b84b7d14f07edb762 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 5 Apr 2008 11:41:34 +0200
-Subject: [PATCH] Use proper datatypes for 'long long'
+Subject: [PATCH 3/6] Use proper datatypes for 'long long'
xmlrpc-c uses 'long long' at some places (e.g. in printf
statements with PRId64) under the assumption that it has a
@@ -22,7 +22,7 @@ for now, the patch uses datatypes with e
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/include/xmlrpc-c/base.h b/include/xmlrpc-c/base.h
-index 6cf1fc8..886d39b 100644
+index 4778f80..539e57d 100644
--- a/include/xmlrpc-c/base.h
+++ b/include/xmlrpc-c/base.h
@@ -5,7 +5,9 @@
@@ -34,8 +34,8 @@ index 6cf1fc8..886d39b 100644
+#include <stdint.h>
#include <xmlrpc-c/util.h>
#include <xmlrpc-c/config.h>
- /* Defines XMLRPC_HAVE_WCHAR, XMLRPC_INT64 */
-@@ -36,9 +38,9 @@ extern unsigned int const xmlrpc_version_point;
+ /* Defines XMLRPC_HAVE_WCHAR, XMLRPC_INT64, XMLRPC_HAVE_TIMEVAL */
+@@ -40,9 +42,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,7 +47,7 @@ index 6cf1fc8..886d39b 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
-@@ -113,7 +115,7 @@ extern xmlrpc_type xmlrpc_value_type (xmlrpc_value* const value);
+@@ -117,7 +119,7 @@ extern xmlrpc_type xmlrpc_value_type (xmlrpc_value* const value);
xmlrpc_value *
xmlrpc_int_new(xmlrpc_env * const envP,
@@ -56,7 +56,7 @@ index 6cf1fc8..886d39b 100644
xmlrpc_value *
xmlrpc_i8_new(xmlrpc_env * const envP,
-@@ -122,7 +124,7 @@ xmlrpc_i8_new(xmlrpc_env * const envP,
+@@ -126,7 +128,7 @@ xmlrpc_i8_new(xmlrpc_env * const envP,
void
xmlrpc_read_int(xmlrpc_env * const envP,
const xmlrpc_value * const valueP,
@@ -106,5 +106,5 @@ index ff3a011..9f2f88e 100644
xmlrpc_read_int(&env.env_c, this->cValueP, &retval);
--
-1.6.0.4
+1.6.5.2
xmlrpc-c-cmake.patch:
CMakeLists.txt | 256 ++++++++++++++++++++++++++++
cmake/try-attr.cc | 3
cmake/va-list-is-array.c | 9
examples/CMakeLists.txt | 57 ++++++
examples/config.h | 1
examples/cpp/CMakeLists.txt | 30 +++
include/CMakeLists.txt | 3
include/xmlrpc-c/CMakeLists.txt | 73 +++++++
include/xmlrpc-c/config.h.cmake | 30 +++
lib/CMakeLists.txt | 12 +
lib/abyss/CMakeLists.txt | 3
lib/abyss/src/CMakeLists.txt | 66 +++++++
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 | 22 ++
lib/expat/xmltok/xmlrpc_xmltok.pc.cmake | 9
lib/libutil/CMakeLists.txt | 24 ++
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 | 121 +++++++++++++
src/cpp/CMakeLists.txt | 70 +++++++
src/cpp/test/CMakeLists.txt | 17 +
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 | 37 ++++
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 +
tools/CMakeLists.txt | 17 +
tools/binmode-rpc-kit/CMakeLists.txt | 2
tools/lib/CMakefiles.txt | 1
tools/turbocharger/CMakeLists.txt | 1
tools/xml-rpc-api2cpp/CMakeLists.txt | 15 +
tools/xmlrpc/CMakeLists.txt | 17 +
tools/xmlrpc/config.h | 1
tools/xmlrpc_cpp_proxy/CMakeLists.txt | 17 +
tools/xmlrpc_pstream/CMakeLists.txt | 16 +
tools/xmlrpc_transport/CMakeLists.txt | 9
tools/xmlrpc_transport/config.h | 1
transport_config.h.cmake | 16 +
version.h.cmake | 5
xmlrpc-c-config | 108 +++++++++++
xmlrpc_config.h.cmake | 100 ++++++++++
57 files changed, 1428 insertions(+), 1 deletion(-)
Index: xmlrpc-c-cmake.patch
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-12/xmlrpc-c-cmake.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xmlrpc-c-cmake.patch 11 Dec 2008 08:37:36 -0000 1.2
+++ xmlrpc-c-cmake.patch 21 Nov 2009 19:44:03 -0000 1.3
@@ -1,10 +1,10 @@
-From d446ef878fb5984180ecf15a961af9550ae4f1c8 Mon Sep 17 00:00:00 2001
+From 1704895382edeabda7b46bf13ca937761e95a0e0 Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sat, 5 Apr 2008 10:55:02 +0200
-Subject: [PATCH] make -> cmake transition
+Subject: [PATCH 1/6] make -> cmake transition
---
- CMakeLists.txt | 254 +++++++++++++++++++++++++++
+ CMakeLists.txt | 256 +++++++++++++++++++++++++++
cmake/try-attr.cc | 3 +
cmake/va-list-is-array.c | 9 +
examples/CMakeLists.txt | 57 ++++++
@@ -15,14 +15,14 @@ Subject: [PATCH] make -> cmake transitio
include/xmlrpc-c/config.h.cmake | 30 +++
lib/CMakeLists.txt | 12 ++
lib/abyss/CMakeLists.txt | 3 +
- lib/abyss/src/CMakeLists.txt | 64 +++++++
+ lib/abyss/src/CMakeLists.txt | 66 +++++++
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 | 20 ++
+ lib/expat/xmltok/CMakeLists.txt | 22 +++
lib/expat/xmltok/xmlrpc_xmltok.pc.cmake | 9 +
lib/libutil/CMakeLists.txt | 24 +++
lib/libutil/xmlrpc_util.pc.cmake | 10 +
@@ -46,7 +46,7 @@ Subject: [PATCH] make -> cmake transitio
src/xmlrpc_server.pc.cmake | 12 ++
src/xmlrpc_server_abyss.pc.cmake | 12 ++
src/xmlrpc_server_cgi.pc.cmake | 12 ++
- tools/CMakeLists.txt | 12 ++
+ tools/CMakeLists.txt | 17 ++
tools/binmode-rpc-kit/CMakeLists.txt | 2 +
tools/lib/CMakefiles.txt | 1 +
tools/turbocharger/CMakeLists.txt | 1 +
@@ -54,14 +54,14 @@ Subject: [PATCH] make -> cmake transitio
tools/xmlrpc/CMakeLists.txt | 17 ++
tools/xmlrpc/config.h | 1 +
tools/xmlrpc_cpp_proxy/CMakeLists.txt | 17 ++
- tools/xmlrpc_pstream/CMakefiles.txt | 6 +
+ tools/xmlrpc_pstream/CMakeLists.txt | 16 ++
tools/xmlrpc_transport/CMakeLists.txt | 9 +
tools/xmlrpc_transport/config.h | 1 +
transport_config.h.cmake | 16 ++
version.h.cmake | 5 +
- xmlrpc-c-config | 80 +++++++++
- xmlrpc_config.h.cmake | 99 +++++++++++
- 57 files changed, 1379 insertions(+), 0 deletions(-)
+ xmlrpc-c-config | 108 +++++++++++
+ xmlrpc_config.h.cmake | 99 ++++++++++
+ 57 files changed, 1428 insertions(+), 0 deletions(-)
create mode 100644 CMakeLists.txt
create mode 100644 cmake/try-attr.cc
create mode 100644 cmake/va-list-is-array.c
@@ -112,7 +112,7 @@ Subject: [PATCH] make -> cmake transitio
create mode 100644 tools/xmlrpc/CMakeLists.txt
create mode 100644 tools/xmlrpc/config.h
create mode 100644 tools/xmlrpc_cpp_proxy/CMakeLists.txt
- create mode 100644 tools/xmlrpc_pstream/CMakefiles.txt
+ create mode 100644 tools/xmlrpc_pstream/CMakeLists.txt
create mode 100644 tools/xmlrpc_transport/CMakeLists.txt
create mode 100644 tools/xmlrpc_transport/config.h
create mode 100644 transport_config.h.cmake
@@ -122,19 +122,21 @@ Subject: [PATCH] make -> cmake transitio
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
-index 0000000..800f7fd
+index 0000000..caf5a6b
--- /dev/null
+++ b/CMakeLists.txt
-@@ -0,0 +1,254 @@
+@@ -0,0 +1,256 @@
+## -*- cmake -*-
+project(xmlrpc-c)
+include(FindPkgConfig)
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+
++cmake_minimum_required(VERSION 2.6)
++
+set(XMLRPC_C_VERSION_MAJOR "1" CACHE STRING "Version (major) of xmlrpc-c")
+set(XMLRPC_C_VERSION_MINOR "16" 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 "24" CACHE STRING "Version (point) of xmlrpc-c")
+
+set(XMLRPC_C_VERSION
+ "${XMLRPC_C_VERSION_MAJOR}.${XMLRPC_C_VERSION_MINOR}.${XMLRPC_C_VERSION_POINT}"
@@ -317,10 +319,10 @@ index 0000000..800f7fd
+
+check_include_file(sys/filio.h HAVE_SYS_FILIO_H)
+check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H)
-+check_function_exists(setenv HAVE_SETENV)
-+check_function_exists(strcasecmp HAVE_STRCASECMP)
-+check_function_exists(_stricmp HAVE__STRICMP)
-+check_function_exists(stricmp HAVE_STRICMP)
++check_function_exists(setenv HAVE_SETENV)
++check_function_exists(strcasecmp HAVE_STRCASECMP)
++check_function_exists(_stricmp HAVE__STRICMP)
++check_function_exists(stricmp HAVE_STRICMP)
+check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
+check_function_exists(setgroups HAVE_SETGROUPS)
+check_function_exists(asprintf HAVE_ASPRINTF)
@@ -663,10 +665,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..e0373e6
+index 0000000..e7f89bf
--- /dev/null
+++ b/lib/abyss/src/CMakeLists.txt
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,66 @@
+## -*- cmake -*-
+
+set(xmlrpc_abyss_SOURCES
@@ -704,6 +706,8 @@ index 0000000..e0373e6
+ trace.c
+ trace.h)
+
++add_definitions(-D_UNIX)
++
+if(ENABLE_ABYSS_THREADS)
+ list(APPEND xmlrpc_abyss_SOURCES thread_pthread.c)
+else(ENABLE_ABYSS_THREADS)
@@ -832,14 +836,16 @@ index 0000000..5b2a7e4
+Cflags:
diff --git a/lib/expat/xmltok/CMakeLists.txt b/lib/expat/xmltok/CMakeLists.txt
new file mode 100644
-index 0000000..c3247ad
+index 0000000..359c4e4
--- /dev/null
+++ b/lib/expat/xmltok/CMakeLists.txt
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,22 @@
+# -*- cmake -*-
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
++add_definitions(-DXML_BYTE_ORDER=0)
++
+add_library(xmlrpc_xmltok STATIC
+ xmltok.c xmlrole.c ${CMAKE_CURRENT_BINARY_DIR}/nametab.h)
+
@@ -1471,10 +1477,10 @@ index 0000000..4d174ef
+Cflags: -I${includedir}
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
-index 0000000..750fed4
+index 0000000..53b501d
--- /dev/null
+++ b/tools/CMakeLists.txt
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,17 @@
+# -*- cmake -*-
+
+add_subdirectory(lib)
@@ -1482,11 +1488,16 @@ index 0000000..750fed4
+add_subdirectory(binmode-rpc-kit)
+add_subdirectory(turbocharger)
+
-+add_subdirectory(xmlrpc)
-+add_subdirectory(xmlrpc_transport)
-+
-+add_subdirectory(xmlrpc_cpp_proxy)
-+add_subdirectory(xml-rpc-api2cpp )
++if (MUST_BUILD_CLIENT)
++ add_subdirectory(xmlrpc)
++ add_subdirectory(xmlrpc_transport)
++
++ if (ENABLE_CPLUSPLUS)
++ add_subdirectory(xmlrpc_cpp_proxy)
++ add_subdirectory(xml-rpc-api2cpp )
++ add_subdirectory(xmlrpc_pstream)
++ endif()
++endif()
diff --git a/tools/binmode-rpc-kit/CMakeLists.txt b/tools/binmode-rpc-kit/CMakeLists.txt
new file mode 100644
index 0000000..a707c75
@@ -1583,18 +1594,28 @@ index 0000000..4166023
+
+install(TARGETS xmlrpc_cpp_proxy
+ RUNTIME DESTINATION bin)
-diff --git a/tools/xmlrpc_pstream/CMakefiles.txt b/tools/xmlrpc_pstream/CMakefiles.txt
+diff --git a/tools/xmlrpc_pstream/CMakeLists.txt b/tools/xmlrpc_pstream/CMakeLists.txt
new file mode 100644
-index 0000000..67ae8c5
+index 0000000..f32b933
--- /dev/null
-+++ b/tools/xmlrpc_pstream/CMakefiles.txt
-@@ -0,0 +1,6 @@
++++ b/tools/xmlrpc_pstream/CMakeLists.txt
+@@ -0,0 +1,16 @@
+# -*- cmake -*-
+
+add_executable(xmlrpc_pstream
+ xmlrpc_pstream.cpp
-+ ${tools_lib_SOURCES})
-+target_link_libraries(xmlrpc_pstream readline util)
++ ../lib/dumpvalue.c)
++
++target_link_libraries(xmlrpc_pstream
++ readline
++ ncurses
++ xmlrpc_client++
++ util)
++
++include_directories(../lib/include)
++
++install(TARGETS xmlrpc_pstream
++ RUNTIME DESTINATION bin)
diff --git a/tools/xmlrpc_transport/CMakeLists.txt b/tools/xmlrpc_transport/CMakeLists.txt
new file mode 100644
index 0000000..b73d7c0
@@ -1652,10 +1673,10 @@ index 0000000..12ab86d
+#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..c32555e
+index 0000000..327fad7
--- /dev/null
+++ b/xmlrpc-c-config
-@@ -0,0 +1,80 @@
+@@ -0,0 +1,108 @@
+#! /bin/sh
+
+comp=
@@ -1668,16 +1689,44 @@ index 0000000..c32555e
+need_packetsocket=
+need_cgi=
+
++show_help() {
++ cat <<EOF
++Usage: xmlrpc-c-config <feature> ... <option> ...
++
++The features are:
++ c++ legacy C++ wrapper API
++ c++2 modern C++ API
++ client client functions
++ cgi-server CGI-based server functions
++ abyss-server ABYSS-based server functions
++ pstream-server pstream-based server functions
++ server-util basic server functions (implied by *-server)
++
++Options are:
++ --version The version number of the package
++ --features List all features (aka modules) currently installed
++ --cflags C compiler flags to use when '#include'ing package headers
++ --libs Libraries and flags to use when linking programs normally
++ --ldadd Libraries to use with automake
++ --ldflags Flags to use with automake & libtool
++ --prefix The prefix under which the package was installed
++EOF
++ exit $1
++}
++
++test $# -ne 0 || show_help 1 >&2
++
+while test $# -gt 0; do
+ case $1 in
-+ (c++) comp="$comp xmlrpc_cpp";;
-+ (server-util) need_server=1;;
-+ (cgi-server) need_cgi=1;;
-+ (c++2) need_cxx=1;;
-+ (abyss-server) need_abyss=1;;
-+ (pstream-server) need_pstream=1;;
++ (c++) comp="$comp xmlrpc_cpp";;
++ (server-util) need_server=1;;
++ (cgi-server) need_cgi=1;;
++ (c++2) need_cxx=1;;
++ (abyss-server) need_abyss=1;;
++ (pstream-server) need_pstream=1;;
+ (packetsocket) need_packetsocket=1;;
+ (client|libwww-client) need_client=1;;
++ (--help) show_help 0;;
+ (--) shift; break;;
+ (--*) break;;
+ (*)
@@ -1842,5 +1891,5 @@ index 0000000..1c9ece8
+
+#endif
--
-1.6.0.4
+1.6.5.2
Index: verinfo
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-12/verinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- verinfo 16 Mar 2008 12:49:56 -0000 1.2
+++ verinfo 21 Nov 2009 19:44:03 -0000 1.3
@@ -1,2 +1,2 @@
-http://xmlrpc-c.sourceforge.net/change_advanced.html
-Release (1\.[0-9.]+)[<>/h2p\s]*Released
+http://xmlrpc-c.sourceforge.net/change_stable.html
+\<h2\>Release (1\.[0-9.]+)\</h2\>
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources 11 Dec 2008 08:37:36 -0000 1.19
+++ sources 21 Nov 2009 19:44:04 -0000 1.20
@@ -1 +1 @@
-8389b0e11d93a61d9bd130f0cb77eaa4 xmlrpc-c-1.16.6.tar.bz2
+53731f1017b02ef0618809bccc8a272c xmlrpc-c-1.16.24.tar.bz2
Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-12/lastver,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- lastver 11 Dec 2008 08:37:36 -0000 1.9
+++ lastver 21 Nov 2009 19:44:04 -0000 1.10
@@ -1 +1 @@
-1.16.06
+1.16.24
Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-12/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- Makefile 15 Nov 2008 13:44:52 -0000 1.6
+++ Makefile 21 Nov 2009 19:44:04 -0000 1.7
@@ -20,5 +20,5 @@ endif
include $(MAKEFILE_COMMON)
svn-sources:
- cd $(DESTDIR) . && svn export https://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced@${SVN_REV} xmlrpc-c-${SVN_VER}
+ cd $(DESTDIR) . && svn export https://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/stable@${SVN_REV} xmlrpc-c-${SVN_VER}
cd $(DESTDIR) . && tar cjf xmlrpc-c-${SVN_VER}.tar.bz2 xmlrpc-c-${SVN_VER} --owner root --group root --mode=go-w,a+rX
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 11 Dec 2008 08:37:36 -0000 1.10
+++ .cvsignore 21 Nov 2009 19:44:04 -0000 1.11
@@ -1 +1 @@
-xmlrpc-c-1.16.6.tar.bz2
+xmlrpc-c-1.16.24.tar.bz2
More information about the fedora-extras-commits
mailing list