- esmtpacceptmailfor change to default

[packages/courier.git] / courier.spec

diff --git a/courier.spec b/courier.spec
index c9dfdc841bcdf1fe78cef5ff2fb84a03e9c0cb82..dfa1ec01727de5cd6be40803b069281ace2869b4 100644 (file)
--- a/courier.spec
+++ b/courier.spec
@@ -5,18 +5,17 @@
 Summary:       Courier mail server
 Summary(pl):   Serwer poczty Courier
 Name:          courier
-Version:       0.44.2
-Release:       7
+Version:       0.45.2
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: 8c607c70a692d8f8ccb769a3f96d2f28
+# Source0-md5: 6242d984744e1969db970ea798ecd564
 Patch0:        %{name}-openssl-path.patch
 Patch1:                %{name}-withoutfam.patch
 Patch2:                %{name}-maildir.patch
-Patch3:                %{name}-no_res_query.patch
-Patch4:                %{name}-sendmail_dir.patch
-Patch5:                %{name}-start_scripts.patch
+Patch3:                %{name}-sendmail_dir.patch
+Patch4:                %{name}-start_scripts.patch
 URL:           http://www.courier-mta.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -27,9 +26,9 @@ BuildRequires:        libtool
 BuildRequires: mailcap
 BuildRequires: mysql-devel
 BuildRequires: openldap-devel
-BuildRequires: openssl-devel >= 0.9.7c
-BuildRequires: openssl-tools >= 0.9.7c
-BuildRequires: openssl-tools-perl >= 0.9.7c
+BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: openssl-tools >= 0.9.7d
+BuildRequires: openssl-tools-perl >= 0.9.7d
 BuildRequires: pam-devel
 BuildRequires: perl-devel
 BuildRequires: postgresql-devel
@@ -37,7 +36,7 @@ BuildRequires:        sysconftool
 BuildRequires: zlib-devel
 %{?with_fam:BuildRequires:     fam-devel}
 Requires(post,preun):  /sbin/chkconfig
-Requires(post):        openssl-tools >= 0.9.7c
+Requires(post):        openssl-tools >= 0.9.7d
 %{?with_fam:Requires:  fam}
 Provides:      smtpdaemon
 Obsoletes:     exim
@@ -98,7 +97,7 @@ Summary:      Courier Integrated POP3 server
 Summary(pl):   Zintegrowany serwer POP3 do Couriera
 Group:         Networking/Daemons
 Requires:      %{name} = %{version}-%{release}
-Requires(post):        openssl-tools >= 0.9.7c
+Requires(post):        openssl-tools >= 0.9.7d
 
 %description pop3d
 This package installs Courier mail server's integrated POP3 server,
@@ -119,7 +118,7 @@ Summary:    Courier Integrated IMAP server
 Summary(pl):   Zintegrowany serwer IMAP do Couriera
 Group:         Networking/Daemons
 Requires:      %{name} = %{version}-%{release}
-Requires(post):        openssl-tools >= 0.9.7c
+Requires(post):        openssl-tools >= 0.9.7d
 Obsoletes:     courier-imap
 Obsoletes:     courier-imap-common
 
@@ -276,7 +275,6 @@ Ten pakiet pozwala na korzystanie z autentykacji PostgreSQL w Courierze.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 # we don't want fax module
@@ -406,7 +404,7 @@ install webmail/cron.cmd $RPM_BUILD_ROOT/etc/cron.hourly/courier-webmail-cleanca
 
 rm -rf htmldoc
 mkdir htmldoc
