6 files changed, 50 insertions, 25 deletions
diff --git a/packaging/repoconfig/CMakeLists.txt b/packaging/repoconfig/CMakeLists.txt
index 65813460..415ad880 100644
--- a/packaging/repoconfig/CMakeLists.txt
+++ b/packaging/repoconfig/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-cmake_minimum_required(VERSION 3.13.0...3.28)
+cmake_minimum_required(VERSION 3.16.0...3.30)
 
 list(APPEND RHEL_DISTROS centos centos-stream rocky almalinux cloudlinux)
 list(APPEND SUSE_DISTROS opensuse-leap opensuse-tumbleweed)
@@ -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 1)
+set(PACKAGE_RELEASE 4)
 
 set(CPACK_THREADS 0)
 set(CPACK_STRIP_FILES NO)
@@ -117,10 +117,10 @@ if(${DISTRO} IN_LIST DEB_DISTROS)
   set(DIST_NAME ${DISTRO})
   message(STATUS "Generating stable repository configuration for ${DISTRO} ${SUITE}")
   set(VARIANT stable)
-  configure_file(netdata.list.in netdata.list @ONLY)
+  configure_file(netdata.sources.in netdata.sources @ONLY)
   message(STATUS "Generating edge repository configuration for ${DISTRO} ${SUITE}")
   set(VARIANT edge)
-  configure_file(netdata.list.in netdata-edge.list @ONLY)
+  configure_file(netdata.sources.in netdata-edge.sources @ONLY)
   message(STATUS "Preparing changelogs")
   set(PKG_NAME netdata-repo)
   file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/netdata-repo)
@@ -129,10 +129,10 @@ if(${DISTRO} IN_LIST DEB_DISTROS)
   file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/netdata-repo-edge)
   configure_file(deb.changelog netdata-repo-edge/changelog @ONLY)
 
