From 270db37d93be4b5955b5fdfa313dc5b630695d20 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 31 May 2018 12:02:17 +0200 Subject: [PATCH 1/4] Use libcurl4 on Ubuntu Bionic --- tools/packaging/packaging.psm1 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index fd4efda2fef..409c6f5905b 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -979,7 +979,6 @@ function Get-PackageDependencies if ($Environment.IsUbuntu -or $Environment.IsDebian) { $Dependencies = @( "libc6", - "libcurl3", "libgcc1", "libgssapi-krb5-2", "liblttng-ust0", @@ -990,12 +989,12 @@ function Get-PackageDependencies ) switch ($Distribution) { - "ubuntu.14.04" { $Dependencies += @("libssl1.0.0", "libicu52") } - "ubuntu.16.04" { $Dependencies += @("libssl1.0.0", "libicu55") } - "ubuntu.17.10" { $Dependencies += @("libssl1.0.0", "libicu57") } - "ubuntu.18.04" { $Dependencies += @("libssl1.0.0", "libicu60") } - "debian.8" { $Dependencies += @("libssl1.0.0", "libicu52") } - "debian.9" { $Dependencies += @("libssl1.0.2", "libicu57") } + "ubuntu.14.04" { $Dependencies += @("libssl1.0.0", "libicu52", "libcurl3" ) } + "ubuntu.16.04" { $Dependencies += @("libssl1.0.0", "libicu55", "libcurl3") } + "ubuntu.17.10" { $Dependencies += @("libssl1.0.0", "libicu57", "libcurl3") } + "ubuntu.18.04" { $Dependencies += @("libssl1.0.0", "libicu60", "libcurl4") } + "debian.8" { $Dependencies += @("libssl1.0.0", "libicu52", "libcurl3") } + "debian.9" { $Dependencies += @("libssl1.0.2", "libicu57", "libcurl3") } default { throw "Debian distro '$Distribution' is not supported." } } } elseif ($Environment.IsRedHatFamily) { From b7d2b165dc1de53254f37a2c86f70dbf2a80b0cb Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 31 May 2018 12:10:56 +0200 Subject: [PATCH 2/4] Remove libcurl dependency --- tools/packaging/packaging.psm1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 409c6f5905b..f76e8c62d07 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -989,12 +989,12 @@ function Get-PackageDependencies ) switch ($Distribution) { - "ubuntu.14.04" { $Dependencies += @("libssl1.0.0", "libicu52", "libcurl3" ) } - "ubuntu.16.04" { $Dependencies += @("libssl1.0.0", "libicu55", "libcurl3") } - "ubuntu.17.10" { $Dependencies += @("libssl1.0.0", "libicu57", "libcurl3") } - "ubuntu.18.04" { $Dependencies += @("libssl1.0.0", "libicu60", "libcurl4") } - "debian.8" { $Dependencies += @("libssl1.0.0", "libicu52", "libcurl3") } - "debian.9" { $Dependencies += @("libssl1.0.2", "libicu57", "libcurl3") } + "ubuntu.14.04" { $Dependencies += @("libssl1.0.0", "libicu52") } + "ubuntu.16.04" { $Dependencies += @("libssl1.0.0", "libicu55") } + "ubuntu.17.10" { $Dependencies += @("libssl1.0.0", "libicu57") } + "ubuntu.18.04" { $Dependencies += @("libssl1.0.0", "libicu60") } + "debian.8" { $Dependencies += @("libssl1.0.0", "libicu52") } + "debian.9" { $Dependencies += @("libssl1.0.2", "libicu57") } default { throw "Debian distro '$Distribution' is not supported." } } } elseif ($Environment.IsRedHatFamily) { From 0da7ce1b016834fdd0847291eaba4bbc6e13ae55 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 31 May 2018 12:11:20 +0200 Subject: [PATCH 3/4] Remove libunwind dependency --- tools/packaging/packaging.psm1 | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index f76e8c62d07..1bff3f5f991 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -983,7 +983,6 @@ function Get-PackageDependencies "libgssapi-krb5-2", "liblttng-ust0", "libstdc++6", - "libunwind8", "libuuid1", "zlib1g" ) From f418857d4b0d6fed4f21fc35a36c65875d52da30 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 31 May 2018 12:14:39 +0200 Subject: [PATCH 4/4] Remove libuuid dependency --- tools/packaging/packaging.psm1 | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 1bff3f5f991..3ae53213d54 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -983,7 +983,6 @@ function Get-PackageDependencies "libgssapi-krb5-2", "liblttng-ust0", "libstdc++6", - "libuuid1", "zlib1g" ) @@ -998,8 +997,6 @@ function Get-PackageDependencies } } elseif ($Environment.IsRedHatFamily) { $Dependencies = @( - "libunwind", - "libcurl", "openssl-libs", "libicu" )