From 7d4504d6aee51a0b02a6e28d7af5547cbd6f006e Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 13 Jul 2009 14:33:17 +0000 Subject: [PATCH] update to 1.2.1 --- .cvsignore | 8 +++--- dovecot-1.1-default-settings.patch | 29 +++++++++---------- dovecot.spec | 45 +++++++++++++++++++----------- sources | 8 +++--- 4 files changed, 52 insertions(+), 38 deletions(-) diff --git a/.cvsignore b/.cvsignore index 73a8981..1dda5e8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -dovecot-1.2-managesieve-0.11.3.tar.gz -dovecot-1.2.rc2.tar.gz -dovecot-1.2.rc2-managesieve-0.11.3.diff.gz -dovecot-sieve-1.1.6.tar.gz +dovecot-1.2.1.tar.gz +dovecot-1.2-managesieve-0.11.7.tar.gz +dovecot-1.2.1-managesieve-0.11.7.diff.gz +dovecot-1.2-sieve-0.1.8.tar.gz diff --git a/dovecot-1.1-default-settings.patch b/dovecot-1.1-default-settings.patch index bb89dc8..674766b 100644 --- a/dovecot-1.1-default-settings.patch +++ b/dovecot-1.1-default-settings.patch @@ -1,14 +1,15 @@ -diff -up dovecot-1.2.rc2/dovecot-example.conf.default-settings dovecot-1.2.rc2/dovecot-example.conf ---- dovecot-1.2.rc2/dovecot-example.conf.default-settings 2009-04-06 10:45:53.519651253 +0200 -+++ dovecot-1.2.rc2/dovecot-example.conf 2009-04-06 10:45:53.525647967 +0200 -@@ -10,17 +10,14 @@ +diff -up dovecot-1.2.1/dovecot-example.conf.default-settings dovecot-1.2.1/dovecot-example.conf +--- dovecot-1.2.1/dovecot-example.conf.default-settings 2009-07-13 09:05:54.735890052 +0200 ++++ dovecot-1.2.1/dovecot-example.conf 2009-07-13 09:09:23.309020322 +0200 +@@ -10,18 +10,14 @@ # value inside quotes, eg.: key = "# char and trailing whitespace " # Default values are shown for each setting, it's not required to uncomment --# any of the lines. Exception to this are paths, they're just examples with --# the real defaults being based on configure options. The paths listed here --# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --# --with-ssldir=/etc/ssl +-# those. These are exceptions to this though: No sections (e.g. namespace {}) +-# or plugin settings are added by default, they're listed only as examples. +-# Paths are also just examples with the 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. @@ -21,7 +22,7 @@ diff -up dovecot-1.2.rc2/dovecot-example.conf.default-settings dovecot-1.2.rc2/d # A space separated list of IP or host addresses where to listen in for # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6 -@@ -42,13 +39,13 @@ +@@ -43,13 +39,13 @@ # listen = *:12000 # .. # } @@ -37,7 +38,7 @@ diff -up dovecot-1.2.rc2/dovecot-example.conf.default-settings dovecot-1.2.rc2/d # 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 -@@ -95,8 +92,8 @@ +@@ -96,8 +92,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 @@ -48,7 +49,7 @@ diff -up dovecot-1.2.rc2/dovecot-example.conf.default-settings dovecot-1.2.rc2/d # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. Since this file is often -@@ -485,7 +482,7 @@ +@@ -486,7 +482,7 @@ # locking methods as well. Some operating systems don't allow using some of # them simultaneously. #mbox_read_locks = fcntl @@ -57,9 +58,9 @@ diff -up dovecot-1.2.rc2/dovecot-example.conf.default-settings dovecot-1.2.rc2/d # Maximum time in seconds to wait for lock (all of them) before aborting. #mbox_lock_timeout = 300 -diff -up dovecot-1.2.rc2/src/master/master-settings.c.default-settings dovecot-1.2.rc2/src/master/master-settings.c ---- dovecot-1.2.rc2/src/master/master-settings.c.default-settings 2009-04-06 10:45:53.523648309 +0200 -+++ dovecot-1.2.rc2/src/master/master-settings.c 2009-04-06 10:48:05.630586332 +0200 +diff -up dovecot-1.2.1/src/master/master-settings.c.default-settings dovecot-1.2.1/src/master/master-settings.c +--- dovecot-1.2.1/src/master/master-settings.c.default-settings 2009-07-13 09:05:54.738890180 +0200 ++++ dovecot-1.2.1/src/master/master-settings.c 2009-07-13 09:05:54.742889890 +0200 @@ -178,8 +178,8 @@ struct settings default_settings = { MEMBER(syslog_facility) "mail", diff --git a/dovecot.spec b/dovecot.spec index aa97bed..03b9011 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -1,9 +1,8 @@ Summary: Secure imap and pop3 server Name: dovecot Epoch: 1 -Version: 1.2 -%define betaver rc3 -Release: 0.%{betaver}.1%{?dist} +Version: 1.2.1 +Release: 1%{?dist} License: MIT and LGPLv2 and BSD with advertising Group: System Environment/Daemons @@ -15,13 +14,14 @@ Group: System Environment/Daemons %define build_sieve 1 %define build_managesieve 1 -%define sieve_version 1.1.6 -%define sieve_name dovecot-sieve -%define managesieve_version 0.11.4 -%define managesieve_name dovecot-%{version}-managesieve +%define sieve_version 0.1.8 +%define sieve_name dovecot-1.2-sieve +%define managesieve_version 0.11.7 +#define managesieve_name dovecot-%{version}-managesieve +%define managesieve_name dovecot-1.2-managesieve URL: http://www.dovecot.org/ -Source: http://www.dovecot.org/releases/1.2/%{name}-%{version}.%{betaver}.tar.gz +Source: http://www.dovecot.org/releases/1.2/%{name}-%{version}.tar.gz Source1: dovecot.init Source2: dovecot.pam Source3: maildir-migration.txt @@ -29,10 +29,11 @@ Source4: migrate-folders Source5: migrate-users Source6: perfect_maildir.pl Source7: dovecot-REDHAT-FAQ.txt -Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_version}.tar.gz +#Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_version}.tar.gz +Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz Source9: dovecot.sysconfig Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz -Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{version}.%{betaver}-managesieve-%{managesieve_version}.diff.gz +Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-%{version}-managesieve-%{managesieve_version}.diff.gz # 3x Fedora specific Patch1: dovecot-1.1-default-settings.patch @@ -162,10 +163,8 @@ Group: Development/Libraries %description devel This package provides the development files for dovecot. - %prep - -%setup -q -n %{name}-%{version}.%{betaver} +%setup -q zcat %{SOURCE11} | patch -p1 --fuzz=0 -s %patch1 -p1 -b .default-settings @@ -173,11 +172,11 @@ zcat %{SOURCE11} | patch -p1 --fuzz=0 -s %patch3 -p1 -b .mkcert-paths %if %{build_sieve} -%setup -q -n %{name}-%{version}.%{betaver} -D -T -a 8 +%setup -q -D -T -a 8 %endif %if %{build_managesieve} -%setup -q -n %{name}-%{version}.%{betaver} -D -T -a 10 +%setup -q -D -T -a 10 %endif %build @@ -376,7 +375,14 @@ fi %if %{build_sieve} %files sieve %defattr(-,root,root,-) -%{_libdir}/%{name}/lda/lib90_cmusieve_plugin.so +#%{_libdir}/%{name}/lda/lib90_cmusieve_plugin.so +%{_bindir}/sieve-filter +%{_bindir}/sieve-test +%{_bindir}/sievec +%{_bindir}/sieved +%{_mandir}/man1/sieve-test.1.gz +%{_mandir}/man1/sievec.1.gz +%{_mandir}/man1/sieved.1.gz %endif %if %{build_managesieve} @@ -429,6 +435,13 @@ fi %changelog +* Mon Jul 13 2009 Michal Hlavinka - 1:1.2.1-1 +- updated to 1.2.1 +- GSSAPI authentication is fixed (#506782) +- logins now fail if home directory path is relative, because it was + not working correctly and never was expected to work +- sieve and managesieve update + * Mon Apr 20 2009 Michal Hlavinka - 1:1.2-0.rc3.1 - updated to 1.2.rc3 diff --git a/sources b/sources index 02427b9..8b64a88 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -66ce5ff7faff318a943a1b62b765c127 dovecot-1.2-managesieve-0.11.4.tar.gz -5ef845d0c137a6fd4cca8453073cd6b4 dovecot-1.2.rc3.tar.gz -50e849383089b4abb2718e8aa004f3be dovecot-1.2.rc3-managesieve-0.11.4.diff.gz -7acf3d98974a515b868addbdb73054eb dovecot-sieve-1.1.6.tar.gz +c269cfe38fc40061e232dd28e5fe3721 dovecot-1.2.1.tar.gz +61e84cf3749e3ec1ce1f41e918f1f0b0 dovecot-1.2-managesieve-0.11.7.tar.gz +a2b944bd9a477fd4c2bf65fe086369a6 dovecot-1.2.1-managesieve-0.11.7.diff.gz +364ca99ec75d7c149ed2f2de15debf8a dovecot-1.2-sieve-0.1.8.tar.gz