From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- .../mcproxy/files/fix_checksum_calculation.patch | 41 ---------- net-misc/mcproxy/files/mcproxy-1.1.1-clang.patch | 93 ++++++++++++++++++++++ .../mcproxy-1.1.1-fix-checksum-calculation.patch | 41 ++++++++++ 3 files changed, 134 insertions(+), 41 deletions(-) delete mode 100644 net-misc/mcproxy/files/fix_checksum_calculation.patch create mode 100644 net-misc/mcproxy/files/mcproxy-1.1.1-clang.patch create mode 100644 net-misc/mcproxy/files/mcproxy-1.1.1-fix-checksum-calculation.patch (limited to 'net-misc/mcproxy/files') diff --git a/net-misc/mcproxy/files/fix_checksum_calculation.patch b/net-misc/mcproxy/files/fix_checksum_calculation.patch deleted file mode 100644 index 2cbfb6590b72..000000000000 --- a/net-misc/mcproxy/files/fix_checksum_calculation.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 93b5ace42268160ebbfff4c61818fb15fa2d9b99 Mon Sep 17 00:00:00 2001 -From: Sebastian Woelke -Date: Thu, 24 Aug 2017 14:41:50 +0200 -Subject: [PATCH] Fix checksum calculation - ---- - mcproxy/src/utils/mroute_socket.cpp | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/mcproxy/src/utils/mroute_socket.cpp b/mcproxy/src/utils/mroute_socket.cpp -index 61289dd..3a55359 100644 ---- a/src/utils/mroute_socket.cpp -+++ b/src/utils/mroute_socket.cpp -@@ -157,17 +157,23 @@ u_int16_t mroute_socket::calc_checksum(const unsigned char* buf, int buf_size) c - - u_int16_t* b = (u_int16_t*)buf; - int sum = 0; -+ int csum; - - for (int i = 0; i < buf_size / 2; i++) { -- ADD_SIGNED_NUM_U16(sum, b[i]); -- //sum +=b[i]; -+ sum +=b[i]; - } - - if (buf_size % 2 == 1) { -- //sum += buf[buf_size-1]; -- ADD_SIGNED_NUM_U16(sum, buf[buf_size - 1]); -+ sum += buf[buf_size-1]; - } - -+ // fold checksum -+ csum = sum & 0xFFFF; -+ sum = sum >> 16; -+ sum += csum; -+ // fold again in case of overflow. -+ sum += sum >> 16; -+ - return ~sum; - } - diff --git a/net-misc/mcproxy/files/mcproxy-1.1.1-clang.patch b/net-misc/mcproxy/files/mcproxy-1.1.1-clang.patch new file mode 100644 index 000000000000..e3db8f754093 --- /dev/null +++ b/net-misc/mcproxy/files/mcproxy-1.1.1-clang.patch @@ -0,0 +1,93 @@ +From 842e2859669f8a721c10c4f8d019f78f37e29e48 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki +Date: Sun, 20 Sep 2020 16:28:39 +0200 +Subject: [PATCH] mcproxy/mcproxy.pro: fix compilation with clang + +If -L/usr/lib is being included, this will break compiling on 64-bit with clang. + +Signed-off-by: Conrad Kostecki +--- + mcproxy/mcproxy.pro | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mcproxy.pro b/mcproxy.pro +index 5216198..b576b3c 100644 +--- a/mcproxy.pro ++++ b/mcproxy.pro +@@ -15,7 +15,7 @@ tester { + HEADERS += include/tester/config_map.hpp \ + include/tester/tester.hpp + +- LIBS += -L/usr/lib -lboost_regex ++ LIBS += -lboost_regex + } + + mcproxy { #default mode +@@ -123,7 +123,7 @@ HEADERS += include/hamcast_logging.h \ + include/parser/parser.hpp \ + include/parser/interface.hpp + +-LIBS += -L/usr/lib -lpthread ++LIBS += -lpthread + + QMAKE_CLEAN += thread* + +From 5b2f3e3e2ea23c3bb8e72a90e18177f69e350d37 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki +Date: Sun, 20 Sep 2020 16:38:03 +0200 +Subject: [PATCH] include/proxy/message_queue.hpp: fix compilation with clang + +Signed-off-by: Conrad Kostecki +--- + mcproxy/include/proxy/message_queue.hpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/include/proxy/message_queue.hpp b/include/proxy/message_queue.hpp +index 347a616..ede35ab 100644 +--- a/include/proxy/message_queue.hpp ++++ b/include/proxy/message_queue.hpp +@@ -101,7 +101,7 @@ bool message_queue::is_empty() const + { + HC_LOG_TRACE(""); + +- std::lock_guard lock(m_global_lock); ++ std::lock_guard lock(this->m_global_lock); + + return m_q.empty(); + } +@@ -111,7 +111,7 @@ unsigned int message_queue::size() const + { + HC_LOG_TRACE(""); + +- std::lock_guard lock(m_global_lock); ++ std::lock_guard lock(this->m_global_lock); + + return m_q.size(); + } +@@ -130,7 +130,7 @@ bool message_queue::enqueue_loseable(const T& t) + HC_LOG_TRACE(""); + + { +- std::unique_lock lock(m_global_lock); ++ std::unique_lock lock(this->m_global_lock); + if (m_q.size() < m_size) { + m_q.push(t); + } else { +@@ -148,7 +148,7 @@ void message_queue::enqueue(const T& t) + HC_LOG_TRACE(""); + + { +- std::unique_lock lock(m_global_lock); ++ std::unique_lock lock(this->m_global_lock); + m_q.push(t); + } + cond_empty.notify_one(); +@@ -162,7 +162,7 @@ T message_queue::dequeue(void) + + T t; + { +- std::unique_lock lock(m_global_lock); ++ std::unique_lock lock(this->m_global_lock); + cond_empty.wait(lock, [&]() { + return m_q.size() != 0; + }); diff --git a/net-misc/mcproxy/files/mcproxy-1.1.1-fix-checksum-calculation.patch b/net-misc/mcproxy/files/mcproxy-1.1.1-fix-checksum-calculation.patch new file mode 100644 index 000000000000..2cbfb6590b72 --- /dev/null +++ b/net-misc/mcproxy/files/mcproxy-1.1.1-fix-checksum-calculation.patch @@ -0,0 +1,41 @@ +From 93b5ace42268160ebbfff4c61818fb15fa2d9b99 Mon Sep 17 00:00:00 2001 +From: Sebastian Woelke +Date: Thu, 24 Aug 2017 14:41:50 +0200 +Subject: [PATCH] Fix checksum calculation + +--- + mcproxy/src/utils/mroute_socket.cpp | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/mcproxy/src/utils/mroute_socket.cpp b/mcproxy/src/utils/mroute_socket.cpp +index 61289dd..3a55359 100644 +--- a/src/utils/mroute_socket.cpp ++++ b/src/utils/mroute_socket.cpp +@@ -157,17 +157,23 @@ u_int16_t mroute_socket::calc_checksum(const unsigned char* buf, int buf_size) c + + u_int16_t* b = (u_int16_t*)buf; + int sum = 0; ++ int csum; + + for (int i = 0; i < buf_size / 2; i++) { +- ADD_SIGNED_NUM_U16(sum, b[i]); +- //sum +=b[i]; ++ sum +=b[i]; + } + + if (buf_size % 2 == 1) { +- //sum += buf[buf_size-1]; +- ADD_SIGNED_NUM_U16(sum, buf[buf_size - 1]); ++ sum += buf[buf_size-1]; + } + ++ // fold checksum ++ csum = sum & 0xFFFF; ++ sum = sum >> 16; ++ sum += csum; ++ // fold again in case of overflow. ++ sum += sum >> 16; ++ + return ~sum; + } + -- cgit v1.2.3