Drop patch, solved differently upstream

diff --git a/debian/patches/0002-siri-db-add-NULL-check-before-calling-siridb_tasks_d.patch b/debian/patches/0002-siri-db-add-NULL-check-before-calling-siridb_tasks_d.patch
deleted file mode 100644 (file)
index ca0e917..0000000
--- a/debian/patches/0002-siri-db-add-NULL-check-before-calling-siridb_tasks_d.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: siri/db: add NULL check before calling siridb_tasks_dec
- When built against libuv1 1.44.2, siridb_query_free may call
- siridb_tasks_dec on NULL, causing a segfault. Add a NULL check on siridb
- before calling siridb_tasks_dec to avoid this.
-Author: Nick Rosbrook <nick.rosbrook@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/siridb-server/+bug/1987558 
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1017748
-Forwarded: https://github.com/SiriDB/siridb-server/pull/182
-Last-Update: 2022-08-24
----
-From 90c261499af260f3450b4a2e00ec828bca81211a Mon Sep 17 00:00:00 2001
-From: Nick Rosbrook <nick.rosbrook@canonical.com>
-Date: Wed, 24 Aug 2022 14:57:07 -0400
-Subject: [PATCH] siri/db: add NULL check before calling siridb_tasks_dec
-
-When built against libuv1 1.44.2, siridb_query_free may call
-siridb_tasks_dec on NULL, causing a segfault. Add a NULL check on siridb
-before calling siridb_tasks_dec to avoid this.
----
- src/siri/db/query.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/siri/db/query.c b/src/siri/db/query.c
-index 3f9f7a0a..555628e4 100644
---- a/src/siri/db/query.c
-+++ b/src/siri/db/query.c
-@@ -156,7 +156,10 @@ void siridb_query_free(uv_handle_t * handle)
-     siridb_t * siridb = query->client->siridb;
- 
-     /* decrement active tasks */
--    siridb_tasks_dec(siridb->tasks);
-+    if (siridb != NULL)
-+    {
-+        siridb_tasks_dec(siridb->tasks);
-+    }
- 
-     /* free query */
-     free(query->q);
--- 
-2.34.1
-

diff --git a/debian/patches/series b/debian/patches/series
index 20678d8b0ca981ae6b1eb0962a6bc812fd40e5f4..e05f2415f9550036548753da170da1931db6158b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-link-with-libatomic-for-test.patch
-0002-siri-db-add-NULL-check-before-calling-siridb_tasks_d.patch