From ac0d93b4a0088d0a2c6487f0800621c9dcf4928e Mon Sep 17 00:00:00 2001
From: Stuart D. Gathman <stuart@gathman.org>
Date: Jan 23 2020 04:02:11 +0000
Subject: New upstream release 20.5


---

diff --git a/cjdns.fuzz.patch b/cjdns.fuzz.patch
index 3faaed6..878f7c6 100644
--- a/cjdns.fuzz.patch
+++ b/cjdns.fuzz.patch
@@ -12,10 +12,3 @@ diff -up ./test/Main_fuzz_test.c.fuzz ./test/Main_fuzz_test.c
      }
  }
  
-@@ -185,4 +185,4 @@ void CJDNS_FUZZ_MAIN(void* vctx, struct
-     TestFramework_assertLastMessageUnaltered(ctx->nodeA);
- 
-     EventBase_beginLoop(ctx->base);
--}
-\ No newline at end of file
-+}
diff --git a/cjdns.python3.patch b/cjdns.python3.patch
index f7d6464..415cdd7 100644
--- a/cjdns.python3.patch
+++ b/cjdns.python3.patch
@@ -23,21 +23,3 @@ diff -up ./node_build/dependencies/libuv/gyp_uv.py.python3 ./node_build/dependen
 -  print gyp_args
 +  print(gyp_args)
    run_gyp(gyp_args)
-diff -up ./node_build/FindPython2.js.python3 ./node_build/FindPython2.js
---- ./node_build/FindPython2.js.python3	2019-09-19 13:14:40.677573302 -0400
-+++ ./node_build/FindPython2.js	2019-09-19 13:15:15.796056265 -0400
-@@ -16,12 +16,12 @@ var nThen = require('nthen');
- var Spawn = require('child_process').spawn;
- var Fs = require('fs');
- 
--var PYTHONS = ["python", "python2", "python2.7", "python2.6", "python2.5"];
-+var PYTHONS = ["python", "python2", "python2.7", "python2.6", "python3"];
- 
- var SCRIPT = [
-     'import sys;',
-     'print(sys.version_info);',
--    'exit(sys.version_info[0] != 2 or sys.version_info[1] < 7);'
-+    'exit(sys.version_info[0] < 2 or sys.version_info[1] < 6);'
- ].join('\n');
- 
- var find = module.exports.find = function (tempFile, callback) {
diff --git a/cjdns.spec b/cjdns.spec
index 28899c7..27dcb1c 100644
--- a/cjdns.spec
+++ b/cjdns.spec
@@ -80,8 +80,8 @@
 
 Name:           cjdns
 # major version is cjdns protocol version:
-Version:        20.4
-Release:        2%{?dist}
+Version:        20.5
+Release:        1%{?dist}
 Summary:        The privacy-friendly network without borders
 # cjdns is all GPLv3 except libuv which is MIT and BSD and ISC
 # cnacl is unused except when use_embedded is true
@@ -143,7 +143,7 @@ Patch12: cjdns.sign.patch
 # included in cjdns-20.1
 #Patch15: cjdns.benc.patch
 # Specify python2 for systems that default to python3
-Patch16: cjdns.python3.patch
+#Patch16: cjdns.python3.patch
 # s390x support for embedded cnacl library from Dan Horák <dan@danny.cz>
 # Included upstream since 20.3
 #Patch17: cjdns.s390x.patch
@@ -322,7 +322,7 @@ fi
 #patch13 -b .ppc64
 #patch14 -b .entropy
 #patch15 -b .benc
-%patch16 -b .python3
+#patch16 -b .python3
 %if 0%{use_libuv}
 %patch18 -p1 -b .libuv
 rm -rf node_build/dependencies/libuv
@@ -741,6 +741,9 @@ fi
 %{_bindir}/graphStats
 
 %changelog
+* Wed Jan 22 2020 Stuart Gathman <stuart@gathman.org> - 20.5-1
+- New upstream release
+
 * Wed Oct  2 2019 Stuart Gathman <stuart@gathman.org> - 20.4-2
 - Add python3 support for python API
 
diff --git a/cjdns.warnings.patch b/cjdns.warnings.patch
index 706786b..d470667 100644
--- a/cjdns.warnings.patch
+++ b/cjdns.warnings.patch
@@ -87,15 +87,6 @@ diff -up ./util/platform/netdev/NetPlatform_linux.c.warnings ./util/platform/net
  #endif
  #include <linux/netlink.h>
  #include <linux/rtnetlink.h>
-@@ -78,7 +79,7 @@ static int socketForIfName(const char* i
-     }
- 
-     memset(ifRequestOut, 0, sizeof(struct ifreq));
--    strncpy(ifRequestOut->ifr_name, interfaceName, IFNAMSIZ);
-+    strncpy(ifRequestOut->ifr_name, interfaceName, IFNAMSIZ - 1);
- 
-     if (ioctl(s, SIOCGIFINDEX, ifRequestOut) < 0) {
-         int err = errno;
 @@ -167,7 +168,7 @@ void NetPlatform_addAddress(const char*
              Except_throw(eh, "ioctl(SIOCSIFADDR) failed: [%s]", strerror(err));
          }