From 84f66858f926b88d90e656518acc87070f675753 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Mon, 21 Oct 2024 20:50:43 -0400 Subject: [PATCH 1/3] bootstrap-profile: less quic again --- profiles/pentoo/bootstrap/package.use | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/pentoo/bootstrap/package.use b/profiles/pentoo/bootstrap/package.use index 4797bf6986..2dc7ab747c 100644 --- a/profiles/pentoo/bootstrap/package.use +++ b/profiles/pentoo/bootstrap/package.use @@ -26,7 +26,7 @@ net-dns/c-ares -verify-sig net-dns/libidn2 -verify-sig net-fs/samba -cups net-libs/gnutls -verify-sig -net-misc/curl -http2 -http3 -quic -verify-sig +net-misc/curl -curl_quic_openssl -http2 -http3 -quic -verify-sig net-wireless/bluez -cups sys-apps/util-linux -udev sys-apps/util-linux -verify-sig From f354b2ed01ebedfc4f7fc74144a0b62832f2533f Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Mon, 21 Oct 2024 21:14:23 -0400 Subject: [PATCH 2/3] pentoo-updater: java and ruby updates --- scripts/pentoo-updater.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/pentoo-updater.sh b/scripts/pentoo-updater.sh index 8edfe5cea6..35bd2df5ba 100755 --- a/scripts/pentoo-updater.sh +++ b/scripts/pentoo-updater.sh @@ -97,7 +97,7 @@ set_java() { if [ "${java_system/17/}" != "${java_system}" ]; then return 0 fi - wanted_java=$(eselect java-vm list | grep --color=never 17 | tr -d "[]" | awk '{print $2,$1}' | sort | head -n 1 | awk '{print $2}') + wanted_java=$(eselect java-vm list | grep --color=never 21 | tr -d "[]" | awk '{print $2,$1}' | sort | head -n 1 | awk '{print $2}') if [ -n "${wanted_java}" ]; then if eselect java-vm set system "${wanted_java}"; then printf "Successfully set system java vm\n" @@ -107,12 +107,16 @@ set_java() { return 1 fi else - printf "Failed to detect available jdk-17\n" + printf "Failed to detect available jdk-21\n" return 0 fi } set_ruby() { + if portageq has_version / dev-lang/ruby:3.2; then + eselect ruby set ruby32 + return 0 + fi if portageq has_version / dev-lang/ruby:3.1; then eselect ruby set ruby31 return 0 From ac35997347eacb4b0cac643651d3af339a8e0fd1 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Mon, 21 Oct 2024 21:15:06 -0400 Subject: [PATCH 3/3] package.mask: xfce4-screensaver isn't broken, pam was --- profiles/pentoo/base/package.mask | 3 --- 1 file changed, 3 deletions(-) diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index 178104296b..6bc60ba70a 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -54,9 +54,6 @@ sci-libs/mkl #force sticky upgrade