[SCM] QCA2 library packaging branch, master, updated. debian/2.0.3-3-5-g1a5a4cf

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca2.git;a=commitdiff;h=fa3dfd0

The following commit has been merged in the master branch:
commit fa3dfd08ce2251f8f7777099f8abdf721416637f
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jun 3 13:47:56 2012 +0200

    add patch hurd_msync.diff
    
    temporarly ignore ENOSYS errors for Hurd's msync()
---
 debian/changelog               |    2 +
 debian/patches/hurd_msync.diff |   43 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |    1 +
 3 files changed, 46 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d9ea2b..1068185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qca2 (2.0.3-4) UNRELEASED; urgency=low
   * Fix the symbols file.
   * Add pipeunittest_more_wait.diff to increase times of qWait() in the
     pipeunittest test (helps with Hurd).
+  * Add patch hurd_msync.diff to temporarly ignore ENOSYS errors for Hurd's
+    msync().
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 03 Jun 2012 13:28:53 +0200
 
diff --git a/debian/patches/hurd_msync.diff b/debian/patches/hurd_msync.diff
new file mode 100644
index 0000000..f380c12
--- /dev/null
+++ b/debian/patches/hurd_msync.diff
@@ -0,0 +1,43 @@
+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).
+ Temporarly 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
+@@ -158,11 +161,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 3f02004..e1c7f64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ define_qca_export.diff
 disable_randomunittest.diff
 fix_build_gcc4.7.diff
 pipeunittest_more_wait.diff
+hurd_msync.diff

-- 
QCA2 library packaging