From 397839a608be984d01eb0437874ed758204947cd Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Thu, 24 Nov 2022 05:42:23 +0000 Subject: user/protobuf: Update to 3.20.3, fix 32-bit build Patch from upstream to fix 32-bit. Patch requires C++14, so that was also backported. 3.20.3 fixes two security issues, but no CVEs were assigned. Closes: #865 --- user/protobuf/APKBUILD | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'user/protobuf/APKBUILD') diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD index c1c3b49af..e82d51e41 100644 --- a/user/protobuf/APKBUILD +++ b/user/protobuf/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen pkgname=protobuf _gemname=google-protobuf -pkgver=3.20.1 +pkgver=3.20.3 _tstver=8d51dc50eb7e7698427fed81b85edad0e032112e pkgrel=0 pkgdesc="Library for extensible, efficient structure packing" @@ -19,9 +19,14 @@ makedepends="$depends_dev autoconf automake libtool ruby ruby-dev ruby-rake checkdepends="ruby-json ruby-test-unit" subpackages="ruby-$_gemname:_ruby py3-$pkgname:_python $pkgname-dev $pkgname-vim::noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/google/$pkgname/archive/v$pkgver.tar.gz - googletest-$_tstver.tar.gz::https://github.com/google/googletest/archive/$_tstver.tar.gz" + googletest-$_tstver.tar.gz::https://github.com/google/googletest/archive/$_tstver.tar.gz + cxx14.patch + 32bit.patch + " prepare() { + default_prepare + # symlink tests to the test directory rm -rf third_party/googletest ln -sf "$srcdir"/googletest-$_tstver \ @@ -114,5 +119,7 @@ vim() { "$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim } -sha512sums="fde3eb9f13946887ddfd87df428c5615ad09aaf191e4478b24e98e5e13231feeff4e70b4ca6a2ff7d9b9b2e2c60bc1d5479526edeafa78f9a8ed3bef2e0bacb0 protobuf-3.20.1.tar.gz -f7f804abf68af5e4e6cd767151773394fb8297d7d7fc878532ebb22b8c41d13554f68fa38a27470d458b590259a939e93cee7e5f5f6de8f1726c7ce85a606099 googletest-8d51dc50eb7e7698427fed81b85edad0e032112e.tar.gz" +sha512sums="01d6703bdbe769a1200ee6e4ebcdcb99688ec21f576988c60d82ec36e0822820fb245fcb4ca53293143d53e666d748b5a0c6937bc659fb3cdc4cd9b05ed12a1c protobuf-3.20.3.tar.gz +f7f804abf68af5e4e6cd767151773394fb8297d7d7fc878532ebb22b8c41d13554f68fa38a27470d458b590259a939e93cee7e5f5f6de8f1726c7ce85a606099 googletest-8d51dc50eb7e7698427fed81b85edad0e032112e.tar.gz +faf8962f0c7f1e4053b28a712b31ac9b254b17986326d2188d6edcc609f4b52f4cb85766c4bc02c6b9bc7bc30e2061f940a3089db54eb6056f729a80c1cfa891 cxx14.patch +2dfb540395460f0ea9fad663851633b29fa368a6ec99a88a42e31d7547034191679ef868c0ec67613d070659d4e322dc942b54b21793764e3d2342927977c7eb 32bit.patch" -- cgit v1.2.3-60-g2f50