Skip to contentSkip to conversation

package/grpc: bump version to 1.42.0

PATCH In review Michael Nosthoff via buildroot 2 participants 2 messages Nov 24, 2021 – Dec 11, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/grpc: bump version to 1.42.0

* update patch 0001 to match changed target code

---
 ...t-the-availability-of-pthread_setname_.patch | 17 ++++++++++++++++-
 package/grpc/grpc.hash                          |  2 +-
 package/grpc/grpc.mk                            |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)
package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch +16 -1
index 32493ac1a0..92dc5a6c45 100644
@@ -11,6 +11,14 @@ non-POSIX function in all cases.
 
 Upstream: https://github.com/grpc/grpc/pull/17610
 Signed-off-by: Thomas Petazzoni <[email protected]>
+
+[[email protected]:
+  1.42.0 added new logic to handle older glibc without pthread_setname_np()
+  but is still not sufficient for all cases. So alter the patch to wrap all
+  this with our cmake based workaround.
+  See: https://github.com/grpc/grpc/pull/27540
+]
+Signed-off-by: Michael Nosthoff <[email protected]>
 ---
  CMakeLists.txt                            | 6 ++++++
  include/grpc/impl/codegen/port_platform.h | 2 ++
@@ -37,15 +45,22 @@ diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codeg
 index 4f213ff..55ecd9d 100644
 --- a/include/grpc/impl/codegen/port_platform.h
 +++ b/include/grpc/impl/codegen/port_platform.h
-@@ -168,7 +168,9 @@
+@@ -186,6 +186,7 @@
  #endif /* _LP64 */
  #ifdef __GLIBC__
  #define GPR_POSIX_CRASH_HANDLER 1
 +#if defined(HAVE_PTHREAD_SETNAME_NP)
+ #ifdef __GLIBC_PREREQ
+ #if __GLIBC_PREREQ(2, 12)
+ #define GPR_LINUX_PTHREAD_NAME 1
+@@ -194,6 +195,7 @@
+ // musl libc & others
  #define GPR_LINUX_PTHREAD_NAME 1
+ #endif
 +#endif /* HAVE_PTHREAD_SETNAME_NP */
  #include <linux/version.h>
  #else /* musl libc */
  #define GPR_MUSL_LIBC_COMPAT 1
+
 -- 
 2.26.63
package/grpc/grpc.hash +1 -1
index 26d0d315d8..978d5e4fe3 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656  grpc-1.41.0.tar.gz
+sha256  b2f2620c762427bfeeef96a68c1924319f384e877bc0e084487601e4cc6e434c  grpc-1.42.0.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
package/grpc/grpc.mk +1 -1
index 1bb4bd2b98..df23a4a3ff 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GRPC_VERSION = 1.41.0
+GRPC_VERSION = 1.42.0
 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION))
 GRPC_LICENSE = Apache-2.0
 GRPC_LICENSE_FILES = LICENSE
Signature · 6 lines
2.34.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 3 lines · Michael Nosthoff via buildroot

* update patch 0001 to match changed target code

[snip]

package/grpc/grpc.hash line 3

Quoted 9 lines
package/grpc/grpc.hash +1 -1
index 26d0d315d8..978d5e4fe3 100644
@@ -1,3 +1,3 @@
  # Locally computed
-sha256  e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656  grpc-1.41.0.tar.gz
+sha256  b2f2620c762427bfeeef96a68c1924319f384e877bc0e084487601e4cc6e434c  grpc-1.42.0.tar.gz
  sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE

The hash of the license file has changed: the BSD-3-Clause and MPL-2.0
licenses were added to it. Indeed, it turns out that some third-party code is BSD licensed and that the certificate store is MPL-licensed. So I created a separate commit that adds those to LICENSE [Peter: for stable]. And of course I updated the license hash in this patch and applied to master, thanks!

I think that this is the first time that I see the license hash doing what it
was meant to do: detecting that we need to update the license information.

Regards,
Arnout

Quoted 6 lines
package/grpc/grpc.mk +0 -0
index 1bb4bd2b98..df23a4a3ff 100644

package/grpc/grpc.mk line 10

Quoted 8 lines
package/grpc/grpc.mk +1 -1
@@ -4,7 +4,7 @@
  #
  ################################################################################
 
-GRPC_VERSION = 1.41.0
+GRPC_VERSION = 1.42.0
  GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION))
  GRPC_LICENSE = Apache-2.0
  GRPC_LICENSE_FILES = LICENSE

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot