diff --git a/.cvsignore b/.cvsignore index 164085b..321af2c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xmlrpc-c-1.14.2.tar.bz2 +xmlrpc-c-1.14.6.tar.bz2 diff --git a/fixed-broken-format-string-modifiers-for-size_t-type.patch b/fixed-broken-format-string-modifiers-for-size_t-type.patch index 3c487a3..86de1e3 100644 --- a/fixed-broken-format-string-modifiers-for-size_t-type.patch +++ b/fixed-broken-format-string-modifiers-for-size_t-type.patch @@ -1,4 +1,4 @@ -From b4884128c52b27015020148b698ef2e9907ff2fa Mon Sep 17 00:00:00 2001 +From 3e749ef00fe69f76587620d2c326aee363e46253 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Mon, 25 Feb 2008 17:48:25 +0100 Subject: [PATCH] fixed broken format string modifiers for size_t typed arguments @@ -16,7 +16,7 @@ Subject: [PATCH] fixed broken format string modifiers for size_t typed arguments 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/abyss/src/socket_unix.c b/lib/abyss/src/socket_unix.c -index fd39276..afe2be7 100644 +index 0059a1e..5ec8f78 100644 --- a/lib/abyss/src/socket_unix.c +++ b/lib/abyss/src/socket_unix.c @@ -193,8 +193,8 @@ channelWrite(TChannel * const channelP, @@ -57,7 +57,7 @@ index 28827fe..415dd6d 100644 else { memcpy(byteStringValue, contents, size); diff --git a/src/xmlrpc_datetime.c b/src/xmlrpc_datetime.c -index c4cc938..17fa328 100644 +index 832f4fb..a02ca21 100644 --- a/src/xmlrpc_datetime.c +++ b/src/xmlrpc_datetime.c @@ -208,7 +208,7 @@ validateFormat(xmlrpc_env * const envP, @@ -92,10 +92,10 @@ index eeb3414..36e62f6 100644 else { struct mbrDecomp * const mbrP = diff --git a/src/xmlrpc_parse.c b/src/xmlrpc_parse.c -index 77b649d..dfcc29b 100644 +index b62406e..29aec20 100644 --- a/src/xmlrpc_parse.c +++ b/src/xmlrpc_parse.c -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ do \ if (xml_element_children_size(elem) != (count)) \ XMLRPC_FAIL3(env, XMLRPC_PARSE_ERROR, \ @@ -104,7 +104,7 @@ index 77b649d..dfcc29b 100644 xml_element_name(elem), (count), \ xml_element_children_size(elem)); \ while (0) -@@ -675,7 +675,7 @@ parseMethodNameElement(xmlrpc_env * const envP, +@@ -830,7 +830,7 @@ parseMethodNameElement(xmlrpc_env * const envP, xmlrpc_env_set_fault_formatted( envP, XMLRPC_PARSE_ERROR, "A element should not have children. " @@ -113,7 +113,7 @@ index 77b649d..dfcc29b 100644 else { const char * const cdata = xml_element_cdata(nameElemP); -@@ -734,7 +734,7 @@ parseCallChildren(xmlrpc_env * const envP, +@@ -889,7 +889,7 @@ parseCallChildren(xmlrpc_env * const envP, xmlrpc_env_set_fault_formatted( envP, XMLRPC_PARSE_ERROR, " has extraneous children, other than " @@ -122,7 +122,7 @@ index 77b649d..dfcc29b 100644 callChildCount); if (envP->fault_occurred) -@@ -772,7 +772,7 @@ xmlrpc_parse_call(xmlrpc_env * const envP, +@@ -927,7 +927,7 @@ xmlrpc_parse_call(xmlrpc_env * const envP, if (xmlLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID)) xmlrpc_env_set_fault_formatted( envP, XMLRPC_LIMIT_EXCEEDED_ERROR, @@ -131,7 +131,7 @@ index 77b649d..dfcc29b 100644 xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID)); else { xml_element * callElemP; -@@ -849,7 +849,7 @@ parseFaultElement(xmlrpc_env * const envP, +@@ -1004,7 +1004,7 @@ parseFaultElement(xmlrpc_env * const envP, if (xml_element_children_size(faultElement) != 1) xmlrpc_env_set_fault_formatted( envP, XMLRPC_PARSE_ERROR, @@ -140,7 +140,7 @@ index 77b649d..dfcc29b 100644 xml_element_children_size(faultElement)); else { xml_element * const faultValueP = -@@ -945,7 +945,7 @@ parseMethodResponseElt(xmlrpc_env * const envP, +@@ -1100,7 +1100,7 @@ parseMethodResponseElt(xmlrpc_env * const envP, } else xmlrpc_env_set_fault_formatted( envP, XMLRPC_PARSE_ERROR, @@ -149,7 +149,7 @@ index 77b649d..dfcc29b 100644 xml_element_children_size(methodResponseEltP)); } -@@ -984,8 +984,8 @@ xmlrpc_parse_response2(xmlrpc_env * const envP, +@@ -1139,8 +1139,8 @@ xmlrpc_parse_response2(xmlrpc_env * const envP, if (xmlDataLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID)) xmlrpc_env_set_fault_formatted( envP, XMLRPC_LIMIT_EXCEEDED_ERROR, @@ -227,5 +227,5 @@ index 1bdc44c..c4e0618 100644 else { size_t const byteStringSize = strlen(valueString)/2; -- -1.5.4.1 +1.5.4.5 diff --git a/lastver b/lastver index 6243d53..7674a94 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -1.14.02 +1.14.06 diff --git a/make-cmake-transition.patch b/make-cmake-transition.patch index 0292ca6..3783f80 100644 --- a/make-cmake-transition.patch +++ b/make-cmake-transition.patch @@ -1,4 +1,4 @@ -From fe143f77b741d6518d26bafa56adc030dc1d3bb1 Mon Sep 17 00:00:00 2001 +From 9ba428178fbde76825e673bab3f82f97e8d65722 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 5 Apr 2008 10:55:02 +0200 Subject: [PATCH] make -> cmake transition @@ -116,7 +116,7 @@ Subject: [PATCH] make -> cmake transition diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 -index 0000000..2cba7d1 +index 0000000..244ddb2 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,260 @@ @@ -128,7 +128,7 @@ index 0000000..2cba7d1 + +set(XMLRPC_C_VERSION_MAJOR "1" CACHE STRING "Version (major) of xmlrpc-c") +set(XMLRPC_C_VERSION_MINOR "14" CACHE STRING "Version (minor) of xmlrpc-c") -+set(XMLRPC_C_VERSION_POINT "2" CACHE STRING "Version (point) of xmlrpc-c") ++set(XMLRPC_C_VERSION_POINT "6" CACHE STRING "Version (point) of xmlrpc-c") + +set(XMLRPC_C_VERSION + "${XMLRPC_C_VERSION_MAJOR}.${XMLRPC_C_VERSION_MINOR}.${XMLRPC_C_VERSION_POINT}" @@ -959,7 +959,7 @@ index 0000000..de3501c +endif(MUST_BUILD_WININET_CLIENT) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 -index 0000000..a820602 +index 0000000..f0981e3 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,107 @@ @@ -1008,7 +1008,7 @@ index 0000000..a820602 + +### libxmlrpc.so +add_library(xmlrpc SHARED -+ resource.c trace.c version.c ${xmlrpc_xml_parser} ++ double.c resource.c trace.c version.c ${xmlrpc_xml_parser} + xmlrpc_data.c xmlrpc_datetime.c xmlrpc_string.c + xmlrpc_array.c xmlrpc_struct.c + xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c @@ -1744,5 +1744,5 @@ index 0000000..3ba3202 + +#endif -- -1.5.4.1 +1.5.4.5 diff --git a/sources b/sources index eb07e49..cd7a571 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2a058493accf2d18aa25b5cd54acedf xmlrpc-c-1.14.2.tar.bz2 +2f28e2e412636009c0b7508454d5db07 xmlrpc-c-1.14.6.tar.bz2 diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec index 8e4d6be..3b6996b 100644 --- a/xmlrpc-c.spec +++ b/xmlrpc-c.spec @@ -4,7 +4,7 @@ Summary: A lightweight RPC library based on XML and HTTP Name: xmlrpc-c -Version: 1.14.2 +Version: 1.14.6 Release: %release_func 1 License: BSD/PSF -- see COPYING Group: System Environment/Libraries @@ -124,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun May 25 2008 Enrico Scholz - 1.14.6-1 +- updated to 1.14.6 + * Sat Apr 12 2008 Enrico Scholz - 1.14.2-1 - updated to 1.14.2 - rediffed patches