From 72de5acd2ab9ced7b340d5a70d5b5aa4a7111ee5 Mon Sep 17 00:00:00 2001 From: Davlet Panech Date: Thu, 16 May 2024 12:08:04 -0400 Subject: [PATCH] Revert "Add 32bit ncurses libraries & dependencies" This reverts commit 57d8f1772b3e05ac154f020556b5162cd21daf6f. Reasons for revert: * Gerrit automerged this change with a CVE fix [1] which updated libc to a different version than the original commit * There are other libc-related packages that conflict with this change * This needs more analysis, reverting for now [1] https://review.opendev.org/c/starlingx/tools/+/918959 Change-Id: I880c71b7e0852c4caf2ab469bdb9e0d9cacd2d8f Signed-off-by: Davlet Panech --- debian-mirror-tools/config/debian/common/base-bullseye.lst | 6 +++--- debian-mirror-tools/config/debian/containers/os-std.lst | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/debian-mirror-tools/config/debian/common/base-bullseye.lst b/debian-mirror-tools/config/debian/common/base-bullseye.lst index 1ad973b8..01c4075c 100644 --- a/debian-mirror-tools/config/debian/common/base-bullseye.lst +++ b/debian-mirror-tools/config/debian/common/base-bullseye.lst @@ -309,6 +309,9 @@ libcurl3-gnutls 7.74.0-1.3+deb11u11 https://snapshot.debian.org/archive/debian-s libcurl4 7.74.0-1.3+deb11u11 https://snapshot.debian.org/archive/debian-security/20231224T011632Z/pool/updates/main/c/curl/libcurl4_7.74.0-1.3%2Bdeb11u11_amd64.deb libcurl4-gnutls-dev 7.74.0-1.3+deb11u11 https://snapshot.debian.org/archive/debian-security/20231224T011632Z/pool/updates/main/c/curl/libcurl4-gnutls-dev_7.74.0-1.3%2Bdeb11u11_amd64.deb libcurl4-openssl-dev 7.74.0-1.3+deb11u11 https://snapshot.debian.org/archive/debian-security/20231224T011632Z/pool/updates/main/c/curl/libcurl4-openssl-dev_7.74.0-1.3%2Bdeb11u11_amd64.deb +libncursesw5-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncursesw5-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb +libncurses5-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncurses5-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb +libncurses-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncurses-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb libdaemon0 0.14-7.1 libdatrie1 0.2.13-1 libdaxctl1 71.1-1 @@ -497,9 +500,6 @@ libmount1 2.36.1-8+deb11u2 https://snapshot.debian.org/archive/debian-security/ libmpc3 1.2.0-1 libmpdec3 2.5.1-1 libmpfr6 4.1.0-3 -libncurses-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncurses-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb -libncurses5-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncurses5-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb -libncursesw5-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncursesw5-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb libncurses6 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncurses6_6.2%2B20201114-2%2Bdeb11u2_amd64.deb libncursesw6 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/libncursesw6_6.2%2B20201114-2%2Bdeb11u2_amd64.deb libndctl6 71.1-1 diff --git a/debian-mirror-tools/config/debian/containers/os-std.lst b/debian-mirror-tools/config/debian/containers/os-std.lst index 253342df..38c6bb53 100644 --- a/debian-mirror-tools/config/debian/containers/os-std.lst +++ b/debian-mirror-tools/config/debian/containers/os-std.lst @@ -14,12 +14,6 @@ git-man 1:2.30.2-1 https://snapshot.debian.org/archive/debian/20220703T032011Z/p git-review 1.28.0-2 guile-2.2-libs 2.2.7+1-6 hwdata 0.345-1 -lib32ncurses-dev 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/lib32ncurses-dev_6.2%2B20201114-2%2Bdeb11u2_amd64.deb -lib32ncurses6 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/lib32ncurses6_6.2%2B20201114-2%2Bdeb11u2_amd64.deb -lib32ncursesw6 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/lib32ncursesw6_6.2%2B20201114-2%2Bdeb11u2_amd64.deb -lib32tinfo6 6.2+20201114-2+deb11u2 https://snapshot.debian.org/archive/debian/20230726T151952Z/pool/main/n/ncurses/lib32tinfo6_6.2%2B20201114-2%2Bdeb11u2_amd64.deb -libc6-i386 2.31-13+deb11u9 https://snapshot.debian.org/archive/debian-security/20240423T070953Z/pool/updates/main/g/glibc/libc6-i386_2.31-13%2Bdeb11u9_amd64.deb -libc6-dev-i386 2.31-13+deb11u9 https://snapshot.debian.org/archive/debian-security/20240423T070953Z/pool/updates/main/g/glibc/libc6-dev-i386_2.31-13%2Bdeb11u9_amd64.deb libcap-dev 1:2.44-1 libclang-cpp11 1:11.0.1-2 libclang1-11 1:11.0.1-2