diff --git a/.gitignore b/.gitignore index 9227397..2d055d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /xmlrpc-c-1.24.4.tar.xz /xmlrpc-c-1.25.0.tar.xz /xmlrpc-c-1.25.1.tar.xz +/xmlrpc-c-1.26.0.tar.xz diff --git a/lastver b/lastver index fc9b6b9..631455b 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -2077 +2118 diff --git a/sources b/sources index 819d5f8..5bbef4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8ffc26b0274e82977649c58c1eb89a7 xmlrpc-c-1.25.1.tar.xz +4034f7fd65704a7542a5fc593c52ac10 xmlrpc-c-1.26.0.tar.xz diff --git a/xmlrpc-c-cmake.patch b/xmlrpc-c-cmake.patch index e3c62ef..7f386ff 100644 --- a/xmlrpc-c-cmake.patch +++ b/xmlrpc-c-cmake.patch @@ -1,4 +1,4 @@ -From 045f8f7a446ea738b229478ef618a2705ee19aef Mon Sep 17 00:00:00 2001 +From 8410940833027653f6b58866e1468f5dc42dae0e 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 @@ -8,7 +8,7 @@ cmake: updated CMakeLists.txt | 284 +++++++++++++++++++++++++++ cmake/try-attr.cc | 3 + cmake/va-list-is-array.c | 9 + - examples/CMakeLists.txt | 60 ++++++ + examples/CMakeLists.txt | 62 ++++++ examples/config.h | 1 + examples/cpp/CMakeLists.txt | 34 ++++ include/CMakeLists.txt | 3 + @@ -63,7 +63,7 @@ cmake: updated version.h.cmake | 5 + xmlrpc-c-config | 105 ++++++++++ xmlrpc_config.h.cmake | 147 ++++++++++++++ - 58 files changed, 1528 insertions(+), 0 deletions(-) + 58 files changed, 1530 insertions(+), 0 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 cmake/try-attr.cc create mode 100644 cmake/va-list-is-array.c @@ -125,7 +125,7 @@ cmake: updated diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 -index 0000000..c3204fe +index 0000000..3bb9e03 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,284 @@ @@ -143,8 +143,8 @@ 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 "1" CACHE STRING "Version (point) of xmlrpc-c") ++set(XMLRPC_C_VERSION_MINOR "26" 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}" @@ -439,10 +439,10 @@ index 0000000..1ad0bab +int main() {} diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 -index 0000000..cfe9f52 +index 0000000..30d0db5 --- /dev/null +++ b/examples/CMakeLists.txt -@@ -0,0 +1,60 @@ +@@ -0,0 +1,62 @@ +# -*- cmake -*- + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -474,6 +474,7 @@ index 0000000..cfe9f52 + set(client_LIBS xmlrpc_client) + + ensc_add_example(auth_client c client) ++ ensc_add_example(compound_value_client c client) + ensc_add_example(synch_client c client) + ensc_add_example(xmlrpc_sample_add_client c client) + ensc_add_example(xmlrpc_asynch_client c client) @@ -494,6 +495,7 @@ index 0000000..cfe9f52 +if(ENABLE_ABYSS_SERVER) + set(abyss_server_LIBS xmlrpc_server_abyss) + ++ ensc_add_example(compound_value_server c abyss_server) + ensc_add_example(interrupted_server c abyss_server) + ensc_add_example(xmlrpc_inetd_server c abyss_server) + ensc_add_example(xmlrpc_socket_server c abyss_server) @@ -2000,5 +2002,5 @@ index 0000000..2859749 + +#endif -- -1.7.3.4 +1.7.4 diff --git a/xmlrpc-c-longlong.patch b/xmlrpc-c-longlong.patch index 4e80105..8f2f06e 100644 --- a/xmlrpc-c-longlong.patch +++ b/xmlrpc-c-longlong.patch @@ -1,4 +1,4 @@ -From b06183b4942036f06b560cdb18b9eac26d2be89a Mon Sep 17 00:00:00 2001 +From 4d3bbc5d59418666a5fc91c8fe3e301ee9c89b32 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 5 Apr 2008 11:41:34 +0200 Subject: [PATCH 3/8] Use proper datatypes for 'long long' @@ -22,7 +22,7 @@ for now, the patch uses datatypes with exact widths. 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/xmlrpc-c/base.h b/include/xmlrpc-c/base.h -index 66bf3f2..b7b654a 100644 +index cdc9161..cbdf3d0 100644 --- a/include/xmlrpc-c/base.h +++ b/include/xmlrpc-c/base.h @@ -5,6 +5,7 @@ @@ -55,11 +55,11 @@ index 66bf3f2..b7b654a 100644 diff --git a/lib/libutil/string_number.c b/lib/libutil/string_number.c -index 0294526..eb3a3f9 100644 +index 1c284af..a7e78ad 100644 --- a/lib/libutil/string_number.c +++ b/lib/libutil/string_number.c -@@ -7,6 +7,7 @@ - #include +@@ -6,6 +6,7 @@ + ============================================================================*/ #include #include +#include @@ -94,5 +94,5 @@ index 67c636b..60f7df9 100644 if (longlongvalue < minimum) -- -1.7.3.4 +1.7.4 diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec index 4e9c757..f680b28 100644 --- a/xmlrpc-c.spec +++ b/xmlrpc-c.spec @@ -1,12 +1,12 @@ %global advanced_branch 1 -%global svnrev 2077 +%global svnrev 2188 %{!?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.1 -Release: %release_func 1501.svn%svnrev +Version: 1.26.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. License: BSD and MIT @@ -235,6 +235,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 2 2011 Enrico Scholz - 1.26.0-1600.svn2188 +- updated to 1.26.0 + * Mon Feb 07 2011 Fedora Release Engineering - 1.25.1-1501.svn2077 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild