From ce9254ef85dea0911baa5d24f86554bcdc846670 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sat, 6 Apr 2024 17:09:04 -0700
Subject: [PATCH] sync from upstream

---
 shared/additional_and_filter_packages.conf | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index fc2f659..afa61af 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -38,6 +38,26 @@ filter_packages = [
 
 ]
 
+filter_modules = [
+    ("^AppStream$", {
+       "*":
+             [
+             "*",
+             ],
+           }),
+    ("^BaseOS$", {
+       "*":
+             [
+             "*",
+             ],
+           }),
+    ("^CRB$", {
+       "*":
+             [
+             "*",
+             ],
+           }),
+]
 
 additional_packages = [
     # Everything contains everything.
@@ -102,6 +122,9 @@ additional_packages = [
             "cepces", #ENGCMP-3552
             "cepces-certmonger", #ENGCMP-3790
             "cepces-selinux", #ENGCMP-3803
+            "cloud-utils-growpart",
+            "cups-browsed", #ENGCMP-3862
+            "cups-filters-driverless", #ENGCMP-3862
             "cockpit-ostree", #ENGCMP-3233
             "composefs", #ENGCMP-3802
             "dotnet-apphost-pack-7.0", #ENGCMP-2586
@@ -113,10 +136,12 @@ additional_packages = [
             "dotnet-runtime-8.0", #ENGCMP-3375
             "dotnet-sdk-7.0", #ENGCMP-2586
             "dotnet-sdk-8.0", #ENGCMP-3375
+            "dotnet-sdk-8.0-source-built-artifacts", #ENGCMP-3375
             "dotnet-targeting-pack-7.0", #ENGCMP-2586
             "dotnet-targeting-pack-8.0", #ENGCMP-3375
             "dotnet-templates-7.0", #ENGCMP-2586
             "dotnet-templates-8.0", #ENGCMP-3375
+            "dpdk-devel", #ENGCMP-2205
             "drgn", #ENGCMP-3490
             "ecj", #ENGCMP-2928
             "efs-utils", #ENGCMP-3422
@@ -200,7 +225,10 @@ additional_packages = [
             "gstreamer1-plugins-base-tools", #ENGCMP-2907
             "gstreamer1-rtsp-server", #ENGCMP-3178
             "gvisor-tap-vsock", #ENGCMP-3491
+            "gstreamer1-plugins-base-tools", #ENGCMP-2907
+            "gstreamer1-rtsp-server", #ENGCMP-3178
             "idm-pki-est", #ENGCMP-2798
+            "ipp-usb", #ENGCMP-3862
             "ignition-edge", #ENGCMP-2770
             "ignition-validate", #ENGCMP-2656
             "intel-lpmd", #ENGCMP-3806
@@ -231,6 +259,7 @@ additional_packages = [
             "libi2cd", #ENGCMP-2428
             "libi2cd-devel", #ENGCMP-2428
             "libkdumpfile", #ENGCMP-3470
+            "libnvme", #ENGCMP-2358
             "libnxz", #ENGCMP-2576
             "libsepol-utils", #ENGCMP-2399
             "libtsan2", #ENGCMP-2405
@@ -252,7 +281,6 @@ additional_packages = [
             "netstandard-targeting-pack-2.1", #ENGCMP-2586
             "nfsv4-client-utils", #ENGCMP-2493
             "nvme-stas", #ENGCMP-2495
-            "libnvme", #ENGCMP-2358
             "osbuild-depsolve-dnf", #ENGCMP-3857
             "passt", #ENGCMP-2741
             "passt-selinux", # ENGCMP-3074
@@ -269,32 +297,6 @@ additional_packages = [
             "python3-dnf-plugin-leaves", #ENGCMP-3213
             "python3-dnf-plugin-show-leaves", #ENGCMP-3213
             "python3-pefile", #ENGCMP-3231
-            "python3.11", #ENGCMP-2833
-            "python3.11-cffi", #ENGCMP-2957
-            "python3.11-charset-normalizer", #ENGCMP-2914
-            "python3.11-cryptography", #ENGCMP-2958
-            "python3.11-devel", #ENGCMP-2982
-            "python3.11-idna", #ENGCMP-2888
-            "python3.11-lxml", #ENGCMP-2954
-            "python3.11-mod_wsgi", #ENGCMP-2955
-            "python3.11-numpy", #ENGCMP-2933
-            "python3.11-numpy-f2py", #ENGCMP-2982
-            "python3.11-pip", #ENGCMP-2858
-            "python3.11-ply", #ENGCMP-2911
-            "python3.11-psycopg2", #ENGCMP-2956
-            "python3.11-pycparser", #ENGCMP-2923
-            "python3.11-PyMySQL", #ENGCMP-2963
-            "python3.11-PyMySQL+rsa", #ENGCMP-2982
-            "python3.11-pysocks", #ENGCMP-2912
-            "python3.11-pyyaml", #ENGCMP-2910
-            "python3.11-requests", #ENGCMP-2940
-            "python3.11-requests+security", #ENGCMP-2982
-            "python3.11-requests+socks", #ENGCMP-2982
-            "python3.11-scipy", #ENGCMP-2979
-            "python3.11-setuptools", #ENGCMP-2860
-            "python3.11-six", #ENGCMP-2872
-            "python3.11-tkinter", #ENGCMP-2982
-            "python3.11-wheel", #ENGCMP-2873
             "python3-dnf-plugin-modulesync", #ENGCMP-2323
             "python3-alembic", #ENGCMP-2424
             "python3-greenlet", #ENGCMP-2421
@@ -339,7 +341,6 @@ additional_packages = [
             "python3.12-wheel", #ENGCMP-3671
             "qatlib-service", #ENGCMP-2490
             "redhat-cloud-client-configuration", #ENGCMP-2401
-            "rpm-local-generator-support", #ENGCMP-3800
             "rtla", #ENGCMP-2799
             "rust-analyzer", #ENGCMP-2839
             "rv", #ENGCMP-3263
@@ -389,7 +390,6 @@ additional_packages = [
              "kernel-64k-devel", #ENGCMP-2800
              "kernel-64k-devel-matched", #ENGCMP-2800
              "rhc-worker-playbook", #ENGCMP-3127
-             "s390utils", #ENGCMP-3606
          ],
          "s390x": [
              "libzpc", #ENGCMP-2756