From 073ed5526a834fe7c71df89f30adc86f00e39afc Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 30 Mar 2009 14:35:23 +0000 Subject: [PATCH] update to 1.2.beta4 spec clean-up --- .cvsignore | 10 +-- dovecot-1.1-default-settings.patch | 18 ++--- dovecot-1.2-ldap.patch | 104 +++++++++++++++++++++++++++++ dovecot.spec | 43 +++++++----- sources | 10 +-- 5 files changed, 147 insertions(+), 38 deletions(-) create mode 100644 dovecot-1.2-ldap.patch diff --git a/.cvsignore b/.cvsignore index fbc0aaf..04cf367 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,8 +1,4 @@ -dovecot-1.1.11-managesieve-0.10.5.diff.gz -dovecot-1.1.11-managesieve-0.10.5.diff.gz.sig -dovecot-1.1.11.tar.gz -dovecot-1.1.11.tar.gz.sig -dovecot-1.1-managesieve-0.10.5.tar.gz -dovecot-1.1-managesieve-0.10.5.tar.gz.sig +dovecot-1.2-managesieve-0.11.3.tar.gz +dovecot-1.2.beta4.tar.gz +dovecot-1.2-managesieve-0.11.3.tar.gz dovecot-sieve-1.1.6.tar.gz -dovecot-sieve-1.1.6.tar.gz.sig diff --git a/dovecot-1.1-default-settings.patch b/dovecot-1.1-default-settings.patch index b150778..9de2697 100644 --- a/dovecot-1.1-default-settings.patch +++ b/dovecot-1.1-default-settings.patch @@ -1,6 +1,6 @@ -diff -up dovecot-1.1.8/dovecot-example.conf.default-settings dovecot-1.1.8/dovecot-example.conf ---- dovecot-1.1.8/dovecot-example.conf.default-settings 2009-01-13 19:34:30.390937820 +0100 -+++ dovecot-1.1.8/dovecot-example.conf 2009-01-13 19:37:00.217687707 +0100 +diff -up dovecot-1.2.beta4/dovecot-example.conf.default-settings dovecot-1.2.beta4/dovecot-example.conf +--- dovecot-1.2.beta4/dovecot-example.conf.default-settings 2009-03-30 15:56:26.941208108 +0200 ++++ dovecot-1.2.beta4/dovecot-example.conf 2009-03-30 15:56:26.969311839 +0200 @@ -10,17 +10,14 @@ # value inside quotes, eg.: key = "# char and trailing whitespace " @@ -48,7 +48,7 @@ diff -up dovecot-1.1.8/dovecot-example.conf.default-settings dovecot-1.1.8/dovec # If key file is password protected, give the password here. Alternatively # give it when starting dovecot with -p parameter. Since this file is often -@@ -452,7 +449,7 @@ +@@ -481,7 +478,7 @@ # locking methods as well. Some operating systems don't allow using some of # them simultaneously. #mbox_read_locks = fcntl @@ -57,9 +57,9 @@ diff -up dovecot-1.1.8/dovecot-example.conf.default-settings dovecot-1.1.8/dovec # Maximum time in seconds to wait for lock (all of them) before aborting. #mbox_lock_timeout = 300 -diff -up dovecot-1.1.8/src/master/master-settings.c.default-settings dovecot-1.1.8/src/master/master-settings.c ---- dovecot-1.1.8/src/master/master-settings.c.default-settings 2009-01-13 19:34:30.408937169 +0100 -+++ dovecot-1.1.8/src/master/master-settings.c 2009-01-13 19:34:30.419937312 +0100 +diff -up dovecot-1.2.beta4/src/master/master-settings.c.default-settings dovecot-1.2.beta4/src/master/master-settings.c +--- dovecot-1.2.beta4/src/master/master-settings.c.default-settings 2009-03-30 15:56:26.966311559 +0200 ++++ dovecot-1.2.beta4/src/master/master-settings.c 2009-03-30 15:57:10.994066535 +0200 @@ -178,8 +178,8 @@ struct settings default_settings = { MEMBER(syslog_facility) "mail", @@ -70,7 +70,7 @@ diff -up dovecot-1.1.8/src/master/master-settings.c.default-settings dovecot-1.1 + MEMBER(listen) "*, [::]", MEMBER(ssl_listen) "", - MEMBER(ssl_disable) FALSE, + MEMBER(ssl) "yes", @@ -191,7 +191,7 @@ struct settings default_settings = { MEMBER(ssl_cipher_list) "", MEMBER(ssl_cert_username_field) "commonName", @@ -80,7 +80,7 @@ diff -up dovecot-1.1.8/src/master/master-settings.c.default-settings dovecot-1.1 MEMBER(verbose_ssl) FALSE, MEMBER(shutdown_clients) TRUE, MEMBER(nfs_check) TRUE, -@@ -255,7 +255,7 @@ struct settings default_settings = { +@@ -254,7 +254,7 @@ struct settings default_settings = { MEMBER(maildir_copy_with_hardlinks) TRUE, MEMBER(maildir_copy_preserve_filename) FALSE, MEMBER(mbox_read_locks) "fcntl", diff --git a/dovecot-1.2-ldap.patch b/dovecot-1.2-ldap.patch new file mode 100644 index 0000000..53ff121 --- /dev/null +++ b/dovecot-1.2-ldap.patch @@ -0,0 +1,104 @@ +# HG changeset patch +# User Timo Sirainen +# Date 1238106996 14400 +# Node ID 643a96aec996a6da08e0c2850264872a4a98195d +# Parent 7c21256e35986a8f7ddcf843eeee44dd4a08d272 +Fixed --with-ldap=plugin and --with-gssapi=plugin + +--- a/src/auth/Makefile.am Thu Mar 26 18:17:09 2009 -0400 ++++ b/src/auth/Makefile.am Thu Mar 26 18:36:36 2009 -0400 +@@ -48,14 +48,6 @@ dovecot_auth_LDADD = \ + + ldap_sources = db-ldap.c passdb-ldap.c userdb-ldap.c + +-if ! LDAP_PLUGIN +-builtin_ldap_sources = $(ldap_sources) +-endif +- +-if ! GSSAPI_PLUGIN +-builtin_gssapi_sources = mech-gssapi.c +-endif +- + dovecot_auth_SOURCES = \ + auth.c \ + auth-cache.c \ +@@ -77,6 +69,7 @@ dovecot_auth_SOURCES = \ + mech-login.c \ + mech-cram-md5.c \ + mech-digest-md5.c \ ++ mech-gssapi.c \ + mech-ntlm.c \ + mech-otp.c \ + mech-skey.c \ +@@ -107,8 +100,7 @@ dovecot_auth_SOURCES = \ + userdb-static.c \ + userdb-vpopmail.c \ + userdb-sql.c \ +- $(builtin_gssapi_sources) \ +- $(builtin_ldap_sources) ++ $(ldap_sources) + + headers = \ + auth.h \ +@@ -144,14 +136,14 @@ if GSSAPI_PLUGIN + if GSSAPI_PLUGIN + libmech_gssapi_la_LDFLAGS = -module -avoid-version + libmech_gssapi_la_LIBADD = $(KRB5_LIBS) +-libmech_gssapi_la_CPPFLAGS = $(AM_CPPFLAGS) $(KRB5_CFLAGS) ++libmech_gssapi_la_CPPFLAGS = $(AM_CPPFLAGS) $(KRB5_CFLAGS) -DPLUGIN_BUILD + libmech_gssapi_la_SOURCES = mech-gssapi.c + endif + + if LDAP_PLUGIN + libauthdb_ldap_la_LDFLAGS = -module -avoid-version + libauthdb_ldap_la_LIBADD = $(LDAP_LIBS) +-libauthdb_ldap_la_CPPFLAGS = $(AM_CPPFLAGS) ++libauthdb_ldap_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_BUILD + libauthdb_ldap_la_SOURCES = $(ldap_sources) + endif + +--- a/src/auth/db-ldap.c Thu Mar 26 18:17:09 2009 -0400 ++++ b/src/auth/db-ldap.c Thu Mar 26 18:36:36 2009 -0400 +@@ -2,7 +2,7 @@ + + #include "common.h" + +-#if defined(PASSDB_LDAP) || defined(USERDB_LDAP) ++#if defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD) + + #include "network.h" + #include "ioloop.h" +--- a/src/auth/mech-gssapi.c Thu Mar 26 18:17:09 2009 -0400 ++++ b/src/auth/mech-gssapi.c Thu Mar 26 18:36:36 2009 -0400 +@@ -23,7 +23,7 @@ + + #include + +-#ifdef HAVE_GSSAPI ++#if defined(BUILTIN_GSSAPI) || defined(PLUGIN_BUILD) + + #ifndef HAVE___GSS_USEROK + # define USE_KRB5_USEROK +--- a/src/auth/passdb-ldap.c Thu Mar 26 18:17:09 2009 -0400 ++++ b/src/auth/passdb-ldap.c Thu Mar 26 18:36:36 2009 -0400 +@@ -3,7 +3,7 @@ + #include "common.h" + #include "passdb.h" + +-#ifdef PASSDB_LDAP ++#if defined(PASSDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD)) + + #include "ioloop.h" + #include "hash.h" +--- a/src/auth/userdb-ldap.c Thu Mar 26 18:17:09 2009 -0400 ++++ b/src/auth/userdb-ldap.c Thu Mar 26 18:36:36 2009 -0400 +@@ -3,7 +3,7 @@ + #include "common.h" + #include "userdb.h" + +-#ifdef USERDB_LDAP ++#if defined(USERDB_LDAP) && (defined(BUILTIN_LDAP) || defined(PLUGIN_BUILD)) + + #include "hash.h" + #include "str.h" + diff --git a/dovecot.spec b/dovecot.spec index 040d43e..8cdf1af 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -1,8 +1,9 @@ Summary: Dovecot Secure imap server Name: dovecot Epoch: 1 -Version: 1.1.11 -Release: 2%{?dist} +Version: 1.2 +%define betaver beta4 +Release: 0.%{betaver}.1%{?dist} License: MIT and LGPLv2 and BSD with advertising Group: System Environment/Daemons @@ -16,11 +17,11 @@ Group: System Environment/Daemons %define build_managesieve 1 %define sieve_version 1.1.6 %define sieve_name dovecot-sieve -%define managesieve_version 0.10.5 -%define managesieve_name dovecot-1.1-managesieve +%define managesieve_version 0.11.3 +%define managesieve_name dovecot-%{version}-managesieve URL: http://www.dovecot.org/ -Source: http://www.dovecot.org/releases/1.1/%{name}-%{version}.tar.gz +Source: http://www.dovecot.org/releases/1.2/%{name}-%{version}.%{betaver}.tar.gz Source1: dovecot.init Source2: dovecot.pam Source3: maildir-migration.txt @@ -30,22 +31,29 @@ Source6: perfect_maildir.pl Source7: dovecot-REDHAT-FAQ.txt Source8: http://dovecot.org/releases/sieve/%{sieve_name}-%{sieve_version}.tar.gz Source9: dovecot.sysconfig -Source10: http://www.rename-it.nl/dovecot/1.1/%{managesieve_name}-%{managesieve_version}.tar.gz -Source11: http://www.rename-it.nl/dovecot/1.1/dovecot-%{version}-managesieve-%{managesieve_version}.diff.gz -Patch0: dovecot-%{version}-managesieve-%{managesieve_version}.diff.gz +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 +Patch0: dovecot-%{version}.%{betaver}-managesieve-%{managesieve_version}.diff.gz + +# 3x Fedora specific Patch1: dovecot-1.1-default-settings.patch Patch2: dovecot-1.0.beta2-mkcert-permissions.patch -# local filesystem rules Patch3: dovecot-1.0.rc7-mkcert-paths.patch +# from upstream, for dovecot <= 1.2.beta4 +Patch4: dovecot-1.2-ldap.patch + Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, pam-devel, zlib-devel BuildRequires: libtool autoconf automake + # gettext-devel is needed for running autoconf because of the # presence of AM_ICONV BuildRequires: gettext-devel + # Explicit Runtime Requirements Requires: openssl >= 0.9.7f-4 + # Package includes an initscript service file, needs to require initscripts package Requires: initscripts Requires(pre): /usr/sbin/useradd @@ -161,23 +169,24 @@ This package provides the development files for dovecot. %prep -%setup -q +%setup -q -n %{name}-%{version}.%{betaver} %patch0 -p1 -b .managesieve %patch1 -p1 -b .default-settings %patch2 -p1 -b .mkcert-permissions %patch3 -p1 -b .mkcert-paths +%patch4 -p1 -b .ldap %if %{build_sieve} -%setup -q -D -T -a 8 +%setup -q -n %{name}-%{version}.%{betaver} -D -T -a 8 %endif %if %{build_managesieve} -%setup -q -D -T -a 10 +%setup -q -n %{name}-%{version}.%{betaver} -D -T -a 10 %endif %build -rm -f ./configure +rm -f ./"configure" autoreconf -i -f %configure \ INSTALL_DATA="install -c -p -m644" \ @@ -208,7 +217,7 @@ make %{?_smp_mflags} %if %{build_sieve} cd %{sieve_name}-%{sieve_version} -rm -f ./configure +rm -f ./"configure" autoreconf -i -f %configure \ INSTALL_DATA="install -c -p -m644" \ @@ -222,7 +231,7 @@ make %{?_smp_mflags} cd .. cd %{managesieve_name}-%{managesieve_version} -rm -f ./configure +rm -f ./"configure" autoreconf -i -f %configure \ INSTALL_DATA="install -c -p -m644" \ @@ -425,6 +434,10 @@ fi %changelog +* Mon Mar 30 2009 Michal Hlavinka - 1:1.2-0.beta4.1 +- spec clean-up +- updated to 1.2.beta4 + * Tue Feb 24 2009 Fedora Release Engineering - 1:1.1.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 57777d8..5b77fa4 100644 --- a/sources +++ b/sources @@ -1,8 +1,4 @@ -420aa314145670a1ea2d015a7d0cecb6 dovecot-1.1.11-managesieve-0.10.5.diff.gz -a0a51d389c796661f353402bd7697c08 dovecot-1.1.11-managesieve-0.10.5.diff.gz.sig -c973eb41aca79fb16630a16f0d84f765 dovecot-1.1.11.tar.gz -17e04c718ca043cbfa041eff13c5e770 dovecot-1.1.11.tar.gz.sig -972ad948be782b7cf37fc74bd17795e2 dovecot-1.1-managesieve-0.10.5.tar.gz -7e68d7212ce1904f80064c466a525150 dovecot-1.1-managesieve-0.10.5.tar.gz.sig +a651e2f12a17157d716eedc622032fdc dovecot-1.2-managesieve-0.11.3.tar.gz +9f2e1e0f0f18dbb3d31f255e61bbf722 dovecot-1.2.beta4.tar.gz +a651e2f12a17157d716eedc622032fdc dovecot-1.2-managesieve-0.11.3.tar.gz 7acf3d98974a515b868addbdb73054eb dovecot-sieve-1.1.6.tar.gz -a9c6b8b2eab4d6a72395ffde1fb53327 dovecot-sieve-1.1.6.tar.gz.sig