[neon/kde/kopete/Neon/unstable] debian/patches: drop all non applying patches
Carlos De Maine
null at kde.org
Tue Aug 15 00:34:34 BST 2023
Git commit 3fcea165ce1d02838cf52848a1360cea9e9970b4 by Carlos De Maine.
Committed on 15/08/2023 at 01:34.
Pushed by carlosdem into branch 'Neon/unstable'.
drop all non applying patches
D +0 -30 debian/patches/c++-mediastream.patch
D +0 -18 debian/patches/find-mediastreamer.patch
D +0 -221 debian/patches/fix-mediastreamer-ftbfs.patch
D +0 -306 debian/patches/kopete-17.08.3-openssl-1.1.patch
D +0 -159 debian/patches/kopete-srtp2.patch
D +0 -399 debian/patches/log-error
D +0 -6 debian/patches/series
https://invent.kde.org/neon/kde/kopete/-/commit/3fcea165ce1d02838cf52848a1360cea9e9970b4
diff --git a/debian/patches/c++-mediastream.patch b/debian/patches/c++-mediastream.patch
deleted file mode 100644
index 6a4dede..0000000
--- a/debian/patches/c++-mediastream.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: New mediastreamer2 uses c++ code
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-Last-Update: 2020-12-28
-
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-@@ -34,11 +34,9 @@
- #ifdef HAVE_LINPHONE
-
- // LinphoneMediaEngine is a Linphone implementation of MediaEngine
--extern "C" {
- #include <mediastreamer2/mediastream.h>
- #include <mediastreamer2/mssndcard.h>
- #include <mediastreamer2/msfilter.h>
--}
-
- #include "talk/session/phone/linphonemediaengine.h"
-
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h
-@@ -35,9 +35,7 @@
- #include <string>
- #include <vector>
-
--extern "C" {
- #include <mediastreamer2/mediastream.h>
--}
-
- #include "talk/base/scoped_ptr.h"
- #include "talk/session/phone/codec.h"
diff --git a/debian/patches/find-mediastreamer.patch b/debian/patches/find-mediastreamer.patch
deleted file mode 100644
index 6b643a3..0000000
--- a/debian/patches/find-mediastreamer.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: <short summary of the patch>
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-
-Last-Update: 2020-12-28
-
---- kopete-20.12.0.orig/cmake/modules/FindMediastreamer.cmake
-+++ kopete-20.12.0/cmake/modules/FindMediastreamer.cmake
-@@ -14,6 +14,10 @@ SET( MEDIASTREAMER_FOUND FALSE )
-
- pkg_check_modules(MEDIASTREAMER mediastreamer>=2.3.0)
-
-+IF (NOT MEDIASTREAMER_FOUND)
-+ FIND_PACKAGE(Mediastreamer2)
-+ENDIF (NOT MEDIASTREAMER_FOUND)
-+
- if (MEDIASTREAMER_INCLUDE_DIR AND MEDIASTREAMER_LIBRARIES)
- SET(MEDIASTREAMER_FOUND TRUE)
- endif(MEDIASTREAMER_INCLUDE_DIR AND MEDIASTREAMER_LIBRARIES)
diff --git a/debian/patches/fix-mediastreamer-ftbfs.patch b/debian/patches/fix-mediastreamer-ftbfs.patch
deleted file mode 100644
index b94d8ab..0000000
--- a/debian/patches/fix-mediastreamer-ftbfs.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-Description: Fix FTBFS for recent mediastreamer releases
-Author: Felix Lechner <felix.lechner at lease-up.com>
-Bug: https://bugs.kde.org/show_bug.cgi?id=368340
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=890606
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-+++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-@@ -60,18 +60,34 @@
- ///////////////////////////////////////////////////////////////////////////
- LinphoneMediaEngine::LinphoneMediaEngine(const std::string& ringWav, const std::string& callWav) : ring_wav_(ringWav), call_wav_(callWav) {
- ortp_init();
-+#ifdef MEDIASTREAMER_LESS_2_14
- ms_init();
-+#else
-+ factory = ms_factory_new();
-+ ms_factory_init_voip(factory);
-+ ms_factory_init_plugins(factory);
-+#endif
-
- #ifndef WIN32
- char * path = strdup(MSILBC_LIBRARY);
- char * dirc = dirname(path);
-+#ifdef MEDIASTREAMER_LESS_2_14
- ms_load_plugins(dirc);
-+#else
-+ ms_factory_load_plugins(factory, dirc);
-+#endif
- free(path);
- #endif
-
-+#ifdef MEDIASTREAMER_LESS_2_14
- have_ilbc = ms_filter_codec_supported("iLBC");
- have_speex = ms_filter_codec_supported("speex");
- have_gsm = ms_filter_codec_supported("gsm");
-+#else
-+ have_ilbc = ms_factory_codec_supported(factory, "iLBC");
-+ have_speex = ms_factory_codec_supported(factory, "speex");
-+ have_gsm = ms_factory_codec_supported(factory, "gsm");
-+#endif
-
- if (have_speex) {
- voice_codecs_.push_back(AudioCodec(110, payload_type_speex_wb.mime_type, payload_type_speex_wb.clock_rate, 0, 1, 8));
-@@ -88,6 +104,14 @@
- voice_codecs_.push_back(AudioCodec(101, payload_type_telephone_event.mime_type, payload_type_telephone_event.clock_rate, 0, 1, 1));
- }
-
-+LinphoneMediaEngine::~LinphoneMediaEngine() {
-+#ifndef MEDIASTREAMER_LESS_2_14
-+ ms_factory_uninit_plugins(factory);
-+ ms_factory_uninit_voip(factory);
-+ ms_factory_destroy(factory);
-+#endif
-+}
-+
- void LinphoneMediaEngine::Terminate() {
- fflush(stdout);
- }
-@@ -149,15 +173,17 @@
- playport2 = PORT_UNUSED;
-
- #ifdef _DEBUG
-- ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
-+ ortp_set_log_level_mask(ORTP_LOG_DOMAIN, ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL);
- #else
-- ortp_set_log_level_mask(ORTP_FATAL);
-+ ortp_set_log_level_mask(ORTP_LOG_DOMAIN, ORTP_FATAL);
- #endif
-
- #ifdef MEDIASTREAMER_LESS_2_9
- audio_stream_ = audio_stream_new(-1, 0); /* -1 means that function will choose some free port */
--#else
-+#elseif MEDIASTREAMER_LESS_2_14
- audio_stream_ = audio_stream_new(-1, -1, 0); /* -1 means that function will choose some free port */
-+#else
-+ audio_stream_ = audio_stream_new(engine_->factory, -1, -1, 0); /* -1 means that function will choose some free port */
- #endif
-
- }
-@@ -272,11 +298,17 @@
- {
- StopRing();
-
-- MSSndCard *playcard = ms_snd_card_manager_get_default_playback_card(ms_snd_card_manager_get());
-+#ifdef MEDIASTREAMER_LESS_2_14
-+ MSSndCardManager *snd_manager = ms_snd_card_manager_get();
-+#else
-+ MSSndCardManager *snd_manager = ms_factory_get_snd_card_manager(engine_->factory);
-+#endif
-+
-+ MSSndCard *playcard = ms_snd_card_manager_get_default_playback_card(snd_manager);
- if (!playcard)
- return false;
-
-- MSSndCard *captcard = ms_snd_card_manager_get_default_capture_card(ms_snd_card_manager_get());
-+ MSSndCard *captcard = ms_snd_card_manager_get_default_capture_card(snd_manager);
- if (!captcard)
- return false;
-
-@@ -333,8 +365,14 @@
-
- void LinphoneVoiceChannel::StartRing(bool bIncomingCall)
- {
-+#ifdef MEDIASTREAMER_LESS_2_14
-+ MSSndCardManager *snd_manager = ms_snd_card_manager_get();
-+#else
-+ MSSndCardManager *snd_manager = ms_factory_get_snd_card_manager(engine_->factory);
-+#endif
-+
- MSSndCard *sndcard = NULL;
-- sndcard=ms_snd_card_manager_get_default_card(ms_snd_card_manager_get());
-+ sndcard=ms_snd_card_manager_get_default_card(snd_manager);
- if (sndcard)
- {
- if (bIncomingCall)
-@@ -342,7 +380,11 @@
- if (engine_->GetRingWav().size() > 0)
- {
- LOG(LS_VERBOSE) << "incoming ring. sound file: " << engine_->GetRingWav().c_str() << "\n";
-+#ifdef MEDIASTREAMER_LESS_2_14
- ring_stream_ = ring_start (engine_->GetRingWav().c_str(), 1, sndcard);
-+#else
-+ ring_stream_ = ring_start (engine_->factory, engine_->GetRingWav().c_str(), 1, sndcard);
-+#endif
- }
- }
- else
-@@ -350,7 +392,11 @@
- if (engine_->GetCallWav().size() > 0)
- {
- LOG(LS_VERBOSE) << "outgoing ring. sound file: " << engine_->GetCallWav().c_str() << "\n";
-+#ifdef MEDIASTREAMER_LESS_2_14
- ring_stream_ = ring_start (engine_->GetCallWav().c_str(), 1, sndcard);
-+#else
-+ ring_stream_ = ring_start (engine_->factory, engine_->GetCallWav().c_str(), 1, sndcard);
-+#endif
- }
- }
- }
---- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h
-+++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.h
-@@ -53,7 +53,7 @@
- class LinphoneMediaEngine : public MediaEngineInterface {
- public:
- LinphoneMediaEngine(const std::string& ringWav, const std::string& callWav);
-- virtual ~LinphoneMediaEngine() {}
-+ ~LinphoneMediaEngine();
-
- // Implement pure virtual methods of MediaEngine.
- virtual bool Init() { return true; }
-@@ -97,6 +97,10 @@
- bool have_speex;
- bool have_gsm;
-
-+#ifndef MEDIASTREAMER_LESS_2_14
-+ MSFactory *factory;
-+#endif
-+
- private:
- std::vector<AudioCodec> voice_codecs_;
- std::vector<VideoCodec> video_codecs_;
-@@ -110,7 +114,7 @@
- class LinphoneVoiceChannel : public VoiceMediaChannel {
- public:
- LinphoneVoiceChannel(LinphoneMediaEngine *eng);
-- virtual ~LinphoneVoiceChannel();
-+ ~LinphoneVoiceChannel();
-
- // Implement pure virtual methods of VoiceMediaChannel.
- virtual bool SetRecvCodecs(const std::vector<AudioCodec>& codecs);
---- a/cmake/modules/FindMediastreamer.cmake
-+++ b/cmake/modules/FindMediastreamer.cmake
-@@ -20,17 +20,24 @@
-
- IF (MEDIASTREAMER_FOUND)
- IF (NOT MEDIASTREAMER_FIND_QUIETLY)
-+
- MESSAGE(STATUS "Found Mediastreamer: ${MEDIASTREAMER_LIBRARIES} (version: ${MEDIASTREAMER_VERSION})")
-+
-+ SET(MEDIASTREAMER_LESS_2_9 FALSE)
-+ SET(MEDIASTREAMER_LESS_2_11 FALSE)
-+ SET(MEDIASTREAMER_LESS_2_14 FALSE)
-+
- IF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
- SET(MEDIASTREAMER_LESS_2_9 TRUE)
- SET(MEDIASTREAMER_LESS_2_11 TRUE)
-+ SET(MEDIASTREAMER_LESS_2_14 TRUE)
- ELSEIF (MEDIASTREAMER_VERSION VERSION_LESS 2.11)
-- SET(MEDIASTREAMER_LESS_2_9 FALSE)
- SET(MEDIASTREAMER_LESS_2_11 TRUE)
-- ELSE (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
-- SET(MEDIASTREAMER_LESS_2_9 FALSE)
-- SET(MEDIASTREAMER_LESS_2_11 FALSE)
-+ SET(MEDIASTREAMER_LESS_2_14 TRUE)
-+ ELSEIF (MEDIASTREAMER_VERSION VERSION_LESS 2.14)
-+ SET(MEDIASTREAMER_LESS_2_14 TRUE)
- ENDIF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
-+
- ENDIF (NOT MEDIASTREAMER_FIND_QUIETLY)
- ELSE (MEDIASTREAMER_FOUND)
- IF (MEDIASTREAMER_FIND_REQUIRED)
---- a/protocols/jabber/libjingle/CMakeLists.txt
-+++ b/protocols/jabber/libjingle/CMakeLists.txt
-@@ -283,6 +283,7 @@
- EXPAT::EXPAT
- ${MEDIASTREAMER_LIBRARIES}
- ${LIBORTP_LIBRARY}
-+ ${CMAKE_THREAD_LIBS_INIT}
- ${CMAKE_DL_LIBS}
- )
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -34,6 +34,7 @@
-
- find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5IdentityManagement ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
-+find_package(Threads)
-
- include(KDEInstallDirs)
- include(KDECompilerSettings NO_POLICY_SCOPE)
diff --git a/debian/patches/kopete-17.08.3-openssl-1.1.patch b/debian/patches/kopete-17.08.3-openssl-1.1.patch
deleted file mode 100644
index 243b6fa..0000000
--- a/debian/patches/kopete-17.08.3-openssl-1.1.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-Description: OpenSSL 1.1 support for kopete
-Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
-Origin: Fedora, https://src.fedoraproject.org/cgit/rpms/kopete.git/tree/kopete-17.08.3-openssl-1.1.patch?id=24143623ded59beb87ba300b64f22fa4c835c873
-Bug-Debian: https://bugs.debian.org/858938
-Forwarded: https://phabricator.kde.org/D13231
-Reviewed-by: Sandro Knauß <hefee at debian.org>
-Last-Update: 2018-05-31
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/protocols/jabber/libjingle/talk/base/openssladapter.cc
-+++ b/protocols/jabber/libjingle/talk/base/openssladapter.cc
-@@ -84,6 +84,7 @@ static long socket_ctrl(BIO* h, int cmd,
- static int socket_new(BIO* h);
- static int socket_free(BIO* data);
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- static BIO_METHOD methods_socket = {
- BIO_TYPE_BIO,
- "socket",
-@@ -98,16 +99,36 @@ static BIO_METHOD methods_socket = {
- };
-
- BIO_METHOD* BIO_s_socket2() { return(&methods_socket); }
-+#else
-+static BIO_METHOD *methods_socket = NULL;
-+
-+static const BIO_METHOD * BIO_s_socket2(void) {
-+ if (methods_socket == NULL) {
-+ methods_socket = BIO_meth_new (BIO_TYPE_BIO | BIO_get_new_index (), "socket");
-+ if (methods_socket == NULL ||
-+ BIO_meth_set_write (methods_socket, socket_write) ||
-+ BIO_meth_set_read (methods_socket, socket_read) ||
-+ BIO_meth_set_puts (methods_socket, socket_puts) ||
-+ BIO_meth_set_gets (methods_socket, 0) ||
-+ BIO_meth_set_ctrl (methods_socket, socket_ctrl) ||
-+ BIO_meth_set_create (methods_socket, socket_new) ||
-+ BIO_meth_set_destroy (methods_socket, socket_free))
-+ return NULL;
-+ }
-+ return methods_socket;
-+}
-+#endif
-
- BIO* BIO_new_socket(talk_base::AsyncSocket* socket) {
- BIO* ret = BIO_new(BIO_s_socket2());
- if (ret == NULL) {
- return NULL;
- }
-- ret->ptr = socket;
-+ BIO_set_data(ret, socket);
- return ret;
- }
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- static int socket_new(BIO* b) {
- b->shutdown = 0;
- b->init = 1;
-@@ -115,6 +136,14 @@ static int socket_new(BIO* b) {
- b->ptr = 0;
- return 1;
- }
-+#else
-+static int socket_new(BIO* b) {
-+ BIO_set_shutdown(b, 0);
-+ BIO_set_init(b, 1);
-+ BIO_set_data(b, 0);
-+ return 1;
-+}
-+#endif
-
- static int socket_free(BIO* b) {
- if (b == NULL)
-@@ -125,13 +154,11 @@ static int socket_free(BIO* b) {
- static int socket_read(BIO* b, char* out, int outl) {
- if (!out)
- return -1;
-- talk_base::AsyncSocket* socket = static_cast<talk_base::AsyncSocket*>(b->ptr);
-+ talk_base::AsyncSocket* socket = static_cast<talk_base::AsyncSocket*>(BIO_get_data(b));
- BIO_clear_retry_flags(b);
- int result = socket->Recv(out, outl);
- if (result > 0) {
- return result;
-- } else if (result == 0) {
-- b->num = 1;
- } else if (socket->IsBlocking()) {
- BIO_set_retry_read(b);
- }
-@@ -141,7 +168,7 @@ static int socket_read(BIO* b, char* out
- static int socket_write(BIO* b, const char* in, int inl) {
- if (!in)
- return -1;
-- talk_base::AsyncSocket* socket = static_cast<talk_base::AsyncSocket*>(b->ptr);
-+ talk_base::AsyncSocket* socket = static_cast<talk_base::AsyncSocket*>(BIO_get_data(b));
- BIO_clear_retry_flags(b);
- int result = socket->Send(in, inl);
- if (result > 0) {
-@@ -164,7 +191,6 @@ static long socket_ctrl(BIO* b, int cmd,
- case BIO_CTRL_RESET:
- return 0;
- case BIO_CTRL_EOF:
-- return b->num;
- case BIO_CTRL_WPENDING:
- case BIO_CTRL_PENDING:
- return 0;
-@@ -696,7 +722,9 @@ bool OpenSSLAdapter::VerifyServerName(SS
- // We assign this to a local variable, instead of passing the address
- // directly to ASN1_item_d2i.
- // See http://readlist.com/lists/openssl.org/openssl-users/0/4761.html.
-- unsigned char* ext_value_data = extension->value->data;
-+ ASN1_OCTET_STRING *extension_data = X509_EXTENSION_get_data(extension);
-+ unsigned char* ext_value_data = extension_data->data;
-+ long length = extension_data->length;
-
- #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
- const unsigned char **ext_value_data_ptr =
-@@ -707,10 +735,10 @@ bool OpenSSLAdapter::VerifyServerName(SS
-
- if (meth->it) {
- ext_str = ASN1_item_d2i(NULL, ext_value_data_ptr,
-- extension->value->length,
-+ length,
- ASN1_ITEM_ptr(meth->it));
- } else {
-- ext_str = meth->d2i(NULL, ext_value_data_ptr, extension->value->length);
-+ ext_str = meth->d2i(NULL, ext_value_data_ptr, length);
- }
-
- STACK_OF(CONF_VALUE)* value = meth->i2v(meth, ext_str, NULL);
---- a/protocols/jabber/libjingle/talk/base/openssldigest.cc
-+++ b/protocols/jabber/libjingle/talk/base/openssldigest.cc
-@@ -32,16 +32,16 @@
- namespace talk_base {
-
- OpenSSLDigest::OpenSSLDigest(const std::string& algorithm) {
-- EVP_MD_CTX_init(&ctx_);
-+ EVP_MD_CTX_init(ctx_);
- if (GetDigestEVP(algorithm, &md_)) {
-- EVP_DigestInit_ex(&ctx_, md_, NULL);
-+ EVP_DigestInit_ex(ctx_, md_, NULL);
- } else {
- md_ = NULL;
- }
- }
-
- OpenSSLDigest::~OpenSSLDigest() {
-- EVP_MD_CTX_cleanup(&ctx_);
-+ EVP_MD_CTX_destroy(ctx_);
- }
-
- size_t OpenSSLDigest::Size() const {
-@@ -55,7 +55,7 @@ void OpenSSLDigest::Update(const void* b
- if (!md_) {
- return;
- }
-- EVP_DigestUpdate(&ctx_, buf, len);
-+ EVP_DigestUpdate(ctx_, buf, len);
- }
-
- size_t OpenSSLDigest::Finish(void* buf, size_t len) {
-@@ -63,8 +63,8 @@ size_t OpenSSLDigest::Finish(void* buf,
- return 0;
- }
- unsigned int md_len;
-- EVP_DigestFinal_ex(&ctx_, static_cast<unsigned char*>(buf), &md_len);
-- EVP_DigestInit_ex(&ctx_, md_, NULL); // prepare for future Update()s
-+ EVP_DigestFinal_ex(ctx_, static_cast<unsigned char*>(buf), &md_len);
-+ EVP_DigestInit_ex(ctx_, md_, NULL); // prepare for future Update()s
- ASSERT(md_len == Size());
- return md_len;
- }
---- a/protocols/jabber/libjingle/talk/base/openssldigest.h
-+++ b/protocols/jabber/libjingle/talk/base/openssldigest.h
-@@ -55,7 +55,7 @@ class OpenSSLDigest : public MessageDige
- size_t* len);
-
- private:
-- EVP_MD_CTX ctx_;
-+ EVP_MD_CTX* ctx_ = EVP_MD_CTX_create();
- const EVP_MD* md_;
- };
-
---- a/protocols/jabber/libjingle/talk/base/opensslidentity.cc
-+++ b/protocols/jabber/libjingle/talk/base/opensslidentity.cc
-@@ -169,7 +169,12 @@ OpenSSLKeyPair::~OpenSSLKeyPair() {
- }
-
- void OpenSSLKeyPair::AddReference() {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- CRYPTO_add(&pkey_->references, 1, CRYPTO_LOCK_EVP_PKEY);
-+#else
-+ EVP_PKEY_up_ref(pkey_);
-+#endif
-+
- }
-
- #ifdef _DEBUG
-@@ -275,7 +280,11 @@ std::string OpenSSLCertificate::ToPEMStr
- }
-
- void OpenSSLCertificate::AddReference() {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- CRYPTO_add(&x509_->references, 1, CRYPTO_LOCK_X509);
-+#else
-+ X509_up_ref(x509_);
-+#endif
- }
-
- OpenSSLIdentity* OpenSSLIdentity::Generate(const std::string& common_name) {
---- a/protocols/jabber/libjingle/talk/base/opensslstreamadapter.cc
-+++ b/protocols/jabber/libjingle/talk/base/opensslstreamadapter.cc
-@@ -87,6 +87,7 @@ static long stream_ctrl(BIO* h, int cmd,
- static int stream_new(BIO* h);
- static int stream_free(BIO* data);
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- static BIO_METHOD methods_stream = {
- BIO_TYPE_BIO,
- "stream",
-@@ -101,17 +102,37 @@ static BIO_METHOD methods_stream = {
- };
-
- static BIO_METHOD* BIO_s_stream() { return(&methods_stream); }
-+#else
-+static BIO_METHOD *methods_stream = NULL;
-+
-+static const BIO_METHOD * BIO_s_stream(void) {
-+ if (methods_stream == NULL) {
-+ methods_stream = BIO_meth_new (BIO_TYPE_BIO | BIO_get_new_index (), "stream");
-+ if (methods_stream == NULL ||
-+ BIO_meth_set_write (methods_stream, stream_write) ||
-+ BIO_meth_set_read (methods_stream, stream_read) ||
-+ BIO_meth_set_puts (methods_stream, stream_puts) ||
-+ BIO_meth_set_gets (methods_stream, 0) ||
-+ BIO_meth_set_ctrl (methods_stream, stream_ctrl) ||
-+ BIO_meth_set_create (methods_stream, stream_new) ||
-+ BIO_meth_set_destroy (methods_stream, stream_free))
-+ return NULL;
-+ }
-+ return methods_stream;
-+}
-+#endif
-
- static BIO* BIO_new_stream(StreamInterface* stream) {
- BIO* ret = BIO_new(BIO_s_stream());
- if (ret == NULL)
- return NULL;
-- ret->ptr = stream;
-+ BIO_set_data(ret, stream);
- return ret;
- }
-
- // bio methods return 1 (or at least non-zero) on success and 0 on failure.
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- static int stream_new(BIO* b) {
- b->shutdown = 0;
- b->init = 1;
-@@ -119,6 +140,14 @@ static int stream_new(BIO* b) {
- b->ptr = 0;
- return 1;
- }
-+#else
-+static int stream_new(BIO* b) {
-+ BIO_set_shutdown(b, 0);
-+ BIO_set_init(b, 1);
-+ BIO_set_data(b, 0);
-+ return 1;
-+}
-+#endif
-
- static int stream_free(BIO* b) {
- if (b == NULL)
-@@ -129,15 +158,13 @@ static int stream_free(BIO* b) {
- static int stream_read(BIO* b, char* out, int outl) {
- if (!out)
- return -1;
-- StreamInterface* stream = static_cast<StreamInterface*>(b->ptr);
-+ StreamInterface* stream = static_cast<StreamInterface*>(BIO_get_data(b));
- BIO_clear_retry_flags(b);
- size_t read;
- int error;
- StreamResult result = stream->Read(out, outl, &read, &error);
- if (result == SR_SUCCESS) {
- return read;
-- } else if (result == SR_EOS) {
-- b->num = 1;
- } else if (result == SR_BLOCK) {
- BIO_set_retry_read(b);
- }
-@@ -147,7 +174,7 @@ static int stream_read(BIO* b, char* out
- static int stream_write(BIO* b, const char* in, int inl) {
- if (!in)
- return -1;
-- StreamInterface* stream = static_cast<StreamInterface*>(b->ptr);
-+ StreamInterface* stream = static_cast<StreamInterface*>(BIO_get_data(b));
- BIO_clear_retry_flags(b);
- size_t written;
- int error;
-@@ -172,7 +199,6 @@ static long stream_ctrl(BIO* b, int cmd,
- case BIO_CTRL_RESET:
- return 0;
- case BIO_CTRL_EOF:
-- return b->num;
- case BIO_CTRL_WPENDING:
- case BIO_CTRL_PENDING:
- return 0;
diff --git a/debian/patches/kopete-srtp2.patch b/debian/patches/kopete-srtp2.patch
deleted file mode 100644
index 3328d33..0000000
--- a/debian/patches/kopete-srtp2.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-Author: Antonio Rojas <arojas at archlinux.org>
-Origin: archlinux, https://git.archlinux.org/svntogit/packages.git/tree/trunk/kopete-srtp2.patch?h=packages/kopete
-Bug: https://bugs.kde.org/show_bug.cgi?id=399678
-Bug-Debian: https://bugs.kde.org/show_bug.cgi?id=399678
-
-diff --git a/cmake/modules/FindSRTP.cmake b/cmake/modules/FindSRTP.cmake
-index 4e8baa827..ce9033497 100644
---- a/cmake/modules/FindSRTP.cmake
-+++ b/cmake/modules/FindSRTP.cmake
-@@ -11,8 +11,8 @@ include ( FindPackageHandleStandardArgs )
- if ( SRTP_INCLUDE_DIR AND SRTP_LIBRARY )
- set ( SRTP_FOUND true )
- else ( SRTP_INCLUDE_DIR AND SRTP_LIBRARY )
-- find_path ( SRTP_INCLUDE_DIR srtp.h PATH_SUFFIXES srtp )
-- find_library ( SRTP_LIBRARY NAMES srtp )
-+ find_path ( SRTP_INCLUDE_DIR srtp.h PATH_SUFFIXES srtp srtp2 )
-+ find_library ( SRTP_LIBRARY NAMES srtp srtp2 )
-
- if ( SRTP_INCLUDE_DIR AND SRTP_LIBRARY )
- set ( SRTP_FOUND true )
-diff --git a/protocols/jabber/libjingle/talk/session/phone/srtpfilter.cc b/protocols/jabber/libjingle/talk/session/phone/srtpfilter.cc
-index 7a1cb7866..f5363a36a 100644
---- a/protocols/jabber/libjingle/talk/session/phone/srtpfilter.cc
-+++ b/protocols/jabber/libjingle/talk/session/phone/srtpfilter.cc
-@@ -416,7 +416,7 @@ bool SrtpSession::ProtectRtp(void* p, int in_len, int max_len, int* out_len) {
- }
- int seq_num;
- GetRtpSeqNum(p, in_len, &seq_num);
-- if (err != err_status_ok) {
-+ if (err != srtp_err_status_ok) {
- LOG(LS_WARNING) << "Failed to protect SRTP packet, seqnum="
- << seq_num << ", err=" << err << ", last seqnum="
- << last_send_seq_num_;
-@@ -442,7 +442,7 @@ bool SrtpSession::ProtectRtcp(void* p, int in_len, int max_len, int* out_len) {
- *out_len = in_len;
- int err = srtp_protect_rtcp(session_, p, out_len);
- srtp_stat_->AddProtectRtcpResult(err);
-- if (err != err_status_ok) {
-+ if (err != srtp_err_status_ok) {
- LOG(LS_WARNING) << "Failed to protect SRTCP packet, err=" << err;
- return false;
- }
-@@ -461,7 +461,7 @@ bool SrtpSession::UnprotectRtp(void* p, int in_len, int* out_len) {
- if (GetRtpSsrc(p, in_len, &ssrc)) {
- srtp_stat_->AddUnprotectRtpResult(ssrc, err);
- }
-- if (err != err_status_ok) {
-+ if (err != srtp_err_status_ok) {
- LOG(LS_WARNING) << "Failed to unprotect SRTP packet, err=" << err;
- return false;
- }
-@@ -477,7 +477,7 @@ bool SrtpSession::UnprotectRtcp(void* p, int in_len, int* out_len) {
- *out_len = in_len;
- int err = srtp_unprotect_rtcp(session_, p, out_len);
- srtp_stat_->AddUnprotectRtcpResult(err);
-- if (err != err_status_ok) {
-+ if (err != srtp_err_status_ok) {
- LOG(LS_WARNING) << "Failed to unprotect SRTCP packet, err=" << err;
- return false;
- }
-@@ -504,11 +504,11 @@ bool SrtpSession::SetKey(int type, const std::string& cs,
- memset(&policy, 0, sizeof(policy));
-
- if (cs == CS_AES_CM_128_HMAC_SHA1_80) {
-- crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtp);
-- crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtcp);
-+ srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtp);
-+ srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtcp);
- } else if (cs == CS_AES_CM_128_HMAC_SHA1_32) {
-- crypto_policy_set_aes_cm_128_hmac_sha1_32(&policy.rtp); // rtp is 32,
-- crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtcp); // rtcp still 80
-+ srtp_crypto_policy_set_aes_cm_128_hmac_sha1_32(&policy.rtp); // rtp is 32,
-+ srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtcp); // rtcp still 80
- } else {
- LOG(LS_WARNING) << "Failed to create SRTP session: unsupported"
- << " cipher_suite " << cs.c_str();
-@@ -520,7 +520,7 @@ bool SrtpSession::SetKey(int type, const std::string& cs,
- return false;
- }
-
-- policy.ssrc.type = static_cast<ssrc_type_t>(type);
-+ policy.ssrc.type = static_cast<srtp_ssrc_type_t>(type);
- policy.ssrc.value = 0;
- policy.key = const_cast<uint8*>(key);
- // TODO parse window size from WSH session-param
-@@ -529,7 +529,7 @@ bool SrtpSession::SetKey(int type, const std::string& cs,
- policy.next = NULL;
-
- int err = srtp_create(&session_, &policy);
-- if (err != err_status_ok) {
-+ if (err != srtp_err_status_ok) {
- LOG(LS_ERROR) << "Failed to create SRTP session, err=" << err;
- return false;
- }
-@@ -543,13 +543,13 @@ bool SrtpSession::Init() {
- if (!inited_) {
- int err;
- err = srtp_init();
-- if (err != err_status_ok) {
-+ if (err != srtp_err_status_ok) {
- LOG(LS_ERROR) << "Failed to init SRTP, err=" << err;
- return false;
- }
-
- err = srtp_install_event_handler(&SrtpSession::HandleEventThunk);
-- if (err != err_status_ok) {
-+ if (err != srtp_err_status_ok) {
- LOG(LS_ERROR) << "Failed to install SRTP event handler, err=" << err;
- return false;
- }
-@@ -652,10 +652,10 @@ void SrtpStat::AddProtectRtpResult(uint32 ssrc, int result) {
- key.ssrc = ssrc;
- key.mode = SrtpFilter::PROTECT;
- switch (result) {
-- case err_status_ok:
-+ case srtp_err_status_ok:
- key.error = SrtpFilter::ERROR_NONE;
- break;
-- case err_status_auth_fail:
-+ case srtp_err_status_auth_fail:
- key.error = SrtpFilter::ERROR_AUTH;
- break;
- default:
-@@ -669,14 +669,14 @@ void SrtpStat::AddUnprotectRtpResult(uint32 ssrc, int result) {
- key.ssrc = ssrc;
- key.mode = SrtpFilter::UNPROTECT;
- switch (result) {
-- case err_status_ok:
-+ case srtp_err_status_ok:
- key.error = SrtpFilter::ERROR_NONE;
- break;
-- case err_status_auth_fail:
-+ case srtp_err_status_auth_fail:
- key.error = SrtpFilter::ERROR_AUTH;
- break;
-- case err_status_replay_fail:
-- case err_status_replay_old:
-+ case srtp_err_status_replay_fail:
-+ case srtp_err_status_replay_old:
- key.error = SrtpFilter::ERROR_REPLAY;
- break;
- default:
-diff --git a/protocols/jabber/libjingle/talk/session/phone/srtpfilter.h b/protocols/jabber/libjingle/talk/session/phone/srtpfilter.h
-index 991d4bf42..ff4e5070f 100644
---- a/protocols/jabber/libjingle/talk/session/phone/srtpfilter.h
-+++ b/protocols/jabber/libjingle/talk/session/phone/srtpfilter.h
-@@ -39,11 +39,7 @@
- #include "talk/session/phone/cryptoparams.h"
- #include "talk/p2p/base/sessiondescription.h"
-
--// Forward declaration to avoid pulling in libsrtp headers here
--struct srtp_event_data_t;
--struct srtp_ctx_t;
--typedef srtp_ctx_t* srtp_t;
--struct srtp_policy_t;
-+#include "srtp2/srtp.h"
-
- namespace cricket {
-
diff --git a/debian/patches/log-error b/debian/patches/log-error
deleted file mode 100644
index bc692cb..0000000
--- a/debian/patches/log-error
+++ /dev/null
@@ -1,399 +0,0 @@
-Description: Rename LOG_ERR in LOG_ERR_KOP to fix the build failure with newer glibc
-
-In file included from /<<PKGBUILDDIR>>/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc:47:
-/<<PKGBUILDDIR>>/protocols/jabber/libjingle/talk/base/logging.h:365: warning: "LOG_ERR" redefined
- 365 | #define LOG_ERR(sev) \
- |
-In file included from /usr/include/syslog.h:1,
- from /usr/include/bctoolbox/logging.h:263,
- from /usr/include/ortp/logging.h:33,
- from /usr/include/ortp/ortp.h:66,
- from /usr/include/mediastreamer2/mediastream.h:24,
- from /<<PKGBUILDDIR>>/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc:38:
-/usr/include/x86_64-linux-gnu/sys/syslog.h:54: note: this is the location of the previous definition
- 54 | #define LOG_ERR 3 /* error conditions */
- |
-In file included from /usr/include/c++/10/bits/stringfwd.h:40,
- from /usr/include/c++/10/string:39,
- from /usr/include/bctoolbox/logging.h:258,
- from /usr/include/ortp/logging.h:33,
- from /usr/include/ortp/ortp.h:66,
- from /usr/include/mediastreamer2/mediastream.h:24,
- from /<<PKGBUILDDIR>>/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc:38:
-/usr/include/c++/10/bits/memoryfwd.h:63:3: error: template with C linkage
- 63 | template<typename>
- | ^~~~~~~~
-/<<PKGBUILDDIR>>/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc:37:1: note: ‘extern "C"’ linkage started here
-
-
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-
-Last-Update: 2020-12-28
-
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/base/cpumonitor.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/base/cpumonitor.cc
-@@ -140,11 +140,11 @@ bool CpuSampler::Init() {
- Pathname sname("/proc/stat");
- sfile_.reset(Filesystem::OpenFile(sname, "rb"));
- if (sfile_.get() == NULL) {
-- LOG_ERR(LS_ERROR) << "open proc/stat failed:";
-+ LOG_ERR_KOP(LS_ERROR) << "open proc/stat failed:";
- return false;
- }
- if (!sfile_->DisableBuffering()) {
-- LOG_ERR(LS_ERROR) << "could not disable buffering for proc/stat";
-+ LOG_ERR_KOP(LS_ERROR) << "could not disable buffering for proc/stat";
- return false;
- }
- #endif // defined(LINUX) || defined(ANDROID)
-@@ -264,7 +264,7 @@ float CpuSampler::GetSystemLoad() {
- std::string statbuf;
- sfile_->SetPosition(0);
- if (!sfile_->ReadLine(&statbuf)) {
-- LOG_ERR(LS_ERROR) << "Could not read proc/stat file";
-+ LOG_ERR_KOP(LS_ERROR) << "Could not read proc/stat file";
- return 0.f;
- }
-
-@@ -275,7 +275,7 @@ float CpuSampler::GetSystemLoad() {
- if (sscanf(statbuf.c_str(), "cpu %Lu %Lu %Lu %Lu",
- &user, &nice,
- &system, &idle) != 4) {
-- LOG_ERR(LS_ERROR) << "Could not parse cpu info";
-+ LOG_ERR_KOP(LS_ERROR) << "Could not parse cpu info";
- return 0.f;
- }
- const uint64 cpu_times = nice + system + user;
-@@ -351,7 +351,7 @@ float CpuSampler::GetProcessLoad() {
- #if defined(LINUX) || defined(ANDROID)
- rusage usage;
- if (getrusage(RUSAGE_SELF, &usage) < 0) {
-- LOG_ERR(LS_ERROR) << "getrusage failed";
-+ LOG_ERR_KOP(LS_ERROR) << "getrusage failed";
- return 0.f;
- }
-
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/base/linux.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/base/linux.cc
-@@ -288,7 +288,7 @@ std::string ReadLinuxLsbRelease() {
- // No cached result. Run lsb_release and parse output.
- POpenStream lsb_release_output;
- if (!lsb_release_output.Open("lsb_release -idrcs", "r", NULL)) {
-- LOG_ERR(LS_ERROR) << "Can't run lsb_release";
-+ LOG_ERR_KOP(LS_ERROR) << "Can't run lsb_release";
- return lsb_release_string; // empty
- }
- // Read in the command's output and build the string.
-@@ -335,7 +335,7 @@ std::string ReadLinuxLsbRelease() {
- std::string ReadLinuxUname() {
- struct utsname buf;
- if (uname(&buf) < 0) {
-- LOG_ERR(LS_ERROR) << "Can't call uname()";
-+ LOG_ERR_KOP(LS_ERROR) << "Can't call uname()";
- return std::string();
- }
- std::ostringstream sstr;
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/base/logging.h
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/base/logging.h
-@@ -47,7 +47,7 @@
- // LOG_ERRNO(sev) attempts to add a string description of an errno-derived
- // error. errno and associated facilities exist on both Windows and POSIX,
- // but on Windows they only apply to the C/C++ runtime.
--// LOG_ERR(sev) is an alias for the platform's normal error system, i.e. _GLE on
-+// LOG_ERR_KOP(sev) is an alias for the platform's normal error system, i.e. _GLE on
- // Windows and _ERRNO on POSIX.
- // (The above three also all have _EX versions that let you specify the error
- // code, rather than using the last one.)
-@@ -355,14 +355,14 @@ inline bool LogCheckLevel(LoggingSeverit
- LOG_E(sev, HRESULT, GetLastError(), mod)
- #define LOG_ERR_EX(sev, err) \
- LOG_GLE_EX(sev, err)
--#define LOG_ERR(sev) \
-+#define LOG_ERR_KOP(sev) \
- LOG_GLE(sev)
- #define LAST_SYSTEM_ERROR \
- (::GetLastError())
- #elif POSIX
- #define LOG_ERR_EX(sev, err) \
- LOG_ERRNO_EX(sev, err)
--#define LOG_ERR(sev) \
-+#define LOG_ERR_KOP(sev) \
- LOG_ERRNO(sev)
- #define LAST_SYSTEM_ERROR \
- (errno)
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/base/network.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/base/network.cc
-@@ -189,7 +189,7 @@ bool BasicNetworkManager::CreateNetworks
- struct ifaddrs* interfaces;
- int error = getifaddrs(&interfaces);
- if (error != 0) {
-- LOG_ERR(LERROR) << "getifaddrs failed to gather interface data: " << error;
-+ LOG_ERR_KOP(LERROR) << "getifaddrs failed to gather interface data: " << error;
- return false;
- }
- struct ifaddrs* cursor = interfaces;
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/base/physicalsocketserver.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/base/physicalsocketserver.cc
-@@ -654,14 +654,14 @@ class PosixSignalHandler {
- private:
- PosixSignalHandler() {
- if (pipe(afd_) < 0) {
-- LOG_ERR(LS_ERROR) << "pipe failed";
-+ LOG_ERR_KOP(LS_ERROR) << "pipe failed";
- return;
- }
- if (fcntl(afd_[0], F_SETFL, O_NONBLOCK) < 0) {
-- LOG_ERR(LS_WARNING) << "fcntl #1 failed";
-+ LOG_ERR_KOP(LS_WARNING) << "fcntl #1 failed";
- }
- if (fcntl(afd_[1], F_SETFL, O_NONBLOCK) < 0) {
-- LOG_ERR(LS_WARNING) << "fcntl #2 failed";
-+ LOG_ERR_KOP(LS_WARNING) << "fcntl #2 failed";
- }
- memset(const_cast<void *>(static_cast<volatile void *>(received_signal_)),
- 0,
-@@ -720,7 +720,7 @@ class PosixSignalDispatcher : public Dis
- uint8 b[16];
- ssize_t ret = read(GetDescriptor(), b, sizeof(b));
- if (ret < 0) {
-- LOG_ERR(LS_WARNING) << "Error in read()";
-+ LOG_ERR_KOP(LS_WARNING) << "Error in read()";
- } else if (ret == 0) {
- LOG(LS_WARNING) << "Should have read at least one byte";
- }
-@@ -835,7 +835,7 @@ class SocketDispatcher : public Dispatch
- // "connection lost"-type error as a blocking error, because typically
- // the next recv() will get EOF, so we'll still eventually notice that
- // the socket is closed.
-- LOG_ERR(LS_WARNING) << "Assuming benign blocking error";
-+ LOG_ERR_KOP(LS_WARNING) << "Assuming benign blocking error";
- return false;
- }
- }
-@@ -1438,7 +1438,7 @@ bool PhysicalSocketServer::InstallSignal
- struct sigaction act;
- // It doesn't really matter what we set this mask to.
- if (sigemptyset(&act.sa_mask) != 0) {
-- LOG_ERR(LS_ERROR) << "Couldn't set mask";
-+ LOG_ERR_KOP(LS_ERROR) << "Couldn't set mask";
- return false;
- }
- act.sa_handler = handler;
-@@ -1447,7 +1447,7 @@ bool PhysicalSocketServer::InstallSignal
- // real standard for which ones. :(
- act.sa_flags = SA_RESTART;
- if (sigaction(signum, &act, NULL) != 0) {
-- LOG_ERR(LS_ERROR) << "Couldn't set sigaction";
-+ LOG_ERR_KOP(LS_ERROR) << "Couldn't set sigaction";
- return false;
- }
- return true;
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/base/posix.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/base/posix.cc
-@@ -63,7 +63,7 @@ bool RunAsDaemon(const char *file, const
- // Fork intermediate child to daemonize.
- pid_t pid = fork();
- if (pid < 0) {
-- LOG_ERR(LS_ERROR) << "fork()";
-+ LOG_ERR_KOP(LS_ERROR) << "fork()";
- return false;
- } else if (!pid) {
- // Child.
-@@ -112,7 +112,7 @@ bool RunAsDaemon(const char *file, const
- int status;
- pid_t child = waitpid(pid, &status, 0);
- if (child < 0) {
-- LOG_ERR(LS_ERROR) << "Error in waitpid()";
-+ LOG_ERR_KOP(LS_ERROR) << "Error in waitpid()";
- return false;
- }
- if (child != pid) {
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/base/socketadapters.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/base/socketadapters.cc
-@@ -123,7 +123,7 @@ void BufferedReadAdapter::OnReadEvent(As
- int len = socket_->Recv(buffer_ + data_len_, buffer_size_ - data_len_);
- if (len < 0) {
- // TODO: Do something better like forwarding the error to the user.
-- LOG_ERR(INFO) << "Recv";
-+ LOG_ERR_KOP(INFO) << "Recv";
- return;
- }
-
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/base/thread.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/base/thread.cc
-@@ -157,7 +157,7 @@ bool Thread::SleepMs(int milliseconds) {
- ts.tv_nsec = (milliseconds % 1000) * 1000000;
- int ret = nanosleep(&ts, NULL);
- if (ret != 0) {
-- LOG_ERR(LS_WARNING) << "nanosleep() returning early";
-+ LOG_ERR_KOP(LS_WARNING) << "nanosleep() returning early";
- return false;
- }
- return true;
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/base/unixfilesystem.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/base/unixfilesystem.cc
-@@ -124,12 +124,12 @@ bool UnixFilesystem::CreatePrivateFile(c
- O_RDWR | O_CREAT | O_EXCL,
- S_IRUSR | S_IWUSR);
- if (fd < 0) {
-- LOG_ERR(LS_ERROR) << "open() failed.";
-+ LOG_ERR_KOP(LS_ERROR) << "open() failed.";
- return false;
- }
- // Don't need to keep the file descriptor.
- if (close(fd) < 0) {
-- LOG_ERR(LS_ERROR) << "close() failed.";
-+ LOG_ERR_KOP(LS_ERROR) << "close() failed.";
- // Continue.
- }
- return true;
-@@ -508,7 +508,7 @@ Pathname UnixFilesystem::GetCurrentDirec
- char *path = getcwd(buffer, PATH_MAX);
-
- if (!path) {
-- LOG_ERR(LS_ERROR) << "getcwd() failed";
-+ LOG_ERR_KOP(LS_ERROR) << "getcwd() failed";
- return cwd; // returns empty pathname
- }
- cwd.SetFolder(std::string(path));
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/base/win32filesystem.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/base/win32filesystem.cc
-@@ -97,7 +97,7 @@ bool Win32Filesystem::CreatePrivateFile(
- if (!::OpenProcessToken(::GetCurrentProcess(),
- TOKEN_QUERY,
- &process_token)) {
-- LOG_ERR(LS_ERROR) << "OpenProcessToken() failed";
-+ LOG_ERR_KOP(LS_ERROR) << "OpenProcessToken() failed";
- return false;
- }
-
-@@ -123,12 +123,12 @@ bool Win32Filesystem::CreatePrivateFile(
- // We're now done with this.
- ::CloseHandle(process_token);
- if (!success) {
-- LOG_ERR(LS_ERROR) << "GetTokenInformation() failed";
-+ LOG_ERR_KOP(LS_ERROR) << "GetTokenInformation() failed";
- return false;
- }
-
- if (!IsValidSid(token_user->User.Sid)) {
-- LOG_ERR(LS_ERROR) << "Current process has invalid user SID";
-+ LOG_ERR_KOP(LS_ERROR) << "Current process has invalid user SID";
- return false;
- }
-
-@@ -141,7 +141,7 @@ bool Win32Filesystem::CreatePrivateFile(
- PACL acl = reinterpret_cast<PACL>(acl_bytes.get());
- memset(acl, 0, acl_size);
- if (!::InitializeAcl(acl, acl_size, ACL_REVISION)) {
-- LOG_ERR(LS_ERROR) << "InitializeAcl() failed";
-+ LOG_ERR_KOP(LS_ERROR) << "InitializeAcl() failed";
- return false;
- }
-
-@@ -150,7 +150,7 @@ bool Win32Filesystem::CreatePrivateFile(
- ACL_REVISION,
- GENERIC_READ | GENERIC_WRITE | STANDARD_RIGHTS_ALL,
- token_user->User.Sid)) {
-- LOG_ERR(LS_ERROR) << "AddAccessAllowedAce() failed";
-+ LOG_ERR_KOP(LS_ERROR) << "AddAccessAllowedAce() failed";
- return false;
- }
-
-@@ -158,7 +158,7 @@ bool Win32Filesystem::CreatePrivateFile(
- SECURITY_DESCRIPTOR security_descriptor;
- if (!::InitializeSecurityDescriptor(&security_descriptor,
- SECURITY_DESCRIPTOR_REVISION)) {
-- LOG_ERR(LS_ERROR) << "InitializeSecurityDescriptor() failed";
-+ LOG_ERR_KOP(LS_ERROR) << "InitializeSecurityDescriptor() failed";
- return false;
- }
-
-@@ -167,7 +167,7 @@ bool Win32Filesystem::CreatePrivateFile(
- TRUE,
- acl,
- FALSE)) {
-- LOG_ERR(LS_ERROR) << "SetSecurityDescriptorDacl() failed";
-+ LOG_ERR_KOP(LS_ERROR) << "SetSecurityDescriptorDacl() failed";
- return false;
- }
-
-@@ -185,11 +185,11 @@ bool Win32Filesystem::CreatePrivateFile(
- 0,
- NULL);
- if (INVALID_HANDLE_VALUE == handle) {
-- LOG_ERR(LS_ERROR) << "CreateFile() failed";
-+ LOG_ERR_KOP(LS_ERROR) << "CreateFile() failed";
- return false;
- }
- if (!::CloseHandle(handle)) {
-- LOG_ERR(LS_ERROR) << "CloseFile() failed";
-+ LOG_ERR_KOP(LS_ERROR) << "CloseFile() failed";
- // Continue.
- }
- return true;
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/p2p/base/relayserver.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/p2p/base/relayserver.cc
-@@ -56,7 +56,7 @@ void Send(talk_base::AsyncPacketSocket*
- LOG(LS_ERROR) << "SendTo wrote only " << result << " of " << size
- << " bytes";
- } else if (result < 0) {
-- LOG_ERR(LS_ERROR) << "SendTo";
-+ LOG_ERR_KOP(LS_ERROR) << "SendTo";
- }
- }
-
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/p2p/base/stunserver.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/p2p/base/stunserver.cc
-@@ -145,7 +145,7 @@ void StunServer::SendResponse(
- // TODO: Allow response addr attribute if sent from another stun server.
-
- if (socket_->SendTo(buf.Data(), buf.Length(), addr) < 0)
-- LOG_ERR(LS_ERROR) << "sendto";
-+ LOG_ERR_KOP(LS_ERROR) << "sendto";
- }
-
- } // namespace cricket
---- kopete-20.12.0.orig/protocols/jabber/libjingle/talk/session/phone/linuxdevicemanager.cc
-+++ kopete-20.12.0/protocols/jabber/libjingle/talk/session/phone/linuxdevicemanager.cc
-@@ -315,7 +315,7 @@ bool LinuxDeviceWatcher::Start() {
- }
- udev_ = LATE(udev_new)();
- if (!udev_) {
-- LOG_ERR(LS_ERROR) << "udev_new()";
-+ LOG_ERR_KOP(LS_ERROR) << "udev_new()";
- return true;
- }
- // The second argument here is the event source. It can be either "kernel" or
-@@ -323,7 +323,7 @@ bool LinuxDeviceWatcher::Start() {
- // udev daemon in turn listens on the kernel.
- udev_monitor_ = LATE(udev_monitor_new_from_netlink)(udev_, "udev");
- if (!udev_monitor_) {
-- LOG_ERR(LS_ERROR) << "udev_monitor_new_from_netlink()";
-+ LOG_ERR_KOP(LS_ERROR) << "udev_monitor_new_from_netlink()";
- return true;
- }
- // We only listen for changes in the video devices. Audio devices are more or
-@@ -337,11 +337,11 @@ bool LinuxDeviceWatcher::Start() {
- if (LATE(udev_monitor_filter_add_match_subsystem_devtype)(udev_monitor_,
- "video4linux",
- NULL) < 0) {
-- LOG_ERR(LS_ERROR) << "udev_monitor_filter_add_match_subsystem_devtype()";
-+ LOG_ERR_KOP(LS_ERROR) << "udev_monitor_filter_add_match_subsystem_devtype()";
- return true;
- }
- if (LATE(udev_monitor_enable_receiving)(udev_monitor_) < 0) {
-- LOG_ERR(LS_ERROR) << "udev_monitor_enable_receiving()";
-+ LOG_ERR_KOP(LS_ERROR) << "udev_monitor_enable_receiving()";
- return true;
- }
- static_cast<talk_base::PhysicalSocketServer*>(
-@@ -380,7 +380,7 @@ void LinuxDeviceWatcher::OnEvent(uint32
- if (!device) {
- // Probably the socket connection to the udev daemon was terminated (perhaps
- // the daemon crashed or is being restarted?).
-- LOG_ERR(LS_WARNING) << "udev_monitor_receive_device()";
-+ LOG_ERR_KOP(LS_WARNING) << "udev_monitor_receive_device()";
- // Stop listening to avoid potential livelock (an fd with EOF in it is
- // always considered readable).
- static_cast<talk_base::PhysicalSocketServer*>(
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e4028c6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-kopete-17.08.3-openssl-1.1.patch
-fix-mediastreamer-ftbfs.patch
-kopete-srtp2.patch
-find-mediastreamer.patch
-log-error
-c++-mediastream.patch
More information about the Neon-commits
mailing list