[csw-devel] SF.net SVN: gar:[16671] csw/mgar/pkg/xmlrpc_c/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jan 3 17:25:12 CET 2012
Revision: 16671
http://gar.svn.sourceforge.net/gar/?rev=16671&view=rev
Author: dmichelsen
Date: 2012-01-03 16:25:11 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
xmlrpc_c/trunk: Update to 1.16.39, general rework
Modified Paths:
--------------
csw/mgar/pkg/xmlrpc_c/trunk/Makefile
csw/mgar/pkg/xmlrpc_c/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/xmlrpc_c/trunk/files/0001-Remove-inclusion-of-curl-types.h.patch
csw/mgar/pkg/xmlrpc_c/trunk/files/0002-Use-direct-unistd-for-close.patch
Removed Paths:
-------------
csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch
Property Changed:
----------------
csw/mgar/pkg/xmlrpc_c/trunk/
Property changes on: csw/mgar/pkg/xmlrpc_c/trunk
___________________________________________________________________
Deleted: svn:externals
- gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/xmlrpc_c/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2012-01-03 14:33:37 UTC (rev 16670)
+++ csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2012-01-03 16:25:11 UTC (rev 16671)
@@ -1,9 +1,8 @@
NAME = xmlrpc-c
-VERSION = 1.16.13
-SVN_REVISION = 1679
+VERSION = 1.16.39
CATEGORIES = lib
-DESCRIPTION = A lightweight RPC library based on XML and HTTP.
+DESCRIPTION = A lightweight RPC library based on XML and HTTP
define BLURB
It's a spec and a set of implementations that allow software
running on disparate operating systems, running in different
@@ -14,34 +13,29 @@
processed and returned.
endef
-MASTER_SITES = svn-http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/
-DISTFILES = stable
-DISTNAME = stable
-NOCHECKSUM = stable
-SVNHTTP_CO_ARGS = -r $(SVN_REVISION) --no-auth-cache --username guest --password guest
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES += $(DISTNAME).tgz
+PATCHFILES += 0001-Remove-inclusion-of-curl-types.h.patch
+PATCHFILES += 0002-Use-direct-unistd-for-close.patch
LICENSE = doc/COPYING
DOCFILES += CREDITS DEVELOPING HISTORY INSTALL SECURITY TESTING TODO
-SPKG_SOURCEURL = http://xmlrpc-c.sourceforge.net
+VENDOR_URL = http://xmlrpc-c.sourceforge.net
-PACKAGES = CSWxmlrpc-c
-CATALOGNAME_CSWxmlrpc-c = xmlrpc_c
+PACKAGES += CSWxmlrpc-c
SPKG_DESC_CSWxmlrpc-c = $(DESCRIPTION)
-PATCHFILES = mainpatch
-
RUNTIME_DEP_PKGS_CSWxmlrpc-c = CSWcurlrt CSWlibidn CSWoldaprt CSWosslrt CSWzlib
-# We define upstream file regex so we can be notifed of
-# new upstream software release
-#UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz
+EXTRA_CPPFLAGS += -D__EXTENSIONS__
-#BUILD64 = 1
-#NOISAEXEC = 1
+BUILD_OVERRIDE_VARS += CFLAGS_PERSONAL
+BUILD_OVERRIDE_VAR_CFLAGS_PERSONAL = $(CFLAGS) $(CPPFLAGS)
-CONFIGURE_ARGS = $(DIRPATHS)
+TEST_OVERRIDE_VARS += LADD
+TEST_OVERRIDE_VAR_LADD = $(LDFLAGS) -lm
-TEST_TARGET = check
+BUILD64 = 1
include gar/category.mk
Modified: csw/mgar/pkg/xmlrpc_c/trunk/checksums
===================================================================
--- csw/mgar/pkg/xmlrpc_c/trunk/checksums 2012-01-03 14:33:37 UTC (rev 16670)
+++ csw/mgar/pkg/xmlrpc_c/trunk/checksums 2012-01-03 16:25:11 UTC (rev 16671)
@@ -1 +1 @@
-4b1ac60cca84678a9bdfb7c145bd227e download/mainpatch
+e88c9ee202890d726405b3bdfb00cfaf xmlrpc-c-1.16.39.tgz
Added: csw/mgar/pkg/xmlrpc_c/trunk/files/0001-Remove-inclusion-of-curl-types.h.patch
===================================================================
--- csw/mgar/pkg/xmlrpc_c/trunk/files/0001-Remove-inclusion-of-curl-types.h.patch (rev 0)
+++ csw/mgar/pkg/xmlrpc_c/trunk/files/0001-Remove-inclusion-of-curl-types.h.patch 2012-01-03 16:25:11 UTC (rev 16671)
@@ -0,0 +1,50 @@
+From 2e285823a8dd35cd0be82d78338ab17a620a52b1 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 3 Jan 2012 16:41:16 +0100
+Subject: [PATCH] Remove inclusion of curl/types.h
+
+---
+ lib/curl_transport/curlmulti.c | 1 -
+ lib/curl_transport/curltransaction.c | 1 -
+ lib/curl_transport/xmlrpc_curl_transport.c | 1 -
+ 3 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/lib/curl_transport/curlmulti.c b/lib/curl_transport/curlmulti.c
+index 526a4db..5503b9f 100644
+--- a/lib/curl_transport/curlmulti.c
++++ b/lib/curl_transport/curlmulti.c
+@@ -17,7 +17,6 @@
+ #endif
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+
+diff --git a/lib/curl_transport/curltransaction.c b/lib/curl_transport/curltransaction.c
+index 6b60b20..141fa5a 100644
+--- a/lib/curl_transport/curltransaction.c
++++ b/lib/curl_transport/curltransaction.c
+@@ -15,7 +15,6 @@
+ #include "version.h"
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include "curlversion.h"
+diff --git a/lib/curl_transport/xmlrpc_curl_transport.c b/lib/curl_transport/xmlrpc_curl_transport.c
+index 526381d..9b7b530 100644
+--- a/lib/curl_transport/xmlrpc_curl_transport.c
++++ b/lib/curl_transport/xmlrpc_curl_transport.c
+@@ -83,7 +83,6 @@
+ #include "xmlrpc-c/time_int.h"
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+
+--
+1.7.6.1
+
Added: csw/mgar/pkg/xmlrpc_c/trunk/files/0002-Use-direct-unistd-for-close.patch
===================================================================
--- csw/mgar/pkg/xmlrpc_c/trunk/files/0002-Use-direct-unistd-for-close.patch (rev 0)
+++ csw/mgar/pkg/xmlrpc_c/trunk/files/0002-Use-direct-unistd-for-close.patch 2012-01-03 16:25:11 UTC (rev 16671)
@@ -0,0 +1,25 @@
+From bd2e3e5b16548900f07cea4a775fbef255639961 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 3 Jan 2012 17:19:38 +0100
+Subject: [PATCH] Use direct unistd for close()
+
+---
+ src/cpp/test/server_abyss.cpp | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/cpp/test/server_abyss.cpp b/src/cpp/test/server_abyss.cpp
+index 4b236ef..a60cdbb 100644
+--- a/src/cpp/test/server_abyss.cpp
++++ b/src/cpp/test/server_abyss.cpp
+@@ -14,7 +14,7 @@
+ #ifdef WIN32
+ #include <winsock.h>
+ #else
+- #include <sys/unistd.h>
++ #include <unistd.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #endif
+--
+1.7.6.1
+
Deleted: csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch
===================================================================
--- csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch 2012-01-03 14:33:37 UTC (rev 16670)
+++ csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch 2012-01-03 16:25:11 UTC (rev 16671)
@@ -1,169 +0,0 @@
-diff -ru ../stable.orig/config.mk.in stable/config.mk.in
---- ../stable.orig/config.mk.in 2009-03-19 06:00:07.627856581 +0100
-+++ stable/config.mk.in 2009-03-19 09:12:13.567567079 +0100
-@@ -187,6 +187,7 @@
- # Solaris compiler (Sun C 5.5) can't take multiple ld options as
- # -Wl,-a,-b . Ld sees -a,-b in that case.
- LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME)
-+ CXXLDFLAGS_SHLIB = -Bdynamic -G -h $(SONAME)
- CFLAGS_SHLIB = -Kpic
- endif
-
-diff -ru ../stable.orig/lib/libutil/select.c stable/lib/libutil/select.c
---- ../stable.orig/lib/libutil/select.c 2009-03-19 05:59:43.875873563 +0100
-+++ stable/lib/libutil/select.c 2009-03-19 08:50:30.335123806 +0100
-@@ -1,4 +1,6 @@
-+#ifndef __sun
- #define _XOPEN_SOURCE 600 /* Get pselect() in <sys/select.h> */
-+#endif
-
- #ifdef WIN32
- #include <winsock.h>
-diff -ru ../stable.orig/src/cpp/Makefile stable/src/cpp/Makefile
---- ../stable.orig/src/cpp/Makefile 2009-03-19 05:58:59.910486603 +0100
-+++ stable/src/cpp/Makefile 2009-03-19 09:13:04.787229910 +0100
-@@ -8,6 +8,8 @@
-
- include $(BLDDIR)/config.mk
-
-+LDFLAGS_SHLIB =$(CXXLDFLAGS_SHLIB)
-+
- default: all
-
- # libxmlrpc_cpp is the legacy C++ wrapper library. The others are the
-@@ -167,6 +169,8 @@
- -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \
- -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
-
-+LIBXMLRPC_SERVER_CGIPP_SH = $(call shlibfn, libxmlrpc_server_cgi++)
-+
- $(LIBXMLRPC_SERVER_CGIPP_SH): $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh) \
- $(call shliblefn, libxmlrpc_server++) \
- $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \
-diff -ru ../stable.orig/src/cpp/client.cpp stable/src/cpp/client.cpp
---- ../stable.orig/src/cpp/client.cpp 2009-03-19 05:58:59.244697817 +0100
-+++ stable/src/cpp/client.cpp 2009-03-19 08:50:30.390788638 +0100
-@@ -456,7 +456,7 @@
-
-
- void
--clientXmlTransport::finishAsync(xmlrpc_c::timeout) {
-+clientXmlTransport::finishAsync(xmlrpc_c::timeout const) {
-
- // Since our start() does the whole thing, there's nothing for
- // us to do.
-@@ -504,7 +504,7 @@
-
-
- void
--clientXmlTransport::setInterrupt(int *) {
-+clientXmlTransport::setInterrupt(int * const) {
-
- throwf("The client XML transport is not interruptible");
- }
-@@ -896,7 +896,7 @@
-
-
- void
--client_xml::setInterrupt(int * const interruptP) {
-+client_xml::setInterrupt(int * interruptP) {
-
- this->implP->transportP->setInterrupt(interruptP);
- }
-diff -ru ../stable.orig/src/cpp/libwww.cpp stable/src/cpp/libwww.cpp
---- ../stable.orig/src/cpp/libwww.cpp 2009-03-19 05:58:58.921926116 +0100
-+++ stable/src/cpp/libwww.cpp 2009-03-19 08:50:30.416995305 +0100
-@@ -141,7 +141,7 @@
- }
-
- #else // MUST_BUILD_LIBWWW_CLIENT
-- clientXmlTransport_libwww::clientXmlTransport_libwww(string, string) {
-+ clientXmlTransport_libwww::clientXmlTransport_libwww(string const, string const) {
-
- throw(error("There is no Libwww client XML transport "
- "in this XML-RPC client library"));
-diff -ru ../stable.orig/src/cpp/packetsocket.cpp stable/src/cpp/packetsocket.cpp
---- ../stable.orig/src/cpp/packetsocket.cpp 2009-03-19 05:58:59.387947753 +0100
-+++ stable/src/cpp/packetsocket.cpp 2009-03-19 08:50:30.441570893 +0100
-@@ -166,7 +166,7 @@
-
-
-
--packetSocket::packetSocket(int const sockFd) {
-+packetSocket::packetSocket(int sockFd) {
-
- int dupRc;
-
-diff -ru ../stable.orig/src/cpp/test/server_abyss.cpp stable/src/cpp/test/server_abyss.cpp
---- ../stable.orig/src/cpp/test/server_abyss.cpp 2009-03-19 05:58:55.789530607 +0100
-+++ stable/src/cpp/test/server_abyss.cpp 2009-03-19 08:50:30.466112632 +0100
-@@ -14,7 +14,11 @@
- #ifdef WIN32
- #include <winsock.h>
- #else
-- #include <sys/unistd.h>
-+ #ifdef __sun
-+ #include <unistd.h>
-+ #else
-+ #include <sys/unistd.h>
-+ #endif
- #include <sys/socket.h>
- #include <arpa/inet.h>
- #endif
-diff -ru ../stable.orig/src/test/Makefile stable/src/test/Makefile
---- ../stable.orig/src/test/Makefile 2009-03-19 05:59:05.577343998 +0100
-+++ stable/src/test/Makefile 2009-03-19 08:50:30.490742022 +0100
-@@ -25,7 +25,7 @@
-
- all: $(PROGS)
-
--LDFLAGS = $(LADD)
-+LDFLAGS = $(LADD) -lm
-
- TEST_OBJS = \
- test.o \
-diff -ru ../stable.orig/src/test/cgi.c stable/src/test/cgi.c
---- ../stable.orig/src/test/cgi.c 2009-03-19 05:59:04.026249087 +0100
-+++ stable/src/test/cgi.c 2009-03-19 09:41:03.971988485 +0100
-@@ -42,8 +42,9 @@
- TESTDATA_DIR DIRSEP "sample_add_call.xml",
- "r");
-
-- if (cgiOutputP == NULL)
-+ if (cgiOutputP == NULL) {
- TEST_ERROR("Unable to run 'cgitest' program.");
-+ }
- else {
- unsigned char cgiResponse[4096];
- size_t bytesRead;
-diff -ru ../stable.orig/src/test/test.h stable/src/test/test.h
---- ../stable.orig/src/test/test.h 2009-03-19 05:59:05.023815247 +0100
-+++ stable/src/test/test.h 2009-03-19 08:50:30.514813356 +0100
-@@ -76,9 +76,7 @@
-
-
- #define TEST_FAULT(envP, code) \
-- do { test_fault(envP, code, __FILE__, __LINE__); } while(0)
--
--;
-+ do { test_fault(envP, code, __FILE__, __LINE__); } while(0) ;
-
-
- static __inline__ void
-@@ -96,14 +94,10 @@
-
-
- #define TEST_NULL_STRING(string) \
-- do { test_null_string(string, __FILE__, __LINE__); } while(0)
--
--;
-+ do { test_null_string(string, __FILE__, __LINE__); } while(0) ;
-
- #define TEST_ERROR(reason) \
- do { \
- printf("Unable to test at %s/%u. %s", __FILE__, __LINE__, reason); \
- abort(); \
-- } while (0)
--
--;
-+ } while (0) ;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list