From ce2d8cadb44ef68ccaa99474aee0a75b9a9ea6d14297c07ce747d8573c5022f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 18 Jul 2011 11:51:13 +0000 Subject: [PATCH] Accepting request 74804 from home:appleonkel:branches:devel:libraries:c_c++ I updated to recent stable version (not superstable). I hope the new %{soname} version wouldn't break anything. Please have a deeper look at this package. OBS-URL: https://build.opensuse.org/request/show/74804 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/xmlrpc-c?expand=0&rev=61 --- xmlrpc-c-1.06.04-sizet.patch | 146 -------------- xmlrpc-c-1.06.41.tar.bz2 | 3 - xmlrpc-c-1.25.07.tar.bz2 | 3 + xmlrpc-c-default-constructor.patch | 10 + xmlrpc-c-disable_rpath.patch | 45 ----- xmlrpc-c-fix_as_needed.patch | 60 ------ xmlrpc-c-fix_without_as_needed.patch | 60 ------ ...c-fix_wrong_printf_format_for_size_t.patch | 62 ------ xmlrpc-c-lib.patch | 20 -- xmlrpc-c-lib64.patch | 92 --------- xmlrpc-c.changes | 9 + xmlrpc-c.spec | 187 +++++++++++------- 12 files changed, 134 insertions(+), 563 deletions(-) delete mode 100644 xmlrpc-c-1.06.04-sizet.patch delete mode 100644 xmlrpc-c-1.06.41.tar.bz2 create mode 100644 xmlrpc-c-1.25.07.tar.bz2 create mode 100644 xmlrpc-c-default-constructor.patch delete mode 100644 xmlrpc-c-disable_rpath.patch delete mode 100644 xmlrpc-c-fix_as_needed.patch delete mode 100644 xmlrpc-c-fix_without_as_needed.patch delete mode 100644 xmlrpc-c-fix_wrong_printf_format_for_size_t.patch delete mode 100644 xmlrpc-c-lib.patch delete mode 100644 xmlrpc-c-lib64.patch diff --git a/xmlrpc-c-1.06.04-sizet.patch b/xmlrpc-c-1.06.04-sizet.patch deleted file mode 100644 index b943ca5..0000000 --- a/xmlrpc-c-1.06.04-sizet.patch +++ /dev/null @@ -1,146 +0,0 @@ -2006-06-04 Enrico Scholz - - * fixed a lot of format strings which produce - - | warning: format '%d' expects type 'int', but argument 6 has type 'size_t' - - style warnings on x86_64 machines else - ---- xmlrpc-c-1.05/lib/libutil/memblock.c.sizet 2005-09-23 04:17:23.000000000 +0200 -+++ xmlrpc-c-1.05/lib/libutil/memblock.c 2006-06-04 19:02:10.000000000 +0200 -@@ -73,7 +73,7 @@ xmlrpc_mem_block_init(xmlrpc_env * - - blockP->_block = (void*) malloc(blockP->_allocated); - if (!blockP->_block) -- xmlrpc_faultf(envP, "Can't allocate %u-byte memory block", -+ xmlrpc_faultf(envP, "Can't allocate %zu-byte memory block", - blockP->_allocated); - } - ---- xmlrpc-c-1.05/src/xmlrpc_data.c.sizet 2006-01-03 07:48:59.000000000 +0100 -+++ xmlrpc-c-1.05/src/xmlrpc_data.c 2006-06-04 19:06:02.000000000 +0200 -@@ -288,7 +288,7 @@ xmlrpc_read_string(xmlrpc_env * - if (stringValue == NULL) - xmlrpc_env_set_fault_formatted( - envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate space " -- "for %u-character string", length); -+ "for %zu-character string", length); - else { - memcpy(stringValue, contents, length); - stringValue[length] = '\0'; -@@ -419,7 +419,7 @@ xmlrpc_read_string_w(xmlrpc_env * co - if (stringValue == NULL) - xmlrpc_env_set_fault_formatted( - envP, XMLRPC_INTERNAL_ERROR, -- "Unable to allocate space for %u-byte string", -+ "Unable to allocate space for %zu-byte string", - length); - else { - memcpy(stringValue, wcontents, length * sizeof(wchar_t)); -@@ -466,7 +466,7 @@ xmlrpc_read_string_w_lp(xmlrpc_env * - if (stringValue == NULL) - xmlrpc_env_set_fault_formatted( - envP, XMLRPC_INTERNAL_ERROR, -- "Unable to allocate space for %u-byte string", -+ "Unable to allocate space for %zu-byte string", - size); - else { - memcpy(stringValue, wcontents, size * sizeof(wchar_t)); -@@ -523,7 +523,7 @@ xmlrpc_read_base64(xmlrpc_env * - byteStringValue = malloc(size); - if (byteStringValue == NULL) - xmlrpc_env_set_fault_formatted( -- envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate %u bytes " -+ envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate %zu bytes " - "for byte string.", size); - else { - memcpy(byteStringValue, contents, size); ---- xmlrpc-c-1.05/src/xmlrpc_datetime.c.sizet 2006-01-03 04:39:22.000000000 +0100 -+++ xmlrpc-c-1.05/src/xmlrpc_datetime.c 2006-06-04 19:06:37.000000000 +0200 -@@ -331,7 +331,7 @@ validateFormat(xmlrpc_env * const envP, - const char * const t) { - - if (strlen(t) != 17) -- xmlrpc_faultf(envP, "%u characters instead of 15.", strlen(t)); -+ xmlrpc_faultf(envP, "%zu characters instead of 15.", strlen(t)); - else if (t[8] != 'T') - xmlrpc_faultf(envP, "9th character is '%c', not 'T'", t[8]); - else { ---- xmlrpc-c-1.05/src/xmlrpc_parse.c.sizet 2006-03-23 00:48:31.000000000 +0100 -+++ xmlrpc-c-1.05/src/xmlrpc_parse.c 2006-06-04 19:10:00.000000000 +0200 -@@ -57,7 +57,7 @@ - do \ - if (xml_element_children_size(elem) != (count)) \ - XMLRPC_FAIL3(env, XMLRPC_PARSE_ERROR, \ -- "Expected <%s> to have %d children, found %d", \ -+ "Expected <%s> to have %d children, found %zd", \ - xml_element_name(elem), (count), \ - xml_element_children_size(elem)); \ - while (0) -@@ -595,7 +595,7 @@ parseMethodNameElement(xmlrpc_env * con - xmlrpc_env_set_fault_formatted( - envP, XMLRPC_PARSE_ERROR, - "A element should not have children. " -- "This one has %u of them.", xml_element_children_size(nameElemP)); -+ "This one has %zu of them.", xml_element_children_size(nameElemP)); - else { - const char * const cdata = xml_element_cdata(nameElemP); - -@@ -654,7 +654,7 @@ parseCallChildren(xmlrpc_env * const - xmlrpc_env_set_fault_formatted( - envP, XMLRPC_PARSE_ERROR, - " has extraneous children, other than " -- " and . Total child count = %u", -+ " and . Total child count = %zu", - callChildCount); - - if (envP->fault_occurred) -@@ -697,7 +697,7 @@ xmlrpc_parse_call(xmlrpc_env * const - if (xmlLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID)) - xmlrpc_env_set_fault_formatted( - envP, XMLRPC_LIMIT_EXCEEDED_ERROR, -- "XML-RPC request too large. Max allowed is %u bytes", -+ "XML-RPC request too large. Max allowed is %zu bytes", - xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID)); - else { - xml_element * callElemP; -@@ -773,7 +773,7 @@ parseFaultElement(xmlrpc_env * co - if (xml_element_children_size(faultElement) != 1) - xmlrpc_env_set_fault_formatted( - envP, XMLRPC_PARSE_ERROR, -- " element should have 1 child, but it has %u.", -+ " element should have 1 child, but it has %zu.", - xml_element_children_size(faultElement)); - else { - xml_element * const faultValueP = -@@ -869,7 +869,7 @@ parseMethodResponseElt(xmlrpc_env * - } else - xmlrpc_env_set_fault_formatted( - envP, XMLRPC_PARSE_ERROR, -- " has %u children, should have 1.", -+ " has %zu children, should have 1.", - xml_element_children_size(methodResponseEltP)); - } - -@@ -908,8 +908,8 @@ xmlrpc_parse_response2(xmlrpc_env * c - if (xmlDataLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID)) - xmlrpc_env_set_fault_formatted( - envP, XMLRPC_LIMIT_EXCEEDED_ERROR, -- "XML-RPC response too large. Our limit is %u characters. " -- "We got %u characters", -+ "XML-RPC response too large. Our limit is %zu characters. " -+ "We got %zu characters", - xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID), xmlDataLen); - else { - xml_parse(envP, xmlData, xmlDataLen, &response); ---- xmlrpc-c-1.05/src/xmlrpc_server_abyss.c.sizet 2006-03-25 20:15:31.000000000 +0100 -+++ xmlrpc-c-1.05/src/xmlrpc_server_abyss.c 2006-06-04 19:11:24.000000000 +0200 -@@ -348,7 +348,7 @@ processCall(TSession * const abys - if (contentSize > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID)) - xmlrpc_env_set_fault_formatted( - &env, XMLRPC_LIMIT_EXCEEDED_ERROR, -- "XML-RPC request too large (%d bytes)", contentSize); -+ "XML-RPC request too large (%zd bytes)", contentSize); - else { - xmlrpc_mem_block *body; - /* Read XML data off the wire. */ diff --git a/xmlrpc-c-1.06.41.tar.bz2 b/xmlrpc-c-1.06.41.tar.bz2 deleted file mode 100644 index 9ea053d..0000000 --- a/xmlrpc-c-1.06.41.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24cde10cf121264db75e45c22ac87b7ff4bef05ab546f3f31aeee6b293f60db0 -size 570847 diff --git a/xmlrpc-c-1.25.07.tar.bz2 b/xmlrpc-c-1.25.07.tar.bz2 new file mode 100644 index 0000000..1e67068 --- /dev/null +++ b/xmlrpc-c-1.25.07.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a8d57f900ea8ca30a27740009158a867ade2198ada36c2048e127804804de44 +size 597764 diff --git a/xmlrpc-c-default-constructor.patch b/xmlrpc-c-default-constructor.patch new file mode 100644 index 0000000..e70679c --- /dev/null +++ b/xmlrpc-c-default-constructor.patch @@ -0,0 +1,10 @@ +--- include/xmlrpc-c/registry.hpp.orig 2011-06-28 22:43:07.787955247 +0200 ++++ include/xmlrpc-c/registry.hpp 2011-06-28 22:43:56.652197548 +0200 +@@ -24,6 +24,7 @@ + information pertinent to that kind of server. + -----------------------------------------------------------------------------*/ + public: ++ callInfo() {}; + virtual ~callInfo() {}; // This makes it polymorphic + }; + diff --git a/xmlrpc-c-disable_rpath.patch b/xmlrpc-c-disable_rpath.patch deleted file mode 100644 index b5d883c..0000000 --- a/xmlrpc-c-disable_rpath.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- xmlrpc-c-config.in.orig 2010-10-30 19:57:49.000000000 +0200 -+++ xmlrpc-c-config.in 2010-10-30 19:58:30.000000000 +0200 -@@ -59,8 +59,6 @@ - the_libdirs="-L$libdir $the_libdirs" - - the_libs="-lxmlrpc -lxmlrpc_util ${LIBXML}" --the_rpath= --the_wl_rpath= - cpp_libs= - - cflags= -@@ -112,18 +110,12 @@ - - if test "${MUST_BUILD_WININET_CLIENT}" = "yes"; then - the_libs="$the_libs @WININET_LDADD@" -- the_rpath="@WININET_RPATH@ $the_rpath" -- the_wl_rpath="@WININET_WL_RPATH@ $the_wl_rpath" - fi - if test "${MUST_BUILD_CURL_CLIENT}" = "yes"; then - the_libs="$the_libs @CURL_LDADD@" -- the_rpath="@CURL_RPATH@ $the_rpath" -- the_wl_rpath="@CURL_WL_RPATH@ $the_wl_rpath" - fi - if test "${MUST_BUILD_LIBWWW_CLIENT}" = "yes"; then - the_libs="$the_libs @LIBWWW_LDADD@" -- the_rpath="@LIBWWW_RPATH@ $the_rpath" -- the_wl_rpath="@LIBWWW_WL_RPATH@ $the_wl_rpath" - fi - if test "${needCpp}" = "yes"; then - the_libs="-lxmlrpc_client++ $the_libs" -@@ -142,13 +134,12 @@ - echo "$cflags" - ;; - --libs) -- echo "$the_libdirs $the_libs $the_wl_rpath" -+ echo "$the_libdirs $the_libs" - ;; - --ldadd) - echo "$the_libdirs $the_libs" - ;; - --ldflags) -- echo "$the_rpath" - ;; - --prefix) - echo "@prefix@" diff --git a/xmlrpc-c-fix_as_needed.patch b/xmlrpc-c-fix_as_needed.patch deleted file mode 100644 index 0e61f7a..0000000 --- a/xmlrpc-c-fix_as_needed.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- examples/cpp/Makefile.orig 2009-09-28 09:14:02.000000000 +0200 -+++ examples/cpp/Makefile 2009-09-28 09:14:52.000000000 +0200 -@@ -15,7 +15,7 @@ - include $(BUILDDIR)/Makefile.config - - CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) --LDFLAGS = $(LADD) -+LDFLAGS = $(LADD) -Wl,--as-needed -lcurl - - # If this were a real application, working from an installed copy of - # Xmlrpc-c, XMLRPC_C_CONFIG would just be 'xmlrpc-c-config'. It would be -@@ -63,13 +63,13 @@ - all: $(PROGS) - - $(SERVERPROGS_ABYSS):%:%.o -- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS) -+ $(CXXLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS) - - $(LEGACY_CLIENTPROGS):%:%.o -- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_LEGACY_CLIENT) -+ $(CXXLD) -o $@ $^ $(LDADD_LEGACY_CLIENT) $(LDFLAGS) - - $(CLIENTPROGS):%:%.o -- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT) -+ $(CXXLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS) - - %.o:%.cpp - $(CXX) -c $(INCLUDES) $(CXXFLAGS) $< ---- examples/Makefile.orig 2009-09-28 07:36:45.000000000 +0200 -+++ examples/Makefile 2009-09-28 09:11:28.000000000 +0200 -@@ -15,7 +15,7 @@ - include $(BUILDDIR)/Makefile.config - - CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) --LDFLAGS = $(LADD) -+LDFLAGS = $(LADD) -Wl,--as-needed -lcurl - - # If this were a real application, working from an installed copy of - # Xmlrpc-c, XMLRPC_C_CONFIG would just be 'xmlrpc-c-config'. It would be -@@ -81,16 +81,16 @@ - $(MAKE) -C $(dir $@) $(notdir $@) - - $(CLIENTPROGS):%:%.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT) -+ $(CCLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS) - - $(SERVERPROGS_CGI):%.cgi:%_cgi.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_CGI) -+ $(CCLD) -o $@ $^ $(LDADD_SERVER_CGI) $(LDFLAGS) - - $(SERVERPROGS_ABYSS):%:%.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS) -+ $(CCLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS) - - gen_sample_add_xml:%:%.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_BASE) -+ $(CCLD) -o $@ $^ $(LDADD_BASE) $(LDFLAGS) - - %.o:%.c - $(CC) -c $(INCLUDES) $(CFLAGS) $< diff --git a/xmlrpc-c-fix_without_as_needed.patch b/xmlrpc-c-fix_without_as_needed.patch deleted file mode 100644 index 004a145..0000000 --- a/xmlrpc-c-fix_without_as_needed.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- examples/cpp/Makefile.orig 2009-09-28 09:14:02.000000000 +0200 -+++ examples/cpp/Makefile 2009-09-28 09:14:52.000000000 +0200 -@@ -15,7 +15,7 @@ - include $(BUILDDIR)/Makefile.config - - CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) --LDFLAGS = $(LADD) -+LDFLAGS = $(LADD) -lcurl - - # If this were a real application, working from an installed copy of - # Xmlrpc-c, XMLRPC_C_CONFIG would just be 'xmlrpc-c-config'. It would be -@@ -63,13 +63,13 @@ - all: $(PROGS) - - $(SERVERPROGS_ABYSS):%:%.o -- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS) -+ $(CXXLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS) - - $(LEGACY_CLIENTPROGS):%:%.o -- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_LEGACY_CLIENT) -+ $(CXXLD) -o $@ $^ $(LDADD_LEGACY_CLIENT) $(LDFLAGS) - - $(CLIENTPROGS):%:%.o -- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT) -+ $(CXXLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS) - - %.o:%.cpp - $(CXX) -c $(INCLUDES) $(CXXFLAGS) $< ---- examples/Makefile.orig 2009-09-28 07:36:45.000000000 +0200 -+++ examples/Makefile 2009-09-28 09:11:28.000000000 +0200 -@@ -15,7 +15,7 @@ - include $(BUILDDIR)/Makefile.config - - CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) --LDFLAGS = $(LADD) -+LDFLAGS = $(LADD) -lcurl - - # If this were a real application, working from an installed copy of - # Xmlrpc-c, XMLRPC_C_CONFIG would just be 'xmlrpc-c-config'. It would be -@@ -81,16 +81,16 @@ - $(MAKE) -C $(dir $@) $(notdir $@) - - $(CLIENTPROGS):%:%.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT) -+ $(CCLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS) - - $(SERVERPROGS_CGI):%.cgi:%_cgi.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_CGI) -+ $(CCLD) -o $@ $^ $(LDADD_SERVER_CGI) $(LDFLAGS) - - $(SERVERPROGS_ABYSS):%:%.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS) -+ $(CCLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS) - - gen_sample_add_xml:%:%.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_BASE) -+ $(CCLD) -o $@ $^ $(LDADD_BASE) $(LDFLAGS) - - %.o:%.c - $(CC) -c $(INCLUDES) $(CFLAGS) $< diff --git a/xmlrpc-c-fix_wrong_printf_format_for_size_t.patch b/xmlrpc-c-fix_wrong_printf_format_for_size_t.patch deleted file mode 100644 index 12ebc39..0000000 --- a/xmlrpc-c-fix_wrong_printf_format_for_size_t.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- src/xmlrpc_parse.c.orig 2010-10-30 20:02:08.000000000 +0200 -+++ src/xmlrpc_parse.c 2010-10-30 20:04:08.000000000 +0200 -@@ -122,7 +122,7 @@ - /* Look for out-of-range errors which didn't produce ERANGE. */ - if (i < min || i > max) - XMLRPC_FAIL3(env, XMLRPC_PARSE_ERROR, -- "\"%s\" must be in range %ld to %ld", str, min, max); -+ "\"%s\" must be in range %zd to %zd", str, min, max); - - /* Check for unused characters. */ - if (end != str + strlen) ---- lib/abyss/src/response.c.orig 2010-10-30 20:00:10.000000000 +0200 -+++ lib/abyss/src/response.c 2010-10-30 20:00:26.000000000 +0200 -@@ -225,7 +225,7 @@ - uint64_t const len) { - char contentLengthValue[32]; - -- sprintf(contentLengthValue, "%llu", len); -+ sprintf(contentLengthValue, "%zu", len); - - return ResponseAddField(sessionP, "Content-length", contentLengthValue); - } ---- lib/abyss/src/socket_unix.c.orig 2010-10-30 20:01:22.000000000 +0200 -+++ lib/abyss/src/socket_unix.c 2010-10-30 20:01:33.000000000 +0200 -@@ -200,7 +200,7 @@ - fprintf(stderr, "Abyss socket: send() failed. " - "Socket closed.\n"); - else -- fprintf(stderr, "Abyss socket: sent %u bytes: '%.*s'\n", -+ fprintf(stderr, "Abyss socket: sent %zu bytes: '%.*s'\n", - rc, rc, &buffer[len-bytesLeft]); - } - if (rc <= 0) ---- lib/abyss/src/server.c.orig 2010-10-30 20:00:32.000000000 +0200 -+++ lib/abyss/src/server.c 2010-10-30 20:01:16.000000000 +0200 -@@ -277,7 +277,7 @@ - } - } - -- sprintf(z3, "%5llu %c", fi->size, u); -+ sprintf(z3, "%5zu %c", fi->size, u); - - if (xmlrpc_streq(fi->name, "..")) - z4 = ""; -@@ -440,7 +440,7 @@ - if (decoded) { - /* Entity header, not response header */ - sprintf(z, "Content-type: %s" CRLF -- "Content-range: bytes %llu-%llu/%llu" CRLF -+ "Content-range: bytes %zu-%zu/%zu" CRLF - "Content-length: %llu" CRLF - CRLF, mediatype, start, end, - filesize, end-start+1); -@@ -509,7 +509,7 @@ - break; - } - -- sprintf(z, "bytes %llu-%llu/%llu", start, end, filesize); -+ sprintf(z, "bytes %zu-%zu/%zu", start, end, filesize); - - ResponseAddField(r, "Content-range", z); - ResponseContentLength(r, end - start + 1); diff --git a/xmlrpc-c-lib.patch b/xmlrpc-c-lib.patch deleted file mode 100644 index fa6a7d7..0000000 --- a/xmlrpc-c-lib.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ltconfig.orig 2010-10-30 19:53:24.000000000 +0200 -+++ ltconfig 2010-10-30 19:53:43.000000000 +0200 -@@ -1957,7 +1957,7 @@ - ;; - - # This must be Linux ELF. --linux-gnu*) -+linux*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -1970,7 +1970,7 @@ - file_magic_cmd=/usr/bin/file - file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - -- if test -f /lib/ld.so.1; then -+ if true; then - dynamic_linker='GNU ld.so' - else - # Only the GNU ld.so supports shared libraries on MkLinux. diff --git a/xmlrpc-c-lib64.patch b/xmlrpc-c-lib64.patch deleted file mode 100644 index cdcfacc..0000000 --- a/xmlrpc-c-lib64.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- ltconfig.orig 2010-10-30 19:50:15.000000000 +0200 -+++ ltconfig 2010-10-30 19:52:55.000000000 +0200 -@@ -1774,8 +1774,8 @@ - shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64" -+sys_lib_search_path_spec="/lib64 /usr/lib64" - file_magic_cmd= - file_magic_test_file= - deplibs_check_method='unknown' -@@ -1957,7 +1957,7 @@ - ;; - - # This must be Linux ELF. --linux-gnu*) -+linux*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -1968,9 +1968,9 @@ - shlibpath_overrides_runpath=no - deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - file_magic_cmd=/usr/bin/file -- file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` -+ file_magic_test_file=`echo /lib64/libc.so* /lib64/libc-*.so` - -- if test -f /lib/ld.so.1; then -+ if true; then - dynamic_linker='GNU ld.so' - else - # Only the GNU ld.so supports shared libraries on MkLinux. ---- configure.in.orig 2010-10-30 19:49:57.000000000 +0200 -+++ configure.in 2010-10-30 19:50:08.000000000 +0200 -@@ -439,7 +439,7 @@ - WININET_LIBDIR="`$WININET_CONFIG --rpath-dir`" - else - dnl Yawn. We're using the regular boring version. -- WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib" -+ WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib64" - fi - AC_MSG_RESULT($WININET_LIBDIR) - AC_SUBST(WININET_LIBDIR) -@@ -510,7 +510,7 @@ - LIBWWW_LIBDIR="`$LIBWWW_CONFIG --rpath-dir`" - else - dnl Yawn. We're using the regular boring version. -- LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib" -+ LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib64" - fi - AC_MSG_RESULT($LIBWWW_LIBDIR) - AC_SUBST(LIBWWW_LIBDIR) -@@ -562,7 +562,7 @@ - dnl adjust the search patch manually. Just gag me with a backquote, OK? - AC_MSG_CHECKING(for curl library directory) - dnl Yawn. We're using the regular boring version. -- CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib" -+ CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib64" - - AC_MSG_RESULT($CURL_LIBDIR) - AC_SUBST(CURL_LIBDIR) ---- configure.orig 2010-10-30 19:48:41.000000000 +0200 -+++ configure 2010-10-30 19:49:55.000000000 +0200 -@@ -5985,7 +5985,7 @@ - if $WININET_CONFIG --rpath-dir > /dev/null 2>&1; then - WININET_LIBDIR="`$WININET_CONFIG --rpath-dir`" - else -- WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib" -+ WININET_LIBDIR="`$WININET_CONFIG --prefix`/lib64" - fi - { echo "$as_me:$LINENO: result: $WININET_LIBDIR" >&5 - echo "${ECHO_T}$WININET_LIBDIR" >&6; } -@@ -6091,7 +6091,7 @@ - if $LIBWWW_CONFIG --rpath-dir > /dev/null 2>&1; then - LIBWWW_LIBDIR="`$LIBWWW_CONFIG --rpath-dir`" - else -- LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib" -+ LIBWWW_LIBDIR="`$LIBWWW_CONFIG --prefix`/lib64" - fi - { echo "$as_me:$LINENO: result: $LIBWWW_LIBDIR" >&5 - echo "${ECHO_T}$LIBWWW_LIBDIR" >&6; } -@@ -6172,7 +6172,7 @@ - - { echo "$as_me:$LINENO: checking for curl library directory" >&5 - echo $ECHO_N "checking for curl library directory... $ECHO_C" >&6; } -- CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib" -+ CURL_LIBDIR="`$CURL_CONFIG --prefix`/lib64" - - { echo "$as_me:$LINENO: result: $CURL_LIBDIR" >&5 - echo "${ECHO_T}$CURL_LIBDIR" >&6; } diff --git a/xmlrpc-c.changes b/xmlrpc-c.changes index 60bbb29..c7a6361 100644 --- a/xmlrpc-c.changes +++ b/xmlrpc-c.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 28 22:08:44 UTC 2011 - appleonkel@opensuse.org + +- update to 1.25.07 + * soname for cpp libs to 7 + * 3 new libraries (server_cgi++, server_pstream++, packetsocket) +- deleted old patches, looks like upstream had fixed it +- added fix for default constructor + ------------------------------------------------------------------- Sat Oct 30 17:46:21 UTC 2010 - pascal.bleser@opensuse.org diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec index b90d3bb..9d223d7 100644 --- a/xmlrpc-c.spec +++ b/xmlrpc-c.spec @@ -1,5 +1,5 @@ # -# spec file for package xmmlrpc-c (Version 1.06.41) +# spec file for package xmmlrpc-c (Version 1.25.07) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,22 +19,17 @@ # norootforbuild %define soname 3 +%define soname_cpp 7 Name: xmlrpc-c -Version: 1.06.41 +Version: 1.25.07 Release: 1 License: BSD Group: Development/Libraries/C and C++ URL: http://xmlrpc-c.sourceforge.net # http://prdownloads.sourceforge.net/xmlrpc-c/xmlrpc-c-%{version}.tgz -Source: %{name}-%{version}.tar.bz2 -Patch0: %{name}-1.06.04-sizet.patch -Patch1: %{name}-fix_as_needed.patch -Patch2: %{name}-fix_without_as_needed.patch -Patch3: %{name}-lib64.patch -Patch4: %{name}-lib.patch -Patch5: %{name}-disable_rpath.patch -Patch6: %{name}-fix_wrong_printf_format_for_size_t.patch +Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-default-constructor.patch Source99: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf automake file gcc-c++ libtool @@ -56,11 +51,14 @@ Authors: %package -n libxmlrpc-c-devel Group: Development/Libraries/C and C++ -Requires: libxmlrpc++%{soname} = %{version} -Requires: libxmlrpc_client++%{soname} = %{version} -Requires: libxmlrpc_cpp%{soname} = %{version} -Requires: libxmlrpc_server++%{soname} = %{version} -Requires: libxmlrpc_server_abyss++%{soname} = %{version} +Requires: libxmlrpc++%{soname_cpp} = %{version} +Requires: libxmlrpc_client++%{soname_cpp} = %{version} +Requires: libxmlrpc_cpp%{soname_cpp} = %{version} +Requires: libxmlrpc_server++%{soname_cpp} = %{version} +Requires: libxmlrpc_server_cgi++%{soname_cpp} = %{version} +Requires: libxmlrpc_server_abyss++%{soname_cpp} = %{version} +Requires: libxmlrpc_server_pstream++%{soname_cpp} = %{version} +Requires: libxmlrpc_server_packetsocket%{soname_cpp} = %{version} Requires: libxmlrpc%{soname} = %{version} Requires: libxmlrpc_client%{soname} = %{version} Requires: libxmlrpc_server%{soname} = %{version} @@ -87,11 +85,11 @@ Authors: -------- Eric Kidd -%package -n libxmlrpc++%{soname} +%package -n libxmlrpc++%{soname_cpp} Group: System/Libraries Summary: A library implementing XML-based remote procedure calls -%description -n libxmlrpc++%{soname} +%description -n libxmlrpc++%{soname_cpp} XML-RPC is a lightweight RPC protocol based on XML and HTTP. This package is used by XML-RPC clients and servers written in C and C++. @@ -113,11 +111,11 @@ Authors: -------- Eric Kidd -%package -n libxmlrpc_client++%{soname} +%package -n libxmlrpc_client++%{soname_cpp} Group: System/Libraries Summary: Library implementing XML-based Remote Procedure Calls -%description -n libxmlrpc_client++%{soname} +%description -n libxmlrpc_client++%{soname_cpp} XML-RPC is a lightweight RPC protocol based on XML and HTTP. This package is used by XML-RPC clients and servers written in C and C++. @@ -125,11 +123,11 @@ Authors: -------- Eric Kidd -%package -n libxmlrpc_cpp%{soname} +%package -n libxmlrpc_cpp%{soname_cpp} Group: System/Libraries Summary: Library implementing XML-based Remote Procedure Calls -%description -n libxmlrpc_cpp%{soname} +%description -n libxmlrpc_cpp%{soname_cpp} XML-RPC is a lightweight RPC protocol based on XML and HTTP. This package is used by XML-RPC clients and servers written in C and C++. @@ -165,11 +163,11 @@ Authors: -------- Eric Kidd -%package -n libxmlrpc_server++%{soname} +%package -n libxmlrpc_server++%{soname_cpp} Group: System/Libraries Summary: Library implementing XML-based Remote Procedure Calls -%description -n libxmlrpc_server++%{soname} +%description -n libxmlrpc_server++%{soname_cpp} XML-RPC is a lightweight RPC protocol based on XML and HTTP. This package is used by XML-RPC clients and servers written in C and C++. @@ -192,11 +190,11 @@ Authors: -------- Eric Kidd -%package -n libxmlrpc_server_abyss++%{soname} +%package -n libxmlrpc_server_abyss++%{soname_cpp} Group: System/Libraries Summary: Library implementing XML-based Remote Procedure Calls -%description -n libxmlrpc_server_abyss++%{soname} +%description -n libxmlrpc_server_abyss++%{soname_cpp} XML-RPC is a lightweight RPC protocol based on XML and HTTP. This package is used by XML-RPC clients and servers written in C and C++. @@ -222,77 +220,101 @@ Summary: Library implementing XML-based Remote Procedure Calls XML-RPC is a lightweight RPC protocol based on XML and HTTP. This package is used by XML-RPC clients and servers written in C and C++. +Authors: +-------- + Eric Kidd + +%package -n libxmlrpc_server_cgi++%{soname_cpp} +Group: System/Libraries +Summary: Library implementing XML-based Remote Procedure Calls + +%description -n libxmlrpc_server_cgi++%{soname_cpp} +XML-RPC is a lightweight RPC protocol based on XML and HTTP. This +package is used by XML-RPC clients and servers written in C and C++. + +Authors: +-------- + Eric Kidd + +%package -n libxmlrpc_server_pstream++%{soname_cpp} +Group: System/Libraries +Summary: Library implementing XML-based Remote Procedure Calls + +%description -n libxmlrpc_server_pstream++%{soname_cpp} +XML-RPC is a lightweight RPC protocol based on XML and HTTP. This +package is used by XML-RPC clients and servers written in C and C++. + +Authors: +-------- + Eric Kidd + +%package -n libxmlrpc_packetsocket%{soname_cpp} +Group: System/Libraries +Summary: Library implementing XML-based Remote Procedure Calls + +%description -n libxmlrpc_packetsocket%{soname_cpp} +XML-RPC is a lightweight RPC protocol based on XML and HTTP. This +package is used by XML-RPC clients and servers written in C and C++. + Authors: -------- Eric Kidd %prep %setup -q -%patch0 -p1 -b .sizet -%if 0%{?suse_version} < 1000 -%patch2 -p0 -b .fix -%else -%patch1 -p0 -b .asneeded -%endif -%if "%{_lib}"=="lib64" -%patch3 -p0 -b .lib64 -%else -%patch4 -p0 -b .lib -%endif -%patch5 -p0 -b .rpath -%patch6 -p0 -b .format +%patch0 %__rm -rf examples/.cvsignore examples/cpp/.cvsignore %build export CFLAGS_PERSONAL="%{optflags}" + %configure \ --enable-libxml2-backend \ - --enable-shared - -%__sed -i ' -s/^hardcode_direct.*$/hardcode_direct=yes/g -; -s/^hardcode_minus_L.*$/hardcode_minus_L=yes/g -; -s/^hardcode_shlibpath_var.*$/hardcode_shlibpath_var=no/g -' libtool ltconfig* ltmain* + --enable-shared-libs # don't pass -j, breaks build %__make CADD="-fPIC -DPIC" + %install %makeinstall -%__rm "%{buildroot}%{_libdir}"/*.la +#%__rm "%{buildroot}%{_libdir}"/*.la %__make -C examples clean %__make -C examples/cpp clean %post -n libxmlrpc%{soname} -p /sbin/ldconfig -%post -n libxmlrpc++%{soname} -p /sbin/ldconfig +%post -n libxmlrpc++%{soname_cpp} -p /sbin/ldconfig %post -n libxmlrpc_client%{soname} -p /sbin/ldconfig -%post -n libxmlrpc_client++%{soname} -p /sbin/ldconfig -%post -n libxmlrpc_cpp%{soname} -p /sbin/ldconfig +%post -n libxmlrpc_client++%{soname_cpp} -p /sbin/ldconfig +%post -n libxmlrpc_cpp%{soname_cpp} -p /sbin/ldconfig %post -n libxmlrpc_abyss%{soname} -p /sbin/ldconfig %post -n libxmlrpc_server%{soname} -p /sbin/ldconfig -%post -n libxmlrpc_server++%{soname} -p /sbin/ldconfig +%post -n libxmlrpc_server++%{soname_cpp} -p /sbin/ldconfig %post -n libxmlrpc_server_abyss%{soname} -p /sbin/ldconfig -%post -n libxmlrpc_server_abyss++%{soname} -p /sbin/ldconfig +%post -n libxmlrpc_server_abyss++%{soname_cpp} -p /sbin/ldconfig %post -n libxmlrpc_server_cgi%{soname} -p /sbin/ldconfig +%post -n libxmlrpc_server_cgi++%{soname_cpp} -p /sbin/ldconfig +%post -n libxmlrpc_server_pstream++%{soname_cpp} -p /sbin/ldconfig %post -n libxmlrpc_util%{soname} -p /sbin/ldconfig +%post -n libxmlrpc_packetsocket%{soname_cpp} -p /sbin/ldconfig %postun -n libxmlrpc%{soname} -p /sbin/ldconfig -%postun -n libxmlrpc++%{soname} -p /sbin/ldconfig +%postun -n libxmlrpc++%{soname_cpp} -p /sbin/ldconfig %postun -n libxmlrpc_client%{soname} -p /sbin/ldconfig -%postun -n libxmlrpc_client++%{soname} -p /sbin/ldconfig -%postun -n libxmlrpc_cpp%{soname} -p /sbin/ldconfig +%postun -n libxmlrpc_client++%{soname_cpp} -p /sbin/ldconfig +%postun -n libxmlrpc_cpp%{soname_cpp} -p /sbin/ldconfig %postun -n libxmlrpc_abyss%{soname} -p /sbin/ldconfig %postun -n libxmlrpc_server%{soname} -p /sbin/ldconfig -%postun -n libxmlrpc_server++%{soname} -p /sbin/ldconfig +%postun -n libxmlrpc_server++%{soname_cpp} -p /sbin/ldconfig %postun -n libxmlrpc_server_abyss%{soname} -p /sbin/ldconfig -%postun -n libxmlrpc_server_abyss++%{soname} -p /sbin/ldconfig +%postun -n libxmlrpc_server_abyss++%{soname_cpp} -p /sbin/ldconfig %postun -n libxmlrpc_server_cgi%{soname} -p /sbin/ldconfig +%postun -n libxmlrpc_server_cgi++%{soname_cpp} -p /sbin/ldconfig +%postun -n libxmlrpc_server_pstream++%{soname_cpp} -p /sbin/ldconfig %postun -n libxmlrpc_util%{soname} -p /sbin/ldconfig +%postun -n libxmlrpc_packetsocket%{soname_cpp} -p /sbin/ldconfig %clean %{?buildroot:%__rm -rf "%{buildroot}"} @@ -300,8 +322,8 @@ s/^hardcode_shlibpath_var.*$/hardcode_shlibpath_var=no/g %files %defattr(-, root, root) %doc tools/xmlrpc/xmlrpc.html tools/xmlrpc_transport/xmlrpc_transport.html -%{_bindir}/xmlrpc -%{_bindir}/xmlrpc_transport +#%{_bindir}/xmlrpc +#%{_bindir}/xmlrpc_transport %files -n libxmlrpc-c-devel %defattr(-, root, root) @@ -317,58 +339,73 @@ s/^hardcode_shlibpath_var.*$/hardcode_shlibpath_var=no/g %{_libdir}/libxmlrpc.so.%{soname} %{_libdir}/libxmlrpc.so.%{soname}.* -%files -n libxmlrpc++%{soname} +%files -n libxmlrpc++%{soname_cpp} %defattr(-, root, root) -%{_libdir}/libxmlrpc++.so.%{soname} -%{_libdir}/libxmlrpc++.so.%{soname}.* +%{_libdir}/libxmlrpc++.so.%{soname_cpp} +%{_libdir}/libxmlrpc++.so.%{soname_cpp}.* %files -n libxmlrpc_client%{soname} %defattr(-, root, root) %{_libdir}/libxmlrpc_client.so.%{soname} %{_libdir}/libxmlrpc_client.so.%{soname}.* -%files -n libxmlrpc_client++%{soname} +%files -n libxmlrpc_client++%{soname_cpp} %defattr(-, root, root) -%{_libdir}/libxmlrpc_client++.so.%{soname} -%{_libdir}/libxmlrpc_client++.so.%{soname}.* +%{_libdir}/libxmlrpc_client++.so.%{soname_cpp} +%{_libdir}/libxmlrpc_client++.so.%{soname_cpp}.* %files -n libxmlrpc_abyss%{soname} %defattr(-, root, root) %{_libdir}/libxmlrpc_abyss.so.%{soname} %{_libdir}/libxmlrpc_abyss.so.%{soname}.* -%files -n libxmlrpc_cpp%{soname} +%files -n libxmlrpc_cpp%{soname_cpp} %defattr(-, root, root) -%{_libdir}/libxmlrpc_cpp.so.%{soname} -%{_libdir}/libxmlrpc_cpp.so.%{soname}.* +%{_libdir}/libxmlrpc_cpp.so.%{soname_cpp} +%{_libdir}/libxmlrpc_cpp.so.%{soname_cpp}.* %files -n libxmlrpc_server%{soname} %defattr(-, root, root) %{_libdir}/libxmlrpc_server.so.%{soname} %{_libdir}/libxmlrpc_server.so.%{soname}.* -%files -n libxmlrpc_server++%{soname} +%files -n libxmlrpc_server++%{soname_cpp} %defattr(-, root, root) -%{_libdir}/libxmlrpc_server++.so.%{soname} -%{_libdir}/libxmlrpc_server++.so.%{soname}.* +%{_libdir}/libxmlrpc_server++.so.%{soname_cpp} +%{_libdir}/libxmlrpc_server++.so.%{soname_cpp}.* %files -n libxmlrpc_server_abyss%{soname} %defattr(-, root, root) %{_libdir}/libxmlrpc_server_abyss.so.%{soname} %{_libdir}/libxmlrpc_server_abyss.so.%{soname}.* -%files -n libxmlrpc_server_abyss++%{soname} +%files -n libxmlrpc_server_abyss++%{soname_cpp} %defattr(-, root, root) -%{_libdir}/libxmlrpc_server_abyss++.so.%{soname} -%{_libdir}/libxmlrpc_server_abyss++.so.%{soname}.* +%{_libdir}/libxmlrpc_server_abyss++.so.%{soname_cpp} +%{_libdir}/libxmlrpc_server_abyss++.so.%{soname_cpp}.* %files -n libxmlrpc_server_cgi%{soname} %defattr(-, root, root) %{_libdir}/libxmlrpc_server_cgi.so.%{soname} %{_libdir}/libxmlrpc_server_cgi.so.%{soname}.* +%files -n libxmlrpc_server_cgi++%{soname_cpp} +%defattr(-, root, root) +%{_libdir}/libxmlrpc_server_cgi++.so.%{soname_cpp} +%{_libdir}/libxmlrpc_server_cgi++.so.%{soname_cpp}.* + +%files -n libxmlrpc_server_pstream++%{soname_cpp} +%defattr(-, root, root) +%{_libdir}/libxmlrpc_server_pstream++.so.%{soname_cpp} +%{_libdir}/libxmlrpc_server_pstream++.so.%{soname_cpp}.* + %files -n libxmlrpc_util%{soname} %defattr(-, root, root) %{_libdir}/libxmlrpc_util.so.%{soname} %{_libdir}/libxmlrpc_util.so.%{soname}.* +%files -n libxmlrpc_packetsocket%{soname_cpp} +%defattr(-, root, root) +%{_libdir}/libxmlrpc_packetsocket.so.%{soname_cpp} +%{_libdir}/libxmlrpc_packetsocket.so.%{soname_cpp}.* +