cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to version 1.06.23

Browse Source 
feedback and ok espie@
This commit is contained in:
ajacoutot 2008-03-15 10:35:54 +00:00
parent 9eb1778375
commit 1d07e237ca
13 changed files with 77 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
net/xmlrpc-c/Makefile
View File

@ -1,24 +1,26 @@
# $OpenBSD: Makefile,v 1.4 2007/11/17 20:39:03 steven Exp $
# $OpenBSD: Makefile,v 1.5 2008/03/15 10:35:54 ajacoutot Exp $
COMMENT= XML-RPC C/C++ client-server implementation
CATEGORIES= net devel textproc
DISTNAME= xmlrpc-c-1.06.08
PKGNAME= ${DISTNAME}p1
V= 1.06.23
DISTNAME= xmlrpc-${V}
PKGNAME= xmlrpc-c-${V}
EXTRACT_SUFX= .tgz
SHARED_LIBS += xmlrpc_util 0.0 # .9.4
SHARED_LIBS += xmlrpc_abyss 0.0 # .9.4
SHARED_LIBS += xmlrpc_xmlparse 0.0 # .9.4
SHARED_LIBS += xmlrpc_xmltok 0.0 # .9.4
SHARED_LIBS += xmlrpc 0.0 # .9.4
SHARED_LIBS += xmlrpc_server 0.0 # .9.4
SHARED_LIBS += xmlrpc_server_abyss 0.0 # .9.4
SHARED_LIBS += xmlrpc_client 0.0 # .9.4
SHARED_LIBS += xmlrpc_server_cgi 0.0 # .9.4
SHARED_LIBS += xmlrpc_util 1.0 # .9.15
SHARED_LIBS += xmlrpc_abyss 1.0 # .9.15
SHARED_LIBS += xmlrpc_xmlparse 1.0 # .9.15
SHARED_LIBS += xmlrpc_xmltok 1.0 # .9.15
SHARED_LIBS += xmlrpc 1.0 # .9.15
SHARED_LIBS += xmlrpc_server 1.0 # .9.15
SHARED_LIBS += xmlrpc_server_abyss 1.0 # .9.15
SHARED_LIBS += xmlrpc_client 1.0 # .9.15
SHARED_LIBS += xmlrpc_server_cgi 1.0 # .9.15
HOMEPAGE= http://xmlrpc-c.sourceforge.net/
WANTLIB += c crypto iconv intl idn pthread ssl z
WANTLIB= c crypto idn pthread ssl z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmlrpc-c/}
@ -28,22 +30,21 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
MODULES= devel/gettext
LIB_DEPENDS= curl::net/curl
CONFIGURE_STYLE= gnu
USE_LIBTOOL= Yes
USE_GMAKE= Yes
post-extract:
rm ${WRKSRC}/src/cpp/test/srcdir
# we don't have libwww for now, this guards against picking it up
# if somebody ports it
CONFIGURE_ARGS+= --disable-libwww-client
CONFIGURE_ARGS+= --disable-libwww-client
# flavor ?
CONFIGURE_ARGS+= --disable-libxml2-backend
CONFIGURE_ARGS+= --disable-libxml2-backend
MAKE_FILE= ${WRKBUILD}/GNUmakefile
MAKE_FILE= GNUmakefile
.include <bsd.port.mk>

10
net/xmlrpc-c/distinfo
View File

@ -1,5 +1,5 @@
MD5 (xmlrpc-c-1.06.08.tgz) = zpnmU1NqLmPcxgSw3TAGvg==
RMD160 (xmlrpc-c-1.06.08.tgz) = qGenySpH0vusloWjMZB6JacwpPA=
SHA1 (xmlrpc-c-1.06.08.tgz) = Dk8GUOSMvN0PpuMBlbCDo3wWb7c=
SHA256 (xmlrpc-c-1.06.08.tgz) = 0Po/lmDZiFxDLrT2OStCjXnH3drc1+B0OaHfLehDHXc=
SIZE (xmlrpc-c-1.06.08.tgz) = 680057
MD5 (xmlrpc-1.06.23.tgz) = 5RmkMUW5DoFPz7CvHbHZHA==
RMD160 (xmlrpc-1.06.23.tgz) = pVYXV/BYy+RDX31kXC1d0OZO/8g=
SHA1 (xmlrpc-1.06.23.tgz) = RHryP+Ek86oRvkHwhAdQQakpGMg=
SHA256 (xmlrpc-1.06.23.tgz) = TqbL8gKhkGddDzrd+TFhtOV1dY0X5ERMy8tu6HmGE1k=
SIZE (xmlrpc-1.06.23.tgz) = 703495