-cp -f $RPM_BUILD_ROOT%{_datadir}/htmldoc/* htmldoc
+mv -f $RPM_BUILD_ROOT%{_datadir}/htmldoc/* htmldoc
 chmod a-w htmldoc/*
 
 # Manually set POP3DSTART and IMAPDSTART to yes, they'll go into a separate
@@ -433,8 +431,8 @@ for confdist in `awk ' $5 == "config" && $1 ~ /\.dist$/ { print $1 }' <permissio
 do /usr/bin/perl ././sysconftool $RPM_BUILD_ROOT$confdist
 done
 
-# make locals, esmtpacceptmailfor.dir/esmtpacceptmailfor
-for X in locals esmtpacceptmailfor.dir/esmtpacceptmailfor
+# make locals, esmtpacceptmailfor.dir/default
+for X in locals esmtpacceptmailfor.dir/default
 do
 echo localhost >$RPM_BUILD_ROOT%{_sysconfdir}/$X
 done
@@ -479,15 +477,17 @@ EOF
 # sendmail soft links
 ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT/usr/lib/sendmail
 
+# fix rmail link
+rm -f $RPM_BUILD_ROOT%{_bindir}/rmail
+ln -sf %{_sbindir}/sendmail $RPM_BUILD_ROOT%{_bindir}/rmail
+
 # This link by default is missing
 ln -sf %{_datadir}/esmtpd-ssl $RPM_BUILD_ROOT%{_sbindir}/esmtpd-ssl
 
 # remove unpackaged files
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.dist
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rfcerr*.txt
-rm -rf $RPM_BUILD_ROOT%{_datadir}/htmldoc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/faxmail
-rm -f $RPM_BUILD_ROOT%{_mandir}/man5/maildir.5*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -499,7 +499,7 @@ if [ "$1" = "1" ]; then
 cat <<EOF
 
 Now courier will refuse to accept SMTP messages except to localhost
-add hosts to /etc/courier/esmtpacceptmailfor.dir/esmtpacceptmailfor
+add hosts to /etc/courier/esmtpacceptmailfor.dir/default
 run makeacceptmailfor
 
 Add hosts to /etc/courier/locals you want to accept mail for
@@ -513,6 +513,10 @@ fi
 
 if [ -e /var/lock/subsys/courier ]; then
     %{initdir}/courier restart
+else
+echo
+echo Type "%{initdir}/courier start" to start courier
+echo
 fi
 
 %preun
@@ -564,13 +568,20 @@ if [ "$1" = "0" ]; then
 fi
 
 %post webmail
-if ps -A |grep -q authdaemond; then
-       %{_libdir}/courier/sqwebmaild start
+if ps -A |grep -q sqwebmaild; then
+    %{_libdir}/courier/sqwebmaild stop
+    %{_libdir}/courier/sqwebmaild start
+else
+echo
+echo Type "%{_libdir}/courier/sqwebmaild start" to start webmail server
+echo
 fi
 
 %preun webmail
-if ps -A |grep -q sqwebmaild; then
+if [ "$1" = "0" ]; then
+    if ps -A |grep -q sqwebmaild; then
        %{_libdir}/courier/sqwebmaild stop
+    fi
 fi
 
 %post smtpauth
@@ -602,42 +613,42 @@ if [ "$1" = "0" ]; then
 fi
 
 %post authldap
-if ps -A |grep -q authdaemond; then
+if ps -A |grep -q authdaemond.lda; then
        %{_libdir}/authlib/authdaemond stop
        %{_libdir}/authlib/authdaemond start
 fi
 
 %postun authldap
 if [ -x %{_libdir}/authlib/authdaemond ]; then
-       if ps -A |grep -q authdaemond; then
+       if ps -A |grep -q authdaemond.lda; then
                %{_libdir}/authlib/authdaemond stop;
                %{_libdir}/authlib/authdaemond start;
        fi
 fi
 
 %post authmysql
-if ps -A |grep -q authdaemond; then
+if ps -A |grep -q authdaemond.mys; then
        %{_libdir}/authlib/authdaemond stop
        %{_libdir}/authlib/authdaemond start
 fi
 
 %postun authmysql
 if [ -x %{_libdir}/authlib/authdaemond ]; then
-       if ps -A |grep -q authdaemond; then
+       if ps -A |grep -q authdaemond.mys; then
                %{_libdir}/authlib/authdaemond stop;
                %{_libdir}/authlib/authdaemond start;
        fi
 fi
 
 %post authpgsql
-if ps -A |grep -q authdaemond; then
+if ps -A |grep -q authdaemond.pgs; then
        %{_libdir}/authlib/authdaemond stop
        %{_libdir}/authlib/authdaemond start
 fi
 
 %postun authpgsql
 if [ -x %{_libdir}/authlib/authdaemond ]; then
-       if ps -A |grep -q authdaemond; then
+       if ps -A |grep -q authdaemond.pgs; then
                %{_libdir}/authlib/authdaemond stop;
                %{_libdir}/authlib/authdaemond start;
        fi
@@ -645,11 +656,12 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS BENCHMARKS ChangeLog NEWS README TODO htmldoc/*
+%doc AUTHORS BENCHMARKS ChangeLog NEWS README TODO htmldoc/* maildir/README.*.html
 %{_mandir}/man1/sendmail.1*
 %{_mandir}/man1/preline.1*
 %{_mandir}/man1/maildirmake.1*
 %{_mandir}/man1/maildirkw.1*
+%{_mandir}/man1/maildiracl.1*
 %{_mandir}/man1/cancelmsg.1*
 %{_mandir}/man1/lockmail.1*
 %{_mandir}/man1/mailbot.1*
@@ -664,6 +676,7 @@ fi
 %{_mandir}/man1/dotforward.1*
 %{_mandir}/man1/rmail.1*
 %{_mandir}/man5/dot-courier.5*
+%{_mandir}/man5/maildir.5*
 %{_mandir}/man7/localmailfilter.7*
 %{_mandir}/man7/maildirquota.7*
 %{_mandir}/man7/authlib.7*
@@ -706,7 +719,7 @@ fi
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/enablefiltering
 %attr(755,daemon,daemon) %dir %{_sysconfdir}/smtpaccess
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/smtpaccess/default
-%attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/esmtpacceptmailfor.dir/esmtpacceptmailfor
+%attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/esmtpacceptmailfor.dir/default
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/locals
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/courierd
 %attr(640,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/aliases/system
@@ -786,7 +799,6 @@ fi
 %attr(755,daemon,daemon) %dir %{_sysconfdir}/esmtppercentrelay.dir
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/esmtpd.cnf
 %attr(600,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/esmtpauthclient
-%dir %{_libdir}/courier/modules/dsn
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dsndelayed.txt
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dsndelivered.txt
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dsnfailed.txt
@@ -796,6 +808,7 @@ fi
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dsnsubjectwarn.txt
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dsnheader.txt
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/module.dsn
+%dir %{_libdir}/courier/modules/dsn
 %attr(755,root,root) %{_libdir}/courier/modules/dsn/courierdsn
 %{_libdir}/courier/modules/modules.ctl
 %attr(4550,daemon,daemon) %{_libdir}/courier/submitmkdir
@@ -805,43 +818,46 @@ fi
 %attr(750,root,daemon) %{_libdir}/courier/aliascreate
 %attr(750,root,daemon) %{_libdir}/courier/submit
 %attr(755,root,root) %{_libdir}/courier/makedatprog
-%attr(755,root,root) %{_libdir}/%{name}/pcpd
+%attr(755,root,root) %{_sbindir}/authenumerate
+%attr(6555,daemon,daemon) %{_bindir}/cancelmsg
 %attr(755,root,root) %{_sbindir}/courier
-%attr(755,root,root) %{_sbindir}/showconfig
-%attr(750,root,daemon) %{_sbindir}/showmodules
-%attr(755,root,root) %{_sbindir}/userdbpw
+%attr(755,root,root) %{_datadir}/courierctl.start
+%attr(755,root,root) %{_bindir}/couriertls
 %attr(755,root,root) %{_sbindir}/couriertcpd
 %attr(755,root,root) %{_sbindir}/courierlogger
-%attr(6555,daemon,daemon) %{_bindir}/cancelmsg
 %attr(755,root,root) %{_bindir}/courier-config
-%attr(2755,root,daemon) %{_bindir}/mailq
-%attr(755,root,root) %{_bindir}/maildirmake
-%attr(755,root,root) %{_bindir}/maildirkw
-%attr(4755,root,root) %{_sbindir}/sendmail
-%attr(4755,root,root) %{_bindir}/rmail
-%attr(755,root,root) %{_bindir}/lockmail
 %attr(755,root,root) %{_bindir}/deliverquota
-%attr(755,root,root) %{_bindir}/mailbot
-%attr(755,root,root) %{_bindir}/makemime
-%attr(755,root,root) %{_bindir}/mimegpg
 %attr(755,root,root) %{_bindir}/dotforward
-%attr(755,root,root) %{_datadir}/makedat
-%attr(755,root,root) %{_bindir}/makedat
-%attr(755,root,root) %{_bindir}/testmxlookup
+%attr(755,root,root) %{_bindir}/lockmail
+%attr(755,root,root) %{_bindir}/mailbot
+%attr(755,root,root) %{_bindir}/maildirmake
+%attr(755,root,root) %{_bindir}/maildirkw
+%attr(755,root,root) %{_bindir}/maildiracl
+%attr(2755,root,daemon) %{_bindir}/mailq
 %attr(750,root,daemon) %{_datadir}/makealiases
 %attr(750,root,daemon) %{_sbindir}/makealiases
+%attr(755,root,root) %{_datadir}/makedat
+%attr(755,root,root) %{_bindir}/makedat
 %attr(755,root,root) %{_datadir}/makehosteddomains
 %attr(755,root,root) %{_sbindir}/makehosteddomains
+%attr(755,root,root) %{_bindir}/makemime
 %attr(755,root,root) %{_datadir}/makeuserdb
 %attr(755,root,root) %{_sbindir}/makeuserdb
-%attr(755,root,root) %{_datadir}/userdb
-%attr(755,root,root) %{_sbindir}/userdb
+%attr(755,root,root) %{_bindir}/mimegpg
 %attr(755,root,root) %{_datadir}/pw2userdb
 %attr(755,root,root) %{_sbindir}/pw2userdb
+%attr(4755,root,root) %{_bindir}/rmail
+%attr(755,root,root) %{_sbindir}/sharedindexinstall
+%attr(755,root,root) %{_sbindir}/sharedindexsplit
+%attr(755,root,root) %{_sbindir}/showconfig
+%attr(750,root,daemon) %{_sbindir}/showmodules
+%attr(4755,root,root) %{_sbindir}/sendmail
+%attr(755,root,root) %{_bindir}/testmxlookup
+%attr(755,root,root) %{_datadir}/userdb
+%attr(755,root,root) %{_sbindir}/userdb
+%attr(755,root,root) %{_sbindir}/userdbpw
 %attr(755,root,root) %{_datadir}/vchkpw2userdb
 %attr(755,root,root) %{_sbindir}/vchkpw2userdb
-%attr(755,root,root) %{_datadir}/courierctl.start
-%attr(755,root,root) %{_bindir}/couriertls
 %attr(640,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ldapaliasrc
 %attr(700,daemon,daemon) %{_sbindir}/courierldapaliasd
 %attr(660,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/authdaemonrc
@@ -867,9 +883,9 @@ fi
 %defattr(644,root,root,755)
 %attr(644,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/pop3
 %{_mandir}/man8/courierpop3d.8*
+%{_mandir}/man8/courierpop3login.8*
 %{_mandir}/man8/mkpop3dcert.8*
 %{_mandir}/man8/pop3d.8*
-%{_mandir}/man8/courierpop3login.8*
 %attr(755,root,root) %{_datadir}/courierwebadmin/admin-45pop3.pl
 %{_datadir}/courierwebadmin/admin-45pop3.html
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pop3d
@@ -877,12 +893,12 @@ fi
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pop3d-ssl
 %attr(755,root,root) %{_libdir}/courier/courierpop3d
 %attr(755,root,root) %{_libdir}/courier/courierpop3login
+%attr(755,root,root) %{_datadir}/mkpop3dcert
+%attr(755,root,root) %{_sbindir}/mkpop3dcert
 %attr(755,root,root) %{_datadir}/pop3d
 %attr(755,root,root) %{_sbindir}/pop3d
 %attr(755,root,root) %{_datadir}/pop3d-ssl
 %attr(755,root,root) %{_sbindir}/pop3d-ssl
-%attr(755,root,root) %{_datadir}/mkpop3dcert
-%attr(755,root,root) %{_sbindir}/mkpop3dcert
 
 %files imapd
 %defattr(644,root,root,755)
@@ -918,15 +934,16 @@ fi
 %{_datadir}/sqwebmail/html/en-us/*.txt
 %attr(755,root,root) %{_datadir}/courierwebadmin/admin-4*.pl
 %{_datadir}/courierwebadmin/admin-4*.html
-%attr(755,root,root) %{_datadir}/sqwebmail/webgpg
-%attr(755,root,root) %{_sbindir}/webgpg
 %attr(755,root,root) %{_datadir}/sqwebmail/cleancache.pl
-%attr(755,root,root) %{_datadir}/sqwebmail/sendit.sh
 %attr(755,root,root) %{_datadir}/sqwebmail/ldapsearch
-%attr(755,root,root) %{_libdir}/%{name}/sqwebmaild
-%dir %{_libdir}/%{name}/webmail
-%attr(755,root,root) %{_libdir}/%{name}/webmail/webadmin
-%attr(755,root,root) %{_libdir}/%{name}/webmail/webmail
+%attr(755,root,root) %{_datadir}/sqwebmail/sendit.sh
+%attr(755,root,root) %{_datadir}/sqwebmail/webgpg
+%attr(755,root,root) %{_sbindir}/webgpg
+%dir %{_libdir}/courier/webmail
+%attr(755,root,root) %{_libdir}/courier/pcpd
+%attr(755,root,root) %{_libdir}/courier/sqwebmaild
+%attr(755,root,root) %{_libdir}/courier/webmail/webadmin
+%attr(755,root,root) %{_libdir}/courier/webmail/webmail
 %attr(700, bin, bin) %dir %{_localstatedir}/webmail-logincache
 %attr(755,root,root) /etc/cron.hourly/courier-webmail-cleancache