Bump to grpc 1.20.1 accepted/tizen_6.0_unified accepted/tizen_6.0_unified_hotfix sandbox/backup/grpc-1.20.1_20210127 tizen_6.0 tizen_6.0_hotfix accepted/tizen/6.0/unified/20201030.110405 accepted/tizen/6.0/unified/hotfix/20201102.233342 accepted/tizen/6.0/unified/hotfix/20201103.051255 accepted/tizen/unified/20200311.130912 submit/tizen/20200310.055521 submit/tizen_6.0/20201029.205502 submit/tizen_6.0_hotfix/20201102.192902 submit/tizen_6.0_hotfix/20201103.115102 tizen_6.0.m2_release
authorDongHun Kwak <dh0128.kwak@samsung.com>
Tue, 10 Mar 2020 05:36:01 +0000 (14:36 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Tue, 10 Mar 2020 05:36:01 +0000 (14:36 +0900)
Change-Id: Ie68d558e59569cb87e3fd001c18bed24b1a459d3

68 files changed:
.github/CODEOWNERS [deleted file]
.github/ISSUE_TEMPLATE.md [deleted file]
.github/lock.yml [deleted file]
.github/mergeable.yml [deleted file]
.gitignore [deleted file]
doc/.gitignore [deleted file]
examples/android/helloworld/.gitignore [deleted file]
examples/android/helloworld/app/.gitignore [deleted file]
examples/csharp/.gitignore [deleted file]
examples/csharp/HelloworldLegacyCsproj/Greeter/.gitignore [deleted file]
examples/csharp/HelloworldLegacyCsproj/GreeterClient/.gitignore [deleted file]
examples/csharp/HelloworldLegacyCsproj/GreeterServer/.gitignore [deleted file]
examples/csharp/HelloworldUnity/.gitignore [deleted file]
examples/csharp/HelloworldXamarin/.gitignore [deleted file]
examples/csharp/RouteGuide/.gitignore [deleted file]
examples/node/.gitignore [deleted file]
examples/php/.gitignore [deleted file]
examples/python/helloworld/.gitignore [deleted file]
examples/python/multiplex/.gitignore [deleted file]
examples/python/route_guide/.gitignore [deleted file]
examples/ruby/.gitignore [deleted file]
examples/ruby/pubsub/.gitignore [deleted file]
packaging/0001-Change-install-command-at-Makefile.patch [new file with mode: 0644]
packaging/0002-Migrate-to-openssl-1.1.patch [new file with mode: 0644]
packaging/0003-tizen_6_build-Rename-gettid-functions.patch [new file with mode: 0644]
packaging/grpc.manifest [new file with mode: 0644]
packaging/grpc.spec [new file with mode: 0644]
src/android/test/interop/.gitignore [deleted file]
src/android/test/interop/app/.gitignore [deleted file]
src/csharp/.gitignore [deleted file]
src/csharp/Grpc.Auth/.gitignore [deleted file]
src/csharp/Grpc.Core.Api/.gitignore [deleted file]
src/csharp/Grpc.Core.NativeDebug/.gitignore [deleted file]
src/csharp/Grpc.Core.Testing/.gitignore [deleted file]
src/csharp/Grpc.Core.Tests/.gitignore [deleted file]
src/csharp/Grpc.Core/.gitignore [deleted file]
src/csharp/Grpc.Examples.MathClient/.gitignore [deleted file]
src/csharp/Grpc.Examples.MathServer/.gitignore [deleted file]
src/csharp/Grpc.Examples.Tests/.gitignore [deleted file]
src/csharp/Grpc.Examples/.gitignore [deleted file]
src/csharp/Grpc.HealthCheck.Tests/.gitignore [deleted file]
src/csharp/Grpc.HealthCheck/.gitignore [deleted file]
src/csharp/Grpc.IntegrationTesting.Client/.gitignore [deleted file]
src/csharp/Grpc.IntegrationTesting.QpsWorker/.gitignore [deleted file]
src/csharp/Grpc.IntegrationTesting.Server/.gitignore [deleted file]
src/csharp/Grpc.IntegrationTesting.StressClient/.gitignore [deleted file]
src/csharp/Grpc.IntegrationTesting/.gitignore [deleted file]
src/csharp/Grpc.Microbenchmarks/.gitignore [deleted file]
src/csharp/Grpc.Reflection.Tests/.gitignore [deleted file]
src/csharp/Grpc.Reflection/.gitignore [deleted file]
src/csharp/Grpc/.gitignore [deleted file]
src/csharp/doc/.gitignore [deleted file]
src/php/.gitignore [deleted file]
src/python/.gitignore [deleted file]
src/python/grpcio/.gitignore [deleted file]
src/python/grpcio/grpc/_cython/.gitignore [deleted file]
src/python/grpcio_channelz/.gitignore [deleted file]
src/python/grpcio_health_checking/.gitignore [deleted file]
src/python/grpcio_reflection/.gitignore [deleted file]
src/python/grpcio_status/.gitignore [deleted file]
src/python/grpcio_tests/.gitignore [deleted file]
src/python/grpcio_tests/tests/unit/_cython/.gitignore [deleted file]
src/ruby/.gitignore [deleted file]
test/distrib/csharp/.gitignore [deleted file]
test/distrib/csharp/DistribTest/.gitignore [deleted file]
third_party/nanopb/.gitignore [deleted file]
tools/distrib/python/.gitignore [deleted file]
tools/distrib/python/grpcio_tools/.gitignore [deleted file]

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644 (file)
index 1fcdb6b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# Auto-generated by the tools/mkowners/mkowners.py tool
-# Uses OWNERS files in different modules throughout the
-# repository as the source of truth for module ownership.
-/**/OWNERS @markdroth @nicolasnoble @a11r
-/bazel/** @nicolasnoble @jtattermusch @a11r @vjpai
-/cmake/** @jtattermusch @nicolasnoble @apolcyn
-/src/core/ext/filters/client_channel/** @markdroth @apolcyn @AspirinSJL
-/tools/dockerfile/** @jtattermusch @apolcyn @nicolasnoble
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100755 (executable)
index acfcdc1..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-
-This form is for bug reports and feature requests ONLY!
-For general questions and troubleshooting, please ask/look for answers here:
-- grpc.io mailing list: https://groups.google.com/forum/#!forum/grpc-io
-- StackOverflow, with "grpc" tag: https://stackoverflow.com/questions/tagged/grpc
-
-Issues specific to *grpc-java*, *grpc-go*, *grpc-node*, *grpc-dart*, *grpc-web* should be created in the repository they belong to (e.g. https://github.com/grpc/grpc-LANGUAGE/issues/new)
--->
-### What version of gRPC and what language are you using?
-### What operating system (Linux, Windows,...) and version?
-### What runtime / compiler are you using (e.g. python version or version of gcc)
-### What did you do?
-If possible, provide a recipe for reproducing the error. Try being specific and include code snippets if helpful.
-### What did you expect to see?
-### What did you see instead?
-Make sure you include information that can help us debug (full error message, exception listing, stack trace, logs).
-
-See [TROUBLESHOOTING.md](https://github.com/grpc/grpc/blob/master/TROUBLESHOOTING.md) for how to diagnose problems better.
-### Anything else we should know about your project / environment?
-
diff --git a/.github/lock.yml b/.github/lock.yml
deleted file mode 100644 (file)
index 119e484..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-daysUntilLock: 90
-lockComment: false
diff --git a/.github/mergeable.yml b/.github/mergeable.yml
deleted file mode 100644 (file)
index a10ae9b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-mergeable:
-  pull_requests:
-    label:
-      and:
-        - must_exclude:
-            regex: '^disposition/DO NOT MERGE'
-            message: 'Pull request marked not mergeable'
-        - or:
-          - and:
-            - must_include:
-                regex: 'release notes: yes'
-                message: 'Please include release note: yes'
-            - must_include:
-                regex: '^lang\/'
-                message: 'Please include a language label'
-          - must_include:
-              regex: 'release notes: no'
-              message: 'Please include release note: no'
diff --git a/.gitignore b/.gitignore
deleted file mode 100644 (file)
index cde82bc..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-# C/C++ build outputs
-.build/
-bins
-gens
-libs
-objs
-
-# Python items
-cython_debug/
-python_build/
-yapf_virtual_environment/
-python_pylint_venv/
-.coverage*
-.eggs
-htmlcov/
-dist/
-*.egg
-py27_gevent/
-py27_native/
-py3[0-9]_gevent/
-py3[0-9]_native/
-
-# Node installation output
-node_modules
-src/node/extension_binary/
-
-# gcov coverage data
-reports
-coverage
-*.gcno
-
-# profiler output
-*.prof
-
-# python compiled objects
-*.pyc
-
-# eclipse project files
-.cproject
-.project
-.settings
-
-# cache for run_tests.py
-.run_tests_cache
-.preprocessed_build
-
-# emacs temp files
-*~
-
-# vim temp files
-.*.swp
-
-# Makefile's cache
-cache.mk
-
-# Ruby's local gem information
-Gemfile.lock
-
-# Temporary test reports
-report.xml
-*/sponge_log.xml
-latency_trace.txt
-latency_trace.*.txt
-
-# port server log
-portlog.txt
-
-# gyp generated make files
-*-gyp.mk
-out
-
-# YCM config files
-.ycm_extra_conf.py
-
-# XCode
-^build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-*.xcuserstate
-*.DS_Store
-
-# Objective-C generated files
-*.pbobjc.*
-*.pbrpc.*
-
-# Cocoapods artifacts
-Pods/
-Podfile.lock
-*.xcworkspace
-
-# Artifacts directory
-/artifacts/
-
-# Git generated files for conflicting
-*.orig
-
-# IDE specific folder for JetBrains IDEs
-.idea/
-
-# Blaze files
-bazel-bin
-bazel-genfiles
-bazel-grpc
-bazel-out
-bazel-testlogs
-
-# Debug output
-gdb.txt
-
-# ctags file
-tags
-
-# perf data
-memory_usage.csv
-perf.data
-perf.data.old
-
-# bm_diff
-bm_diff_new/
-bm_diff_old/
-bm_*.json
-
-# cmake build files
-/cmake/build
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644 (file)
index 95464d3..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-build/
-src/
diff --git a/examples/android/helloworld/.gitignore b/examples/android/helloworld/.gitignore
deleted file mode 100644 (file)
index 39fb081..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-.externalNativeBuild
diff --git a/examples/android/helloworld/app/.gitignore b/examples/android/helloworld/app/.gitignore
deleted file mode 100644 (file)
index 796b96d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/examples/csharp/.gitignore b/examples/csharp/.gitignore
deleted file mode 100644 (file)
index 11f758f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-.vs/
-bin/
-obj/
-packages/
-*.suo
-*.user
-*.userprefs
diff --git a/examples/csharp/HelloworldLegacyCsproj/Greeter/.gitignore b/examples/csharp/HelloworldLegacyCsproj/Greeter/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/examples/csharp/HelloworldLegacyCsproj/GreeterClient/.gitignore b/examples/csharp/HelloworldLegacyCsproj/GreeterClient/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/examples/csharp/HelloworldLegacyCsproj/GreeterServer/.gitignore b/examples/csharp/HelloworldLegacyCsproj/GreeterServer/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/examples/csharp/HelloworldUnity/.gitignore b/examples/csharp/HelloworldUnity/.gitignore
deleted file mode 100644 (file)
index 6245af9..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-[Ll]ibrary/
-[Tt]emp/
-[Oo]bj/
-[Bb]uild/
-[Bb]uilds/
-[Ll]ogs/
-
-# Never ignore Asset meta data
-![Aa]ssets/**/*.meta
-
-# Uncomment this line if you wish to ignore the asset store tools plugin
-# [Aa]ssets/AssetStoreTools*
-
-# Visual Studio cache directory
-.vs/
-
-# Gradle cache directory
-.gradle/
-
-# Autogenerated VS/MD/Consulo solution and project files
-ExportedObj/
-.consulo/
-*.csproj
-*.unityproj
-*.sln
-*.suo
-*.tmp
-*.user
-*.userprefs
-*.pidb
-*.booproj
-*.svd
-*.pdb
-*.mdb
-*.opendb
-*.VC.db
-
-# Unity3D generated meta files
-*.pidb.meta
-*.pdb.meta
-*.mdb.meta
-
-# Unity3D generated file on crash reports
-sysinfo.txt
-
-# Builds
-*.apk
-*.unitypackage
-
-# Crashlytics generated file
-crashlytics-build.properties
-
diff --git a/examples/csharp/HelloworldXamarin/.gitignore b/examples/csharp/HelloworldXamarin/.gitignore
deleted file mode 100644 (file)
index bf793ed..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# Autosave files\r
-*~\r
-\r
-# build\r
-[Oo]bj/\r
-[Bb]in/\r
-packages/\r
-TestResults/\r
-\r
-# globs\r
-Makefile.in\r
-*.DS_Store\r
-*.sln.cache\r
-*.suo\r
-*.cache\r
-*.pidb\r
-*.userprefs\r
-*.usertasks\r
-config.log\r
-config.make\r
-config.status\r
-aclocal.m4\r
-install-sh\r
-autom4te.cache/\r
-*.user\r
-*.tar.gz\r
-tarballs/\r
-test-results/\r
-Thumbs.db\r
-.vs/\r
-\r
-# Mac bundle stuff\r
-*.dmg\r
-*.app\r
-\r
-# resharper\r
-*_Resharper.*\r
-*.Resharper\r
-\r
-# dotCover\r
-*.dotCover\r
diff --git a/examples/csharp/RouteGuide/.gitignore b/examples/csharp/RouteGuide/.gitignore
deleted file mode 100644 (file)
index 585000e..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/
-obj/
-packages/
-*.suo
-*.userprefs
diff --git a/examples/node/.gitignore b/examples/node/.gitignore
deleted file mode 100644 (file)
index 3d06f5d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-*~
-node_modules
-npm-debug.log
\ No newline at end of file
diff --git a/examples/php/.gitignore b/examples/php/.gitignore
deleted file mode 100644 (file)
index d8a7996..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-composer.lock
-vendor/
diff --git a/examples/python/helloworld/.gitignore b/examples/python/helloworld/.gitignore
deleted file mode 100644 (file)
index 0d20b64..0000000
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/examples/python/multiplex/.gitignore b/examples/python/multiplex/.gitignore
deleted file mode 100644 (file)
index 0d20b64..0000000
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/examples/python/route_guide/.gitignore b/examples/python/route_guide/.gitignore
deleted file mode 100644 (file)
index 0d20b64..0000000
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/examples/ruby/.gitignore b/examples/ruby/.gitignore
deleted file mode 100644 (file)
index 62fcb4f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-vendor
diff --git a/examples/ruby/pubsub/.gitignore b/examples/ruby/pubsub/.gitignore
deleted file mode 100644 (file)
index 62fcb4f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-vendor
diff --git a/packaging/0001-Change-install-command-at-Makefile.patch b/packaging/0001-Change-install-command-at-Makefile.patch
new file mode 100644 (file)
index 0000000..b8c958a
--- /dev/null
@@ -0,0 +1,45 @@
+From 2570adb1aa76a24ce74dfcd9932ee757db4d2b38 Mon Sep 17 00:00:00 2001
+From: DongHun Kwak <dh0128.kwak@samsung.com>
+Date: Tue, 7 May 2019 14:45:58 +0900
+Subject: [PATCH 1/3] Change install command at Makefile
+
+- fix build error at obs (Argument list too long)
+- change foreach statement to for statement
+
+Change-Id: Ibdfcd27e8bd586a304a83e47f2bde8815eb5e049
+Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
+---
+ Makefile | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7ed6a6a..4ddd3cf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2990,13 +2990,19 @@ install-headers: install-headers_c install-headers_cxx
+ install-headers_c:
+       $(E) "[INSTALL] Installing public C headers"
+-      $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+-      $(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++      @for header in `echo $(PUBLIC_HEADERS_C)`; \
++      do \
++              $(INSTALL) -d $(prefix)/$$(dirname $$header); \
++              $(INSTALL) $$header $(prefix)/$$header; \
++      done
+ install-headers_cxx:
+       $(E) "[INSTALL] Installing public C++ headers"
+-      $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
+-      $(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
++      @for header in `echo $(PUBLIC_HEADERS_CXX)`; \
++      do \
++              $(INSTALL) -d $(prefix)/$$(dirname $$header); \
++              $(INSTALL) $$header $(prefix)/$$header; \
++      done
+ install-static: install-static_c install-static_cxx
+-- 
+2.7.4
+
diff --git a/packaging/0002-Migrate-to-openssl-1.1.patch b/packaging/0002-Migrate-to-openssl-1.1.patch
new file mode 100644 (file)
index 0000000..4eb660a
--- /dev/null
@@ -0,0 +1,50 @@
+From c479a18227d2171fc4c2565fd38e905bd945026f Mon Sep 17 00:00:00 2001
+From: Dariusz Michaluk <d.michaluk@samsung.com>
+Date: Thu, 18 Jul 2019 15:05:24 +0200
+Subject: [PATCH 2/3] Migrate to openssl 1.1
+
+Change-Id: Ie5b7c20fab22ba507f256f0adb5cfe5282e21f02
+---
+ Makefile            | 12 ++++++------
+ packaging/grpc.spec |  2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4ddd3cf..33753a8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -517,7 +517,7 @@ IS_GIT_FOLDER = true
+ endif
+ ifeq ($(HAS_PKG_CONFIG),true)
+-OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl
++OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl1.1
+ ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib
+ PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.5.0 protobuf
+ CARES_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.11.0 libcares
+@@ -742,12 +742,12 @@ CPPFLAGS := -I$(EMBED_OPENSSL)/include $(CPPFLAGS)
+ else # EMBED_OPENSSL=false
+ ifeq ($(HAS_PKG_CONFIG),true)
+ OPENSSL_PKG_CONFIG = true
+-PC_REQUIRES_SECURE = openssl
+-CPPFLAGS := $(shell $(PKG_CONFIG) --cflags openssl) $(CPPFLAGS)
+-LDFLAGS_OPENSSL_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L openssl)
++PC_REQUIRES_SECURE = openssl1.1
++CPPFLAGS := $(shell $(PKG_CONFIG) --cflags openssl1.1) $(CPPFLAGS)
++LDFLAGS_OPENSSL_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L openssl1.1)
+ ifeq ($(SYSTEM),Linux)
+ ifneq ($(LDFLAGS_OPENSSL_PKG_CONFIG),)
+-LDFLAGS_OPENSSL_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L openssl | sed s/L/Wl,-rpath,/)
++LDFLAGS_OPENSSL_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L openssl1.1 | sed s/L/Wl,-rpath,/)
+ endif # LDFLAGS_OPENSSL_PKG_CONFIG=''
+ endif # System=Linux
+ LDFLAGS := $(LDFLAGS_OPENSSL_PKG_CONFIG) $(LDFLAGS)
+@@ -763,7 +763,7 @@ endif # EMBED_OPENSSL
+ endif # NO_SECURE
+ ifeq ($(OPENSSL_PKG_CONFIG),true)
+-LDLIBS_SECURE += $(shell $(PKG_CONFIG) --libs-only-l openssl)
++LDLIBS_SECURE += $(shell $(PKG_CONFIG) --libs-only-l openssl1.1)
+ else
+ LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE))
+ endif
diff --git a/packaging/0003-tizen_6_build-Rename-gettid-functions.patch b/packaging/0003-tizen_6_build-Rename-gettid-functions.patch
new file mode 100644 (file)
index 0000000..9446bf1
--- /dev/null
@@ -0,0 +1,86 @@
+From 58542cb31e1a1d973d9a71017c7c431613c3407c Mon Sep 17 00:00:00 2001
+From: Benjamin Peterson <benjamin@dropbox.com>
+Date: Fri, 3 May 2019 08:11:00 -0700
+Subject: [PATCH 3/3] [tizen_6_build] Rename gettid() functions.
+
+glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
+
+(cherry picked from commit 57586a1ca7f17b1916aed3dea4ff8de872dbf853)
+
+Change-Id: I29c34cc0a68140bb5ba728a44eb0e1d38819b20a
+Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>
+---
+ src/core/lib/gpr/log_linux.cc          | 4 ++--
+ src/core/lib/gpr/log_posix.cc          | 4 ++--
+ src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
+index 561276f..8b597b4 100644
+--- a/src/core/lib/gpr/log_linux.cc
++++ b/src/core/lib/gpr/log_linux.cc
+@@ -40,7 +40,7 @@
+ #include <time.h>
+ #include <unistd.h>
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
+   struct tm tm;
+   static __thread long tid = 0;
+-  if (tid == 0) tid = gettid();
++  if (tid == 0) tid = sys_gettid();
+   timer = static_cast<time_t>(now.tv_sec);
+   final_slash = strrchr(args->file, '/');
+diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc
+index 0acb225..cd0b702 100644
+--- a/src/core/lib/gpr/log_posix.cc
++++ b/src/core/lib/gpr/log_posix.cc
+@@ -30,7 +30,7 @@
+ #include <string.h>
+ #include <time.h>
+-static intptr_t gettid(void) { return (intptr_t)pthread_self(); }
++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+@@ -85,7 +85,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+   char* prefix;
+   gpr_asprintf(&prefix, "%s%s.%09d %7tu %s:%d]",
+                gpr_log_severity_string(args->severity), time_buffer,
+-               (int)(now.tv_nsec), gettid(), display_file, args->line);
++               (int)(now.tv_nsec), sys_gettid(), display_file, args->line);
+   fprintf(stderr, "%-70s %s\n", prefix, args->message);
+   gpr_free(prefix);
+diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
+index 7a4870d..4258ded 100644
+--- a/src/core/lib/iomgr/ev_epollex_linux.cc
++++ b/src/core/lib/iomgr/ev_epollex_linux.cc
+@@ -1150,7 +1150,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
+ }
+ #ifndef NDEBUG
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+ #endif
+ /* pollset->mu lock must be held by the caller before calling this.
+@@ -1170,7 +1170,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
+ #define WORKER_PTR (&worker)
+ #endif
+ #ifndef NDEBUG
+-  WORKER_PTR->originator = gettid();
++  WORKER_PTR->originator = sys_gettid();
+ #endif
+   if (grpc_polling_trace.enabled()) {
+     gpr_log(GPR_INFO,
+-- 
+2.7.4
+
diff --git a/packaging/grpc.manifest b/packaging/grpc.manifest
new file mode 100644 (file)
index 0000000..017d22d
--- /dev/null
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>
diff --git a/packaging/grpc.spec b/packaging/grpc.spec
new file mode 100644 (file)
index 0000000..070ca45
--- /dev/null
@@ -0,0 +1,111 @@
+#
+# spec file for package grpc
+#
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define lname libgrpc
+%define src_install_dir /usr/src/%{name}
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+Name:           grpc
+Version:        1.20.1
+Release:        0
+Summary:        HTTP/2-based Remote Procedure Call implementation
+License:        Apache-2.0
+Group:          Development/Tools/Building
+Url:            http://grpc.io/
+Source:         https://github.com/grpc/grpc/archive/v%{version}.tar.gz
+Source101:      0001-Change-install-command-at-Makefile.patch 
+Source102:      0002-Migrate-to-openssl-1.1.patch
+Source103:      0003-tizen_6_build-Rename-gettid-functions.patch
+Source1001:     grpc.manifest
+BuildRequires:  python-cython
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools
+# BuildRequires:  python-rpm-macros
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
+BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(libcares)
+BuildRequires:  pkgconfig(openssl1.1) >= 1.0.1
+BuildRequires:  pkgconfig(protobuf) >= 3.5
+BuildRequires:  pkgconfig(zlib)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+The reference implementation of the gRPC protocol, done on top of
+HTTP/2 with support for synchronous and asynchronous calls. gRPC uses
+Protocol Buffers as the Interface Definition Language by default.
+
+%package -n %lname
+Summary:        HTTP/2-based Remote Procedure Call implementation
+Group:          System/Libraries
+
+%description -n %lname
+The reference implementation of the gRPC protocol, done on top of
+HTTP/2 with support for synchronous and asynchronous calls. gRPC uses
+Protocol Buffers as the Interface Definition Language by default.
+
+%package devel
+Summary:        Development files for grpc, a HTTP/2 Remote Procedure Call implementation
+Group:          Development/Tools/Building
+Requires:       %lname = %version
+
+%description devel
+This subpackage contains libraries and header files for developing
+applications that want to make use of the gRPC reference implementation.
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+%{__patch} -p1 < %{SOURCE101}
+%{__patch} -p1 < %{SOURCE102}
+%{__patch} -p1 < %{SOURCE103}
+
+%build
+make %{?_smp_mflags} STRIP=/bin/true V=1 VERBOSE=1 \
+       CFLAGS="%optflags -Wno-error" CXXFLAGS="%optflags -Wno-error"
+
+%install
+b="%buildroot"
+make prefix="$b/%_prefix" STRIP=/bin/true V=1 VERBOSE=1 install
+find "$b/%_includedir" -type f -exec chmod a-x {} +
+pushd "$b/usr"
+rm -fv lib/*.a share/grpc/*.pem
+perl -i -pe 's{^prefix=.*}{prefix=%_prefix}' lib/pkgconfig/*.pc
+perl -i -pe 's{^libdir=.*}{libdir=%_libdir}' lib/pkgconfig/*.pc
+if test ! -d lib64 && test "%_lib" = lib64; then
+       mv lib lib64
+fi
+popd
+
+%post   -n %lname -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
+
+%files -n %lname
+%defattr(-,root,root)
+%_libdir/libaddress_sorting.so.*
+%_libdir/libgpr*.so.*
+%_libdir/libgrpc*.so.*
+
+%files devel
+%defattr(-,root,root)
+%license LICENSE
+%_bindir/*
+%_includedir/*
+%_libdir/pkgconfig/*.pc
+%_libdir/*.so
+
+%changelog
diff --git a/src/android/test/interop/.gitignore b/src/android/test/interop/.gitignore
deleted file mode 100644 (file)
index 39fb081..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-.externalNativeBuild
diff --git a/src/android/test/interop/app/.gitignore b/src/android/test/interop/app/.gitignore
deleted file mode 100644 (file)
index 796b96d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/src/csharp/.gitignore b/src/csharp/.gitignore
deleted file mode 100644 (file)
index 6fd7648..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-*.userprefs
-*.user
-*.lock.json
-/*.suo
-/*.sdf
-/.vs/
-bin/
-obj/
-*.nupkg
-StyleCop.Cache
-/packages/
-/protoc_plugins/
-
-test-results/
-TestResult.xml
-coverage_results.xml
-/TestResults
diff --git a/src/csharp/Grpc.Auth/.gitignore b/src/csharp/Grpc.Auth/.gitignore
deleted file mode 100644 (file)
index c2dd664..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-obj
-*.nupkg
diff --git a/src/csharp/Grpc.Core.Api/.gitignore b/src/csharp/Grpc.Core.Api/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/Grpc.Core.NativeDebug/.gitignore b/src/csharp/Grpc.Core.NativeDebug/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/Grpc.Core.Testing/.gitignore b/src/csharp/Grpc.Core.Testing/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/Grpc.Core.Tests/.gitignore b/src/csharp/Grpc.Core.Tests/.gitignore
deleted file mode 100644 (file)
index 775a944..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-test-results
-bin
-obj
\ No newline at end of file
diff --git a/src/csharp/Grpc.Core/.gitignore b/src/csharp/Grpc.Core/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/Grpc.Examples.MathClient/.gitignore b/src/csharp/Grpc.Examples.MathClient/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/Grpc.Examples.MathServer/.gitignore b/src/csharp/Grpc.Examples.MathServer/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/Grpc.Examples.Tests/.gitignore b/src/csharp/Grpc.Examples.Tests/.gitignore
deleted file mode 100644 (file)
index 4795a95..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-test-results
-bin
-obj
diff --git a/src/csharp/Grpc.Examples/.gitignore b/src/csharp/Grpc.Examples/.gitignore
deleted file mode 100644 (file)
index 4795a95..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-test-results
-bin
-obj
diff --git a/src/csharp/Grpc.HealthCheck.Tests/.gitignore b/src/csharp/Grpc.HealthCheck.Tests/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/Grpc.HealthCheck/.gitignore b/src/csharp/Grpc.HealthCheck/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/Grpc.IntegrationTesting.Client/.gitignore b/src/csharp/Grpc.IntegrationTesting.Client/.gitignore
deleted file mode 100644 (file)
index a382af2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-obj
-
diff --git a/src/csharp/Grpc.IntegrationTesting.QpsWorker/.gitignore b/src/csharp/Grpc.IntegrationTesting.QpsWorker/.gitignore
deleted file mode 100644 (file)
index a382af2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-obj
-
diff --git a/src/csharp/Grpc.IntegrationTesting.Server/.gitignore b/src/csharp/Grpc.IntegrationTesting.Server/.gitignore
deleted file mode 100644 (file)
index a382af2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-obj
-
diff --git a/src/csharp/Grpc.IntegrationTesting.StressClient/.gitignore b/src/csharp/Grpc.IntegrationTesting.StressClient/.gitignore
deleted file mode 100644 (file)
index a382af2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-obj
-
diff --git a/src/csharp/Grpc.IntegrationTesting/.gitignore b/src/csharp/Grpc.IntegrationTesting/.gitignore
deleted file mode 100644 (file)
index 8d4a6c0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
\ No newline at end of file
diff --git a/src/csharp/Grpc.Microbenchmarks/.gitignore b/src/csharp/Grpc.Microbenchmarks/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/Grpc.Reflection.Tests/.gitignore b/src/csharp/Grpc.Reflection.Tests/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/Grpc.Reflection/.gitignore b/src/csharp/Grpc.Reflection/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/Grpc/.gitignore b/src/csharp/Grpc/.gitignore
deleted file mode 100644 (file)
index 1746e32..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-obj
diff --git a/src/csharp/doc/.gitignore b/src/csharp/doc/.gitignore
deleted file mode 100644 (file)
index 09ee235..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-html
-obj
diff --git a/src/php/.gitignore b/src/php/.gitignore
deleted file mode 100644 (file)
index f124cbc..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-.libs/
-build/
-modules/
-autom4te.cache/
-*.lo
-*.la
-.deps
-acinclude.m4
-aclocal.m4
-config.*
-configure*
-Makefile*
-run-tests.php
-
-install-sh
-libtool
-missing
-mkinstalldirs
-
-ext/grpc/ltmain.sh
-composer.lock
-vendor/
-
-*.pb.php
-*_grpc_pb.php
diff --git a/src/python/.gitignore b/src/python/.gitignore
deleted file mode 100644 (file)
index 4181312..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-gens/
-*_pb2.py
-*_pb2_grpc.py
-*.egg-info/
diff --git a/src/python/grpcio/.gitignore b/src/python/grpcio/.gitignore
deleted file mode 100644 (file)
index d0ee1e1..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-MANIFEST
-*.egg-info/
-build/
-dist/
-*.egg
-*.egg/
-*.eggs/
-*_pb2.py
-.coverage
-.coverage.*
-.cache/
-nosetests.xml
-doc/
-htmlcov/
-grpc/_cython/_credentials
-poison.c
diff --git a/src/python/grpcio/grpc/_cython/.gitignore b/src/python/grpcio/grpc/_cython/.gitignore
deleted file mode 100644 (file)
index b9936e9..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-cygrpc.cpp
-*.a
-*.so
-*.dll
-*.pyc
-*.pyd
diff --git a/src/python/grpcio_channelz/.gitignore b/src/python/grpcio_channelz/.gitignore
deleted file mode 100644 (file)
index 0c5da6b..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-*.proto
-*_pb2.py
-*_pb2_grpc.py
-build/
-grpcio_channelz.egg-info/
-dist/
diff --git a/src/python/grpcio_health_checking/.gitignore b/src/python/grpcio_health_checking/.gitignore
deleted file mode 100644 (file)
index 432c319..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-*.proto
-*_pb2.py
-*_pb2_grpc.py
-build/
-grpcio_health_checking.egg-info/
-dist/
diff --git a/src/python/grpcio_reflection/.gitignore b/src/python/grpcio_reflection/.gitignore
deleted file mode 100644 (file)
index c0befdc..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-*.proto
-*_pb2.py
-build/
-grpcio_reflection.egg-info/
-dist/
diff --git a/src/python/grpcio_status/.gitignore b/src/python/grpcio_status/.gitignore
deleted file mode 100644 (file)
index 19d1523..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-build/
-grpcio_status.egg-info/
-dist/
diff --git a/src/python/grpcio_tests/.gitignore b/src/python/grpcio_tests/.gitignore
deleted file mode 100644 (file)
index 4f00cd9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/src/
diff --git a/src/python/grpcio_tests/tests/unit/_cython/.gitignore b/src/python/grpcio_tests/tests/unit/_cython/.gitignore
deleted file mode 100644 (file)
index c315029..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-*.h
-*.c
-*.a
-*.so
-*.dll
-*.pyc
-*.pyd
diff --git a/src/ruby/.gitignore b/src/ruby/.gitignore
deleted file mode 100755 (executable)
index 62fcb4f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-vendor
diff --git a/test/distrib/csharp/.gitignore b/test/distrib/csharp/.gitignore
deleted file mode 100644 (file)
index 52503c7..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-packages
-*.userprefs
-*.csproj.user
-*.suo
-/TestNugetFeed
-
diff --git a/test/distrib/csharp/DistribTest/.gitignore b/test/distrib/csharp/DistribTest/.gitignore
deleted file mode 100644 (file)
index 07f3d57..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-obj
-*.lock.json
diff --git a/third_party/nanopb/.gitignore b/third_party/nanopb/.gitignore
deleted file mode 100644 (file)
index 3bb09db..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-*.gcda
-*.gcno
-*.gcov
-*.o
-*.pb.c
-*.pb.h
-*.pb
-*.pyc
-*_pb2.py
-*~
-*.tar.gz
-.sconsign.dblite
-config.log
-.sconf_temp
-tests/build
-julkaisu.txt
-dist
-docs/*.html
-docs/generator_flow.png
-examples/simple/simple
-examples/network_server/client
-examples/network_server/server
-examples/using_double_on_avr/decode_double
-examples/using_double_on_avr/encode_double
-examples/using_double_on_avr/test_conversions
-examples/using_union_messages/decode
-examples/using_union_messages/encode
-generator/nanopb_pb2.pyc
diff --git a/tools/distrib/python/.gitignore b/tools/distrib/python/.gitignore
deleted file mode 100644 (file)
index 8ff3b08..0000000
+++ /dev/null
@@ -1 +0,0 @@
-distrib_virtualenv/
diff --git a/tools/distrib/python/grpcio_tools/.gitignore b/tools/distrib/python/grpcio_tools/.gitignore
deleted file mode 100644 (file)
index 9f3a736..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-build/
-protobuf/
-grpc_plugin/
-grpc_root/
-*.c
-*.cpp
-*.egg-info
-*.so