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>

9 files changed, 36 insertions, 11 deletions

diff --git a/patches/xmlrpc-c-1.06.41/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
index ec7c7c880..6df122ca2 100644
--- a/patches/xmlrpc-c-1.06.41/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
@@ -13,10 +13,10 @@ information.
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  configure.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.in b/configure.in
-index 8f1f890..dfbc6a4 100644
+index 4a4f916..a83076a 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -227,7 +227,7 @@ dnl =======================================================================
diff --git a/patches/xmlrpc-c-1.06.41/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
index c24b850ae..e8225c2f8 100644
--- a/patches/xmlrpc-c-1.06.41/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
@@ -12,7 +12,7 @@ considered to compile for a linux system.
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  Makefile.config.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.config.in b/Makefile.config.in
 index 07f37af..a79ca1e 100644
diff --git a/patches/xmlrpc-c-1.06.41/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
index 32a5d88a4..f1f1457ba 100644
--- a/patches/xmlrpc-c-1.06.41/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
@@ -5,7 +5,7 @@ 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 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/xmlrpc-c-config.in b/xmlrpc-c-config.in
 index db6afdb..2baafe9 100644
diff --git a/patches/xmlrpc-c-1.06.41/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
index 67316c239..1b80a0291 100644
--- a/patches/xmlrpc-c-1.06.41/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
@@ -5,7 +5,7 @@ Subject: [PATCH] xmlrpc-c-config.in: add SYSROOT support
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  xmlrpc-c-config.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/xmlrpc-c-config.in b/xmlrpc-c-config.in
 index 2baafe9..699f697 100644
diff --git a/patches/xmlrpc-c-1.06.41/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
index 48009a9ce..e29d53a9f 100644
--- a/patches/xmlrpc-c-1.06.41/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
@@ -6,10 +6,10 @@ Subject: [PATCH] calling AC_PROG_CXX conditionally is broken with autoconf >
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
  configure.in |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index dfbc6a4..f362127 100644
+index a83076a..705eb35 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -213,9 +213,7 @@ dnl Checks for programs.
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.41/autogen.sh b/patches/xmlrpc-c-1.06.42/autogen.sh
index f2a7963b6..f2a7963b6 100755
--- a/patches/xmlrpc-c-1.06.41/autogen.sh
+++ b/patches/xmlrpc-c-1.06.42/autogen.sh
diff --git a/patches/xmlrpc-c-1.06.41/series b/patches/xmlrpc-c-1.06.42/series
index 353a5820d..94b776866 100644
--- a/patches/xmlrpc-c-1.06.41/series
+++ b/patches/xmlrpc-c-1.06.42/series
@@ -5,4 +5,5 @@
 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
-# d872292dc31c12b342cd7c678a7c1c7c  - git-ptx-patches magic
+0006-fix-building-with-libcurl-7.26.0.patch
+# 836dbd8535e2c51912651afb2ece2608  - git-ptx-patches magic
diff --git a/rules/xmlrpc-c.make b/rules/xmlrpc-c.make
index 9602021b1..56cc0b907 100644
--- a/rules/xmlrpc-c.make
+++ b/rules/xmlrpc-c.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_XMLRPC_C) += xmlrpc-c
 #
 # Paths and names
 #
-XMLRPC_C_VERSION	:= 1.06.41
-XMLRPC_C_MD5		:= 02c6b89b8ff911341b6b6d4a6c621ea9
+XMLRPC_C_VERSION	:= 1.06.42
+XMLRPC_C_MD5		:= 248bacf3a998ceca6f491a213337c592
 XMLRPC_C		:= xmlrpc-c-$(XMLRPC_C_VERSION)
 XMLRPC_C_SUFFIX		:= tgz
 XMLRPC_C_URL		:= $(call ptx/mirror, SF, xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(XMLRPC_C_VERSION)/$(XMLRPC_C).$(XMLRPC_C_SUFFIX))
@@ -73,7 +73,8 @@ XMLRPC_C_CONF_OPT += --disable-libxml2-backend
 endif
 
 XMLRPC_C_MAKE_OPT := \
-	CADD=-fPIC \
+	CADD="$(CROSS_CPPFLAGS) $(CROSS_CFLAGS) -fPIC" \
+	LADD="$(CROSS_LDFLAGS)" \
 	BUILDTOOL_CC=$(HOSTCC) \
 	BUILDTOOL_CCLD=$(HOSTCC)