-  install(FILES ${CMAKE_BINARY_DIR}/netdata.list
+  install(FILES ${CMAKE_BINARY_DIR}/netdata.sources
           DESTINATION etc/apt/sources.list.d
           COMPONENT netdata-repo)
-  install(FILES ${CMAKE_BINARY_DIR}/netdata-edge.list
+  install(FILES ${CMAKE_BINARY_DIR}/netdata-edge.sources
           DESTINATION etc/apt/sources.list.d
           COMPONENT netdata-repo-edge)
 
@@ -150,24 +150,14 @@ if(${DISTRO} IN_LIST DEB_DISTROS)
                     DEPENDS ${CMAKE_BINARY_DIR}/netdata.gpg)
 
   install(FILES ${CMAKE_BINARY_DIR}/netdata.gpg
-          DESTINATION etc/apt/trusted.gpg.d
+          DESTINATION usr/share/keyrings
           RENAME netdata-archive-keyring.gpg
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
           COMPONENT netdata-repo)
-  install(FILES ${CMAKE_BINARY_DIR}/netdata.gpg
-          DESTINATION etc/apt/trusted.gpg.d
-          RENAME netdata-repoconfig-archive-keyring.gpg
-          PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
-          COMPONENT netdata-repo)
 
   install(FILES ${CMAKE_BINARY_DIR}/netdata.gpg
-          DESTINATION etc/apt/trusted.gpg.d
-          RENAME netdata-edge-archive-keyring.gpg
-          PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
-          COMPONENT netdata-repo-edge)
-  install(FILES ${CMAKE_BINARY_DIR}/netdata.gpg
-          DESTINATION etc/apt/trusted.gpg.d
-          RENAME netdata-repoconfig-archive-keyring.gpg
+          DESTINATION usr/share/keyrings
+          RENAME netdata-archive-keyring.gpg
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
           COMPONENT netdata-repo-edge)
 
@@ -247,10 +237,10 @@ elseif(${DISTRO} IN_LIST RPM_DISTROS)
   set(CPACK_RPM_PACKAGE_VERSION "${PACKAGE_VERSION}")
   set(CPACK_RPM_PACKAGE_RELEASE "${PACKAGE_RELEASE}")
   set(CPACK_RPM_PACKAGE_CHANGELOG "${CMAKE_SOURCE_DIR}/rpm.changelog")
-  set(CPACK_RPM_NETDATA-REPO_FILE_NAME "netdata-repo-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.rpm")
+  set(CPACK_RPM_NETDATA-REPO_FILE_NAME "netdata-repo-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.noarch.rpm")
   set(CPACK_RPM_NETDATA-REPO_PACKAGE_NAME "netdata-repo")
   set(CPACK_RPM_NETDATA-REPO_PACAKGE_CONFLICTS "netdata-repo-edge")
-  set(CPACK_RPM_NETDATA-REPO-EDGE_FILE_NAME "netdata-repo-edge-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.rpm")
+  set(CPACK_RPM_NETDATA-REPO-EDGE_FILE_NAME "netdata-repo-edge-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.noarch.rpm")
   set(CPACK_RPM_NETDATA-REPO-EDGE_PACKAGE_NAME "netdata-repo-edge")
   set(CPACK_RPM_NETDATA-REPO-EDGE_PACKAGE_CONFLICTS "netdata-repo")
 else()
diff --git a/packaging/repoconfig/deb.changelog b/packaging/repoconfig/deb.changelog
index 9d0f3ba7..6d1dca88 100644
--- a/packaging/repoconfig/deb.changelog
+++ b/packaging/repoconfig/deb.changelog
@@ -1,3 +1,21 @@
+@PKG_NAME@ (3-4) unstable; urgency=medium
+
+  * Convert sources to DEB822 format
+
+ -- Netdata Builder <bot@netdata.cloud>  Mon, 19 Aug 2024 07:49:00 -0400
+
+@PKG_NAME@ (3-3) unstable; urgency=medium
+
+  * Version bump to keep in sync with RPM repo packages
+
+ -- Netdata Builder <bot@netdata.cloud>  Fri, 9 Aug 2024 09:37:00 -0400
+
+@PKG_NAME@ (3-2) unstable; urgency=medium
+
+  * Version bump to keep in sync with RPM repo packages
+
+ -- Netdata Builder <bot@netdata.cloud>  Mon, 24 Jun 2024 07:54:00 -0400
+
 @PKG_NAME@ (3-1) unstable; urgency=medium
 
   * Migrate to CPack for package builds
diff --git a/packaging/repoconfig/netdata.list.in b/packaging/repoconfig/netdata.list.in
deleted file mode 100644
index b35ede44..00000000
--- a/packaging/repoconfig/netdata.list.in
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://repo.netdata.cloud/repos/@VARIANT@/@DIST_NAME@/ @SUITE@/
-deb http://repo.netdata.cloud/repos/repoconfig/@DIST_NAME@/ @SUITE@/
diff --git a/packaging/repoconfig/netdata.repo.dnf b/packaging/repoconfig/netdata.repo.dnf
index a8ab94a0..3a64a2a5 100644
--- a/packaging/repoconfig/netdata.repo.dnf
+++ b/packaging/repoconfig/netdata.repo.dnf
@@ -6,7 +6,6 @@ gpgcheck=1
 gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
-sslcacert=/etc/pki/tls/certs/ca-bundle.crt
 priority=50
 
 [netdata-repoconfig]
@@ -17,5 +16,4 @@ gpgcheck=1
 gpgkey=https://repo.netdata.cloud/netdatabot.gpg.key
 enabled=1
 sslverify=1
-sslcacert=/etc/pki/tls/certs/ca-bundle.crt
 priority=50
diff --git a/packaging/repoconfig/netdata.sources.in b/packaging/repoconfig/netdata.sources.in
new file mode 100644
index 00000000..926b2c45
--- /dev/null
+++ b/packaging/repoconfig/netdata.sources.in
@@ -0,0 +1,15 @@
+X-Repolib-Name: Netdata @VARIANT@ repository
+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
+Enabled: Yes
+
+X-Repolib-Name: Netdata repository configuration repository
+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
+Enabled: Yes
diff --git a/packaging/repoconfig/rpm.changelog b/packaging/repoconfig/rpm.changelog
index 5ae4aea0..dab81a2c 100644
--- a/packaging/repoconfig/rpm.changelog
+++ b/packaging/repoconfig/rpm.changelog
@@ -1,3 +1,9 @@
+* Mon Aug 19 2024 Austin Hemmelgarn <austin@netdata.cloud
+- 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.
+* Mon Jun 24 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-2
+- Fix package file names.
 * Fri Jun 14 2024 Austin Hemmelgarn <austin@netdata.cloud> 3-1
 - Migrate package build infrastructure to CPack.
 * Wed Apr 10 2024 Paul Szymanski <mail@pszy.de> 2-3