From 532962529a53f655e7918456776828cadb1e5655d09c51c0ef0c0d16256e3f9e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 14 Aug 2019 18:20:08 +0000 Subject: [PATCH 1/3] - Update to new upstream release 2.8.90 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gsoap?expand=0&rev=175 --- gsoap-2.8.89.tar.xz | 3 --- gsoap-2.8.90.tar.xz | 3 +++ gsoap.changes | 6 ++++++ gsoap.spec | 4 ++-- sanitize_source.sh | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 gsoap-2.8.89.tar.xz create mode 100644 gsoap-2.8.90.tar.xz diff --git a/gsoap-2.8.89.tar.xz b/gsoap-2.8.89.tar.xz deleted file mode 100644 index e56465c..0000000 --- a/gsoap-2.8.89.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:586a41c42282633a874f846a0da81d2749ffa1196f88e2cf644c73c4b157a3e3 -size 16223076 diff --git a/gsoap-2.8.90.tar.xz b/gsoap-2.8.90.tar.xz new file mode 100644 index 0000000..9c2bdb5 --- /dev/null +++ b/gsoap-2.8.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:690b8a8c4786a3dd63e428b4f7521cce85e78fd2018227c9acf900d8363cd354 +size 16695708 diff --git a/gsoap.changes b/gsoap.changes index 51388a8..0763d75 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 14 18:19:03 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 2.8.90 + * Internal changes related to gsoap's own build only. + ------------------------------------------------------------------- Sun Aug 11 13:33:42 UTC 2019 - Jan Engelhardt diff --git a/gsoap.spec b/gsoap.spec index f6f7670..4a9e354 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -17,8 +17,8 @@ Name: gsoap -%define lname libgsoap-2_8_89 -Version: 2.8.89 +%define lname libgsoap-2_8_90 +Version: 2.8.90 Release: 0 Summary: Toolkit for SOAP/REST-based C/C++ server and client web service applications License: SUSE-GPL-2.0+-with-openssl-exception diff --git a/sanitize_source.sh b/sanitize_source.sh index 7635c88..6e5beb6 100644 --- a/sanitize_source.sh +++ b/sanitize_source.sh @@ -13,7 +13,7 @@ if ! which hardlink >/dev/null; then exit 1; fi; -version="2.8.89" +version="2.8.90" shortver="2.8" # agh... if [ ! -e "gsoap_$version.zip" ]; then wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip" From 116e149486db74d575c14e3bd763f3d80f618a71d8d2cdf2484cac659cc84e05 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 14 Aug 2019 19:09:26 +0000 Subject: [PATCH 2/3] - Add revert-z.diff to counter a regression in handling the soapcpp2 "-z" option introduced in 2.8.89. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gsoap?expand=0&rev=176 --- gsoap.changes | 2 ++ gsoap.spec | 3 ++- revert-z.diff | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 revert-z.diff diff --git a/gsoap.changes b/gsoap.changes index 0763d75..ce5d0c7 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -3,6 +3,8 @@ Wed Aug 14 18:19:03 UTC 2019 - Jan Engelhardt - Update to new upstream release 2.8.90 * Internal changes related to gsoap's own build only. +- Add revert-z.diff to counter a regression in handling the + soapcpp2 "-z" option introduced in 2.8.89. ------------------------------------------------------------------- Sun Aug 11 13:33:42 UTC 2019 - Jan Engelhardt diff --git a/gsoap.spec b/gsoap.spec index 4a9e354..235760c 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -29,6 +29,7 @@ Source: gsoap-%version.tar.xz Source2: sanitize_source.sh Patch1: gsoap-automake1_13.diff Patch2: gsoap-01-sharedlibs.diff +Patch3: revert-z.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -83,7 +84,7 @@ This subpackage contains the documentation for the gSOAP toolkit. %prep %setup -q cmp gsoap/stdsoap2.cpp gsoap/stdsoap2.c -%patch -P 1 -P 2 -p1 +%patch -P 1 -P 2 -P 3 -p1 ln -fs stdsoap2.cpp gsoap/stdsoap2.c %build diff --git a/revert-z.diff b/revert-z.diff new file mode 100644 index 0000000..9a59e8d --- /dev/null +++ b/revert-z.diff @@ -0,0 +1,33 @@ +From: Jan Engelhardt +Upstream: https://sourceforge.net/p/gsoap2/bugs/1253/ + +Revert broken code change in 2.8.89 that ignores all -z options. + +diff --git a/gsoap/src/soapcpp2.c b/gsoap/src/soapcpp2.c +index 34ca6fce..3a92e297 100644 +--- a/gsoap/src/soapcpp2.c ++++ b/gsoap/src/soapcpp2.c +@@ -356,22 +356,15 @@ infile header file to parse (if none reads stdin)\n\ + vflag = 1; + break; + case 'z': +- { +- int z = zflag; + a++; +- if (zflag) +- fprintf(stderr, "soapcpp2: Option -z specified twice\n"); + g = 0; + if (*a) + zflag = *a - '0'; + else if (i < argc && argv[++i]) + zflag = *argv[i] - '0'; + else +- execerror("Option -z requires an argument"); +- if (zflag == 0 || z < zflag) +- zflag = z; ++ execerror("Option -z requires a digit"); + break; +- } + default: + fprintf(stderr, "soapcpp2: Unknown option %s\n", a); + exit(1); From bca0b44c63f80516da85a0cadf37a616ada1d9c7d1cdb185505119e13d1a2fc9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 15 Aug 2019 14:26:00 +0000 Subject: [PATCH 3/3] - Update to new upstream release 2.8.91 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gsoap?expand=0&rev=177 --- gsoap-2.8.90.tar.xz | 3 --- gsoap-2.8.91.tar.xz | 3 +++ gsoap.changes | 8 ++++++++ gsoap.spec | 7 +++---- revert-z.diff | 33 --------------------------------- sanitize_source.sh | 2 +- 6 files changed, 15 insertions(+), 41 deletions(-) delete mode 100644 gsoap-2.8.90.tar.xz create mode 100644 gsoap-2.8.91.tar.xz delete mode 100644 revert-z.diff diff --git a/gsoap-2.8.90.tar.xz b/gsoap-2.8.90.tar.xz deleted file mode 100644 index 9c2bdb5..0000000 --- a/gsoap-2.8.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:690b8a8c4786a3dd63e428b4f7521cce85e78fd2018227c9acf900d8363cd354 -size 16695708 diff --git a/gsoap-2.8.91.tar.xz b/gsoap-2.8.91.tar.xz new file mode 100644 index 0000000..875c9b4 --- /dev/null +++ b/gsoap-2.8.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:279d6e21ea2eac008739e483280b63a8178fe6cb160d9d46ec6a43df9ad3546e +size 16125560 diff --git a/gsoap.changes b/gsoap.changes index ce5d0c7..d0c3f7f 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Aug 15 14:22:59 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 2.8.91 + * Correction to fix soapcpp2 2.8.90 `-z#` flag enforcement + problem. +- Removed revert-z.diff (solved upstream) + ------------------------------------------------------------------- Wed Aug 14 18:19:03 UTC 2019 - Jan Engelhardt diff --git a/gsoap.spec b/gsoap.spec index 235760c..97f0de1 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -17,8 +17,8 @@ Name: gsoap -%define lname libgsoap-2_8_90 -Version: 2.8.90 +%define lname libgsoap-2_8_91 +Version: 2.8.91 Release: 0 Summary: Toolkit for SOAP/REST-based 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: revert-z.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -84,7 +83,7 @@ This subpackage contains the documentation for the gSOAP toolkit. %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 diff --git a/revert-z.diff b/revert-z.diff deleted file mode 100644 index 9a59e8d..0000000 --- a/revert-z.diff +++ /dev/null @@ -1,33 +0,0 @@ -From: Jan Engelhardt -Upstream: https://sourceforge.net/p/gsoap2/bugs/1253/ - -Revert broken code change in 2.8.89 that ignores all -z options. - -diff --git a/gsoap/src/soapcpp2.c b/gsoap/src/soapcpp2.c -index 34ca6fce..3a92e297 100644 ---- a/gsoap/src/soapcpp2.c -+++ b/gsoap/src/soapcpp2.c -@@ -356,22 +356,15 @@ infile header file to parse (if none reads stdin)\n\ - vflag = 1; - break; - case 'z': -- { -- int z = zflag; - a++; -- if (zflag) -- fprintf(stderr, "soapcpp2: Option -z specified twice\n"); - g = 0; - if (*a) - zflag = *a - '0'; - else if (i < argc && argv[++i]) - zflag = *argv[i] - '0'; - else -- execerror("Option -z requires an argument"); -- if (zflag == 0 || z < zflag) -- zflag = z; -+ execerror("Option -z requires a digit"); - break; -- } - default: - fprintf(stderr, "soapcpp2: Unknown option %s\n", a); - exit(1); diff --git a/sanitize_source.sh b/sanitize_source.sh index 6e5beb6..3fb9721 100644 --- a/sanitize_source.sh +++ b/sanitize_source.sh @@ -13,7 +13,7 @@ if ! which hardlink >/dev/null; then exit 1; fi; -version="2.8.90" +version="2.8.91" shortver="2.8" # agh... if [ ! -e "gsoap_$version.zip" ]; then wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip"