diff --git a/0001-add-secure-compile-option-in-Makefile.patch b/0001-add-secure-compile-fs-check-in-Makefile.patch similarity index 42% rename from 0001-add-secure-compile-option-in-Makefile.patch rename to 0001-add-secure-compile-fs-check-in-Makefile.patch index 988ba4334d481993d49a6dbce0eb2beabea2317d..17a11a27159709142faacbd738ec8b0b8adf4493 100644 --- a/0001-add-secure-compile-option-in-Makefile.patch +++ b/0001-add-secure-compile-fs-check-in-Makefile.patch @@ -1,12 +1,19 @@ +#From: haozi007 +#Date: Sat, 20 Feb 2021 16:52:15 +0800 +#Subject: [PATCH] add secure compile fs check in Makefile +# +#Signed-off-by: haozi007 +#--- +# diff --git a/src/Makefile.am b/src/Makefile.am -index f1099d9..9b7053b 100644 +index 662710a..2b87f3e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,6 +19,7 @@ PTHREAD_DEF = endif - PROTOBUF_VERSION = 25:0:0 -+PROTOBUF_OPT_FLAG += -Wl,-z,now + PROTOBUF_VERSION = 26:6:0 ++PROTOBUF_OPT_FLAG += -Wl,-z,now -fstack-check if GCC # Turn on all warnings except for sign comparison (we ignore sign comparison diff --git a/0002-add-secure-compile-fs-check-in-Makefile.patch b/0002-add-secure-compile-fs-check-in-Makefile.patch deleted file mode 100644 index 9a5ff529883142f31d3f38c4e7c3c5214b7866eb..0000000000000000000000000000000000000000 --- a/0002-add-secure-compile-fs-check-in-Makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dddceb14106499f9fca17e75cdce458a205b102c Mon Sep 17 00:00:00 2001 -From: haozi007 -Date: Sat, 20 Feb 2021 16:52:15 +0800 -Subject: [PATCH] add secure compile fs check in Makefile - -Signed-off-by: haozi007 ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 9b7053b..e447b05 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -19,7 +19,7 @@ PTHREAD_DEF = - endif - - PROTOBUF_VERSION = 25:0:0 --PROTOBUF_OPT_FLAG += -Wl,-z,now -+PROTOBUF_OPT_FLAG += -Wl,-z,now -fstack-check - - if GCC - # Turn on all warnings except for sign comparison (we ignore sign comparison --- -2.25.1 - diff --git a/protobuf-all-3.14.0.tar.gz b/protobuf-all-3.15.6.tar.gz similarity index 49% rename from protobuf-all-3.14.0.tar.gz rename to protobuf-all-3.15.6.tar.gz index 3c6f0b8506f4b14e9c377a181d8572551c297e35..b85c7c5a6266e2242a031dfc9109d7fe7ae6e938 100644 Binary files a/protobuf-all-3.14.0.tar.gz and b/protobuf-all-3.15.6.tar.gz differ diff --git a/protobuf.spec b/protobuf.spec index 2559549428be89750aefa2da82af1998af947170..c2f14b263ef4958133a39833f50a727ab1774ac0 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -7,15 +7,14 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf -Version: 3.14.0 +Version: 3.15.6 Release: 1 License: BSD URL: https://github.com/protocolbuffers/protobuf Source: https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz Source1: protobuf-init.el -Patch9000: 0001-add-secure-compile-option-in-Makefile.patch -Patch9001: 0002-add-secure-compile-fs-check-in-Makefile.patch +Patch9001: 0001-add-secure-compile-fs-check-in-Makefile.patch BuildRequires: make autoconf automake emacs gcc-c++ libtool pkgconfig zlib-devel %description @@ -256,11 +255,11 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %files %doc CHANGES.txt CONTRIBUTORS.txt README.md %license LICENSE -%{_libdir}/libprotobuf.so.25* +%{_libdir}/libprotobuf.so.26* %files compiler %{_bindir}/protoc -%{_libdir}/libprotoc.so.25* +%{_libdir}/libprotoc.so.26* %{_emacs_sitelispdir}/%{name}/ %{_emacs_sitestartdir}/protobuf-init.el %license LICENSE @@ -279,7 +278,7 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %{_datadir}/vim/vimfiles/syntax/proto.vim %files lite -%{_libdir}/libprotobuf-lite.so.25* +%{_libdir}/libprotobuf-lite.so.26* %files lite-devel %{_libdir}/libprotobuf-lite.so @@ -318,6 +317,9 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %endif %changelog +* Thu May 04 2023 liksh - 3.15.6-1 +- Upgrade for openstack wallaby + * Fri Jul 30 2021 liyanan - 3.14.0-1 - update to 3.14.0