From 03e2634173f8bb5eb1628b4ddcfe3b3f352e24c4 Mon Sep 17 00:00:00 2001
From: murgatroid99
Date: Wed, 25 Feb 2015 14:44:47 -0800
Subject: [PATCH 1/6] Updated dockerfile with correct node executable
---
tools/dockerfile/grpc_node_base/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/dockerfile/grpc_node_base/Dockerfile b/tools/dockerfile/grpc_node_base/Dockerfile
index 55ae608020108..20ed4cf7be2f5 100644
--- a/tools/dockerfile/grpc_node_base/Dockerfile
+++ b/tools/dockerfile/grpc_node_base/Dockerfile
@@ -34,7 +34,7 @@ FROM grpc/base
RUN curl -sL https://deb.nodesource.com/setup | bash -
-RUN apt-get update && apt-get install -y nodejs
+RUN apt-get update && apt-get install -y nodejs nodejs-legacy
RUN npm install -g node-gyp
From be8d1dae5e4d997288714838a7b83b61a8d3cf8a Mon Sep 17 00:00:00 2001
From: murgatroid99
Date: Wed, 25 Feb 2015 16:29:54 -0800
Subject: [PATCH 2/6] Added important Node package information and LICENSE file
for inclusion in Node package
---
src/node/LICENSE | 28 ++++++++++++++++++++++++++++
src/node/package.json | 11 ++++++++++-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 src/node/LICENSE
diff --git a/src/node/LICENSE b/src/node/LICENSE
new file mode 100644
index 0000000000000..0209b570e10da
--- /dev/null
+++ b/src/node/LICENSE
@@ -0,0 +1,28 @@
+Copyright 2015, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/node/package.json b/src/node/package.json
index e9995e7f0c738..8e0a7bdb25c59 100644
--- a/src/node/package.json
+++ b/src/node/package.json
@@ -1,7 +1,14 @@
{
"name": "grpc",
"version": "0.5.0",
+ "author": "Google Inc.",
"description": "gRPC Library for Node",
+ "contributors": [
+ {
+ "name": "Michael Lumish",
+ "email": "mlumish@google.com"
+ }
+ ],
"scripts": {
"lint": "node ./node_modules/jshint/bin/jshint src test examples interop index.js",
"test": "node ./node_modules/mocha/bin/mocha && npm run-script lint"
@@ -22,6 +29,7 @@
"strftime": "^0.8.2"
},
"files": [
+ "LICENSE",
"README.md",
"index.js",
"binding.gyp",
@@ -31,5 +39,6 @@
"src",
"test"
],
- "main": "index.js"
+ "main": "index.js",
+ "license": "BSD-3-Clause"
}
From c4a4288f830bcc9f0bd72b24fab824adb3a91f7a Mon Sep 17 00:00:00 2001
From: Tim Emiola
Date: Wed, 25 Feb 2015 16:45:19 -0800
Subject: [PATCH 3/6] Update grpc.gemspec
---
src/ruby/grpc.gemspec | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/ruby/grpc.gemspec b/src/ruby/grpc.gemspec
index 25a3ff5ce27a4..ed26fef4a97a3 100755
--- a/src/ruby/grpc.gemspec
+++ b/src/ruby/grpc.gemspec
@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
s.homepage = 'https://github.com/google/grpc/tree/master/src/ruby'
s.summary = 'GRPC system in Ruby'
s.description = 'Send RPCs from Ruby using GRPC'
+ s.license = 'BSD-3-Clause'
s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- spec/*`.split("\n")
From 87709366ae6bb89049593496f54e4b96e79a86ed Mon Sep 17 00:00:00 2001
From: Abhishek Kumar
Date: Wed, 25 Feb 2015 16:54:44 -0800
Subject: [PATCH 4/6] Update INSTALL
---
INSTALL | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/INSTALL b/INSTALL
index c12bea089fc25..3f1c5fe276368 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,8 +12,10 @@ wiki pages:
$ git clone https://github.com/grpc/grpc.git
$ git submodule update --init
- $ make
- $ sudo make install
+ $cd grpc
+
+ $ make
+ $ sudo make install
You don't need anything else than GNU Make, gcc and autotools. Under a Debian
or Ubuntu system, this should boil down to the following packages:
From 2deb9865e970d90c022df47b91082a156b12c379 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar
Date: Wed, 25 Feb 2015 16:55:58 -0800
Subject: [PATCH 5/6] Update INSTALL
---
INSTALL | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/INSTALL b/INSTALL
index 3f1c5fe276368..0b632f194450d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,7 +12,7 @@ wiki pages:
$ git clone https://github.com/grpc/grpc.git
$ git submodule update --init
- $cd grpc
+ $ cd grpc
$ make
$ sudo make install
From 28ab96c0bb44adf0c8a23c8fd7749ab11d6d7460 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch
Date: Thu, 26 Feb 2015 10:38:06 -0800
Subject: [PATCH 6/6] fix the version of debian package builder script
---
tools/distpackages/build_deb_packages.sh | 5 +++--
.../templates/libgrpc-dev/DEBIAN/control | 2 +-
.../usr/share/doc/libgrpc-dev/changelog.gz | Bin 136 -> 121 bytes
.../templates/libgrpc/DEBIAN/control | 2 +-
.../libgrpc/usr/share/doc/libgrpc/changelog.gz | Bin 132 -> 117 bytes
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/distpackages/build_deb_packages.sh b/tools/distpackages/build_deb_packages.sh
index a5f945bd9a168..7b2acb6577e22 100755
--- a/tools/distpackages/build_deb_packages.sh
+++ b/tools/distpackages/build_deb_packages.sh
@@ -33,7 +33,8 @@
deb_dest="deb_out"
mkdir -p $deb_dest
-version='0.8.0.0'
+version='0.5.0.0'
+pkg_version='0.5.0'
if [ -f /.dockerinit ]; then
# We're in Docker where uname -p returns "unknown".
@@ -97,7 +98,7 @@ do
# Build the debian package
fakeroot dpkg-deb --build $tmp_dir/$pkg_name || { echo "dpkg-deb failed"; exit 1; }
- deb_path=$deb_dest/${pkg_name}_amd64.deb
+ deb_path=$deb_dest/${pkg_name}_${pkg_version}_amd64.deb
# Copy the .deb file to destination dir
cp $tmp_dir/$pkg_name.deb $deb_path
diff --git a/tools/distpackages/templates/libgrpc-dev/DEBIAN/control b/tools/distpackages/templates/libgrpc-dev/DEBIAN/control
index 64dc79af1956a..289a278c5fd08 100644
--- a/tools/distpackages/templates/libgrpc-dev/DEBIAN/control
+++ b/tools/distpackages/templates/libgrpc-dev/DEBIAN/control
@@ -1,5 +1,5 @@
Package: libgrpc-dev
-Version: 0.8.0
+Version: 0.5.0
Architecture: amd64
Maintainer: Jan Tattermusch
Depends: libgrpc, libc6-dev | libc-dev
diff --git a/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/changelog.gz b/tools/distpackages/templates/libgrpc-dev/usr/share/doc/libgrpc-dev/changelog.gz
index eabdf46e6e2d798dab32e8ea88029448c988e330..4f557b8e9f8d1d0b78ec0ee245d1f9b890aab681 100644
GIT binary patch
literal 121
zcmV-<0EYh`iwFqoW$#o117m1mZf9j|Z)X6@$xKQwDoEB%Ni9>*FwisAGtlJX;#5%3
zQt-^nEXhpFQ7B5yNlh$H)dLCZ>MD38<|%|EmXxFx<(3vFXDHZYl^}Qy>G}ETIjMTd
b`MGuq3PuKorn&}3x`vhjDprg?W&i*H$B;EI
literal 136
zcmV;30C)c%iwFo>jpkGW17m1mZf9j|Z)X6@$xKQwDoEB%Ni9>*FwnEmGtlJX;#5%3
zQt(YoNmX!3P0CEnQz%GG&Q45ERmjQAD*^G7b5axY^gs%AbrrmT0wIYdC8
Depends: libc6
diff --git a/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/changelog.gz b/tools/distpackages/templates/libgrpc/usr/share/doc/libgrpc/changelog.gz
index c07b4d2637133dc9f0f7d8eb373bb203dd4af141..12d4cd9300a286b4a6d662f8a4785cd5e30b7dc4 100644
GIT binary patch
literal 117
zcmV-*0E+(~iwFqAW$#o117m1mZf9j|Z)X6@$xKQwDo9q)FwisAGtlJX;#5%3Qt-^n
zEXhpFQ7B5yNlh$H)dLCZ>MD38<|%|EmXxFx<(3vFXDHZYl^}Qy>G}ETIjMTd`MGuq
X3PuKorn&}3x<+OIvZ&v}VgLXD0cA9;
literal 132
zcmV-~0DJ!*iwFoQiRM%S17m1mZf9j|Z)X6@$xKQwDo9q)FwnEmGtlJX;#5%3Qt(Yo
zNmX!3P0CEnQz%GG&Q45ERmjQAD*^G7b5axY^gs%AbrrmT0wIYdC8