From 9b359174ee00828f792755e42b81b6d1a3aec521 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 4 Nov 2024 09:08:33 -0700
Subject: [PATCH] sync from upstream

---
 prepopulate.json                           | 24 ----------------------
 prepopulate.yaml                           | 16 ---------------
 shared/additional_and_filter_packages.conf |  1 +
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/prepopulate.json b/prepopulate.json
index 672fd09..7f83791 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -6486,9 +6486,6 @@
       "xz-java": [
         "xz-java.noarch"
       ],
-      "yajl": [
-        "yajl.aarch64"
-      ],
       "yelp-tools": [
         "yelp-tools.noarch"
       ],
@@ -12914,9 +12911,6 @@
       "xz-java": [
         "xz-java.noarch"
       ],
-      "yajl": [
-        "yajl.ppc64le"
-      ],
       "yelp-tools": [
         "yelp-tools.noarch"
       ],
@@ -19332,9 +19326,6 @@
       "xz-java": [
         "xz-java.noarch"
       ],
-      "yajl": [
-        "yajl.s390x"
-      ],
       "yelp-tools": [
         "yelp-tools.noarch"
       ],
@@ -25949,9 +25940,6 @@
       "xz-java": [
         "xz-java.noarch"
       ],
-      "yajl": [
-        "yajl.x86_64"
-      ],
       "yelp-tools": [
         "yelp-tools.noarch"
       ],
@@ -34031,9 +34019,6 @@
       "xorg-x11-xtrans-devel": [
         "xorg-x11-xtrans-devel.noarch"
       ],
-      "yajl": [
-        "yajl-devel.aarch64"
-      ],
       "zlib-ng": [
         "zlib-ng-compat-static.aarch64"
       ],
@@ -35803,9 +35788,6 @@
         "xmvn-mojo.noarch",
         "xmvn-tools.noarch"
       ],
-      "yajl": [
-        "yajl-devel.ppc64le"
-      ],
       "zlib-ng": [
         "zlib-ng-compat-static.ppc64le"
       ],
@@ -37568,9 +37550,6 @@
         "xmvn-mojo.noarch",
         "xmvn-tools.noarch"
       ],
-      "yajl": [
-        "yajl-devel.s390x"
-      ],
       "zlib-ng": [
         "zlib-ng-compat-static.s390x"
       ],
@@ -39411,9 +39390,6 @@
         "xmvn-mojo.noarch",
         "xmvn-tools.noarch"
       ],
-      "yajl": [
-        "yajl-devel.x86_64"
-      ],
       "zlib-ng": [
         "zlib-ng-compat-static.x86_64"
       ],
diff --git a/prepopulate.yaml b/prepopulate.yaml
index e40f5bc..fbf7b42 100644
--- a/prepopulate.yaml
+++ b/prepopulate.yaml
@@ -5044,8 +5044,6 @@ AppStream:
     - xz-lzma-compat.aarch64
     xz-java:
     - xz-java.noarch
-    yajl:
-    - yajl.aarch64
     yelp-tools:
     - yelp-tools.noarch
     yelp-xsl:
@@ -10037,8 +10035,6 @@ AppStream:
     - xz-lzma-compat.ppc64le
     xz-java:
     - xz-java.noarch
-    yajl:
-    - yajl.ppc64le
     yelp-tools:
     - yelp-tools.noarch
     yelp-xsl:
@@ -15029,8 +15025,6 @@ AppStream:
     - xz-lzma-compat.s390x
     xz-java:
     - xz-java.noarch
-    yajl:
-    - yajl.s390x
     yelp-tools:
     - yelp-tools.noarch
     yelp-xsl:
@@ -20171,8 +20165,6 @@ AppStream:
     - xz-lzma-compat.x86_64
     xz-java:
     - xz-java.noarch
-    yajl:
-    - yajl.x86_64
     yelp-tools:
     - yelp-tools.noarch
     yelp-xsl:
@@ -26271,8 +26263,6 @@ CRB:
     - xmvn-tools.noarch
     xorg-x11-xtrans-devel:
     - xorg-x11-xtrans-devel.noarch
-    yajl:
-    - yajl-devel.aarch64
     zlib-ng:
     - zlib-ng-compat-static.aarch64
     zziplib:
@@ -27517,8 +27507,6 @@ CRB:
     - xmvn-minimal.noarch
     - xmvn-mojo.noarch
     - xmvn-tools.noarch
-    yajl:
-    - yajl-devel.ppc64le
     zlib-ng:
     - zlib-ng-compat-static.ppc64le
     zziplib:
@@ -28759,8 +28747,6 @@ CRB:
     - xmvn-minimal.noarch
     - xmvn-mojo.noarch
     - xmvn-tools.noarch
-    yajl:
-    - yajl-devel.s390x
     zlib-ng:
     - zlib-ng-compat-static.s390x
     zziplib:
@@ -30062,8 +30048,6 @@ CRB:
     - xmvn-minimal.noarch
     - xmvn-mojo.noarch
     - xmvn-tools.noarch
-    yajl:
-    - yajl-devel.x86_64
     zlib-ng:
     - zlib-ng-compat-static.x86_64
     zziplib:
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index ece386d..9996f15 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -337,6 +337,7 @@ additional_packages = [
             "s390utils-se-data", #ENGCMP-3789
             "samba-gpupdate", #ENGCMP-3659, ENGCMP-3720
             "sip6", #ENGCMP-2239
+            "slirp4netns", #ENGCMP-4612
             "speech-dispatcher-utils", #ENGCMP-4281
             "sssd-idp", #ENGCMP-2276
             "stratisd-tools", #ENGCMP-3210