add missing files to the tree

This commit is contained in:
Mario Fetka
2013-04-20 08:40:33 +02:00
parent 43478a1a04
commit 9275d8b68f
49 changed files with 65119 additions and 792 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,17 @@
diff -uNr gsoap-2.7.orig//soapcpp2/stdsoap2.cpp gsoap-2.7/soapcpp2/stdsoap2.cpp
--- gsoap-2.7.orig//soapcpp2/stdsoap2.cpp 2011-09-03 07:03:34.532000130 +0200
+++ gsoap-2.7/soapcpp2/stdsoap2.cpp 2011-09-03 07:11:26.218000131 +0200
@@ -4001,7 +4001,12 @@
{ X509_EXTENSION *ext = X509_get_ext(peer, i);
const char *ext_str = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
if (ext_str && !strcmp(ext_str, "subjectAltName"))
- { X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
+ {
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+ const X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
+#else
+ X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
+#endif
void *ext_data;
#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
const unsigned char *data;

View File

@@ -0,0 +1,63 @@
--- gsoap-2.7/soapcpp2/import/dom.h 2007-05-02 09:00:15.000000000 -0500
+++ gsoap-2.7mf/soapcpp2/import/dom.h 2007-09-30 19:10:22.000000000 -0500
@@ -69,32 +69,35 @@ file, import the dom.h file into your he
#import "dom.h"
@endcode
-By importing dom.h a special data type @ref xsd__anyType is available that
-represents a hierarchical DOM node set. The DOM node set data structure can be
-used within structs, classes, STL containers, and as arguments of service
-operations. For example:
+By importing dom.h two special data types @ref xsd__anyType and @ref
+xsd__anyAttribute are available representing a hierarchical DOM node set of
+elements and attributes, respectively. The DOM node element and attribute data
+structures can be used within structs, classes, STL containers, and as
+arguments of service operations. For example:
@code
#import "dom.h"
#import "wsu.h"
class ns__myProduct
{ public:
- @char* wsu__Id;
- _wsu__Timestamp* wsu__Timestamp;
- char* name;
- int SKU;
- double price;
- xsd__anyType* any;
- ns__myProduct();
- ~ns__myProduct();
+ @char* wsu__Id;
+ @xsd__anyAttribute atts;
+ _wsu__Timestamp* wsu__Timestamp;
+ char* name;
+ int SKU;
+ double price;
+ xsd__anyType* elts;
+ ns__myProduct();
+ ~ns__myProduct();
};
@endcode
It is important to declare the @ref xsd__anyType at the end of the struct or
-class, since the DOM parser consumes any XML element (the field name, 'any' in
+class, since the DOM parser consumes any XML element (the field name, 'elts' in
this case, is irrelavant). Thus, the other fields must be defined first to
ensure they are populated first before the DOM node set is populated with any
-non-previously matched XML element.
+non-previously matched XML element. Likewise, the @ref xsd__anyAttribute member
+should be placed after the other attributes.
Note that we also imported wsu.h as an example to show how to add a wsu:Id
attribute to a struct or class if we want to digitally sign instances, and how
@@ -625,6 +628,9 @@ The @ref soap_dom_attribute constructors
*/
-/// @brief The custom serializer for DOM nodes is represented by xsd__anyType.
+/// @brief The custom serializer for DOM element nodes is represented by xsd__anyType.
extern typedef struct soap_dom_element xsd__anyType;
+/// @brief The custom serializer for DOM attribute nodes is represented by xsd__anyAttribute.
+extern typedef struct soap_dom_attribute xsd__anyAttribute;
+

View File

@@ -0,0 +1,19 @@
--- gsoap-2.7/soapcpp2/samples/Makefile.defines 2007-04-21 20:56:38.000000000 -0500
+++ gsoap-2.7mf/soapcpp2/samples/Makefile.defines 2007-09-11 11:46:14.000000000 -0500
@@ -14,12 +14,12 @@ SOAP_FLAGS=-I$(top_srcdir)/soapcpp2/impo
SOAP_C_CLIENT=soapClient.c soapC.c
SOAP_C_SERVER=soapServer.c soapC.c
-SOAP_C_LIB=$(top_builddir)/soapcpp2/libgsoap.a
-SOAP_C_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck.a
+SOAP_C_LIB=$(top_builddir)/soapcpp2/libgsoap.la
+SOAP_C_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck.la
SOAP_CPP_CLIENT=soapClient.cpp soapC.cpp
SOAP_CPP_SERVER=soapServer.cpp soapC.cpp
-SOAP_CPP_LIB=$(top_builddir)/soapcpp2/libgsoap++.a
-SOAP_CPP_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck++.a
+SOAP_CPP_LIB=$(top_builddir)/soapcpp2/libgsoap++.la
+SOAP_CPP_LIB_CK=$(top_builddir)/soapcpp2/libgsoapck++.la

View File

@@ -0,0 +1,121 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-07-01 17:19:00 +0200
build: always use shared libraries
---
configure.in | 9 ++++-----
gsoap/Makefile.am | 32 +++++++++++++++++++-------------
gsoap/samples/autotest/Makefile.am | 2 +-
gsoap/samples/databinding/Makefile.am | 2 +-
4 files changed, 25 insertions(+), 20 deletions(-)
Index: gsoap-2.8.3/configure.in
===================================================================
--- gsoap-2.8.3.orig/configure.in
+++ gsoap-2.8.3/configure.in
@@ -16,8 +16,7 @@ AM_PROG_CC_C_O
AM_PROG_LEX
AC_PROG_YACC
AC_PROG_CPP
-AC_PROG_RANLIB
-#AC_PROG_LIBTOOL
+LT_INIT
AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_INSTALL
@@ -222,13 +221,13 @@ if test "x$with_openssl" = "xyes"; then
WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP"
WSDL2H_EXTRA_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
+ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
else
AC_MSG_RESULT(no)
WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz"
SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
+ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
fi
if test -n "$OPENSSL"; then
WSDL2H_EXTRA_FLAGS="-I${OPENSSL}/include ${WSDL2H_EXTRA_FLAGS}"
@@ -240,7 +239,7 @@ else
WSDL2H_EXTRA_FLAGS=
WSDL2H_EXTRA_LIBS=
SAMPLE_SSL_LIBS=
- WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
+ WSDL2H_SOAP_CPP_LIB="libgsoap++.la"
fi
AC_SUBST(WSDL2H_EXTRA_FLAGS)
AC_SUBST(WSDL2H_EXTRA_LIBS)
Index: gsoap-2.8.3/gsoap/Makefile.am
===================================================================
--- gsoap-2.8.3.orig/gsoap/Makefile.am
+++ gsoap-2.8.3/gsoap/Makefile.am
@@ -34,20 +34,26 @@ stdsoap2_ssl_cpp.cpp: stdsoap2.cpp
dom_cpp.cpp: dom.cpp
$(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp
-lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a
+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
-libgsoap_a_SOURCES = stdsoap2.c dom.c
-libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
-libgsoap___a_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
-libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
-libgsoapck_a_SOURCES = stdsoap2_ck.c dom.c
-libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
-libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c
-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
+libgsoap_la_SOURCES = stdsoap2.c dom.c
+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
+libgsoap_la_LDFLAGS = -release ${PACKAGE_VERSION} -version-info 0:0:0
+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
+libgsoap___la_LDFLAGS = ${libgsoap_la_LDFLAGS}
+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
+libgsoapck_la_LDFLAGS = ${libgsoap_la_LDFLAGS}
+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
+libgsoapck___la_LDFLAGS = ${libgsoap_la_LDFLAGS}
+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
+libgsoapssl_la_LDFLAGS = ${libgsoap_la_LDFLAGS}
+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
+libgsoapssl___la_LDFLAGS = ${libgsoap_la_LDFLAGS}
BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
Index: gsoap-2.8.3/gsoap/samples/autotest/Makefile.am
===================================================================
--- gsoap-2.8.3.orig/gsoap/samples/autotest/Makefile.am
+++ gsoap-2.8.3/gsoap/samples/autotest/Makefile.am
@@ -14,7 +14,7 @@ SOAP_FLAGS=-SL -T -I$(top_srcdir)/gsoap/
WSDLINPUT=$(srcdir)/examples.wsdl
SOAPHEADER=$(srcdir)/examples.h
SOAP_CPP_SRC=soapC.cpp soapServer.cpp
-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
$(SOAP_CPP_SRC) : $(WSDLINPUT)
$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
Index: gsoap-2.8.3/gsoap/samples/databinding/Makefile.am
===================================================================
--- gsoap-2.8.3.orig/gsoap/samples/databinding/Makefile.am
+++ gsoap-2.8.3/gsoap/samples/databinding/Makefile.am
@@ -14,7 +14,7 @@ SOAP_FLAGS=-2 -CS -p address -I$(top_src
WSDLINPUT=$(srcdir)/address.xsd
SOAPHEADER=$(srcdir)/address.h
SOAP_CPP_SRC=addressC.cpp
-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
$(SOAP_CPP_SRC) : $(WSDLINPUT)
$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)

View File

@@ -0,0 +1,31 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-07-01 17:19:00 +0200
src: fix invocation of undefined behavior
The int type may have a stricter alignment than buf, and as such,
using *(int *)buf is prone to undefined behavior, usually manifesting
themselves in SIGBUS.
---
gsoap/stdsoap2.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: gsoap-2.8.3/gsoap/stdsoap2.c
===================================================================
--- gsoap-2.8.3.orig/gsoap/stdsoap2.c
+++ gsoap-2.8.3/gsoap/stdsoap2.c
@@ -2946,10 +2946,12 @@ int
SOAP_FMAC2
soap_rand()
{ unsigned char buf[4];
+ int r;
if (!soap_ssl_init_done)
soap_ssl_init();
RAND_pseudo_bytes(buf, 4);
- return *(int*)buf;
+ memcpy(&r, buf, sizeof(r));
+ return r;
}
#endif
#endif

View File

@@ -0,0 +1,29 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-07-01 17:19:00 +0200
build: resolve compiler warning
An extern declaration must not be a definition.
wsdl2h.cpp:88:7: warning: 'mapfile' initialized and declared 'extern'
wsdl2h.cpp:89:7: warning: 'import_path' initialized and declared 'extern'
wsdl2h.cpp:90:7: warning: 'cwd_path' initialized and declared 'extern'
wsdl2h.cpp:91:7: warning: 'cppnamespace' initialized and declared 'extern'
---
gsoap/wsdl/wsdl2h.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: gsoap-2.8.3/gsoap/wsdl/wsdl2h.cpp
===================================================================
--- gsoap-2.8.3.orig/gsoap/wsdl/wsdl2h.cpp
+++ gsoap-2.8.3/gsoap/wsdl/wsdl2h.cpp
@@ -84,7 +84,7 @@ char *infile[MAXINFILES],
*proxy_host = NULL,
*proxy_userid = NULL,
*proxy_passwd = NULL;
-extern const char
+const char
*mapfile = WSDL_TYPEMAP_FILE,
*import_path = WSDL2H_IMPORT_PATH,
*cwd_path = NULL,

View File

@@ -0,0 +1,48 @@
diff -uNr ./gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp ../gsoap-2.8.3//gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
--- ./gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp 2011-06-24 19:48:46.000000000 -0300
+++ ../gsoap-2.8.3//gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp 2011-07-18 12:43:03.961999906 -0300
@@ -8261,7 +8261,7 @@
soap_set_recv_logfile(copy, soap->logfile[SOAP_INDEX_RECV]);
#endif
copy->local_namespaces = NULL;
- soap_set_namespaces(copy, soap->local_namespaces);
+ soap_set_namespaces(copy, soap->namespaces);
#ifdef WITH_C_LOCALE
copy->c_locale = duplocale(soap->c_locale);
#else
diff -uNr ./gsoap/stdsoap2.c ../gsoap-2.8.3//gsoap/stdsoap2.c
--- ./gsoap/stdsoap2.c 2011-06-24 19:48:46.000000000 -0300
+++ ../gsoap-2.8.3//gsoap/stdsoap2.c 2011-07-18 12:43:03.961999906 -0300
@@ -8261,7 +8261,7 @@
soap_set_recv_logfile(copy, soap->logfile[SOAP_INDEX_RECV]);
#endif
copy->local_namespaces = NULL;
- soap_set_namespaces(copy, soap->local_namespaces);
+ soap_set_namespaces(copy, soap->namespaces);
#ifdef WITH_C_LOCALE
copy->c_locale = duplocale(soap->c_locale);
#else
diff -uNr ./gsoap/stdsoap2.cpp ../gsoap-2.8.3//gsoap/stdsoap2.cpp
--- ./gsoap/stdsoap2.cpp 2011-06-24 19:48:46.000000000 -0300
+++ ../gsoap-2.8.3//gsoap/stdsoap2.cpp 2011-07-18 12:43:03.961999906 -0300
@@ -8261,7 +8261,7 @@
soap_set_recv_logfile(copy, soap->logfile[SOAP_INDEX_RECV]);
#endif
copy->local_namespaces = NULL;
- soap_set_namespaces(copy, soap->local_namespaces);
+ soap_set_namespaces(copy, soap->namespaces);
#ifdef WITH_C_LOCALE
copy->c_locale = duplocale(soap->c_locale);
#else
diff -uNr ./gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp ../gsoap-2.8.3//gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
--- ./gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp 2011-06-24 19:48:46.000000000 -0300
+++ ../gsoap-2.8.3//gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp 2011-07-18 12:43:03.961999906 -0300
@@ -8261,7 +8261,7 @@
soap_set_recv_logfile(copy, soap->logfile[SOAP_INDEX_RECV]);
#endif
copy->local_namespaces = NULL;
- soap_set_namespaces(copy, soap->local_namespaces);
+ soap_set_namespaces(copy, soap->namespaces);
#ifdef WITH_C_LOCALE
copy->c_locale = duplocale(soap->c_locale);
#else