Compare commits
9 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
169630bee3 | ||
|
|
a9675fbe1f | ||
|
|
6f79cd1177 | ||
|
|
50f44b928d | ||
|
|
284ffb185e | ||
|
|
c00c8c80c5 | ||
|
|
20ffe20e20 | ||
|
|
436b86d7eb | ||
|
|
9b1e025997 |
5 changed files with 139 additions and 76 deletions
15
dovecot-2.3.11.3-ftbfs1.patch
Normal file
15
dovecot-2.3.11.3-ftbfs1.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c
|
||||
index cf05370035..0a030a2be0 100644
|
||||
--- a/src/auth/test-mech.c
|
||||
+++ b/src/auth/test-mech.c
|
||||
@@ -196,8 +196,8 @@ test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_
|
||||
{
|
||||
string_t *apop_challenge = t_str_new(128);
|
||||
|
||||
- str_printfa(apop_challenge,"<%lx.%u.%"PRIdTIME_T"", (unsigned long) getpid(),
|
||||
- connect_uid, process_start_time+10);
|
||||
+ str_printfa(apop_challenge,"<%lx.%lx.%"PRIxTIME_T".", (unsigned long)getpid(),
|
||||
+ (unsigned long)connect_uid, process_start_time+10);
|
||||
str_append_data(apop_challenge, "\0testuser\0responseoflen16-", 26);
|
||||
*len_r = apop_challenge->used;
|
||||
return apop_challenge->data;
|
||||
22
dovecot-2.3.11.3-ftbfs2.patch
Normal file
22
dovecot-2.3.11.3-ftbfs2.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/src/auth/test-mech.c b/src/auth/test-mech.c
|
||||
index 0a030a2be0..0a22ff46d0 100644
|
||||
--- a/src/auth/test-mech.c
|
||||
+++ b/src/auth/test-mech.c
|
||||
@@ -192,7 +192,7 @@ static void test_mech_handle_challenge(struct auth_request *request,
|
||||
}
|
||||
|
||||
static inline const unsigned char *
|
||||
-test_mech_construct_apop_challenge(unsigned int connect_uid, unsigned long *len_r)
|
||||
+test_mech_construct_apop_challenge(unsigned int connect_uid, size_t *len_r)
|
||||
{
|
||||
string_t *apop_challenge = t_str_new(128);
|
||||
|
||||
@@ -323,7 +323,7 @@ static void test_mechs(void)
|
||||
struct test_case *test_case = &tests[running_test];
|
||||
const struct mech_module *mech = test_case->mech;
|
||||
struct auth_request *request;
|
||||
- const char *testname = t_strdup_printf("auth mech %s %d/%lu",
|
||||
+ const char *testname = t_strdup_printf("auth mech %s %d/%zu",
|
||||
mech->mech_name,
|
||||
running_test+1,
|
||||
N_ELEMENTS(tests));
|
||||
13
dovecot-2.3.11.3-gssapi.patch
Normal file
13
dovecot-2.3.11.3-gssapi.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/auth/mech-gssapi.c b/src/auth/mech-gssapi.c
|
||||
index f29e48da88..966273d388 100644
|
||||
--- a/src/auth/mech-gssapi.c
|
||||
+++ b/src/auth/mech-gssapi.c
|
||||
@@ -735,7 +735,7 @@ mech_gssapi_auth_free(struct auth_request *request)
|
||||
const struct mech_module mech_gssapi = {
|
||||
"GSSAPI",
|
||||
|
||||
- .flags = 0,
|
||||
+ .flags = MECH_SEC_ALLOW_NULS,
|
||||
.passdb_need = MECH_PASSDB_NEED_NOTHING,
|
||||
|
||||
mech_gssapi_auth_new,
|
||||
161
dovecot.spec
161
dovecot.spec
|
|
@ -3,9 +3,9 @@
|
|||
Summary: Secure imap and pop3 server
|
||||
Name: dovecot
|
||||
Epoch: 1
|
||||
Version: 2.3.6
|
||||
Version: 2.3.11.3
|
||||
%global prever %{nil}
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
#dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
|
||||
License: MIT and LGPLv2
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ URL: http://www.dovecot.org/
|
|||
Source: http://www.dovecot.org/releases/2.3/%{name}-%{version}%{?prever}.tar.gz
|
||||
Source1: dovecot.init
|
||||
Source2: dovecot.pam
|
||||
%global pigeonholever 0.5.6
|
||||
%global pigeonholever 0.5.11
|
||||
Source8: http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-%{pigeonholever}.tar.gz
|
||||
Source9: dovecot.sysconfig
|
||||
Source10: dovecot.tmpfilesd
|
||||
|
|
@ -32,6 +32,9 @@ Patch6: dovecot-2.1.10-waitonline.patch
|
|||
Patch8: dovecot-2.2.20-initbysystemd.patch
|
||||
Patch9: dovecot-2.2.22-systemd_w_protectsystem.patch
|
||||
Patch10: dovecot-2.3.0.1-libxcrypt.patch
|
||||
Patch12: dovecot-2.3.11.3-ftbfs1.patch
|
||||
Patch13: dovecot-2.3.11.3-ftbfs2.patch
|
||||
Patch14: dovecot-2.3.11.3-gssapi.patch
|
||||
|
||||
Source15: prestartscript
|
||||
|
||||
|
|
@ -39,18 +42,16 @@ BuildRequires: gcc, gcc-c++, openssl-devel, pam-devel, zlib-devel, bzip2-devel,
|
|||
BuildRequires: libtool, autoconf, automake, pkgconfig
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: libpq-devel
|
||||
%if %{?fedora}0 < 280
|
||||
BuildRequires: mysql-devel
|
||||
BuildRequires: tcp_wrappers-devel
|
||||
%else
|
||||
BuildRequires: mariadb-connector-c-devel
|
||||
BuildRequires: libxcrypt-devel
|
||||
%endif
|
||||
BuildRequires: openldap-devel
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: quota-devel
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: lz4-devel
|
||||
BuildRequires: libsodium-devel
|
||||
BuildRequires: libexttextcat-devel
|
||||
BuildRequires: libstemmer-devel
|
||||
|
||||
# gettext-devel is needed for running autoconf because of the
|
||||
# presence of AM_ICONV
|
||||
|
|
@ -61,31 +62,16 @@ Requires: openssl >= 0.9.7f-4
|
|||
|
||||
# Package includes an initscript service file, needs to require initscripts package
|
||||
Requires(pre): shadow-utils
|
||||
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
|
||||
Requires: systemd
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
%else
|
||||
Requires: initscripts
|
||||
Requires(post): chkconfig
|
||||
Requires(preun): chkconfig initscripts
|
||||
Requires(postun): initscripts
|
||||
%endif
|
||||
|
||||
%if %{?fedora}0 > 150 || %{?rhel}0 >60
|
||||
#clucene in fedora <=15 and rhel<=6 is too old
|
||||
BuildRequires: clucene-core-devel
|
||||
%endif
|
||||
|
||||
%global ssldir %{_sysconfdir}/pki/%{name}
|
||||
|
||||
%if %{?fedora}00%{?rhel} < 6
|
||||
%global _initddir %{_initrddir}
|
||||
BuildRequires: curl-devel expat-devel
|
||||
%else
|
||||
BuildRequires: libcurl-devel expat-devel
|
||||
%endif
|
||||
|
||||
%global restart_flag /run/%{name}/%{name}-restart-after-rpm-install
|
||||
|
||||
|
|
@ -131,21 +117,24 @@ This package provides the development files for dovecot.
|
|||
%patch8 -p1 -b .initbysystemd
|
||||
%patch9 -p1 -b .systemd_w_protectsystem
|
||||
#%patch10 -p1 -b .libxcrypt
|
||||
%patch12 -p1 -b .ftbfs1
|
||||
%patch13 -p1 -b .ftbfs2
|
||||
%patch14 -p1 -b .gssapi
|
||||
|
||||
#pushd dovecot-2*3-pigeonhole-%{pigeonholever}
|
||||
#popd
|
||||
sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
|
||||
|
||||
%build
|
||||
# This package references hidden symbols during an LTO link. This needs further
|
||||
# investigation. Until then, disable LTO
|
||||
%define _lto_cflags %{nil}
|
||||
#required for fdpass.c line 125,190: dereferencing type-punned pointer will break strict-aliasing rules
|
||||
%global _hardened_build 1
|
||||
export CFLAGS="%{__global_cflags} -fno-strict-aliasing -fstack-reuse=none"
|
||||
export LDFLAGS="-Wl,-z,now -Wl,-z,relro %{?__global_ldflags}"
|
||||
# el6 autoconf too old to regen; use packaged files (#1082384)
|
||||
%if %{?fedora}00%{?rhel} > 6
|
||||
mkdir -p m4
|
||||
autoreconf -I . -fiv #required for aarch64 support
|
||||
%endif
|
||||
%configure \
|
||||
INSTALL_DATA="install -c -p -m644" \
|
||||
--docdir=%{_docdir}/%{name} \
|
||||
|
|
@ -162,18 +151,11 @@ autoreconf -I . -fiv #required for aarch64 support
|
|||
--with-sqlite \
|
||||
--with-zlib \
|
||||
--with-libcap \
|
||||
%if %{?fedora}0 < 280
|
||||
--with-libwrap \
|
||||
%endif
|
||||
%if %{?fedora}0 > 150 || %{?rhel}0 >60
|
||||
--with-lucene \
|
||||
%endif
|
||||
--with-ssl=openssl \
|
||||
--with-ssldir=%{ssldir} \
|
||||
--with-solr \
|
||||
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
%endif
|
||||
--with-docs
|
||||
|
||||
sed -i 's|/etc/ssl|/etc/pki/dovecot|' doc/mkcert.sh doc/example-config/conf.d/10-ssl.conf
|
||||
|
|
@ -213,11 +195,6 @@ mv $RPM_BUILD_ROOT/%{_docdir}/%{name} $RPM_BUILD_ROOT/%{_docdir}/%{name}-pigeonh
|
|||
install -m 644 AUTHORS ChangeLog COPYING COPYING.LGPL INSTALL NEWS README $RPM_BUILD_ROOT/%{_docdir}/%{name}-pigeonhole
|
||||
popd
|
||||
|
||||
|
||||
%if %{?fedora}00%{?rhel} < 6
|
||||
sed -i 's|password-auth|system-auth|' %{SOURCE2}
|
||||
%endif
|
||||
|
||||
install -p -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/dovecot
|
||||
|
||||
#install man pages
|
||||
|
|
@ -234,12 +211,7 @@ chmod 600 $RPM_BUILD_ROOT%{ssldir}/certs/dovecot.pem
|
|||
touch $RPM_BUILD_ROOT%{ssldir}/private/dovecot.pem
|
||||
chmod 600 $RPM_BUILD_ROOT%{ssldir}/private/dovecot.pem
|
||||
|
||||
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
|
||||
install -p -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_tmpfilesdir}/dovecot.conf
|
||||
%else
|
||||
install -p -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/dovecot
|
||||
install -p -D -m 600 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/dovecot
|
||||
%endif
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/run/dovecot/{login,empty,token-login}
|
||||
|
||||
|
|
@ -279,54 +251,34 @@ useradd -r -g dovenull -d /usr/libexec/dovecot -s /sbin/nologin -c "Dovecot's un
|
|||
# do not let dovecot run during upgrade rhbz#134325
|
||||
if [ "$1" = "2" ]; then
|
||||
rm -f %restart_flag
|
||||
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
|
||||
/bin/systemctl is-active %{name}.service >/dev/null 2>&1 && touch %restart_flag ||:
|
||||
/bin/systemctl stop %{name}.service >/dev/null 2>&1
|
||||
%else
|
||||
/sbin/service %{name} status >/dev/null 2>&1 && touch %restart_flag ||:
|
||||
/sbin/service %{name} stop >/dev/null 2>&1
|
||||
%endif
|
||||
fi
|
||||
|
||||
%post
|
||||
if [ $1 -eq 1 ]
|
||||
then
|
||||
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
|
||||
%systemd_post dovecot.service
|
||||
%else
|
||||
/sbin/chkconfig --add %{name}
|
||||
%endif
|
||||
fi
|
||||
|
||||
install -d -m 0755 -g dovecot -d /run/dovecot
|
||||
install -d -m 0755 -d /run/dovecot/empty
|
||||
install -d -m 0750 -g dovenull -d /run/dovecot/login
|
||||
install -d -m 0755 -g dovenull -d /run/dovecot/token-login
|
||||
install -d -m 0750 -g dovenull -d /run/dovecot/token-login
|
||||
[ -x /sbin/restorecon ] && /sbin/restorecon -R /run/dovecot
|
||||
|
||||
%preun
|
||||
if [ $1 = 0 ]; then
|
||||
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
|
||||
/bin/systemctl disable dovecot.service dovecot.socket >/dev/null 2>&1 || :
|
||||
/bin/systemctl stop dovecot.service dovecot.socket >/dev/null 2>&1 || :
|
||||
%else
|
||||
/sbin/service %{name} stop > /dev/null 2>&1
|
||||
/sbin/chkconfig --del %{name}
|
||||
%endif
|
||||
rm -rf /run/dovecot
|
||||
fi
|
||||
|
||||
%postun
|
||||
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
|
||||
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
%endif
|
||||
|
||||
if [ "$1" -ge "1" -a -e %restart_flag ]; then
|
||||
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
|
||||
/bin/systemctl start dovecot.service >/dev/null 2>&1 || :
|
||||
%else
|
||||
/sbin/service %{name} start >/dev/null 2>&1 || :
|
||||
%endif
|
||||
rm -f %restart_flag
|
||||
fi
|
||||
|
||||
|
|
@ -334,11 +286,7 @@ fi
|
|||
# dovecot should be started again in %%postun, but it's not executed on reinstall
|
||||
# if it was already started, restart_flag won't be here, so it's ok to test it again
|
||||
if [ -e %restart_flag ]; then
|
||||
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
|
||||
/bin/systemctl start dovecot.service >/dev/null 2>&1 || :
|
||||
%else
|
||||
/sbin/service %{name} start >/dev/null 2>&1 || :
|
||||
%endif
|
||||
rm -f %restart_flag
|
||||
fi
|
||||
|
||||
|
|
@ -354,17 +302,13 @@ make check
|
|||
%{_bindir}/doveadm
|
||||
%{_bindir}/doveconf
|
||||
%{_bindir}/dsync
|
||||
%{_bindir}/dovecot-sysreport
|
||||
|
||||
|
||||
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
|
||||
%_tmpfilesdir/dovecot.conf
|
||||
%{_unitdir}/dovecot.service
|
||||
%{_unitdir}/dovecot-init.service
|
||||
%{_unitdir}/dovecot.socket
|
||||
%else
|
||||
%{_initddir}/dovecot
|
||||
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/dovecot
|
||||
%endif
|
||||
|
||||
%dir %{_sysconfdir}/dovecot
|
||||
%dir %{_sysconfdir}/dovecot/conf.d
|
||||
|
|
@ -436,7 +380,11 @@ make check
|
|||
%{_libexecdir}/%{name}
|
||||
%exclude %{_libexecdir}/%{name}/managesieve*
|
||||
|
||||
%ghost /run/dovecot
|
||||
%dir %attr(0755,root,dovecot) %ghost /run/dovecot
|
||||
%attr(0750,root,dovenull) %ghost /run/dovecot/login
|
||||
%attr(0750,root,dovenull) %ghost /run/dovecot/token-login
|
||||
%attr(0755,root,root) %ghost /run/dovecot/empty
|
||||
|
||||
%attr(0750,dovecot,dovecot) /var/lib/dovecot
|
||||
|
||||
%{_datadir}/%{name}
|
||||
|
|
@ -493,6 +441,71 @@ make check
|
|||
%{_libdir}/%{name}/dict/libdriver_pgsql.so
|
||||
|
||||
%changelog
|
||||
* Wed Sep 02 2020 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.11.3-5
|
||||
- fix gssapi issue
|
||||
|
||||
* Wed Aug 26 2020 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.11.3-4
|
||||
- fix FTBFS on 32bit systems
|
||||
|
||||
* Mon Aug 17 2020 Jeff Law <law@redhat.com> - 1:2.3.11.3-2
|
||||
- Disable LTO
|
||||
|
||||
* Sat Aug 15 2020 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.11.3-1
|
||||
- CVE-2020-12100: Parsing mails with a large number of MIME parts could
|
||||
have resulted in excessive CPU usage or a crash due to running out of
|
||||
stack memory.
|
||||
- CVE-2020-12673: Dovecot's NTLM implementation does not correctly check
|
||||
message buffer size, which leads to reading past allocation which can
|
||||
lead to crash.
|
||||
- CVE-2020-10967: lmtp/submission: Issuing the RCPT command with an
|
||||
address that has the empty quoted string as local-part causes the lmtp
|
||||
service to crash.
|
||||
- CVE-2020-12674: Dovecot's RPA mechanism implementation accepts
|
||||
zero-length message, which leads to assert-crash later on.
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.10.1-3
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.10.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon May 18 2020 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.10.1-1
|
||||
- dovecot updated to 2.3.10.1
|
||||
- fixes CVE-2020-10967, CVE-2020-10958, CVE-2020-10957
|
||||
|
||||
* Tue Apr 21 2020 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.10-1
|
||||
- dovecot updated to 2.3.10, pigeonhole updated to 0.5.10
|
||||
|
||||
* Wed Feb 12 2020 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.9.3-1
|
||||
- dovecot updated to 2.3.9.3
|
||||
- fixes CVE-2020-7046: Truncated UTF-8 can be used to DoS
|
||||
submission-login and lmtp processes.
|
||||
- fixes CVE-2020-7957: Specially crafted mail can crash snippet generation.
|
||||
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.9.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Dec 19 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.9.2-1
|
||||
- CVE-2019-19722: Mails with group addresses in From or To fields
|
||||
caused crash in push notification drivers.
|
||||
|
||||
* Wed Dec 04 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.9-1
|
||||
- dovecot updated to 2.3.9, pigeonhole updated to 0.5.9
|
||||
|
||||
* Thu Oct 10 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.8-1
|
||||
- dovecot updated to 2.3.8, pigeonhole 0.5.8
|
||||
|
||||
* Thu Aug 29 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.7.2-1
|
||||
- dovecot updated to 2.3.7.2, pigeonhole 0.5.7.2
|
||||
- fixes CVE-2019-11500: IMAP protocol parser does not properly handle NUL byte
|
||||
when scanning data in quoted strings, leading to out of bounds heap
|
||||
memory writes
|
||||
|
||||
* Mon Aug 19 2019 Michal Hlavinka <mhlavink@redhat.com> - 1:1-2.3.7.1
|
||||
- dovecot updated to 2.3.7.1, pigeonhole updated to 0.5.7.1
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.6-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (dovecot-2.3.6.tar.gz) = ec28af2efcbd4ab534298c3342709251074dcdb0f0f4bcad0d24b996b273387e2ce557d7ab54abafb69be3ed7dd61f25c82b9710d78156932e2eff7f941c9eb2
|
||||
SHA512 (dovecot-2.3-pigeonhole-0.5.6.tar.gz) = 998a046d2eb5ff7bba615fd1a3efdfb1e7e1dabf191257f7fa2882074acc1735a0a4c11c5f31bab1e964b0118f1a8e9e51b3d5529b8fff6d1312c9a8257d9c20
|
||||
SHA512 (dovecot-2.3.11.3.tar.gz) = d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb
|
||||
SHA512 (dovecot-2.3-pigeonhole-0.5.11.tar.gz) = 793d93edc50192c52654e2f7244d3e01aaa4e69f786e3ecfcd658a4ab26a5099cc5319cb93221150db4ce94bc4515ffb38115b1d0eeb6e052b956efec680b33d
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue