diff options
author | 2019-04-19 09:12:31 +0300 | |
---|---|---|
committer | 2019-04-19 09:12:31 +0300 | |
commit | 1ba3595677c18c85de07f29828ee4af7b0a51f5a (patch) | |
tree | 36f7a39e2e451492ac082d93be2e2562fb8d6111 /net-mail/dovecot/files | |
parent | net-mail/dovecot: remove vulnerable (diff) | |
download | gentoo-1ba3595677c18c85de07f29828ee4af7b0a51f5a.tar.gz gentoo-1ba3595677c18c85de07f29828ee4af7b0a51f5a.tar.bz2 gentoo-1ba3595677c18c85de07f29828ee4af7b0a51f5a.zip |
net-mail/dovecot: remove vulnerable
Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Eray Aslan <eras@gentoo.org>
Diffstat (limited to 'net-mail/dovecot/files')
-rw-r--r-- | net-mail/dovecot/files/dovecot-10-ssl.patch | 15 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot-glibc226.patch | 84 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot-glibc228.patch | 44 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot.init-r4 | 57 | ||||
-rw-r--r-- | net-mail/dovecot/files/dovecot.init-r5 | 57 |
5 files changed, 0 insertions, 257 deletions
diff --git a/net-mail/dovecot/files/dovecot-10-ssl.patch b/net-mail/dovecot/files/dovecot-10-ssl.patch deleted file mode 100644 index 8173bacc0bc5..000000000000 --- a/net-mail/dovecot/files/dovecot-10-ssl.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- doc/example-config/conf.d/10-ssl.conf 2014-12-08 07:58:21.000000000 +0000 -+++ doc/example-config/conf.d/10-ssl.conf 2014-12-08 08:02:19.000000000 +0000 -@@ -49,6 +49,12 @@ - #ssl_protocols = !SSLv2 - - # SSL ciphers to use -+# ############### -+# Added by Gentoo -+# You are encouraged to change the cipher list to -+#ssl_cipher_list = DEFAULT:!EXPORT:!LOW:!MEDIUM:!MD5 -+# if you are not required to support legacy mail clients. -+# ############### - #ssl_cipher_list = ALL:!LOW:!SSLv2:!EXP:!aNULL - - # Prefer the server's order of ciphers over client's. diff --git a/net-mail/dovecot/files/dovecot-glibc226.patch b/net-mail/dovecot/files/dovecot-glibc226.patch deleted file mode 100644 index adf1dd99aac8..000000000000 --- a/net-mail/dovecot/files/dovecot-glibc226.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 9a58361b08e1858e3bc7ea93934b7613261da476 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen <timo.sirainen@dovecot.fi> -Date: Mon, 9 Jul 2018 11:33:23 +0300 -Subject: [PATCH] m4: Enable rquota only if rpc/rpc.h exists - -It's been removed in glibc 2.26 ---- - m4/quota.m4 | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/m4/quota.m4 b/m4/quota.m4 -index 5840e3af89..0695b1e021 100644 ---- a/m4/quota.m4 -+++ b/m4/quota.m4 -@@ -7,8 +7,10 @@ AC_DEFUN([DOVECOT_RPCGEN], [ - - have_rquota=no - if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then -- AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes]) -- have_rquota=yes -+ AC_CHECK_HEADER([rpc/rpc.h], [ -+ AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes]) -+ have_rquota=yes -+ ]) - fi - AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes") - ]) -From 5803ae4bbd420def0072e1660ea7061c0e5dbcb9 Mon Sep 17 00:00:00 2001 -From: Timo Sirainen <timo.sirainen@dovecot.fi> -Date: Mon, 9 Jul 2018 11:39:59 +0300 -Subject: [PATCH] m4, quota: Support rquota using libtirpc - ---- - m4/quota.m4 | 13 ++++++++++--- - src/plugins/quota/Makefile.am | 3 ++- - 2 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/m4/quota.m4 b/m4/quota.m4 -index 0695b1e021..d75af447e1 100644 ---- a/m4/quota.m4 -+++ b/m4/quota.m4 -@@ -7,18 +7,25 @@ AC_DEFUN([DOVECOT_RPCGEN], [ - - have_rquota=no - if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then -- AC_CHECK_HEADER([rpc/rpc.h], [ -- AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes]) -+ PKG_CHECK_MODULES(LIBTIRPC, libtirpc, [ - have_rquota=yes -+ QUOTA_LIBS="$QUOTA_LIBS \$(LIBTIRPC_LIBS)" -+ ], [ -+ AC_CHECK_HEADER([rpc/rpc.h], [ -+ have_rquota=yes -+ ]) - ]) - fi -+ if test "$have_rquota" = yes; then -+ AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes]) -+ fi - AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes") - ]) - - AC_DEFUN([DOVECOT_QUOTA], [ - AC_SEARCH_LIBS(quota_open, quota, [ - AC_DEFINE(HAVE_QUOTA_OPEN,, [Define if you have quota_open()]) -- QUOTA_LIBS="-lquota" -+ QUOTA_LIBS="$QUOTA_LIBS -lquota" - ]) - AC_SUBST(QUOTA_LIBS) - ]) -diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am -index f220d4f075..ffebc67404 100644 ---- a/src/plugins/quota/Makefile.am -+++ b/src/plugins/quota/Makefile.am -@@ -19,7 +19,8 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src/lib-storage/index/imapc \ - -I$(top_srcdir)/src/lib-storage/index/maildir \ - -I$(top_srcdir)/src/lib-program-client \ -- -I$(top_srcdir)/src/doveadm -+ -I$(top_srcdir)/src/doveadm \ -+ $(LIBTIRPC_CFLAGS) - - NOPLUGIN_LDFLAGS = - lib10_doveadm_quota_plugin_la_LDFLAGS = -module -avoid-version diff --git a/net-mail/dovecot/files/dovecot-glibc228.patch b/net-mail/dovecot/files/dovecot-glibc228.patch deleted file mode 100644 index 9549c12f6e8f..000000000000 --- a/net-mail/dovecot/files/dovecot-glibc228.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 63a74b9e8e0604486a15a879e7f1a27257322400 Mon Sep 17 00:00:00 2001 -From: Aki Tuomi <aki.tuomi@dovecot.fi> -Date: Wed, 8 Aug 2018 12:33:20 +0300 -Subject: [PATCH] auth: mycrypt - include crypt.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes crypt usage on glibc-2.28 - -Reported by Reuben Farrelly -Patch provided by Thore Bödecker ---- - configure.ac | 2 +- - src/auth/mycrypt.c | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index dd545ebfdc..c5d8fae666 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -315,7 +315,7 @@ AC_CHECK_HEADERS(strings.h stdint.h unistd.h dirent.h malloc.h \ - quota.h sys/fs/quota_common.h \ - mntent.h sys/mnttab.h sys/event.h sys/time.h sys/mkdev.h linux/dqblk_xfs.h \ - xfs/xqm.h execinfo.h ucontext.h malloc_np.h sys/utsname.h sys/vmount.h \ -- sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h) -+ sys/utsname.h glob.h linux/falloc.h ucred.h sys/ucred.h crypt.h) - - CC_CLANG - AC_CC_PIE -diff --git a/src/auth/mycrypt.c b/src/auth/mycrypt.c -index c49fcf842e..0bd00bc238 100644 ---- a/src/auth/mycrypt.c -+++ b/src/auth/mycrypt.c -@@ -14,6 +14,9 @@ - # define _XPG6 /* Some Solaris versions require this, some break with this */ - #endif - #include <unistd.h> -+#ifdef HAVE_CRYPT_H -+# include <crypt.h> -+#endif - - #include "mycrypt.h" - diff --git a/net-mail/dovecot/files/dovecot.init-r4 b/net-mail/dovecot/files/dovecot.init-r4 deleted file mode 100644 index 665aa0dc7333..000000000000 --- a/net-mail/dovecot/files/dovecot.init-r4 +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -extra_started_commands="reload" - -depend() { - need localmount - before postfix - after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd - use logger net -} - -checkconfig() { - DOVECOT_INSTANCE=${SVCNAME##*.} - if [ -n "${DOVECOT_INSTANCE}" -a "${SVCNAME}" != "dovecot" ]; then - DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf - else - DOVECOT_CONF=/etc/dovecot/dovecot.conf - fi - if [ ! -e ${DOVECOT_CONF} ]; then - eerror "You will need an ${DOVECOT_CONF} first" - return 1 - fi - if [ -x /usr/sbin/dovecot ]; then - DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} -a | grep '^base_dir = ' | sed 's/^base_dir = //') - else - eerror "dovecot not executable" - return 1 - fi - DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/var/run/dovecot} - DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid -} - -start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}" - eend $? -} - -stop() { - checkconfig || return 1 - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" - eend $? -} - -reload() { - checkconfig || return 1 - ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes" - start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" - eend $? -} diff --git a/net-mail/dovecot/files/dovecot.init-r5 b/net-mail/dovecot/files/dovecot.init-r5 deleted file mode 100644 index 8a98603d4b42..000000000000 --- a/net-mail/dovecot/files/dovecot.init-r5 +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License, v2 or later - -extra_started_commands="reload" - -depend() { - need localmount - before postfix - after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd - use logger net -} - -checkconfig() { - DOVECOT_INSTANCE=${SVCNAME##*.} - if [ -n "${DOVECOT_INSTANCE}" -a "${SVCNAME}" != "dovecot" ]; then - DOVECOT_CONF=/etc/dovecot/dovecot.${DOVECOT_INSTANCE}.conf - else - DOVECOT_CONF=/etc/dovecot/dovecot.conf - fi - if [ ! -e ${DOVECOT_CONF} ]; then - eerror "You will need an ${DOVECOT_CONF} first" - return 1 - fi - if [ -x /usr/sbin/dovecot ]; then - DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} config -h base_dir) - else - eerror "dovecot not executable" - return 1 - fi - DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/run/dovecot} - DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid -} - -start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}" - eend $? -} - -stop() { - checkconfig || return 1 - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" - eend $? -} - -reload() { - checkconfig || return 1 - ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes" - start-stop-daemon --signal HUP --exec /usr/sbin/dovecot \ - --pidfile "${DOVECOT_PIDFILE}" - eend $? -} |