!9 [sync] PR-7: Upgrade to 0.33.0 to support OpenStack-W

From: @openeuler-sync-bot Reviewed-by: @zhuchunyi Signed-off-by: @zhuchunyi
Upgrade to 0.33.0 to support OpenStack-W
2021-08-23 07:44:18 +00:00 · 2021-08-19 19:37:26 +08:00 · 2021-08-10 11:28:44 +00:00 · 2021-08-10 11:52:21 +08:00 · 2020-06-03 11:13:18 +08:00 · 2020-06-03 10:23:58 +08:00
7 changed files with 261 additions and 75 deletions
--- a/0.33.0.tar.gz
+++ b/0.33.0.tar.gz
--- a/README.en.md
+++ b/README.en.md
@ -1,36 +0,0 @@
-# qpid-proton
-
-#### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
--- a/README.md
+++ b/README.md
@ -1,39 +0,0 @@
-# qpid-proton
-
-#### 介绍
-{**以下是码云平台说明，您可以替换此简介**
-码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
--- a/for-non-constant-SIGSTKSZ.patch
+++ b/for-non-constant-SIGSTKSZ.patch
@ -0,0 +1,43 @@
+From 7d07d0587ba62ffb44112fbde8ccd189542f0099 Mon Sep 17 00:00:00 2001
+From: wang_yue111 <648774160@qq.com>
+Date: Tue, 10 Aug 2021 11:26:13 +0800
+Subject: [PATCH] Patch for non-constant SIGSTKSZ
+
+---
+ tests/include/catch.hpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/include/catch.hpp b/tests/include/catch.hpp
+index f619f23..9b342ec 100644
+--- a/tests/include/catch.hpp
+++ b/tests/include/catch.hpp
+@@ -6540,7 +6540,7 @@ namespace Catch {
+         static bool isSet;
+         static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
+         static stack_t oldSigStack;
+-        static char altStackMem[SIGSTKSZ];
+        static char altStackMem[32768];
+ 
+         static void handleSignal( int sig ) {
+             std::string name = "<unknown signal>";
+@@ -6560,7 +6560,7 @@ namespace Catch {
+             isSet = true;
+             stack_t sigStack;
+             sigStack.ss_sp = altStackMem;
+-            sigStack.ss_size = SIGSTKSZ;
+            sigStack.ss_size = 32768;
+             sigStack.ss_flags = 0;
+             sigaltstack(&sigStack, &oldSigStack);
+             struct sigaction sa = { 0 };
+@@ -6591,7 +6591,7 @@ namespace Catch {
+     bool FatalConditionHandler::isSet = false;
+     struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+     stack_t FatalConditionHandler::oldSigStack = {};
+-    char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
+    char FatalConditionHandler::altStackMem[32768] = {};
+ 
+ } // namespace Catch
+ 
+-- 
+2.23.0
+
--- a/proton.patch
+++ b/proton.patch
@ -0,0 +1,26 @@
+From e5522e87e2597ee9898cd9699c8c27bc6f8b12b1 Mon Sep 17 00:00:00 2001
+From: Kim van der Riet <kvdr@localhost.localdomain>
+Date: Tue, 10 Dec 2019 10:56:30 -0500
+Subject: [PATCH] Changed Sphinx invocation from sphinx to sphinx-build for
+ RHEL7
+
+---
+ python/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index 87057d8..9176ba5 100644
+--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
+@@ -127,7 +127,7 @@ else ()
+         COMMAND ${PN_ENV_SCRIPT} --
+         PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}
+         LD_LIBRARY_PATH="${CMAKE_CURRENT_BINARY_DIR}/c"
+-        ${PYTHON_EXECUTABLE} -m sphinx "${CMAKE_CURRENT_SOURCE_DIR}/docs" "${CMAKE_CURRENT_BINARY_DIR}/docs")
+        sphinx-build "${CMAKE_CURRENT_SOURCE_DIR}/docs" "${CMAKE_CURRENT_BINARY_DIR}/docs")
+     add_dependencies(docs docs-py)
+     install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docs/"
+             DESTINATION "${PROTON_SHARE}/docs/api-py"
+-- 
+1.8.3.1
+
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@ -0,0 +1,188 @@
+%{?filter_setup:
+%filter_provides_in %{_datadir}/proton/examples/
+%filter_requires_in %{_datadir}/proton/examples/
+%filter_setup
+}
+
+%global proton_licensedir %{_licensedir}/proton
+%{!?_licensedir:
+%global license %doc
+%global proton_licensedir %{_datadir}/proton}
+
+Name:                qpid-proton
+Version:             0.33.0
+Release:             1
+Summary:             A high performance and lightweight library for messaging applications
+License:             ASL 2.0
+URL:                 http://qpid.apache.org/proton/
+Source0:             https://github.com/apache/qpid-proton/archive/%{version}.tar.gz
+Patch0000:           proton.patch
+Patch0001:           for-non-constant-SIGSTKSZ.patch
+
+BuildRequires:       gcc gcc-c++ cmake swig pkgconfig doxygen libuuid-devel openssl-devel
+BuildRequires:       python3-devel python3-sphinx glibc-headers cyrus-sasl-devel jsoncpp-devel
+
+%description
+Proton is a high performance, lightweight messaging library. It can be used in
+the widest range of messaging applications including brokers, client libraries,
+routers, bridges, proxies, and more. Proton makes it trivial to integrate with
+the AMQP 1.0 ecosystem from any platform, environment, or language.
+
+%package   c-cpp
+Summary:             C/C++ libs for qpid-proton
+Requires:            cyrus-sasl-lib jsoncpp
+Provides:            qpid-proton-c = %{version}-%{release} qpid-proton-cpp = %{version}-%{release}
+Obsoletes:           qpid-proton perl-qpid-proton qpid-proton-c < %{version}-%{release}
+Obsoletes:           qpid-proton-cpp < %{version}-%{release}
+
+%description c-cpp
+This package contains C/C++ libraries for qpid-proton.
+
+%package c-cpp-devel
+Summary:             Development C/C++ libs for qpid-proton
+Requires:            qpid-proton-c-cpp = %{version}-%{release}
+Provides:            qpid-proton-c-devel = %{version}-%{release} qpid-proton-cpp-devel = %{version}-%{release}
+Obsoletes:           qpid-proton-devel qpid-proton-c-devel < %{version}-%{release}
+Obsoletes:           qpid-proton-cpp-devel < %{version}-%{release}
+
+%description c-cpp-devel
+This package contains C/C++ development libraries for writing messaging apps with qpid-proton.
+
+
+%package c-help
+Summary:             Documentation for the C development libs
+BuildArch:           noarch
+Provides:            c-docs = %{version}-%{release}
+Obsoletes:           qpid-proton-c-devel-doc qpid-proton-c-devel-docs c-docs < %{version}-%{release}
+
+%description c-help
+This package contains documentation for the C development libraries and examples for qpid-proton.
+
+%package   cpp-help
+Summary:             Documentation for the C++ development libs
+BuildArch:           noarch
+Provides:            cpp-docs = %{version}-%{release}
+Obsoletes:           qpid-proton-cpp-devel-doc qpid-proton-cpp-devel-docs cpp-docs < %{version}-%{release}
+
+%description cpp-help
+This package contains documentation for the C++ development libraries and examples for qpid-proton.
+
+%package -n python3-qpid-proton
+Summary:             Python language bindings for the qpid-proton
+%python_provide python3-qpid-proton
+Requires:            qpid-proton-c = %{version}-%{release} python3
+
+%description -n python3-qpid-proton
+This package contains python language bindings for the qpid-proton messaging framework.
+
+%package -n python-qpid-proton-help
+Summary:             Documentation for the Python language bindings for qpid-proton
+BuildArch:           noarch
+Provides:            python-qpid-proton-docs = %{version}-%{release}
+Obsoletes:           python-qpid-proton-doc python-qpid-proton-docs < %{version}-%{release}
+
+%description -n python-qpid-proton-help
+This package contains documentation for the Python language bindings for qpid-proton.
+
+%package tests
+Summary:             Tests for qpid-proton
+BuildArch:           noarch
+
+%description tests
+This package contains some tests for qpid-proton.
+
+%prep
+%autosetup -n %{name}-%{version} -p1
+
+%build
+rm -rf buildpython3 && mkdir buildpython3
+pushd buildpython3
+python_includes=$(ls -d /usr/include/python3*)
+%cmake \
+    -DSYSINSTALL_BINDINGS=ON \
+    -DCMAKE_SKIP_RPATH:BOOL=OFF \
+    -DENABLE_FUZZ_TESTING=NO \
+    "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS -Wno-error=format-security" \
+    "-DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS $CXXFLAGS -Wno-error=format-security" \
+    ..
+make all docs -j1
+(pushd python/dist; %py3_build)
+
+%install
+pushd buildpython3
+%make_install
+(pushd python/dist; %py3_install)
+
+find %{buildroot}%{_datadir}/proton/examples/python -name "*.py" -exec sed -i 's/!\/usr\/bin\/env python/!\/usr\/bin\/python3/' {} \;
+echo '#!/usr/bin/python3' > %{buildroot}%{_datadir}/proton/examples/python/proton_server.py.original
+cat %{buildroot}%{_datadir}/proton/examples/python/proton_server.py >> %{buildroot}%{_datadir}/proton/examples/python/proton_server.py.original
+mv %{buildroot}%{_datadir}/proton/examples/python/proton_server.py.original %{buildroot}%{_datadir}/proton/examples/python/proton_server.py
+chmod +x %{buildroot}%{python3_sitearch}/_cproton.so
+
+rm -fr %{buildroot}%{_datadir}/proton/examples/**/*.cmake
+rm -f  %{buildroot}%{_datadir}/proton/CMakeLists.txt
+rm -fr %{buildroot}%{_datadir}/proton/examples/go
+for fpath in %{buildroot}%{_libdir} %{buildroot}%{_datarootdir} \
+        %{buildroot}%{_datadir}/proton/examples
+do
+    rm -rf ${fpath}/ruby
+done
+
+%check
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%files c-cpp
+%dir %{_datadir}/proton
+%license %{_datadir}/proton/LICENSE.txt
+%doc %{_datadir}/proton/README*
+%{_libdir}/libqpid-proton*
+
+%files c-cpp-devel
+%{_includedir}/proton
+%{_libdir}/cmake/Proton
+%{_libdir}/pkgconfig/*
+%{_libdir}/cmake/ProtonCpp
+
+%files c-help
+%defattr(-,root,root,-)
+%license %{_datadir}/proton/LICENSE.txt
+%doc %{_datadir}/proton/examples/README.md
+%doc %{_datadir}/proton/docs/api-c
+%doc %{_datadir}/proton/examples/c/*
+
+%files cpp-help
+%defattr(-,root,root,-)
+%license %{_datadir}/proton/LICENSE.txt
+%{_datadir}/proton/docs/api-cpp
+%doc %{_datadir}/proton/examples/cpp/*
+
+%files -n python3-qpid-proton
+%{python3_sitearch}/*
+
+%files -n python-qpid-proton-help
+%defattr(-,root,root,-)
+%license %{_datadir}/proton/LICENSE.txt
+%doc %{_datadir}/proton/docs/api-py
+%doc %{_datadir}/proton/examples/python
+
+%files tests
+%license %{_datadir}/proton/LICENSE.txt
+%doc %{_datadir}/proton/tests
+
+%changelog
+* Tue Jul 13 2021 huangtianhua <huangtianhua@huawei.com> - 0.33.0-1
+- Update to 0.33.0
+
+* Tue Aug 10 2021 wangyue <wangyue92@huawei.com> - 0.31.0-2
+- Patch for non-constant SIGSTKSZ
+
+* Tue Jun 2 2020 leiju <leiju4@huawei.com> - 0.31.0-1
+- Update to 0.31.0
+
+* Wed Jan 8 2020 Senlin Xia<xiasenlin1@huawei.com> - 0.24.0-5
+- Package init
--- a/qpid-proton.yaml
+++ b/qpid-proton.yaml
@ -0,0 +1,4 @@
+version_control: github
+src_repo: apache/qpid-proton
+tag_prefix: "^v"
+seperator: "."
Author	SHA1	Message	Date
openeuler-ci-bot	1f19a74502	!9 [sync] PR-7: Upgrade to 0.33.0 to support OpenStack-W From: @openeuler-sync-bot Reviewed-by: @zhuchunyi Signed-off-by: @zhuchunyi	2021-08-23 07:44:18 +00:00
huangtianhua	ea8d119404	Upgrade to 0.33.0 to support OpenStack-W (cherry picked from commit bfa7ad0d7c8ad7ec61275368975873b0a8a03b54)	2021-08-19 19:37:26 +08:00
openeuler-ci-bot	a1013d24be	!8 Patch for non-constant SIGSTKSZ From: @wang_yue111 Reviewed-by: @licihua Signed-off-by: @licihua	2021-08-10 11:28:44 +00:00
wang_yue111	485535026f	Patch for non-constant SIGSTKSZ	2021-08-10 11:52:21 +08:00
openeuler-ci-bot	ea655ab264	!3 Update to 0.31.0 Merge pull request !3 from 雷炬/master	2020-06-03 11:13:18 +08:00
lei_ju	50f5901e0b	modify spec file	2020-06-03 10:23:58 +08:00
lei_ju	5030f40d57	update package to 0.31.0	2020-06-03 10:20:18 +08:00
openeuler-ci-bot	a80ec91f7c	!2 add yaml file Merge pull request !2 from sugarfillet/master	2020-05-19 08:56:18 +08:00
sugarfillet	767ea02a17	add yaml file	2020-05-08 15:56:43 +08:00
openeuler-ci-bot	14523bd092	!1 add spec file Merge pull request !1 from small_leek/xsl_qpid_proton	2020-01-10 10:08:30 +08:00
small_leek	f6db84815b	add spec and tar	2020-01-09 20:42:21 -05:00