From 2246fb180b21e9e8a661030b75a438869a3f6ab7 Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Mon, 16 Sep 2024 06:58:45 -0400
Subject: [PATCH] Fetch metadata by hash for DEB repos. (#18536)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This enables atomic updates to the repository metadata on the server
side, which should mitigate some of the issues we’ve seen with bad
hashes for packages.
---
 packaging/repoconfig/CMakeLists.txt     | 2 +-
 packaging/repoconfig/deb.changelog      | 6 ++++++
 packaging/repoconfig/netdata.sources.in | 4 ++--
 packaging/repoconfig/rpm.changelog      | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packaging/repoconfig/CMakeLists.txt b/packaging/repoconfig/CMakeLists.txt
index 415ad88072..2dec38895e 100644
--- a/packaging/repoconfig/CMakeLists.txt
+++ b/packaging/repoconfig/CMakeLists.txt
@@ -10,7 +10,7 @@ list(APPEND DEB_DISTROS debian ubuntu)
 set(DEB_GPG_KEY_SOURCE "https://repo.netdata.cloud/netdatabot.gpg.key")
 
 set(PACKAGE_VERSION 3)
-set(PACKAGE_RELEASE 4)
+set(PACKAGE_RELEASE 5)
 
 set(CPACK_THREADS 0)
 set(CPACK_STRIP_FILES NO)
diff --git a/packaging/repoconfig/deb.changelog b/packaging/repoconfig/deb.changelog
index 6d1dca8835..d493fa12ad 100644
--- a/packaging/repoconfig/deb.changelog
+++ b/packaging/repoconfig/deb.changelog
@@ -1,3 +1,9 @@
+@PKG_NAME@ (3-5) unstable; urgency=medium
+
+  * Swithc DEB packages to fetch repo metadata by hash.
+
+ -- Austin Hemmelgarn <austin@netdata.cloud>  Thu, 12 Sep 2024 07:27:00 -0400
+
 @PKG_NAME@ (3-4) unstable; urgency=medium
 
   * Convert sources to DEB822 format
diff --git a/packaging/repoconfig/netdata.sources.in b/packaging/repoconfig/netdata.sources.in
index 926b2c4532..ac30dc2f11 100644
--- a/packaging/repoconfig/netdata.sources.in
+++ b/packaging/repoconfig/netdata.sources.in
@@ -3,7 +3,7 @@ Types: deb
 URIs: http://repo.netdata.cloud/repos/@VARIANT@/@DIST_NAME@/
 Suites: @SUITE@/
 Signed-By: /usr/share/keyrings/netdata-archive-keyring.gpg
-By-Hash: No
+By-Hash: Yes
 Enabled: Yes
 
 X-Repolib-Name: Netdata repository configuration repository
@@ -11,5 +11,5 @@ Types: deb
 URIs: http://repo.netdata.cloud/repos/repoconfig/@DIST_NAME@/
 Suites: @SUITE@/
 Signed-By: /usr/share/keyrings/netdata-archive-keyring.gpg
-By-Hash: No
+By-Hash: Yes
 Enabled: Yes
diff --git a/packaging/repoconfig/rpm.changelog b/packaging/repoconfig/rpm.changelog
index dab81a2cfd..35fda5f478 100644
--- a/packaging/repoconfig/rpm.changelog
+++ b/packaging/repoconfig/rpm.changelog
@@ -1,4 +1,6 @@
-* Mon Aug 19 2024 Austin Hemmelgarn <austin@netdata.cloud
+* Thu Sep 17 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-5
+- Fix changelog formatting.
+* Mon Aug 19 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-4
 - Version bump to stay in sync with DEB packages.
 * Fri Aug 9 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-3
 - Use system certificate config for Yum/DNF repos.