From e4cb3a223373536f52fa81033cce7ff9280568d4 Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Sun, 31 Oct 2021 14:51:24 -0700
Subject: [PATCH] sync with 8.5

---
 common/include-excludes.conf | 90 ++++++++++++++++++++++++++++++++++--
 variants.xml                 |  3 ++
 2 files changed, 89 insertions(+), 4 deletions(-)

diff --git a/common/include-excludes.conf b/common/include-excludes.conf
index c6f54e1..10129bd 100644
--- a/common/include-excludes.conf
+++ b/common/include-excludes.conf
@@ -33,7 +33,7 @@ filter_packages = [
 
     ("^.*$", {
         "*": [
-            "java-11-openjdk-*slowdebug*",
+            "scap-security-guide-rule-playbooks",
         ]
     }),
 ]
@@ -57,7 +57,8 @@ filter_modules = [
 additional_packages = [
     ("^AppStream$", {
         "*": [
-            "libasan5", 
+	    "ansible-collection-redhat-rhel_mgmt",
+            "libasan5",
             "libubsan1",
             "dotnet5.0",
             "gcc-toolset-10-dyninst-devel",
@@ -67,8 +68,8 @@ additional_packages = [
             "micropipenv",
             "nispor",
             "nispor-devel",
-            "osbuild-composer-core",
             "python3-nispor",
+            "python3-pyghmi",
             "libnumbertext",
             "dotnet-sdk-3.0",
             "perl-IO-String",
@@ -81,7 +82,6 @@ additional_packages = [
             "ucx-ib",
             "ucx-rdmacm"
             "ucx-devel",
-            "qatengine",
             "mpich-doc",
             "mvapich2-devel",
             "mvapich2-psm2-devel",
@@ -91,10 +91,86 @@ additional_packages = [
             "mysql-selinux",
             "rshim",
             "qatlib",
+            "qatengine",
             "tracer",
             "flatpak-xdg-utils",
             "modulemd-tools",
             "emoji-picker",
+            "gcc-toolset-11",
+            "xapian-core",
+            "gnome-session-kiosk-session",
+            "udftools",
+            "qperf",
+            "gcc-toolset-11-dwz",
+            "gcc-toolset-11-gcc",
+            "ansible-freeipa-tests",
+            "xorg-x11-server-Xwayland",
+            "gcc-toolset-11-strace",
+            "ansible-pcp",
+            "gcc-toolset-11-dyninst",
+            "gcc-toolset-11-binutils",
+            "gcc-toolset-11-valgrind",
+            "gcc-toolset-11-elfutils",
+            "gcc-toolset-11-systemtap",
+            "gcc-toolset-11-gdb",
+            "gcc-toolset-11-annobin",
+            "gcc-toolset-11-annobin-annocheck",
+            "gcc-toolset-11-annobin-annocheck-debuginfo",
+            "gcc-toolset-11-annobin-debuginfo",
+            "gcc-toolset-11-annobin-plugin-gcc",
+            "gcc-toolset-11-annobin-plugin-gcc-debuginfo",
+            "stratisd-dracut",
+            "eth-tools",
+            "sblim-gather",
+            "gcc-toolset-11-ltrace",
+            "gcc-toolset-11-make",
+            "coreos-installer",
+            "ansible-collection-microsoft-sql",
+            "tesseract",
+            "gcc-toolset-11-annobin-debuginfo",
+            "gcc-toolset-11-binutils-devel",
+            "gcc-toolset-11-dyninst-devel",
+            "gcc-toolset-11-elfutils-debuginfod-client-devel",
+            "gcc-toolset-11-elfutils-devel",
+            "gcc-toolset-11-elfutils-libelf-devel",
+            "gcc-toolset-11-gcc-gdb-plugin-debuginfo",
+            "gcc-toolset-11-gcc-gdb-plugin",
+            "gcc-toolset-11-gdb-doc",
+            "gcc-toolset-11-gdb-gdbserver",
+            "gcc-toolset-11-libasan-devel",
+            "gcc-toolset-11-libatomic-devel",
+            "gcc-toolset-11-libitm-devel",
+            "gcc-toolset-11-liblsan-devel",
+            "gcc-toolset-11-libstdc++-docs",
+            "gcc-toolset-11-libtsan-devel",
+            "gcc-toolset-11-libubsan-devel",
+            "gcc-toolset-11-make-devel",
+            "gcc-toolset-11-systemtap-initscript",
+            "gcc-toolset-11-systemtap-sdt-devel",
+            "gcc-toolset-11-systemtap-server-debuginfo",
+            "gcc-toolset-11-systemtap-server",
+            "gcc-toolset-11-valgrind-devel",
+            "gcc-toolset-11-build",
+            "eth-tools-basic",
+            "eth-tools-fastfabric",
+            "java-17-openjdk",
+            "samba-vfs-iouring",
+            "sevctl",
+            "coreos-installer-bootinfra",
+            "gcc-toolset-11-gcc-plugin-devel",
+            "java-17-openjdk-demo",
+            "java-17-openjdk-devel",
+            "java-17-openjdk-jmods",
+            "java-17-openjdk-src",
+            "java-17-openjdk-static-libs",
+            "java-17-openjdk-javadoc",
+            "java-17-openjdk-javadoc-zip",
+            "gcc-toolset-11-libgccjit",
+            "gcc-toolset-11-libgccjit-devel",
+            "pcm",
+            "jigawatts",
+            "udica",
+            "jigawatts-javadoc",
         ]
     }),
 
@@ -848,6 +924,11 @@ additional_packages = [
             "libsolv-devel",
             "libsolv-tools",
             "ibus-typing-booster-tests",
+            "dotnet-sdk-3.1-source-built-artifacts",
+            "dotnet-sdk-5.0-source-built-artifacts",
+            "libcomps-devel",
+            "sblim-gather-provider",
+            "tesseract-devel",
         ]
     }),
     ("PowerTools", {
@@ -864,6 +945,7 @@ additional_packages = [
         "x86_64": [
             "java-1.8.0-openjdk-*slowdebug*",
             "java-11-openjdk-*slowdebug*",
+            "dotnet5.0-build-reference-packages",
             "java-17-openjdk-*slowdebug*",
         ],
     }),
diff --git a/variants.xml b/variants.xml
index abb712b..b281256 100644
--- a/variants.xml
+++ b/variants.xml
@@ -180,9 +180,11 @@
       <module>nginx:1.14</module>
       <module>nginx:1.16</module>
       <module>nginx:1.18</module>
+      <module>nginx:1.20</module>
       <module>nodejs:10</module>
       <module>nodejs:12</module>
       <module>nodejs:14</module>
+      <module>nodejs:16</module>
       <module>parfait:0.5</module>
       <module>perl:5.24</module>
       <module>perl:5.26</module>
@@ -208,6 +210,7 @@
       <module>ruby:2.5</module>
       <module>ruby:2.6</module>
       <module>ruby:2.7</module>
+      <module>ruby:3.0</module>
       <module>rust-toolset:rhel8</module>
       <module>satellite-5-client:1.0</module>
       <module>scala:2.10</module>