From 7f45c6569ae41e0a04d89b379a6ec249e1268950 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Apr 10 2020 00:57:08 +0000
Subject: Merge branch 'master' into epel8


---

diff --git a/.gitignore b/.gitignore
index a5c35e5..713f40f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,9 @@
 /netatalk-3.1.7.tar.bz2
 /netatalk-3.1.12.tar.bz2
+/netatalk.pam-system-auth
+/netatalk-3.0.1-basedir.patch
+/netatalk-afpstats-python3-compat.patch
+/netatalk-fix-incorrect-fsf-address.patch
+/netatalk-invalid_dircache_entries.patch
+/netatalk-systemd-execstartpre.patch
+/netatalk.conf
diff --git a/netatalk.pam-system-auth b/netatalk.pam-system-auth
index 2cced33..82868f4 100644
--- a/netatalk.pam-system-auth
+++ b/netatalk.pam-system-auth
@@ -7,7 +7,6 @@ password   include      system-auth
 # pam_selinux.so close should be the first session rule
 session    required     pam_selinux.so close
 session    required     pam_loginuid.so
-session    optional     pam_console.so
 # pam_selinux.so open should only be followed by sessions to be executed in the user context
 session    required     pam_selinux.so open
 session    required     pam_namespace.so
diff --git a/netatalk.spec b/netatalk.spec
index 8fea47e..67b5bc4 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -37,7 +37,7 @@
 Name:              netatalk
 Epoch:             5
 Version:           3.1.12
-Release:           13%{?dist}
+Release:           14%{?dist}
 Summary:           Open Source Apple Filing Protocol(AFP) File Server
 License:           GPL+ and GPLv2 and GPLv2+ and LGPLv2+ and BSD and FSFUL and MIT
 # Project is also mirrored at https://github.com/Netatalk/Netatalk
@@ -46,6 +46,11 @@ Source0:           https://download.sourceforge.net/netatalk/netatalk-%{version}
 Source1:           netatalk.pam-system-auth
 Source2:           netatalk.conf
 
+# https://pagure.io/epel/issue/87
+%if 0%{?rhel} >= 8
+ExcludeArch:       aarch64 s390x
+%endif
+
 # From http://www003.upp.so-net.ne.jp/hat/files/netatalk-3.1.7-0.1.fc22.src.rpm
 Patch0:            netatalk-3.0.1-basedir.patch
 Patch1:            netatalk-systemd-execstartpre.patch
@@ -221,6 +226,10 @@ sh test/afpd/test.sh
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5:3.1.12-14
+- remove pam_console dependency RHBZ 1822216
+- Exclude aarch64 and s390x on el8 https://pagure.io/epel/issue/87
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5:3.1.12-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index f9760a9..d3c4aca 100644
--- a/sources
+++ b/sources
@@ -1 +1,8 @@
 SHA512 (netatalk-3.1.12.tar.bz2) = 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
+SHA512 (netatalk-3.0.1-basedir.patch) = e39c0aa104e7a2ee08ff4bc20f325ba2d74f1aa0b0a3b0735a9aadb32e44f49c8dbf961a4c684662f4af83fca06a382f890f885327b7e10607dd9e5e62ed5e82
+SHA512 (netatalk-afpstats-python3-compat.patch) = 0af0a288579056ad7f810938746ce7a0b9b8ee97ca5980bf3432b444a57f5b6ca473387aa956a81c95671deb505d8094724b91576c8910f5616082bcc32a2c75
+SHA512 (netatalk-fix-incorrect-fsf-address.patch) = 36aa9a67fe23f36acce0bfddcb70e93c7557a342de0243607d2a492534362ce0043dae9eebbe626b59f58968fbca9e4177cdac84628c9da6f9f1d766a6a2fd95
+SHA512 (netatalk-invalid_dircache_entries.patch) = 46709ba02fdd7723062838d8d15b339eed12042efe6bb2249560b0b0f80275b586736a2e87c15b001a966dfd7aaf4e4c3ef0dc29162289b3c848c7b23b610db5
+SHA512 (netatalk-systemd-execstartpre.patch) = 2dc9d5cdbb8ec1b16317bc8187e1f1d8ba717360756ac38e7026a28b012176f3d47f551ee291c3e5faeebb9f1bdb3921f1cb3b3328c803856ce4205d2241b401
+SHA512 (netatalk.conf) = ec0264aeb39619c8860f45ebb348cc6509855e69370c3f2992ae89c89e55d9eee1087e1203eceee5a2309cf5bf61df9688cd725e6696137c40990eeba95988a4
+SHA512 (netatalk.pam-system-auth) = 40d1635ace1b663edadef435a05bc9b89c54556aa7ac08834ae6861c6324a6343f0d4f0926764aee1789fc6ae04c6a380fba6e5f4588717440f1340799a27477