From 90d45d0b87be432c42231ed6765890f00c8b5a00 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 26 May 2025 11:19:24 +0000 Subject: [PATCH 1/5] Initial plan for issue From 00c048eb5cec9320f43039301e60959bd7691829 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 26 May 2025 11:25:26 +0000 Subject: [PATCH 2/5] Update spec, signatures and manifest for bind 9.20.9 Co-authored-by: kgodara912 <193572699+kgodara912@users.noreply.github.com> --- SPECS/bind/bind.signatures.json | 2 +- SPECS/bind/bind.spec | 11 +++--- ...tialized-warning-in-dlz_mysqldyn_mod.patch | 34 ------------------ SPECS/bind/nongit-fix.patch | 36 ------------------- cgmanifest.json | 4 +-- 5 files changed, 9 insertions(+), 78 deletions(-) delete mode 100644 SPECS/bind/fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch delete mode 100644 SPECS/bind/nongit-fix.patch diff --git a/SPECS/bind/bind.signatures.json b/SPECS/bind/bind.signatures.json index 13e9243d3ec..4ba65627f67 100644 --- a/SPECS/bind/bind.signatures.json +++ b/SPECS/bind/bind.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "bind-9.20.5.tar.xz": "19274fd739c023772b4212a0b6c201cf4364855fa7e6a7d3db49693f55db1ab8", + "bind-9.20.9.tar.xz": "3d26900ed9c9a859073ffea9b97e292c1248dad18279b17b05fcb23c3091f86d", "dlz-modules-main.tar.gz": "884bef3535317a7757ad0e3556a27e2ed1a80f5b1040bce4074780c8719667d0", "generate-rndc-key.sh": "da0964516a9abe4074e262a1d0b7f63e63b2150c4cc2dddaaca029010383c422", "named-chroot.files": "5dbc7bd2a21836fb86cb740a2d4d72eb9f2b4f341996cd0c8ae9c39e95c0d76c", diff --git a/SPECS/bind/bind.spec b/SPECS/bind/bind.spec index 36f2d314404..d390d2cc0f0 100644 --- a/SPECS/bind/bind.spec +++ b/SPECS/bind/bind.spec @@ -9,8 +9,8 @@ Summary: Domain Name System software Name: bind -Version: 9.20.5 -Release: 4%{?dist} +Version: 9.20.9 +Release: 1%{?dist} License: ISC Vendor: Microsoft Corporation Distribution: Azure Linux @@ -32,9 +32,6 @@ Source13: named.rwtab Source14: named-chroot.files Source15: https://gitlab.isc.org/isc-projects/dlz-modules/-/archive/main/dlz-modules-main.tar.gz -Patch0: nongit-fix.patch -Patch1: fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch - BuildRequires: gcc BuildRequires: git BuildRequires: json-c-devel @@ -536,6 +533,10 @@ fi; %{_mandir}/man1/named-nzd2nzf.1* %changelog +* Mon May 26 2025 CBL-Mariner Servicing Account - 9.20.9-1 +- Auto-upgrade to 9.20.9 - for CVE-2025-40775 +- Remove nongit-fix.patch and fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch + * Tue Feb 11 2025 Andrew Phelps - 9.20.5-4 - Remove duplicate shared object files in base and devel packages - Remove duplicate files from utils package diff --git a/SPECS/bind/fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch b/SPECS/bind/fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch deleted file mode 100644 index 9054348416c..00000000000 --- a/SPECS/bind/fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch +++ /dev/null @@ -1,34 +0,0 @@ -From daa392c65a4a578985fb3188ee81b1e80ee1791c Mon Sep 17 00:00:00 2001 -From: Tobias Brick -Date: Mon, 24 Feb 2025 18:17:20 +0000 -Subject: [PATCH] fix maybe-uninitialized warning in dlz_mysqldyn_mod.c - ---- - build/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/build/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c b/build/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c -index bdd0bcc..4488b94 100644 ---- a/build/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c -+++ b/build/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c -@@ -375,6 +375,9 @@ build_query(mysql_data_t *state, mysql_instance_t *dbi, const char *command, - size_t len = 0; - va_list ap1; - -+ /* Initialize arglist before anything else so we can safely free it if we fail out. */ -+ DLZ_LIST_INIT(arglist); -+ - /* Get a DB instance if needed */ - if (dbi == NULL) { - dbi = get_dbi(state); -@@ -390,7 +393,6 @@ build_query(mysql_data_t *state, mysql_instance_t *dbi, const char *command, - } - - va_start(ap1, command); -- DLZ_LIST_INIT(arglist); - q = querystr = strdup(command); - if (querystr == NULL) { - goto fail; --- -2.45.3 - diff --git a/SPECS/bind/nongit-fix.patch b/SPECS/bind/nongit-fix.patch deleted file mode 100644 index 39d8c152a26..00000000000 --- a/SPECS/bind/nongit-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a93a15295ac2690f587711b26af84d6292d2aa1b Mon Sep 17 00:00:00 2001 -From: Kanishk Bansal -Date: Tue, 4 Feb 2025 06:49:17 +0000 -Subject: [PATCH] Fix issue where bind directory isn't downloaded via git - ---- - configure.ac | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -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], 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_PKG_VERSION], [[bind_VERSION_MAJOR.bind_VERSION_MINOR.bind_VERSION_PATCH]bind_VERSION_EXTRA])dnl - - # -@@ -60,7 +60,9 @@ AC_CONFIG_MACRO_DIR([m4]) - # and not cross compling - # - AS_IF([test "$cross_compiling" = no], -- [AM_MAINTAINER_MODE(m4_ifset([bind_SRCID],[enable],[disable]))], -+ [AS_IF([test bind_SRCID = unsetID], -+ [AM_MAINTAINER_MODE([enable])], -+ [AM_MAINTAINER_MODE([disable])])], - [AM_MAINTAINER_MODE([disable])]) - - # --- -2.43.0 - diff --git a/cgmanifest.json b/cgmanifest.json index 44e84473222..11474c74690 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -1097,8 +1097,8 @@ "type": "other", "other": { "name": "bind", - "version": "9.20.5", - "downloadUrl": "https://ftp.isc.org/isc/bind9/9.20.5/bind-9.20.5.tar.xz" + "version": "9.20.9", + "downloadUrl": "https://ftp.isc.org/isc/bind9/9.20.9/bind-9.20.9.tar.xz" } } }, From 6b26d2ece93cc2658156b3f6b3c7e6131b97a6ec Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 26 May 2025 11:28:50 +0000 Subject: [PATCH 3/5] Fix %changelog date format for bind upgrade Co-authored-by: kgodara912 <193572699+kgodara912@users.noreply.github.com> --- SPECS/bind/bind.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/bind/bind.spec b/SPECS/bind/bind.spec index d390d2cc0f0..c11d9ebf491 100644 --- a/SPECS/bind/bind.spec +++ b/SPECS/bind/bind.spec @@ -533,7 +533,7 @@ fi; %{_mandir}/man1/named-nzd2nzf.1* %changelog -* Mon May 26 2025 CBL-Mariner Servicing Account - 9.20.9-1 +* Tue May 26 2025 CBL-Mariner Servicing Account - 9.20.9-1 - Auto-upgrade to 9.20.9 - for CVE-2025-40775 - Remove nongit-fix.patch and fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch From 64a9ba24c02b766cb7e7e00bae9340352e724cb8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 26 May 2025 11:39:40 +0000 Subject: [PATCH 4/5] Fix day-of-week in changelog entries Co-authored-by: kgodara912 <193572699+kgodara912@users.noreply.github.com> --- SPECS/bind/bind.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS/bind/bind.spec b/SPECS/bind/bind.spec index c11d9ebf491..ab6443a6a69 100644 --- a/SPECS/bind/bind.spec +++ b/SPECS/bind/bind.spec @@ -533,11 +533,11 @@ fi; %{_mandir}/man1/named-nzd2nzf.1* %changelog -* Tue May 26 2025 CBL-Mariner Servicing Account - 9.20.9-1 +* Mon May 26 2025 CBL-Mariner Servicing Account - 9.20.9-1 - Auto-upgrade to 9.20.9 - for CVE-2025-40775 - Remove nongit-fix.patch and fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch -* Tue Feb 11 2025 Andrew Phelps - 9.20.5-4 +* Tue Mar 11 2025 Andrew Phelps - 9.20.5-4 - Remove duplicate shared object files in base and devel packages - Remove duplicate files from utils package - Add requires for bind-libs from base package From abe5cbf5b7d0b4b1a5942af528b9e7a80d12cae6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 2 Jun 2025 10:46:21 +0000 Subject: [PATCH 5/5] Add back nongit-fix.patch and fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch Co-authored-by: kgodara912 <193572699+kgodara912@users.noreply.github.com> --- SPECS/bind/bind.spec | 4 ++- ...tialized-warning-in-dlz_mysqldyn_mod.patch | 34 ++++++++++++++++++ SPECS/bind/nongit-fix.patch | 36 +++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 SPECS/bind/fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch create mode 100644 SPECS/bind/nongit-fix.patch diff --git a/SPECS/bind/bind.spec b/SPECS/bind/bind.spec index ab6443a6a69..ad2172293ab 100644 --- a/SPECS/bind/bind.spec +++ b/SPECS/bind/bind.spec @@ -32,6 +32,9 @@ Source13: named.rwtab Source14: named-chroot.files Source15: https://gitlab.isc.org/isc-projects/dlz-modules/-/archive/main/dlz-modules-main.tar.gz +Patch0: nongit-fix.patch +Patch1: fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch + BuildRequires: gcc BuildRequires: git BuildRequires: json-c-devel @@ -535,7 +538,6 @@ fi; %changelog * Mon May 26 2025 CBL-Mariner Servicing Account - 9.20.9-1 - Auto-upgrade to 9.20.9 - for CVE-2025-40775 -- Remove nongit-fix.patch and fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch * Tue Mar 11 2025 Andrew Phelps - 9.20.5-4 - Remove duplicate shared object files in base and devel packages diff --git a/SPECS/bind/fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch b/SPECS/bind/fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch new file mode 100644 index 00000000000..9054348416c --- /dev/null +++ b/SPECS/bind/fix-maybe-uninitialized-warning-in-dlz_mysqldyn_mod.patch @@ -0,0 +1,34 @@ +From daa392c65a4a578985fb3188ee81b1e80ee1791c Mon Sep 17 00:00:00 2001 +From: Tobias Brick +Date: Mon, 24 Feb 2025 18:17:20 +0000 +Subject: [PATCH] fix maybe-uninitialized warning in dlz_mysqldyn_mod.c + +--- + build/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/build/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c b/build/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c +index bdd0bcc..4488b94 100644 +--- a/build/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c ++++ b/build/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c +@@ -375,6 +375,9 @@ build_query(mysql_data_t *state, mysql_instance_t *dbi, const char *command, + size_t len = 0; + va_list ap1; + ++ /* Initialize arglist before anything else so we can safely free it if we fail out. */ ++ DLZ_LIST_INIT(arglist); ++ + /* Get a DB instance if needed */ + if (dbi == NULL) { + dbi = get_dbi(state); +@@ -390,7 +393,6 @@ build_query(mysql_data_t *state, mysql_instance_t *dbi, const char *command, + } + + va_start(ap1, command); +- DLZ_LIST_INIT(arglist); + q = querystr = strdup(command); + if (querystr == NULL) { + goto fail; +-- +2.45.3 + diff --git a/SPECS/bind/nongit-fix.patch b/SPECS/bind/nongit-fix.patch new file mode 100644 index 00000000000..262068e5277 --- /dev/null +++ b/SPECS/bind/nongit-fix.patch @@ -0,0 +1,36 @@ +From 87098009404ea5d372be6268bd1d1ce356c1a4f5 Mon Sep 17 00:00:00 2001 +From: Kshitiz Godara +Date: Mon, 2 Jun 2025 16:33:19 +0000 +Subject: [PATCH 2/2] non-git download issue + +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9701cdb..b7c84f6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,7 +19,7 @@ m4_define([bind_VERSION_MINOR], 20)dnl + m4_define([bind_VERSION_PATCH], 9)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_PKG_VERSION], [[bind_VERSION_MAJOR.bind_VERSION_MINOR.bind_VERSION_PATCH]bind_VERSION_EXTRA])dnl + + # +@@ -60,7 +60,9 @@ AC_CONFIG_MACRO_DIR([m4]) + # and not cross compling + # + AS_IF([test "$cross_compiling" = no], +- [AM_MAINTAINER_MODE(m4_ifset([bind_SRCID],[enable],[disable]))], ++ [AS_IF([test bind_SRCID = unsetID], ++ [AM_MAINTAINER_MODE([enable])], ++ [AM_MAINTAINER_MODE([disable])])], + [AM_MAINTAINER_MODE([disable])]) + + # +-- +2.45.3 +