gentoo resync : 13.01.2018

4 files changed, 2 insertions, 182 deletions

diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 7251216f5b4c..e4cfeb1d147f 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,3 @@
-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-r2.ebuild 589 BLAKE2B afc09e57d5e74c5a24444096fb012758e30dcc2709af14664da92320f4070619ef565fd8bbe00d8716bafe0fdc0b160451279b8059b34ac83fc55f2c16b10120 SHA512 3398ddb3578074e4c8614f0d1a276c63f285fd04b3c39172d2d1a0adfd4a00c914698ca0dc2ffad3754fc05bbc57ec38350b4b5d6ab25b8020b5a5da1db75665
+DIST ksmtp-17.12.1.tar.xz 38384 BLAKE2B a2dc08c473b16305f2b5318cc0d4acc5818eaf9f634d3814c08dc18a4a085765f3b97233da13b759d7e70365ed46c42cf2c310ce3b0225aa57b4e67183231c81 SHA512 b3d5aaf1bb9030615fffa9af0ed80a97096c80fb40c64e921d125f2809ed282ea2cb07e88f6d2134e154534751ab3ea6bf2067576f7b89398ca274955fac1a20
+EBUILD ksmtp-17.12.1.ebuild 493 BLAKE2B 0227d2a472e6819e5961a812af3f15e6ef92c5a0b089c813b5ed206915c77d320b06fe7464b4945a51f55c153dce0452b0d3faa1fec2e4e72135cfddc7fd1649 SHA512 951d85a292c545396672d20369ee9e9582430e56fd910f4898c59a8fc22709ebb8ef22cb1dea9b0a642b964e1637161351a6db5635d7cb1bc325ad4e146bd337
 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
deleted file mode 100644
index 8860c59ebfde..000000000000
--- a/kde-apps/ksmtp/files/ksmtp-17.12.0-correct-hostname.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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/files/ksmtp-17.12.0-ehlo-auth-fix.patch b/kde-apps/ksmtp/files/ksmtp-17.12.0-ehlo-auth-fix.patch
deleted file mode 100644
index 903bfe0d1144..000000000000
--- a/kde-apps/ksmtp/files/ksmtp-17.12.0-ehlo-auth-fix.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 4564d77d3c644a7d1f99749c4e934969b4e21952 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Fri, 22 Dec 2017 14:22:49 +0100
-Subject: [PATCH] Fix duplicate authentication
-
-Summary:
-The response to EHLO triggers an authentication command, but with TLS
-two EHLOs are sent: For the 220 from the server and after TLS negotiation.
-However, sending it twice results in an unexpected "503 already authenticated"
-response which ends up getting parsed by the SendJob, causing confusion.
-
-BUG: 387926
-BUG: 388068
-
-Reviewers: mlaurent, dvratil
-
-Subscribers: rdieter, heikobecker, asn, #kde_pim, lbeltrame, cgiboudeaux
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D9476
----
- src/session.cpp       | 29 +++++++++++++++++++----------
- src/session_p.h       |  1 +
- src/sessionthread.cpp |  1 -
- 3 files changed, 20 insertions(+), 11 deletions(-)
-
-diff --git a/src/session.cpp b/src/session.cpp
-index 861419d..4320adc 100644
---- a/src/session.cpp
-+++ b/src/session.cpp
-@@ -80,6 +80,19 @@ void SessionPrivate::setAuthenticationMethods(const QList<QByteArray> &authMetho
-     }
- }
- 
-+void SessionPrivate::startHandshake()
-+{
-+    QByteArray cmd;
-+    if (!m_ehloRejected) {
-+         cmd = "EHLO ";
-+    } else {
-+         cmd = "HELO ";
-+    }
-+    setState(Session::Handshake);
-+    const auto hostname = m_customHostname.isEmpty() ? m_thread->hostName() : m_customHostname;
-+    sendData(cmd + QUrl::toAce(hostname));
-+}
-+
- 
- 
- Session::Session(const QString &hostName, quint16 port, QObject *parent)
-@@ -277,15 +290,7 @@ void SessionPrivate::responseReceived(const ServerResponse &r)
- 
-     if (m_state == Session::Ready) {
-         if (r.isCode(22) || m_ehloRejected) {
--            QByteArray cmd;
--            if (!m_ehloRejected) {
--                cmd = "EHLO ";
--            } else {
--                cmd = "HELO ";
--            }
--            setState(Session::Handshake);
--            const auto hostname = m_customHostname.isEmpty() ? m_thread->hostName() : m_customHostname;
--            sendData(cmd + QUrl::toAce(hostname));
-+            startHandshake();
-             return;
-         }
-     }
-@@ -346,7 +351,11 @@ KTcpSocket::SslVersion SessionPrivate::negotiatedEncryption() const
- 
- void SessionPrivate::encryptionNegotiationResult(bool encrypted, KTcpSocket::SslVersion version)
- {
--    Q_UNUSED(encrypted);
-+    if (encrypted) {
-+        // Get the updated auth methods
-+        startHandshake();
-+    }
-+
-     m_sslVersion = version;
- }
- 
-diff --git a/src/session_p.h b/src/session_p.h
-index 875f7be..90151f6 100644
---- a/src/session_p.h
-+++ b/src/session_p.h
-@@ -73,6 +73,7 @@ private Q_SLOTS:
- 
- private:
- 
-+    void startHandshake();
-     void startNext();
-     void startSocketTimer();
-     void stopSocketTimer();
-diff --git a/src/sessionthread.cpp b/src/sessionthread.cpp
-index 1e4db8b..c195826 100644
---- a/src/sessionthread.cpp
-+++ b/src/sessionthread.cpp
-@@ -223,7 +223,6 @@ void SessionThread::sslConnected()
-     } else {
-         qCDebug(KSMTP_LOG) << "TLS negotiation done.";
- 
--        QMetaObject::invokeMethod(this, "sendData", Qt::QueuedConnection, Q_ARG(QByteArray, "EHLO " + QUrl::toAce(hostName())));
-         Q_EMIT encryptionNegotiationResult(true, m_socket->negotiatedSslVersion());
-     }
- }
--- 
-2.13.6
-
diff --git a/kde-apps/ksmtp/ksmtp-17.12.0-r2.ebuild b/kde-apps/ksmtp/ksmtp-17.12.1.ebuild
index d4eac8670b30..237add174dc6 100644
--- a/kde-apps/ksmtp/ksmtp-17.12.0-r2.ebuild
+++ b/kde-apps/ksmtp/ksmtp-17.12.1.ebuild
@@ -21,9 +21,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-ehlo-auth-fix.patch"
-	"${FILESDIR}/${P}-correct-hostname.patch"
-)
-
 RESTRICT+=" test" # bug 642410