From 4719e70e35e8a37af02f17ce1325a099eae1a3dc Mon Sep 17 00:00:00 2001
From: Torsten Kilias <torsten.kilias@exasol.com>
Date: Fri, 8 Dec 2023 11:03:39 +0100
Subject: [PATCH 1/6] Update packages

---
 .../flavor_base/build_deps/packages/apt_get_packages          | 4 ++--
 .../flavor_base/language_deps/packages/apt_get_packages       | 2 +-
 .../flavor_base/udfclient_deps/packages/apt_get_packages      | 2 +-
 .../flavor_base/conda_deps/packages/apt_get_packages          | 4 ++--
 .../flavor_base/nvidia_driver_deps/packages/apt_get_packages  | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

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/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..2b062869c 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-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

From 6e45ef780500331521c676f96a0cdfd30ebf683f Mon Sep 17 00:00:00 2001
From: Torsten Kilias <torsten.kilias@exasol.com>
Date: Fri, 8 Dec 2023 11:03:54 +0100
Subject: [PATCH 2/6] Improve scripts/update_apt_package_in_package_list.sh

---
 scripts/update_apt_package_in_package_list.sh | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/scripts/update_apt_package_in_package_list.sh b/scripts/update_apt_package_in_package_list.sh
index e9e82e751..6a75c801d 100644
--- a/scripts/update_apt_package_in_package_list.sh
+++ b/scripts/update_apt_package_in_package_list.sh
@@ -11,13 +11,19 @@ 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 -E -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 -E "^$PACKAGE\|$CURRENT_VERSION" "$FILE"
+  echo "Updated lines:"
+  SEARCH_REPLACE_PATTERN="s/^($PACKAGE\|$CURRENT_VERSION).*$/$PACKAGE|$CANDIDATE_VERSION/g"
+	sed -E "$SEARCH_REPLACE_PATTERN" "$FILE" | grep -E "^$PACKAGE\|"
+  if [[ "$REPLACE" == "yes"  ]]
+  then
+    echo "Updating file $FILE:"
+	  sed -i -E "$SEARCH_REPLACE_PATTERN" "$FILE"
+  fi
+  echo
+done

From b8ef9fc3906ed54ccb94a7fa0cc50b3ccecf591f Mon Sep 17 00:00:00 2001
From: Torsten Kilias <torsten.kilias@exasol.com>
Date: Fri, 8 Dec 2023 12:37:19 +0100
Subject: [PATCH 3/6] Update packages

---
 .../flavor_base/language_deps/packages/apt_get_packages         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2b062869c..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.21
 

From 39583b9519db8733209d46220de3658f82a888be Mon Sep 17 00:00:00 2001
From: Torsten Kilias <torsten.kilias@exasol.com>
Date: Fri, 8 Dec 2023 12:38:02 +0100
Subject: [PATCH 4/6] Fix handling of character '~' in
 scripts/update_apt_package_in_package_list.sh

---
 scripts/update_apt_package_in_package_list.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/update_apt_package_in_package_list.sh b/scripts/update_apt_package_in_package_list.sh
index 6a75c801d..0baff0914 100644
--- a/scripts/update_apt_package_in_package_list.sh
+++ b/scripts/update_apt_package_in_package_list.sh
@@ -11,19 +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 "|")
 
-FILES=$(grep -E -R "^$PACKAGE\|$CURRENT_VERSION" "$SEARCH_DIRECTORY" | cut -f 1 -d ":")
+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 -E "^$PACKAGE\|$CURRENT_VERSION" "$FILE"
+  grep "^$PACKAGE|$CURRENT_VERSION" "$FILE"
   echo "Updated lines:"
-  SEARCH_REPLACE_PATTERN="s/^($PACKAGE\|$CURRENT_VERSION).*$/$PACKAGE|$CANDIDATE_VERSION/g"
-	sed -E "$SEARCH_REPLACE_PATTERN" "$FILE" | grep -E "^$PACKAGE\|"
+  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 -i -E "$SEARCH_REPLACE_PATTERN" "$FILE"
+	  sed -E -i "$SEARCH_REPLACE_PATTERN" "$FILE"
   fi
   echo
 done

From a08a0dec33c3488c6174001c231ba14d7ba66c58 Mon Sep 17 00:00:00 2001
From: Torsten Kilias <torsten.kilias@exasol.com>
Date: Fri, 8 Dec 2023 15:35:42 +0100
Subject: [PATCH 5/6] Update packages

---
 .../flavor_base/flavor_base_deps/packages/apt_get_packages      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From b10c8c6bcac800feebcfe3ddf4f1ddcf853138a3 Mon Sep 17 00:00:00 2001
From: Torsten Kilias <torsten.kilias@exasol.com>
Date: Mon, 11 Dec 2023 09:24:43 +0100
Subject: [PATCH 6/6] Updated packages in package management tests

---
 .../test_files/apt/with_versions/all_versions_specified         | 2 +-
 .../test_files/apt/with_versions/some_missing_versions          | 2 +-
 2 files changed, 2 insertions(+), 2 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|