From f94a8846341b8680a1efab220237ca6fad4115b6 Mon Sep 17 00:00:00 2001 From: Yashvi Jain Date: Fri, 3 Jan 2025 11:28:37 +0530 Subject: [PATCH] Removing openssl 3 dependency Signed-off-by: Yashvi Jain --- .../habitat/plan.sh | 14 ++++---- .../automate-es-gateway/habitat/plan.sh | 32 +++++++++---------- scripts/verify_build.sh | 3 +- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/components/automate-builder-memcached/habitat/plan.sh b/components/automate-builder-memcached/habitat/plan.sh index 527ab666c40..ae7c30af42f 100644 --- a/components/automate-builder-memcached/habitat/plan.sh +++ b/components/automate-builder-memcached/habitat/plan.sh @@ -11,17 +11,17 @@ pkg_source="http://www.memcached.org/files/${pkg_distname}-${pkg_version}.tar.gz pkg_shasum=f291a35f82ef9756ed1d952879ef5f4be870f932bdfcb2ab61356609abf82346 pkg_deps=( - core/bash - core/glibc - core/libevent - core/openssl11 + core/bash/5.1/20240105214248 + core/glibc/2.35/20240105171810 + core/libevent/2.1.12/20240106023556 + core/openssl11/1.1.1w/20240106015742 ) pkg_build_deps=( - core/git - core/gcc - core/make + core/git/2.33.1/20240614092831 + core/gcc/9.5.0/20240105175314 + core/make/4.3/20240105222044 ) pkg_bin_dirs=(bin) pkg_include_dirs=(include) diff --git a/components/automate-es-gateway/habitat/plan.sh b/components/automate-es-gateway/habitat/plan.sh index 747339a1acf..c3edab5fd05 100644 --- a/components/automate-es-gateway/habitat/plan.sh +++ b/components/automate-es-gateway/habitat/plan.sh @@ -39,26 +39,26 @@ chef_automate_hab_binding_mode="relaxed" pkg_svc_user="root" pkg_deps=( - core/glibc - core/libedit - core/ncurses - core/zlib - core/bzip2 - core/openssl/3.0.9 - core/pcre2 - - core/coreutils - chef/mlsa - core/bash - core/curl # health_check - chef/automate-platform-tools + core/glibc/2.35/20240105171810 + core/libedit/20210910-3.1/20240106023704 + core/ncurses/6.2/20240105212325 + core/zlib/1.3/20240105173710 + core/bzip2/1.0.8/20240105212113 + core/openssl/1.0.2zi/20240105224424 + #core/pcre2 + core/pcre/8.45/20240105213900 + core/coreutils/8.32/20240105213308 + chef/mlsa/1.0.1/20240125084021 + core/bash/5.1/20240105214248 + core/curl/8.7.1/20240614090648# health_check + chef/automate-platform-tools/0.1.0/20241212061203 ) pkg_build_deps=( - core/gcc - core/make - core/coreutils + core/gcc/9.5.0/20240105175314 + core/make/4.3/20240105222044 + core/coreutils/8.32/20240105213308 ) pkg_lib_dirs=(lib) diff --git a/scripts/verify_build.sh b/scripts/verify_build.sh index 702585c8462..c6412fb1efd 100755 --- a/scripts/verify_build.sh +++ b/scripts/verify_build.sh @@ -66,8 +66,7 @@ fi # Build all habitat packages that have changed build_commands="" for component in "${changed_components[@]}"; do - if [[ "$component" == "components/automate-builder-memcached" || - "$component" == "components/automate-builder-api" || + if [[ "$component" == "components/automate-builder-api" || "$component" == "components/automate-builder-api-proxy" || "$component" == "components/automate-ui" ]]; then echo "Skipping component: $component"