[neon/extras/qca2/Neon/unstable] debian/patches: remove patches mostly unused
Jonathan Riddell
null at kde.org
Thu Oct 1 14:00:59 BST 2020
Git commit 42bc73921a7fbad7d1b6eafe140e8fedc11bc261 by Jonathan Riddell.
Committed on 01/10/2020 at 13:00.
Pushed by jriddell into branch 'Neon/unstable'.
remove patches mostly unused
D +0 -43 debian/patches/hurd_msync.diff
D +0 -20 debian/patches/kubuntu_ignore_filewatch_test.diff
D +0 -107 debian/patches/pipeunittest_more_wait.diff
D +0 -3 debian/patches/series
https://invent.kde.org/neon/extras/qca2/commit/42bc73921a7fbad7d1b6eafe140e8fedc11bc261
diff --git a/debian/patches/hurd_msync.diff b/debian/patches/hurd_msync.diff
deleted file mode 100644
index f380539..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
-@@ -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/kubuntu_ignore_filewatch_test.diff b/debian/patches/kubuntu_ignore_filewatch_test.diff
deleted file mode 100644
index eb7b88f..0000000
--- a/debian/patches/kubuntu_ignore_filewatch_test.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: ignore test
- this test works locally but not in the buildd for some reason
-Author: Jonathan Riddell
-Origin: me
-Forwarded: no, needs investigation why it is failing
-Last-Update: 2014-11-26
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: qca2-2.1.0/unittest/CMakeLists.txt
-===================================================================
---- qca2-2.1.0.orig/unittest/CMakeLists.txt
-+++ qca2-2.1.0/unittest/CMakeLists.txt
-@@ -13,7 +13,6 @@ add_subdirectory(cipherunittest)
- add_subdirectory(clientplugin)
- add_subdirectory(cms)
- add_subdirectory(dsaunittest)
--add_subdirectory(filewatchunittest)
- add_subdirectory(hashunittest)
- add_subdirectory(hexunittest)
- add_subdirectory(kdfunittest)
diff --git a/debian/patches/pipeunittest_more_wait.diff b/debian/patches/pipeunittest_more_wait.diff
deleted file mode 100644
index 79b0583..0000000
--- a/debian/patches/pipeunittest_more_wait.diff
+++ /dev/null
@@ -1,107 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: pipeunittest: raise the qWait() times to 100ms
- In some cases 1ms can be too few to be able to actually read the data from
- pipes and propagating the events with signals and timeouts.
- Raise the waits to 100ms to give enough time without slowing the test too
- much.
-Last-Update: 2012-06-03
-Forwarded: no
-
-Index: qca2/unittest/pipeunittest/pipeunittest.cpp
-===================================================================
---- qca2.orig/unittest/pipeunittest/pipeunittest.cpp 2015-02-13 16:48:50.902697891 +0100
-+++ qca2/unittest/pipeunittest/pipeunittest.cpp 2015-02-13 16:48:50.902697891 +0100
-@@ -109,17 +109,17 @@
- pipe1.readEnd().enable();
-
- pipe1.writeEnd().write( testData1 );
-- QTest::qWait(1); // process events
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
-+ QTest::qWait(100); // process events
- QByteArray out1 = pipe1.readEnd().read(); // read all...
- QCOMPARE( testData1, out1 );
-
- pipe1.writeEnd().write( testData1 ); // put it back in
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
- QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() );
-
- pipe1.writeEnd().write( testData2 ); // add some more data
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
- QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() + testData2.size() );
- QByteArray thisRead = pipe1.readEnd().read(1);
- QCOMPARE( thisRead, QByteArray("D") );
-@@ -144,17 +144,17 @@
- pipe1.readEnd().enable();
-
- pipe1.writeEnd().writeSecure( testData1 );
-- QTest::qWait(1); // process events
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
-+ QTest::qWait(100); // process events
- QCA::SecureArray out1 = pipe1.readEnd().readSecure(); // read all...
- QCOMPARE( testData1, out1 );
-
- pipe1.writeEnd().writeSecure( testData1 ); // put it back in
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
- QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() );
-
- pipe1.writeEnd().writeSecure( testData2 ); // add some more data
-- QTest::qWait(1); // process events
-+ QTest::qWait(100); // process events
- QCOMPARE( pipe1.readEnd().bytesAvailable(), testData1.size() + testData2.size() );
- QCA::SecureArray thisRead = pipe1.readEnd().readSecure(1);
- QCOMPARE( thisRead, QCA::SecureArray("D") );
-@@ -190,8 +190,8 @@
-
- QByteArray data("Far better, it is, to dare mighty things");
- pipe->writeEnd().write( data );
-- QTest::qWait(1);
-- QTest::qWait(1);
-+ QTest::qWait(100);
-+ QTest::qWait(100);
- QCOMPARE( readyReadSpy.count(), 1 );
- QCOMPARE( bytesWrittenSpy.count(), 1 );
- // this pulls out the first argument to the first signal as an integer
-@@ -202,11 +202,11 @@
- QCOMPARE( closedReadSpy.count(), 0 );
-
- pipe->readEnd().close();
-- QTest::qWait(1);
-+ QTest::qWait(100);
- QCOMPARE( closedWriteSpy.count(), 0 );
- QCOMPARE( closedReadSpy.count(), 1 );
- pipe->writeEnd().close();
-- QTest::qWait(1);
-+ QTest::qWait(100);
- QCOMPARE( closedWriteSpy.count(), 1 );
- QCOMPARE( closedReadSpy.count(), 1 );
- }
-@@ -237,8 +237,8 @@
-
- QCA::SecureArray data("Far better, it is, to dare mighty things");
- pipe->writeEnd().writeSecure( data );
-- QTest::qWait(1);
-- QTest::qWait(1);
-+ QTest::qWait(100);
-+ QTest::qWait(100);
- QCOMPARE( readyReadSpy.count(), 1 );
- QCOMPARE( bytesWrittenSpy.count(), 1 );
- // this pulls out the first argument to the first signal as an integer
-@@ -249,11 +249,11 @@
- QCOMPARE( closedReadSpy.count(), 0 );
-
- pipe->readEnd().close();
-- QTest::qWait(1);
-+ QTest::qWait(100);
- QCOMPARE( closedWriteSpy.count(), 0 );
- QCOMPARE( closedReadSpy.count(), 1 );
- pipe->writeEnd().close();
-- QTest::qWait(1);
-+ QTest::qWait(100);
- QCOMPARE( closedWriteSpy.count(), 1 );
- QCOMPARE( closedReadSpy.count(), 1 );
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6f05d3e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-pipeunittest_more_wait.diff
-hurd_msync.diff
-kubuntu_ignore_filewatch_test.diff
More information about the Neon-commits
mailing list