diff --git a/gsoap-02-accept.diff b/gsoap-02-accept.diff deleted file mode 100644 index 1041c75..0000000 --- a/gsoap-02-accept.diff +++ /dev/null @@ -1,24 +0,0 @@ -From: Jan Engelhardt -Date: 2017-01-24 10:28:48.315550326 +0100 - -Undo change introduced in 2.8.41 which closes connections -at the time of accept(2). - -References: https://sourceforge.net/p/gsoap2/bugs/1095/ ---- - gsoap/stdsoap2.cpp | 2 -- - 1 file changed, 2 deletions(-) - -Index: gsoap-2.8.41/gsoap/stdsoap2.cpp -=================================================================== ---- gsoap-2.8.41.orig/gsoap/stdsoap2.cpp -+++ gsoap-2.8.41/gsoap/stdsoap2.cpp -@@ -5798,8 +5798,6 @@ soap_accept(struct soap *soap) - #endif - soap->error = SOAP_OK; - memset((void*)&soap->peer, 0, sizeof(soap->peer)); -- if (soap_valid_socket(soap->socket) && !(soap->omode & SOAP_IO_UDP)) -- soap->fclosesocket(soap, soap->socket); - soap->socket = SOAP_INVALID_SOCKET; - soap->errmode = 0; - soap->keep_alive = 0; diff --git a/gsoap-2.8.41.tar.xz b/gsoap-2.8.41.tar.xz deleted file mode 100644 index 583cb04..0000000 --- a/gsoap-2.8.41.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:049d50bae75b4cf31408c3bf19a3d34af185ac6e50fc1cff831e6b90e41fcfdd -size 97087772 diff --git a/gsoap-2.8.42.tar.xz b/gsoap-2.8.42.tar.xz new file mode 100644 index 0000000..ec9f428 --- /dev/null +++ b/gsoap-2.8.42.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a627e73b8677e4c925cfdcd2728711b2267286a9e35d1918cf5b0f2dcadecc4 +size 22142080 diff --git a/gsoap.changes b/gsoap.changes index 4f80b08..1f11bf9 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,7 +1,12 @@ ------------------------------------------------------------------- -Tue Jan 24 09:29:04 UTC 2017 - jengelh@inai.de +Tue Jan 24 13:53:09 UTC 2017 - jengelh@inai.de -- Add gsoap-02-accept.diff +- Update to new upstream release 2.8.42 + * Fixed shared pointer to QName string QName output normalization. + * Improved `WITH_REPLACE_ILLEGAL_UTF8` flag to optionally compile + the library with: this replaces illegal UTF-8 input/output + with the replacement character U+FFFD (or define your own + `SOAP_UNKNOWN_UNICODE_CHAR`). ------------------------------------------------------------------- Thu Jan 19 09:06:14 UTC 2017 - jengelh@inai.de diff --git a/gsoap.spec b/gsoap.spec index 75fab60..5d0d596 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -17,8 +17,8 @@ Name: gsoap -%define lname libgsoap-2_8_41 -Version: 2.8.41 +%define lname libgsoap-2_8_42 +Version: 2.8.42 Release: 0 Summary: Toolkit for C/C++ server and client web service applications License: SUSE-GPL-2.0+-with-openssl-exception @@ -29,7 +29,6 @@ Source: gsoap-%version.tar.xz Source2: sanitize_source.sh Patch1: gsoap-automake1_13.diff Patch2: gsoap-01-sharedlibs.diff -Patch3: gsoap-02-accept.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -84,7 +83,7 @@ available or under development. %prep %setup -q cmp gsoap/stdsoap2.cpp gsoap/stdsoap2.c -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -P 2 -p1 ln -fs stdsoap2.cpp gsoap/stdsoap2.c %build @@ -96,8 +95,6 @@ perl -i -lpe 's{AC_INIT\(gsoap, 2.8\)}{AC_INIT([gsoap], [%version])}' \ # Also needed because Makefile.am and configure.ac are touched. autoreconf -fi -export CFLAGS="-O0 -ggdb3" -export CXXFLAGS="-O0 -ggdb3" %configure --enable-ipv6 --disable-static pushd gsoap/src/ # build prerequisites for parallel build first diff --git a/sanitize_source.sh b/sanitize_source.sh index 9c60f48..004b003 100644 --- a/sanitize_source.sh +++ b/sanitize_source.sh @@ -13,9 +13,11 @@ if ! which hardlink >/dev/null; then exit 1; fi; -version="2.8.41" +version="2.8.42" shortver="2.8" # agh... -wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip" +if [ ! -e "gsoap_$version.zip" ]; then + wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip" +fi rm -Rf "gsoap-$shortver" "gsoap-$version" unzip "gsoap_$version.zip" @@ -35,5 +37,5 @@ find "gsoap-$version" -type f "(" \ -name "*~" -o -name .DS_Store ")" -delete hardlink "gsoap-$version" find "gsoap-$version" -print0 | sort -z | \ - tar -T- --null --owner=root --group=root --no-recur --use=xz \ + tar --no-recur -T- --null --owner=root --group=root --use=xz \ -cvf "gsoap-$version.tar.xz"