From 75306cc03687b0e63cc75746ae5dcf43b897ed26 Mon Sep 17 00:00:00 2001 From: cvs2git Date: Fri, 21 Sep 2007 08:58:51 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create branch 'AC-branch'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sprout from master 2006-12-23 12:40:12 UTC Arkadiusz Miśkiewicz '- fix db linking' Cherrypick from master 2007-09-21 08:58:51 UTC dzeus '- rel. 2 rebuild with db4.6, STBR': courier-imap.spec -> 1.173 Delete: courier-imap-certsdir.patch --- courier-imap-certsdir.patch | 308 ------------------------------------ courier-imap.spec | 40 ++--- 2 files changed, 21 insertions(+), 327 deletions(-) delete mode 100644 courier-imap-certsdir.patch diff --git a/courier-imap-certsdir.patch b/courier-imap-certsdir.patch deleted file mode 100644 index 59fc9fc..0000000 --- a/courier-imap-certsdir.patch +++ /dev/null @@ -1,308 +0,0 @@ -diff -Nur old/configure.in new/configure.in ---- old/configure.in 2004-06-12 01:38:04.000000000 +0000 -+++ new/configure.in 2004-07-08 16:53:13.000000000 +0000 -@@ -97,6 +97,11 @@ - eval "exec_prefix=$exec_prefix" - eval "libexecdir=$libexecdir" - -+AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ], -+certsdir="$withval", certsdir=$datadir) -+ -+AC_SUBST(certsdir) -+ - AC_ARG_WITH(authchangepwdir, [], , - ac_configure_args="$ac_configure_args --with-authchangepwdir=$libexecdir/authlib") - -diff -Nur old/imap/configure.in new/imap/configure.in ---- old/imap/configure.in 2004-06-12 01:38:04.000000000 +0000 -+++ new/imap/configure.in 2004-07-08 16:53:44.000000000 +0000 -@@ -35,6 +35,11 @@ - eval "exec_prefix=$exec_prefix" - eval "bindir=$bindir" - -+AC_ARG_WITH(certsdir, [ --with-certsdir Directory where certs are created ], -+certsdir="$withval", certsdir=$datadir) -+ -+AC_SUBST(certsdir) -+ - AC_ARG_WITH(mailer, - [ --with-mailer=prog Your mail submission program], - SENDMAIL="$withval", -diff -Nur old/imap/imapd.cnf.in new/imap/imapd.cnf.in ---- old/imap/imapd.cnf.in 2001-03-24 04:59:55.000000000 +0000 -+++ new/imap/imapd.cnf.in 2004-07-08 16:54:18.000000000 +0000 -@@ -1,5 +1,5 @@ - --RANDFILE = @datadir@/imapd.rand -+RANDFILE = @certsdir@/imapd.rand - - [ req ] - default_bits = 1024 -diff -Nur old/imap/imapd-ssl.dist.in new/imap/imapd-ssl.dist.in ---- old/imap/imapd-ssl.dist.in 2004-01-24 20:09:26.000000000 +0000 -+++ new/imap/imapd-ssl.dist.in 2004-07-08 16:54:04.000000000 +0000 -@@ -146,7 +146,7 @@ - # servers, and is optional for SSL/TLS clients. TLS_CERTFILE is usually - # treated as confidential, and must not be world-readable. - # --TLS_CERTFILE=@datadir@/imapd.pem -+TLS_CERTFILE=@certsdir@/imapd.pem - - ##NAME: TLS_TRUSTCERTS:0 - # -diff -Nur old/imap/mkimapdcert.8.in new/imap/mkimapdcert.8.in ---- old/imap/mkimapdcert.8.in 2004-02-08 04:12:08.000000000 +0000 -+++ new/imap/mkimapdcert.8.in 2004-07-08 17:01:04.000000000 +0000 -@@ -18,7 +18,7 @@ - .PP - IMAP over SSL requires a valid, signed, X.509 certificate. The default - location for the certificate file is --\fI@datadir@/imapd.pem\fR\&. -+\fI@certsdir@/imapd.pem\fR\&. - \fBmkimapdcert\fR generates a self-signed X.509 certificate, - mainly for - testing. -@@ -26,19 +26,19 @@ - recognized certificate authority, in order for mail clients to accept the - certificate. - .PP --\fI@datadir@/imapd.pem\fR must be owned by the -+\fI@certsdir@/imapd.pem\fR must be owned by the - @mailuser@ user and - have no group or world permissions. - The \fBmkimapdcert\fR command will - enforce this. To prevent an unfortunate accident, - \fBmkimapdcert\fR --will not work if \fB@datadir@/imapd.pem\fR already exists. -+will not work if \fB@certsdir@/imapd.pem\fR already exists. - .PP - \fBmkimapdcert\fR requires - \fBOpenSSL\fR to be installed. - .SH "FILES" - .TP --\fB@datadir@/imapd.pem\fR -+\fB@certsdir@/imapd.pem\fR - X.509 certificate. - .TP - \fB@sysconfdir@/imapd.cnf\fR -diff -Nur old/imap/mkimapdcert.html.in new/imap/mkimapdcert.html.in ---- old/imap/mkimapdcert.html.in 2004-02-08 04:12:12.000000000 +0000 -+++ new/imap/mkimapdcert.html.in 2004-07-08 17:00:45.000000000 +0000 -@@ -57,7 +57,7 @@ - location for the certificate file is - @datadir@/imapd.pem@certsdir@/imapd.pem. -

@datadir@/imapd.pem@certsdir@/imapd.pem must be owned by the - @mailuser@ user and - have no group or world permissions. -@@ -86,7 +86,7 @@ - > - will not work if @datadir@/imapd.pem@certsdir@/imapd.pem already exists.

@datadir@/imapd.pem
@certsdir@/imapd.pem

X.509 certificate.

@datadir@/pop3d.pem@certsdir@/pop3d.pem. -

@datadir@/pop3d.pem@certsdir@/pop3d.pem must be owned by the - @mailuser@ user and - have no group or world permissions. -@@ -86,7 +86,7 @@ - > - will not work if @datadir@/pop3d.pem@certsdir@/pop3d.pem already exists.

@datadir@/pop3d.pem
@certsdir@/pop3d.pem

X.509 certificate.

/dev/null -+cd @certsdir@ -+dd if=@RANDOMV@ of=@certsdir@/imapd.rand count=1 2>/dev/null - @OPENSSL@ req -new -x509 -days 365 -nodes \ -- -config @sysconfdir@/imapd.cnf -out @datadir@/imapd.pem -keyout @datadir@/imapd.pem || cleanup --@OPENSSL@ gendh -rand @datadir@/imapd.rand 512 >>@datadir@/imapd.pem || cleanup --@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/imapd.pem || cleanup --rm -f @datadir@/imapd.rand -+ -config @sysconfdir@/imapd.cnf -out @certsdir@/imapd.pem -keyout @certsdir@/imapd.pem || cleanup -+@OPENSSL@ gendh -rand @certsdir@/imapd.rand 512 >>@certsdir@/imapd.pem || cleanup -+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @certsdir@/imapd.pem || cleanup -+rm -f @certsdir@/imapd.rand -diff -Nur old/imap/mkpop3dcert.in new/imap/mkpop3dcert.in ---- old/imap/mkpop3dcert.in 2005-06-29 18:01:17.000000000 +0000 -+++ new/imap/mkpop3dcert.in 2005-08-31 21:49:26.143362392 +0000 -@@ -13,26 +13,26 @@ - - prefix="@prefix@" - --if test -f @datadir@/pop3d.pem -+if test -f @certsdir@/pop3d.pem - then -- echo "@datadir@/pop3d.pem already exists." -+ echo "@certsdir@/pop3d.pem already exists." - exit 1 - fi - - umask 077 --cp /dev/null @datadir@/pop3d.pem --chmod 600 @datadir@/pop3d.pem --chown @mailuser@ @datadir@/pop3d.pem -+cp /dev/null @certsdir@/pop3d.pem -+chmod 600 @certsdir@/pop3d.pem -+chown @mailuser@ @certsdir@/pop3d.pem - - cleanup() { -- rm -f @datadir@/pop3d.pem -- rm -f @datadir@/pop3d.rand -+ rm -f @certsdir@/pop3d.pem -+ rm -f @certsdir@/pop3d.rand - exit 1 - } - --dd if=@RANDOMV@ of=@datadir@/pop3d.rand count=1 2>/dev/null -+dd if=@RANDOMV@ of=@certsdir@/pop3d.rand count=1 2>/dev/null - @OPENSSL@ req -new -x509 -days 365 -nodes \ -- -config @sysconfdir@/pop3d.cnf -out @datadir@/pop3d.pem -keyout @datadir@/pop3d.pem || cleanup --@OPENSSL@ gendh -rand @datadir@/pop3d.rand 512 >>@datadir@/pop3d.pem || cleanup --@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @datadir@/pop3d.pem || cleanup --rm -f @datadir@/pop3d.rand -+ -config @sysconfdir@/pop3d.cnf -out @certsdir@/pop3d.pem -keyout @certsdir@/pop3d.pem || cleanup -+@OPENSSL@ gendh -rand @certsdir@/pop3d.rand 512 >>@certsdir@/pop3d.pem || cleanup -+@OPENSSL@ x509 -subject -dates -fingerprint -noout -in @certsdir@/pop3d.pem || cleanup -+rm -f @certsdir@/pop3d.rand diff --git a/courier-imap.spec b/courier-imap.spec index dfdc46b..f518c4a 100644 --- a/courier-imap.spec +++ b/courier-imap.spec @@ -6,14 +6,14 @@ %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: 4.1.1 -Release: 3 +Version: 4.1.2 +Release: 2 License: GPL Group: Networking/Daemons Source0: http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2 -# Source0-md5: f423a609d9cce0dcf193cac64eb4cbdd +# Source0-md5: e4a1c75992cc85ba10f719e98f6df0ff Source1: %{name}.init Source2: %{name}-ssl.init Source3: %{name}-pop3.init @@ -25,10 +25,11 @@ Patch1: %{name}-certsdir.patch Patch2: %{name}-maildir.patch 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: courier-authlib-devel >= 0.57 +BuildRequires: courier-authlib-devel >= 0.59 BuildRequires: db-devel BuildRequires: fam-devel BuildRequires: libstdc++-devel @@ -56,12 +57,12 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %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 Requires(post,preun): /sbin/chkconfig Requires: /sbin/chkconfig @@ -72,41 +73,41 @@ 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. +%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 Requires: %{name}-common = %{version}-%{release} -Requires: pam >= 0.77.3 +Requires: pam >= 0.79.0 Provides: pop3daemon Obsoletes: pop3daemon Conflicts: cyrus-imapd @@ -117,7 +118,7 @@ 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. %prep @@ -129,6 +130,7 @@ Courier-IMAP POP3 jest serwerem POP3 dla skrzynek pocztowych Maildir. %patch3 -p1 %endif %patch4 -p1 +%patch5 -p1 install %{SOURCE1} courier-imap.in install %{SOURCE2} courier-imap-ssl.in -- 2.44.0