Hello community, here is the log from the commit of package ksmtp for openSUSE:Leap:15.2 checked in at 2020-05-12 11:35:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ksmtp (Old) and /work/SRC/openSUSE:Leap:15.2/.ksmtp.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksmtp" Tue May 12 11:35:23 2020 rev:58 rq:797449 version:20.04.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ksmtp/ksmtp.changes 2020-03-15 07:09:50.468908770 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ksmtp.new.2738/ksmtp.changes 2020-05-12 11:35:24.592123678 +0200 @@ -1,0 +2,29 @@ +Thu Apr 23 12:22:51 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- No code change since 20.03.90 + +------------------------------------------------------------------- +Sun Apr 5 20:30:25 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- No code change since 20.03.80 + +------------------------------------------------------------------- +Sun Mar 22 09:17:22 UTC 2020 - Luca Beltrame <[email protected]> + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Changes since 19.12.3: + * Make it compile against qt5.15 + * Autogenerate file categories + +------------------------------------------------------------------- Old: ---- ksmtp-19.12.3.tar.xz ksmtp-19.12.3.tar.xz.sig New: ---- ksmtp-20.04.0.tar.xz ksmtp-20.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksmtp.spec ++++++ --- /var/tmp/diff_new_pack.uWbU4n/_old 2020-05-12 11:35:24.928124384 +0200 +++ /var/tmp/diff_new_pack.uWbU4n/_new 2020-05-12 11:35:24.932124392 +0200 @@ -18,17 +18,13 @@ %bcond_without lang Name: ksmtp -Version: 19.12.3 +Version: 20.04.0 Release: 0 Summary: Job-based library to send email through an SMTP server License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif BuildRequires: cyrus-sasl-devel BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: kf5-filesystem @@ -39,6 +35,10 @@ BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Test) Recommends: %{name}-lang +%if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif %description KSMTP is a job based library to send email through an SMTP server. ++++++ ksmtp-19.12.3.tar.xz -> ksmtp-20.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/.gitignore new/ksmtp-20.04.0/.gitignore --- old/ksmtp-19.12.3/.gitignore 2020-02-07 07:14:59.000000000 +0100 +++ new/ksmtp-20.04.0/.gitignore 2020-04-04 12:00:22.000000000 +0200 @@ -14,8 +14,7 @@ .swp.* Doxyfile Makefile -avail -random_seed /build*/ +.cmake/ CMakeLists.txt.user* *.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/CMakeLists.txt new/ksmtp-20.04.0/CMakeLists.txt --- old/ksmtp-19.12.3/CMakeLists.txt 2020-03-03 01:42:49.000000000 +0100 +++ new/ksmtp-20.04.0/CMakeLists.txt 2020-04-17 02:41:53.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.13.3") +set(PIM_VERSION "5.14.0") project(KSMTP VERSION ${PIM_VERSION}) set(CMAKE_CXX_STANDARD 14) # ECM setup -set(KF5_MIN_VERSION "5.63.0") +set(KF5_MIN_VERSION "5.68.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -26,7 +26,7 @@ set(KSMTP_LIB_VERSION ${PIM_VERSION}) -set(QT_REQUIRED_VERSION "5.11.0") +set(QT_REQUIRED_VERSION "5.12.0") ecm_setup_version(PROJECT VARIABLE_PREFIX KSMTP VERSION_HEADER ${KSMTP_BINARY_DIR}/ksmtp_version.h PACKAGE_VERSION_FILE ${KSMTP_BINARY_DIR}/KPimSMTPConfigVersion.cmake @@ -56,7 +56,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libksmtp5\") if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400) endif() add_definitions(-DQT_NO_FOREACH) @@ -86,7 +86,5 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim COMPONENT Devel ) -install(FILES ksmtp.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ki18n_install(po) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/ksmtp.categories new/ksmtp-20.04.0/ksmtp.categories --- old/ksmtp-19.12.3/ksmtp.categories 2020-02-07 07:14:59.000000000 +0100 +++ new/ksmtp-20.04.0/ksmtp.categories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -org.kde.pim.ksmtp ksmtp (ksmtp) IDENTIFIER [KSMTP_LOG] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/po/en_GB/libksmtp5.po new/ksmtp-20.04.0/po/en_GB/libksmtp5.po --- old/ksmtp-19.12.3/po/en_GB/libksmtp5.po 2020-03-03 01:42:46.000000000 +0100 +++ new/ksmtp-20.04.0/po/en_GB/libksmtp5.po 2020-04-17 02:41:52.000000000 +0200 @@ -9,7 +9,7 @@ "POT-Creation-Date: 2019-05-20 03:17+0200\n" "PO-Revision-Date: 2018-10-27 17:55+0100\n" "Last-Translator: Steve Allewell <[email protected]>\n" -"Language-Team: British English <[email protected]>\n" +"Language-Team: British English <[email protected]>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/po/et/libksmtp5.po new/ksmtp-20.04.0/po/et/libksmtp5.po --- old/ksmtp-19.12.3/po/et/libksmtp5.po 2020-03-03 01:42:46.000000000 +0100 +++ new/ksmtp-20.04.0/po/et/libksmtp5.po 2020-04-17 02:41:52.000000000 +0200 @@ -1,47 +1,46 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Marek Laane <[email protected]>, 2011. +# Marek Laane <[email protected]>, 2011, 2019. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-05-20 03:17+0200\n" -"PO-Revision-Date: 2011-06-24 05:22+0300\n" -"Last-Translator: Marek Laane <[email protected]>\n" -"Language-Team: Estonian <[email protected]>\n" +"PO-Revision-Date: 2019-11-17 00:56+0200\n" +"Last-Translator: Marek Laane <[email protected]>\n" +"Language-Team: Estonian <[email protected]>\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 19.08.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: job.cpp:72 #, kde-format msgid "Service not available" -msgstr "" +msgstr "Teenust ei ole saadaval" #: job.cpp:74 #, kde-format msgid "Mailbox unavailable. The server said: %1" -msgstr "" +msgstr "Postkast ei ole saadaval. Server teatas: %1" #: job.cpp:76 #, kde-format msgid "Insufficient storage space on server. The server said: %1" -msgstr "" +msgstr "Serveris napib salvestusruumi. Server teatas: %1" #: job.cpp:78 -#, fuzzy, kde-format -#| msgid "Server error" +#, kde-format msgid "Server error: %1" -msgstr "Serveri tõrge" +msgstr "Serveri tõrge: %1" #: job.cpp:87 #, kde-format msgid "Connection to server lost." -msgstr "" +msgstr "Ühendus serveriga katkes." #: loginjob.cpp:94 #, kde-format @@ -51,7 +50,7 @@ #: loginjob.cpp:159 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." -msgstr "" +msgstr "STARTTLS ei ole serveris toetatud, selle asemel kasutatakse SSL/TLS." #: loginjob.cpp:223 #, kde-format @@ -59,17 +58,17 @@ "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "" -"Autentimine SMTP serveris nurjus, sest ei leitud sobivat atutentimisviisi" +"Autentimine SMTP serveris nurjus, sest ei leitud sobivat autentimisviisi" #: loginjob.cpp:286 #, kde-format msgid "Token expired" -msgstr "" +msgstr "Pääsmik on aegunud" #: loginjob.cpp:331 #, kde-format msgid "Login failed, cannot initialize the SASL library" -msgstr "" +msgstr "Sisselogimine nurjus, SASL teeki ei õnnestunud initsialiseerida" #: sendjob.cpp:69 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/po/ia/libksmtp5.po new/ksmtp-20.04.0/po/ia/libksmtp5.po --- old/ksmtp-19.12.3/po/ia/libksmtp5.po 2020-03-03 01:42:47.000000000 +0100 +++ new/ksmtp-20.04.0/po/ia/libksmtp5.po 2020-04-17 02:41:52.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This file is copyright: # This file is distributed under the same license as the ksmtp package. # -# Giovanni Sora <[email protected]>, 2020. +# giovanni <[email protected]>, 2020. msgid "" msgstr "" "Project-Id-Version: ksmtp\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-05-20 03:17+0200\n" -"PO-Revision-Date: 2020-02-10 10:49+0100\n" +"PO-Revision-Date: 2020-02-12 14:05+0100\n" "Last-Translator: giovanni <[email protected]>\n" "Language-Team: Interlingua <[email protected]>\n" "Language: ia\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/po/ko/libksmtp5.po new/ksmtp-20.04.0/po/ko/libksmtp5.po --- old/ksmtp-19.12.3/po/ko/libksmtp5.po 2020-03-03 01:42:47.000000000 +0100 +++ new/ksmtp-20.04.0/po/ko/libksmtp5.po 2020-04-17 02:41:52.000000000 +0200 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Shinjo Park <[email protected]>, 2017, 2018, 2019. +# Shinjo Park <[email protected]>, 2017, 2018, 2019, 2020. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-05-20 03:17+0200\n" -"PO-Revision-Date: 2019-04-22 01:20+0200\n" +"PO-Revision-Date: 2020-04-05 13:06+0200\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 18.12.3\n" +"X-Generator: Lokalize 19.04.3\n" #: job.cpp:72 #, kde-format @@ -90,7 +90,7 @@ "bytes. (Message size: %2 bytes.)" msgstr "" "메시지 최대 허용 크기인 %1바이트를 초과했기 때문에 메시지를 보낼 수 없습니다." -"(메시지 크기: %2 바이트.)" +"(메시지 크기: %2바이트.)" #~ msgid "Server time out" #~ msgstr "서버 시간 초과됨" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/po/nn/libksmtp5.po new/ksmtp-20.04.0/po/nn/libksmtp5.po --- old/ksmtp-19.12.3/po/nn/libksmtp5.po 2020-03-03 01:42:48.000000000 +0100 +++ new/ksmtp-20.04.0/po/nn/libksmtp5.po 2020-04-17 02:41:52.000000000 +0200 @@ -8,7 +8,7 @@ "POT-Creation-Date: 2019-05-20 03:17+0200\n" "PO-Revision-Date: 2016-11-28 19:47+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" -"Language-Team: Norwegian Nynorsk <[email protected]>\n" +"Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/po/uk/libksmtp5.po new/ksmtp-20.04.0/po/uk/libksmtp5.po --- old/ksmtp-19.12.3/po/uk/libksmtp5.po 2020-03-03 01:42:49.000000000 +0100 +++ new/ksmtp-20.04.0/po/uk/libksmtp5.po 2020-04-17 02:41:53.000000000 +0200 @@ -1,5 +1,5 @@ # Translation of libksmtp5.po to Ukrainian -# Copyright (C) 2014-2018 This_file_is_part_of_KDE +# Copyright (C) 2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/po/zh_CN/libksmtp5.po new/ksmtp-20.04.0/po/zh_CN/libksmtp5.po --- old/ksmtp-19.12.3/po/zh_CN/libksmtp5.po 2020-03-03 01:42:49.000000000 +0100 +++ new/ksmtp-20.04.0/po/zh_CN/libksmtp5.po 2020-04-17 02:41:53.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-05-20 03:17+0200\n" -"PO-Revision-Date: 2020-01-20 21:56\n" +"PO-Revision-Date: 2020-03-25 19:57\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/src/CMakeLists.txt new/ksmtp-20.04.0/src/CMakeLists.txt --- old/ksmtp-19.12.3/src/CMakeLists.txt 2020-02-07 07:14:59.000000000 +0100 +++ new/ksmtp-20.04.0/src/CMakeLists.txt 2020-04-04 12:00:22.000000000 +0200 @@ -7,7 +7,10 @@ sessionuiproxy.cpp ) -ecm_qt_declare_logging_category(ksmtp_SRCS HEADER ksmtp_debug.h IDENTIFIER KSMTP_LOG CATEGORY_NAME org.kde.pim.ksmtp) +ecm_qt_declare_logging_category(ksmtp_SRCS HEADER ksmtp_debug.h + IDENTIFIER KSMTP_LOG CATEGORY_NAME org.kde.pim.ksmtp + DESCRIPTION "ksmtp (ksmtp)" EXPORT KSMTP + ) add_library(KPimSMTP ${ksmtp_SRCS}) @@ -62,6 +65,7 @@ ${KSMTP_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim/KSMTP/KSMTP ) +ecm_qt_install_logging_categories(EXPORT KSMTP FILE ksmtp.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) ecm_generate_pri_file(BASE_NAME KSMTP LIB_NAME KPimSMTP DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KPim/KSMTP) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-19.12.3/src/sessionthread.cpp new/ksmtp-20.04.0/src/sessionthread.cpp --- old/ksmtp-19.12.3/src/sessionthread.cpp 2020-02-07 07:14:59.000000000 +0100 +++ new/ksmtp-20.04.0/src/sessionthread.cpp 2020-04-04 12:00:22.000000000 +0200 @@ -154,7 +154,11 @@ m_parentSession->d, &SessionPrivate::socketDisconnected); connect(m_socket.get(), &QSslSocket::connected, m_parentSession->d, &SessionPrivate::socketConnected); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) connect(m_socket.get(), QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error), +#else + connect(m_socket.get(), QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::errorOccurred), +#endif this, [this](QAbstractSocket::SocketError err) { qCWarning(KSMTP_LOG) << "SMTP Socket error:" << err << m_socket->errorString(); Q_EMIT m_parentSession->connectionError(m_socket->errorString()); @@ -223,13 +227,23 @@ QMutexLocker locker(&m_mutex); QSslCipher cipher = m_socket->sessionCipher(); - if (!m_socket->sslErrors().isEmpty() || !m_socket->isEncrypted() +#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + if (!m_socket->sslErrors().isEmpty() +#else + if (!m_socket->sslHandshakeErrors().isEmpty() +#endif + || !m_socket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) { qCDebug(KSMTP_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits() << ", the socket says:" << m_socket->errorString() << "and the list of SSL errors contains" - << m_socket->sslErrors().count() << "items."; + #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0)) + << m_socket->sslErrors().count() + #else + << m_socket->sslHandshakeErrors().count() + #endif + << "items."; KSslErrorUiData errorData(m_socket.get()); Q_EMIT sslError(errorData); } else {
