Skip to content

Commit 7ea2d09

Browse files
committed
use the series file for patching
1 parent eabe38d commit 7ea2d09

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

src/thrift_0_14_1/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
1717
wget -O "thrift_$(THRIFT_VERSION).tar.gz" "$(THRIFT_LINK_PRE)/$(THRIFT_VERSION)/thrift-$(THRIFT_VERSION).tar.gz"
1818

1919
tar -xvzf ./thrift_$(THRIFT_VERSION).tar.gz
20+
if [ -f thrift.patch/series ]; then pushd thrift-$(THRIFT_VERSION) && QUILT_PATCHES=../thrift.patch quilt push -a; [ -d .pc ] && rm -rf .pc; popd; fi
2021
pushd thrift-$(THRIFT_VERSION)
2122

2223
# Disable php perl and few other packages as they need additional packages to be installed

src/thrift_0_14_1/patch/0003-Remove-minimist-packages.patch renamed to src/thrift_0_14_1/thrift.patch/0003-Remove-minimist-packages.patch

+12-13
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix security issue for package minimist
66
---
77
3 files changed, 9 insertions(+), 120 deletions(-)
88

9-
diff --git a/lib/js/package-lock.json b/lib/js/package-lock.json
10-
index ea1c04620..b68217af3 100644
11-
--- a/lib/js/package-lock.json
12-
+++ b/lib/js/package-lock.json
9+
Index: thrift-0.14.1/lib/js/package-lock.json
10+
===================================================================
11+
--- thrift-0.14.1.orig/lib/js/package-lock.json
12+
+++ thrift-0.14.1/lib/js/package-lock.json
1313
@@ -1037,16 +1037,7 @@
1414
"dev": true,
1515
"requires": {
@@ -94,10 +94,10 @@ index ea1c04620..b68217af3 100644
9494
},
9595
"supports-color": {
9696
"version": "5.5.0",
97-
diff --git a/lib/ts/package-lock.json b/lib/ts/package-lock.json
98-
index fddef4426..e7f4d46fd 100644
99-
--- a/lib/ts/package-lock.json
100-
+++ b/lib/ts/package-lock.json
97+
Index: thrift-0.14.1/lib/ts/package-lock.json
98+
===================================================================
99+
--- thrift-0.14.1.orig/lib/ts/package-lock.json
100+
+++ thrift-0.14.1/lib/ts/package-lock.json
101101
@@ -1139,16 +1139,7 @@
102102
"dev": true,
103103
"requires": {
@@ -181,10 +181,10 @@ index fddef4426..e7f4d46fd 100644
181181
},
182182
"supports-color": {
183183
"version": "5.5.0",
184-
diff --git a/package-lock.json b/package-lock.json
185-
index 9c1e5f581..83793eaaf 100644
186-
--- a/package-lock.json
187-
+++ b/package-lock.json
184+
Index: thrift-0.14.1/package-lock.json
185+
===================================================================
186+
--- thrift-0.14.1.orig/package-lock.json
187+
+++ thrift-0.14.1/package-lock.json
188188
@@ -1427,16 +1427,7 @@
189189
"integrity": "sha512-4vGP107UDhhNHeWA5N8j/nUPlQbtB/W/K2x/P7aElbWMWrOkJA0MRSVFsMFrTPSAAjZWCG9uki2+1cQDzFtVcQ==",
190190
"dev": true,
@@ -266,4 +266,3 @@ index 9c1e5f581..83793eaaf 100644
266266
"resolve": {
267267
"version": "1.7.1",
268268
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
269-

src/thrift_0_14_1/thrift.patch/series

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
0001-Remove-unneeded-packages.patch
2+
0002-Fix-build-rules.patch
3+
0003-Remove-minimist-packages.patch

0 commit comments

Comments
 (0)