Skip to content

Commit 5860249

Browse files
authored
fix: statically define kerberos module dependencies (microsoft#189116)
fix: statically define kerberos module dependencies (microsoft#189047)
1 parent 9b1ebb2 commit 5860249

File tree

4 files changed

+38
-18
lines changed

4 files changed

+38
-18
lines changed

build/linux/debian/calculate-deps.js

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/linux/debian/calculate-deps.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,16 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, sysroo
7676
// on the newer package, this hack skips the dep. This is safe because
7777
// libgcc-s1 is a dependency of libc6. This hack can be removed once
7878
// support for Debian Buster and Ubuntu Bionic are dropped.
79+
//
80+
// Remove kerberos native module related dependencies as the versions
81+
// computed from sysroot will not satisfy the minimum supported distros
82+
// Refs https://github.com/microsoft/vscode/issues/188881.
83+
// TODO(deepak1556): remove this workaround in favor of computing the
84+
// versions from build container for native modules.
7985
const filteredDeps = depsStr.split(', ').filter(dependency => {
80-
return !dependency.startsWith('libgcc-s1');
86+
return !dependency.startsWith('libgcc-s1') &&
87+
!dependency.startsWith('libgssapi-krb5-2') &&
88+
!dependency.startsWith('libkrb5-3');
8189
}).sort();
8290
const requires = new Set(filteredDeps);
8391
return requires;

build/linux/debian/dep-lists.js

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/linux/debian/dep-lists.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ export const additionalDeps = [
1010
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
1111
'libnss3 (>= 3.26)',
1212
'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3', // For Breakpad crash reports.
13-
'xdg-utils (>= 1.0.2)' // OS integration
13+
'xdg-utils (>= 1.0.2)', // OS integration
14+
'libgssapi-krb5-2',
15+
'libkrb5-3',
1416
];
1517

1618
// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/debian/manual_recommends
@@ -38,10 +40,10 @@ export const referenceGeneratedDepsByArch = {
3840
'libgbm1 (>= 17.1.0~rc2)',
3941
'libglib2.0-0 (>= 2.16.0)',
4042
'libglib2.0-0 (>= 2.39.4)',
41-
'libgssapi-krb5-2 (>= 1.17)',
43+
'libgssapi-krb5-2',
4244
'libgtk-3-0 (>= 3.9.10)',
4345
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
44-
'libkrb5-3 (>= 1.6.dfsg.2)',
46+
'libkrb5-3',
4547
'libnspr4 (>= 2:4.9-2~)',
4648
'libnss3 (>= 2:3.22)',
4749
'libnss3 (>= 3.26)',
@@ -78,10 +80,10 @@ export const referenceGeneratedDepsByArch = {
7880
'libgbm1 (>= 17.1.0~rc2)',
7981
'libglib2.0-0 (>= 2.12.0)',
8082
'libglib2.0-0 (>= 2.39.4)',
81-
'libgssapi-krb5-2 (>= 1.17)',
83+
'libgssapi-krb5-2',
8284
'libgtk-3-0 (>= 3.9.10)',
8385
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
84-
'libkrb5-3 (>= 1.6.dfsg.2)',
86+
'libkrb5-3',
8587
'libnspr4 (>= 2:4.9-2~)',
8688
'libnss3 (>= 2:3.22)',
8789
'libnss3 (>= 3.26)',
@@ -117,10 +119,10 @@ export const referenceGeneratedDepsByArch = {
117119
'libgbm1 (>= 17.1.0~rc2)',
118120
'libglib2.0-0 (>= 2.12.0)',
119121
'libglib2.0-0 (>= 2.39.4)',
120-
'libgssapi-krb5-2 (>= 1.17)',
122+
'libgssapi-krb5-2',
121123
'libgtk-3-0 (>= 3.9.10)',
122124
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
123-
'libkrb5-3 (>= 1.6.dfsg.2)',
125+
'libkrb5-3',
124126
'libnspr4 (>= 2:4.9-2~)',
125127
'libnss3 (>= 2:3.22)',
126128
'libnss3 (>= 3.26)',

0 commit comments

Comments
 (0)