[gsoap] Update to gsoap 2.8.4 Drop gsoap-ipv6.patch implemented upstream Link gsoap SSL shared libraries wit
Mattias Ellert
ellert at fedoraproject.org
Mon Oct 31 18:40:17 UTC 2011
commit 4979e72722cd57876292f2048f0f1a86719c318e
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Mon Oct 31 19:39:53 2011 +0100
Update to gsoap 2.8.4
Drop gsoap-ipv6.patch implemented upstream
Link gsoap SSL shared libraries with libssl
gsoap-ipv6.patch | 54 ---------------------------------------------------
gsoap-libtool.patch | 38 ++++++++++++++++++-----------------
gsoap.spec | 24 +++++++++++++---------
soapcpp2.1 | 7 ++++-
sources | 2 +-
wsdl2h.1 | 14 ++++++------
6 files changed, 47 insertions(+), 92 deletions(-)
---
diff --git a/gsoap-libtool.patch b/gsoap-libtool.patch
index 465d2ff..c240568 100644
--- a/gsoap-libtool.patch
+++ b/gsoap-libtool.patch
@@ -1,6 +1,6 @@
-diff -ur gsoap-2.8.3.orig/configure.in gsoap-2.8.3/configure.in
---- gsoap-2.8.3.orig/configure.in 2011-06-25 00:48:28.000000000 +0200
-+++ gsoap-2.8.3/configure.in 2011-06-28 07:09:22.084012776 +0200
+diff -ur gsoap-2.8.orig/configure.in gsoap-2.8/configure.in
+--- gsoap-2.8.orig/configure.in 2011-10-22 23:12:11.000000000 +0200
++++ gsoap-2.8/configure.in 2011-10-31 18:28:15.407071755 +0100
@@ -16,8 +16,7 @@
AM_PROG_LEX
AC_PROG_YACC
@@ -11,7 +11,7 @@ diff -ur gsoap-2.8.3.orig/configure.in gsoap-2.8.3/configure.in
AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_INSTALL
-@@ -222,13 +221,13 @@
+@@ -226,13 +225,13 @@
WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP"
WSDL2H_EXTRA_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
@@ -27,7 +27,7 @@ diff -ur gsoap-2.8.3.orig/configure.in gsoap-2.8.3/configure.in
fi
if test -n "$OPENSSL"; then
WSDL2H_EXTRA_FLAGS="-I${OPENSSL}/include ${WSDL2H_EXTRA_FLAGS}"
-@@ -240,7 +239,7 @@
+@@ -244,7 +243,7 @@
WSDL2H_EXTRA_FLAGS=
WSDL2H_EXTRA_LIBS=
SAMPLE_SSL_LIBS=
@@ -36,10 +36,10 @@ diff -ur gsoap-2.8.3.orig/configure.in gsoap-2.8.3/configure.in
fi
AC_SUBST(WSDL2H_EXTRA_FLAGS)
AC_SUBST(WSDL2H_EXTRA_LIBS)
-diff -ur gsoap-2.8.3.orig/gsoap/Makefile.am gsoap-2.8.3/gsoap/Makefile.am
---- gsoap-2.8.3.orig/gsoap/Makefile.am 2011-06-25 00:48:31.000000000 +0200
-+++ gsoap-2.8.3/gsoap/Makefile.am 2011-06-28 07:22:35.068006554 +0200
-@@ -34,20 +34,20 @@
+diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/gsoap/Makefile.am
+--- gsoap-2.8.orig/gsoap/Makefile.am 2011-10-22 23:12:12.000000000 +0200
++++ gsoap-2.8/gsoap/Makefile.am 2011-10-31 18:50:50.430109556 +0100
+@@ -34,20 +34,22 @@
dom_cpp.cpp: dom.cpp
$(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp
@@ -68,14 +68,16 @@ diff -ur gsoap-2.8.3.orig/gsoap/Makefile.am gsoap-2.8.3/gsoap/Makefile.am
+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
+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_LIBADD = -lssl -lcrypto
+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_LIBADD = -lssl -lcrypto
BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
-diff -ur gsoap-2.8.3.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8.3/gsoap/samples/autotest/Makefile.am
---- gsoap-2.8.3.orig/gsoap/samples/autotest/Makefile.am 2011-06-25 00:48:37.000000000 +0200
-+++ gsoap-2.8.3/gsoap/samples/autotest/Makefile.am 2011-06-28 07:08:20.248007341 +0200
+diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/samples/autotest/Makefile.am
+--- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am 2011-10-22 23:12:14.000000000 +0200
++++ gsoap-2.8/gsoap/samples/autotest/Makefile.am 2011-10-31 18:28:15.464071762 +0100
@@ -14,7 +14,7 @@
WSDLINPUT=$(srcdir)/examples.wsdl
SOAPHEADER=$(srcdir)/examples.h
@@ -85,9 +87,9 @@ diff -ur gsoap-2.8.3.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8.3/gsoap/s
$(SOAP_CPP_SRC) : $(WSDLINPUT)
$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
-diff -ur gsoap-2.8.3.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8.3/gsoap/samples/databinding/Makefile.am
---- gsoap-2.8.3.orig/gsoap/samples/databinding/Makefile.am 2011-06-25 00:48:41.000000000 +0200
-+++ gsoap-2.8.3/gsoap/samples/databinding/Makefile.am 2011-06-28 07:08:20.248007341 +0200
+diff -ur gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8/gsoap/samples/databinding/Makefile.am
+--- gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am 2011-10-22 23:12:15.000000000 +0200
++++ gsoap-2.8/gsoap/samples/databinding/Makefile.am 2011-10-31 18:28:15.465071761 +0100
@@ -14,7 +14,7 @@
WSDLINPUT=$(srcdir)/address.xsd
SOAPHEADER=$(srcdir)/address.h
@@ -97,9 +99,9 @@ diff -ur gsoap-2.8.3.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8.3/gsoa
$(SOAP_CPP_SRC) : $(WSDLINPUT)
$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
-diff -ur gsoap-2.8.3.orig/gsoap/samples/Makefile.defines gsoap-2.8.3/gsoap/samples/Makefile.defines
---- gsoap-2.8.3.orig/gsoap/samples/Makefile.defines 2011-06-25 00:48:43.000000000 +0200
-+++ gsoap-2.8.3/gsoap/samples/Makefile.defines 2011-06-28 07:08:20.248007341 +0200
+diff -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/Makefile.defines
+--- gsoap-2.8.orig/gsoap/samples/Makefile.defines 2011-10-22 23:12:15.000000000 +0200
++++ gsoap-2.8/gsoap/samples/Makefile.defines 2011-10-31 18:28:15.466071760 +0100
@@ -15,13 +15,13 @@
SOAP_C_CORE=soapC.c
SOAP_C_CLIENT=soapClient.c $(SOAP_C_CORE)
diff --git a/gsoap.spec b/gsoap.spec
index f3f1d12..46115cb 100644
--- a/gsoap.spec
+++ b/gsoap.spec
@@ -1,7 +1,7 @@
Summary: Generator Tools for Coding SOAP/XML Web Services in C and C++
Name: gsoap
-Version: 2.8.3
-Release: 2%{?dist}
+Version: 2.8.4
+Release: 1%{?dist}
# gsoap is licensed both under the gSOAP public license and under GPL version
# 2 or later with an OpenSSL linking exception.
#
@@ -18,11 +18,10 @@ Release: 2%{?dist}
License: GPLv2+ with exceptions
Group: Development/Tools
URL: http://gsoap2.sourceforge.net
-Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.8.3.zip
+Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.8.4.zip
Source1: soapcpp2.1
Source2: wsdl2h.1
Patch0: %{name}-libtool.patch
-Patch1: %{name}-ipv6.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: flex
@@ -66,7 +65,6 @@ gSOAP documentation in html
# enable use of libtool in configure.in and a few Makefile.am files
%patch0 -p1
-%patch1 -p1
# XML files non-executable
find . -name "*.xml" -exec chmod a-x {} \;
@@ -75,16 +73,12 @@ find . -name "*.xml" -exec chmod a-x {} \;
dos2unix README.txt LICENSE.txt NOTES.txt
# remove .DS_Stores
-rm -rf gsoap/doc/.DS_Store
-rm -rf gsoap/doc/wsse/html/.DS_Store
+rm gsoap/doc/.DS_Store
# remove stuff with gsoap license only - not GPL
rm -rf gsoap/extras gsoap/mod_gsoap gsoap/Symbian
sed 's!$(srcdir)/extras/\*!!' -i gsoap/Makefile.am
-# forward IPv6 flags to pkg-config
-sed 's/Cflags:/& @SOAPCPP2_IPV6@/' -i gsoap*.pc.in
-
%build
# patches change autoconf and automake files, so we must reconfigure
autoreconf --install --force
@@ -268,6 +262,11 @@ make check
%_datadir/gsoap/import/xenc.h
%_datadir/gsoap/plugin/mecevp.c
%_datadir/gsoap/plugin/mecevp.h
+# Additions in 2.8.4-1
+%_datadir/gsoap/import/wsdd.h
+%_datadir/gsoap/import/wsdx.h
+%_datadir/gsoap/plugin/wsddapi.c
+%_datadir/gsoap/plugin/wsddapi.h
%files doc
%defattr(-,root,root,-)
@@ -279,6 +278,11 @@ make check
%postun -p /sbin/ldconfig
%changelog
+* Mon Oct 31 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8.4-1
+- Update to gsoap 2.8.4
+- Drop gsoap-ipv6.patch implemented upstream
+- Link gsoap SSL shared libraries with libssl
+
* Fri Oct 21 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8.3-2
- Fix an issue with IPv4 only sockets when IPv6 support is enabled
diff --git a/soapcpp2.1 b/soapcpp2.1
index 5ea5140..e2f6a08 100644
--- a/soapcpp2.1
+++ b/soapcpp2.1
@@ -65,14 +65,17 @@ File split of \fIN\fR XML serializer implementations per file (N>=10).
\fB\-h\fR
Display help info.
.TP
+\fB\-I\fIpath\fR
+use \fIpath\fR(s) for \fB#import\fR.
+.TP
\fB\-i\fR
Generate C++ service proxies and objects inherited from \fBsoap\fR struct.
.TP
\fB\-j\fR
Generate C++ service proxies and objects that share a \fBsoap\fR struct.
.TP
-\fB\-I\fIpath\fR
-use \fIpath\fR(s) for \fB#import\fR.
+\fB\-k\fR
+Generate data structure walkers (experimental).
.TP
\fB\-l\fR
Generate linkable modules (experimental).
diff --git a/sources b/sources
index e816759..2064abf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48e7739a5719bd635843e42d2ec670f7 gsoap_2.8.3.zip
+cb37c5cc3ef15b6b82863f45544d9473 gsoap_2.8.4.zip
diff --git a/wsdl2h.1 b/wsdl2h.1
index bd7b3fb..a5e6067 100644
--- a/wsdl2h.1
+++ b/wsdl2h.1
@@ -22,7 +22,7 @@ wsdl2h \- the gSOAP WSDL parser for C and C++
.SH DESCRIPTION
Please see /usr/share/doc/gsoap/soapdoc2.html for details.
.PP
-Converts a \fBWSDL\fR or\fBXSD\fR input file, or from an HTTP address,
+Converts a \fBWSDL\fR or \fBXSD\fR input file, or from an HTTP address,
\fISOURCE\fR to a declaration file that can be parsed by
\fBsoapcpp2\fR(1). If no \fISOURCE\fR argument is specified, read
from standard input.
@@ -40,7 +40,7 @@ Use DOM to populate \fBxs\fR:\fIany\fR, \fBxs\fR:\fIanyType\fR and
\fBxs\fR:\fIanyAttribute\fR.
.TP
\fB\-e\fR
-Don not qualify enum names.
+Do not qualify enum names.
.TP
\fB\-f\fR
Generate flat C++ class hierarchy.
@@ -49,7 +49,7 @@ Generate flat C++ class hierarchy.
Generate global top-level element declarations.
.TP
\fB\-h\fR
-Display help info
+Display help info.
.TP
\fB\-i\fR
Do not import (advanced option).
@@ -58,11 +58,11 @@ Do not import (advanced option).
Use \fIpath\fR to find files.
.TP
\fB\-j\fR
-Don not generate \fBSOAP_ENV__Header\fR and \fBSOAP_ENV__Detail\fR
+Do not generate \fBSOAP_ENV__Header\fR and \fBSOAP_ENV__Detail\fR
definitions.
.TP
\fB\-k\fR
-Don not generate \fBSOAP_ENV__Header\fR mustUnderstand qualifiers.
+Do not generate \fBSOAP_ENV__Header\fR mustUnderstand qualifiers.
.TP
\fB\-l\fR
Display license information.
@@ -93,7 +93,7 @@ Use \fIname\fR for the C++ namespace of all declarations.
Connect via proxy \fIhost\fR, \fIport\fR and proxy credentials.
.TP
\fB\-s\fR
-Don not generate STL code (no \fBstd::string\fR and no
+Do not generate STL code (no \fBstd::string\fR and no
\fBstd::vector\fR).
.TP
\fB\-t\fIfile\fR
@@ -101,7 +101,7 @@ Use type map file \fIfile\fR instead of the default file
\fBtypemap.dat\fR.
.TP
\fB\-u\fR
-Don not generate unions.
+Do not generate unions.
.TP
\fB\-v\fR
Verbose output.
More information about the scm-commits
mailing list