diff --git a/.cvsignore b/.cvsignore index 946f665..bd7d924 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -gsoap_2.7.9l.tar.gz -import_dom_h-2.7.9l.patch +gsoap_2.7.10.tar.gz diff --git a/datadir_importpath-2.7.10.patch b/datadir_importpath-2.7.10.patch new file mode 100644 index 0000000..0a2346c --- /dev/null +++ b/datadir_importpath-2.7.10.patch @@ -0,0 +1,20 @@ +--- gsoap-2.7/configure.in 2008-01-27 15:02:36.000000000 -0600 ++++ gsoap-2.7mf/configure.in 2008-01-28 10:57:13.000000000 -0600 +@@ -115,13 +115,13 @@ fi + AC_SUBST(SOAPCPP2_DEBUG) + + dnl set the default soapcpp2 import path +-# SOAPCPP2_IMPORTPATH="-DSOAPCPP_IMPORT_PATH=\"\\\"${datadir}/gsoap/import\\\"\"" +-SOAPCPP2_IMPORTPATH="-DSOAPCPP2_IMPORT_PATH=\"\\\"`pwd`/gsoap/import\\\"\"" ++SOAPCPP2_IMPORTPATH="-DSOAPCPP_IMPORT_PATH=\"\\\"${datadir}/gsoap/import\\\"\"" ++#SOAPCPP2_IMPORTPATH="-DSOAPCPP2_IMPORT_PATH=\"\\\"`pwd`/gsoap/import\\\"\"" + AC_SUBST(SOAPCPP2_IMPORTPATH) + + dnl set the default wsdl2h import path +-# WSDL2H_IMPORTPATH="-DWSDL_IMPORT_PATH=\"\\\"${datadir}/gsoap/WS\\\"\"" +-WSDL2H_IMPORTPATH="-DWSDL2H_IMPORT_PATH=\"\\\"`pwd`/gsoap/WS\\\"\"" ++WSDL2H_IMPORTPATH="-DWSDL_IMPORT_PATH=\"\\\"${datadir}/gsoap/WS\\\"\"" ++#WSDL2H_IMPORTPATH="-DWSDL2H_IMPORT_PATH=\"\\\"`pwd`/gsoap/WS\\\"\"" + AC_SUBST(WSDL2H_IMPORTPATH) + + dnl the disable-namespaces option adds the -DWITH_NONAMESPACES to the diff --git a/gsoap.spec b/gsoap.spec index cba01fa..c930307 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -1,22 +1,28 @@ Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++ Name: gsoap -Version: 2.7.9 -Release: 0.3.l +Version: 2.7.10 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools URL: http://gsoap2.sourceforge.net -Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.9l.tar.gz -Patch0: http://grid.et.redhat.com/files/autotools_update-2.7.9k.patch -Patch1: http://grid.et.redhat.com/files/makefile_defines-2.7.9k.patch -Patch2: http://grid.et.redhat.com/files/tru64_hp_ux_cpp-2.7.9k.patch -Patch3: http://grid.et.redhat.com/files/tru64_hp_ux_c-2.7.9k.patch -Patch4: http://grid.et.redhat.com/files/import_dom_h-2.7.9l.patch -#Patch5: http://grid.et.redhat.com/files/anonymous_server_and_client-2.7.9k.patch +Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.10.tar.gz +Patch0: datadir_importpath-2.7.10.patch +Patch1: use_libtool-2.7.10.patch +Patch2: tru64_hp_ux_cpp-2.7.10.patch +Patch3: tru64_hp_ux_c-2.7.10.patch +Patch4: install_soapcpp2_wsdl2h_aux-2.7.10.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + BuildRequires: flex BuildRequires: bison -BuildRequires: dos2unix BuildRequires: findutils +BuildRequires: dos2unix +BuildRequires: openssl-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool + +Requires: openssl %description @@ -37,24 +43,13 @@ gSOAP libraries, headers and generators for linking with and creating gSOAP generated stubs -#%package static -#Summary: Static libraries for linking with gSOAP generated stubs -#Group: Development/System -#Requires: %name = %version-%release - - -#%description static -#Static gSOAP libraries for linking with gSOAP generated stubs - - %prep %setup -q -n gsoap-2.7 -# update the autotool generated scripts to something more current, and -# enable libtool support +# use ${datadir}, not `pwd`, when setting *_IMPORT_PATH locations %patch0 -p1 -# update Makefile.defines to let samples use libtool +# enable use of libtool in configure.in and a few Makefile.am files %patch1 -p1 # update stdsoap2.c/pp to better identify the need for hostent_data @@ -62,21 +57,22 @@ gSOAP generated stubs %patch2 -p1 %patch3 -p1 -# gsoap 2.7.9l's import/dom.h was missing xsd__anyAttribute definitions +# update gsoap/Makefile.am so that it installs gsoap/import, +# gsoap/plugin, gsoap/WS, gsoap/custom and gsoap/extras into +# ${prefix}/share/gsoap %patch4 -p1 # a number of ~ files are distribute, but we do not want them find . -name "*~" -exec rm {} \; -# pre-generated Makefiles abound, kill them -find . -name "Makefile" -exec rm {} \; - -# stdsoap2_cpp.cpp is generated by soapcpp2/Makefile, and should not -# exist in the distributed source -rm soapcpp2/stdsoap2_cpp.cpp +# we want all txt files to have unix end-of-line encoding +dos2unix README.txt LICENSE.txt NOTES.txt %build +# patches change autoconf and automake files, so we must reconfigure +autoreconf --install --force + %configure --disable-namespaces --disable-static --prefix=/usr # dependencies are not declared properly @@ -96,20 +92,13 @@ make #chmod a-x soapcpp2/samples/ssl/root.sh #chmod a-x soapcpp2/samples/ssl/cacerts.pem -# we want all txt files to have unix end-of-line encoding -dos2unix soapcpp2/README.txt -dos2unix soapcpp2/NOTES.txt -#dos2unix soapcpp2/samples/README.txt -#dos2unix soapcpp2/samples/gpl.txt - %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -mkdir -p %{buildroot}/%_datadir/gsoap -cp -r soapcpp2/import %{buildroot}/%_datadir/gsoap rm -f %{buildroot}/%_libdir/*.la + %clean rm -rf %{buildroot} @@ -120,7 +109,7 @@ make check %files %defattr(-,root,root,-) -%doc soapcpp2/README.txt soapcpp2/NOTES.txt +%doc README.txt NOTES.txt LICENSE.txt %_libdir/libgsoapck.so.0 %_libdir/libgsoapck++.so.0 %_libdir/libgsoapck.so.0.0.0 @@ -137,7 +126,7 @@ make check %files devel %defattr(-,root,root,-) -%doc soapcpp2/README.txt soapcpp2/NOTES.txt +%doc README.txt NOTES.txt LICENSE.txt %_bindir/soapcpp2 %_bindir/wsdl2h %_libdir/libgsoapck.so @@ -180,6 +169,76 @@ make check %_datadir/gsoap/import/xmlmime5.h %_datadir/gsoap/import/xmlmime.h %_datadir/gsoap/import/xop.h +%dir %_datadir/gsoap/WS +%_datadir/gsoap/WS/README.txt +%_datadir/gsoap/WS/WS-Addressing.xsd +%_datadir/gsoap/WS/WS-Addressing03.xsd +%_datadir/gsoap/WS/WS-Addressing04.xsd +%_datadir/gsoap/WS/WS-Addressing05.xsd +%_datadir/gsoap/WS/WS-Discovery.wsdl +%_datadir/gsoap/WS/WS-Enumeration.wsdl +%_datadir/gsoap/WS/WS-Policy.xsd +%_datadir/gsoap/WS/WS-Routing.xsd +%_datadir/gsoap/WS/WS-typemap.dat +%_datadir/gsoap/WS/discovery.xsd +%_datadir/gsoap/WS/ds.xsd +%_datadir/gsoap/WS/enumeration.xsd +%_datadir/gsoap/WS/typemap.dat +%_datadir/gsoap/WS/wsse.xsd +%_datadir/gsoap/WS/wsu.xsd +%dir %_datadir/gsoap/custom +%_datadir/gsoap/custom/README.txt +%_datadir/gsoap/custom/long_double.c +%_datadir/gsoap/custom/long_double.h +%_datadir/gsoap/custom/struct_timeval.c +%_datadir/gsoap/custom/struct_timeval.h +%_datadir/gsoap/custom/struct_tm.c +%_datadir/gsoap/custom/struct_tm.h +%dir %_datadir/gsoap/extras +%_datadir/gsoap/extras/README.txt +%_datadir/gsoap/extras/ckdb.c +%_datadir/gsoap/extras/ckdb.h +%_datadir/gsoap/extras/ckdbtest.c +%_datadir/gsoap/extras/ckdbtest.h +%_datadir/gsoap/extras/fault.cpp +%_datadir/gsoap/extras/logging.cpp +%_datadir/gsoap/extras/soapdefs.h +%dir %_datadir/gsoap/plugin +%_datadir/gsoap/plugin/README.txt +%_datadir/gsoap/plugin/cacerts.c +%_datadir/gsoap/plugin/cacerts.h +%_datadir/gsoap/plugin/httpda.c +%_datadir/gsoap/plugin/httpda.h +%_datadir/gsoap/plugin/httpdatest.c +%_datadir/gsoap/plugin/httpdatest.h +%_datadir/gsoap/plugin/httpform.c +%_datadir/gsoap/plugin/httpform.h +%_datadir/gsoap/plugin/httpget.c +%_datadir/gsoap/plugin/httpget.h +%_datadir/gsoap/plugin/httpgettest.c +%_datadir/gsoap/plugin/httpgettest.h +%_datadir/gsoap/plugin/httpmd5.c +%_datadir/gsoap/plugin/httpmd5.h +%_datadir/gsoap/plugin/httpmd5test.c +%_datadir/gsoap/plugin/httpmd5test.h +%_datadir/gsoap/plugin/httppost.c +%_datadir/gsoap/plugin/httppost.h +%_datadir/gsoap/plugin/logging.c +%_datadir/gsoap/plugin/logging.h +%_datadir/gsoap/plugin/md5evp.c +%_datadir/gsoap/plugin/md5evp.h +%_datadir/gsoap/plugin/plugin.c +%_datadir/gsoap/plugin/plugin.h +%_datadir/gsoap/plugin/smdevp.c +%_datadir/gsoap/plugin/smdevp.h +%_datadir/gsoap/plugin/threads.c +%_datadir/gsoap/plugin/threads.h +%_datadir/gsoap/plugin/wsaapi.c +%_datadir/gsoap/plugin/wsaapi.h +%_datadir/gsoap/plugin/wsse2api.c +%_datadir/gsoap/plugin/wsse2api.h +%_datadir/gsoap/plugin/wsseapi.c +%_datadir/gsoap/plugin/wsseapi.h %_libdir/pkgconfig/gsoapck.pc %_libdir/pkgconfig/gsoapck++.pc %_libdir/pkgconfig/gsoap.pc @@ -188,17 +247,6 @@ make check %_libdir/pkgconfig/gsoapssl++.pc -#%files static -#%defattr(-,root,root,-) -#%doc soapcpp2/README.txt soapcpp2/NOTES.txt soapcpp2/samples/ -#%_libdir/libgsoap.a -#%_libdir/libgsoap++.a -#%_libdir/libgsoapck.a -#%_libdir/libgsoapck++.a -#%_libdir/libgsoapssl.a -#%_libdir/libgsoapssl++.a - - %post -p /sbin/ldconfig @@ -206,6 +254,31 @@ make check %changelog +* Sun Jan 27 2008 - 2.7.10-1 +- Upgraded to 2.7.10 release +- Stopped hosting patches on grid.et.redhat.com +- Removed import_dom_h patch, it was integrated +- Removed large autotools patch, replaced with patch + (use_libtool-2.7.10.patch) changing configure.in, gsoap/Makefile.am + and gsoap/wsdl/Makefile.am, which enable libtool use, and a + call to autoreconf +- Changed soapcpp2 references to gsoap as per new layout of source + distribution +- Updated tru64_hp_up_c/pp patches to handle new source layout +- Install of soapcpp2/import with cp removed in favor of a patch to + gsoap/Makefile.am (install_soapcpp2_wsdl2h_aux-2.7.10.patch) +- No pre-generated Makefiles are distributed, no longer removing them +- stdsoap2_cpp.cpp not in distribution, no longer removing it +- Added datadir_importpath-2.7.10.patch to set SOAPCPP2_IMPORT_PATH + and WSDL2H_IMPORT_PATH, useful defaults, using ${datadir} instead of + `pwd` +- Added autoconf, automake and libtool to BuildRequires, because + configure.in and gsoap/Makefile.am are patched +- Added ?dist to Release + +* Fri Nov 30 2007 - 2.7.9-0.4.l +- Added OpenSSL requirement + * Tue Nov 27 2007 - 2.7.9-0.3.l - Decided soapcpp2/import/ files should be in /usr/share instead of /usr/include because they are not really headers gcc can diff --git a/install_soapcpp2_wsdl2h_aux-2.7.10.patch b/install_soapcpp2_wsdl2h_aux-2.7.10.patch new file mode 100644 index 0000000..673deb1 --- /dev/null +++ b/install_soapcpp2_wsdl2h_aux-2.7.10.patch @@ -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 diff --git a/makefile_defines-2.7.9k.patch b/makefile_defines-2.7.9k.patch deleted file mode 100644 index 4972f8d..0000000 --- a/makefile_defines-2.7.9k.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 - - diff --git a/sources b/sources index e1037b2..c821d1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9bd21c4f8fe4ffa9ee6cd5f05ea3b65a gsoap_2.7.9l.tar.gz +31ac50314900d87c43f8f008c8de712f gsoap_2.7.10.tar.gz diff --git a/tru64_hp_ux_c-2.7.10.patch b/tru64_hp_ux_c-2.7.10.patch new file mode 100644 index 0000000..8d3fa30 --- /dev/null +++ b/tru64_hp_ux_c-2.7.10.patch @@ -0,0 +1,31 @@ +--- gsoap-2.7/gsoap/stdsoap2.c 2007-08-21 21:24:33.000000000 -0500 ++++ gsoap-2.7mf/gsoap/stdsoap2.c 2007-09-13 12:13:56.000000000 -0500 +@@ -3405,7 +3405,7 @@ tcp_gethost(struct soap *soap, const cha + /* inet_addr(), and hostGetByName() expect "char *"; addr is a "const char *". */ + iadd = inet_addr((char*)addr); + #else +-#if defined(_AIX43) || defined(TRU64) ++#if defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) + struct hostent_data ht_data; + #endif + #ifdef AS400 +@@ -3421,7 +3421,7 @@ tcp_gethost(struct soap *soap, const cha + #if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) + if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0) + host = NULL; +-#elif defined(_AIX43) || defined(TRU64) ++#elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) + memset((void*)&ht_data, 0, sizeof(ht_data)); + if (gethostbyname_r(addr, &hostent, &ht_data) < 0) + { host = NULL; +@@ -3463,6 +3463,10 @@ tcp_gethost(struct soap *soap, const cha + #endif + + /******************************************************************************/ ++#if defined(HP_UX) && defined(HAVE_GETHOSTBYNAME_R) ++extern int h_errno; ++#endif ++ + #ifndef WITH_NOIO + #ifndef PALM_1 + static SOAP_SOCKET diff --git a/tru64_hp_ux_c-2.7.9k.patch b/tru64_hp_ux_c-2.7.9k.patch deleted file mode 100644 index d8f2ec5..0000000 --- a/tru64_hp_ux_c-2.7.9k.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- gsoap-2.7/soapcpp2/stdsoap2.c 2007-08-21 21:24:33.000000000 -0500 -+++ gsoap-2.7mf/soapcpp2/stdsoap2.c 2007-09-13 12:13:56.000000000 -0500 -@@ -3405,7 +3405,7 @@ tcp_gethost(struct soap *soap, const cha - /* inet_addr(), and hostGetByName() expect "char *"; addr is a "const char *". */ - iadd = inet_addr((char*)addr); - #else --#if defined(_AIX43) || defined(TRU64) -+#if defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) - struct hostent_data ht_data; - #endif - #ifdef AS400 -@@ -3421,7 +3421,7 @@ tcp_gethost(struct soap *soap, const cha - #if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) - if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0) - host = NULL; --#elif defined(_AIX43) || defined(TRU64) -+#elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) - memset((void*)&ht_data, 0, sizeof(ht_data)); - if (gethostbyname_r(addr, &hostent, &ht_data) < 0) - { host = NULL; -@@ -3463,6 +3463,10 @@ tcp_gethost(struct soap *soap, const cha - #endif - - /******************************************************************************/ -+#if defined(HP_UX) && defined(HAVE_GETHOSTBYNAME_R) -+extern int h_errno; -+#endif -+ - #ifndef WITH_NOIO - #ifndef PALM_1 - static SOAP_SOCKET diff --git a/tru64_hp_ux_cpp-2.7.10.patch b/tru64_hp_ux_cpp-2.7.10.patch new file mode 100644 index 0000000..3d1e345 --- /dev/null +++ b/tru64_hp_ux_cpp-2.7.10.patch @@ -0,0 +1,31 @@ +--- gsoap-2.7/gsoap/stdsoap2.cpp 2007-08-21 21:24:33.000000000 -0500 ++++ gsoap-2.7mf/gsoap/stdsoap2.cpp 2007-09-13 12:13:56.000000000 -0500 +@@ -3405,7 +3405,7 @@ tcp_gethost(struct soap *soap, const cha + /* inet_addr(), and hostGetByName() expect "char *"; addr is a "const char *". */ + iadd = inet_addr((char*)addr); + #else +-#if defined(_AIX43) || defined(TRU64) ++#if defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) + struct hostent_data ht_data; + #endif + #ifdef AS400 +@@ -3421,7 +3421,7 @@ tcp_gethost(struct soap *soap, const cha + #if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) + if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0) + host = NULL; +-#elif defined(_AIX43) || defined(TRU64) ++#elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) + memset((void*)&ht_data, 0, sizeof(ht_data)); + if (gethostbyname_r(addr, &hostent, &ht_data) < 0) + { host = NULL; +@@ -3463,6 +3463,10 @@ tcp_gethost(struct soap *soap, const cha + #endif + + /******************************************************************************/ ++#if defined(HP_UX) && defined(HAVE_GETHOSTBYNAME_R) ++extern int h_errno; ++#endif ++ + #ifndef WITH_NOIO + #ifndef PALM_1 + static SOAP_SOCKET diff --git a/tru64_hp_ux_cpp-2.7.9k.patch b/tru64_hp_ux_cpp-2.7.9k.patch deleted file mode 100644 index f668391..0000000 --- a/tru64_hp_ux_cpp-2.7.9k.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- gsoap-2.7/soapcpp2/stdsoap2.cpp 2007-08-21 21:24:33.000000000 -0500 -+++ gsoap-2.7mf/soapcpp2/stdsoap2.cpp 2007-09-13 12:13:56.000000000 -0500 -@@ -3405,7 +3405,7 @@ tcp_gethost(struct soap *soap, const cha - /* inet_addr(), and hostGetByName() expect "char *"; addr is a "const char *". */ - iadd = inet_addr((char*)addr); - #else --#if defined(_AIX43) || defined(TRU64) -+#if defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) - struct hostent_data ht_data; - #endif - #ifdef AS400 -@@ -3421,7 +3421,7 @@ tcp_gethost(struct soap *soap, const cha - #if defined(__GLIBC__) || (defined(HAVE_GETHOSTBYNAME_R) && (defined(FREEBSD) || defined(__FreeBSD__))) - if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0) - host = NULL; --#elif defined(_AIX43) || defined(TRU64) -+#elif defined(_AIX43) || ((defined(TRU64) || defined(HP_UX)) && defined(HAVE_GETHOSTBYNAME_R)) - memset((void*)&ht_data, 0, sizeof(ht_data)); - if (gethostbyname_r(addr, &hostent, &ht_data) < 0) - { host = NULL; -@@ -3463,6 +3463,10 @@ tcp_gethost(struct soap *soap, const cha - #endif - - /******************************************************************************/ -+#if defined(HP_UX) && defined(HAVE_GETHOSTBYNAME_R) -+extern int h_errno; -+#endif -+ - #ifndef WITH_NOIO - #ifndef PALM_1 - static SOAP_SOCKET diff --git a/use_libtool-2.7.10.patch b/use_libtool-2.7.10.patch new file mode 100644 index 0000000..f5c3aed --- /dev/null +++ b/use_libtool-2.7.10.patch @@ -0,0 +1,69 @@ +diff -r -upN gsoap-2.7/configure.in gsoap-2.7mf/configure.in +--- gsoap-2.7/configure.in 2008-01-27 15:02:36.000000000 -0600 ++++ gsoap-2.7mf/configure.in 2008-01-28 12:17:19.000000000 -0600 +@@ -15,7 +15,7 @@ AC_PROG_CC + AM_PROG_LEX + AC_PROG_YACC + AC_PROG_CPP +-AC_PROG_RANLIB ++AM_PROG_LIBTOOL + AC_PROG_LN_S + AC_PROG_AWK + AC_PROG_INSTALL +diff -r -upN gsoap-2.7/gsoap/Makefile.am gsoap-2.7mf/gsoap/Makefile.am +--- gsoap-2.7/gsoap/Makefile.am 2008-01-27 15:02:36.000000000 -0600 ++++ gsoap-2.7mf/gsoap/Makefile.am 2008-01-28 12:03:16.000000000 -0600 +@@ -3,7 +3,7 @@ + ## you have all needed files, that a GNU package needs + AUTOMAKE_OPTIONS = foreign 1.4 + +-SUBDIRS=src wsdl @SAMPLE_DIRS@ ++SUBDIRS=. src wsdl @SAMPLE_DIRS@ + CLEANFILES=soapcpp2 stdsoap2_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp + + ## *~ *.req.xml *.res.xml *.nsmap *.wsdl *.xsd *Proxy.h \ +@@ -28,19 +28,19 @@ stdsoap2_ssl.c: stdsoap2.cpp + stdsoap2_ssl_cpp.cpp: stdsoap2.cpp + $(LN_S) $(srcdir)/stdsoap2.cpp stdsoap2_ssl_cpp.cpp + +-lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a +-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 ++lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la ++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 -r -upN gsoap-2.7/gsoap/wsdl/Makefile.am gsoap-2.7mf/gsoap/wsdl/Makefile.am +--- gsoap-2.7/gsoap/wsdl/Makefile.am 2008-01-27 15:02:34.000000000 -0600 ++++ gsoap-2.7mf/gsoap/wsdl/Makefile.am 2008-01-28 12:05:10.000000000 -0600 +@@ -8,7 +8,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 + INCLUDES=-I$(top_srcdir)/gsoap + LDFLAGS=$(INCLUDES) -L$(srcdir) + SOAP=$(top_builddir)/gsoap/src/soapcpp2 +-SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.a ++SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.la + SOAP_CPP_SRC=wsdlC.cpp + SOAPHEADER=$(srcdir)/wsdl.h + SOAP_FLAGS=-SC -pwsdl -I../import