From 76979a1c194c74c25db22c9ec90ec36f97179e3f Mon Sep 17 00:00:00 2001
From: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
Date: Sat, 26 Jun 2021 13:15:10 +0300
Subject: [PATCH] chore: update protobuf deps

* https://github.com/protocolbuffers/protobuf/releases
* https://github.com/protocolbuffers/protobuf-go/releases
* https://github.com/grpc/grpc-go/releases

Patch is not needed since https://github.com/protocolbuffers/protobuf/pull/8503.

Signed-off-by: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
---
 protobuf/patches/musl-fix.patch | 22 ----------------------
 protobuf/pkg.yaml               |  9 +++------
 protoc-gen-go-grpc/pkg.yaml     |  6 +++---
 protoc-gen-go/pkg.yaml          |  6 +++---
 4 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 protobuf/patches/musl-fix.patch

diff --git a/protobuf/patches/musl-fix.patch b/protobuf/patches/musl-fix.patch
deleted file mode 100644
index 1e7259e..0000000
--- a/protobuf/patches/musl-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-seems like both musl libc and android has byteswap.h
-
---- src/google/protobuf/stubs/port.h
-+++ src/google/protobuf/stubs/port.h
-@@ -94,7 +94,7 @@
- #include <intrin.h>
- #elif defined(__APPLE__)
- #include <libkern/OSByteOrder.h>
--#elif defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__)
-+#elif defined(__linux__) || defined(__BIONIC__) || defined(__CYGWIN__)
- #include <byteswap.h>  // IWYU pragma: export
- #endif
-
-@@ -380,7 +380,7 @@ inline void GOOGLE_UNALIGNED_STORE64(voi
- #define bswap_32(x) OSSwapInt32(x)
- #define bswap_64(x) OSSwapInt64(x)
-
--#elif !defined(__GLIBC__) && !defined(__BIONIC__) && !defined(__CYGWIN__)
-+#elif !defined(__linux__) && !defined(__BIONIC__) && !defined(__CYGWIN__)
-
- static inline uint16 bswap_16(uint16 x) {
-   return static_cast<uint16>(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8));
diff --git a/protobuf/pkg.yaml b/protobuf/pkg.yaml
index f272731..a3fdb81 100644
--- a/protobuf/pkg.yaml
+++ b/protobuf/pkg.yaml
@@ -1,13 +1,12 @@
 name: protobuf
 dependencies:
   - stage: base
-  - stage: patch
 steps:
   - sources:
-      - url: https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protobuf-cpp-3.15.6.tar.gz
+      - url: https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-cpp-3.17.3.tar.gz
         destination: protobuf-cpp.tar.gz
-        sha256: bbdfb7455431d7d58666e8a2996d14b236718ff238eecde10646581e4c87f168
-        sha512: e41d687351ee7ad38e83e5e952ca53e44d8e8b02242ea6fcf218960e5409921ddd5ee0588dfcf9485b425d3711bb060d3f61129900b952fda368008e13cb3830
+        sha256: 51cec99f108b83422b7af1170afd7aeb2dd77d2bcbb7b6bad1f92509e9ccf8cb
+        sha512: efad397f5cdda6639d5e9980fe6eeadc1ef768bf1d96b1e528a1d7ba1d81ceb49e22cbd78d9b4ab3518236055140568342ff138204b4a47234fb2957a89d2db8
     prepare:
       - |
         tar -xzf protobuf-cpp.tar.gz --strip-components=1
@@ -15,8 +14,6 @@ steps:
         ./configure \
         --prefix="${TOOLCHAIN}" \
         --disable-shared
-
-        patch -p0 < /pkg/patches/musl-fix.patch
     build:
       - |
         make -j $(nproc)
diff --git a/protoc-gen-go-grpc/pkg.yaml b/protoc-gen-go-grpc/pkg.yaml
index 1ad10c8..6ba56c4 100644
--- a/protoc-gen-go-grpc/pkg.yaml
+++ b/protoc-gen-go-grpc/pkg.yaml
@@ -4,10 +4,10 @@ dependencies:
   - stage: golang
 steps:
   - sources:
-      - url: https://github.com/grpc/grpc-go/archive/v1.36.0.tar.gz
+      - url: https://github.com/grpc/grpc-go/archive/refs/tags/v1.38.0.tar.gz
         destination: grpc-go.tar.gz
-        sha256: d460c8f379ff240f6169924ec399080351e4a03a0492fbb5a761f4e2d14d4fda
-        sha512: da566806154d6a79c8e2c06f44a6b3ee68b79e328df471ec6ef003c7a326667e299c3c545a6849c5b5d6a8d4b7ff6f9d59ae9243bfe0491ecdd77c4a95cbb453
+        sha256: fd6a2e2ae9e810670fdb63d196275ddb171e7f99f3bb801a02dde973de2f557b
+        sha512: 9657bfcc23ea3f98654dc2650b28a85d4ecf398151e0f0d83da67eff870e28b95599550f2090690e863ee306d9f72f60bba5c4c2bdd3db9683b8a50d056ed68d
     prepare:
       - |
         tar -xzf grpc-go.tar.gz --strip-components=1
diff --git a/protoc-gen-go/pkg.yaml b/protoc-gen-go/pkg.yaml
index 3b40c33..46a18ef 100644
--- a/protoc-gen-go/pkg.yaml
+++ b/protoc-gen-go/pkg.yaml
@@ -4,10 +4,10 @@ dependencies:
   - stage: golang
 steps:
   - sources:
-      - url: https://github.com/protocolbuffers/protobuf-go/archive/v1.26.0.tar.gz
+      - url: https://github.com/protocolbuffers/protobuf-go/archive/refs/tags/v1.27.0.tar.gz
         destination: protobuf-go.tar.gz
-        sha256: 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
-        sha512: 18d3392fae131014e95961cc7490c8a4f0e0a7d95a18f0a469a9f2b119a1b89bf1952881950129e2b96ea4096b220ff8a3250736ca6efd5eca004f56db861844
+        sha256: 5a928abfdcc7972e92738e7af2b8d1a41f4b2b7511d5b4f4f5b1ce3705668f45
+        sha512: 8d7a01c9183d1e0512378803d8100e291e99ba3b1a7a2fdc82fd9bea5738a009c252539eeaf0656d7ca25e41c5fd4ec6c68bfb3e8801160d4f254feba627ae42
     prepare:
       - |
         tar -xzf protobuf-go.tar.gz --strip-components=1