8
net/xmlrpc-c/patches/patch-Makefile_common
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_common,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
--- Makefile.common.orig Wed Aug 30 04:59:05 2006
+++ Makefile.common Mon Dec 18 12:58:57 2006
$OpenBSD: patch-Makefile_common,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
--- Makefile.common.orig Fri Jul 13 02:32:20 2007
+++ Makefile.common Wed Jan 16 14:20:17 2008
@@ -32,11 +32,11 @@ CFLAGS_COMMON = -DNDEBUG
CXXFLAGS_COMMON = -DNDEBUG
@ -15,7 +15,7 @@ $OpenBSD: patch-Makefile_common,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
endif
DISTDIR = $(BUILDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR)
@@ -259,6 +259,10 @@ $(ALL_OBJS): $(BUILDDIR)/include/xmlrpc-
@@ -259,6 +259,10 @@ $(ALL_OBJS): $(BUILDDIR)/include/xmlrpc-c/config.h
ifeq ($(SHARED_LIB_TYPE),unix)
include $(SRCDIR)/unix-common.make

10
net/xmlrpc-c/patches/patch-Makefile_config_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_config_in,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
--- Makefile.config.in.orig Sat May 13 23:01:38 2006
+++ Makefile.config.in Sun Dec 17 20:15:52 2006
@@ -35,8 +35,8 @@ HAVE_WCHAR_H_DEFINE = @HAVE_WCHAR_H_DEFI
$OpenBSD: patch-Makefile_config_in,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
--- Makefile.config.in.orig Tue Mar 6 17:54:44 2007
+++ Makefile.config.in Wed Jan 16 14:20:17 2008
@@ -35,8 +35,8 @@ HAVE_WCHAR_H_DEFINE = @HAVE_WCHAR_H_DEFINE@
SHELL = @SHELL@
CC = @CC@
CXX = @CXX@
@ -12,7 +12,7 @@ $OpenBSD: patch-Makefile_config_in,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
AR = ar
RANLIB = @RANLIB@
LN_S = @LN_S@
@@ -193,6 +193,12 @@ ifeq ($(findstring netbsd,$(HOST_OS)),FI
@@ -193,6 +193,12 @@ ifeq ($(findstring netbsd,$(HOST_OS)),netbsd)
CFLAGS_SHLIB = -fpic
endif

11
net/xmlrpc-c/patches/patch-lib_abyss_src_server_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-lib_abyss_src_server_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
--- lib/abyss/src/server.c.orig Sun Dec 17 20:41:07 2006
+++ lib/abyss/src/server.c Sun Dec 17 20:41:12 2006
@@ -5,6 +5,7 @@
#include <string.h>
#include <time.h>
#include <sys/errno.h>
+#include <errno.h>
#ifdef WIN32
#include <io.h>
#else

8
net/xmlrpc-c/patches/patch-lib_abyss_src_socket_unix_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_abyss_src_socket_unix_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
--- lib/abyss/src/socket_unix.c.orig Mon Dec 18 13:30:29 2006
+++ lib/abyss/src/socket_unix.c Mon Dec 18 13:31:46 2006
@@ -200,8 +200,8 @@ socketWrite(TSocket * const
$OpenBSD: patch-lib_abyss_src_socket_unix_c,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
--- lib/abyss/src/socket_unix.c.orig Sat Jun 10 18:51:46 2006
+++ lib/abyss/src/socket_unix.c Wed Jan 16 14:20:17 2008
@@ -200,8 +200,8 @@ socketWrite(TSocket * const socketP,
fprintf(stderr, "Abyss socket: send() failed. "
"Socket closed.\n");
else

8
net/xmlrpc-c/patches/patch-lib_libutil_memblock_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_libutil_memblock_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
--- lib/libutil/memblock.c.orig Mon Dec 18 13:29:37 2006
+++ lib/libutil/memblock.c Mon Dec 18 13:30:00 2006
@@ -73,8 +73,8 @@ xmlrpc_mem_block_init(xmlrpc_env *
$OpenBSD: patch-lib_libutil_memblock_c,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
--- lib/libutil/memblock.c.orig Fri Sep 23 04:17:35 2005
+++ lib/libutil/memblock.c Wed Jan 16 14:20:17 2008
@@ -73,8 +73,8 @@ xmlrpc_mem_block_init(xmlrpc_env * const envP,
blockP->_block = (void*) malloc(blockP->_allocated);
if (!blockP->_block)

8
net/xmlrpc-c/patches/patch-src_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
--- src/Makefile.orig Mon Dec 18 11:00:33 2006
+++ src/Makefile Mon Dec 18 11:00:51 2006
$OpenBSD: patch-src_Makefile,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
--- src/Makefile.orig Sun Jul 30 05:07:28 2006
+++ src/Makefile Wed Jan 16 14:20:17 2008
@@ -7,8 +7,8 @@ VPATH = .:$(SRCDIR)
include $(BUILDDIR)/Makefile.config
@ -12,7 +12,7 @@ $OpenBSD: patch-src_Makefile,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
default: all
@@ -132,7 +132,7 @@ all: $(TARGET_LTLIBRARIES) $(SUBDIRS:%=%
@@ -132,7 +132,7 @@ all: $(TARGET_LTLIBRARIES) $(SUBDIRS:%=%/all)
LDFLAGS = $(LADD)

12
net/xmlrpc-c/patches/patch-src_registry_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_registry_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
--- src/registry.c.orig Mon Dec 18 11:53:48 2006
+++ src/registry.c Mon Dec 18 12:56:41 2006
@@ -359,10 +359,13 @@ xmlrpc_dispatchCall(xmlrpc_env * co
if (!envP->fault_occurred)
$OpenBSD: patch-src_registry_c,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
--- src/registry.c.orig Wed Jan 16 14:15:43 2008
+++ src/registry.c Wed Jan 16 14:17:38 2008
@@ -363,10 +363,13 @@ xmlrpc_dispatchCall(xmlrpc_env * const envP,
if (!methodLookupEnv.fault_occurred)
callNamedMethod(envP, methodInfoP, paramArrayP, resultPP);
else if (envP->fault_code == XMLRPC_INDEX_ERROR) {
else if (methodLookupEnv.fault_code == XMLRPC_INDEX_ERROR) {
- if (registryP->_default_method)
+ if (registryP->_default_method) {
+ xmlrpc_env_clean(envP);

12
net/xmlrpc-c/patches/patch-src_xmlrpc_builddecomp_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_xmlrpc_builddecomp_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
--- src/xmlrpc_builddecomp.c.orig Mon Dec 18 12:15:59 2006
+++ src/xmlrpc_builddecomp.c Mon Dec 18 12:47:57 2006
$OpenBSD: patch-src_xmlrpc_builddecomp_c,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
--- src/xmlrpc_builddecomp.c.orig Thu Mar 23 00:48:31 2006
+++ src/xmlrpc_builddecomp.c Wed Jan 16 14:20:18 2008
@@ -26,11 +26,15 @@ typedef double va_double;
** tricky fashions. We don't why Python does this, but since we're
** abusing our va_list objects in a similar fashion, we'll copy them
@ -17,7 +17,7 @@ $OpenBSD: patch-src_xmlrpc_builddecomp_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp
/*=========================================================================
** Creating XML-RPC values.
@@ -460,6 +464,7 @@ xmlrpc_build_value_va(xmlrpc_env * co
@@ -460,6 +464,7 @@ xmlrpc_build_value_va(xmlrpc_env * const envP,
if (!envP->fault_occurred)
XMLRPC_ASSERT_VALUE_OK(*valPP);
@ -25,7 +25,7 @@ $OpenBSD: patch-src_xmlrpc_builddecomp_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp
*tailP = formatCursor;
}
@@ -887,6 +892,7 @@ xmlrpc_decompose_value_va(xmlrpc_env *
@@ -887,6 +892,7 @@ xmlrpc_decompose_value_va(xmlrpc_env * const envP,
if (!envP->fault_occurred) {
XMLRPC_ASSERT(*format_copy == '\0');
}
@ -33,7 +33,7 @@ $OpenBSD: patch-src_xmlrpc_builddecomp_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp
}
@@ -925,6 +931,7 @@ xmlrpc_parse_value_va(xmlrpc_env * con
@@ -925,6 +931,7 @@ xmlrpc_parse_value_va(xmlrpc_env * const envP,
if (!envP->fault_occurred) {
XMLRPC_ASSERT(*format_copy == '\0');
}

14
net/xmlrpc-c/patches/patch-src_xmlrpc_data_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xmlrpc_data_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
--- src/xmlrpc_data.c.orig Mon Dec 18 13:32:57 2006
+++ src/xmlrpc_data.c Mon Dec 18 13:34:07 2006
@@ -288,7 +288,7 @@ xmlrpc_read_string(xmlrpc_env *
$OpenBSD: patch-src_xmlrpc_data_c,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
--- src/xmlrpc_data.c.orig Tue Jan 3 07:48:59 2006
+++ src/xmlrpc_data.c Wed Jan 16 14:20:18 2008
@@ -288,7 +288,7 @@ xmlrpc_read_string(xmlrpc_env * const envP,
if (stringValue == NULL)
xmlrpc_env_set_fault_formatted(
envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate space "
@ -10,7 +10,7 @@ $OpenBSD: patch-src_xmlrpc_data_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
else {
memcpy(stringValue, contents, length);
stringValue[length] = '\0';
@@ -419,8 +419,8 @@ xmlrpc_read_string_w(xmlrpc_env * co
@@ -419,8 +419,8 @@ xmlrpc_read_string_w(xmlrpc_env * const envP,
if (stringValue == NULL)
xmlrpc_env_set_fault_formatted(
envP, XMLRPC_INTERNAL_ERROR,
@ -21,7 +21,7 @@ $OpenBSD: patch-src_xmlrpc_data_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
else {
memcpy(stringValue, wcontents, length * sizeof(wchar_t));
stringValue[length] = '\0';
@@ -466,8 +466,8 @@ xmlrpc_read_string_w_lp(xmlrpc_env *
@@ -466,8 +466,8 @@ xmlrpc_read_string_w_lp(xmlrpc_env * const envP,
if (stringValue == NULL)
xmlrpc_env_set_fault_formatted(
envP, XMLRPC_INTERNAL_ERROR,
@ -32,7 +32,7 @@ $OpenBSD: patch-src_xmlrpc_data_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
else {
memcpy(stringValue, wcontents, size * sizeof(wchar_t));
@@ -523,8 +523,8 @@ xmlrpc_read_base64(xmlrpc_env *
@@ -523,8 +523,8 @@ xmlrpc_read_base64(xmlrpc_env * const envP,
byteStringValue = malloc(size);
if (byteStringValue == NULL)
xmlrpc_env_set_fault_formatted(

16
net/xmlrpc-c/patches/patch-src_xmlrpc_parse_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_xmlrpc_parse_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
$OpenBSD: patch-src_xmlrpc_parse_c,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
--- src/xmlrpc_parse.c.orig Thu Mar 23 00:48:31 2006
+++ src/xmlrpc_parse.c Mon Dec 18 13:41:28 2006
+++ src/xmlrpc_parse.c Wed Jan 16 14:20:18 2008
@@ -57,9 +57,9 @@
do \
if (xml_element_children_size(elem) != (count)) \
@ -14,7 +14,7 @@ $OpenBSD: patch-src_xmlrpc_parse_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
while (0)
static xml_element *
@@ -595,7 +595,8 @@ parseMethodNameElement(xmlrpc_env * con
@@ -595,7 +595,8 @@ parseMethodNameElement(xmlrpc_env * const envP,
xmlrpc_env_set_fault_formatted(
envP, XMLRPC_PARSE_ERROR,
"A <methodName> element should not have children. "
@ -24,7 +24,7 @@ $OpenBSD: patch-src_xmlrpc_parse_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
else {
const char * const cdata = xml_element_cdata(nameElemP);
@@ -654,8 +655,8 @@ parseCallChildren(xmlrpc_env * const
@@ -654,8 +655,8 @@ parseCallChildren(xmlrpc_env * const envP,
xmlrpc_env_set_fault_formatted(
envP, XMLRPC_PARSE_ERROR,
"<methodCall> has extraneous children, other than "
@ -35,7 +35,7 @@ $OpenBSD: patch-src_xmlrpc_parse_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
if (envP->fault_occurred)
xmlrpc_DECREF(*paramArrayPP);
@@ -697,8 +698,8 @@ xmlrpc_parse_call(xmlrpc_env * const
@@ -697,8 +698,8 @@ xmlrpc_parse_call(xmlrpc_env * const envP,
if (xmlLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
xmlrpc_env_set_fault_formatted(
envP, XMLRPC_LIMIT_EXCEEDED_ERROR,
@ -46,7 +46,7 @@ $OpenBSD: patch-src_xmlrpc_parse_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
else {
xml_element * callElemP;
parseCallXml(envP, xmlData, xmlLen, &callElemP);
@@ -773,8 +774,8 @@ parseFaultElement(xmlrpc_env * co
@@ -773,8 +774,8 @@ parseFaultElement(xmlrpc_env * const envP,
if (xml_element_children_size(faultElement) != 1)
xmlrpc_env_set_fault_formatted(
envP, XMLRPC_PARSE_ERROR,
@ -57,7 +57,7 @@ $OpenBSD: patch-src_xmlrpc_parse_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
else {
xml_element * const faultValueP =
xml_element_children(faultElement)[0];
@@ -869,8 +870,8 @@ parseMethodResponseElt(xmlrpc_env *
@@ -869,8 +870,8 @@ parseMethodResponseElt(xmlrpc_env * const envP,
} else
xmlrpc_env_set_fault_formatted(
envP, XMLRPC_PARSE_ERROR,
@ -68,7 +68,7 @@ $OpenBSD: patch-src_xmlrpc_parse_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
}
@@ -908,9 +909,10 @@ xmlrpc_parse_response2(xmlrpc_env * c
@@ -908,9 +909,10 @@ xmlrpc_parse_response2(xmlrpc_env * const envP,
if (xmlDataLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
xmlrpc_env_set_fault_formatted(
envP, XMLRPC_LIMIT_EXCEEDED_ERROR,

8
net/xmlrpc-c/patches/patch-src_xmlrpc_server_abyss_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_xmlrpc_server_abyss_c,v 1.1.1.1 2006/12/18 14:39:56 espie Exp $
--- src/xmlrpc_server_abyss.c.orig Mon Dec 18 13:41:53 2006
+++ src/xmlrpc_server_abyss.c Mon Dec 18 13:42:15 2006
@@ -371,7 +371,8 @@ processCall(TSession * const abys
$OpenBSD: patch-src_xmlrpc_server_abyss_c,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
--- src/xmlrpc_server_abyss.c.orig Wed Aug 30 04:59:05 2006
+++ src/xmlrpc_server_abyss.c Wed Jan 16 14:20:18 2008
@@ -371,7 +371,8 @@ processCall(TSession * const abyssSessionP,
if (contentSize > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
xmlrpc_env_set_fault_formatted(
&env, XMLRPC_LIMIT_EXCEEDED_ERROR,