X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=courier-imap.spec;h=275ee966ec83090a772ad6c2dff651be9f0170cb;hb=10802e096205df366166ca0f43ca99a8107aaf62;hp=b49ca0d08bf95a401f60c9092e674b2cba3c923f;hpb=b3e3893341383797c7894eebf940e55c5aadc976;p=packages%2Fcourier-imap.git diff --git a/courier-imap.spec b/courier-imap.spec index b49ca0d..275ee96 100644 --- a/courier-imap.spec +++ b/courier-imap.spec @@ -1,41 +1,49 @@ +# TODO: +# - put imap-ssl and pop3-ssl to separate packages - some want to have +# ssl-only system (or non-ssl only system) +# see also http://thread.gmane.org/gmane.linux.pld.devel.english/2509/focus=2509 # -# Conditional build: -%bcond_without ldap # without LDAP support -%bcond_without mysql # without MySQL support -%bcond_without pgsql # without PostgreSQL support +%bcond_with toplevel # Allow toplevel folders. More info: http://www.ricky-chan.co.uk/courier/ # Summary: Courier-IMAP server -Summary(pl): Serwer Courier-IMAP +Summary(pl.UTF-8): Serwer Courier-IMAP Name: courier-imap -Version: 3.0.5 -Release: 2 +Version: 4.3.1 +Release: 1 License: GPL Group: Networking/Daemons Source0: http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2 -# Source0-md5: 8b0c79997905dc46cfe4cc13be74ceaf +# Source0-md5: 6e25e51faeec55a695242679311b595f Source1: %{name}.init -Source2: %{name}-pop3.init -Source3: %{name}.pamd -Source4: %{name}-pop3.pamd +Source2: %{name}-ssl.init +Source3: %{name}-pop3.init +Source4: %{name}-pop3-ssl.init +Source5: %{name}.pamd +Source6: %{name}-pop3.pamd Patch0: %{name}-dirs.patch Patch1: %{name}-certsdir.patch Patch2: %{name}-maildir.patch -URL: http://www.inter7.com/courierimap/ +Patch3: %{name}-toplevel.patch +Patch4: %{name}-drop-makedat.patch +Patch5: %{name}-link.patch +URL: http://www.courier-mta.org/imap/ BuildRequires: autoconf >= 2.54 BuildRequires: automake -BuildRequires: gdbm-devel +BuildRequires: courier-authlib-devel >= 0.59 +BuildRequires: db-devel +BuildRequires: fam-devel BuildRequires: libstdc++-devel -%{?with_mysql:BuildRequires: mysql-devel} -%{?with_ldap:BuildRequires: openldap-devel} +BuildRequires: libtool BuildRequires: openssl-devel >= 0.9.7d -%{?with_pgsql:BuildRequires: postgresql-devel} BuildRequires: procps +BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: sed >= 4.0 BuildRequires: sysconftool -%{?with_mysql:BuildRequires: zlib-devel} -PreReq: %{name}-common = %{version}-%{release} -PreReq: rc-scripts Requires(post,preun): /sbin/chkconfig -Requires: pam >= 0.77.3 +Requires: %{name}-common = %{version}-%{release} +Requires: /sbin/chkconfig +Requires: pam >= 0.79.0 +Requires: rc-scripts Provides: imapdaemon Obsoletes: imapdaemon Conflicts: cyrus-imapd @@ -44,74 +52,63 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _libexecdir /usr/%{_lib}/courier-imap %define _sysconfdir /etc/courier-imap -%define _certsdir %{_sysconfdir}/certs +%define _certsdir %{_sysconfdir}/certs +%define _localstatedir /var/spool/courier-imap %description Courier-IMAP is an IMAP server for Maildir mailboxes. -%description -l pl +%description -l pl.UTF-8 Courier-IMAP jest serwerem IMAP dla skrzynek pocztowych Maildir. %package common Summary: Common files for imap and pop3 daemons -Summary(pl): Pliki wspólne dla serwerów imap i pop3 +Summary(pl.UTF-8): Pliki wspólne dla serwerów imap i pop3 Group: Networking/Daemons -PreReq: rc-scripts Requires(post,preun): /sbin/chkconfig -Requires: %{name}-deliverquota = %{version}-%{release} -Requires: %{name}-maildirmake = %{version}-%{release} -Requires: %{name}-userdb = %{version}-%{release} +Requires: /sbin/chkconfig +Requires: courier-authlib Requires: procps +Requires: rc-scripts %description common 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. +%description common -l pl.UTF-8 +Pliki wspólne dla serwerów imap i pop3. %package deliverquota Summary: Deliver to a Maildir with a quota -Summary(pl): Obs³uga quoty przy dostarczaniu poczty do skrzynek Maildir +Summary(pl.UTF-8): 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. -%description deliverquota -l pl -deliverquota jest tymczasowym rozwi±zaniem implementuj±cym -dostarczanie e-maili do skrzynek Maildir z programowo narzucon± quot±. +%description deliverquota -l pl.UTF-8 +deliverquota jest tymczasowym rozwiązaniem implementującym +dostarczanie e-maili do skrzynek Maildir z programowo narzuconą quotą. %package maildirmake Summary: Tool for making mail folders in Maildir format -Summary(pl): Narzêdzie do tworzenia folderów w formacie Maildir +Summary(pl.UTF-8): Narzędzie do tworzenia folderów w formacie Maildir Group: Networking/Daemons Conflicts: qmail-maildirmake %description maildirmake Maildirmake is a tool for making mail folders in Maildir format. -%description maildirmake -l pl -Maildirmake jest narzêdziem do tworzenia folderów pocztowych w +%description maildirmake -l pl.UTF-8 +Maildirmake jest narzędziem do tworzenia folderów pocztowych w formacie Maildir. %package pop3 Summary: Courier-IMAP POP3 Server -Summary(pl): Serwer Courier-IMAP POP3 +Summary(pl.UTF-8): Serwer Courier-IMAP POP3 Group: Networking/Daemons -PreReq: %{name}-common = %{version}-%{release} -Requires: pam >= 0.77.3 +Requires: %{name}-common = %{version}-%{release} +Requires: pam >= 0.79.0 Provides: pop3daemon Obsoletes: pop3daemon Conflicts: cyrus-imapd @@ -122,149 +119,88 @@ Conflicts: tpop3d %description pop3 Courier-IMAP POP3 is an POP3 server for Maildir mailboxes. -%description pop3 -l pl +%description pop3 -l pl.UTF-8 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 %patch1 -p1 %patch2 -p1 +%if %{with toplevel} +%patch3 -p1 +%endif +%patch4 -p1 +%patch5 -p1 install %{SOURCE1} courier-imap.in -install %{SOURCE2} courier-pop3.in +install %{SOURCE2} courier-imap-ssl.in +install %{SOURCE3} courier-pop3.in +install %{SOURCE4} courier-pop3-ssl.in +rm -f makedat/configure.in %build -cp -f /usr/share/automake/config.sub . -cp -f /usr/share/automake/config.sub maildir - -%{__aclocal} -%{__automake} -%{__autoconf} - -cd authlib -%{__aclocal} -%{__automake} -%{__autoconf} -cd ../imap -%{__aclocal} -%{__automake} -%{__autoconf} -cd .. + +# Change Makefile.am files and force recreate Makefile.in's. +find -type f -a '(' -name configure.in -o -name configure.ac ')' | while read FILE; do + cd "$(dirname "$FILE")" + + if [ -f Makefile.am ]; then + %{__sed} -i -e '/_[L]DFLAGS=-static/d' Makefile.am + fi + + %{__libtoolize} + %{__aclocal} + %{__autoconf} + %{__autoheader} + %{__automake} + + cd - +done %configure \ - --libexecdir=%{_libexecdir} \ + --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-mailer=/usr/lib/sendmail %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security,sysconfig} \ - $RPM_BUILD_ROOT{%{_sysconfdir}/shared,%{_certsdir},/var/lib/authdaemon} +install -d $RPM_BUILD_ROOT{/etc/{pam.d,rc.d/init.d,security},%{_certsdir}} -%{__make} install \ +%{__make} -j1 install \ DESTDIR=$RPM_BUILD_ROOT install courier-imap $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap +install courier-imap-ssl $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap-ssl 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} - -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 +install courier-pop3-ssl $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-pop3-ssl +install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/imap +install %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/pop3 + +rm -rf $RPM_BUILD_ROOT%{_sbindir}/mk*cert + +install imap/README README.imap +install imap/ChangeLog ChangeLog +install maildir/README.maildirquota.txt README.maildirquota + +mv -f $RPM_BUILD_ROOT%{_datadir}/mk*cert $RPM_BUILD_ROOT%{_sbindir} + +install tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man8/couriertls.8 +install imap/courierpop3d.8 $RPM_BUILD_ROOT%{_mandir}/man8/courierpop3d.8 touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap} +touch $RPM_BUILD_ROOT%{_sysconfdir}/shared/index # make config files ./sysconftool $RPM_BUILD_ROOT%{_sysconfdir}/*.dist # set yes to start imapd and pop3d -sed 's/^POP3DSTART.*/POP3DSTART=YES/' < $RPM_BUILD_ROOT%{_sysconfdir}/pop3d > $RPM_BUILD_ROOT%{_sysconfdir}/pop3d.new -mv -f $RPM_BUILD_ROOT%{_sysconfdir}/pop3d.new $RPM_BUILD_ROOT%{_sysconfdir}/pop3d - -sed 's/^IMAPDSTART.*/IMAPDSTART=YES/' < $RPM_BUILD_ROOT%{_sysconfdir}/imapd > $RPM_BUILD_ROOT%{_sysconfdir}/imapd.new -mv -f $RPM_BUILD_ROOT%{_sysconfdir}/imapd.new $RPM_BUILD_ROOT%{_sysconfdir}/imapd +sed -i 's/^POP3DSTART.*/POP3DSTART=YES/' $RPM_BUILD_ROOT%{_sysconfdir}/pop3d +sed -i 's/^IMAPDSTART.*/IMAPDSTART=YES/' $RPM_BUILD_ROOT%{_sysconfdir}/imapd # remove unpackaged files rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.dist @@ -274,63 +210,69 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add courier-imap - -if [ -f /var/lock/subsys/courier-imap ]; then - /etc/rc.d/init.d/courier-imap restart >&2 -else - echo "Run \"/etc/rc.d/init.d/courier-imap start\" to start courier-imap daemon." -fi +/sbin/chkconfig --add courier-imap-ssl +%service courier-imap restart "courier-imap daemon" +%service courier-imap-ssl restart "courier-imap-ssl daemon" %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/courier-imap ]; then - /etc/rc.d/init.d/courier-imap stop >&2 - fi + %service courier-imap stop /sbin/chkconfig --del courier-imap fi +if [ "$1" = "0" ]; then + %service courier-imap-ssl stop + /sbin/chkconfig --del courier-imap-ssl +fi + + %triggerin -- %{name} < 3.0.5 if [ -f /var/lib/openssl/certs/imapd.pem ]; then - echo - echo imapd.pem has been moved automatically to %{_certsdir} - echo - mv -f /var/lib/openssl/certs/imapd.pem %{_certsdir} + echo + echo imapd.pem has been moved automatically to %{_certsdir} + echo + mv -f /var/lib/openssl/certs/imapd.pem %{_certsdir} 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 COURIERTLS |cut -d= -f1`; - do - eval opt2=\$$opt - sed s/^$opt=.*/"$opt=\"$opt2\""/ < %{_sysconfdir}/imapd > %{_sysconfdir}/imapd.new - mv -f %{_sysconfdir}/imapd.new %{_sysconfdir}/imapd - sed s/^$opt=.*/"$opt=\"$opt2\""/ < %{_sysconfdir}/imapd-ssl > %{_sysconfdir}/imapd-ssl.new - mv -f %{_sysconfdir}/imapd-ssl.new %{_sysconfdir}/imapd-ssl - done - sed s/^SSLADDRESS=.*/"SSLADDRESS=$ADDRESS_SSL"/ < %{_sysconfdir}/imapd-ssl > %{_sysconfdir}/imapd-ssl.new - sed s/^SSLPORT=.*/"SSLPORT=$PORTS_SSL"/ < %{_sysconfdir}/imapd-ssl.new > %{_sysconfdir}/imapd-ssl - rm -f %{_sysconfdir}/imapd-ssl.new - chmod 640 %{_sysconfdir}/imapd-ssl - chmod 640 %{_sysconfdir}/imapd - echo - echo IMAPD config file has been rewriten to %{_sysconfdir}/imapd,imapd-ssl - echo please look at them - echo + . /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`; + do + eval opt2=\$$opt + sed -i s/^$opt=.*/"$opt=\"$opt2\""/ %{_sysconfdir}/imapd + sed -i s/^$opt=.*/"$opt=\"$opt2\""/ %{_sysconfdir}/imapd-ssl + done + sed -i s/^SSLADDRESS=.*/"SSLADDRESS=$ADDRESS_SSL"/ %{_sysconfdir}/imapd-ssl + sed -i s/^SSLPORT=.*/"SSLPORT=$PORTS_SSL"/ %{_sysconfdir}/imapd-ssl + sed -i s!^MAILDIRPATH=.*!"MAILDIRPATH=\"$MAILDIR\""! %{_sysconfdir}/imapd-ssl + sed -i s!^MAILDIRPATH=.*!"MAILDIRPATH=\"$MAILDIR\""! %{_sysconfdir}/imapd + echo + echo IMAPD config file has been rewriten to %{_sysconfdir}/imapd,imapd-ssl + echo please look at them + echo fi -if [ -f /var/lock/subsys/courier-imap ]; then - /etc/rc.d/init.d/courier-imap restart >&2 +%service -q courier-imap restart + +%triggerin -- %{name} < 3.0.6 +. %{_sysconfdir}/imapd-ssl +if [ $TLS_CACHEFILE = "/var/couriersslcache" ]; then + sed -i s/^TLS_CACHEFILE=.*/"TLS_CACHEFILE=\/var\/spool\/courier-imap\/couriersslcache"/ %{_sysconfdir}/imapd-ssl fi +%triggerin -n %{name}-common -- %{name}-userdb +echo +echo courier-imap-userdb is obsolete +echo install courier-authlib-userdb package +echo + %triggerin -n %{name}-common -- %{name}-common < 3.0.5 /sbin/chkconfig --del authdaemon if [ -f /var/lock/subsys/authdaemon ]; then - kill `cat /var/lib/authdaemon/pid` - rm -f /var/lock/subsys/authdaemon + kill `cat /var/lib/authdaemon/pid` + rm -f /var/lock/subsys/authdaemon fi if [ -f /etc/sysconfig/authdaemon ]; then - . /etc/sysconfig/authdaemon - sed s/^version.*/version=authdaemond.$METHOD/ <%{_sysconfdir}/authdaemonrc >%{_sysconfdir}/authdaemonrc.new - mv -f %{_sysconfdir}/authdaemonrc.new %{_sysconfdir}/authdaemonrc - chmod 640 %{_sysconfdir}/authdaemonrc + . /etc/sysconfig/authdaemon + sed -i s/^version.*/version=authdaemond.$METHOD/ %{_sysconfdir}/authdaemonrc fi echo echo Changes to version 3.0.5 : @@ -340,108 +282,70 @@ echo %post pop3 /sbin/chkconfig --add courier-pop3 +/sbin/chkconfig --add courier-pop3-ssl /sbin/chkconfig --del courier-imap-pop3 >/dev/null 2>&1 || : if [ -f /var/lock/subsys/courier-imap-pop3 ]; then - /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 + /sbin/service courier-imap-pop3 stop >&2 + /sbin/service courier-pop3 start >&2 else - echo "Run \"/etc/rc.d/init.d/courier-pop3 start\" to start courier-pop3 daemon." + %service courier-pop3 restart "courier-pop3 daemon" fi +%service courier-pop3-ssl restart "courier-pop3-ssl daemon" %preun pop3 if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/courier-pop3 ]; then - /etc/rc.d/init.d/courier-pop3 stop >&2 - fi + %service courier-pop3 stop /sbin/chkconfig --del courier-pop3 + %service courier-pop3-ssl stop + /sbin/chkconfig --del courier-pop3-ssl fi %triggerin -n %{name}-pop3 -- %{name}-pop3 < 3.0.5 if [ -f /var/lib/openssl/certs/pop3d.pem ]; then - echo - echo pop3d.pem has been moved automatically to %{_certsdir} - echo - mv -f /var/lib/openssl/certs/pop3d.pem %{_certsdir} + echo + echo pop3d.pem has been moved automatically to %{_certsdir} + echo + mv -f /var/lib/openssl/certs/pop3d.pem %{_certsdir} 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 COURIERTLS |cut -d= -f1`; - do - eval opt2=\$$opt - sed s/^$opt=.*/"$opt=\"$opt2\""/ < %{_sysconfdir}/pop3d > %{_sysconfdir}/pop3d.new - mv -f %{_sysconfdir}/pop3d.new %{_sysconfdir}/pop3d - sed s/^$opt=.*/"$opt=\"$opt2\""/ < %{_sysconfdir}/pop3d-ssl > %{_sysconfdir}/pop3d-ssl.new - mv -f %{_sysconfdir}/pop3d-ssl.new %{_sysconfdir}/pop3d-ssl - done - chmod 640 %{_sysconfdir}/pop3d-ssl - chmod 640 %{_sysconfdir}/pop3d - echo - echo POP3D config file has been rewriten to %{_sysconfdir}/pop3d,pop3d-ssl - echo please look at them - echo -fi -if [ -f /var/lock/subsys/courier-pop3 ]; then - /etc/rc.d/init.d/courier-pop3 restart >&2 -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 + . /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`; + do + eval opt2=\$$opt + sed -i s/^$opt=.*/"$opt=\"$opt2\""/ %{_sysconfdir}/pop3d + sed -i s/^$opt=.*/"$opt=\"$opt2\""/ %{_sysconfdir}/pop3d-ssl + done + sed -i s!^MAILDIRPATH=.*!"MAILDIRPATH=\"$MAILDIR\""! %{_sysconfdir}/pop3d-ssl + sed -i s!^MAILDIRPATH=.*!"MAILDIRPATH=\"$MAILDIR\""! %{_sysconfdir}/pop3d + echo + echo POP3D config file has been rewriten to %{_sysconfdir}/{pop3d,pop3d-ssl} + echo please look at them + echo fi +%service courier-pop3 restart -%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 +%triggerin -n %{name}-pop3 -- %{name}-pop3 < 3.0.6 +. %{_sysconfdir}/pop3d-ssl +if [ $TLS_CACHEFILE = "/var/couriersslcache" ]; then + sed -i s/^TLS_CACHEFILE=.*/"TLS_CACHEFILE=\/var\/spool\/courier-imap\/couriersslcache"/ %{_sysconfdir}/pop3d-ssl fi %files %defattr(644,root,root,755) -%doc maildir/README.sharedfolders.html -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/imap -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.imap -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/imapd -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/imapd-ssl -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/imapd.cnf +%doc maildir/README.sharedfolders.txt imap/README.proxy tcpd/README.couriertls +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/imap +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.imap +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/imapd +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/imapd-ssl +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/imapd.cnf %attr(754,root,root) /etc/rc.d/init.d/courier-imap -%attr(750,daemon,daemon) %dir %{_sysconfdir}/shared +%attr(754,root,root) /etc/rc.d/init.d/courier-imap-ssl +%attr(755,daemon,daemon) %dir %{_sysconfdir}/shared +%attr(755,daemon,daemon) %dir %{_sysconfdir}/shared.tmp +%attr(644,daemon,daemon) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/shared/index %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 @@ -455,39 +359,17 @@ fi %files common %defattr(644,root,root,755) %doc AUTHORS ChangeLog imap/BUGS INSTALL README* -%attr(700,root,root) /var/lib/authdaemon -%attr(750,root,root) %dir %{_sysconfdir} +%attr(751,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 @@ -500,39 +382,16 @@ fi %files pop3 %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) %{_sysconfdir}/pop3d -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pop3d-ssl -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pop3d.cnf +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/pop3 +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.pop3 +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pop3d +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pop3d-ssl +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pop3d.cnf %attr(754,root,root) /etc/rc.d/init.d/courier-pop3 +%attr(754,root,root) /etc/rc.d/init.d/courier-pop3-ssl %attr(755,root,root) %{_bindir}/pop3d %attr(755,root,root) %{_sbindir}/mkpop3dcert %attr(755,root,root) %{_sbindir}/pop3login %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