From ec65894b43a9b20f9f1fd0258af191a3486a72c8 Mon Sep 17 00:00:00 2001 From: Mark K <7grrar1r+fedora@gmail.com> Date: Thu, 8 Jan 2026 00:37:27 +0100 Subject: [PATCH 1/3] fix cleanup_cachedir function --- akmods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akmods b/akmods index cdaa39a..9af6046 100644 --- a/akmods +++ b/akmods @@ -172,7 +172,7 @@ cleanup_cachedir () local excluded excluded=$(find /boot -name 'vmlinuz-*' '!' -name '*rescue*' 2>/dev/null | sed 's/.*vmlinuz-//') local -a file_list - mapfile -t file_list < <(find /var/cache/akmods -mindepth 3 2>/dev/null | grep -Fv -f <(echo "${excluded}")) + mapfile -t file_list < <(find /var/cache/akmods -mindepth 2 -type f -not -name .last.log 2>/dev/null | grep -Fv -f <(echo "${excluded}")) for one_file in "${file_list[@]}"; do if grep -q ".*\.rpm$" <<< "${one_file}" ; then if ! rpm -q "$(basename "${one_file%.rpm}")" >/dev/null ; then From ebb52e0d0a35591bf591295875461ca5354fb019 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Mon, 8 Dec 2025 23:20:58 +0100 Subject: [PATCH 2/3] kmodgenca: fallback to US when locale country code is missing rhbz#2416536 Fall back to "US" when `locale country_ab2` returns empty (as seen with LANG=C), preventing an empty countryName in the generated OpenSSL config. Fixes: rhbz#2416536 --- akmods-kmodgenca | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/akmods-kmodgenca b/akmods-kmodgenca index dafe69b..eab0882 100644 --- a/akmods-kmodgenca +++ b/akmods-kmodgenca @@ -433,6 +433,12 @@ function create_cacert_config() { # Set '-batch' argument. AUTOMATIC_BUILD_OPTION="-batch" + local cert_country_code=$(locale country_ab2) + if [[ -z ${cert_country_code} ]]; then + echo -e "${BOLD_YELLOW_TEXT}WARNING:${CLEAR_TEXT} COULD NOT DETECT COUNTRY CODE FROM LOCALE; USING FALLBACK VALUE: US" >&2 + cert_country_code=US + fi + # Utilise default values if 'AUTOMATIC_BUILD' is equal to '1'. # - Set OpenSSL field values. # - Comment default and min/max values. @@ -441,7 +447,7 @@ function create_cacert_config() { -e "s#\(emailAddress *= \).*#\1akmods@${cert_hostname}#" \ -e "s#\(localityName *= \).*#\1None#" \ -e "s#\(stateOrProvinceName *= \).*#\1None#" \ - -e "s#\(countryName *= \).*#\1$(locale country_ab2)#" \ + -e "s#\(countryName *= \).*#\1${cert_country_code}#" \ -e "s#\(commonName *= \).*#\1${KEYNAME}#" \ -e "s/^[^#]*_default *= /#&/" \ -e "s/^[^#]*_min/#&/" \ From f4104cf2817bc91ac85dd815f2ad64cabf99a07e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:32:40 +0000 Subject: [PATCH 3/3] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild