Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AUTOPATCHER-CORE] Upgrade bind to 9.20.5 to fix CVE-2024-12705 & CVE-2024-11187 #12211

Draft
wants to merge 2 commits into
base: fasttrack/3.0
Choose a base branch
from
+31 −30
Draft

[AUTOPATCHER-CORE] Upgrade bind to 9.20.5 to fix CVE-2024-12705 & CVE-2024-11187 #12211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6201e9
Upgrade bind to 9.20.5 to fix CVE-2024-12705 & CVE-2024-11187
CBL-Mariner-Bot Feb 4, 2025
dc13a0c
Refresh nongit-fix patch to apply cleanly.
Kanishk-Bansal Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions SPECS/bind/bind.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"Signatures": {
"bind-9.20.0.tar.xz": "cc580998017b51f273964058e8cb3aa5482bc785243dea71e5556ec565a13347",
"generate-rndc-key.sh": "da0964516a9abe4074e262a1d0b7f63e63b2150c4cc2dddaaca029010383c422",
"named-chroot.files": "5dbc7bd2a21836fb86cb740a2d4d72eb9f2b4f341996cd0c8ae9c39e95c0d76c",
"named.conf.sample": "1807f11df688de4eb8cdcc97bd1a8863d81b03b1f24af96f3639de40bc8e538a",
"named.empty": "44e2cc6e10328cd3604148763458978f547ee54c3ff46468944d535644fc6da1",
"named.localhost": "9a2aa18c87202a691cc641f0c7e027dff3a2bb30917990f1b04c237e667530c8",
"named.logrotate": "748dd5d967d309d69b44f5451e2ce9d982af1b62448182f38ff76e83e45a4d61",
"named.loopback": "58a0c65ef763372a1d85e63766194526bfe19f496a413db40d9febea777ba4c9",
"named.rfc1912.zones": "61d2e64b8523e7d83c7cf9908538bf74b2f8f6993d52d7ab9c56cad25c23a92a",
"named.root": "36bf9aa06206b6b82c58a55ab74920d8901938e4cf79b754b239bb0e5dc0951c",
"named.root.key": "2a91cc1a1c3dd805aa149d8df6d9849d5e2ac0ad2c2ed93ddaf0234358e8c383",
"named.rwtab": "6a4c84b6709211d09f2d71491d4c66d1d4c0115a9db247a5ed2a9db10e575735",
"named.sysconfig": "8f8eff846667b7811358e289e9fe594de17d0e47f2b8cebf7840ad8db7f34816",
"setup-named-chroot.sh": "786fbc88c7929fadf217cf2286f2eb03b6fba14843e5da40ad43c0022dd71c3a"
}
}
"Signatures": {
"generate-rndc-key.sh": "da0964516a9abe4074e262a1d0b7f63e63b2150c4cc2dddaaca029010383c422",
"named-chroot.files": "5dbc7bd2a21836fb86cb740a2d4d72eb9f2b4f341996cd0c8ae9c39e95c0d76c",
"named.conf.sample": "1807f11df688de4eb8cdcc97bd1a8863d81b03b1f24af96f3639de40bc8e538a",
"named.empty": "44e2cc6e10328cd3604148763458978f547ee54c3ff46468944d535644fc6da1",
"named.localhost": "9a2aa18c87202a691cc641f0c7e027dff3a2bb30917990f1b04c237e667530c8",
"named.logrotate": "748dd5d967d309d69b44f5451e2ce9d982af1b62448182f38ff76e83e45a4d61",
"named.loopback": "58a0c65ef763372a1d85e63766194526bfe19f496a413db40d9febea777ba4c9",
"named.rfc1912.zones": "61d2e64b8523e7d83c7cf9908538bf74b2f8f6993d52d7ab9c56cad25c23a92a",
"named.root": "36bf9aa06206b6b82c58a55ab74920d8901938e4cf79b754b239bb0e5dc0951c",
"named.root.key": "2a91cc1a1c3dd805aa149d8df6d9849d5e2ac0ad2c2ed93ddaf0234358e8c383",
"named.rwtab": "6a4c84b6709211d09f2d71491d4c66d1d4c0115a9db247a5ed2a9db10e575735",
"named.sysconfig": "8f8eff846667b7811358e289e9fe594de17d0e47f2b8cebf7840ad8db7f34816",
"setup-named-chroot.sh": "786fbc88c7929fadf217cf2286f2eb03b6fba14843e5da40ad43c0022dd71c3a",
"bind-9.20.5.tar.xz": "19274fd739c023772b4212a0b6c201cf4364855fa7e6a7d3db49693f55db1ab8"
}
}
6 changes: 5 additions & 1 deletion SPECS/bind/bind.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

Summary: Domain Name System software
Name: bind
Version: 9.20.0
Version: 9.20.5
Release: 1%{?dist}
License: ISC
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -523,6 +523,10 @@ fi;
%{_mandir}/man1/named-nzd2nzf.1*

%changelog
* Tue Feb 04 2025 CBL-Mariner Servicing Account <[email protected]> - 9.20.5-1
- Auto-upgrade to 9.20.5 - to fix CVE-2024-12705 & CVE-2024-11187
- Refresh nongit-fix patch to apply cleanly.

* Wed Jul 24 2024 Muhammad Falak <[email protected]> - 9.20.0-1
- Upgrade version to 9.20.0 to address CVE-CVE-2024-0760, CVE-2024-1737, CVE-2024-1975 & CVE-2024-4076
- Refresh patches to apply cleanly
Expand Down
17 changes: 7 additions & 10 deletions SPECS/bind/nongit-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
From 431fa0dcec199512effecb4842a889eee5884c72 Mon Sep 17 00:00:00 2001
From: alejandro-microsoft <alejandroma@microsoft.com>
Date: Fri, 1 Mar 2024 17:49:51 -0800
From a93a15295ac2690f587711b26af84d6292d2aa1b Mon Sep 17 00:00:00 2001
From: Kanishk Bansal <kbkanishk975@gmail.com>
Date: Tue, 4 Feb 2025 06:49:17 +0000
Subject: [PATCH] Fix issue where bind directory isn't downloaded via git

Ported to v.9.20.0 from v9.19.21 by @mfrw on 24-July-2024

Signed-off-by: Muhammad Falak R Wani <[email protected]>
---
configure.ac | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index a911163..b58d5be 100644
index 168a77a..37c0acd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ m4_define([bind_VERSION_MINOR], 20)dnl
m4_define([bind_VERSION_PATCH], 0)dnl
m4_define([bind_VERSION_PATCH], 5)dnl
m4_define([bind_VERSION_EXTRA], )dnl
m4_define([bind_DESCRIPTION], [(Stable Release)])dnl
-m4_define([bind_SRCID], [m4_esyscmd_s([git rev-parse --short HEAD | cut -b1-7])])dnl
+m4_define([bind_SRCID], [m4_esyscmd_s([git rev-parse --short HEAD 2>/dev/null || echo "unsetID" | cut -b1-7])])dnl
+m4_define([bind_SRCID], [m4_esyscmd_s([git rev-parse --short HEAD 2>/dev/null || echo "unsetID" | cut -b1-7])])dnl
m4_define([bind_PKG_VERSION], [[bind_VERSION_MAJOR.bind_VERSION_MINOR.bind_VERSION_PATCH]bind_VERSION_EXTRA])dnl

#
Expand All @@ -35,5 +32,5 @@ index a911163..b58d5be 100644

#
--
2.40.1
2.43.0

4 changes: 2 additions & 2 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,8 +1087,8 @@
"type": "other",
"other": {
"name": "bind",
"version": "9.20.0",
"downloadUrl": "https://ftp.isc.org/isc/bind9/9.20.0/bind-9.20.0.tar.xz"
"version": "9.20.5",
"downloadUrl": "https://ftp.isc.org/isc/bind9/9.20.5/bind-9.20.5.tar.xz"
}
}
},
Expand Down
Loading