Rebase on 1.0 beta7 (current upstream beta).
This commit is contained in:
prockai
parent
f93e9dc0c3
commit
bdb6f60b0d
@ -1,2 +1 @@
|
||||
dovecot-0.99.14.tar.gz
|
||||
dovecot-1.0.beta2.tar.gz
|
||||
dovecot-1.0.beta7.tar.gz
|
||||
|
||||
100
dovecot-1.0.beta7-default-settings.patch
Normal file
100
dovecot-1.0.beta7-default-settings.patch
Normal file
@ -0,0 +1,100 @@
|
||||
--- dovecot-1.0.beta7/src/master/master-settings.c.default-settings 2006-04-12 13:38:42.000000000 +0200
|
||||
+++ dovecot-1.0.beta7/src/master/master-settings.c 2006-05-04 12:48:08.000000000 +0200
|
||||
@@ -261,8 +261,8 @@
|
||||
MEMBER(syslog_facility) "mail",
|
||||
|
||||
/* general */
|
||||
- MEMBER(protocols) "imap imaps",
|
||||
- MEMBER(listen) "*",
|
||||
+ MEMBER(protocols) "imap imaps pop3 pop3s",
|
||||
+ MEMBER(listen) "[::]",
|
||||
MEMBER(ssl_listen) NULL,
|
||||
|
||||
MEMBER(ssl_disable) FALSE,
|
||||
@@ -273,7 +273,7 @@
|
||||
MEMBER(ssl_parameters_regenerate) 168,
|
||||
MEMBER(ssl_cipher_list) NULL,
|
||||
MEMBER(ssl_verify_client_cert) FALSE,
|
||||
- MEMBER(disable_plaintext_auth) TRUE,
|
||||
+ MEMBER(disable_plaintext_auth) FALSE,
|
||||
MEMBER(verbose_ssl) FALSE,
|
||||
MEMBER(shutdown_clients) TRUE,
|
||||
|
||||
@@ -326,7 +326,7 @@
|
||||
MEMBER(maildir_stat_dirs) FALSE,
|
||||
MEMBER(maildir_copy_with_hardlinks) FALSE,
|
||||
MEMBER(mbox_read_locks) "fcntl",
|
||||
- MEMBER(mbox_write_locks) "dotlock fcntl",
|
||||
+ MEMBER(mbox_write_locks) "fcntl",
|
||||
MEMBER(mbox_lock_timeout) 300,
|
||||
MEMBER(mbox_dotlock_change_timeout) 120,
|
||||
MEMBER(mbox_min_index_size) 0,
|
||||
--- dovecot-1.0.beta7/dovecot-example.conf.default-settings 2006-04-12 13:37:30.000000000 +0200
|
||||
+++ dovecot-1.0.beta7/dovecot-example.conf 2006-05-04 12:50:07.000000000 +0200
|
||||
@@ -7,17 +7,14 @@
|
||||
# value inside quotes, eg.: key = "# char and trailing whitespace "
|
||||
|
||||
# Default values are shown after each value, it's not required to uncomment
|
||||
-# 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
|
||||
+# any of the lines.
|
||||
|
||||
# Base directory where to store runtime data.
|
||||
#base_dir = /var/run/dovecot/
|
||||
|
||||
# Protocols we want to be serving:
|
||||
# imap imaps pop3 pop3s
|
||||
-#protocols = imap imaps
|
||||
+#protocols = imap imaps pop3 pop3s
|
||||
|
||||
# IP or host address where to listen in for connections. It's not currently
|
||||
# possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
|
||||
@@ -36,7 +33,7 @@
|
||||
# listen = *:10100
|
||||
# ..
|
||||
# }
|
||||
-#listen = *
|
||||
+#listen = [::]
|
||||
|
||||
# IP or host address where to listen in for SSL connections. Defaults
|
||||
# to above if not specified.
|
||||
@@ -49,8 +46,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 = /etc/pki/dovecot/certs/dovecot.pem
|
||||
+#ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
|
||||
|
||||
# If key file is password protected, give the password here. Alternatively
|
||||
# give it when starting dovecot with -p parameter.
|
||||
@@ -74,7 +71,7 @@
|
||||
# SSL/TLS is used (LOGINDISABLED capability). Note that 127.*.*.* and
|
||||
# IPv6 ::1 addresses are considered secure, this setting has no effect if
|
||||
# you connect from those addresses.
|
||||
-#disable_plaintext_auth = yes
|
||||
+#disable_plaintext_auth = no
|
||||
|
||||
# Should all IMAP and POP3 processes be killed when Dovecot master process
|
||||
# shuts down. Setting this to "no" means that Dovecot can be upgraded without
|
||||
@@ -371,7 +368,7 @@
|
||||
# locking methods as well. Some operating systems don't allow using some of
|
||||
# them simultaneously.
|
||||
#mbox_read_locks = fcntl
|
||||
-#mbox_write_locks = dotlock fcntl
|
||||
+#mbox_write_locks = fcntl
|
||||
|
||||
# Maximum time in seconds to wait for lock (all of them) before aborting.
|
||||
#mbox_lock_timeout = 300
|
||||
@@ -547,7 +544,7 @@
|
||||
# installations. %08Xu%08Xv will be the new default, so use it for new
|
||||
# installations.
|
||||
#
|
||||
- #pop3_uidl_format =
|
||||
+ #pop3_uidl_format = %08Xu%08Xv
|
||||
|
||||
# POP3 logout format string:
|
||||
# %t - number of TOP commands
|
||||
27
dovecot.spec
27
dovecot.spec
@ -1,15 +1,15 @@
|
||||
Summary: Dovecot Secure imap server
|
||||
Name: dovecot
|
||||
Version: 1.0
|
||||
Release: 0.beta2.8
|
||||
Release: 0.beta7.1
|
||||
License: LGPL
|
||||
Group: System Environment/Daemons
|
||||
|
||||
%define build_postgres 1
|
||||
%define build_mysql 1
|
||||
%define upstream 1.0.beta2
|
||||
%define upstream 1.0.beta7
|
||||
|
||||
Source: %{name}-1.0.beta2.tar.gz
|
||||
Source: %{name}-%{upstream}.tar.gz
|
||||
Source1: dovecot.init
|
||||
Source2: dovecot.pam
|
||||
Source3: maildir-migration.txt
|
||||
@ -17,12 +17,12 @@ Source4: migrate-folders
|
||||
Source5: migrate-users
|
||||
Source6: perfect_maildir.pl
|
||||
Source7: dovecot-REDHAT-FAQ.txt
|
||||
Patch100: dovecot-1.0.beta2-default-settings.patch
|
||||
Patch100: dovecot-1.0.beta7-default-settings.patch
|
||||
Patch101: dovecot-1.0.beta2-pam-tty.patch
|
||||
Patch102: dovecot-1.0.beta2-pam-setcred.patch
|
||||
Patch103: dovecot-1.0.beta2-mkcert-permissions.patch
|
||||
Patch104: dovecot-1.0.beta2-lib64.patch
|
||||
Patch105: dovecot-1.0.beta2-sqlite-check.patch
|
||||
#Patch105: dovecot-1.0.beta2-sqlite-check.patch
|
||||
|
||||
# XXX this patch needs review and forward porting
|
||||
#Patch105: dovecot-auth-log.patch
|
||||
@ -35,6 +35,9 @@ BuildRequires: openldap-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
# gettext-devel is needed for running autoconf because of the
|
||||
# presence of AM_ICONV
|
||||
BuildRequires: gettext-devel
|
||||
@ -63,18 +66,17 @@ in either of maildir or mbox formats.
|
||||
|
||||
%setup -q -n %{name}-%{upstream}
|
||||
|
||||
%patch100 -p2 -b .default-settings
|
||||
%patch100 -p1 -b .default-settings
|
||||
%patch101 -p2 -b .pam-tty
|
||||
%patch102 -p2 -b .pam-setcred
|
||||
%patch103 -p1 -b .mkcert-permissions
|
||||
%patch104 -p1 -b .lib64
|
||||
%patch105 -p1 -b .sqlite-check
|
||||
#%patch104 -p1 -b .lib64
|
||||
#%patch105 -p1 -b .sqlite-check
|
||||
|
||||
%build
|
||||
rm -f ./configure
|
||||
aclocal
|
||||
automake -a
|
||||
autoconf
|
||||
libtoolize -f
|
||||
autoreconf
|
||||
%configure \
|
||||
INSTALL_DATA="install -c -p -m644" \
|
||||
--with-doc \
|
||||
@ -210,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu May 04 2006 Petr Rockai <prockai@redhat.com> - 1.0-0.beta7.1
|
||||
- upgrade to latest upstream beta release
|
||||
|
||||
* Fri Mar 17 2006 Petr Rockai <prockai@redhat.com> - 1.0-0.beta2.8
|
||||
- fix sqlite detection in upstream configure checks, second part
|
||||
of #182240
|
||||
|
||||
Loading…
Reference in New Issue
Block a user