- merged from DEVEL

- updated TODO

Changed files:
    courier-imap.spec -> 1.143

diff --git a/courier-imap.spec b/courier-imap.spec
index a9abc78d4e71d8c3ae0a0eb8677672ad5bcd229b..0d8b2aeace42082e3789c2ea12116a36c8fc653c 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -1,18 +1,18 @@
 #
-# Conditional build:
-%bcond_without ldap    # without LDAP support
-%bcond_without mysql   # without MySQL support
-%bcond_without pgsql   # without PostgreSQL support
+# TODO:
+#      - waiting for all updates from courier-mta.org, and all triggers !
+#      - force update of userdb ? or trigger with info to do it manualy
+#      - tests
 #
 Summary:       Courier-IMAP server
 Summary(pl):   Serwer Courier-IMAP
 Name:          courier-imap
-Version:       3.0.8
-Release:       4
+Version:       4.0.2
+Release:       0.5
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: 1b431e6dac39ed728d839ceb35474040
+# Source0-md5: 9061583ef8e7b3fd69ef77dbfc0656eb
 Source1:       %{name}.init
 Source2:       %{name}-pop3.init
 Source3:       %{name}.pamd
@@ -20,20 +20,17 @@ Source4:    %{name}-pop3.pamd
 Patch0:                %{name}-dirs.patch
 Patch1:                %{name}-certsdir.patch
 Patch2:                %{name}-maildir.patch
-URL:           http://www.inter7.com/courierimap/
+URL:           http://www.courier-mta.org/imap/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
+BuildRequires: courier-authlib-devel
+BuildRequires: db-devel
 BuildRequires: fam-devel
-BuildRequires: gdbm-devel
 BuildRequires: libstdc++-devel
