New Upstream Release - libnop
Ready changes
Summary
Merged new upstream version: 0.0~git20211103.35e800d (was: 0.0~git20200728.45dfe0f).
Resulting package
Built on 2023-02-26T06:44 (took 2m26s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases libnop-dev
Lintian Result
Diff
diff --git a/debian/changelog b/debian/changelog
index 52b4407..fdc6371 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libnop (0.0~git20211103.35e800d-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ * Drop patch 910b55815be16109f04f4180e9adee14fb4ce281.patch, present upstream.
+ * Drop patch 35e800d81f28c632956c5a592e3cbe8085ecd430.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sun, 26 Feb 2023 06:42:16 -0000
+
libnop (0.0~git20200728.45dfe0f-4) unstable; urgency=medium
* Cherry-pick upstream commit to fix GCC-11 FTBFS. (Closes: #984190)
diff --git a/debian/patches/35e800d81f28c632956c5a592e3cbe8085ecd430.patch b/debian/patches/35e800d81f28c632956c5a592e3cbe8085ecd430.patch
deleted file mode 100644
index f6b389c..0000000
--- a/debian/patches/35e800d81f28c632956c5a592e3cbe8085ecd430.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 35e800d81f28c632956c5a592e3cbe8085ecd430 Mon Sep 17 00:00:00 2001
-From: Corey Tabaka <eieio@google.com>
-Date: Tue, 2 Nov 2021 18:51:11 -0700
-Subject: [PATCH] Fix for -Werror=range-loop-construct in GCC 11.
-
-Range iteration in GCC 11 triggers range-loop-construct due to mismatch
-between element types (const key) forcing a copy. Switch to const auto&
-to avoid the type mismatch.
----
- include/nop/base/map.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/nop/base/map.h b/include/nop/base/map.h
-index 7c4cb9a..1b028a9 100644
---- a/include/nop/base/map.h
-+++ b/include/nop/base/map.h
-@@ -67,7 +67,7 @@ struct Encoding<std::map<Key, T, Compare, Allocator>>
- if (!status)
- return status;
-
-- for (const std::pair<Key, T>& element : value) {
-+ for (const auto& element : value) {
- status = Encoding<Key>::Write(element.first, writer);
- if (!status)
- return status;
-@@ -139,7 +139,7 @@ struct Encoding<std::unordered_map<Key, T, Hash, KeyEqual, Allocator>>
- if (!status)
- return status;
-
-- for (const std::pair<Key, T>& element : value) {
-+ for (const auto& element : value) {
- status = Encoding<Key>::Write(element.first, writer);
- if (!status)
- return status;
diff --git a/debian/patches/910b55815be16109f04f4180e9adee14fb4ce281.patch b/debian/patches/910b55815be16109f04f4180e9adee14fb4ce281.patch
deleted file mode 100644
index 470400b..0000000
--- a/debian/patches/910b55815be16109f04f4180e9adee14fb4ce281.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 910b55815be16109f04f4180e9adee14fb4ce281 Mon Sep 17 00:00:00 2001
-From: Corey Tabaka <eieio@google.com>
-Date: Thu, 5 Nov 2020 10:25:16 -0800
-Subject: [PATCH] Fix overflow warnings (errors) in tests on 32bit builds.
-
----
- test/serializer_tests.cpp | 60 +++++++++++++++++++--------------------
- 1 file changed, 30 insertions(+), 30 deletions(-)
-
-diff --git a/test/serializer_tests.cpp b/test/serializer_tests.cpp
-index af86280..c0e39eb 100644
---- a/test/serializer_tests.cpp
-+++ b/test/serializer_tests.cpp
-@@ -2965,24 +2965,24 @@ TEST(Serializer, size_t) {
- EXPECT_EQ(expected, writer.data());
- writer.clear();
-
-- if (sizeof(std::size_t) == sizeof(std::uint64_t)) {
-- // Min U64.
-- value = (1LLU << 32);
-- status = serializer.Write(value);
-- ASSERT_TRUE(status);
-- expected = Compose(EncodingByte::U64, Integer<std::uint64_t>(1LLU << 32));
-- EXPECT_EQ(expected, writer.data());
-- writer.clear();
-+#if SIZE_MAX == UINT64_MAX
-+ // Min U64.
-+ value = (1LLU << 32);
-+ status = serializer.Write(value);
-+ ASSERT_TRUE(status);
-+ expected = Compose(EncodingByte::U64, Integer<std::uint64_t>(1LLU << 32));
-+ EXPECT_EQ(expected, writer.data());
-+ writer.clear();
-
-- // Max U64.
-- value = 0xffffffffffffffffLLU;
-- status = serializer.Write(value);
-- ASSERT_TRUE(status);
-- expected = Compose(EncodingByte::U64,
-- Integer<std::uint64_t>(0xffffffffffffffffLLU));
-- EXPECT_EQ(expected, writer.data());
-- writer.clear();
-- }
-+ // Max U64.
-+ value = 0xffffffffffffffffLLU;
-+ status = serializer.Write(value);
-+ ASSERT_TRUE(status);
-+ expected =
-+ Compose(EncodingByte::U64, Integer<std::uint64_t>(0xffffffffffffffffLLU));
-+ EXPECT_EQ(expected, writer.data());
-+ writer.clear();
-+#endif
- }
-
- TEST(Deserializer, size_t) {
-@@ -3039,20 +3039,20 @@ TEST(Deserializer, size_t) {
- ASSERT_TRUE(status);
- EXPECT_EQ(0xffffffffU, value);
-
-- if (sizeof(std::size_t) == sizeof(std::uint64_t)) {
-- // Min U64.
-- reader.Set(Compose(EncodingByte::U64, Integer<std::uint64_t>(0)));
-- status = deserializer.Read(&value);
-- ASSERT_TRUE(status);
-- EXPECT_EQ(0U, value);
-+#if SIZE_MAX == UINT64_MAX
-+ // Min U64.
-+ reader.Set(Compose(EncodingByte::U64, Integer<std::uint64_t>(0)));
-+ status = deserializer.Read(&value);
-+ ASSERT_TRUE(status);
-+ EXPECT_EQ(0U, value);
-
-- // Max U64.
-- reader.Set(Compose(EncodingByte::U64,
-- Integer<std::uint64_t>(0xffffffffffffffffLLU)));
-- status = deserializer.Read(&value);
-- ASSERT_TRUE(status);
-- EXPECT_EQ(0xffffffffffffffffLLU, value);
-- }
-+ // Max U64.
-+ reader.Set(Compose(EncodingByte::U64,
-+ Integer<std::uint64_t>(0xffffffffffffffffLLU)));
-+ status = deserializer.Read(&value);
-+ ASSERT_TRUE(status);
-+ EXPECT_EQ(0xffffffffffffffffLLU, value);
-+#endif
-
- // Test short payload.
- reader.Set(Compose(EncodingByte::U32));
diff --git a/debian/patches/series b/debian/patches/series
index 7bdabc4..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-910b55815be16109f04f4180e9adee14fb4ce281.patch
-35e800d81f28c632956c5a592e3cbe8085ecd430.patch
diff --git a/include/nop/base/map.h b/include/nop/base/map.h
index 7c4cb9a..1b028a9 100644
--- a/include/nop/base/map.h
+++ b/include/nop/base/map.h
@@ -67,7 +67,7 @@ struct Encoding<std::map<Key, T, Compare, Allocator>>
if (!status)
return status;
- for (const std::pair<Key, T>& element : value) {
+ for (const auto& element : value) {
status = Encoding<Key>::Write(element.first, writer);
if (!status)
return status;
@@ -139,7 +139,7 @@ struct Encoding<std::unordered_map<Key, T, Hash, KeyEqual, Allocator>>
if (!status)
return status;
- for (const std::pair<Key, T>& element : value) {
+ for (const auto& element : value) {
status = Encoding<Key>::Write(element.first, writer);
if (!status)
return status;
diff --git a/test/serializer_tests.cpp b/test/serializer_tests.cpp
index af86280..c0e39eb 100644
--- a/test/serializer_tests.cpp
+++ b/test/serializer_tests.cpp
@@ -2965,24 +2965,24 @@ TEST(Serializer, size_t) {
EXPECT_EQ(expected, writer.data());
writer.clear();
- if (sizeof(std::size_t) == sizeof(std::uint64_t)) {
- // Min U64.
- value = (1LLU << 32);
- status = serializer.Write(value);
- ASSERT_TRUE(status);
- expected = Compose(EncodingByte::U64, Integer<std::uint64_t>(1LLU << 32));
- EXPECT_EQ(expected, writer.data());
- writer.clear();
+#if SIZE_MAX == UINT64_MAX
+ // Min U64.
+ value = (1LLU << 32);
+ status = serializer.Write(value);
+ ASSERT_TRUE(status);
+ expected = Compose(EncodingByte::U64, Integer<std::uint64_t>(1LLU << 32));
+ EXPECT_EQ(expected, writer.data());
+ writer.clear();
- // Max U64.
- value = 0xffffffffffffffffLLU;
- status = serializer.Write(value);
- ASSERT_TRUE(status);
- expected = Compose(EncodingByte::U64,
- Integer<std::uint64_t>(0xffffffffffffffffLLU));
- EXPECT_EQ(expected, writer.data());
- writer.clear();
- }
+ // Max U64.
+ value = 0xffffffffffffffffLLU;
+ status = serializer.Write(value);
+ ASSERT_TRUE(status);
+ expected =
+ Compose(EncodingByte::U64, Integer<std::uint64_t>(0xffffffffffffffffLLU));
+ EXPECT_EQ(expected, writer.data());
+ writer.clear();
+#endif
}
TEST(Deserializer, size_t) {
@@ -3039,20 +3039,20 @@ TEST(Deserializer, size_t) {
ASSERT_TRUE(status);
EXPECT_EQ(0xffffffffU, value);
- if (sizeof(std::size_t) == sizeof(std::uint64_t)) {
- // Min U64.
- reader.Set(Compose(EncodingByte::U64, Integer<std::uint64_t>(0)));
- status = deserializer.Read(&value);
- ASSERT_TRUE(status);
- EXPECT_EQ(0U, value);
+#if SIZE_MAX == UINT64_MAX
+ // Min U64.
+ reader.Set(Compose(EncodingByte::U64, Integer<std::uint64_t>(0)));
+ status = deserializer.Read(&value);
+ ASSERT_TRUE(status);
+ EXPECT_EQ(0U, value);
- // Max U64.
- reader.Set(Compose(EncodingByte::U64,
- Integer<std::uint64_t>(0xffffffffffffffffLLU)));
- status = deserializer.Read(&value);
- ASSERT_TRUE(status);
- EXPECT_EQ(0xffffffffffffffffLLU, value);
- }
+ // Max U64.
+ reader.Set(Compose(EncodingByte::U64,
+ Integer<std::uint64_t>(0xffffffffffffffffLLU)));
+ status = deserializer.Read(&value);
+ ASSERT_TRUE(status);
+ EXPECT_EQ(0xffffffffffffffffLLU, value);
+#endif
// Test short payload.
reader.Set(Compose(EncodingByte::U32));
Debdiff
File lists identical (after any substitutions)
No differences were encountered in the control files