From bd3b3303f45d5e3aa420c61fbf21cf2fc2b0c8cb Mon Sep 17 00:00:00 2001
From: Torsten Kilias <tkilias@users.noreply.github.com>
Date: Mon, 11 Dec 2023 14:13:20 +0100
Subject: [PATCH] #861: Updated Packages (#393)

* Improved scripts/update_apt_package_in_package_list.sh
---
 .../apt/with_versions/all_versions_specified  |  2 +-
 .../apt/with_versions/some_missing_versions   |  2 +-
 .../build_deps/packages/apt_get_packages      |  4 +--
 .../packages/apt_get_packages                 |  2 +-
 .../language_deps/packages/apt_get_packages   |  4 +--
 .../udfclient_deps/packages/apt_get_packages  |  2 +-
 .../conda_deps/packages/apt_get_packages      |  4 +--
 .../packages/apt_get_packages                 |  4 +--
 scripts/update_apt_package_in_package_list.sh | 27 ++++++++++++-------
 9 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified
index 501e5b257..e02724f04 100644
--- a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified
+++ b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified
@@ -1,2 +1,2 @@
-curl|7.68.0-1ubuntu2.20 # t1
+curl|7.68.0-1ubuntu2.21 # t1
 wget|1.20.3-1ubuntu2 # t2
diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions
index 9c946377a..d947d1cab 100644
--- a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions
+++ b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions
@@ -1,3 +1,3 @@
-curl|7.68.0-1ubuntu2.20 # t1
+curl|7.68.0-1ubuntu2.21 # t1
 wget| # t2
 git|
diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/packages/apt_get_packages b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/packages/apt_get_packages
index f645511d1..9935ee2cd 100644
--- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/packages/apt_get_packages
+++ b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/packages/apt_get_packages
@@ -1,7 +1,7 @@
 coreutils|8.28-1ubuntu1
-locales|2.31-0ubuntu9.12
+locales|2.31-0ubuntu9.14
 tar|1.29b-2ubuntu0.4
-curl|7.68.0-1ubuntu2.20
+curl|7.68.0-1ubuntu2.21
 openjdk-11-jdk|11.0.19+7~us1-0ubuntu1~20.04.1
 build-essential|12.4ubuntu1
 libpcre3-dev|2:8.39-9ubuntu0.1
diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/apt_get_packages b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/apt_get_packages
index a48906b9a..56b84a81e 100644
--- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/apt_get_packages
+++ b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/apt_get_packages
@@ -1,4 +1,4 @@
 unzip|6.0-25ubuntu1.1
 git|1:2.25.1-1ubuntu3.11
-libcurl4-openssl-dev|7.68.0-1ubuntu2.20
+libcurl4-openssl-dev|7.68.0-1ubuntu2.21
 build-essential|12.8ubuntu1.1
diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/apt_get_packages b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/apt_get_packages
index 279121ca1..15bda81e2 100644
--- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/apt_get_packages
+++ b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/apt_get_packages
@@ -1,5 +1,5 @@
 ca-certificates|20230311ubuntu0.20.04.1
-python3.8-dev|3.8.10-0ubuntu1~20.04.8
+python3.8-dev|3.8.10-0ubuntu1~20.04.9
 python3-distutils|3.8.10-0ubuntu1~20.04
-curl|7.68.0-1ubuntu2.20
+curl|7.68.0-1ubuntu2.21
 
diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/packages/apt_get_packages b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/packages/apt_get_packages
index 4d15d5062..488811126 100644
--- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/packages/apt_get_packages
+++ b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/packages/apt_get_packages
@@ -1,5 +1,5 @@
 coreutils|8.30-3ubuntu2
-locales|2.31-0ubuntu9.12
+locales|2.31-0ubuntu9.14
 libnss-db|2.2.3pre1-6build6
 libzmq3-dev|4.3.2-2ubuntu1
 libprotobuf-dev|3.6.1.3-2ubuntu5.2
diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/packages/apt_get_packages
index 7fc125026..cc56f8ddd 100644
--- a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/packages/apt_get_packages
+++ b/flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/packages/apt_get_packages
@@ -1,4 +1,4 @@
 coreutils|8.30-3ubuntu2
-locales|2.31-0ubuntu9.12
-curl|7.68.0-1ubuntu2.20
+locales|2.31-0ubuntu9.14
+curl|7.68.0-1ubuntu2.21
 ca-certificates|20230311ubuntu0.20.04.1
diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages
index 7fc125026..cc56f8ddd 100644
--- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages
+++ b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages
@@ -1,4 +1,4 @@
 coreutils|8.30-3ubuntu2
-locales|2.31-0ubuntu9.12
-curl|7.68.0-1ubuntu2.20
+locales|2.31-0ubuntu9.14
+curl|7.68.0-1ubuntu2.21
 ca-certificates|20230311ubuntu0.20.04.1
diff --git a/scripts/update_apt_package_in_package_list.sh b/scripts/update_apt_package_in_package_list.sh
index e9e82e751..0baff0914 100644
--- a/scripts/update_apt_package_in_package_list.sh
+++ b/scripts/update_apt_package_in_package_list.sh
@@ -11,13 +11,20 @@ PACKAGE=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 1 -d "|")
 CANDIDATE_VERSION=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 3 -d "|")
 CURRENT_VERSION=$(echo "$LIST_NEWEST_VERSION_OUTPUT" | cut -f 2 -d "|")
 
-if [[ "$REPLACE" == "yes"  ]]
-then
-	SED_REPLACE_OPTION=("-i")
-else
-	SED_REPLACE_OPTION=()
-fi
-grep -E -R "^$PACKAGE\|$CURRENT_VERSION" "$SEARCH_DIRECTORY" \
-	| cut -f 1 -d ":" \
-	| xargs -I{} sed "${SED_REPLACE_OPTION[@]}" -E "s/^($PACKAGE\|$CURRENT_VERSION).*$/$PACKAGE|$CANDIDATE_VERSION/g" "{}" \
-	| grep -E "^$PACKAGE\|"
+FILES=$(grep -R "^$PACKAGE|$CURRENT_VERSION" "$SEARCH_DIRECTORY" | cut -f 1 -d ":")
+for FILE in $FILES
+do
+  echo "Found package $PACKAGE|$CURRENT_VERSION in $FILE"
+  echo "Original lines:"
+  grep "^$PACKAGE|$CURRENT_VERSION" "$FILE"
+  echo "Updated lines:"
+  CURRENT_VERSION_ESCAPE=${CURRENT_VERSION//\~/\\~}
+  SEARCH_REPLACE_PATTERN="s/^($PACKAGE|$CURRENT_VERSION_ESCAPE).*$/$PACKAGE|$CANDIDATE_VERSION/g"
+	sed -E "$SEARCH_REPLACE_PATTERN" "$FILE" | grep "^$PACKAGE|"
+  if [[ "$REPLACE" == "yes"  ]]
+  then
+    echo "Updating file $FILE:"
+	  sed -E -i "$SEARCH_REPLACE_PATTERN" "$FILE"
+  fi
+  echo
+done