update to 1.06.38

this switches to the "super stable" branch which is the only one
where tarballs are distributed of,
too many changes to list here, the most notable recent one is that the
recent expat DOS vulnerability was fixed, as were some portability
issues which caused problems on NetBSD

12 files changed, 61 insertions, 115 deletions

diff --git a/textproc/xmlrpc-c/Makefile b/textproc/xmlrpc-c/Makefile
index e25b1f3e804..ac296ce3bdb 100644
--- a/textproc/xmlrpc-c/Makefile
+++ b/textproc/xmlrpc-c/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2008/10/02 17:57:39 ahoka Exp $
+# $NetBSD: Makefile,v 1.9 2009/10/27 18:50:38 drochner Exp $
 #
 
-DISTNAME=	xmlrpc-c-1.09.00
-PKGREVISION=	3
+DISTNAME=	xmlrpc-c-1.06.38
 CATEGORIES=	textproc devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/}
 EXTRACT_SUFX=	.tgz
@@ -21,6 +20,7 @@ USE_LIBTOOL=	yes
 USE_LANGUAGES=	c99 c++
 USE_TOOLS+=	gmake
 MAKE_FILE=	GNUmakefile
+TEST_TARGET=	check
 
 SUBST_CLASSES+=	pthread
 SUBST_FILES.pthread=	xmlrpc-c-config.in xmlrpc-c-config.test.in
diff --git a/textproc/xmlrpc-c/PLIST b/textproc/xmlrpc-c/PLIST
index 899561c26a0..a1b73c930aa 100644
--- a/textproc/xmlrpc-c/PLIST
+++ b/textproc/xmlrpc-c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/10/27 18:50:39 drochner Exp $
 bin/xmlrpc
 bin/xmlrpc-c-config
 bin/xmlrpc_transport
@@ -6,7 +6,6 @@ include/XmlRpcCpp.h
 include/xmlrpc-c/abyss.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
@@ -28,38 +27,35 @@ include/xmlrpc-c/transport.h
 include/xmlrpc-c/util.h
 include/xmlrpc-c/xml.hpp
 include/xmlrpc.h
+include/xmlrpc_abyss.h
 include/xmlrpc_cgi.h
 include/xmlrpc_client.h
 include/xmlrpc_server.h
-include/xmlrpc_server_abyss.h
 include/xmlrpc_server_w32httpsys.h
 lib/libxmlrpc++.a
 lib/libxmlrpc++.so
 lib/libxmlrpc++.so.3
-lib/libxmlrpc++.so.3.09
+lib/libxmlrpc++.so.3.06
 lib/libxmlrpc.la
-lib/libxmlrpc_abyss.a
-lib/libxmlrpc_abyss.so
-lib/libxmlrpc_abyss.so.3
-lib/libxmlrpc_abyss.so.3.09
+lib/libxmlrpc_abyss.la
 lib/libxmlrpc_client++.a
 lib/libxmlrpc_client++.so
 lib/libxmlrpc_client++.so.3
-lib/libxmlrpc_client++.so.3.09
+lib/libxmlrpc_client++.so.3.06
 lib/libxmlrpc_client.la
 lib/libxmlrpc_cpp.a
 lib/libxmlrpc_cpp.so
 lib/libxmlrpc_cpp.so.3
-lib/libxmlrpc_cpp.so.3.09
+lib/libxmlrpc_cpp.so.3.06
 lib/libxmlrpc_server++.a
 lib/libxmlrpc_server++.so
 lib/libxmlrpc_server++.so.3
-lib/libxmlrpc_server++.so.3.09
+lib/libxmlrpc_server++.so.3.06
 lib/libxmlrpc_server.la
 lib/libxmlrpc_server_abyss++.a
 lib/libxmlrpc_server_abyss++.so
 lib/libxmlrpc_server_abyss++.so.3
-lib/libxmlrpc_server_abyss++.so.3.09
+lib/libxmlrpc_server_abyss++.so.3.06
 lib/libxmlrpc_server_abyss.la
 lib/libxmlrpc_server_cgi.la
 lib/libxmlrpc_util.la
