Jan Engelhardt 2016-02-03 09:56:00 +00:00 committed by Git OBS Bridge
parent 68e76e74c4
commit c7083c7199
10 changed files with 89 additions and 211 deletions

View File

@ -9,13 +9,13 @@ BUILT_SOURCES.
gsoap/Makefile.am | 2 +- gsoap/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: gsoap-2.8.22/gsoap/Makefile.am Index: gsoap-2.8.28/gsoap/Makefile.am
=================================================================== ===================================================================
--- gsoap-2.8.22.orig/gsoap/Makefile.am --- gsoap-2.8.28.orig/gsoap/Makefile.am
+++ gsoap-2.8.22/gsoap/Makefile.am +++ gsoap-2.8.28/gsoap/Makefile.am
@@ -49,7 +49,7 @@ libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) @@ -49,7 +49,7 @@ libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG)
libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp 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 libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES) -BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
+BUILT_SOURCES = stdsoap2_ck.c stdsoap2_cpp.cpp stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp dom.cpp +BUILT_SOURCES = stdsoap2_ck.c stdsoap2_cpp.cpp stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp dom.cpp

View File

@ -10,10 +10,10 @@ build: always use shared libraries
gsoap/samples/databinding/Makefile.am | 2 +- gsoap/samples/databinding/Makefile.am | 2 +-
4 files changed, 28 insertions(+), 20 deletions(-) 4 files changed, 28 insertions(+), 20 deletions(-)
Index: gsoap-2.8.22/configure.ac Index: gsoap-2.8.28/configure.ac
=================================================================== ===================================================================
--- gsoap-2.8.22.orig/configure.ac --- gsoap-2.8.28.orig/configure.ac
+++ gsoap-2.8.22/configure.ac +++ gsoap-2.8.28/configure.ac
@@ -15,8 +15,8 @@ AM_PROG_CC_C_O @@ -15,8 +15,8 @@ AM_PROG_CC_C_O
AM_PROG_LEX AM_PROG_LEX
AC_PROG_YACC AC_PROG_YACC
@ -52,10 +52,10 @@ Index: gsoap-2.8.22/configure.ac
fi fi
AC_SUBST(WSDL2H_EXTRA_FLAGS) AC_SUBST(WSDL2H_EXTRA_FLAGS)
AC_SUBST(WSDL2H_EXTRA_LIBS) AC_SUBST(WSDL2H_EXTRA_LIBS)
Index: gsoap-2.8.22/gsoap/Makefile.am Index: gsoap-2.8.28/gsoap/Makefile.am
=================================================================== ===================================================================
--- gsoap-2.8.22.orig/gsoap/Makefile.am --- gsoap-2.8.28.orig/gsoap/Makefile.am
+++ gsoap-2.8.22/gsoap/Makefile.am +++ gsoap-2.8.28/gsoap/Makefile.am
@@ -34,20 +34,28 @@ stdsoap2_ssl_cpp.cpp: stdsoap2.cpp @@ -34,20 +34,28 @@ stdsoap2_ssl_cpp.cpp: stdsoap2.cpp
dom_cpp.cpp: dom.cpp dom_cpp.cpp: dom.cpp
$(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp
@ -72,36 +72,36 @@ Index: gsoap-2.8.22/gsoap/Makefile.am
-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp -libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
-libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES -libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c -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_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp -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 -libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+libgsoap_la_SOURCES = stdsoap2.c dom.c +libgsoap_la_SOURCES = stdsoap2.c dom.c
+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) +libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
+libgsoap_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp +libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) +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_SOURCES = stdsoap2_ck.c dom.c
+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES +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_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES +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_SOURCES = stdsoap2_ssl.c dom.c
+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM +libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+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 -DWITH_COOKIES
+libgsoap_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libgsoap___la_LDFLAGS = ${libgsoap_la_LDFLAGS}
+libgsoapck_la_LDFLAGS = ${libgsoap_la_LDFLAGS}
+libgsoapck___la_LDFLAGS = ${libgsoap_la_LDFLAGS}
+libgsoapssl_la_LDFLAGS = ${libgsoap_la_LDFLAGS} +libgsoapssl_la_LDFLAGS = ${libgsoap_la_LDFLAGS}
+libgsoapssl_la_LIBADD = ${SAMPLE_SSL_LIBS} +libgsoapssl_la_LIBADD = ${SAMPLE_SSL_LIBS}
+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} +libgsoapssl___la_LDFLAGS = ${libgsoap_la_LDFLAGS}
+libgsoapssl___la_LIBADD = ${SAMPLE_SSL_LIBS} +libgsoapssl___la_LIBADD = ${SAMPLE_SSL_LIBS}
BUILT_SOURCES = stdsoap2_ck.c stdsoap2_cpp.cpp stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp dom.cpp BUILT_SOURCES = stdsoap2_ck.c stdsoap2_cpp.cpp stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp dom.cpp
Index: gsoap-2.8.22/gsoap/samples/autotest/Makefile.am Index: gsoap-2.8.28/gsoap/samples/autotest/Makefile.am
=================================================================== ===================================================================
--- gsoap-2.8.22.orig/gsoap/samples/autotest/Makefile.am --- gsoap-2.8.28.orig/gsoap/samples/autotest/Makefile.am
+++ gsoap-2.8.22/gsoap/samples/autotest/Makefile.am +++ gsoap-2.8.28/gsoap/samples/autotest/Makefile.am
@@ -14,7 +14,7 @@ SOAP_FLAGS=-SL -T -I$(top_srcdir)/gsoap/ @@ -14,7 +14,7 @@ SOAP_FLAGS=-SL -T -I$(top_srcdir)/gsoap/
WSDLINPUT=$(srcdir)/examples.wsdl WSDLINPUT=$(srcdir)/examples.wsdl
SOAPHEADER=$(srcdir)/examples.h SOAPHEADER=$(srcdir)/examples.h
@ -111,10 +111,10 @@ Index: gsoap-2.8.22/gsoap/samples/autotest/Makefile.am
$(SOAP_CPP_SRC) : $(WSDLINPUT) $(SOAP_CPP_SRC) : $(WSDLINPUT)
$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
Index: gsoap-2.8.22/gsoap/samples/databinding/Makefile.am Index: gsoap-2.8.28/gsoap/samples/databinding/Makefile.am
=================================================================== ===================================================================
--- gsoap-2.8.22.orig/gsoap/samples/databinding/Makefile.am --- gsoap-2.8.28.orig/gsoap/samples/databinding/Makefile.am
+++ gsoap-2.8.22/gsoap/samples/databinding/Makefile.am +++ gsoap-2.8.28/gsoap/samples/databinding/Makefile.am
@@ -14,7 +14,7 @@ SOAP_FLAGS=-0 -CS -p address -I$(top_src @@ -14,7 +14,7 @@ SOAP_FLAGS=-0 -CS -p address -I$(top_src
WSDLINPUT=$(srcdir)/address.xsd WSDLINPUT=$(srcdir)/address.xsd
SOAPHEADER=$(srcdir)/address.h SOAPHEADER=$(srcdir)/address.h

View File

@ -16,31 +16,31 @@ stdsoap2_ssl.c:15576:14: note: in expansion of macro soap_get1
gsoap/stdsoap2.h | 3 +-- gsoap/stdsoap2.h | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-) 2 files changed, 1 insertion(+), 4 deletions(-)
Index: gsoap-2.8.22/gsoap/stdsoap2.cpp Index: gsoap-2.8.28/gsoap/stdsoap2.cpp
=================================================================== ===================================================================
--- gsoap-2.8.22.orig/gsoap/stdsoap2.cpp --- gsoap-2.8.28.orig/gsoap/stdsoap2.cpp
+++ gsoap-2.8.22/gsoap/stdsoap2.cpp +++ gsoap-2.8.28/gsoap/stdsoap2.cpp
@@ -1547,7 +1547,6 @@ soap_get0(struct soap *soap) @@ -1591,7 +1591,6 @@ soap_get0(struct soap *soap)
#endif
/******************************************************************************/ /******************************************************************************/
-#ifdef WITH_LEAN -#ifdef WITH_LEAN
#ifndef PALM_1 #ifndef PALM_1
soap_wchar soap_wchar
soap_get1(struct soap *soap) soap_get1(struct soap *soap)
@@ -1556,7 +1555,6 @@ soap_get1(struct soap *soap) @@ -1600,7 +1599,6 @@ soap_get1(struct soap *soap)
return (unsigned char)soap->buf[soap->bufidx++]; return (unsigned char)soap->buf[soap->bufidx++];
} }
#endif #endif
-#endif -#endif
/******************************************************************************/ /******************************************************************************/
#ifndef PALM_1
Index: gsoap-2.8.22/gsoap/stdsoap2.h Index: gsoap-2.8.28/gsoap/stdsoap2.h
=================================================================== ===================================================================
--- gsoap-2.8.22.orig/gsoap/stdsoap2.h --- gsoap-2.8.28.orig/gsoap/stdsoap2.h
+++ gsoap-2.8.22/gsoap/stdsoap2.h +++ gsoap-2.8.28/gsoap/stdsoap2.h
@@ -2344,11 +2344,10 @@ extern SOAP_NMAC struct Namespace namesp @@ -2788,11 +2788,10 @@ extern SOAP_NMAC struct Namespace namesp
#ifndef WITH_LEAN #ifndef WITH_LEAN
# define soap_get0(soap) (((soap)->bufidx>=(soap)->buflen && soap_recv(soap)) ? EOF : (unsigned char)(soap)->buf[(soap)->bufidx]) # define soap_get0(soap) (((soap)->bufidx>=(soap)->buflen && soap_recv(soap)) ? EOF : (unsigned char)(soap)->buf[(soap)->bufidx])
@ -51,5 +51,5 @@ Index: gsoap-2.8.22/gsoap/stdsoap2.h
#endif #endif
+soap_wchar soap_get1(struct soap*); +soap_wchar soap_get1(struct soap*);
#define SOAP_XSTRINGIFY(s) SOAP_STRINGIFY(s) #define soap_versioning_paste(name, ext) name##_REQUIRE_lib_v##ext
#define SOAP_STRINGIFY(s) #s #define soap_versioning_ext(name, ext) soap_versioning_paste(name, ext)

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7eeffcda67a1de66ed8b91833cce7d1648c0e9a13f947b4a051c4837e3d2fb5a
size 6722668

