diff --git a/proftpd.pam b/proftpd.pam index ab3b20d..c0c05db 100644 --- a/proftpd.pam +++ b/proftpd.pam @@ -1,7 +1,7 @@ #%PAM-1.0 -session optional pam_keyinit.so force revoke -auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed -auth required pam_shells.so +session optional pam_keyinit.so force revoke +auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed +auth required pam_shells.so auth include password-auth account include password-auth session required pam_loginuid.so diff --git a/proftpd.spec b/proftpd.spec index 6303683..972f544 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -7,7 +7,7 @@ %endif #global prever rc3 -%global rpmrel 6 +%global rpmrel 7 Summary: Flexible, stable and highly-configurable FTP server Name: proftpd @@ -118,15 +118,20 @@ Module to add PostgreSQL support to the ProFTPD FTP server. %{__cp} -p %{SOURCE8} proftpd-quota.schema # PAM Configuration: +# Default PAM configuration file uses password-auth common config; +# revert to system-auth if password-auth is not available +%{__cp} -p %{SOURCE6} . +if [ ! -f /etc/pam.d/password-auth ]; then + %{__sed} -i -e s/password-auth/system-auth/ proftpd.pam +fi # The "include" syntax used in our PAM configuration file was introduced in # PAM 0.78 and is therefore supported in FC-5 and EL-5 onwards; older # distributions such as EL-4 (PAM 0.77) need to fall back to using the # now-deprecated pam_stack module. Since the pam-devel package doesn't -# include a pkgconfig file from whice we could check the version number, we +# include a pkgconfig file from which we could check the version number, we # instead check for the absence of the file /etc/pam.d/config-util, which is # present in all PAM packages from 0.80 onwards and acts as a useful # indicator of the need to fall back to pam_stack. -%{__cp} -p %{SOURCE6} . [ ! -f /etc/pam.d/config-util ] && %{__sed} -i -e \ 's/include[[:space:]]*system-auth/required'\ \ \ \ \ 'pam_stack.so service=system-auth/' \ proftpd.pam @@ -290,7 +295,10 @@ fi %changelog -* Wed Sep 16 2009 Tomas Mraz - 1.3.2a-6 +* Thu Sep 17 2009 Paul Howarth 1.3.2a-7 +- Restore backward SRPM compatibility broken by previous change + +* Wed Sep 16 2009 Tomas Mraz 1.3.2a-6 - Use password-auth common PAM configuration instead of system-auth * Mon Sep 7 2009 Paul Howarth 1.3.2a-5 @@ -299,7 +307,7 @@ fi * Wed Sep 2 2009 Paul Howarth 1.3.2a-4 - New DSO module: mod_exec (#520214) -* Fri Aug 21 2009 Tomas Mraz - 1.3.2a-3.1 +* Fri Aug 21 2009 Tomas Mraz 1.3.2a-3.1 - Rebuilt with new openssl * Wed Aug 19 2009 Paul Howarth 1.3.2a-3 @@ -354,7 +362,7 @@ fi bundled one, and eliminate log messages like: kernel: warning: `proftpd' uses 32-bit capabilities (legacy support in use) -* Sun Jul 26 2009 Fedora Release Engineering - 1.3.2-3.1 +* Sun Jul 26 2009 Fedora Release Engineering 1.3.2-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Thu Apr 9 2009 Matthias Saou 1.3.2-2.1