diff --git a/textproc/xmlrpc-c/buildlink3.mk b/textproc/xmlrpc-c/buildlink3.mk
index 3ec45a46bb3..7e0acaaa384 100644
--- a/textproc/xmlrpc-c/buildlink3.mk
+++ b/textproc/xmlrpc-c/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/10/27 18:50:39 drochner Exp $
 
 BUILDLINK_TREE+=	xmlrpc-c
 
 .if !defined(XMLRPC_C_BUILDLINK3_MK)
 XMLRPC_C_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xmlrpc-c+=	xmlrpc-c>=1.09.00
-BUILDLINK_ABI_DEPENDS.xmlrpc-c?=	xmlrpc-c>=1.09.00nb3
+BUILDLINK_API_DEPENDS.xmlrpc-c+=	xmlrpc-c>=1.06.32
+BUILDLINK_ABI_DEPENDS.xmlrpc-c?=	xmlrpc-c>=1.06.32
 BUILDLINK_PKGSRCDIR.xmlrpc-c?=	../../textproc/xmlrpc-c
 
 .include "../../www/libwww/buildlink3.mk"
diff --git a/textproc/xmlrpc-c/distinfo b/textproc/xmlrpc-c/distinfo
index 675af0c0671..435dbc95aa5 100644
--- a/textproc/xmlrpc-c/distinfo
+++ b/textproc/xmlrpc-c/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.6 2009/09/20 21:15:44 sno Exp $
+$NetBSD: distinfo,v 1.7 2009/10/27 18:50:39 drochner Exp $
 
-SHA1 (xmlrpc-c-1.09.00.tgz) = bd4571ca3bc23c1fe9dd002659fcc2aa3d4ce8a6
-RMD160 (xmlrpc-c-1.09.00.tgz) = ef098edef126dfd5a14334e6a1e4e7919be4b40c
-Size (xmlrpc-c-1.09.00.tgz) = 701817 bytes
-SHA1 (patch-aa) = ff3f7c7d0195c10f57df4ea047eb87a5bdac5cd1
-SHA1 (patch-ab) = 5c2822312b368888df101d26985979e904e0f046
-SHA1 (patch-ac) = 805aebdaa736a08482a4f82559938d38f794ab81
-SHA1 (patch-ad) = 8b7ad5b7aacb6b13f04792bc157e228deaf2de72
-SHA1 (patch-ae) = 683239483a9bfee5defe2b0c8f3ef9fd0d5735f9
-SHA1 (patch-af) = c679a0cc1b867c093e9f1c1990993f18e1f50b2a
-SHA1 (patch-ag) = 297a2cd667c0b7e7472585bdcffb2c6bb1e4bc2e
+SHA1 (xmlrpc-c-1.06.38.tgz) = 40332f0f363b9ca79242b28d4cbf13516702dacf
+RMD160 (xmlrpc-c-1.06.38.tgz) = 8d9f85a1b1be91fdc5c8aaab5571d0270ddbdf67
+Size (xmlrpc-c-1.06.38.tgz) = 702092 bytes
+SHA1 (patch-ab) = 711dfddb63089948008becbddbe1484f5124b374
+SHA1 (patch-ae) = 0e56c03e8066bfeb4e9a6330ee160d1ab1d68a11
+SHA1 (patch-af) = fdeabde63338443459d96aca657a3fc402b9fbc4
+SHA1 (patch-ah) = 55558998059c502f46a2bd9141ede7182df0753b
diff --git a/textproc/xmlrpc-c/patches/patch-aa b/textproc/xmlrpc-c/patches/patch-aa
deleted file mode 100644
index 2064747587a..00000000000
--- a/textproc/xmlrpc-c/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/02/24 11:00:51 wiz Exp $
-
---- lib/abyss/src/server.c.orig	2006-09-02 04:57:35.000000000 +0200
-+++ lib/abyss/src/server.c
-@@ -4,7 +4,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #ifdef WIN32
-   #include <io.h>
- #else
diff --git a/textproc/xmlrpc-c/patches/patch-ab b/textproc/xmlrpc-c/patches/patch-ab
index bacfe330bba..8d4477fdc2e 100644
--- a/textproc/xmlrpc-c/patches/patch-ab
+++ b/textproc/xmlrpc-c/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2009/09/20 21:15:44 sno Exp $
+$NetBSD: patch-ab,v 1.6 2009/10/27 18:50:39 drochner Exp $
 
