git_repo.patch 4.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081
  1. diff --git a/third_party/boringssl b/third_party/boringssl
  2. index c880e42ba1..70ef9596bb 160000
  3. --- a/third_party/boringssl
  4. +++ b/third_party/boringssl
  5. @@ -1 +1 @@
  6. -Subproject commit c880e42ba1c8032d4cdde2aba0541d8a9d9fa2e9
  7. +Subproject commit 70ef9596bbcc11353b9bb8d4e91478694dd21439
  8. diff --git a/third_party/gflags b/third_party/gflags
  9. index 05b155ff59..30dbc81fb5 160000
  10. --- a/third_party/gflags
  11. +++ b/third_party/gflags
  12. @@ -1 +1 @@
  13. -Subproject commit 05b155ff59114735ec8cd089f669c4c3d8f59029
  14. +Subproject commit 30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e
  15. diff --git a/third_party/googletest b/third_party/googletest
  16. index c99458533a..ec44c6c167 160000
  17. --- a/third_party/googletest
  18. +++ b/third_party/googletest
  19. @@ -1 +1 @@
  20. -Subproject commit c99458533a9b4c743ed51537e25989ea55944908
  21. +Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780
  22. diff --git a/third_party/protobuf b/third_party/protobuf
  23. index 1a58673508..b5fbb742af 160000
  24. --- a/third_party/protobuf
  25. +++ b/third_party/protobuf
  26. @@ -1 +1 @@
  27. -Subproject commit 1a586735085e817b1f52e53feec92ce418049f69
  28. +Subproject commit b5fbb742af122b565925987e65c08957739976a7
  29. diff --git a/third_party/zlib b/third_party/zlib
  30. index 5089329162..cacf7f1d4e 160000
  31. --- a/third_party/zlib
  32. +++ b/third_party/zlib
  33. @@ -1 +1 @@
  34. -Subproject commit 50893291621658f355bc5b4d450a8d06a563053d
  35. +Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f
  36. diff --git a/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile
  37. index da1d2c645e..f405994293 100644
  38. --- a/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile
  39. +++ b/tools/dockerfile/interoptest/grpc_interop_csharp/Dockerfile
  40. @@ -67,11 +67,10 @@ RUN apt-get update && apt-get install -y time && apt-get clean
  41. # C# dependencies
  42. # Update to a newer version of mono
  43. -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
  44. -RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list
  45. +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
  46. +RUN echo "deb http://download.mono-project.com/repo/debian wheezy/snapshots/4.6 main" | tee /etc/apt/sources.list.d/official.list
  47. RUN echo "deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
  48. RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
  49. -RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
  50. # Install dependencies
  51. RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y \
  52. diff --git a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile
  53. index 65f67d3650..26223753ed 100644
  54. --- a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile
  55. +++ b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile
  56. @@ -82,11 +82,10 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2
  57. # C# dependencies
  58. # Update to a newer version of mono
  59. -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
  60. -RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list
  61. +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
  62. +RUN echo "deb http://download.mono-project.com/repo/debian jessie main" | tee /etc/apt/sources.list.d/mono-official.list
  63. RUN echo "deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
  64. RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
  65. -RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list
  66. # Install dependencies
  67. RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y \
  68. @@ -99,7 +98,8 @@ RUN nuget update -self
  69. # Install dotnet SDK based on https://www.microsoft.com/net/core#debian
  70. RUN apt-get update && apt-get install -y curl libunwind8 gettext
  71. -RUN curl -sSL -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=809130
  72. +# https://github.com/dotnet/core/blob/master/release-notes/download-archives/1.0.1-preview2-download.md
  73. +RUN curl -sSL -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=827530
  74. RUN mkdir -p /opt/dotnet && tar zxf dotnet.tar.gz -C /opt/dotnet
  75. RUN ln -s /opt/dotnet/dotnet /usr/local/bin