From 1ab9c39cc18e2c66989eca75c896d2564a9596d5 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jan 24 2014 20:39:43 +0000 Subject: import dovecot-2.2.10-4.el7.src.rpm --- diff --git a/.dovecot.metadata b/.dovecot.metadata index 7fed632..b6cab37 100644 --- a/.dovecot.metadata +++ b/.dovecot.metadata @@ -1,2 +1,2 @@ -12c976ec24a869d958f3b09c1a8803dda54fab86 SOURCES/dovecot-2.2.5.tar.gz -fb86e9f666df1b142b490b1cf22ac4bfe68ac051 SOURCES/dovecot-2.2-pigeonhole-0.4.1.tar.gz +80491d872838d27a6f2775561ba9163150c23a1c SOURCES/dovecot-2.2-pigeonhole-0.4.2.tar.gz +aa6264444096abf139bb4f4c504c01f6107ce740 SOURCES/dovecot-2.2.10.tar.gz diff --git a/SOURCES/dovecot-2.2.9-nodevrand.patch b/SOURCES/dovecot-2.2.9-nodevrand.patch new file mode 100644 index 0000000..4f91c00 --- /dev/null +++ b/SOURCES/dovecot-2.2.9-nodevrand.patch @@ -0,0 +1,41 @@ +diff -up dovecot-2.2.9/src/lib-master/master-service.c.fixit dovecot-2.2.9/src/lib-master/master-service.c +--- dovecot-2.2.9/src/lib-master/master-service.c.fixit 2013-11-24 14:37:39.000000000 +0100 ++++ dovecot-2.2.9/src/lib-master/master-service.c 2013-11-27 17:52:48.802843395 +0100 +@@ -559,6 +559,11 @@ const char *master_service_get_name(stru + return service->name; + } + ++const enum master_service_flags master_service_get_flags(struct master_service *service) ++{ ++ return service->flags; ++} ++ + void master_service_run(struct master_service *service, + master_service_connection_callback_t *callback) + { +diff -up dovecot-2.2.9/src/lib-master/master-service.h.fixit dovecot-2.2.9/src/lib-master/master-service.h +--- dovecot-2.2.9/src/lib-master/master-service.h.fixit 2013-11-24 14:37:39.000000000 +0100 ++++ dovecot-2.2.9/src/lib-master/master-service.h 2013-11-27 17:53:05.329705614 +0100 +@@ -134,6 +134,8 @@ const char *master_service_get_version_s + /* Returns name of the service, as given in name parameter to _init(). */ + const char *master_service_get_name(struct master_service *service); + ++const enum master_service_flags master_service_get_flags(struct master_service *service); ++ + /* Start the service. Blocks until finished */ + void master_service_run(struct master_service *service, + master_service_connection_callback_t *callback) +diff -up dovecot-2.2.9/src/ssl-params/main.c.fixit dovecot-2.2.9/src/ssl-params/main.c +--- dovecot-2.2.9/src/ssl-params/main.c.fixit 2013-11-24 14:37:39.000000000 +0100 ++++ dovecot-2.2.9/src/ssl-params/main.c 2013-11-27 17:51:06.664694558 +0100 +@@ -103,7 +103,10 @@ static void sig_chld(const siginfo_t *si + if (waitpid(-1, &status, WNOHANG) < 0) + i_error("waitpid() failed: %m"); + else if (status != 0) ++ { + i_error("child process failed with status %d", status); ++ if(master_service_get_flags(master_service) & MASTER_SERVICE_FLAG_STANDALONE) exit(1); ++ } + else { + /* params should have been created now. try refreshing. */ + ssl_params_refresh(param); diff --git a/SPECS/dovecot.spec b/SPECS/dovecot.spec index b7c6af1..6281c66 100644 --- a/SPECS/dovecot.spec +++ b/SPECS/dovecot.spec @@ -3,9 +3,9 @@ Summary: Secure imap and pop3 server Name: dovecot Epoch: 1 -Version: 2.2.5 +Version: 2.2.10 %global prever %{nil} -Release: 1%{?dist} +Release: 4%{?dist} #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2 License: MIT and LGPLv2 Group: System Environment/Daemons @@ -14,10 +14,10 @@ URL: http://www.dovecot.org/ Source: http://www.dovecot.org/releases/2.2/%{name}-%{version}%{?prever}.tar.gz Source1: dovecot.init Source2: dovecot.pam -%global pigeonholever 0.4.1 +%global pigeonholever 0.4.2 Source8: http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-%{pigeonholever}.tar.gz -#wget http://hg.rename-it.nl/dovecot-2.1-pigeonhole/archive/%{pigeonholever}.tar.bz2 -O dovecot-2.1-pigeonhole-%{pigeonholever}.tar.bz2 -#Source8: dovecot-2.1-pigeonhole-%{pigeonholever}.tar.bz2 +#wget http://hg.rename-it.nl/dovecot-2.2-pigeonhole/archive/%{pigeonholever}.tar.bz2 -O dovecot-2.2-pigeonhole-%{pigeonholever}.tar.bz2 +#Source8: dovecot-2.2-pigeonhole-%{pigeonholever}.tar.bz2 Source9: dovecot.sysconfig Source10: dovecot.tmpfilesd @@ -35,6 +35,10 @@ Patch5: dovecot-2.1-privatetmp.patch #wait for network Patch6: dovecot-2.1.10-waitonline.patch + +#workaround for chroot installation without /dev/random present, rhbz#1026790 +Patch7: dovecot-2.2.9-nodevrand.patch + Source15: prestartscript Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -124,6 +128,7 @@ This package provides the MySQL back end for dovecot-auth etc. %patch4 -p1 -b .reload %patch5 -p1 -b .privatetmp %patch6 -p1 -b .waitonline +%patch7 -p1 -b .nodevrand sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in %build @@ -191,9 +196,9 @@ mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} %{_builddir}/%{name}-%{version} pushd dovecot-2*2-pigeonhole-%{pigeonholever} make install DESTDIR=$RPM_BUILD_ROOT -mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT/%{_docdir}/%{name}-2.1-pigeonhole-%{pigeonholever} +mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT/%{_docdir}/%{name}-2.2-pigeonhole-%{pigeonholever} -install -m 644 AUTHORS ChangeLog COPYING COPYING.LGPL INSTALL NEWS README $RPM_BUILD_ROOT/%{_docdir}/%{name}-2.1-pigeonhole-%{pigeonholever} +install -m 644 AUTHORS ChangeLog COPYING COPYING.LGPL INSTALL NEWS README $RPM_BUILD_ROOT/%{_docdir}/%{name}-2.2-pigeonhole-%{pigeonholever} popd @@ -230,9 +235,9 @@ mkdir -p $RPM_BUILD_ROOT/var/run/dovecot/{login,empty} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d install -p -m 644 docinstall/example-config/dovecot.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot install -p -m 644 docinstall/example-config/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d -install -p -m 644 $RPM_BUILD_ROOT/%{_docdir}/%{name}-2.1-pigeonhole-%{pigeonholever}/example-config/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d +install -p -m 644 $RPM_BUILD_ROOT/%{_docdir}/%{name}-2.2-pigeonhole-%{pigeonholever}/example-config/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d install -p -m 644 docinstall/example-config/conf.d/*.conf.ext $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d -install -p -m 644 $RPM_BUILD_ROOT/%{_docdir}/%{name}-2.1-pigeonhole-%{pigeonholever}/example-config/conf.d/*.conf.ext $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d ||: +install -p -m 644 $RPM_BUILD_ROOT/%{_docdir}/%{name}-2.2-pigeonhole-%{pigeonholever}/example-config/conf.d/*.conf.ext $RPM_BUILD_ROOT%{_sysconfdir}/dovecot/conf.d ||: install -p -m 644 doc/dovecot-openssl.cnf $RPM_BUILD_ROOT%{ssldir}/dovecot-openssl.cnf install -p -m755 doc/mkcert.sh $RPM_BUILD_ROOT%{_libexecdir}/%{name}/mkcert.sh @@ -446,7 +451,7 @@ make check %config(noreplace) %{_sysconfdir}/dovecot/conf.d/90-sieve.conf %config(noreplace) %{_sysconfdir}/dovecot/conf.d/90-sieve-extprograms.conf -%{_docdir}/%{name}-2.1-pigeonhole-%{pigeonholever} +%{_docdir}/%{name}-2.2-pigeonhole-%{pigeonholever} %{_libexecdir}/%{name}/managesieve %{_libexecdir}/%{name}/managesieve-login @@ -475,6 +480,25 @@ make check %{_libdir}/%{name}/dict/libdriver_pgsql.so %changelog +* Fri Jan 24 2014 Daniel Mach - 1:2.2.10-4 +- Mass rebuild 2014-01-24 + +* Wed Jan 15 2014 Honza Horak - 1:2.2.10-3 +- Rebuild for mariadb-libs + Related: #1045013 + +* Wed Jan 08 2014 Michal Hlavinka - 1:2.2.10-2 +- fix pigeonhole docdir name + +* Fri Jan 03 2014 Michal Hlavinka - 1:2.2.10-1 +- dovecot updated to 2.2.10, pigeonhole updated to 0.4.2 + +* Fri Dec 27 2013 Daniel Mach - 1:2.2.5-3 +- Mass rebuild 2013-12-27 + +* Fri Dec 06 2013 Michal Hlavinka - 1:2.2.5-2 +- fix chroot installation hang (#1026790) + * Wed Aug 07 2013 Michal Hlavinka - 1:2.2.5-1 - dovecot updated to 2.2.5