From 399d6d2ea97c57761ca37316116f893e73f11c9e Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sun, 27 Oct 2024 13:07:54 -0700
Subject: [PATCH] sync from upstream

---
 prepopulate.json                           | 12 ------------
 prepopulate.yaml                           |  8 --------
 shared/additional_and_filter_packages.conf |  4 ++++
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/prepopulate.json b/prepopulate.json
index b72242c..8c5900d 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -603,9 +603,6 @@
       "diffstat": [
         "diffstat.aarch64"
       ],
-      "dlm": [
-        "dlm-lib.aarch64"
-      ],
       "dnsmasq": [
         "dnsmasq-utils.aarch64",
         "dnsmasq.aarch64"
@@ -7126,9 +7123,6 @@
       "diffstat": [
         "diffstat.ppc64le"
       ],
-      "dlm": [
-        "dlm-lib.ppc64le"
-      ],
       "dnsmasq": [
         "dnsmasq-utils.ppc64le",
         "dnsmasq.ppc64le"
@@ -13559,9 +13553,6 @@
       "diffstat": [
         "diffstat.s390x"
       ],
-      "dlm": [
-        "dlm-lib.s390x"
-      ],
       "dnsmasq": [
         "dnsmasq-utils.s390x",
         "dnsmasq.s390x"
@@ -20009,9 +20000,6 @@
       "diffstat": [
         "diffstat.x86_64"
       ],
-      "dlm": [
-        "dlm-lib.x86_64"
-      ],
       "dnsmasq": [
         "dnsmasq-utils.x86_64",
         "dnsmasq.x86_64"
diff --git a/prepopulate.yaml b/prepopulate.yaml
index 5e8e221..d4af0ea 100644
--- a/prepopulate.yaml
+++ b/prepopulate.yaml
@@ -462,8 +462,6 @@ AppStream:
     - dialog.aarch64
     diffstat:
     - diffstat.aarch64
-    dlm:
-    - dlm-lib.aarch64
     dnsmasq:
     - dnsmasq-utils.aarch64
     - dnsmasq.aarch64
@@ -5530,8 +5528,6 @@ AppStream:
     - dialog.ppc64le
     diffstat:
     - diffstat.ppc64le
-    dlm:
-    - dlm-lib.ppc64le
     dnsmasq:
     - dnsmasq-utils.ppc64le
     - dnsmasq.ppc64le
@@ -10523,8 +10519,6 @@ AppStream:
     - dialog.s390x
     diffstat:
     - diffstat.s390x
-    dlm:
-    - dlm-lib.s390x
     dnsmasq:
     - dnsmasq-utils.s390x
     - dnsmasq.s390x
@@ -15535,8 +15529,6 @@ AppStream:
     - dialog.x86_64
     diffstat:
     - diffstat.x86_64
-    dlm:
-    - dlm-lib.x86_64
     dnsmasq:
     - dnsmasq-utils.x86_64
     - dnsmasq.x86_64
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 382f123..ac1b390 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -98,6 +98,7 @@ additional_packages = [
             "fwupd-efi", #ENGCMP-4308
             "python3-libcpuid", #ENGCMP-4447
             "python3-dnf-plugin-pre-transaction-actions", #ENGCMP-4445
+            "kernel-uki-virt-addons", #ENGCMP-4617
         ]
     }),
     ("^BaseOS$", {
@@ -264,6 +265,7 @@ additional_packages = [
             "netstandard-targeting-pack-2.1", #ENGCMP-2586
             "nfsv4-client-utils", #ENGCMP-2493
             "nvme-stas", #ENGCMP-2495
+            "openssh-keysign", #ENGCMP-4703
             "osbuild-depsolve-dnf", #ENGCMP-3857
             "oqsprovider", #ENGCMP-3895
             "pappl", #ENGCMP-3941
@@ -464,6 +466,7 @@ additional_packages = [
             "enchant2-voikko", #ENGCMP-4312
             "gtk3-immodules", #ENGCMP-4312
             "libportal-gtk3", #ENGCMP-4312
+            "libportal-qt6", #RHEL-60817
             "usbredir-tools", #ENGCMP-4314
             "mysql-libs", #ENGCMP-4317
             "libkcapi-hasher", #ENGCMP-4321
@@ -523,6 +526,7 @@ additional_packages = [
             "dotnet-sdk-dbg-9.0", #ENGCMP-4413
             "dotnet-targeting-pack-9.0", #ENGCMP-4413
             "dotnet-templates-9.0", #ENGCMP-4413
+            "crypto-policies-pq-preview", #ENGCMP-4665
         ]
     }),
     ("^AppStream$", {