-%{?with_mysql:BuildRequires:   mysql-devel}
-%{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: openssl-devel >= 0.9.7d
-%{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: procps
 BuildRequires: sed >= 4.0
 BuildRequires: sysconftool
-%{?with_mysql:BuildRequires:   zlib-devel}
 PreReq:                %{name}-common = %{version}-%{release}
 PreReq:                rc-scripts
 Requires(post,preun):  /sbin/chkconfig
@@ -69,17 +66,6 @@ Common files for imap and pop3 daemons.
 %description common -l pl
 Pliki wspólne dla serwerów imap i pop3.
 
-%package userdb
-Summary:       Commands used to create the /etc/userdb.dat
-Summary(pl):   Polecenia do tworzenia /etc/userdb.dat
-Group:         Networking/Daemons
-
-%description userdb
-Commands used to create the /etc/userdb.dat.
-
-%description userdb -l pl
-Polecenia u¿ywane do stworzenia /etc/userdb.dat.
-
 %package deliverquota
 Summary:       Deliver to a Maildir with a quota
 Summary(pl):   Obs³uga quoty przy dostarczaniu poczty do skrzynek Maildir
@@ -125,44 +111,6 @@ Courier-IMAP POP3 is an POP3 server for Maildir mailboxes.
 %description pop3 -l pl
 Courier-IMAP POP3 jest serwerem POP3 dla skrzynek pocztowych Maildir.
 
-%package authldap
-Summary:       LDAP authentication daemon for Courier IMAP
-Summary(pl):   Demon autentykacji LDAP do Courier IMAP
-Group:         Networking/Daemons
-PreReq:                %{name}-common = %{version}-%{release}
-
-%description authldap
-This package provides LDAP authentication for Courier IMAP.
-
-%description authldap -l pl
-Ten pakiet pozwala na korzystanie z autentykacji LDAP w Courier IMAP.
-
-%package authmysql
-Summary:       MySQL authentication daemon for Courier IMAP
-Summary(pl):   Demon autentykacji MySQL do Courier IMAP
-Group:         Networking/Daemons
-PreReq:                %{name}-common = %{version}-%{release}
-Requires:      zlib
-
-%description authmysql
-This package provides MySQL authentication for Courier IMAP.
-
-%description authmysql -l pl
-Ten pakiet pozwala na korzystanie z autentykacji MySQL w Courier IMAP.
-
-%package authpgsql
-Summary:       PostgreSQL authentication daemon for Courier IMAP
-Summary(pl):   Demon autentykacji PostgreSQL do Courier IMAP
-Group:         Networking/Daemons
-PreReq:                %{name}-common = %{version}-%{release}
-
-%description authpgsql
-This package provides PostgreSQL authentication for Courier IMAP.
-
-%description authpgsql -l pl
-Ten pakiet pozwala na korzystanie z autentykacji PostgreSQL w Courier
-IMAP.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -176,30 +124,23 @@ install %{SOURCE2} courier-pop3.in
 cp -f /usr/share/automake/config.sub .
 cp -f /usr/share/automake/config.sub maildir
 
+%{__libtoolize}
 %{__aclocal}
-%{__automake}
 %{__autoconf}
+%{__automake}
 
-cd authlib
+cd imap
 %{__aclocal}
-%{__automake}
 %{__autoconf}
-cd ../imap
-%{__aclocal}
+ln -s ../ltmain.sh .
 %{__automake}
-%{__autoconf}
 cd ..
 
 %configure \
+       --with-db=db \
        --enable-unicode \
        --with-authchangepwdir=/var/tmp \
-       --with-authdaemonvar=/var/lib/authdaemon \
-       --with-certsdir=%{_certsdir} \
-       %{?with_mysql:--with-mysql-libs=%{_libdir} --with-mysql-includes=%{_includedir}/mysql} \
-       %{!?with_mysql:--without-authmysql} \
-       %{?with_pgsql:--with-pgsql-libs=%{_libdir} --with-pgsql-includes=%{_includedir}/postgresql} \
-       %{!?with_pgsql:--without-authpgsql} \
-       %{!?with_ldap:--without-authldap}
+       --with-certsdir=%{_certsdir}
 
 %{__make}
 
@@ -215,45 +156,18 @@ install courier-pop3 $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-pop3
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/imap
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/pop3
 
-rm -rf 
-$RPM_BUILD_ROOT%{_mandir}/man8/{authcram,authpam,authpwd,authshadow,authuserdb,authvchkpw,pw2userdb,vchkpw2userdb,authdaemon,authdaemond,authldap,authmysql}.8 
-\
-       $RPM_BUILD_ROOT%{_sbindir}/{*db,mk*cert}
+rm -rf $RPM_BUILD_ROOT%{_sbindir}/mk*cert
 
-mv -f authlib/README.authmysql.html README.authmysql.html
-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}
-install authlib/authldaprc             $RPM_BUILD_ROOT%{_sysconfdir}
-install authlib/authmysqlrc            $RPM_BUILD_ROOT%{_sysconfdir}
-install authlib/authpgsqlrc            $RPM_BUILD_ROOT%{_sysconfdir}
-
-mv -f $RPM_BUILD_ROOT%{_datadir}/*db \
-       $RPM_BUILD_ROOT%{_sbindir}
 mv -f $RPM_BUILD_ROOT%{_datadir}/mk*cert \
        $RPM_BUILD_ROOT%{_sbindir}
 
 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 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
-%{?with_pgsql:echo ".so man7/authlib.7"        >$RPM_BUILD_ROOT%{_mandir}/man8/authpgsql.8}
-%{?with_mysql:echo ".so man7/authlib.7"        >$RPM_BUILD_ROOT%{_mandir}/man8/authmysql.8}
-%{?with_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
-
 touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
 
 # make config files
@@ -295,8 +209,7 @@ if [ -f /var/lib/openssl/certs/imapd.pem ]; then
 fi
 if [ -f /etc/sysconfig/courier-imap ]; then
        . /etc/sysconfig/courier-imap
-       for opt in `grep ^[^#] /etc/sysconfig/courier-imap |grep -v TLS_CERTFILE |grep -v MAILDIR |grep -v COURIERTLS 
-|cut -d= -f1`;
+       for opt in `grep ^[^#] /etc/sysconfig/courier-imap |grep -v TLS_CERTFILE |grep -v MAILDIR |grep -v COURIERTLS |cut -d= -f1`;
        do
                eval opt2=\$$opt
                sed -i s/^$opt=.*/"$opt=\"$opt2\""/ %{_sysconfdir}/imapd
@@ -366,8 +279,7 @@ if [ -f /var/lib/openssl/certs/pop3d.pem ]; then
 fi
 if [ -f /etc/sysconfig/courier-pop3 ]; then
        . /etc/sysconfig/courier-pop3
-       for opt in `grep ^[^#] /etc/sysconfig/courier-pop3 |grep -v TLS_CERTFILE |grep -v MAILDIR |grep -v COURIERTLS 
-|cut -d= -f1`;
+       for opt in `grep ^[^#] /etc/sysconfig/courier-pop3 |grep -v TLS_CERTFILE |grep -v MAILDIR |grep -v COURIERTLS |cut -d= -f1`;
        do
                eval opt2=\$$opt
                sed -i s/^$opt=.*/"$opt=\"$opt2\""/ %{_sysconfdir}/pop3d
@@ -390,48 +302,6 @@ if [ $TLS_CACHEFILE = "/var/couriersslcache" ]; then
        sed -i s/^TLS_CACHEFILE=.*/"TLS_CACHEFILE=\/var\/spool\/courier-imap\/couriersslcache"/ %{_sysconfdir}/pop3d-ssl
 fi
 
-%post authldap
-if ps -A |grep -q authdaemond.lda; then
-       %{_libexecdir}/authlib/authdaemond stop
-       %{_libexecdir}/authlib/authdaemond start
-fi
-
-%postun authldap
-if [ -x %{_libexecdir}/authlib/authdaemond ]; then
-       if ps -A |grep -q authdaemond.lda; then
-               %{_libexecdir}/authlib/authdaemond stop;
-               %{_libexecdir}/authlib/authdaemond start;
-       fi
-fi
-
-%post authmysql
-if ps -A |grep -q authdaemond.mys; then
-       %{_libexecdir}/authlib/authdaemond stop
-       %{_libexecdir}/authlib/authdaemond start
-fi
-
-%postun authmysql
-if [ -x %{_libexecdir}/authlib/authdaemond ]; then
-       if ps -A |grep -q authdaemond.mys; then
-               %{_libexecdir}/authlib/authdaemond stop;
-               %{_libexecdir}/authlib/authdaemond start;
-       fi
-fi
-
-%post authpgsql
-if ps -A |grep -q authdaemond.pgs; then
-       %{_libexecdir}/authlib/authdaemond stop
-       %{_libexecdir}/authlib/authdaemond start
-fi
-
-%postun authpgsql
-if [ -x %{_libexecdir}/authlib/authdaemond ]; then
-       if ps -A |grep -q authdaemond.pgs; then
-               %{_libexecdir}/authlib/authdaemond stop;
-               %{_libexecdir}/authlib/authdaemond start;
-       fi
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc maildir/README.sharedfolders.html
@@ -446,7 +316,6 @@ fi
 %attr(755,root,root) %{_bindir}/imapd
 %attr(755,root,root) %{_bindir}/maildiracl
 %attr(755,root,root) %{_bindir}/maildirkw
-%attr(755,root,root) %{_sbindir}/authenumerate
 %attr(755,root,root) %{_sbindir}/imaplogin
 %attr(755,root,root) %{_sbindir}/mkimapdcert
 %attr(755,root,root) %{_sbindir}/sharedindexinstall
@@ -460,40 +329,18 @@ fi
 %files common
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog imap/BUGS INSTALL README*
-%attr(770,daemon,daemon) /var/lib/authdaemon
 %attr(750,root,root) %dir %{_sysconfdir}
 %attr(750,root,root) %dir %{_certsdir}
 %attr(770,daemon,daemon) %dir %{_localstatedir}
 %dir %{_libexecdir}
-%dir %{_libexecdir}/authlib
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/authdaemonrc
 %{_sysconfdir}/quotawarnmsg.example
 %attr(755,root,root) %{_bindir}/couriertls
-%attr(755,root,root) %{_libexecdir}/authlib/authdaemon
-%attr(755,root,root) %{_libexecdir}/authlib/authdaemond
-%attr(755,root,root) %{_libexecdir}/authlib/authdaemond.plain
 %attr(755,root,root) %{_libexecdir}/couriertcpd
 %attr(755,root,root) %{_libexecdir}/makedatprog
-%attr(755,root,root) %{_sbindir}/courierlogger
-%{_mandir}/man8/auth[cdsuv]*
-%{_mandir}/man8/authp[aw]*
-%{_mandir}/man7/authlib*
-%{_mandir}/man1/courierlogger*
 %{_mandir}/man1/couriert*
 %{_mandir}/man8/couriert*
 %{_mandir}/man8/mk*
 
-%files userdb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/makeuserdb
-%attr(755,root,root) %{_sbindir}/pw2userdb
-%attr(755,root,root) %{_sbindir}/userdb
-%attr(755,root,root) %{_sbindir}/userdbpw
-%attr(755,root,root) %{_sbindir}/vchkpw2userdb
-%{_mandir}/man8/makeuserdb*
-%{_mandir}/man8/userdb*
-%{_mandir}/man8/*pw2userdb*
-
 %files deliverquota
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/deliverquota
@@ -518,27 +365,3 @@ fi
 %attr(755,root,root) %{_libexecdir}/pop3d.rc
 %attr(755,root,root) %{_libexecdir}/pop3d-ssl.rc
 %{_mandir}/man8/courierpop*
-
-%if %{with ldap}
-%files authldap
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/authldaprc
-%attr(755,root,root) %{_libexecdir}/authlib/authdaemond.ldap
-%{_mandir}/man8/authldap*
-%endif
-
-%if %{with mysql}
-%files authmysql
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/authmysqlrc
-%attr(755,root,root) %{_libexecdir}/authlib/authdaemond.mysql
-%{_mandir}/man8/authmysql*
-%endif
-
-%if %{with pgsql}
-%files authpgsql
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/authpgsqlrc
-%attr(755,root,root) %{_libexecdir}/authlib/authdaemond.pgsql
-%{_mandir}/man8/authpgsql*
-%endif