From b74f5de072c06cf59695589d4aa418526cf60183 Mon Sep 17 00:00:00 2001 From: Luis Enrique Chico Capistrano Date: Mon, 23 Oct 2023 17:13:43 -0300 Subject: [PATCH] Update future version on wazuh-control script. Standardize alpine and archlinux future package versions to x.30.0 --- alpine/build_package.sh | 2 +- alpine/builder.sh | 7 ++++++- arch/build.sh | 5 ++++- arch/generate_arch_package.sh | 2 +- debs/build.sh | 4 +++- rpms/build.sh | 7 ++++--- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/alpine/build_package.sh b/alpine/build_package.sh index 1c9b6880d4..b00cb64406 100755 --- a/alpine/build_package.sh +++ b/alpine/build_package.sh @@ -161,7 +161,7 @@ help() { echo -e " [Optional] Use the SPECS files stored in the host instead of downloading them from GitHub." echo -e "" echo -e " --future" - echo -e " [Optional] Build test future package 99.99.0 Used for development purposes." + echo -e " [Optional] Build test future package {MAJOR}.30.0 Used for development purposes." echo -e "" echo -e " -h, --help" echo -e " Show this help." diff --git a/alpine/builder.sh b/alpine/builder.sh index d193489170..c97470b725 100644 --- a/alpine/builder.sh +++ b/alpine/builder.sh @@ -41,7 +41,12 @@ fi export version="$(cat wazuh*/src/VERSION | cut -d 'v' -f 2)" if [ "${future}" = "yes" ]; then - export version="99.99.0" + old_version=$version + MAJOR=$(echo $version | cut -dv -f2 | cut -d. -f1) + export version="${MAJOR}.30.0" + sed -i "s/${old_version}/${version}/g" "/wazuh"*"/src/init/wazuh-server.sh" + sed -i "s/${old_version}/${version}/g" "/wazuh"*"/src/init/wazuh-client.sh" + sed -i "s/${old_version}/${version}/g" "/wazuh"*"/src/init/wazuh-local.sh" fi diff --git a/arch/build.sh b/arch/build.sh index a191c05160..ffd74d30d8 100755 --- a/arch/build.sh +++ b/arch/build.sh @@ -61,7 +61,7 @@ if [[ "${future}" == "yes" ]]; then base_version=${wazuh_version} MAJOR=$(echo ${base_version} | cut -dv -f2 | cut -d. -f1) MINOR=$(echo ${base_version} | cut -d. -f2) - wazuh_version="99.99.0" + wazuh_version="${MAJOR}.30.0" package_full_name=wazuh-${build_target}-${wazuh_version} # PREPARE FUTURE SPECS AND SOURCES @@ -70,6 +70,9 @@ if [[ "${future}" == "yes" ]]; then sources_dir="${tmp_sources_dir}" find "${sources_dir}" "${specs_path}" \( -name "*VERSION*" -o -name "*changelog*" \) -exec sed -i "s/${base_version}/${wazuh_version}/g" {} \; sed -i "s/\$(VERSION)/${MAJOR}.${MINOR}/g" "${sources_dir}/src/Makefile" + sed -i "s/${base_version}/${wazuh_version}/g" "${sources_dir}/src/init/wazuh-server.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${sources_dir}/src/init/wazuh-client.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${sources_dir}/src/init/wazuh-local.sh" fi cd ${sources_dir} && tar -czf ${pacman_dir}/${package_full_name}.tar.gz . diff --git a/arch/generate_arch_package.sh b/arch/generate_arch_package.sh index 55ec324135..b63a006f58 100755 --- a/arch/generate_arch_package.sh +++ b/arch/generate_arch_package.sh @@ -105,7 +105,7 @@ help() { echo " --sources [Optional] Absolute path containing wazuh source code. This option will use local source code instead of downloading it from GitHub." echo " --packages-branch [Required] Select Git branch or tag from wazuh-packages repository. e.g ${PACKAGES_BRANCH}" echo " --dev [Optional] Use the SPECS files stored in the host instead of downloading them from GitHub." - echo " --future [Optional] Build test future package 99.99.0 Used for development purposes." + echo " --future [Optional] Build test future package {MAJOR}.30.0 Used for development purposes." echo " -h, --help Show this help." echo exit $1 diff --git a/debs/build.sh b/debs/build.sh index 7a9090d9a8..7896c49081 100755 --- a/debs/build.sh +++ b/debs/build.sh @@ -73,6 +73,9 @@ if [[ "${future}" == "yes" ]]; then # PREPARE FUTURE SPECS AND SOURCES find "${build_dir}/${package_name}" "${specs_path}" \( -name "*VERSION*" -o -name "*changelog*" \) -exec sed -i "s/${base_version}/${wazuh_version}/g" {} \; sed -i "s/\$(VERSION)/${MAJOR}.${MINOR}/g" "${build_dir}/${build_target}/${package_full_name}/src/Makefile" + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${build_target}/${package_full_name}/src/init/wazuh-server.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${build_target}/${package_full_name}/src/init/wazuh-client.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${build_target}/${package_full_name}/src/init/wazuh-local.sh" fi cp -pr ${specs_path}/wazuh-${build_target}/debian ${sources_dir}/debian cp -p ${package_files}/gen_permissions.sh ${sources_dir} @@ -125,4 +128,3 @@ if [[ "${checksum}" == "yes" ]]; then cd ${pkg_path} && sha512sum ${deb_file} > /var/local/checksum/${deb_file}.sha512 fi mv ${pkg_path}/${deb_file} /var/local/wazuh - \ No newline at end of file diff --git a/rpms/build.sh b/rpms/build.sh index 036d941e0f..93056d9e17 100755 --- a/rpms/build.sh +++ b/rpms/build.sh @@ -73,7 +73,7 @@ else specs_path="/specs" fi -if [[ "${future}" == "yes" ]]; then +if [[ "${future}" == "yes" ]]; then # MODIFY VARIABLES base_version=$wazuh_version MAJOR=$(echo $base_version | cut -dv -f2 | cut -d. -f1) @@ -88,7 +88,9 @@ if [[ "${future}" == "yes" ]]; then mv "${build_dir}/${old_package_name}" "${build_dir}/${package_name}" find "${build_dir}/${package_name}" "${specs_path}/" \( -name "*VERSION*" -o -name "*.spec" \) -exec sed -i "s/${base_version}/${wazuh_version}/g" {} \; sed -i "s/\$(VERSION)/${MAJOR}.${MINOR}/g" "${build_dir}/${package_name}/src/Makefile" - + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${package_name}/src/init/wazuh-server.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${package_name}/src/init/wazuh-client.sh" + sed -i "s/${base_version}/${wazuh_version}/g" "${build_dir}/${package_name}/src/init/wazuh-local.sh" fi cp ${specs_path}/wazuh-${build_target}.spec ${rpm_build_dir}/SPECS/${package_name}.spec @@ -129,4 +131,3 @@ if [[ "${src}" == "yes" ]]; then fi find ${extract_path} -maxdepth 3 -type f -name "${file_name}*" -exec mv {} /var/local/wazuh \; - \ No newline at end of file