- moved cyrus.pam to %%doc - now saslauthd uses /etc/pam.d/<service> instead

  of one /etc/pam.d/cyrus file; added note to this file
- simplified _without_mysql bcond (preamble doesn't need to be conditional)
- release 2

Changed files:
    cyrus-sasl.pam -> 1.2
    cyrus-sasl.spec -> 1.84

diff --git a/cyrus-sasl.pam b/cyrus-sasl.pam
index a78465bb71374ead58c7595e780381646d8a4881..537590a430067a58e2c037f8afae7a400cdfb8b7 100644 (file)
--- a/cyrus-sasl.pam
+++ b/cyrus-sasl.pam
@@ -1,4 +1,8 @@
 #%PAM-1.0
+#
+# example PAM file for saslauthd - place it as /etc/pam.d/<service>
+# (e.g. /etc/pam.d/smtp if you want to use saslauthd for SMTP AUTH)
+#
 auth           required        /lib/security/pam_listfile.so item=user sense=deny file=/etc/security/blacklist onerr=succeed
 auth            required        /lib/security/pam_unix.so
 auth           required        /lib/security/pam_tally.so file=/var/log/faillog onerr=succeed no_magic_root

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 372e97c4b75afec448cc1e6874bcdff9a510929a..d9b36e19097a591f9f1ef381be72defe616a0135 100644 (file)
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -11,7 +11,7 @@ Summary(ru):  
 Summary(uk):   â¦Â̦ÏÔÅËÁ Cyrus SASL
 Name:          cyrus-sasl
 Version:       2.1.11
-Release:       1
+Release:       2
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.andrew.cmu.edu/pub/cyrus-mail//%{name}-%{version}.tar.gz
@@ -312,7 +312,6 @@ Cyrus SASL sasldb plugin.
 %description sasldb -l pl
 Wtyczka sasldb do Cyrus SASL.
 
-%if %{!?_without_mysql:1}%{?_without_mysql:0}
 %package mysql
 Summary:       Cyrus SASL mysql plugin
 Summary(pl):   Wtyczka mysql do Cyrus SASL
@@ -324,7 +323,6 @@ Cyrus SASL mysql plugin.
 
 %description mysql -l pl
 Wtyczka mysql do Cyrus SASL.
-%endif
 
 %prep
 %setup  -q
@@ -368,7 +366,7 @@ LDFLAGS="%{rpmldflags} -ldl"; export LDFLAGS
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/lib/sasl2,%{_sysconfdir},/etc/{rc.d/init.d,sysconfig,pam.d}} \
+install -d $RPM_BUILD_ROOT{/var/lib/sasl2,%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
                $RPM_BUILD_ROOT%{_mandir}/man8
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
@@ -383,7 +381,7 @@ touch $RPM_BUILD_ROOT/var/lib/sasl2/sasl.db
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/cyrus
+install %{SOURCE3} ./cyrus.pam
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -488,8 +486,8 @@ fi
 
 %files saslauthd
 %defattr(644,root,root,755)
+%doc cyrus.pam
 %attr(755,root,root) %{_sbindir}/saslauthd
 %attr(754,root,root) /etc/rc.d/init.d/saslauthd
 %config(noreplace) %verify(not mtime md5 size) /etc/sysconfig/saslauthd
-%config(noreplace) %verify(not mtime md5 size) /etc/pam.d/cyrus
 %{_mandir}/man8/saslauthd.*