From 514f66a2d6da4f75aac4d1a0261fe3d5137f76df Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Sun, 21 Mar 2021 18:25:35 +0800
Subject: [PATCH] replace rsyslog-gnutls by rsyslog

---
 isomaker/config/aarch64/normal.xml | 3 ---
 isomaker/config/rpmlist.xml        | 1 -
 isomaker/config/x86_64/normal.xml  | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/isomaker/config/aarch64/normal.xml b/isomaker/config/aarch64/normal.xml
index 35350f7..12ed45f 100644
--- a/isomaker/config/aarch64/normal.xml
+++ b/isomaker/config/aarch64/normal.xml
@@ -912,7 +912,6 @@
       <packagereq type="default">freeradius</packagereq>
       <packagereq type="optional">libreswan</packagereq>
       <packagereq type="optional">radvd</packagereq>
-      <packagereq type="optional">rsyslog-gnutls</packagereq>
       <packagereq type="optional">rsyslog</packagereq>
       <packagereq type="optional">rsyslog-mysql</packagereq>
       <packagereq type="optional">rsyslog-pgsql</packagereq>
@@ -938,7 +937,6 @@
       <packagereq type="optional">freeradius</packagereq>
       <packagereq type="optional">libreswan</packagereq>
       <packagereq type="optional">radvd</packagereq>
-      <packagereq type="optional">rsyslog-gnutls</packagereq>
       <packagereq type="optional">rsyslog</packagereq>
       <packagereq type="optional">rsyslog-mysql</packagereq>
       <packagereq type="optional">rsyslog-pgsql</packagereq>
@@ -1316,7 +1314,6 @@
       <packagereq type="default">libstoragemgmt</packagereq>
       <packagereq type="default">nano</packagereq>
       <packagereq type="default">rng-tools</packagereq>
-      <packagereq type="mandatory">rsyslog-gnutls</packagereq>
       <packagereq type="mandatory">rsyslog</packagereq>
       <packagereq type="mandatory">rsyslog-relp</packagereq>
       <packagereq type="default">nmap</packagereq>
diff --git a/isomaker/config/rpmlist.xml b/isomaker/config/rpmlist.xml
index 23671de..b2fbe3a 100644
--- a/isomaker/config/rpmlist.xml
+++ b/isomaker/config/rpmlist.xml
@@ -1184,7 +1184,6 @@
         <packagereq>rsyslog</packagereq>
         <packagereq>rsyslog-crypto</packagereq>
         <packagereq>rsyslog-elasticsearch</packagereq>
-        <packagereq>rsyslog-gnutls</packagereq>
         <packagereq>rsyslog-help</packagereq>
         <packagereq>rsyslog-mmaudit</packagereq>
         <packagereq>rsyslog-mmjsonparse</packagereq>
diff --git a/isomaker/config/x86_64/normal.xml b/isomaker/config/x86_64/normal.xml
index 588e66e..366e32e 100644
--- a/isomaker/config/x86_64/normal.xml
+++ b/isomaker/config/x86_64/normal.xml
@@ -915,7 +915,6 @@
       <packagereq type="optional">freeradius</packagereq>
       <packagereq type="optional">libreswan</packagereq>
       <packagereq type="optional">radvd</packagereq>
-      <packagereq type="optional">rsyslog-gnutls</packagereq>
       <packagereq type="optional">rsyslog</packagereq>
       <packagereq type="optional">rsyslog-mysql</packagereq>
       <packagereq type="optional">rsyslog-pgsql</packagereq>
@@ -941,7 +940,6 @@
       <packagereq type="optional">freeradius</packagereq>
       <packagereq type="optional">libreswan</packagereq>
       <packagereq type="optional">radvd</packagereq>
-      <packagereq type="optional">rsyslog-gnutls</packagereq>
       <packagereq type="optional">rsyslog</packagereq>
       <packagereq type="optional">rsyslog-mysql</packagereq>
       <packagereq type="optional">rsyslog-pgsql</packagereq>
@@ -1320,7 +1318,6 @@
       <packagereq type="default">libstoragemgmt</packagereq>
       <packagereq type="default">nano</packagereq>
       <packagereq type="default">rng-tools</packagereq>
-      <packagereq type="mandatory">rsyslog-gnutls</packagereq>
       <packagereq type="mandatory">rsyslog</packagereq>
       <packagereq type="mandatory">rsyslog-relp</packagereq>
       <packagereq type="default">nmap</packagereq>
-- 
2.27.0