[neon/extras/qca2/Neon/stable] debian: hurd_msync.diff: drop, no more needed

[Pino Toscano]

Git commit 72aed09c850c19291a26f1ea5b01bce42077c7d4 by Pino Toscano.
Committed on 05/02/2021 at 09:32.
Pushed by jriddell into branch 'Neon/stable'.

hurd_msync.diff: drop, no more needed

M  +2    -0    debian/changelog
D  +0    -43   debian/patches/hurd_msync.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/extras/qca2/commit/72aed09c850c19291a26f1ea5b01bce42077c7d4

diff --git a/debian/changelog b/debian/changelog
index e2e806c..f15c0b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qca2 (2.3.2-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Drop patch hurd_msync.diff, as now Hurd implements msync().
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Feb 2021 10:30:25 +0100
 
diff --git a/debian/patches/hurd_msync.diff b/debian/patches/hurd_msync.diff
deleted file mode 100644
index 4a46727..0000000
--- a/debian/patches/hurd_msync.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Ignore ENOSYS errors for msync() on Hurd
- Due to mlock() issues the mmap allocator is used; that allocator uses msync(),
- which is not implemented yet in glibc for Hurd (thus returning ENOSYS).
- Temporarily ignore such failures, with the option to not fail on other errors
- (in case msync() gets implemented).
-Last-Update: 2012-06-03
-Forwarded: not-needed
-
---- a/src/botantools/botan/alloc_mmap/mmap_mem.cpp
-+++ b/src/botantools/botan/alloc_mmap/mmap_mem.cpp
-@@ -63,6 +63,9 @@ namespace QCA { // WRAPNS_LINE
- } // WRAPNS_LINE
- #include <fcntl.h>
- namespace QCA { // WRAPNS_LINE
-+} // WRAPNS_LINE
-+#include <errno.h>
-+namespace QCA { // WRAPNS_LINE
- 
- #ifndef MAP_FAILED
- #define MAP_FAILED -1
-@@ -169,11 +172,19 @@ void MemoryMapping_Allocator::dealloc_bl
- 
-     for (u32bit j = 0; j != OVERWRITE_PASSES; j++) {
-         std::memset(ptr, PATTERNS[j % sizeof(PATTERNS)], n);
--        if (msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC))
-+        if (msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC)
-+#ifdef __GNU__
-+            && errno != ENOSYS
-+#endif
-+           )
-             throw MemoryMapping_Failed("Sync operation failed");
-     }
-     std::memset(ptr, 0, n);
--    if (msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC))
-+    if (msync(MLOCK_TYPE_CAST ptr, n, MS_SYNC)
-+#ifdef __GNU__
-+        && errno != ENOSYS
-+#endif
-+       )
-         throw MemoryMapping_Failed("Sync operation failed");
- 
-     if (munmap(MLOCK_TYPE_CAST ptr, n))
diff --git a/debian/patches/series b/debian/patches/series
index f9b23b5..192bae1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 define_qca_export.diff
 pipeunittest_more_wait.diff
-hurd_msync.diff
 kubuntu_ignore_filewatch_test.diff