---- Makefile.config.in.orig	2006-09-28 04:15:55.000000000 +0200
-+++ Makefile.config.in	2009-09-20 23:05:15.000000000 +0200
-@@ -168,6 +168,15 @@
+--- Makefile.config.in.orig	2008-03-25 15:24:58.000000000 +0100
++++ Makefile.config.in
+@@ -155,6 +155,15 @@ ifeq ($(findstring solaris,$(HOST_OS)),s
    CFLAGS_SHLIB = -Kpic
  endif
  
@@ -16,17 +16,17 @@ $NetBSD: patch-ab,v 1.5 2009/09/20 21:15:44 sno Exp $
 +endif
 +
  ifeq ($(HOST_OS),aix)
-   SHARED_LIB_TYPE = unix
-   SHLIB_SUFFIX = a
-@@ -204,12 +213,31 @@
-   LDFLAGS_SHLIB = -shared -expect_unresolved
+   # 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,11 +197,30 @@ ifeq ($(HOST_OS),osf)
  endif
  
--ifeq ($(findstring netbsd,$(HOST_OS)),FIND)
-+ifeq ($(findstring netbsd,$(HOST_OS)),netbsd)
-   SHARED_LIB_TYPE = unix
-   SHLIB_SUFFIX = so
--  shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ))
+ 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
@@ -44,10 +44,10 @@ $NetBSD: patch-ab,v 1.5 2009/09/20 21:15:44 sno Exp $
 +
 +ifeq ($(findstring freebsd,$(HOST_OS)),freebsd)
 +  SHARED_LIB_TYPE = unix
-+  SHLIB_SUFFIX = so
-+  shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
-   shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
+   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
diff --git a/textproc/xmlrpc-c/patches/patch-ac b/textproc/xmlrpc-c/patches/patch-ac
deleted file mode 100644
index d0dfa970bfe..00000000000
--- a/textproc/xmlrpc-c/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/02/24 11:00:51 wiz Exp $
-
---- src/cpp/Makefile.orig	2006-11-06 02:50:37.000000000 +0100
-+++ src/cpp/Makefile
-@@ -102,8 +102,8 @@ all: \
- 
- # Rules for these are in Makefile.common, courtesy of TARGET_LIB_NAMES_PP:
- 
--$(LIBXMLRPC_CPP): XmlRpcCpp.o
--$(LIBXMLRPC_CPP): LIBOBJECTS = XmlRpcCpp.o
-+$(LIBXMLRPC_CPP): XmlRpcCpp.osh
-+$(LIBXMLRPC_CPP): LIBOBJECTS = XmlRpcCpp.osh
- 
- $(LIBXMLRPCPP): $(LIBXMLRPCPP_MODS:%=%.osh)
- $(LIBXMLRPCPP): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh)
diff --git a/textproc/xmlrpc-c/patches/patch-ad b/textproc/xmlrpc-c/patches/patch-ad
deleted file mode 100644
index 16f680d1ff1..00000000000
--- a/textproc/xmlrpc-c/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/02/26 14:56:30 joerg Exp $
-
---- lib/abyss/src/thread.h.orig	2007-02-26 13:49:18.000000000 +0000
-+++ lib/abyss/src/thread.h
-@@ -57,6 +57,8 @@ ThreadHandleSigchld(pid_t const pid);
- #ifdef WIN32
- typedef HANDLE TMutex;
- #else
-+#include <pthread.h>
-+
- typedef pthread_mutex_t TMutex;
- #endif  /* WIN32 */
- 
diff --git a/textproc/xmlrpc-c/patches/patch-ae b/textproc/xmlrpc-c/patches/patch-ae
index 6dedf050f87..0f50d445798 100644
--- a/textproc/xmlrpc-c/patches/patch-ae
+++ b/textproc/xmlrpc-c/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.1 2007/02/26 14:56:31 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2009/10/27 18:50:39 drochner Exp $
 
---- lib/expat/Makefile.orig	2007-02-26 14:18:10.000000000 +0000
+--- lib/expat/Makefile.orig	2006-07-12 04:00:38.000000000 +0200
 +++ lib/expat/Makefile
