Changes 1.16.34:

* Fix compile bug with some compilers on 64 bit.

Changes 1.16.33:
* Build: Fix prototype/definition mismatch in libwww.cpp with some compilers
  (e.g. Solaris).
* Build: Fix linking of xml-rpc-api2cpp with some linkers (e.g. Solaris).

Changes 1.16.32:
* Windows Abyss server: properly handle wait for connection.

Changes 1.16.31:
* CGI XML-RPC server accepts (ignores) parameters after "text/xml" in
  Content-type header from client.
This commit is contained in:
adam 2011-04-06 07:45:47 +00:00
parent f61ac748e9
commit 96124b5518
13 changed files with 109 additions and 189 deletions

View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.18 2011/02/22 14:23:24 adam Exp $
# $NetBSD: Makefile,v 1.19 2011/04/06 07:45:47 adam Exp $
DISTNAME= xmlrpc-c-1.06.42
DISTNAME= xmlrpc-c-1.16.34
# the "super stable" branch
PKGNAME= ${DISTNAME:S/-c-/-c-ss-/}
CATEGORIES= textproc devel
@ -34,7 +34,7 @@ PTHREAD_LINKFLAGS= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
SUBST_CLASSES+= pthread
SUBST_STAGE.pthread= pre-configure
SUBST_MESSAGE.pthread= Fixing config scripts.
SUBST_FILES.pthread= xmlrpc-c-config.in xmlrpc-c-config.test.in
SUBST_FILES.pthread= xmlrpc-c-config.* xmlrpc-c-config.test.*
SUBST_SED.pthread= -e 's/-lpthread/${PTHREAD_LINKFLAGS:Q}/'
SUBST_SED.pthread+= -e 's/-L\(.\)libdir/-L\1libdir ${COMPILER_RPATH_FLAG}\1libdir/'

View file

