# _without_ldap - without LDAP support
# _without_mysql - without MySQL support
# _without_postgresql - without PostgreSQL support
+#
Summary: Courier-IMAP server
Summary(pl): Serwer Courier-IMAP
Name: courier-imap
-Version: 1.4.2
-Release: 3
+Version: 1.7.0
+Release: 1
License: GPL
Group: Networking/Daemons
-Source0: http://download.sourceforge.net/courier/%{name}-%{version}.tar.gz
+Source0: http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
Source1: %{name}.init
Source2: %{name}-pop3.init
Source3: %{name}-authdaemon.init
Source6: %{name}.sysconfig
Source7: %{name}-pop3.sysconfig
Source8: %{name}-authdaemon.sysconfig
-Patch0: ftp://ftp.pld.org.pl/people/siefca/patches/courier/%{name}-myownquery-fix.patch
+# Patch0: ftp://ftp.pld.org.pl/people/siefca/patches/courier/%{name}-myownquery.patch
URL: http://www.inter7.com/courierimap/
%{!?_without_postgresql:BuildRequires: postgresql-devel}
%{!?_without_mysql:BuildRequires: mysql-devel}
%{!?_without_ldap:BuildRequires: openldap-devel}
BuildRequires: gdbm-devel
BuildRequires: libstdc++-devel
-BuildRequires: openssl-devel
-BuildRequires: kernel-headers
-Provides: imapdaemon
+BuildRequires: openssl-devel >= 0.9.7
PreReq: %{name}-common = %{version}
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+PreReq: rc-scripts
+Requires(post,preun): /sbin/chkconfig
+Provides: imapdaemon
Obsoletes: imapdaemon
+Conflicts: cyrus-imapd
+Conflicts: imap
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _libexecdir /usr/lib/courier-imap
%define _sysconfdir /etc/courier-imap
Summary(pl): Pliki wspólne dla serwerów imap i pop
Group: Networking/Daemons
PreReq: rc-scripts
-PreReq: /sbin/chkconfig
+Requires(post,preun): /sbin/chkconfig
Requires: %{name}-maildirmake
Requires: %{name}-deliverquota
Requires: %{name}-userdb
%package userdb
Summary: Commands used to create the /etc/userdb.dat
+Summary(pl): Polecenia do tworzenia /etc/userdb.dat
Group: Networking/Daemons
%description userdb
Polecenia u¿ywane do stworzenia /etc/userdb.dat.
%package deliverquota
-Summary: Deliver to a maildir with a quota
+Summary: Deliver to a Maildir with a quota
+Summary(pl): Obs³uga quoty przy dostarczaniu poczty do skrzynek Maildir
Group: Networking/Daemons
%description deliverquota
deliverquota is a temporary hack to implement E-mail delivery to a
-maildir with a software-imposed quota.
+Maildir with a software-imposed quota.
%description deliverquota -l pl
deliverquota jest tymczasowym rozwi±zaniem implementuj±cym
-dostarczanie e-maili do maildir z programowo narzucon± quot±.
+dostarczanie e-maili do skrzynek Maildir z programowo narzucon± quot±.
%package maildirmake
-Summary: Tool for making mail folders in Maildir format.
+Summary: Tool for making mail folders in Maildir format
+Summary(pl): Narzêdzie do tworzenia folderów w formacie Maildir
Group: Networking/Daemons
Conflicts: qmail-maildirmake
PreReq: %{name}-common = %{version}
Provides: pop3daemon
Obsoletes: pop3daemon
+Conflicts: cyrus-imapd
+Conflicts: imap-pop3
+Conflicts: tpop3d
+Conflicts: solid-pop3d
%description pop3
Courier-IMAP POP3 is an POP3 server for Maildir mailboxes.
%prep
%setup -q
-%patch0 -p1
+#%patch0 -p1
%build
%configure2_13 \
%{__make} install DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap-pop3
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-pop3
install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/authdaemon
install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/imap
install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/pop3
install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/courier-imap
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/courier-imap-pop3
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/courier-pop3
install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/authdaemon
rm -rf $RPM_BUILD_ROOT%{_mandir}/man8/{authcram,authpam,authpwd,authshadow,authuserdb,authvchkpw,pw2userdb,vchkpw2userdb,authdaemon,authdaemond,authldap,authmysql}.8 \
mv -f authlib/README.ldap README.ldap
mv -f authlib/README.authmysql.myownquery README.authmysql.myownquery
mv -f imap/README README.imap
+mv -f imap/ChangeLog ChangeLog
mv -f maildir/README.maildirquota.txt README.maildirquota
install authlib/authdaemonrc $RPM_BUILD_ROOT%{_sysconfdir}
mv -f $RPM_BUILD_ROOT%{_datadir}/mk*cert \
$RPM_BUILD_ROOT%{_sbindir}
-mv -f tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.1
+mv -f tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.8
mv -f imap/courierpop3d.8 $RPM_BUILD_ROOT%{_mandir}/man8/courierpop3d.8
-echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authcram.8
-echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authpam.8
-echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authpwd.8
-echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authshadow.8
-echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authuserdb.8
-echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authvchkpw.8
-echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authdaemon.8
-echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authdaemond.8
-%{!?_without_pgsql:echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authpgsql.8}
-%{!?_without_mysql:echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authmysql.8}
-%{!?_without_ldap:echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authldap.8}
+echo ".so man7/authlib.7" >$RPM_BUILD_ROOT%{_mandir}/man8/authcram.8
+echo ".so man7/authlib.7" >$RPM_BUILD_ROOT%{_mandir}/man8/authpam.8
+echo ".so man7/authlib.7" >$RPM_BUILD_ROOT%{_mandir}/man8/authpwd.8
+echo ".so man7/authlib.7" >$RPM_BUILD_ROOT%{_mandir}/man8/authshadow.8
+echo ".so man7/authlib.7" >$RPM_BUILD_ROOT%{_mandir}/man8/authuserdb.8
+echo ".so man7/authlib.7" >$RPM_BUILD_ROOT%{_mandir}/man8/authvchkpw.8
+echo ".so man7/authlib.7" >$RPM_BUILD_ROOT%{_mandir}/man8/authdaemon.8
+echo ".so man7/authlib.7" >$RPM_BUILD_ROOT%{_mandir}/man8/authdaemond.8
+%{!?_without_pgsql:echo ".so man7/authlib.7" >$RPM_BUILD_ROOT%{_mandir}/man8/authpgsql.8}
+%{!?_without_mysql:echo ".so man7/authlib.7" >$RPM_BUILD_ROOT%{_mandir}/man8/authmysql.8}
+%{!?_without_ldap:echo ".so man7/authlib.7" >$RPM_BUILD_ROOT%{_mandir}/man8/authldap.8}
echo ".so makeuserdb.8" >$RPM_BUILD_ROOT%{_mandir}/man8/pw2userdb.8
echo ".so makeuserdb.8" >$RPM_BUILD_ROOT%{_mandir}/man8/vchkpw2userdb.8
-gzip -9nf README* imap/BUGS AUTHORS COPYING
-
touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
%clean
fi
%post pop3
-/sbin/chkconfig --add courier-imap-pop3
-
+/sbin/chkconfig --add courier-pop3
+/sbin/chkconfig --del courier-imap-pop3 2>&1 >/dev/null
if [ -f /var/lock/subsys/courier-imap-pop3 ]; then
- /etc/rc.d/init.d/courier-imap-pop3 restart >&2
+ /etc/rc.d/init.d/courier-imap-pop3 stop >&2
+ /etc/rc.d/init.d/courier-pop3 start >&2
+elif [ -f /var/lock/subsys/courier-pop3 ]; then
+ /etc/rc.d/init.d/courier-pop3 restart >&2
else
- echo "Run \"/etc/rc.d/init.d/courier-imap-pop3 start\" to start courier-imap pop3 daemon."
+ echo "Run \"/etc/rc.d/init.d/courier-pop3 start\" to start courier-pop3 daemon."
fi
+rm -f /etc/rc.d/init.d/courier-imap-pop3
%preun pop3
if [ "$1" = "0" ]; then
+ if [ -f /var/lock/subsys/courier-pop3 ]; then
+ /etc/rc.d/init.d/courier-pop3 stop >&2
+ fi
+ /sbin/chkconfig --del courier-pop3
if [ -f /var/lock/subsys/courier-imap-pop3 ]; then
/etc/rc.d/init.d/courier-imap-pop3 stop >&2
fi
- /sbin/chkconfig --del courier-imap-pop3
+ /sbin/chkconfig --del courier-imap-pop3 2>&1 >/dev/null
+ rm -f /etc/rc.d/init.d/courier-imap-pop3
fi
%post authldap
%files common
%defattr(644,root,root,755)
-%doc *.gz imap/*.gz
+%doc README* imap/BUGS ChangeLog AUTHORS
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/authdaemon
%attr(754,root,root) /etc/rc.d/init.d/authdaemon
%attr(700,root,root) /var/lib/authdaemon
%attr(755,root,root) %{_libexecdir}/authlib/authdaemon
%attr(755,root,root) %{_libexecdir}/authlib/authdaemond.plain
%attr(755,root,root) %{_libexecdir}/couriertcpd
-%attr(755,root,root) %{_libexecdir}/logger
+%attr(755,root,root) %{_libexecdir}/courierlogger
%attr(755,root,root) %{_libexecdir}/makedatprog
%{_mandir}/man8/auth[cdsuv]*
%{_mandir}/man8/authp[aw]*
%files deliverquota
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/deliverquota
+%attr(755,root,root) %{_bindir}/deliverquota
%{_mandir}/man8/deliverquota*
%files maildirmake
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/pop3
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.pop3
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/courier-imap-pop3
-%attr(754,root,root) /etc/rc.d/init.d/courier-imap-pop3
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/courier-pop3
+%attr(754,root,root) /etc/rc.d/init.d/courier-pop3
%attr(755,root,root) %{_bindir}/pop3d
%attr(755,root,root) %{_sbindir}/mkpop3dcert
%attr(755,root,root) %{_sbindir}/pop3login