-@@ -9,7 +9,7 @@ SUBDIR := lib/expat
- include $(BLDDIR)/Makefile.config
+@@ -6,7 +6,7 @@ SUBDIR = lib/expat
+ include $(SRCDIR)/Makefile.config
  
  # Build up SUBDIRS:
 -SUBDIRS = gennmtab xmlparse xmltok
diff --git a/textproc/xmlrpc-c/patches/patch-af b/textproc/xmlrpc-c/patches/patch-af
index aaacd66dba4..0d120b3652f 100644
--- a/textproc/xmlrpc-c/patches/patch-af
+++ b/textproc/xmlrpc-c/patches/patch-af
@@ -1,18 +1,13 @@
-$NetBSD: patch-af,v 1.1 2007/02/26 14:56:31 joerg Exp $
+$NetBSD: patch-af,v 1.2 2009/10/27 18:50:39 drochner Exp $
 
---- lib/expat/xmlparse/Makefile.orig	2007-02-26 14:16:29.000000000 +0000
+--- lib/expat/xmlparse/Makefile.orig	2006-06-18 19:34:34.000000000 +0200
 +++ lib/expat/xmlparse/Makefile
-@@ -20,11 +20,11 @@ LIBXMLRPC_XMLPARSE_OBJS = xmlparse.lo
+@@ -27,7 +27,7 @@ LDFLAGS = $(LADD)
+ LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LADD)
  
- INCLUDES = -I$(BLDDIR) -I$(UTILDIR)/include -I$(XMLTOKDIR)
- 
--LIBLDFLAGS = $(LDFLAGS_VERSINFO) -L../xmltok/.libs $(RPATH) $(LADD)
-+LIBLDFLAGS = $(LDFLAGS_VERSINFO) $(RPATH) $(LADD)
- 
- libxmlrpc_xmlparse.la: $(LIBXMLRPC_XMLPARSE_OBJS) $(LIBXMLRPC_XMLTOK)
- 	$(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) \
--	  $(LIBXMLRPC_XMLPARSE_OBJS) -lxmlrpc_xmltok
-+	  $(LIBXMLRPC_XMLPARSE_OBJS) ../xmltok/libxmlrpc_xmltok.la
+ 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)
  
diff --git a/textproc/xmlrpc-c/patches/patch-ag b/textproc/xmlrpc-c/patches/patch-ag
deleted file mode 100644
index f15bbe42369..00000000000
--- a/textproc/xmlrpc-c/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/01/11 14:08:02 wiz Exp $
-
---- lib/curl_transport/xmlrpc_curl_transport.c.orig	2006-09-24 22:00:00.000000000 +0200
-+++ lib/curl_transport/xmlrpc_curl_transport.c
-@@ -1211,7 +1211,7 @@ setupCurlSession(xmlrpc_env *           
-             curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE,
-                              curlSetupP->sslEngine);
-         if (curlSetupP->sslEngineDefault)
--            curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE_DEFAULT);
-+            curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE_DEFAULT, 1);
-         if (curlSetupP->sslVersion != XMLRPC_SSLVERSION_DEFAULT)
-             curl_easy_setopt(curlSessionP, CURLOPT_SSLVERSION,
-                              curlSetupP->sslVersion);
diff --git a/textproc/xmlrpc-c/patches/patch-ah b/textproc/xmlrpc-c/patches/patch-ah
new file mode 100644
index 00000000000..5ff0a637ab6
--- /dev/null
+++ b/textproc/xmlrpc-c/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2009/10/27 18:50:39 drochner Exp $
+
+--- src/Makefile.orig	2009-01-09 21:33:17.000000000 +0100
++++ src/Makefile
+@@ -51,6 +51,7 @@ ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
+   LIBXML_LIBS = $(shell xml2-config --libs)
+ else
+   LIBXML_INCLUDES = -I$(SRCDIR)/lib/expat/xmlparse
++  LIBXML_LIBS = ../lib/expat/xmlparse/libxmlrpc_xmlparse.la
+ endif
+ 
+ ABYSS_INCLUDES = -I$(SRCDIR)/lib/abyss/src