@ -1,11 +1,12 @@
@comment $NetBSD: PLIST,v 1.3 2009/10/27 18:50:39 drochner Exp $
bin/xmlrpc
@comment $NetBSD: PLIST,v 1.4 2011/04/06 07:45:47 adam Exp $
bin/xmlrpc-c-config
bin/xmlrpc_transport
include/XmlRpcCpp.h
include/xmlrpc-c/abyss.h
include/xmlrpc-c/abyss_unixsock.h
include/xmlrpc-c/abyss_winsock.h
include/xmlrpc-c/base.h
include/xmlrpc-c/base.hpp
include/xmlrpc-c/c_util.h
include/xmlrpc-c/client.h
include/xmlrpc-c/client.hpp
include/xmlrpc-c/client_global.h
@ -14,13 +15,16 @@ include/xmlrpc-c/client_transport.hpp
include/xmlrpc-c/config.h
include/xmlrpc-c/girerr.hpp
include/xmlrpc-c/girmem.hpp
include/xmlrpc-c/inttypes.h
include/xmlrpc-c/oldcppwrapper.hpp
include/xmlrpc-c/oldxmlrpc.h
include/xmlrpc-c/packetsocket.hpp
include/xmlrpc-c/registry.hpp
include/xmlrpc-c/server.h
include/xmlrpc-c/server_abyss.h
include/xmlrpc-c/server_abyss.hpp
include/xmlrpc-c/server_cgi.h
include/xmlrpc-c/server_pstream.hpp
include/xmlrpc-c/server_w32httpsys.h
include/xmlrpc-c/timeout.hpp
include/xmlrpc-c/transport.h
@ -34,30 +38,69 @@ include/xmlrpc_server.h
include/xmlrpc_server_w32httpsys.h
lib/libxmlrpc++.a
lib/libxmlrpc++.so
lib/libxmlrpc++.so.3
lib/libxmlrpc++.so.3.06
lib/libxmlrpc.la
lib/libxmlrpc_abyss.la
lib/libxmlrpc++.so.4
lib/libxmlrpc++.so.4.16
lib/libxmlrpc.a
lib/libxmlrpc.so
lib/libxmlrpc.so.3
lib/libxmlrpc.so.3.16
lib/libxmlrpc_abyss.a
lib/libxmlrpc_abyss.so
lib/libxmlrpc_abyss.so.3
lib/libxmlrpc_abyss.so.3.16
lib/libxmlrpc_client++.a
lib/libxmlrpc_client++.so
lib/libxmlrpc_client++.so.3
lib/libxmlrpc_client++.so.3.06
lib/libxmlrpc_client.la
lib/libxmlrpc_client++.so.4
lib/libxmlrpc_client++.so.4.16
lib/libxmlrpc_client.a
lib/libxmlrpc_client.so
lib/libxmlrpc_client.so.3
lib/libxmlrpc_client.so.3.16
lib/libxmlrpc_cpp.a
lib/libxmlrpc_cpp.so
lib/libxmlrpc_cpp.so.3
lib/libxmlrpc_cpp.so.3.06
lib/libxmlrpc_cpp.so.4
lib/libxmlrpc_cpp.so.4.16
lib/libxmlrpc_packetsocket.a
lib/libxmlrpc_packetsocket.so
lib/libxmlrpc_packetsocket.so.4
lib/libxmlrpc_packetsocket.so.4.16
lib/libxmlrpc_server++.a
lib/libxmlrpc_server++.so
lib/libxmlrpc_server++.so.3
lib/libxmlrpc_server++.so.3.06
lib/libxmlrpc_server.la
lib/libxmlrpc_server++.so.4
lib/libxmlrpc_server++.so.4.16
lib/libxmlrpc_server.a
lib/libxmlrpc_server.so
lib/libxmlrpc_server.so.3
lib/libxmlrpc_server.so.3.16
lib/libxmlrpc_server_abyss++.a
lib/libxmlrpc_server_abyss++.so
lib/libxmlrpc_server_abyss++.so.3
lib/libxmlrpc_server_abyss++.so.3.06
lib/libxmlrpc_server_abyss.la
lib/libxmlrpc_server_cgi.la
lib/libxmlrpc_util.la
lib/libxmlrpc_xmlparse.la
lib/libxmlrpc_xmltok.la
lib/libxmlrpc_server_abyss++.so.4
lib/libxmlrpc_server_abyss++.so.4.16
lib/libxmlrpc_server_abyss.a
lib/libxmlrpc_server_abyss.so
lib/libxmlrpc_server_abyss.so.3
lib/libxmlrpc_server_abyss.so.3.16
lib/libxmlrpc_server_cgi++.a
lib/libxmlrpc_server_cgi++.so
lib/libxmlrpc_server_cgi++.so.4
lib/libxmlrpc_server_cgi++.so.4.16
lib/libxmlrpc_server_cgi.a
lib/libxmlrpc_server_cgi.so
lib/libxmlrpc_server_cgi.so.3
lib/libxmlrpc_server_cgi.so.3.16
lib/libxmlrpc_server_pstream++.a
lib/libxmlrpc_server_pstream++.so
lib/libxmlrpc_server_pstream++.so.4
lib/libxmlrpc_server_pstream++.so.4.16
lib/libxmlrpc_util.a
lib/libxmlrpc_util.so
lib/libxmlrpc_util.so.3
lib/libxmlrpc_util.so.3.16
lib/libxmlrpc_xmlparse.a
lib/libxmlrpc_xmlparse.so
lib/libxmlrpc_xmlparse.so.3
lib/libxmlrpc_xmlparse.so.3.16
lib/libxmlrpc_xmltok.a
lib/libxmlrpc_xmltok.so
lib/libxmlrpc_xmltok.so.3
lib/libxmlrpc_xmltok.so.3.16

View file

@ -1,12 +1,12 @@
# $NetBSD: buildlink3.mk,v 1.7 2010/06/15 09:18:10 adam Exp $
# $NetBSD: buildlink3.mk,v 1.8 2011/04/06 07:45:47 adam Exp $
BUILDLINK_TREE+= xmlrpc-c
.if !defined(XMLRPC_C_BUILDLINK3_MK)
XMLRPC_C_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.xmlrpc-c+= xmlrpc-c-ss>=1.06.32
BUILDLINK_ABI_DEPENDS.xmlrpc-c+= xmlrpc-c-ss>=1.06.38nb3
BUILDLINK_API_DEPENDS.xmlrpc-c+= xmlrpc-c-ss>=1.16.34
BUILDLINK_ABI_DEPENDS.xmlrpc-c+= xmlrpc-c-ss>=1.16.34
BUILDLINK_PKGSRCDIR.xmlrpc-c?= ../../textproc/xmlrpc-c
.include "../../www/libwww/buildlink3.mk"

View file

