updated to 1.29.0

rediffed some patches; removed 'struct-serialize' patch which was
applied upstream in 1.28.2
This commit is contained in:
Enrico Scholz 2012-01-04 13:22:04 +01:00
parent 0c94a1bf13
commit 2de7849299
6 changed files with 11 additions and 39 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/xmlrpc-c-1.28.1.tar.xz
/xmlrpc-c-1.29.0.tar.xz

View File

@ -1 +1 @@
2203
2233

View File

@ -1 +1 @@
64461b02285792e9623f0af522c301f5 xmlrpc-c-1.28.1.tar.xz
43d36b8255c0aca641cc60d7796ca29f xmlrpc-c-1.29.0.tar.xz

View File

@ -1,7 +1,7 @@
From 668427e2d8fff3e6b51b6bb3ca8339e47a472a04 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/9] make -> cmake transition
Subject: [PATCH] make -> cmake transition
cmake: updated
---
@ -143,8 +143,8 @@ index 0000000..2d83ce2
+
+
+set(XMLRPC_C_VERSION_MAJOR "1" CACHE STRING "Version (major) of xmlrpc-c")
+set(XMLRPC_C_VERSION_MINOR "28" CACHE STRING "Version (minor) of xmlrpc-c")
+set(XMLRPC_C_VERSION_POINT "1" CACHE STRING "Version (point) of xmlrpc-c")
+set(XMLRPC_C_VERSION_MINOR "29" 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}"

View File

@ -1,29 +0,0 @@
From 9b65c6488a51d36513b9315c11dfb42f319079ac Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Mon, 3 Oct 2011 20:49:57 +0200
Subject: [PATCH] xmlrpc_serialize: check for faults before appending
</struct>
fixes https://bugzilla.redhat.com/show_bug.cgi?id=741980 which was
caused by transmitting too large files within a structure.
---
src/xmlrpc_serialize.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/xmlrpc_serialize.c b/src/xmlrpc_serialize.c
index 78bbc10..e0d9376 100644
--- a/src/xmlrpc_serialize.c
+++ b/src/xmlrpc_serialize.c
@@ -370,7 +370,8 @@ serializeStruct(xmlrpc_env * const envP,
memberKeyP, memberValueP, dialect);
}
}
- addString(envP, outputP, "</struct>");
+ if (!envP->fault_occurred)
+ addString(envP, outputP, "</struct>");
}
}
}
--
1.7.6

View File

@ -1,11 +1,11 @@
%global advanced_branch 1
%global svnrev 2203
%global svnrev 2233
%{!?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.28.1
Version: 1.29.0
Release: %release_func 1700.svn%svnrev
# See COPYING for details.
# The Python 1.5.2 license used by a few files is just BSD.
@ -28,7 +28,6 @@ Patch107: xmlrpc-c-uninit-curl.patch
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-struct-serialize.patch
BuildRoot: %_tmppath/%name-%version-%release-root
@ -118,7 +117,6 @@ This package contains some handy XML-RPC demo applications.
%patch108 -p1
%patch109 -p1
%patch110 -p1
%patch111 -p1
## not needed...
rm doc/{INSTALL,configure_doc}
@ -237,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Jan 4 2012 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 1.29.0-1700.svn2233
- updated to 1.29.0
* Mon Oct 3 2011 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 1.28.1-1700.svn2203
- updated to 1.28.1