From f0bccff0ddc89cbeeae53906a5e68ee302047445 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Apr 10 2020 00:35:54 +0000 Subject: remove pam_console dependency RHBZ 1822216 Exclude aarch64 and s390x on el8 https://pagure.io/epel/issue/87 --- diff --git a/.gitignore b/.gitignore index a5c35e5..417c797 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /netatalk-3.1.7.tar.bz2 /netatalk-3.1.12.tar.bz2 +/netatalk.pam-system-auth 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 - 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 - 5:3.1.12-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index f9760a9..6bdb215 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (netatalk-3.1.12.tar.bz2) = 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759 +SHA512 (netatalk.pam-system-auth) = 40d1635ace1b663edadef435a05bc9b89c54556aa7ac08834ae6861c6324a6343f0d4f0926764aee1789fc6ae04c6a380fba6e5f4588717440f1340799a27477