Merge pull request #1770 from implausible/bump/openssl · nodegit/nodegit@65b4350 · GitHub

nodegit / nodegit Public

• Notifications You must be signed in to change notification settings
• Fork 700
• Star 5.8k

• Code
• Issues 343
• Pull requests 20
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 65b4350

Browse filesBrowse the repository at this point in the historyBrowse files

ianhattendorf

authored

Merge pull request #1770 from implausible/bump/openssl

Bump OpenSSL prebuilt to 1.1.1c

2 parents f267826 + c007bb7 commit 65b4350
Copy full SHA for 65b4350

2 files changed

+21-21Lines changed: 21 additions & 21 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• utils
  • discoverOpenSSLDistros.js
• vendor/static_config
  • openssl_distributions.json

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎utils/discoverOpenSSLDistros.js‎

Copy file name to clipboardExpand all lines: utils/discoverOpenSSLDistros.js

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -60,7 +60,7 @@ const debugPairs = R.toPairs({
60	60	R.test(/^\s*compiler\.runtime=MTd$/gm),
61	61	R.test(/^\s*compiler\.version=15$/gm)
62	62	]),
63		-
	63	+
64	64	"macOS-clang-9-static-debug": R.allPass([
65	65	...macCommonConditions,
66	66	R.test(/^\s*build_type=Debug$/gm),
@@ -133,13 +133,13 @@ const releasePairs = R.toPairs({
133	133	const distributionPairs = [...debugPairs, ...releasePairs];
134	134
135	135	const getDistributionConfigURLFromHash = itemHash =>
136		- `https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/${itemHash}/conaninfo.txt`;
	136	+ `https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/${itemHash}/0/conaninfo.txt`;
137	137
138	138	const getDistributionDownloadURLFromHash = itemHash =>
139		- `https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/${itemHash}/conan_package.tgz`;
	139	+ `https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/${itemHash}/0/conan_package.tgz`;
140	140
141	141	const getDistributionsRootURL = () =>
142		- "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/package/";
	142	+ "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/";
143	143
144	144	const detectDistributionPairFromConfig = (itemHash, body) => R.pipe(
145	145	R.find(([_, predicate]) => predicate(body)),

Collapse file

‎vendor/static_config/openssl_distributions.json‎

Copy file name to clipboard

+17-17Lines changed: 17 additions & 17 deletions

Original file line number	Diff line number	Diff line change
@@ -1,18 +1,18 @@
1	1	{
2		- "macOS-clang-8.1-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/bd3cca94af79c6a2c35b664c43f643582a13a9f2/0/conan_package.tgz",
3		- "macOS-clang-8.1-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/0197c20e330042c026560da838f5b4c4bf094b8a/0/conan_package.tgz",
4		- "macOS-clang-9-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/85d674b0f6705cafe6b2edb8689ffbe0f3c2e60b/0/conan_package.tgz",
5		- "macOS-clang-9-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/227fb0ea22f4797212e72ba94ea89c7b3fbc2a0c/0/conan_package.tgz",
6		- "win32-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/39d6fe009a278f733e97b59a4f9536bfc4e8f366/0/conan_package.tgz",
7		- "win32-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/d16d8a16b4cef0046922b8d83d567689d36149d0/0/conan_package.tgz",
8		- "win32-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/889fd4ea9ba89fd6dc7fa32e2f45bd9804b85481/0/conan_package.tgz",
9		- "win32-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/253958a6ce15f1c9325eeea33ffc0a5cfc29212a/0/conan_package.tgz",
10		- "win32-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/05f648ec4d066b206769d6314e859fdd97a18f8d/0/conan_package.tgz",
11		- "win32-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/a075e3ffc3590d6a920a26b4218b20253dd68d57/0/conan_package.tgz",
12		- "win64-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/6bc3be0f39fdc624b24ba9bb00e8af55928d74e7/0/conan_package.tgz",
13		- "win64-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/e942631065059eabe964ca471ad35bb453c15b31/0/conan_package.tgz",
14		- "win64-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/867ca54360ed234a8bc9a6aa63806599ea29b38e/0/conan_package.tgz",
15		- "win64-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/c4aef4edbc33205e0cf9b55bfb116b38c90ec132/0/conan_package.tgz",
16		- "win64-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/0bd0c413b56aaec57c0f222a89b4e565a6729027/0/conan_package.tgz",
17		- "win64-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.0i/stable/0/package/fce9be1511a149a4af36b5997f7e611ab83b2f58/0/conan_package.tgz"
18		- }
	2	+ "macOS-clang-8.1-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/d1c17264207d7d5cd3268628053a64345144278a/0/conan_package.tgz",
	3	+ "macOS-clang-8.1-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/2fd87da1a557da1625ed3b37267403907210dfd8/0/conan_package.tgz",
	4	+ "macOS-clang-9-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/85d674b0f6705cafe6b2edb8689ffbe0f3c2e60b/0/conan_package.tgz",
	5	+ "macOS-clang-9-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/2f6ec1d0e45c99b245f982a1d4f7554a0ce0f97d/0/conan_package.tgz",
	6	+ "win32-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/39d6fe009a278f733e97b59a4f9536bfc4e8f366/0/conan_package.tgz",
	7	+ "win32-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/d16d8a16b4cef0046922b8d83d567689d36149d0/0/conan_package.tgz",
	8	+ "win32-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/889fd4ea9ba89fd6dc7fa32e2f45bd9804b85481/0/conan_package.tgz",
	9	+ "win32-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/253958a6ce15f1c9325eeea33ffc0a5cfc29212a/0/conan_package.tgz",
	10	+ "win32-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/05f648ec4d066b206769d6314e859fdd97a18f8d/0/conan_package.tgz",
	11	+ "win32-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/a075e3ffc3590d6a920a26b4218b20253dd68d57/0/conan_package.tgz",
	12	+ "win64-vs12-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/6bc3be0f39fdc624b24ba9bb00e8af55928d74e7/0/conan_package.tgz",
	13	+ "win64-vs12-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/e942631065059eabe964ca471ad35bb453c15b31/0/conan_package.tgz",
	14	+ "win64-vs14-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/867ca54360ed234a8bc9a6aa63806599ea29b38e/0/conan_package.tgz",
	15	+ "win64-vs14-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/c4aef4edbc33205e0cf9b55bfb116b38c90ec132/0/conan_package.tgz",
	16	+ "win64-vs15-static-debug": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/0bd0c413b56aaec57c0f222a89b4e565a6729027/0/conan_package.tgz",
	17	+ "win64-vs15-static-release": "https://dl.bintray.com/conan-community/conan/conan/OpenSSL/1.1.1c/stable/0/package/fce9be1511a149a4af36b5997f7e611ab83b2f58/0/conan_package.tgz"
	18	+ }

0 commit comments

Comments

0 (0)