@ -1,14 +1,11 @@
$NetBSD: distinfo,v 1.15 2011/03/25 13:38:07 adam Exp $
$NetBSD: distinfo,v 1.16 2011/04/06 07:45:47 adam Exp $
SHA1 (xmlrpc-c-1.06.42.tgz) = a4c4b878b97cbd7350a2e11518c480fe1d8997a2
RMD160 (xmlrpc-c-1.06.42.tgz) = 02e98cd84a806a81c76bc8508e50cc6b73019f32
Size (xmlrpc-c-1.06.42.tgz) = 712841 bytes
SHA1 (patch-aa) = 54390ac4c2740997544cc3321aa031eff59cbf91
SHA1 (patch-ab) = 601e4d33351d77c43846b328fed02b2f04c9ae3b
SHA1 (patch-ac) = e553e66662aca6d7c246acc24e960074213320c6
SHA1 (patch-ae) = 0e56c03e8066bfeb4e9a6330ee160d1ab1d68a11
SHA1 (patch-af) = fdeabde63338443459d96aca657a3fc402b9fbc4
SHA1 (patch-ah) = bcbca2cd9a7029bac048347b03aabce856a9eb0c
SHA1 (patch-ai) = ef5e4fc8b412e39addbb6da2cd83ec3c345860a0
SHA1 (patch-aj) = 48c5164a23024a1b6d3f6e53a24c2650ffcb47c9
SHA1 (patch-ak) = cf1b406f08913c47d416cc1bbd25fb0fba67ad75
SHA1 (xmlrpc-c-1.16.34.tgz) = e4fa13bc8609134f74ba60597c9a12e28565e094
RMD160 (xmlrpc-c-1.16.34.tgz) = bb1cce17997875fce483fcab7136dfa6a494f8e6
Size (xmlrpc-c-1.16.34.tgz) = 754271 bytes
SHA1 (patch-aa) = 96ca1b0f8550b04e7292d07b4204b5bed841a417
SHA1 (patch-ac) = e230eb36f812c85521721ead4d080250e61f670f
SHA1 (patch-ae) = 52f826d292869be44886881c48aa7707a4af2df3
SHA1 (patch-ai) = e7b981f07d4691bbd63bfa80b34b3e1c050c3ad2
SHA1 (patch-aj) = e3ca062349eb7c50cf3d3dc1370744987a0f3bde
SHA1 (patch-ak) = 2d0528260b203965e5237f5ca7f9464215283f5c

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.5 2009/11/09 13:29:53 joerg Exp $
$NetBSD: patch-aa,v 1.6 2011/04/06 07:45:48 adam Exp $
--- Makefile.common.orig 2007-07-13 02:32:20.000000000 +0200
+++ Makefile.common
@@ -28,15 +28,15 @@ GCC_CXX_WARNINGS = $(GCC_WARNINGS) -Wove
--- common.mk.orig 2011-03-25 16:58:35.000000000 +0000
+++ common.mk
@@ -31,15 +31,15 @@ GCC_CXX_WARNINGS = $(GCC_WARNINGS) -Wove
# assertion and crash the program if it isn't really true. You can add
# -UNDEBUG (in any of various ways) to override this.
#
@ -21,21 +21,8 @@ $NetBSD: patch-aa,v 1.5 2009/11/09 13:29:53 joerg Exp $
+ CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS)
endif
DISTDIR = $(BUILDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR)
@@ -116,10 +116,8 @@ ifneq ($(ENABLE_LIBXML2_BACKEND),yes)
# We're using the internal Expat XML parser
LIBXMLRPC_XML = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK)
LDLIBS_XML = \
- -L$(BUILDDIR)/lib/expat/xmlparse/.libs \
- -lxmlrpc_xmlparse \
- -L$(BUILDDIR)/lib/expat/xmltok/.libs \
- -lxmlrpc_xmltok
+ $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \
+ $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la
else
LDLIBS_XML = $(shell xml2-config --libs)
endif
@@ -334,7 +332,7 @@ install-headers: $(HEADERS_TO_INSTALL)
DISTDIR = $(BLDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR)
@@ -524,7 +524,7 @@ install-headers: $(HEADERS_TO_INSTALL)
done

View file

