fix bugs 143707, 14462, bring up to latest upstream, 0.99.13
This commit is contained in:
John Dennis
parent
21412c6698
commit
f0dad0c4be
@ -1 +1 @@
|
||||
dovecot-0.99.11.tar.gz
|
||||
dovecot-0.99.13.tar.gz
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -r -u dovecot-0.99.11.orig/configure.in dovecot-0.99.11/configure.in
|
||||
--- dovecot-0.99.11.orig/configure.in 2004-09-04 05:20:19.000000000 -0400
|
||||
+++ dovecot-0.99.11/configure.in 2004-12-14 16:26:18.000000000 -0500
|
||||
diff -r -u dovecot-0.99.13.orig/configure.in dovecot-0.99.13/configure.in
|
||||
--- dovecot-0.99.13.orig/configure.in 2004-12-19 23:58:19.000000000 -0500
|
||||
+++ dovecot-0.99.13/configure.in 2005-01-06 18:17:36.000000000 -0500
|
||||
@@ -21,6 +21,13 @@
|
||||
# check posix headers
|
||||
AC_CHECK_HEADERS(sys/time.h)
|
||||
@ -15,14 +15,15 @@ diff -r -u dovecot-0.99.11.orig/configure.in dovecot-0.99.11/configure.in
|
||||
AC_ARG_ENABLE(ipv6,
|
||||
[ --enable-ipv6 Enable IPv6 support (default)],
|
||||
if test x$enableval = xno; then
|
||||
diff -u -r dovecot-0.99.11.orig/doc/Makefile.am dovecot-0.99.11/doc/Makefile.am
|
||||
--- dovecot-0.99.11.orig/doc/Makefile.am 2004-05-25 14:21:10.000000000 -0400
|
||||
+++ dovecot-0.99.11/doc/Makefile.am 2004-12-22 14:49:43.000000000 -0500
|
||||
@@ -1,19 +1,26 @@
|
||||
diff -r -u dovecot-0.99.13.orig/doc/Makefile.am dovecot-0.99.13/doc/Makefile.am
|
||||
--- dovecot-0.99.13.orig/doc/Makefile.am 2004-12-29 12:35:07.000000000 -0500
|
||||
+++ dovecot-0.99.13/doc/Makefile.am 2005-01-06 18:26:44.000000000 -0500
|
||||
@@ -1,20 +1,28 @@
|
||||
-docdir = $(datadir)/doc/dovecot
|
||||
+exampledir=$(docdir)/examples
|
||||
|
||||
-doc_DATA = \
|
||||
- USE-WIKI-INSTEAD \
|
||||
- auth.txt \
|
||||
- configuration.txt \
|
||||
- design.txt \
|
||||
@ -31,6 +32,7 @@ diff -u -r dovecot-0.99.11.orig/doc/Makefile.am dovecot-0.99.11/doc/Makefile.am
|
||||
- multiaccess.txt \
|
||||
- nfs.txt \
|
||||
+doc_DATA = \
|
||||
+ USE-WIKI-INSTEAD \
|
||||
+ auth.txt \
|
||||
+ configuration.txt \
|
||||
+ design.txt \
|
||||
@ -49,6 +51,7 @@ diff -u -r dovecot-0.99.11.orig/doc/Makefile.am dovecot-0.99.11/doc/Makefile.am
|
||||
+example_DATA = \
|
||||
+ ../dovecot-example.conf \
|
||||
+ mkcert.sh \
|
||||
+ dovecot-openssl.cnf \
|
||||
+ dovecot-ldap.conf \
|
||||
+ dovecot-mysql.conf \
|
||||
+ dovecot-pgsql.conf
|
||||
@ -60,9 +63,9 @@ diff -u -r dovecot-0.99.11.orig/doc/Makefile.am dovecot-0.99.11/doc/Makefile.am
|
||||
+ $(example_DATA) \
|
||||
+ $(ssl_DATA) \
|
||||
$(doc_DATA)
|
||||
diff -u -r dovecot-0.99.11.orig/Makefile.am dovecot-0.99.11/Makefile.am
|
||||
--- dovecot-0.99.11.orig/Makefile.am 2003-05-05 12:46:57.000000000 -0400
|
||||
+++ dovecot-0.99.11/Makefile.am 2004-12-21 16:29:26.000000000 -0500
|
||||
diff -r -u dovecot-0.99.13.orig/Makefile.am dovecot-0.99.13/Makefile.am
|
||||
--- dovecot-0.99.13.orig/Makefile.am 2003-05-05 12:46:57.000000000 -0400
|
||||
+++ dovecot-0.99.13/Makefile.am 2005-01-06 18:17:36.000000000 -0500
|
||||
@@ -1,11 +1,22 @@
|
||||
SUBDIRS = src doc
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -u dovecot-0.99.11/dovecot-example.conf dovecot-0.99.11/dovecot.conf
|
||||
--- dovecot-0.99.11/dovecot-example.conf 2004-08-28 08:26:10.000000000 -0400
|
||||
+++ dovecot-0.99.11/dovecot.conf 2004-12-21 17:18:01.000000000 -0500
|
||||
@@ -1,25 +1,19 @@
|
||||
diff -u dovecot-0.99.13/dovecot-example.conf dovecot-0.99.13/dovecot.conf
|
||||
--- dovecot-0.99.13/dovecot-example.conf 2004-12-29 13:00:24.000000000 -0500
|
||||
+++ dovecot-0.99.13/dovecot.conf 2005-01-07 13:17:53.000000000 -0500
|
||||
@@ -1,17 +1,11 @@
|
||||
## Dovecot 1.0 configuration file
|
||||
|
||||
-# Default values are shown after each value, it's not required to uncomment
|
||||
@ -20,16 +20,17 @@ diff -u dovecot-0.99.11/dovecot-example.conf dovecot-0.99.11/dovecot.conf
|
||||
|
||||
# IP or host address where to listen in for connections. It's not currently
|
||||
# possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
|
||||
# "[::]" listens in all IPv6 interfaces, but may also listen in all IPv4
|
||||
# interfaces depending on the operating system. You can specify ports with
|
||||
# "host:port".
|
||||
-#imap_listen = *
|
||||
-#pop3_listen = *
|
||||
+imap_listen = [::]
|
||||
+pop3_listen = [::]
|
||||
@@ -23,8 +17,8 @@
|
||||
|
||||
# IP or host address where to listen in for SSL connections. Defaults
|
||||
# to above non-SSL equilevants if not specified.
|
||||
-#imaps_listen =
|
||||
-#pop3s_listen =
|
||||
+imaps_listen = [::]
|
||||
+pop3s_listen = [::]
|
||||
|
||||
# Disable SSL/TLS support.
|
||||
#ssl_disable = no
|
||||
@@ -33,8 +27,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
|
||||
@ -50,25 +51,6 @@ diff -u dovecot-0.99.11/dovecot-example.conf dovecot-0.99.11/dovecot.conf
|
||||
|
||||
# chroot login process to the login_dir. Only reason not to do this is if you
|
||||
# wish to run the whole Dovecot without roots.
|
||||
@@ -305,7 +299,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
|
||||
@@ -431,8 +425,8 @@
|
||||
# vpopmail: vpopmail authentication
|
||||
# ldap <config path>: LDAP, see doc/dovecot-ldap.conf
|
||||
# pgsql <config path>: 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_executable = /usr/libexec/dovecot/dovecot-auth
|
||||
|
||||
|
||||
diff -u -r dovecot-0.99.11.orig/doc/mkcert.sh dovecot-0.99.11/doc/mkcert.sh
|
||||
--- dovecot-0.99.11.orig/doc/mkcert.sh 2004-07-22 20:04:37.000000000 -0400
|
||||
+++ dovecot-0.99.11/doc/mkcert.sh 2004-12-22 16:33:20.000000000 -0500
|
||||
|
||||
16
dovecot.spec
16
dovecot.spec
@ -1,7 +1,7 @@
|
||||
Summary: Dovecot Secure imap server
|
||||
Name: dovecot
|
||||
Version: 0.99.11
|
||||
Release: 10.devel
|
||||
Version: 0.99.13
|
||||
Release: 1.devel
|
||||
License: LGPL
|
||||
Group: System Environment/Daemons
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
@ -29,9 +29,9 @@ Prereq: openssl, /sbin/chkconfig, /usr/sbin/useradd
|
||||
|
||||
%define docdir %{_docdir}/%{name}-%{version}
|
||||
%define ssldir /usr/share/ssl
|
||||
%define restart_flag %{_tmppath}/%{name}-restart-after-rpm-install
|
||||
%define dovecot-uid 97
|
||||
%define dovecot-gid 97
|
||||
%define restart_flag /tmp/%{name}-restart-after-rpm-install
|
||||
%define dovecot_uid 97
|
||||
%define dovecot_gid 97
|
||||
|
||||
%description
|
||||
Dovecot is an IMAP server for Linux/UNIX-like systems, written with security
|
||||
@ -94,7 +94,7 @@ do
|
||||
done
|
||||
|
||||
%pre
|
||||
/usr/sbin/useradd -c "dovecot" -u %{dovecot-uid} -s /sbin/nologin -r -d /usr/libexec/dovecot dovecot 2>/dev/null || :
|
||||
/usr/sbin/useradd -c "dovecot" -u %{dovecot_uid} -s /sbin/nologin -r -d /usr/libexec/dovecot dovecot 2>/dev/null || :
|
||||
|
||||
# stop service during installation, keep flag if it was running to restart later
|
||||
rm -f %{restart_flag}
|
||||
@ -147,6 +147,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jan 6 2005 John Dennis <jdennis@redhat.com> 0.99.13-1.devel
|
||||
- bring up to date with latest upstream, 0.99.13, bug #143707
|
||||
also fix bug #14462, bad dovecot-uid macro name
|
||||
|
||||
* Thu Jan 6 2005 John Dennis <jdennis@redhat.com> 0.99.11-10.devel
|
||||
- fix bug #133618, removed LITERAL+ capability from capability string
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user