From 1d7855bdef1a1b2beeb0d45b3a1d08751eb9c777 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:20:42 +0000 Subject: [PATCH] auto-import changelog data from dovecot-0.99.10.4-4.src.rpm Fri May 07 2004 Warren Togami 0.99.10.4-4 - default auth config that is actually usable - Timo Sirainen (author) suggested functionality fixes maildir, imap-fetch-body-section, customflags-fix Mon Feb 23 2004 Tim Waugh - Use ':' instead of '.' as separator for chown. --- dovecot-0.99.10.4-conf.patch | 62 ++++++++++++++++++++++++++++++++++++ dovecot.spec | 23 +++++++++++-- 2 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 dovecot-0.99.10.4-conf.patch diff --git a/dovecot-0.99.10.4-conf.patch b/dovecot-0.99.10.4-conf.patch new file mode 100644 index 0000000..e56f52a --- /dev/null +++ b/dovecot-0.99.10.4-conf.patch @@ -0,0 +1,62 @@ +diff -urN dovecot-0.99.10.4.orig/dovecot-example.conf dovecot-0.99.10.4/dovecot-example.conf +--- dovecot-0.99.10.4.orig/dovecot-example.conf 2003-11-08 05:21:22.000000000 -1000 ++++ dovecot-0.99.10.4/dovecot-example.conf 2004-05-07 03:49:31.604463526 -1000 +@@ -4,7 +4,7 @@ + # any of the lines. Exception to this are paths, they're just examples + # with real defaults being based on configure options. The paths listed here + # are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +-# --with-ssldir=/etc/ssl ++# --with-ssldir=/usr/share/ssl + + # Base directory where to store runtime data. + #base_dir = /var/run/dovecot/ +@@ -33,8 +33,8 @@ + # dropping root privileges, so keep the key file unreadable by anyone but + # root. Included doc/mkcert.sh can be used to easily generate self-signed + # certificate, just make sure to update the domains in dovecot-openssl.cnf +-#ssl_cert_file = /etc/ssl/certs/dovecot.pem +-#ssl_key_file = /etc/ssl/private/dovecot.pem ++#ssl_cert_file = /usr/share/ssl/certs/dovecot.pem ++#ssl_key_file = /usr/share/ssl/private/dovecot.pem + + # SSL parameter file. Master process generates this file for login processes. + # It contains Diffie Hellman and RSA parameters. +@@ -67,7 +67,7 @@ + # Directory where authentication process places authentication UNIX sockets + # which login needs to be able to connect to. The sockets are created when + # running as root, so you don't have to worry about permissions. +-#login_dir = /var/run/dovecot/login ++login_dir = /var/run/dovecot-login + + # chroot login process to the login_dir. Only reason not to do this is if you + # wish to run the whole Dovecot without roots. +@@ -288,7 +288,7 @@ + # with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl + # and flock. Some operating systems don't allow using both of them + # simultaneously, eg. BSDs. If dotlock is used, it's always created first. +-#mbox_locks = dotlock fcntl ++mbox_locks = fcntl + + # Should we create dotlock file even when we want only a read-lock? Setting + # this to yes hurts the performance when the mailbox is accessed simultaneously +@@ -380,8 +380,8 @@ + # vpopmail: vpopmail library + # ldap : LDAP, see doc/dovecot-ldap.conf + # pgsql : a PostgreSQL database, see doc/dovecot-pgsql.conf +-#auth_userdb = passwd +-auth_userdb = pgsql /usr/local/etc/dovecot-pgsql.conf ++auth_userdb = passwd ++# auth_userdb = pgsql /usr/local/etc/dovecot-pgsql.conf + + # Where password database is kept: + # passwd: /etc/passwd or similiar, using getpwnam() +@@ -391,7 +391,8 @@ + # vpopmail: vpopmail authentication + # ldap : LDAP, see doc/dovecot-ldap.conf + # pgsql : a PostgreSQL database, see doc/dovecot-pgsql.conf +-auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf ++# auth_passdb = pgsql /usr/local/etc/dovecot-pgsql.conf ++auth_passdb = pam + + #auth_executable = /usr/libexec/dovecot/dovecot-auth + diff --git a/dovecot.spec b/dovecot.spec index 3f58482..9a6fa2c 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -1,13 +1,18 @@ Summary: Dovecot Secure imap server Name: dovecot Version: 0.99.10.4 -Release: 3 +Release: 4 License: GPL Group: System Environment/Daemons Source: %{name}-%{version}.tar.gz Source1: dovecot.init Source2: dovecot.pam -Patch100: dovecot-0.99.9.1-conf.patch +Patch100: dovecot-0.99.10.4-conf.patch + +# Patches 500+ from upstream fixes +Patch500: dovecot-0.99.10.4-maildir.patch +Patch501: dovecot-0.99.10.4-customflags-fix.patch +Patch502: dovecot-0.99.10.4-imap-fetch-body-section.patch URL: http://dovecot.procontrol.fi/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: openssl-devel @@ -28,6 +33,10 @@ in either of maildir or mbox formats. %patch100 -p1 -b .config +%patch500 -p0 -b .maildir +%patch501 -p0 -b .customflags-fix +%patch502 -p1 -b .imap-fetch-body-section + %build %configure --with-ssl=openssl --with-ssldir=/usr/share/ssl --with-ldap @@ -75,7 +84,7 @@ SomeOrganizationalUnit localhost.localdomain root@localhost.localdomain EOF -chown root.root private/dovecot.pem certs/dovecot.pem +chown root:root private/dovecot.pem certs/dovecot.pem chmod 600 private/dovecot.pem certs/dovecot.pem popd &>/dev/null fi @@ -109,6 +118,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 07 2004 Warren Togami 0.99.10.4-4 +- default auth config that is actually usable +- Timo Sirainen (author) suggested functionality fixes + maildir, imap-fetch-body-section, customflags-fix + +* Mon Feb 23 2004 Tim Waugh +- Use ':' instead of '.' as separator for chown. + * Tue Feb 17 2004 Jeremy Katz - 0.99.10.4-3 - restart properly if it dies (#115594)