From a3c68056517b59f29cf9345034143becca48885f Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Sun, 20 Sep 2020 14:50:19 +0100 Subject: [PATCH] Updates to 2.12-1 and GCC10 FTBFS fix --- debian/changelog | 8 +++++--- debian/patches/multiple-definition.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 debian/patches/multiple-definition.patch diff --git a/debian/changelog b/debian/changelog index 8258c55..9344cb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,14 @@ -uronode (2.11-1) UNRELEASED; urgency=medium +uronode (2.12-1) UNRELEASED; urgency=medium - * New upstream update + * New upstream update to 2.12 - Patches Refreshed * Removed makefile-install-locations patch * Fixed lots of patch conflicts and funk * Added gitlab CI + * Added multiple-definition.patch to build in gcc10 + - Closes: #957902 - -- Dave Hibberd Mon, 20 Apr 2020 03:25:08 +0100 + -- Dave Hibberd Sun, 20 Sep 2020 14:34:24 +0100 uronode (2.10-1) unstable; urgency=medium * New upstream update diff --git a/debian/patches/multiple-definition.patch b/debian/patches/multiple-definition.patch new file mode 100644 index 0000000..fa9ce8f --- /dev/null +++ b/debian/patches/multiple-definition.patch @@ -0,0 +1,17 @@ +Description: Fix GCC10 Blocking issues - multiple definitions of globals +Author: Dave Hibberd +Last-Update: 2020-09-20 + +--- a/util.c ++++ b/util.c +@@ -17,8 +17,8 @@ + #include "procinfo.h" + + static char buf[256]; +-char *HostName; +-char *Prompt; ++//char *HostName; ++//char *Prompt; + + void node_msg(const char *fmt, ...) + { diff --git a/debian/patches/series b/debian/patches/series index 5cb9a02..2a0fcdd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +multiple-definition.patch non-interactive-install.patch hardening folder-update