3
gsoap-2.8.28.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:96f5730f2f1104925666f13137b531364b3412bcec28cfd42cfbde999ab668a9
size 8006356

View File

@ -1,67 +0,0 @@
References: http://sf.net/p/gsoap2/bugs/1007/
---
gsoap/stdsoap2.cpp | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
Index: gsoap-2.8.22/gsoap/stdsoap2.cpp
===================================================================
--- gsoap-2.8.22.orig/gsoap/stdsoap2.cpp
+++ gsoap-2.8.22/gsoap/stdsoap2.cpp
@@ -7254,7 +7254,13 @@ SOAP_FMAC1
struct soap*
SOAP_FMAC2
soap_versioning(soap_new)(soap_mode imode, soap_mode omode)
-{ struct soap *soap = (struct soap*)malloc(sizeof(struct soap));
+{
+#ifdef __cplusplus
+ struct soap *soap = new struct soap;
+#else
+ struct soap *soap = malloc(sizeof(struct soap));
+ soap->dummy = NULL;
+#endif
if (soap)
soap_versioning(soap_init)(soap, imode, omode);
return soap;
@@ -7268,7 +7274,11 @@ void
SOAP_FMAC2
soap_free(struct soap *soap)
{ soap_done(soap);
+#ifdef __cplusplus
+ SOAP_DELETE(soap);
+#else
free(soap);
+#endif
}
#endif
@@ -7278,7 +7288,12 @@ SOAP_FMAC1
void
SOAP_FMAC2
soap_del(struct soap *soap)
-{ free(soap);
+{
+#ifdef __cplusplus
+ SOAP_DELETE(soap);
+#else
+ free(soap);
+#endif
}
#endif
@@ -8981,7 +8996,14 @@ SOAP_FMAC1
struct soap*
SOAP_FMAC2
soap_copy(const struct soap *soap)
-{ return soap_copy_context((struct soap*)malloc(sizeof(struct soap)), soap);
+{
+#ifdef __cplusplus
+ return soap_copy_context(new struct soap, soap);
+#else
+ struct soap *s = malloc(sizeof(struct soap));
+ s->dummy = NULL;
+ return soap_copy_context(s, soap);
+#endif
}
#endif

View File

@ -1,58 +0,0 @@
References: https://sf.net/p/gsoap2/bugs/1025/
---
gsoap/stdsoap2.cpp | 6 ++++++
1 file changed, 6 insertions(+)
Index: gsoap-2.8.22/gsoap/stdsoap2.cpp
===================================================================
--- gsoap-2.8.22.orig/gsoap/stdsoap2.cpp
+++ gsoap-2.8.22/gsoap/stdsoap2.cpp
@@ -4074,6 +4074,7 @@ again:
#ifdef WITH_IPV6
if (res->ai_next)
{ res = res->ai_next;
+ soap->error = 0;
goto again;
}
#endif
@@ -4284,6 +4285,7 @@ again:
#ifdef WITH_IPV6
if (err == SOAP_ECONNREFUSED && res->ai_next)
{ soap->fclosesocket(soap, sk);
+ soap->error = 0;
res = res->ai_next;
goto again;
}
@@ -4309,6 +4311,7 @@ again:
#ifdef WITH_IPV6
if (res->ai_next)
{ res = res->ai_next;
+ soap->error = 0;
goto again;
}
freeaddrinfo(ressave);
@@ -4323,6 +4326,7 @@ again:
#ifdef WITH_IPV6
if (res->ai_next)
{ res = res->ai_next;
+ soap->error = 0;
goto again;
}
freeaddrinfo(ressave);
@@ -4341,6 +4345,7 @@ again:
#ifdef WITH_IPV6
if (res->ai_next)
{ res = res->ai_next;
+ soap->error = 0;
goto again;
}
freeaddrinfo(ressave);
@@ -4351,6 +4356,7 @@ again:
#ifdef WITH_IPV6
if (res->ai_next)
{ res = res->ai_next;
+ soap->error = 0;
soap->fclosesocket(soap, sk);
goto again;
}

View File

@ -1,31 +1,39 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 28 19:06:05 UTC 2016 - jengelh@inai.de Wed Feb 3 09:07:07 UTC 2016 - jengelh@inai.de
- add gsoap-00-builtsource.diff, gsoap-03-seqpoint.diff to fix - Update to new upstream release 2.8.28
more compiler warnings * Added many new API functions to a fully redisigned XML DOM API
v5 for C and C++ with new DOM API documentation. The redesigned
------------------------------------------------------------------- DOM API v5 is mostly backward compatible to DOM API v4, but
Tue Jun 2 11:19:46 UTC 2015 - jengelh@inai.de with DOM string data members changed to text members. Many API
functions are added to define a clean interface without having
- Replace gsoap-02-typepuns.diff with better version from SF to use the DOM structure data members. The
- Add gsoap-allocator.diff to please UBSAN soap_dom_next_element() function now takes a second parameter
that is an element pointer to stop deep traversal at (use NULL
------------------------------------------------------------------- for old behavior). See updated XML DOM and XPath documentation
Thu May 28 17:31:39 UTC 2015 - jengelh@inai.de for details.
* Added C serialization to/from strings with new C soap struct
- Drop unnecessary -version-info argument from _LDFLAGS variable members const char *soap::is input string to parse from and
in gsoap-01-sharedlibs.diff (we have -release) const char **soap:os pointer to string that is set by the
engine to point to the output. Note that C++ code is unchanged
------------------------------------------------------------------- and the soap::is and soap::os are still members pointers to
Thu Apr 23 11:45:28 UTC 2015 - jengelh@inai.de istream and ostream streams (use std::stringstream for
input/output from/to strings).
- Update to new upstream release 2.8.22 * Added JSON API C function set_size to set/change array sizes
* Enhancements include XSD 1.1 support and improved portability. and JSON API C function set_struct to create an empty JSON
object.
------------------------------------------------------------------- * Improved jsoncpp command line tool to generate JSONPath C code
Thu Apr 23 10:59:00 UTC 2015 - jengelh@inai.de and improved overall to generate more compact code.
* Improved SOAP_DEFAULTNS flag to emit XML default namespace
- Include SSL libraries in the link to reduce undefined symbols declarations.
* Improved strictness of XML verification under default settings
(i.e. without requiring SOAP_XML_STRICT).
* Changed string deserialization when XML content with tags is
encountered: XML tags are no longer parsed as part of strings.
You must use XML string type to parse literal XML content or
use DOM.
- Remove gsoap-allocator.diff, gsoap-reset-error-code.diff
(merged upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 15 18:34:35 UTC 2015 - jengelh@inai.de Thu Jan 15 18:34:35 UTC 2015 - jengelh@inai.de
@ -44,7 +52,6 @@ Thu Jan 15 18:34:35 UTC 2015 - jengelh@inai.de
UTF8 content that is outside the allowed range of XML 1.0. UTF8 content that is outside the allowed range of XML 1.0.
- Remove gsoap-05-ipv6.diff, gsoap-06-ipv6retry.diff - Remove gsoap-05-ipv6.diff, gsoap-06-ipv6retry.diff
(merged upstream) (merged upstream)
- Add gsoap-mindeflateratio.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Aug 3 23:16:48 UTC 2014 - jengelh@inai.de Sun Aug 3 23:16:48 UTC 2014 - jengelh@inai.de

View File

@ -18,7 +18,7 @@
Name: gsoap Name: gsoap
%define lname libgsoap-2_8 %define lname libgsoap-2_8
Version: 2.8.22 Version: 2.8.28
Release: 0 Release: 0
Summary: Toolkit for C/C++ server and client web service applications Summary: Toolkit for C/C++ server and client web service applications
License: SUSE-GPL-2.0+-with-openssl-exception License: SUSE-GPL-2.0+-with-openssl-exception
@ -34,9 +34,7 @@ Patch1: gsoap-01-sharedlibs.diff
Patch2: gsoap-02-typepuns.diff Patch2: gsoap-02-typepuns.diff
Patch3: gsoap-03-seqpoint.diff Patch3: gsoap-03-seqpoint.diff
Patch4: gsoap-mindeflateratio.diff Patch4: gsoap-mindeflateratio.diff
Patch5: gsoap-allocator.diff
Patch6: gsoap-no-tcpfastopen-fail.diff Patch6: gsoap-no-tcpfastopen-fail.diff
Patch7: gsoap-reset-error-code.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -45,7 +43,6 @@ BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: xz
BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(libssl) BuildRequires: pkgconfig(libssl)
@ -97,36 +94,35 @@ symlinks for libgsoap.
%prep %prep
%setup -q %setup -q
cmp gsoap/stdsoap2.cpp gsoap/stdsoap2.c cmp gsoap/stdsoap2.cpp gsoap/stdsoap2.c
%patch -P 13 -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1 %patch -P 13 -P 0 -P 1 -P 2 -P 3 -P 4 -P 6 -p1
ln -fs stdsoap2.cpp gsoap/stdsoap2.c ln -fs stdsoap2.cpp gsoap/stdsoap2.c
%build %build
# Rebuild configure - fix that utterly long mktime test. # Rebuild configure - fix that utterly long mktime test.
autoreconf -fi; autoreconf -fi
%configure --enable-ipv6 --disable-static %configure --enable-ipv6 --disable-static
pushd gsoap/src/; pushd gsoap/src/
# build prerequisites for parallel build first # build prerequisites for parallel build first
make soapcpp2_yacc.c; make soapcpp2_yacc.c
popd; popd
make %{?_smp_mflags}; make %{?_smp_mflags}
%install %install
b="%buildroot"; b="%buildroot"
make install DESTDIR="$b"; make install DESTDIR="$b"
rm -f "$b/%_libdir"/*.la; rm -f "$b/%_libdir"/*.la
%if 0%{?fdupes:1} %if 0%{?fdupes:1}
%fdupes %buildroot %fdupes %buildroot
%endif %endif
%post -n %lname -p /sbin/ldconfig %post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%_bindir/* %_bindir/*
%_datadir/%name %_datadir/%name/
%files -n %lname %files -n %lname
%defattr(-,root,root) %defattr(-,root,root)

View File

@ -1,4 +1,4 @@
#!/bin/sh -x #!/bin/sh -ex
# #
# Shrink the gsoap archive from 20 MB -> 6 MB. # Shrink the gsoap archive from 20 MB -> 6 MB.
# #
@ -13,7 +13,7 @@ if ! which hardlink >/dev/null; then
exit 1; exit 1;
fi; fi;
version="2.8.22"; version="2.8.28";
shortver="2.8"; # agh... shortver="2.8"; # agh...
rm -Rf "gsoap-$shortver" "gsoap-$version"; rm -Rf "gsoap-$shortver" "gsoap-$version";