From 26fefd31489cf20d4a6d9eef218461f67b1036e3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 19 Mar 2008 19:13:26 +0000 Subject: [PATCH] - cyrus-imapd conflicts with uw-imap (#222506) --- cyrus-imapd.pam-config | 2 ++ cyrus-imapd.spec | 35 +++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/cyrus-imapd.pam-config b/cyrus-imapd.pam-config index 29b1f15..ccb9105 100644 --- a/cyrus-imapd.pam-config +++ b/cyrus-imapd.pam-config @@ -1,3 +1,5 @@ #%PAM-1.0 +auth required pam_nologin.so auth include system-auth account include system-auth +session include system-auth diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index db463d3..00d1e5e 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -1,7 +1,7 @@ %define upstream_ver 2.3.9 Name: cyrus-imapd Version: 2.3.9 -Release: 11%{?dist} +Release: 12%{?dist} # ********************** BUILD TIME OPTIONS START ********************** @@ -442,19 +442,23 @@ done find %{buildroot}%{_libdir}/perl5/ -type f -name "*.so" -exec %{__chmod} 755 {} \; # Install config files -%{__install} -m 644 %{_cyrusconf} %{buildroot}%{_sysconfdir}/cyrus.conf -%{__install} -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/imapd.conf -%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/pop -%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/imap -%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/sieve -%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/mupdate -%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/lmtp -%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/nntp -%{__install} -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/csync -%{__install} -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/%{name} -%{__install} -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -%{__install} -m 755 %{SOURCE25} %{buildroot}%{_sysconfdir}/cron.daily/%{name} -%{__install} -m 755 %{SOURCE11} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name} +%{__install} -p -m 644 %{_cyrusconf} %{buildroot}%{_sysconfdir}/cyrus.conf +%{__install} -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/imapd.conf +%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/pop +%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/imap +%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/sieve +%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/mupdate +%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/lmtp +%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/nntp +%{__install} -p -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/pam.d/csync +%{__install} -p -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/sysconfig/%{name} +%{__install} -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +%{__install} -p -m 755 %{SOURCE25} %{buildroot}%{_sysconfdir}/cron.daily/%{name} +%{__install} -p -m 755 %{SOURCE11} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name} + +# fix conflicts with uw-imap +mv %{buildroot}%{_mandir}/man8/imapd.8 %{buildroot}%{_mandir}/man8/imapd.8cyrus +mv %{buildroot}%{_mandir}/man8/pop3d.8 %{buildroot}%{_mandir}/man8/pop3d.8cyrus # Install templates %{__install} -m 755 -d doc/conf @@ -804,6 +808,9 @@ fi %{_mandir}/man1/* %changelog +* Wed Mar 19 2008 Rex Dieter - 2.3.9-12 +- cyrus-imapd conflicts with uw-imap (#222506) + * Tue Mar 18 2008 Tom "spot" Callaway - 2.3.9-11 - add Requires for versioned perl (libperl.so)