agent: Add pyinstaller-hooks-contrib and importlib-metadata to Pipfile

Pipenv fails to install these dependencies in the
cdrx/pyinstaller:python3 container when pyinstaller is installed from
our fork. Adding them to the Pipfile ensures they get installed and
resolves the issue.
This commit is contained in:
Mike Salvatore 2021-04-23 11:20:13 -04:00
parent fd8ef7f39e
commit df67ba554e
2 changed files with 37 additions and 3 deletions

View File

@ -8,7 +8,9 @@ cryptography = "==2.5" # We can't build 32bit ubuntu12 binary with newer version
cffi = ">=1.14" cffi = ">=1.14"
ecdsa = "==0.15" ecdsa = "==0.15"
pyinstaller = {git = "git://github.com/guardicore/pyinstaller"} pyinstaller = {git = "git://github.com/guardicore/pyinstaller"}
pyinstaller-hooks-contrib = "==2021.1"
impacket = ">=0.9" impacket = ">=0.9"
importlib-metadata = "==4.0.1"
ipaddress = ">=1.0.23" ipaddress = ">=1.0.23"
netifaces = ">=0.10.9" netifaces = ">=0.10.9"
odict = "==1.7.0" odict = "==1.7.0"

View File

@ -1,7 +1,7 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "78392106c26ec104e3734ec0b69975330baa9ff7761d63e1091e2687bb149265" "sha256": "080af5d3991ee621eb9fd84535c6399f297d6eaa72e97dc90871e27dd7a69435"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
@ -265,6 +265,14 @@
"index": "pypi", "index": "pypi",
"version": "==0.9.22" "version": "==0.9.22"
}, },
"importlib-metadata": {
"hashes": [
"sha256:8c501196e49fb9df5df43833bdb1e4328f64847763ec8a50703148b73784d581",
"sha256:d7eb1dea6d6a6086f8be21784cc9e3bcfa55872b52309bc5fad53a8ea444465d"
],
"index": "pypi",
"version": "==4.0.1"
},
"ipaddress": { "ipaddress": {
"hashes": [ "hashes": [
"sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc", "sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc",
@ -658,6 +666,14 @@
"git": "git://github.com/guardicore/pyinstaller", "git": "git://github.com/guardicore/pyinstaller",
"ref": "7c050ea0d6ca1e453045632ec57cf1afe79e15c5" "ref": "7c050ea0d6ca1e453045632ec57cf1afe79e15c5"
}, },
"pyinstaller-hooks-contrib": {
"hashes": [
"sha256:27558072021857d89524c42136feaa2ffe4f003f1bdf0278f9b24f6902c1759c",
"sha256:892310e6363655838485ee748bf1c5e5cade7963686d9af8650ee218a3e0b031"
],
"index": "pypi",
"version": "==2021.1"
},
"pymssql": { "pymssql": {
"hashes": [ "hashes": [
"sha256:04aab92d5a1a5d4e01a0797a939f103f02c0ef777bc8dcf1e952ed30dd1d43d4", "sha256:04aab92d5a1a5d4e01a0797a939f103f02c0ef777bc8dcf1e952ed30dd1d43d4",
@ -880,6 +896,15 @@
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"version": "==4.60.0" "version": "==4.60.0"
}, },
"typing-extensions": {
"hashes": [
"sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918",
"sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c",
"sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"
],
"markers": "python_version < '3.8'",
"version": "==3.7.4.3"
},
"urllib3": { "urllib3": {
"hashes": [ "hashes": [
"sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc", "sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc",
@ -916,7 +941,7 @@
"sha256:a2ad9c0f6d70f6e0e0d1f54b8582054c62d8a09f346b5ccaf55da68628ca10e1", "sha256:a2ad9c0f6d70f6e0e0d1f54b8582054c62d8a09f346b5ccaf55da68628ca10e1",
"sha256:a64624a25fc2d3663a2c5376c5291f3c7531e9c8051571de9ca9db8bf25746c2" "sha256:a64624a25fc2d3663a2c5376c5291f3c7531e9c8051571de9ca9db8bf25746c2"
], ],
"markers": "platform_system == 'Windows'", "markers": "python_version >= '3.6'",
"version": "==0.0.9" "version": "==0.0.9"
}, },
"winsys-3.x": { "winsys-3.x": {
@ -931,7 +956,6 @@
"sha256:1d6b085e5c445141c475476000b661f60fff1aaa19f76bf82b7abb92e0ff4942", "sha256:1d6b085e5c445141c475476000b661f60fff1aaa19f76bf82b7abb92e0ff4942",
"sha256:b6a6be5711b1b6c8d55bda7a8befd75c48c12b770b9d227d31c1737dbf0d40a6" "sha256:b6a6be5711b1b6c8d55bda7a8befd75c48c12b770b9d227d31c1737dbf0d40a6"
], ],
"index": "pypi",
"markers": "sys_platform == 'win32'", "markers": "sys_platform == 'win32'",
"version": "==1.5.1" "version": "==1.5.1"
}, },
@ -941,6 +965,14 @@
"sha256:cc33599b549f0c8a248cb72f3bf32d77712de1ff7ee8814312eb6456b42c015f" "sha256:cc33599b549f0c8a248cb72f3bf32d77712de1ff7ee8814312eb6456b42c015f"
], ],
"version": "==2.0" "version": "==2.0"
},
"zipp": {
"hashes": [
"sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76",
"sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"
],
"markers": "python_version >= '3.6'",
"version": "==3.4.1"
} }
}, },
"develop": {} "develop": {}