X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=courier.spec;h=3b0d1f2017e08f39a0c33161d11d77a4b636b2cc;hb=ba5301815ed3dec8079e5e21c1d8353d683d39a4;hp=c5a7730c50113771d45239da799d2b8f352fc24c;hpb=ec64f69e9412ca3b6c6c9042af30f0b739aa05e3;p=packages%2Fcourier.git

diff --git a/courier.spec b/courier.spec
index c5a7730..3b0d1f2 100644
--- a/courier.spec
+++ b/courier.spec
@@ -5,17 +5,19 @@
 Summary:	Courier mail server
 Summary(pl):	Serwer poczty Courier
 Name:		courier
-Version:	0.45.3
-Release:	0.9
+Version:	0.45.5
+Release:	1
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5:	c1f657b5b0fd8d41d2eb2372fdfe1b41
+# Source0-md5:	59f69d851740a11a0172eb803f9ab12f
 Patch0: 	%{name}-openssl-path.patch
 Patch1:		%{name}-withoutfam.patch
 Patch2:		%{name}-maildir.patch
 Patch3:		%{name}-sendmail_dir.patch
 Patch4:		%{name}-start_scripts.patch
+Patch5:		%{name}-fix_build.patch
+Patch6:		%{name}-certs.patch
 URL:		http://www.courier-mta.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -43,6 +45,7 @@ Obsoletes:	exim
 Obsoletes:	masqmail
 Obsoletes:	nullmailer
 Obsoletes:	omta
+Obsoletes:	postfix
 Obsoletes:	qmail
 Obsoletes:	sendmail
 Obsoletes:	sendmail-cf
@@ -60,6 +63,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_libexecdir	%{_libdir}
 %define		_localstatedir	/var/spool/courier
 %define		_sysconfdir	/etc/courier
+%define		_certsdir	%{_sysconfdir}/certs
 %define		initdir		/etc/rc.d/init.d
 
 # Change the following if your DocumentRoot and cgibindir differ.  This is
@@ -190,16 +194,16 @@ nie obs
 Jest to ten sam serwer, co dystrybuowany oddzielnie pod nazw±
 SqWebMail, ale jego konfiguracja jest dostosowana do serwera Courier.
 
-%package maildir
+%package maildir-tools
 Summary:	Tools for mail folders in Maildir format
 Summary(pl):	Narzêdzia do zarz±dzania skrzynkami Maildir
 Group:		Applications/Mail
 Requires:	%{name} = %{version}-%{release}
 
-%description maildir
+%description maildir-tools
 This package contains tools for mail folders in Maildir format.
 
-%description maildir -l pl
+%description maildir-tools -l pl
 Ten pakiet zawiera narzêdzia do zarz±dzania folderami w formacie Maildir.
 
 %package mlm
@@ -302,6 +306,8 @@ Ten pakiet pozwala na korzystanie z autentykacji PostgreSQL w Courierze.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 # we don't want fax module
@@ -331,6 +337,18 @@ cd courier
 %{__autoconf}
 ln -s ../ltmain.sh .
 %{__automake}
+
+cd module.esmtp
+%{__aclocal}
+%{__autoconf}
+ln -s ../ltmain.sh .
+%{__automake}
+cd ../..
+
+cd imap
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 cd ..
 
 %configure \
@@ -338,6 +356,7 @@ cd ..
 	--sysconfdir=%{_sysconfdir} \
 	--mandir=%{_mandir} \
 	--enable-imageurl=%{_imageurl} \
+	--with-certsdir=%{_certsdir} \
 	--with-db=db \
 	--with-mailer=%{_sbindir}/sendmail
 
@@ -347,10 +366,11 @@ cd ..
 %install
 rm -rf $RPM_BUILD_ROOT
 umask 022
-install -d -p $RPM_BUILD_ROOT{%{_prefix}/lib,/etc/{cron.hourly,pam.d},%{initdir}} \
-	$RPM_BUILD_ROOT{%{_cgibindir},%{_documentrootdir}} \
-	$RPM_BUILD_ROOT{%{_sysconfdir}/{userdb,hosteddomains},%{_localstatedir}{/calendar,/tmp/broken}} \
-	$RPM_BUILD_ROOT/etc/cron.hourly
+install -d -p $RPM_BUILD_ROOT{/etc/{cron.hourly,pam.d},%{initdir}} \
+	$RPM_BUILD_ROOT{%{_cgibindir},%{_documentrootdir},%{_prefix}/lib} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{userdb,hosteddomains,shared} \
+	$RPM_BUILD_ROOT%{_localstatedir}{/calendar/{private,public},/tmp/broken} \
+	$RPM_BUILD_ROOT{/etc/cron.hourly,%{_certsdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -457,17 +477,20 @@ do /usr/bin/perl ././sysconftool $RPM_BUILD_ROOT$confdist
 done
 
 # make locals, esmtpacceptmailfor.dir/default
-for X in locals esmtpacceptmailfor.dir/default
-do
-echo localhost >$RPM_BUILD_ROOT%{_sysconfdir}/$X
-done
-
-install courier.sysvinit $RPM_BUILD_ROOT%{initdir}/courier
+touch $RPM_BUILD_ROOT%{_sysconfdir}/esmtpacceptmailfor.dir/default
+touch $RPM_BUILD_ROOT%{_sysconfdir}/locals
 
 # Make password and unsecureok (files for webadmin)
 touch $RPM_BUILD_ROOT%{_sysconfdir}/webadmin/password
 touch $RPM_BUILD_ROOT%{_sysconfdir}/webadmin/unsecureok
 
+# create file me to put localdomain
+touch $RPM_BUILD_ROOT%{_sysconfdir}/me
+
+# create calendarmode
+touch $RPM_BUILD_ROOT%{_sysconfdir}/calendarmode
+
+install courier.sysvinit $RPM_BUILD_ROOT%{initdir}/courier
 #
 # Red Hat /etc/profile.d scripts
 #
@@ -522,10 +545,16 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/courierwebadmin/*fax*
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerin -- courier < 0.45.5
+echo
+echo Directory with certificates has changed to %{_certsdir}
+echo
+
 %post
-if [ "$1" = "1" ]; then
 /sbin/chkconfig --add courier
 
+if [ "$1" = "1" ]; then
+/bin/hostname -f >/etc/courier/me
 cat <<EOF
 
 Now courier will refuse to accept SMTP messages except to localhost
@@ -562,10 +591,20 @@ if [ -e %{_localstatedir}/tmp/imapd.pid ]; then
     %{_sbindir}/imapd stop
     %{_sbindir}/imapd start
 fi
+else
+echo
+echo Type "%{_sbindir}/imapd start" to start imapd server
+echo
+fi
 if [ -e %{_localstatedir}/tmp/imapd-ssl.pid ]; then
     %{_sbindir}/imapd-ssl stop
     %{_sbindir}/imapd-ssl start
 fi
+else
+echo
+echo Type "%{_sbindir}/imapd-ssl start" to start imapd-ssl server
+echo
+fi
 
 %preun imapd
 if [ "$1" = "0" ]; then
@@ -582,10 +621,20 @@ if [ -e %{_localstatedir}/tmp/pop3d.pid ]; then
     %{_sbindir}/pop3d stop
     %{_sbindir}/pop3d start
 fi
+else
+echo
+echo Type "%{_sbindir}/pop3d start" to start pop3d server
+echo
+fi
 if [ -e %{_localstatedir}/tmp/pop3d-ssl.pid ]; then
     %{_sbindir}/pop3d-ssl stop
     %{_sbindir}/pop3d-ssl start
 fi
+else
+echo
+echo Type "%{_sbindir}/pop3d-ssl start" to start pop3d-ssl server
+echo
+fi
 
 %preun pop3d
 if [ "$1" = "0" ]; then
@@ -605,19 +654,25 @@ echo
 fi
 
 %post webmail
-if ps -A |grep -q sqwebmaild; then
-    %{_libdir}/courier/sqwebmaild stop
-    %{_libdir}/courier/sqwebmaild start
+if [ "$1" = "1" ]; then
+echo
+echo If you want to have calendar starting by default then
+echo put word net to %{_sysconfdir}/calendarmode
+echo
+fi
+if [ -e %{_localstatedir}/tmp/sqwebmaild.pid ]; then
+    %{_sbindir}/webmaild stop
+    %{_sbindir}/webmaild start
 else
 echo
-echo Type "%{_libdir}/courier/sqwebmaild start" to start webmail server
+echo Type "%{_sbindir}/webmaild start" to start webmail server
 echo
 fi
 
 %preun webmail
 if [ "$1" = "0" ]; then
-    if ps -A |grep -q sqwebmaild; then
-	%{_libdir}/courier/sqwebmaild stop
+    if [ -e %{_localstatedir}/tmp/sqwebmaild.pid ]; then
+	%{_sbindir}/webmaild stop
     fi
 fi
 
@@ -708,6 +763,7 @@ fi
 %{_mandir}/man1/testmxlookup.1*
 %{_mandir}/man1/dot-forward.1*
 %{_mandir}/man1/couriertls.1*
+%{_mandir}/man1/courierlogger.1*
 %{_mandir}/man1/mailq*
 %{_mandir}/man1/couriertcpd*
 %{_mandir}/man1/dotforward.1*
@@ -748,7 +804,9 @@ fi
 %{_mandir}/man8/pw2userdb.8*
 %{_mandir}/man8/vchkpw2userdb.8*
 %dir %{_sysconfdir}
+%attr(750,daemon,root) %dir %{_certsdir}
 %attr(755,daemon,daemon) %dir %{_sysconfdir}/hosteddomains
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/me
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ldapaddressbook
 %attr(755,daemon,daemon) %dir %{_sysconfdir}/aliasdir
 %attr(750,daemon,daemon) %dir %{_sysconfdir}/aliases
@@ -787,7 +845,6 @@ fi
 %attr(755,root,root) %{_datadir}/makeuucpneighbors
 %dir %{_libdir}/courier/modules/local
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/module.local
-%attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/authmodulelist
 %attr(755,root,root) %{_libdir}/courier/modules/local/courierlocal
 %attr(755,root,root) %{_libdir}/courier/modules/local/courierdeliver
 %attr(755,root,root) %{_bindir}/preline
@@ -812,6 +869,8 @@ fi
 %attr(755,root,root) %{_datadir}/mkesmtpdcert
 %attr(755,root,root) %{_sbindir}/esmtpd-msa
 %attr(755,root,root) %{_sbindir}/makesmtpaccess-msa
+%attr(755,root,root) %{_sbindir}/sharedindexinstall
+%attr(755,root,root) %{_sbindir}/sharedindexsplit
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/esmtpd
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/esmtpd-msa
 %attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/esmtpd-ssl
@@ -890,7 +949,7 @@ fi
 %attr(755,root,root) /etc/profile.d/courier.csh
 %attr(754,root,root) /etc/rc.d/init.d/courier
 %attr(700,daemon,daemon) %dir %{_sysconfdir}/userdb
-%attr(755,daemon,daemon) %dir %{_localstatedir}/calendar
+%attr(750,daemon,daemon) %dir %{_sysconfdir}/shared
 %attr(755,daemon,daemon) %dir %{_localstatedir}/tmp/broken
 %attr(755,root,root) /usr/lib/sendmail
 
@@ -962,11 +1021,13 @@ fi
 
 %files webmail
 %defattr(644,root,root,755)
-%doc htmldoc/pcp*
+%doc htmldoc/pcp* gpglib/README.html
 %attr(4755,root,root) %{_cgibindir}/webmail
 %attr(644,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/webmail
 %attr(644,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/calendar
 %{_documentrootdir}/webmail
+%attr(644,daemon,daemon) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sqwebmaild
+%attr(755,root,root) %{_sbindir}/webmaild
 %dir %{_datadir}/sqwebmail
 %dir %{_datadir}/sqwebmail/html
 %dir %{_datadir}/sqwebmail/html/en-us
@@ -985,6 +1046,11 @@ fi
 %attr(755,root,root) %{_libdir}/courier/sqwebmaild
 %attr(700, bin, bin) %dir %{_localstatedir}/webmail-logincache
 %attr(755,root,root) /etc/cron.hourly/courier-webmail-cleancache
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/calendarmode
+%attr(751,bin,bin) %dir %{_localstatedir}/calendar
+%attr(700,bin,bin) %dir %{_localstatedir}/calendar/localcache
+%attr(750,bin,bin) %dir %{_localstatedir}/calendar/private
+%attr(755,bin,bin) %dir %{_localstatedir}/calendar/public
 
 %files maildrop
 %defattr(644,root,root,755)
@@ -997,7 +1063,7 @@ fi
 %attr(755,root,root) %{_bindir}/reformail
 %attr(755,root,root) %{_bindir}/reformime
 
-%files maildir
+%files maildir-tools
 %defattr(644,root,root,755)
 %doc maildir/README.*.html htmldoc/maildir*
 %{_mandir}/man1/maildirmake.1*
@@ -1008,8 +1074,6 @@ fi
 %attr(755,root,root) %{_bindir}/maildirmake
 %attr(755,root,root) %{_bindir}/maildirkw
 %attr(755,root,root) %{_bindir}/maildiracl
-%attr(755,root,root) %{_sbindir}/sharedindexinstall
-%attr(755,root,root) %{_sbindir}/sharedindexsplit
 
 %files mlm
 %defattr(644,root,root,755)