xmlrpc-c: version bump 1.06.41 -> 1.06.42

and add patch to fix building with libcurl 7.26.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

8 files changed, 197 insertions, 0 deletions

diff --git a/patches/xmlrpc-c-1.06.42/0001-configure.in-add-propper-quoting-to-AC_CHECK_-FUNC-L.patch b/patches/xmlrpc-c-1.06.42/0001-configure.in-add-propper-quoting-to-AC_CHECK_-FUNC-L.patch
new file mode 100644
index 000000000..6df122ca2
--- /dev/null
+++ b/patches/xmlrpc-c-1.06.42/0001-configure.in-add-propper-quoting-to-AC_CHECK_-FUNC-L.patch
@@ -0,0 +1,30 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Wed, 3 Feb 2010 13:47:09 +0100
+Subject: [PATCH] configure.in: add propper quoting to AC_CHECK_{FUNC,LIB}
+
+This patch fixes this problem:
+
+checking for socket... ./configure: line 1813: ac_fn_c_try_link: command not found
+no
+
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=544809 for more
+information.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ configure.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 4a4f916..a83076a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -227,7 +227,7 @@ dnl =======================================================================
+ # hide their networking code in various places.  (Yes, this links too many
+ # of our libraries against -lsocket, but a finer-grained mechanism would
+ # require too much testing.)
+-AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
++AC_CHECK_FUNC([socket], [:], [AC_CHECK_LIB([socket], [socket])])
+ 
+ # Above sets LIBS, which is not all that useful because we don't want
+ # to include every library in every link.  It also sets
diff --git a/patches/xmlrpc-c-1.06.42/0002-Makefile.config-fix-shared-libs-on-arm.patch b/patches/xmlrpc-c-1.06.42/0002-Makefile.config-fix-shared-libs-on-arm.patch
new file mode 100644
index 000000000..e8225c2f8
--- /dev/null
+++ b/patches/xmlrpc-c-1.06.42/0002-Makefile.config-fix-shared-libs-on-arm.patch
@@ -0,0 +1,29 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Wed, 3 Feb 2010 12:43:37 +0100
+Subject: [PATCH] Makefile.config: fix shared libs on arm
+
+The magic to detect a linux system expects that "HOST_OS" ==
+"linux-gnu". Unfortunately this is not true for modern arm system with
+EABI, the "HOST_OS" is "linux-gnueabi".
+
+With this patch, if the string "linux" is part of "HOST_OS" it's
+considered to compile for a linux system.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Makefile.config.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.config.in b/Makefile.config.in
+index 07f37af..a79ca1e 100644
+--- a/Makefile.config.in
++++ b/Makefile.config.in
+@@ -136,7 +136,7 @@ endif
+ # out how.  For the rest, we have this default:
+ SHARED_LIB_TYPE = NONE
+ 
+-ifeq ($(HOST_OS),linux-gnu)
++ifeq ($(findstring linux,$(HOST_OS)),linux)
+   # Assume linker is GNU Compiler (gcc)
+   SHARED_LIB_TYPE = unix
+   SHLIB_SUFFIX = so
diff --git a/patches/xmlrpc-c-1.06.42/0003-xmlrpc-c-config.in-use-pkg-config-to-get-curl-s-libs.patch b/patches/xmlrpc-c-1.06.42/0003-xmlrpc-c-config.in-use-pkg-config-to-get-curl-s-libs.patch
new file mode 100644
index 000000000..f1f1457ba
--- /dev/null
+++ b/patches/xmlrpc-c-1.06.42/0003-xmlrpc-c-config.in-use-pkg-config-to-get-curl-s-libs.patch
@@ -0,0 +1,22 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Tue, 2 Feb 2010 18:57:47 +0100
+Subject: [PATCH] xmlrpc-c-config.in: use pkg-config to get curl's libs
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ xmlrpc-c-config.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xmlrpc-c-config.in b/xmlrpc-c-config.in
+index db6afdb..2baafe9 100644
+--- a/xmlrpc-c-config.in
++++ b/xmlrpc-c-config.in
+@@ -116,7 +116,7 @@ while test $# -gt 0; do
+         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_libs="$the_libs $(pkg-config --libs libcurl)"
+         the_rpath="@CURL_RPATH@ $the_rpath"
+         the_wl_rpath="@CURL_WL_RPATH@ $the_wl_rpath"
+       fi
diff --git a/patches/xmlrpc-c-1.06.42/0004-xmlrpc-c-config.in-add-SYSROOT-support.patch b/patches/xmlrpc-c-1.06.42/0004-xmlrpc-c-config.in-add-SYSROOT-support.patch
new file mode 100644
index 000000000..1b80a0291
--- /dev/null
+++ b/patches/xmlrpc-c-1.06.42/0004-xmlrpc-c-config.in-add-SYSROOT-support.patch
@@ -0,0 +1,31 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Tue, 2 Feb 2010 18:59:27 +0100
+Subject: [PATCH] xmlrpc-c-config.in: add SYSROOT support
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ xmlrpc-c-config.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xmlrpc-c-config.in b/xmlrpc-c-config.in
+index 2baafe9..699f697 100644
+--- a/xmlrpc-c-config.in
++++ b/xmlrpc-c-config.in
+@@ -56,7 +56,7 @@ the_libdirs=
+ 
+ # If Xmlrpc-c libraries are installed in the standard linker search
+ # path on this system, you should remove the following line:
+-the_libdirs="-L$libdir $the_libdirs"
++the_libdirs="-L${SYSROOT}$libdir $the_libdirs"
+ 
+ the_libs="-lxmlrpc -lxmlrpc_util ${LIBXML}"
+ the_rpath=
+@@ -66,7 +66,7 @@ cpp_libs=
+ cflags=
+ # If Xmlrpc-c library interface header files are installed in the standard
+ # compiler search path on this system, you should remove the following line:
+-cflags="-I$includedir $cflags"
++cflags="-I${SYSROOT}$includedir $cflags"
+ 
+ while test $# -gt 0; do
+   case $1 in
diff --git a/patches/xmlrpc-c-1.06.42/0005-calling-AC_PROG_CXX-conditionally-is-broken-with-aut.patch b/patches/xmlrpc-c-1.06.42/0005-calling-AC_PROG_CXX-conditionally-is-broken-with-aut.patch
new file mode 100644
index 000000000..e29d53a9f
--- /dev/null
+++ b/patches/xmlrpc-c-1.06.42/0005-calling-AC_PROG_CXX-conditionally-is-broken-with-aut.patch
@@ -0,0 +1,25 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 31 Jan 2012 21:04:17 +0100
+Subject: [PATCH] calling AC_PROG_CXX conditionally is broken with autoconf >
+ 2.52
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.in |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index a83076a..705eb35 100644
+--- a/configure.in
++++ b/configure.in
+@@ -213,9 +213,7 @@ dnl Checks for programs.
+ dnl =======================================================================
+ 
+ AC_PROG_CC
+-if test x"$enable_cplusplus" != xno; then
+-    AC_PROG_CXX
+-fi
++AC_PROG_CXX
+ 
+ 
+ dnl =======================================================================
diff --git a/patches/xmlrpc-c-1.06.42/0006-fix-building-with-libcurl-7.26.0.patch b/patches/xmlrpc-c-1.06.42/0006-fix-building-with-libcurl-7.26.0.patch
new file mode 100644
index 000000000..18de951d6
--- /dev/null
+++ b/patches/xmlrpc-c-1.06.42/0006-fix-building-with-libcurl-7.26.0.patch
@@ -0,0 +1,23 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 12 Jul 2012 10:19:15 +0200
+Subject: [PATCH] fix building with libcurl 7.26.0
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ lib/curl_transport/xmlrpc_curl_transport.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/lib/curl_transport/xmlrpc_curl_transport.c b/lib/curl_transport/xmlrpc_curl_transport.c
+index 530fab5..3565a62 100644
+--- a/lib/curl_transport/xmlrpc_curl_transport.c
++++ b/lib/curl_transport/xmlrpc_curl_transport.c
+@@ -76,9 +76,6 @@
+ #include "version.h"
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+-#include <curl/easy.h>
+-#include <curl/multi.h>
+ 
+ #if defined (WIN32) && defined(_DEBUG)
+ #  include <crtdbg.h>
diff --git a/patches/xmlrpc-c-1.06.42/autogen.sh b/patches/xmlrpc-c-1.06.42/autogen.sh
new file mode 100755
index 000000000..f2a7963b6
--- /dev/null
+++ b/patches/xmlrpc-c-1.06.42/autogen.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+aclocal $ACLOCAL_FLAGS
+
+#
+# use automake to install the file "missing"
+#
+# automake fill fail, because the package doesn't use automake.
+# but this is the easiest way :)
+#
+automake \
+	-f \
+	--copy \
+	--add-missing || true
+
+libtoolize \
+	--force \
+	--copy
+
+autoheader \
+	--force \
+	-Wall
+
+autoconf \
+	--force \
+	-Wall
diff --git a/patches/xmlrpc-c-1.06.42/series b/patches/xmlrpc-c-1.06.42/series
new file mode 100644
index 000000000..94b776866
--- /dev/null
+++ b/patches/xmlrpc-c-1.06.42/series
@@ -0,0 +1,9 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-configure.in-add-propper-quoting-to-AC_CHECK_-FUNC-L.patch
+0002-Makefile.config-fix-shared-libs-on-arm.patch
+0003-xmlrpc-c-config.in-use-pkg-config-to-get-curl-s-libs.patch
+0004-xmlrpc-c-config.in-add-SYSROOT-support.patch
+0005-calling-AC_PROG_CXX-conditionally-is-broken-with-aut.patch
+0006-fix-building-with-libcurl-7.26.0.patch
+# 836dbd8535e2c51912651afb2ece2608  - git-ptx-patches magic