Notification time stamped 2021-04-30 14:47:19 UTC
From aea7480a90f840da3b6c7465d51ac290ed6846bb Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:57:09 +0000
Subject: rebase postfix role to latest upstream
Resolves: rhbz#1937938
---
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index 04fa4db..80329bf 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -97,9 +97,9 @@ BuildRequires: ansible >= 2.9.10
%%global rolestodir %%{?rolestodir} %%{roletodir%{1}}
}
-#%%defcommit 1 43eec5668425d295dce3801216c19b1916df1f9b
+%defcommit 1 bbf5784849d362cc3443fde8b09da26ea698a8ce
%global rolename1 postfix
-%deftag 1 0.1
+#%%deftag 1 0.1
%defcommit 2 557546f922886fc1e73012f2af08ec80fec82fe2
%global rolename2 selinux
@@ -187,9 +187,6 @@ Source17: %{archiveurl17}
# Not used on Fedora.
Source998: collection_readme.sh
-Patch11: rhel-system-roles-postfix-pr5.diff
-Patch12: postfix-meta-el8.diff
-
Patch21: selinux-tier1-tags.diff
Patch31: timesync-tier1-tags.diff
@@ -262,10 +259,6 @@ for rolename in %{rolenames}; do
mv "${ROLESTODIR[${rolename}]}" ${rolename}
done
-cd %{rolename1}
-%patch11 -p1
-%patch12 -p1
-cd ..
cd %{rolename2}
%patch21 -p1
cd ..
diff --git a/postfix-meta-el8.diff b/postfix-meta-el8.diff
deleted file mode 100644
index 41cb91b..0000000
--- a/postfix-meta-el8.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/meta/main.yml b/meta/main.yml
-index a0ef6f4..da22270 100644
---- a/meta/main.yml
-+++ b/meta/main.yml
-@@ -7,8 +7,8 @@ galaxy_info:
- min_ansible_version: 2.2
- platforms:
- - name: Fedora
-- versions: [ 24, 25 ]
-+ versions: [ 31, 32 ]
- - name: EL
-- versions: [ 6, 7 ]
-+ versions: [ 6, 7, 8 ]
-
-
-
diff --git a/rhel-system-roles-postfix-pr5.diff b/rhel-system-roles-postfix-pr5.diff
deleted file mode 100644
index 4da6f48..0000000
--- a/rhel-system-roles-postfix-pr5.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/README.md b/README.md
-index 5950215..df64284 100644
---- a/README.md
-+++ b/README.md
-@@ -17,7 +17,7 @@ Example Playbook
-
- Install and enable postfix. Configure "relay_domains=$mydestination" and
-
--```
-+```yaml
- ---
- - hosts: all
- vars:
-@@ -31,7 +31,7 @@ Install and enable postfix. Configure
"relay_domains=$mydestination" and
- Install and enable postfix. Do not run 'postfix check' before restarting
- postfix:
-
--```
-+```yaml
- ---
- - hosts: all
- vars:
-@@ -43,7 +43,7 @@ postfix:
- Install and enable postfix. Do single backup of main.cf (older backup will be
- rewritten) and configure "relay_host=example.com":
-
--```
-+```yaml
- ---
- - hosts: all
- vars:
-@@ -58,7 +58,7 @@ Install and enable postfix. Do timestamped backup of main.cf and
- configure "relay_host=example.com" (if postfix_backup_multiple is
- set to true postfix_backup is ignored):
-
--```
-+```yaml
- ---
- - hosts: all
- vars:
https://src.fedoraproject.org/rpms/linux-system-roles/c/aea7480a90f840da3...