[xmlrpc-c/f15] updated to 1.25.13
ensc
ensc at fedoraproject.org
Wed Jan 4 12:07:26 UTC 2012
commit cd25c357915ded5659c523f322c9710891754932
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Wed Jan 4 13:04:02 2012 +0100
updated to 1.25.13
rediffed some patches; removed 'struct-serialize' patch which was
applied upstream in 1.25.12
.gitignore | 1 +
gssapi-delegate.patch | 42 +++++++++++++++++++++++++-------------
lastver | 2 +-
sources | 2 +-
xmlrpc-c-cmake.patch | 2 +-
xmlrpc-c-struct-serialize.patch | 29 --------------------------
xmlrpc-c.spec | 11 +++++----
7 files changed, 37 insertions(+), 52 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dd754bf..ecc285f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/xmlrpc-c-1.25.0.tar.xz
/xmlrpc-c-1.25.1.tar.xz
/xmlrpc-c-1.25.4.tar.xz
+/xmlrpc-c-1.25.13.tar.xz
diff --git a/gssapi-delegate.patch b/gssapi-delegate.patch
index e0bfede..0271645 100644
--- a/gssapi-delegate.patch
+++ b/gssapi-delegate.patch
@@ -1,11 +1,20 @@
-commit a26e00b3f26c9c37fe63c4045ef5f9bf2e5c695b
-Author: giraffedata <giraffedata at adbb7d4b-a73a-0410-a071-c5f57c452bd4>
-Date: Sun Aug 7 02:50:57 2011 +0000
+From 867cf74ae3a95da7483e94052fd9b3743beb86ec Mon Sep 17 00:00:00 2001
+From: giraffedata <giraffedata at adbb7d4b-a73a-0410-a071-c5f57c452bd4>
+Date: Sun, 7 Aug 2011 02:50:57 +0000
+Subject: [PATCH 9/9] backported GSSAPI_DELEGATION patch
- backported GSSAPI_DELEGATION patch
+---
+ include/xmlrpc-c/client.h | 1 +
+ include/xmlrpc-c/client_transport.hpp | 1 +
+ lib/curl_transport/curltransaction.c | 108 +++++++++++++++++++++++++++-
+ lib/curl_transport/curltransaction.h | 3 +
+ lib/curl_transport/curlversion.h | 6 ++
+ lib/curl_transport/xmlrpc_curl_transport.c | 5 ++
+ src/cpp/curl.cpp | 8 ++-
+ 7 files changed, 129 insertions(+), 3 deletions(-)
diff --git a/include/xmlrpc-c/client.h b/include/xmlrpc-c/client.h
-index f4166e3..27cc78f 100644
+index 99eefd7..8dd3842 100644
--- a/include/xmlrpc-c/client.h
+++ b/include/xmlrpc-c/client.h
@@ -108,6 +108,7 @@ struct xmlrpc_curl_xportparms {
@@ -17,7 +26,7 @@ index f4166e3..27cc78f 100644
diff --git a/include/xmlrpc-c/client_transport.hpp b/include/xmlrpc-c/client_transport.hpp
-index ddeabf5..6f4c57a 100644
+index ada5b5d..58a8c52 100644
--- a/include/xmlrpc-c/client_transport.hpp
+++ b/include/xmlrpc-c/client_transport.hpp
@@ -292,6 +292,7 @@ public:
@@ -29,10 +38,10 @@ index ddeabf5..6f4c57a 100644
private:
struct constrOpt_impl * implP;
diff --git a/lib/curl_transport/curltransaction.c b/lib/curl_transport/curltransaction.c
-index 061392b..614450c 100644
+index 1ae6765..9cd6204 100644
--- a/lib/curl_transport/curltransaction.c
+++ b/lib/curl_transport/curltransaction.c
-@@ -449,6 +449,99 @@ assertConstantsMatch(void) {
+@@ -448,6 +448,99 @@ assertConstantsMatch(void) {
@@ -58,7 +67,7 @@ index 061392b..614450c 100644
+
+ So Xmlrpc-c gives the same choice to its own user, via its
+ 'gssapi_delegation' Curl transport option.
-+
++
+ Current Xmlrpc-c can be linked with, and compiled with, any version of
+ Curl, so it has to carefully consider all the possibilities.
+*/
@@ -132,7 +141,7 @@ index 061392b..614450c 100644
static void
setupCurlSession(xmlrpc_env * const envP,
curlTransaction * const curlTransactionP,
-@@ -483,7 +576,7 @@ setupCurlSession(xmlrpc_env * const envP,
+@@ -482,7 +575,7 @@ setupCurlSession(xmlrpc_env * const envP,
a particular transaction finished.
*/
@@ -141,7 +150,7 @@ index 061392b..614450c 100644
to set what is the default anyhow. The reduction in calls may save
some time, but mostly, it will save us encountering rare bugs or
suffering from backward incompatibilities in future libcurl. I.e. we
-@@ -594,7 +687,18 @@ setupCurlSession(xmlrpc_env * const envP,
+@@ -593,7 +686,18 @@ setupCurlSession(xmlrpc_env * const envP,
if (curlSetupP->timeout)
setCurlTimeout(curlSessionP, curlSetupP->timeout);
@@ -193,10 +202,10 @@ index 71c5a68..4ad445a 100644
#undef CMINOR
diff --git a/lib/curl_transport/xmlrpc_curl_transport.c b/lib/curl_transport/xmlrpc_curl_transport.c
-index fe705b9..66110cc 100644
+index c48b927..9fedcda 100644
--- a/lib/curl_transport/xmlrpc_curl_transport.c
+++ b/lib/curl_transport/xmlrpc_curl_transport.c
-@@ -834,6 +834,11 @@ getXportParms(xmlrpc_env * const envP,
+@@ -836,6 +836,11 @@ getXportParms(xmlrpc_env * const envP,
else
curlSetupP->proxyType = curlXportParmsP->proxy_type;
@@ -209,7 +218,7 @@ index fe705b9..66110cc 100644
}
diff --git a/src/cpp/curl.cpp b/src/cpp/curl.cpp
-index 5751385..24a84ff 100644
+index 9f38ffb..24a84ff 100644
--- a/src/cpp/curl.cpp
+++ b/src/cpp/curl.cpp
@@ -157,6 +157,7 @@ struct clientXmlTransport_curl::constrOpt_impl {
@@ -257,8 +266,11 @@ index 5751385..24a84ff 100644
xmlrpc_curl_transport_ops.create(
&env.env_c, 0, "", "",
-- &transportParms, XMLRPC_CXPSIZE(dont_advertise),
+- &transportParms, XMLRPC_CXPSIZE(proxy_userpwd),
+ &transportParms, XMLRPC_CXPSIZE(gssapi_delegation),
&this->c_transportP);
if (env.env_c.fault_occurred)
+--
+1.7.7.5
+
diff --git a/lastver b/lastver
index 9028955..e60a945 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-2169
+2225
diff --git a/sources b/sources
index e8e561c..41ac8b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b987f88183715b90a5e72d4ce76614b0 xmlrpc-c-1.25.4.tar.xz
+c90d05a718e0a3bb1e823eda83cd88e8 xmlrpc-c-1.25.13.tar.xz
diff --git a/xmlrpc-c-cmake.patch b/xmlrpc-c-cmake.patch
index aa951c1..5dc7b89 100644
--- a/xmlrpc-c-cmake.patch
+++ b/xmlrpc-c-cmake.patch
@@ -144,7 +144,7 @@ index 0000000..c3204fe
+
+set(XMLRPC_C_VERSION_MAJOR "1" CACHE STRING "Version (major) of xmlrpc-c")
+set(XMLRPC_C_VERSION_MINOR "25" CACHE STRING "Version (minor) of xmlrpc-c")
-+set(XMLRPC_C_VERSION_POINT "4" CACHE STRING "Version (point) of xmlrpc-c")
++set(XMLRPC_C_VERSION_POINT "13" CACHE STRING "Version (point) of xmlrpc-c")
+
+set(XMLRPC_C_VERSION
+ "${XMLRPC_C_VERSION_MAJOR}.${XMLRPC_C_VERSION_MINOR}.${XMLRPC_C_VERSION_POINT}"
diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec
index 6f7a8b3..656f889 100644
--- a/xmlrpc-c.spec
+++ b/xmlrpc-c.spec
@@ -1,12 +1,12 @@
%global advanced_branch 1
-%global svnrev 2077
+%global svnrev 2225
%{!?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.25.4
-Release: %release_func 1501.svn%svnrev
+Version: 1.25.13
+Release: %release_func 1500.svn%svnrev
# See COPYING for details.
# The Python 1.5.2 license used by a few files is just BSD.
License: BSD and MIT
@@ -29,7 +29,6 @@ Patch108: xmlrpc-c-30x-redirect.patch
Patch109: xmlrpc-c-check-vasprintf-return-value.patch
Patch110: xmlrpc-c-include-string_int.h.patch
Patch111: xmlrpc-c-default-constructor.patch
-Patch112: xmlrpc-c-struct-serialize.patch
BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: cmake
@@ -122,7 +121,6 @@ This package contains some handy XML-RPC demo applications.
%patch109 -p1
%patch110 -p1
%patch111 -p1
-%patch112 -p1
%patch200 -p1
@@ -243,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 4 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.25.13-1500.svn2225
+- updated to 1.25.13; bugfixes in utility programs
+
* Mon Oct 3 2011 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.25.4-1501.svn2077
- fixed error handling when transfering too large files (#741980)
More information about the scm-commits
mailing list