jengelh/gsoap
SHA256
1
0
Fork 0
forked from pool/gsoap
Code Pull Requests Activity

Accepting request 678279 from devel:libraries:c_c++

Browse Source 
- Update to new upstream release 2.8.80

OBS-URL: https://build.opensuse.org/request/show/678279
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gsoap?expand=0&rev=50
This commit is contained in:
Stephan Kulow 2019-02-24 16:03:18 +00:00 committed by Git OBS Bridge
commit 1ebb543cd0
7 changed files with 80 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
gsconfig.patch
View File

@ -1,242 +0,0 @@
---
Makefile.am | 7 ++++++-
configure.ac | 36 +++++++++++++++++++++---------------
gsoap/stdsoap2.h | 40 +++++++++++++++++-----------------------
3 files changed, 44 insertions(+), 39 deletions(-)
Index: gsoap-2.8.75/Makefile.am
===================================================================
--- gsoap-2.8.75.orig/Makefile.am
+++ gsoap-2.8.75/Makefile.am
@@ -3,7 +3,7 @@
SUBDIRS = . gsoap
CLEANFILES = *~
VERYVERYCLEANFILES = *~ configure Makefile.in compile config.guess config.sub config.log autoscan.log \
-depcomp install-sh missing mkinstalldirs stamp-h.in config.h.in \
+depcomp install-sh missing mkinstalldirs stamp-h.in config.h.in gsoap_config.h \
aclocal.m4 *.cache Makefile
## not a GNU package. You can remove this line, if
@@ -52,3 +52,8 @@ backup:
cd $$BACKUPDIR && \
ls -l $$CURRENTDIR.tgz
+BUILT_SOURCES = gsoap_config.h
+nodist_include_HEADERS = gsoap_config.h
+
+gsoap_config.h: config.h
+ grep GSOAP_WITH_ $^ >$@
Index: gsoap-2.8.75/configure.ac
===================================================================
--- gsoap-2.8.75.orig/configure.ac
+++ gsoap-2.8.75/configure.ac
@@ -92,6 +92,13 @@ esac
AC_SUBST(SAMPLE_EXTRA_LIBS)
AC_SUBST(platform)
+AH_TEMPLATE([GSOAP_WITH_GNUTLS], [gsoap API uses gnutls])
+AH_TEMPLATE([GSOAP_WITH_GZIP], [gsoap API uses gzip/zlib])
+AH_TEMPLATE([GSOAP_WITH_IPV6], [gsoap API uses IPv6])
+AH_TEMPLATE([GSOAP_WITH_NO_IPV6_V6ONLY], [gsoap API uses IPv6/v6only])
+AH_TEMPLATE([GSOAP_WITH_OPENSSL], [gsoap API uses openssl])
+AH_TEMPLATE([GSOAP_WITH_XLOCALE], [gsoap API uses xlocale.h])
+
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([arpa/inet.h locale.h xlocale.h errno.h fcntl.h ctype.h limits.h float.h math.h netdb.h netinet/in.h stdlib.h string.h strings.h stdint.h inttypes.h time.h sys/inttypes.h sys/socket.h sys/types.h sys/time.h sys/timeb.h unistd.h poll.h openssl/ssl.h gnutls/gnutls.h zlib.h])
@@ -191,21 +198,11 @@ else
fi
AC_SUBST(SOAPCPP2_NONAMESPACES)
-# the enable-xlocale option adds the -DWITH_INCLUDE_XLOCALE_H to the
-# library compilation thus forcing the inclusion of xlocale.h
-AC_ARG_ENABLE(xlocale,
- [AC_HELP_STRING([--enable-xlocale],
- [compile library with forced inclusion of xlocale.h])],
- [with_xlocale="$enable_xlocale"],
- [with_xlocale="no"])
-
-AC_MSG_CHECKING(for enable xlocale usage in library)
-if test "x$with_xlocale" = "xyes"; then
- AC_MSG_RESULT(yes)
- SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H"
-else
- AC_MSG_RESULT(no)
-fi
+AS_IF([test "x$ac_cv_header_xlocale_h" = xyes], [
+ AC_DEFINE([GSOAP_WITH_XLOCALE], [1])
+ dnl Could get rid of this, since it's defined through gsoap_config.h.
+ SOAPCPP2_INCLUDE_XLOCALE="-DWITH_INCLUDE_XLOCALE_H"
+])
AC_SUBST(SOAPCPP2_INCLUDE_XLOCALE)
# the disable-c-locale option adds the -DWITH_NO_C_LOCALE to the
@@ -236,6 +233,10 @@ AC_ARG_ENABLE(ipv6,
AC_MSG_CHECKING(for enable ipv6 in library)
if test "x$with_ipv6" = "xyes"; then
AC_MSG_RESULT(yes)
+ AC_DEFINE([GSOAP_WITH_IPV6], [1])
+ AC_DEFINE([GSOAP_WITH_NO_IPV6_V6ONLY], [1])
+ dnl You could just get rid of SOAPCPP2_IPV6 entirely because it's all
+ dnl available through gsoap_config.h now.
SOAPCPP2_IPV6="-DWITH_IPV6" ##define to add IPv6 support
else
AC_MSG_RESULT(no)
@@ -291,6 +292,9 @@ if test "x$with_openssl" = "xyes"; then
AC_MSG_CHECKING(for enable gnutls in library)
if test "x$with_gnutls" = "xyes"; then
AC_MSG_RESULT(yes)
+ AC_DEFINE([GSOAP_WITH_GNUTLS], [1])
+ AC_DEFINE([GSOAP_WITH_GZIP], [1])
+ dnl Could get rid of WSDL2H_EXTRA_FLAGS, since GSOAP_WITH_* is already set by gsoap_config.h
WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP"
WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
SAMPLE_INCLUDES=
@@ -298,6 +302,8 @@ if test "x$with_openssl" = "xyes"; then
WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
else
AC_MSG_RESULT(no)
+ AC_DEFINE([GSOAP_WITH_OPENSSL], [1])
+ AC_DEFINE([GSOAP_WITH_GZIP], [1])
WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
# compile with wsdl2h when OPENSSL is available
WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
Index: gsoap-2.8.75/gsoap/stdsoap2.h
===================================================================
--- gsoap-2.8.75.orig/gsoap/stdsoap2.h
+++ gsoap-2.8.75/gsoap/stdsoap2.h
@@ -54,6 +54,7 @@ A commercial use license is available fr
#define GSOAP_VERSION 20875
+#include "gsoap_config.h"
#ifdef WITH_SOAPDEFS_H
# include "soapdefs.h" /* include user-defined stuff in soapdefs.h */
#endif
@@ -704,13 +705,6 @@ extern intmax_t __strtoull(const char*,
# endif
#endif
-/* force inclusion of xlocale.h when WITH_INCLUDE_XLOCALE_H is defined by the user for systems that require xlocale.h */
-#ifdef WITH_INCLUDE_XLOCALE_H
-# ifndef HAVE_XLOCALE_H
-# define HAVE_XLOCALE_H
-# endif
-#endif
-
#ifdef WITH_C_LOCALE
# include <locale.h>
# if defined(WIN32) && !defined(CYGWIN)
@@ -718,7 +712,7 @@ extern intmax_t __strtoull(const char*,
# define SOAP_LOCALE(soap) ((soap)->c_locale ? (soap)->c_locale : ((soap)->c_locale = _create_locale(LC_ALL, "C")))
# define SOAP_FREELOCALE(soap) (void)((soap)->c_locale && (_free_locale((soap)->c_locale), ((soap)->c_locale = NULL)))
# else
-# if defined(HAVE_XLOCALE_H)
+# if defined(GSOAP_WITH_XLOCALE)
# include <xlocale.h>
# endif
# define SOAP_LOCALE_T locale_t
@@ -875,9 +869,9 @@ extern intmax_t __strtoull(const char*,
# undef WITH_SELF_PIPE
#endif
-#if defined(WITH_IPV6_V6ONLY)
-# ifndef WITH_IPV6
-# define WITH_IPV6
+#if defined(GSOAP_WITH_IPV6_V6ONLY)
+# ifndef GSOAP_WITH_IPV6
+# define GSOAP_WITH_IPV6
# endif
#endif
@@ -898,7 +892,7 @@ extern intmax_t __strtoull(const char*,
// # define _WSPIAPI_COUNTOF // DEV NOTE: enble to fix problems with VC6
// # include <wspiapi.h>
# include <ws2spi.h> // DEV NOTE: replaces older wspiapi.h above
-# ifdef WITH_IPV6
+# ifdef GSOAP_WITH_IPV6
# define SOAP_GAI_STRERROR gai_strerrorA
# endif
#else
@@ -922,12 +916,12 @@ extern intmax_t __strtoull(const char*,
# include <fcgi_stdio.h>
#endif
-#ifdef WITH_OPENSSL
+#ifdef GSOAP_WITH_OPENSSL
# ifdef __VMS
# pragma names save
# pragma names uppercase
# endif
-# undef WITH_GNUTLS
+# undef GSOAP_WITH_GNUTLS
# define OPENSSL_NO_KRB5
# include <openssl/bio.h>
# include <openssl/err.h>
@@ -944,7 +938,7 @@ extern intmax_t __strtoull(const char*,
# endif
#endif
-#ifdef WITH_GNUTLS
+#ifdef GSOAP_WITH_GNUTLS
# include <gnutls/gnutls.h>
# include <gnutls/x509.h>
# if GNUTLS_VERSION_NUMBER < 0x020b00
@@ -962,9 +956,9 @@ extern intmax_t __strtoull(const char*,
# include <gskssl.h>
#endif
-#ifdef WITH_GZIP
-# ifndef WITH_ZLIB
-# define WITH_ZLIB
+#ifdef GSOAP_WITH_GZIP
+# ifndef GSOAP_WITH_ZLIB
+# define GSOAP_WITH_ZLIB
# endif
#endif
@@ -974,7 +968,7 @@ extern intmax_t __strtoull(const char*,
# define SOAP_STRCMP strcmp /* case sensitive XML element/attribute names */
#endif
-#ifdef WITH_ZLIB
+#ifdef GSOAP_WITH_ZLIB
# include <zlib.h>
#endif
@@ -2929,7 +2923,7 @@ struct SOAP_CMAC soap
} peer; /* set by soap_connect/soap_accept and by UDP recv */
size_t peerlen;
#endif
-#if defined(WITH_OPENSSL) /* OpenSSL */
+#if defined(GSOAP_WITH_OPENSSL) /* OpenSSL */
int (*fsslauth)(struct soap*);
int (*fsslverify)(int, X509_STORE_CTX*);
BIO *bio;
@@ -2938,7 +2932,7 @@ struct SOAP_CMAC soap
SSL_SESSION *session;
const char *dhfile;
const char *randfile;
-#elif defined(WITH_GNUTLS) /* GNUTLS */
+#elif defined(GSOAP_WITH_GNUTLS) /* GNUTLS */
int (*fsslauth)(struct soap*);
void *fsslverify;
gnutls_certificate_credentials_t xcred; /* cert pointer */
@@ -2980,7 +2974,7 @@ struct SOAP_CMAC soap
#else
void *c_locale;
#endif
-#ifdef WITH_ZLIB
+#ifdef GSOAP_WITH_ZLIB
z_stream *d_stream; /* decompression stream */
uLong z_crc; /* internal gzip crc */
#else
@@ -3126,7 +3120,7 @@ soap_wchar soap_get1(struct soap*);
SOAP_FMAC1 ULONG64 SOAP_FMAC2 soap_strtoull(const char*, char**, int);
#endif
-#if defined(WITH_OPENSSL)
+#if defined(GSOAP_WITH_OPENSSL)
# define soap_random soap_rand()
SOAP_FMAC1 int SOAP_FMAC2 soap_rand(void);
#elif defined(UNDER_CE)

52
gsoap-01-sharedlibs.diff
View File

@ -16,10 +16,10 @@ build: always use shared libraries
gsoap/gsoapssl.sym | 1 + gsoap/gsoapssl.sym | 1 +
10 files changed, 40 insertions(+), 18 deletions(-) 10 files changed, 40 insertions(+), 18 deletions(-)
Index: gsoap-2.8.71/configure.ac Index: gsoap-2.8.79/configure.ac
=================================================================== ===================================================================
--- gsoap-2.8.71.orig/configure.ac --- gsoap-2.8.79.orig/configure.ac
+++ gsoap-2.8.71/configure.ac +++ gsoap-2.8.79/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
@ -31,7 +31,7 @@ Index: gsoap-2.8.71/configure.ac
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_AWK AC_PROG_AWK
AC_PROG_INSTALL AC_PROG_INSTALL
@@ -298,7 +298,7 @@ if test "x$with_openssl" = "xyes"; then @@ -294,7 +294,7 @@ if test "x$with_openssl" = "xyes"; then
WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
SAMPLE_INCLUDES= SAMPLE_INCLUDES=
SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
@ -39,8 +39,8 @@ Index: gsoap-2.8.71/configure.ac
+ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la" + WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_DEFINE([GSOAP_WITH_OPENSSL], [1]) WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
@@ -308,7 +308,7 @@ if test "x$with_openssl" = "xyes"; then @@ -302,7 +302,7 @@ if test "x$with_openssl" = "xyes"; then
WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
SAMPLE_INCLUDES= SAMPLE_INCLUDES=
SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
@ -49,7 +49,7 @@ Index: gsoap-2.8.71/configure.ac
fi fi
if test -n "$ZLIB"; then if test -n "$ZLIB"; then
WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}" WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
@@ -327,7 +327,7 @@ else @@ -321,7 +321,7 @@ else
WSDL2H_EXTRA_FLAGS= WSDL2H_EXTRA_FLAGS=
SAMPLE_SSL_LIBS= SAMPLE_SSL_LIBS=
SAMPLE_INCLUDES= SAMPLE_INCLUDES=
@ -58,10 +58,10 @@ Index: gsoap-2.8.71/configure.ac
fi fi
AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes") AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes")
AC_SUBST(WITH_OPENSSL) AC_SUBST(WITH_OPENSSL)
Index: gsoap-2.8.71/gsoap/Makefile.am Index: gsoap-2.8.79/gsoap/Makefile.am
=================================================================== ===================================================================
--- gsoap-2.8.71.orig/gsoap/Makefile.am --- gsoap-2.8.79.orig/gsoap/Makefile.am
+++ gsoap-2.8.71/gsoap/Makefile.am +++ gsoap-2.8.79/gsoap/Makefile.am
@@ -34,20 +34,34 @@ stdsoap2_ssl_cpp.cpp: stdsoap2.cpp @@ -34,20 +34,34 @@ stdsoap2_ssl_cpp.cpp: stdsoap2.cpp
dom_cpp.cpp: dom.cpp dom_cpp.cpp: dom.cpp
$(LN_S) -f $(top_srcdir)/gsoap/dom.cpp dom_cpp.cpp $(LN_S) -f $(top_srcdir)/gsoap/dom.cpp dom_cpp.cpp
@ -110,51 +110,51 @@ Index: gsoap-2.8.71/gsoap/Makefile.am
BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
Index: gsoap-2.8.71/gsoap/gsoap++.sym Index: gsoap-2.8.79/gsoap/gsoap++.sym
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gsoap-2.8.71/gsoap/gsoap++.sym +++ gsoap-2.8.79/gsoap/gsoap++.sym
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+GSOAPXX { global: *; }; +GSOAPXX { global: *; };
Index: gsoap-2.8.71/gsoap/gsoap.sym Index: gsoap-2.8.79/gsoap/gsoap.sym
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gsoap-2.8.71/gsoap/gsoap.sym +++ gsoap-2.8.79/gsoap/gsoap.sym
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+GSOAP { global: *; }; +GSOAP { global: *; };
Index: gsoap-2.8.71/gsoap/gsoapck++.sym Index: gsoap-2.8.79/gsoap/gsoapck++.sym
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gsoap-2.8.71/gsoap/gsoapck++.sym +++ gsoap-2.8.79/gsoap/gsoapck++.sym
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+GSOAPCKXX { global: *; }; +GSOAPCKXX { global: *; };
Index: gsoap-2.8.71/gsoap/gsoapck.sym Index: gsoap-2.8.79/gsoap/gsoapck.sym
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gsoap-2.8.71/gsoap/gsoapck.sym +++ gsoap-2.8.79/gsoap/gsoapck.sym
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+GSOAPCK { global: *; }; +GSOAPCK { global: *; };
Index: gsoap-2.8.71/gsoap/gsoapckssl++.sym Index: gsoap-2.8.79/gsoap/gsoapckssl++.sym
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gsoap-2.8.71/gsoap/gsoapckssl++.sym +++ gsoap-2.8.79/gsoap/gsoapckssl++.sym
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+GSOAPCKSSLXX { global: *; }; +GSOAPCKSSLXX { global: *; };
Index: gsoap-2.8.71/gsoap/gsoapckssl.sym Index: gsoap-2.8.79/gsoap/gsoapckssl.sym
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gsoap-2.8.71/gsoap/gsoapckssl.sym +++ gsoap-2.8.79/gsoap/gsoapckssl.sym
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+GSOAPCKSSL { global: *; }; +GSOAPCKSSL { global: *; };
Index: gsoap-2.8.71/gsoap/gsoapssl++.sym Index: gsoap-2.8.79/gsoap/gsoapssl++.sym
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gsoap-2.8.71/gsoap/gsoapssl++.sym +++ gsoap-2.8.79/gsoap/gsoapssl++.sym
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+GSOAPSSLXX { global: *; }; +GSOAPSSLXX { global: *; };
Index: gsoap-2.8.71/gsoap/gsoapssl.sym Index: gsoap-2.8.79/gsoap/gsoapssl.sym
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gsoap-2.8.71/gsoap/gsoapssl.sym +++ gsoap-2.8.79/gsoap/gsoapssl.sym
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+GSOAPSSL { global: *; }; +GSOAPSSL { global: *; };

3
gsoap-2.8.75.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:01ab8a5d625c55343b977a7c7ae9c35ff5efed73b9e1c9c1224a3de1245d3afa
size 16054784

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81c06cd7e9dcc76fe03227e9f5fc3ab3e6eac068403d89fc0707029ffaa59547
size 16804144

44
gsoap.changes
View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Thu Feb 21 17:36:12 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 2.8.80
* Updated to remove GCC 8.2 warnings.
* Improved wsdl2h handling of relative file paths.
-------------------------------------------------------------------
Tue Feb 12 12:51:00 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Remove gsconfig.patch (this patch is broken)
-------------------------------------------------------------------
Mon Feb 11 10:39:52 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 2.8.79
* Fixed a bug in wsdl2h option `-c` for C source code output,
resulting in a missing `*` pointer for `_XML __any` member
declaration when declared after the `$ int __size` array size
member. The bug may lead to validation errors in extensible
types when extra elements are present in the XML payload
received. The fix produces the correct `_XML *__any` member
declaration.
-------------------------------------------------------------------
Fri Feb 1 16:27:44 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 2.8.78
* wsdl2h: WSDL and schema imports of files on relative paths:
file name without path or file name with path stating with
../ are considered relative locations with respect to the
current WSDL and schema that is importing, otherwise imported
files are considered relative to the directory in which
wsdl2h is run (the `-I` option can be used to change that
location).
* wsdl2h: to display warnings for invalid complexType and
simpleType extensions/restrictions but generates valid code
in such cases by inference, the update also fixes a valid
extension case.
* Fixed compilation error for soapcpp2 options `-i` and `-j`
caused by special case with empty input arguments to service
operations.
* Added jsoncpp new option `-k`.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 19 10:11:53 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Sat Jan 19 10:11:53 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

11
gsoap.spec
View File

@ -17,8 +17,8 @@
Name: gsoap Name: gsoap
%define lname libgsoap-2_8_75 %define lname libgsoap-2_8_80
Version: 2.8.75 Version: 2.8.80
Release: 0 Release: 0
Summary: Toolkit for SOAP/REST-based C/C++ server and client web service applications Summary: Toolkit for SOAP/REST-based C/C++ server and client web service applications
License: SUSE-GPL-2.0+-with-openssl-exception License: SUSE-GPL-2.0+-with-openssl-exception
@ -27,9 +27,8 @@ Url: http://www.genivia.com/dev.html
Source: gsoap-%version.tar.xz Source: gsoap-%version.tar.xz
Source2: sanitize_source.sh Source2: sanitize_source.sh
Patch1: gsconfig.patch Patch1: gsoap-automake1_13.diff
Patch3: gsoap-automake1_13.diff Patch2: gsoap-01-sharedlibs.diff
Patch4: gsoap-01-sharedlibs.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -84,7 +83,7 @@ This subpackage contains the documentation for the gSOAP toolkit.
%prep %prep
%setup -q %setup -q
cmp gsoap/stdsoap2.cpp gsoap/stdsoap2.c cmp gsoap/stdsoap2.cpp gsoap/stdsoap2.c
%patch -P 1 -P 3 -P 4 -p1 %patch -P 1 -P 2 -p1
ln -fs stdsoap2.cpp gsoap/stdsoap2.c ln -fs stdsoap2.cpp gsoap/stdsoap2.c
%build %build

4
sanitize_source.sh
View File

@ -13,7 +13,7 @@ if ! which hardlink >/dev/null; then
exit 1; exit 1;
fi; fi;
version="2.8.75" version="2.8.80"
shortver="2.8" # agh... shortver="2.8" # agh...
if [ ! -e "gsoap_$version.zip" ]; then if [ ! -e "gsoap_$version.zip" ]; then
wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip" wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip"
@ -41,5 +41,5 @@ rm -Rf "gsoap-$version/gsoap/VisualStudio2005"
hardlink "gsoap-$version" hardlink "gsoap-$version"
find "gsoap-$version" -print0 | sort -z | \ find "gsoap-$version" -print0 | sort -z | \
tar --no-recur -T- --null --owner=root --group=root --use=xz \ tar --no-recur --null -T- --owner=root --group=root --use=xz \
-cvf "gsoap-$version.tar.xz" -cvf "gsoap-$version.tar.xz"