add new gsoap with fix for ifolder
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@2838 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
17
net-libs/gsoap/files/gsoap-2.7-fedora-openssl.patch
Normal file
17
net-libs/gsoap/files/gsoap-2.7-fedora-openssl.patch
Normal file
@@ -0,0 +1,17 @@
|
||||
diff -up gsoap-2.7/gsoap/stdsoap2.cpp.openssl gsoap-2.7/gsoap/stdsoap2.cpp
|
||||
--- gsoap-2.7/gsoap/stdsoap2.cpp.openssl 2008-10-02 19:36:28.000000000 +0200
|
||||
+++ gsoap-2.7/gsoap/stdsoap2.cpp 2009-08-22 22:20:49.000000000 +0200
|
||||
@@ -4153,7 +4153,12 @@ again:
|
||||
{ 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;
|
||||
98
net-libs/gsoap/files/gsoap-2.7-fix-pre-iso-headers.patch
Normal file
98
net-libs/gsoap/files/gsoap-2.7-fix-pre-iso-headers.patch
Normal file
@@ -0,0 +1,98 @@
|
||||
--- gsoap/samples/factorytest/factorytest.cpp.orig 2009-03-04 01:16:22.300484305 +0100
|
||||
+++ gsoap/samples/factorytest/factorytest.cpp 2009-03-04 01:15:47.656485143 +0100
|
||||
@@ -49,7 +49,7 @@
|
||||
#include "soapH.h"
|
||||
#include "factorytest.nsmap"
|
||||
|
||||
-#include <iostream.h>
|
||||
+#include <iostream>
|
||||
|
||||
// default factory service endpoint:
|
||||
const char *factory = "http://localhost:18085";
|
||||
@@ -167,7 +167,7 @@
|
||||
int main(int argc, char **argv)
|
||||
{ if (argc > 1)
|
||||
factory = argv[1]; // use factory from command line arg by default
|
||||
- cout << "Connecting to factory " << factory << endl;
|
||||
+ std::cout << "Connecting to factory " << factory << std::endl;
|
||||
Adder adder; // create unique new remote adder object
|
||||
Counter counter1("myCounter"); // new counter object "myCounter" (created if not exists)
|
||||
Counter counter2("myCounter"); // lookup and use counter "myCounter" (this is an alias to counter1!)
|
||||
@@ -175,22 +175,22 @@
|
||||
counter1.set(adder.get());
|
||||
adder.add(3.0);
|
||||
counter1.inc();
|
||||
- cout << "Adder=" << adder.get() << endl;
|
||||
- cout << "Counter=" << counter2.get() << endl; // counter2 is an alias for counter1 so this prints the value of counter1
|
||||
- cout << "Sleep for 90 seconds to test factory server purging objects:" << endl;
|
||||
+ std::cout << "Adder=" << adder.get() << std::endl;
|
||||
+ std::cout << "Counter=" << counter2.get() << std::endl; // counter2 is an alias for counter1 so this prints the value of counter1
|
||||
+ std::cout << "Sleep for 90 seconds to test factory server purging objects:" << std::endl;
|
||||
// counter is periodically incremented which keeps it alive
|
||||
sleep(30);
|
||||
counter1.inc();
|
||||
- cout << "Counter=" << counter2.get() << endl;
|
||||
+ std::cout << "Counter=" << counter2.get() << std::endl;
|
||||
sleep(30);
|
||||
counter1.inc();
|
||||
- cout << "Counter=" << counter2.get() << endl;
|
||||
+ std::cout << "Counter=" << counter2.get() << std::endl;
|
||||
sleep(30);
|
||||
counter1.inc();
|
||||
- cout << "Counter=" << counter2.get() << endl;
|
||||
+ std::cout << "Counter=" << counter2.get() << std::endl;
|
||||
// after 90 secs, the adder should be gone
|
||||
- cout << "Adder is no longer available:" << endl;
|
||||
+ std::cout << "Adder is no longer available:" << std::endl;
|
||||
adder.add(3.0);
|
||||
- cout << "Adder status = " << adder.status << endl;
|
||||
+ std::cout << "Adder status = " << adder.status << std::endl;
|
||||
return 0;
|
||||
}
|
||||
--- gsoap/samples/lu/luclient.cpp.orig 2009-03-04 01:16:48.632483467 +0100
|
||||
+++ gsoap/samples/lu/luclient.cpp 2009-03-04 01:17:54.550483188 +0100
|
||||
@@ -32,7 +32,7 @@
|
||||
*/
|
||||
|
||||
#include "soapH.h"
|
||||
-#include <iostream.h>
|
||||
+#include <iostream>
|
||||
|
||||
const char luserver[] = "http://websrv.cs.fsu.edu/~engelen/luserver.cgi";
|
||||
|
||||
@@ -51,14 +51,14 @@
|
||||
a[3].resize(2,3); // 2-element vector indexed from 2 to 3
|
||||
a[3][2] = 1;
|
||||
a[3][3] = 2;
|
||||
- cout << "* Demonstration example *" << endl;
|
||||
- cout << "Matrix:" << endl;
|
||||
+ std::cout << "* Demonstration example *" << std::endl;
|
||||
+ std::cout << "Matrix:" << std::endl;
|
||||
a.print();
|
||||
vector b(soap, 3);
|
||||
b[1] = 1;
|
||||
b[2] = 2;
|
||||
b[3] = 3;
|
||||
- cout << "Vector:" << endl;
|
||||
+ std::cout << "Vector:" << std::endl;
|
||||
b.print();
|
||||
vector x(soap);
|
||||
if (argc < 2)
|
||||
@@ -71,7 +71,7 @@
|
||||
soap_print_fault_location(soap, stderr);
|
||||
}
|
||||
else
|
||||
- { cout << "Solution vector from service:" << endl;
|
||||
+ { std::cout << "Solution vector from service:" << std::endl;
|
||||
x.print();
|
||||
}
|
||||
matrix a1(soap);
|
||||
@@ -80,7 +80,7 @@
|
||||
soap_print_fault_location(soap, stderr);
|
||||
}
|
||||
else
|
||||
- { cout << "Inverse matrix matrix from service:" << endl;
|
||||
+ { std::cout << "Inverse matrix matrix from service:" << std::endl;
|
||||
a1.print();
|
||||
}
|
||||
soap_destroy(soap);
|
||||
@@ -0,0 +1,12 @@
|
||||
--- gsoap-2.7/gsoap/Makefile.am 2008-01-27 15:02:36.000000000 -0600
|
||||
+++ gsoap-2.7mf/gsoap/Makefile.am 2008-01-28 10:24:26.000000000 -0600
|
||||
@@ -12,6 +12,9 @@ CLEANFILES=soapcpp2 stdsoap2_cpp.cpp std
|
||||
AM_CXXFLAGS=$(SOAPCPP2_DEBUG) -D$(platform)
|
||||
AM_CFLAGS=$(SOAPCPP2_DEBUG) -D$(platform)
|
||||
|
||||
+# Install all soapcpp2 and wsdl2h files into /usr/share/gsoap
|
||||
+nobase_pkgdata_DATA = import/* plugin/* WS/* custom/* extras/*
|
||||
+
|
||||
## we cannot build stdsoap2.o from 2 different sources (stdsoap2.cpp and stdsoap2.c), so we need an intermediate target:
|
||||
stdsoap2_ck.c: stdsoap2.cpp
|
||||
$(LN_S) $(srcdir)/stdsoap2.cpp stdsoap2_ck.c
|
||||
101
net-libs/gsoap/files/gsoap-2.7.15-use_libtool.patch
Normal file
101
net-libs/gsoap/files/gsoap-2.7.15-use_libtool.patch
Normal file
@@ -0,0 +1,101 @@
|
||||
diff -Naur gsoap-2.7.orig/configure.in gsoap-2.7/configure.in
|
||||
--- gsoap-2.7.orig/configure.in 2010-03-04 10:04:10.879898902 +0100
|
||||
+++ gsoap-2.7/configure.in 2010-03-04 10:04:57.182889612 +0100
|
||||
@@ -15,8 +15,8 @@
|
||||
AM_PROG_LEX
|
||||
AC_PROG_YACC
|
||||
AC_PROG_CPP
|
||||
-AC_PROG_RANLIB
|
||||
-#AC_PROG_LIBTOOL
|
||||
+#AC_PROG_RANLIB
|
||||
+AC_PROG_LIBTOOL
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_AWK
|
||||
AC_PROG_INSTALL
|
||||
@@ -158,12 +158,12 @@
|
||||
AC_MSG_RESULT(no)
|
||||
WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
|
||||
WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz"
|
||||
- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
|
||||
+ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
|
||||
else
|
||||
AC_MSG_RESULT(yes)
|
||||
WSDL2H_EXTRA_FLAGS=
|
||||
WSDL2H_EXTRA_LIBS=
|
||||
- WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
|
||||
+ WSDL2H_SOAP_CPP_LIB="libgsoap++.la"
|
||||
fi
|
||||
AC_SUBST(WSDL2H_EXTRA_FLAGS)
|
||||
AC_SUBST(WSDL2H_EXTRA_LIBS)
|
||||
diff -Naur gsoap-2.7.orig/gsoap/Makefile.am gsoap-2.7/gsoap/Makefile.am
|
||||
--- gsoap-2.7.orig/gsoap/Makefile.am 2010-03-04 10:04:10.920894818 +0100
|
||||
+++ gsoap-2.7/gsoap/Makefile.am 2010-03-04 10:06:28.000883644 +0100
|
||||
@@ -31,20 +31,20 @@
|
||||
stdsoap2_ssl_cpp.cpp: stdsoap2.cpp
|
||||
$(LN_S) -f $(srcdir)/stdsoap2.cpp stdsoap2_ssl_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
|
||||
-libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
|
||||
-libgsoap___a_SOURCES = stdsoap2_cpp.cpp
|
||||
-libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
|
||||
-libgsoapck_a_SOURCES = stdsoap2_ck.c
|
||||
-libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
|
||||
-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp
|
||||
-libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
|
||||
-libgsoapssl_a_SOURCES = stdsoap2_ssl.c
|
||||
-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
|
||||
-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp
|
||||
-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
|
||||
+libgsoap_la_SOURCES = stdsoap2.c
|
||||
+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
|
||||
+libgsoap___la_SOURCES = stdsoap2_cpp.cpp
|
||||
+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform)
|
||||
+libgsoapck_la_SOURCES = stdsoap2_ck.c
|
||||
+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
|
||||
+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp
|
||||
+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_COOKIES
|
||||
+libgsoapssl_la_SOURCES = stdsoap2_ssl.c
|
||||
+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
|
||||
+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp
|
||||
+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) -D$(platform) -DWITH_OPENSSL -DWITH_DOM -DWITH_GZIP
|
||||
|
||||
BUILT_SOURCES = stdsoap2_cpp.cpp $(lib_LIBRARIES)
|
||||
|
||||
diff -Naur gsoap-2.7.orig/gsoap/samples/databinding/Makefile.am gsoap-2.7/gsoap/samples/databinding/Makefile.am
|
||||
--- gsoap-2.7.orig/gsoap/samples/databinding/Makefile.am 2010-03-04 10:04:10.945913061 +0100
|
||||
+++ gsoap-2.7/gsoap/samples/databinding/Makefile.am 2010-03-04 10:13:18.323885257 +0100
|
||||
@@ -14,7 +14,7 @@
|
||||
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)
|
||||
diff -Naur gsoap-2.7.orig/gsoap/samples/Makefile.defines gsoap-2.7/gsoap/samples/Makefile.defines
|
||||
--- gsoap-2.7.orig/gsoap/samples/Makefile.defines 2010-03-04 10:04:10.933894722 +0100
|
||||
+++ gsoap-2.7/gsoap/samples/Makefile.defines 2010-03-04 10:11:37.388944663 +0100
|
||||
@@ -15,13 +15,13 @@
|
||||
SOAP_C_CORE=soapC.c
|
||||
SOAP_C_CLIENT=soapClient.c $(SOAP_C_CORE)
|
||||
SOAP_C_SERVER=soapServer.c $(SOAP_C_CORE)
|
||||
-SOAP_C_LIB=$(top_builddir)/gsoap/libgsoap.a
|
||||
-SOAP_C_LIB_CK=$(top_builddir)/gsoap/libgsoapck.a
|
||||
-SOAP_C_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl.a
|
||||
+SOAP_C_LIB=$(top_builddir)/gsoap/libgsoap.la
|
||||
+SOAP_C_LIB_CK=$(top_builddir)/gsoap/libgsoapck.la
|
||||
+SOAP_C_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl.la
|
||||
|
||||
SOAP_CPP_CORE=soapC.cpp
|
||||
SOAP_CPP_CLIENT=soapClient.cpp $(SOAP_CPP_CORE)
|
||||
SOAP_CPP_SERVER=soapServer.cpp $(SOAP_CPP_CORE)
|
||||
-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
|
||||
-SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.a
|
||||
-SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.a
|
||||
+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
|
||||
+SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.la
|
||||
+SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.la
|
||||
Reference in New Issue
Block a user