gentoo resync : 25.12.2017

4 files changed, 71 insertions, 2 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 5d663dacfa6b..090902fb7215 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 01f3f0867153..738784ebeff1 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,4 +1,5 @@
+AUX ksmtp-17.12.0-correct-hostname.patch 1799 BLAKE2B 0f5965312cf307809d7aef4579156245888dce5a3a6a30e08aa010b460fdca1952e8f29c22b7411f444fad2fdd578db0ef61ff564f750d3b7c497c9b98b70e0b SHA512 e5ac06c9b1f5e98a5fd6910cf0c38561436ff555778ccebde69bf0a648057fa2f164b30443b9099cd47dd09fc9619a8abe2b16b0fa85aff4adb3fd0bfe619314
 AUX ksmtp-17.12.0-ehlo-auth-fix.patch 3283 BLAKE2B 69e1cc31cb31829aca1b24650c8c42e3bf548ecac529f5f12ed0503b17347f515418f108ad029def7d81da51129e5743033ce713466233c7e0f8772c69b6b8a7 SHA512 f7082efb07a3cbcdbe32d1d8a2acad148eb34a66a874b3b9916f51fae048133602f1bd29ba93aec27f6710e4517c4353415d316a719829971851b409bc2edae7
 DIST ksmtp-17.12.0.tar.xz 38132 BLAKE2B 8a78e06c02ef2b21c23d3251c3e6b92eeae7d578bbdc34ccd0837f73898efb8e8f3aa4123ccf7892d2e27292128ad74572c8c7d173ce534e9795c8b4e338c297 SHA512 d42dd363086d5d9beec7e759aa7234f33c0c62fab5ae0f2f2e78cc81c9bb053729cde31ad6243e9d46e77d937cec8e7694cded4ce726e8a6583ca9be97ad43eb
-EBUILD ksmtp-17.12.0-r1.ebuild 513 BLAKE2B 7214e635ee4f1fc09919b21ae5d18216e70dd870832c68ff8ee987c60077633286fb13b8116f16be0d95a50ec4d868f52c6ab141f0344ae600da6264de98b651 SHA512 bcb5c15d165b736bb9b71a45d5937b36183492580fc9d7acf3b9654c22a3b96a2dfa2ddca049301d6fe27aba378772e5334f0b028e7700bf0b82145c810aca49
+EBUILD ksmtp-17.12.0-r2.ebuild 557 BLAKE2B 4d086d7624ec40df1a8a7844b6fa5e4edfae5c6cb1f19d3321b9ac02ff5595a5ab5d99920fa7cad4528f106a90a1bc3a24354543461616760f405e2eb4548cc7 SHA512 451af9eba91a3072212a2e80bc65ebec7a320f108ae22b2c8a9e974fdd25c0f6ca45898d50dab134dde46573e2a0fd702abbe28be24dbf60ac028f48d301c0e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/files/ksmtp-17.12.0-correct-hostname.patch b/kde-apps/ksmtp/files/ksmtp-17.12.0-correct-hostname.patch
new file mode 100644
index 000000000000..8860c59ebfde
--- /dev/null
+++ b/kde-apps/ksmtp/files/ksmtp-17.12.0-correct-hostname.patch
@@ -0,0 +1,65 @@
+From 5199ed07428a03f1aa340da3ae99fcfa62ba2751 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Fri, 22 Dec 2017 22:32:49 +0100
+Subject: Send the correct hostname with the HELO/EHLO command
+
+Summary:
+It sent the server's hostname previously, which some reject.
+
+BUG: 387926
+
+Test Plan: Ran nc as smtp server, uses the right hostname for EHLO now.
+
+Reviewers: mlaurent, dvratil
+
+Subscribers: #kde_pim
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D9485
+---
+ src/session.cpp | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/session.cpp b/src/session.cpp
+index 4320adc..0be26a9 100644
+--- a/src/session.cpp
++++ b/src/session.cpp
+@@ -27,6 +27,7 @@
+ #include "ksmtp_debug.h"
+ 
+ #include <QHostAddress>
++#include <QHostInfo>
+ #include <QUrl>
+ #include <QEventLoop>
+ #include <QPointer>
+@@ -82,6 +83,18 @@ void SessionPrivate::setAuthenticationMethods(const QList<QByteArray> &authMetho
+ 
+ void SessionPrivate::startHandshake()
+ {
++    QString hostname = m_customHostname;
++
++    if (hostname.isEmpty()) {
++        // FIXME: QHostInfo::fromName can get a FQDN, but does a DNS lookup
++        hostname = QHostInfo::localHostName();
++        if (hostname.isEmpty()) {
++            hostname = QStringLiteral("localhost.invalid");
++        } else if (!hostname.contains(QLatin1Char('.'))) {
++            hostname += QStringLiteral(".localnet");
++        }
++    }
++
+     QByteArray cmd;
+     if (!m_ehloRejected) {
+          cmd = "EHLO ";
+@@ -89,7 +102,6 @@ void SessionPrivate::startHandshake()
+          cmd = "HELO ";
+     }
+     setState(Session::Handshake);
+-    const auto hostname = m_customHostname.isEmpty() ? m_thread->hostName() : m_customHostname;
+     sendData(cmd + QUrl::toAce(hostname));
+ }
+ 
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/ksmtp/ksmtp-17.12.0-r1.ebuild b/kde-apps/ksmtp/ksmtp-17.12.0-r2.ebuild
index b9a34c04f0e7..42d615782b26 100644
--- a/kde-apps/ksmtp/ksmtp-17.12.0-r1.ebuild
+++ b/kde-apps/ksmtp/ksmtp-17.12.0-r2.ebuild
@@ -21,4 +21,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-ehlo-auth-fix.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-ehlo-auth-fix.patch"
+	"${FILESDIR}/${P}-correct-hostname.patch"
+)