@ -1,70 +0,0 @@
$NetBSD: patch-ab,v 1.8 2011/03/25 13:38:07 adam Exp $
--- Makefile.config.in.orig 2008-03-25 15:24:58.000000000 +0100
+++ Makefile.config.in
@@ -141,6 +141,7 @@
SHARED_LIB_TYPE = unix
SHLIB_SUFFIX = so
# SHLIB_CLIB = -lc
+ CFLAGS_SHLIB = -fPIC
LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
endif
@@ -155,6 +155,15 @@ ifeq ($(findstring solaris,$(HOST_OS)),s
CFLAGS_SHLIB = -Kpic
endif
+ifeq ($(HOST_OS),solaris2)
+ SHARED_LIB_TYPE = unix
+ SHLIB_SUFFIX = so
+ shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
+ shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
+ LDFLAGS_SHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME)
+ CFLAGS_SHLIB = -Kpic
+endif
+
ifeq ($(HOST_OS),aix)
# This code is not finished; that's why we don't set SHARED_LIB_TYPE.
# If you can finish it and make it work on AIX, please do.
@@ -188,17 +197,36 @@ ifeq ($(HOST_OS),osf)
endif
ifeq ($(findstring netbsd,$(HOST_OS)),netbsd)
- # This code is not finished; that's why we don't set SHARED_LIB_TYPE.
- # If you can finish it and make it work on AIX, please do.
- # SHARED_LIB_TYPE = unix
+ SHARED_LIB_TYPE = unix
+ SHLIB_SUFFIX = so
+ shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
+ shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
+ CFLAGS_SHLIB = -fPIC
+ LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
+endif
+
+ifeq ($(HOST_OS),dragonfly)
+ SHARED_LIB_TYPE = unix
+ SHLIB_SUFFIX = so
+ shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
+ shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
+ CFLAGS_SHLIB = -fPIC
+ LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
+endif
+
+ifeq ($(findstring freebsd,$(HOST_OS)),freebsd)
+ SHARED_LIB_TYPE = unix
SHLIB_SUFFIX = so
- CFLAGS_SHLIB = -fpic
+ shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
+ shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
+ CFLAGS_SHLIB = -fPIC
+ LDFLAGS_SHLIB = -shared -Wl,-soname,$(SONAME) $(SHLIB_CLIB)
endif
ifeq ($(HOST_OS),darwin)
# This code is not finished; that's why we don't set SHARED_LIB_TYPE.
# If you can finish it and make it work on AIX, please do.
- # SHARED_LIB_TYPE = dylib
+ SHARED_LIB_TYPE = dylib
SHLIB_SUFFIX = dylib
endif

View file

@ -1,13 +1,13 @@
$NetBSD: patch-ac,v 1.3 2009/10/28 09:25:23 adam Exp $
$NetBSD: patch-ac,v 1.4 2011/04/06 07:45:48 adam Exp $
--- src/cpp/Makefile.orig 2009-08-30 17:43:48.000000000 +0200
--- src/cpp/Makefile.orig 2011-03-25 16:58:35.000000000 +0000
+++ src/cpp/Makefile
@@ -139,7 +139,7 @@ libxmlrpc_client++.a: $(LIBXMLRPC_CLIENT
# RULES TO COMPILE OBJECT MODULES FOR LIBRARIES
#-----------------------------------------------------------------------------
@@ -283,7 +283,7 @@ $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.o) \
$(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh): \
INCLUDES = $(BASIC_INCLUDES)
-CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
+CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_SHLIB) $(CFLAGS_PERSONAL) $(CADD)
XmlRpcCpp.o:%.o:%.cpp
$(CXX) -c $(BASIC_INCLUDES) $(CXXFLAGS) $<
TRANSPORT_CONFIG_USERS = client curl libwww wininet

View file

@ -1,9 +1,9 @@
$NetBSD: patch-ae,v 1.2 2009/10/27 18:50:39 drochner Exp $
$NetBSD: patch-ae,v 1.3 2011/04/06 07:45:48 adam Exp $
--- lib/expat/Makefile.orig 2006-07-12 04:00:38.000000000 +0200
--- lib/expat/Makefile.orig 2011-03-25 16:58:35.000000000 +0000
+++ lib/expat/Makefile
@@ -6,7 +6,7 @@ SUBDIR = lib/expat
include $(SRCDIR)/Makefile.config
@@ -9,7 +9,7 @@ SUBDIR := lib/expat
include $(BLDDIR)/config.mk
# Build up SUBDIRS:
-SUBDIRS = gennmtab xmlparse xmltok

View file

@ -1,13 +0,0 @@
$NetBSD: patch-af,v 1.2 2009/10/27 18:50:39 drochner Exp $
--- lib/expat/xmlparse/Makefile.orig 2006-06-18 19:34:34.000000000 +0200
+++ lib/expat/xmlparse/Makefile
@@ -27,7 +27,7 @@ LDFLAGS = $(LADD)
LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LADD)
libxmlrpc_xmlparse.la: $(LIBXMLRPC_XMLPARSE_OBJS)
- $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^ ../xmltok/libxmlrpc_xmltok.la
CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)

View file

@ -1,24 +0,0 @@
$NetBSD: patch-ah,v 1.3 2009/11/10 21:25:57 drochner Exp $
--- src/Makefile.orig 2009-11-02 13:47:29.000000000 +0100
+++ src/Makefile
@@ -7,8 +7,8 @@ VPATH = .:$(SRCDIR)
include $(BUILDDIR)/Makefile.config
-ABYSS_LIBDIR = $(BUILDDIR)/lib/abyss/src/.libs
-LIBUTIL_LIBDIR = $(BUILDDIR)/lib/libutil/.libs
+ABYSS_LIBDIR = $(BUILDDIR)/lib/abyss/src
+LIBUTIL_LIBDIR = $(BUILDDIR)/lib/libutil
default: all
@@ -134,7 +134,7 @@ all: $(TARGET_LTLIBRARIES) $(SUBDIRS:%=%
LDFLAGS = $(LADD)
-LIBPATHS = -L.libs -L$(LIBUTIL_LIBDIR)
+LIBPATHS = -L. -L$(LIBUTIL_LIBDIR)
LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LIBPATHS) $(LADD)

View file

@ -1,13 +1,13 @@
$NetBSD: patch-ai,v 1.1 2009/11/05 21:04:54 joerg Exp $
$NetBSD: patch-ai,v 1.2 2011/04/06 07:45:48 adam Exp $
--- tools/xmlrpc/Makefile.orig 2009-11-01 17:37:40.000000000 +0100
--- tools/xmlrpc/Makefile.orig 2011-03-25 16:58:35.000000000 +0000
+++ tools/xmlrpc/Makefile
@@ -38,7 +38,7 @@ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC)
XMLRPC_OBJS = xmlrpc.o dumpvalue.o
@@ -45,7 +45,7 @@ LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC)
XMLRPC_OBJS = xmlrpc.o $(DUMPVALUE)
xmlrpc: $(XMLRPC_OBJS) $(LIBS) $(UTILS)
- $(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS)
+ libtool --mode=link $(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS)
%.o:%.c
%.o:%.c $(BLDDIR)/include/xmlrpc-c/config.h
$(CC) -c $(CFLAGS) $<

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aj,v 1.1 2009/11/05 21:04:54 joerg Exp $
$NetBSD: patch-aj,v 1.2 2011/04/06 07:45:48 adam Exp $
--- tools/xmlrpc_transport/Makefile.orig 2009-11-01 17:43:49.000000000 +0100
--- tools/xmlrpc_transport/Makefile.orig 2011-03-25 16:58:35.000000000 +0000
+++ tools/xmlrpc_transport/Makefile
@@ -39,7 +39,7 @@ UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%)
@@ -45,7 +45,7 @@ UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%)
LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) $(LIBXMLRPC_XML) $(LIBXMLRPC_UTIL)
xmlrpc_transport:%:%.o $(LIBS) $(UTILS)

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ak,v 1.1 2009/11/05 21:04:54 joerg Exp $
$NetBSD: patch-ak,v 1.2 2011/04/06 07:45:48 adam Exp $
--- tools/xml-rpc-api2cpp/Makefile.orig 2009-11-01 17:46:49.000000000 +0100
--- tools/xml-rpc-api2cpp/Makefile.orig 2011-03-25 16:58:35.000000000 +0000
+++ tools/xml-rpc-api2cpp/Makefile
@@ -43,7 +43,7 @@ xml-rpc-api2cpp: \
@@ -44,7 +44,7 @@ xml-rpc-api2cpp: \
$(LIBXMLRPC) \
$(LIBXMLRPC_XML) \
$(LIBXMLRPC_UTIL)