The package rpms/cjdns.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cjdns.git/commit/?id=461243963ccd....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 461243963ccd7932aebbc6297dada8c436a216d7
Author: Stuart D. Gathman <stuart(a)gathman.org>
Date: Wed May 30 20:27:30 2018 -0400
Merging with master was a fail. Making f28 like master.
diff --git a/cjdns.python3.patch b/cjdns.python3.patch
index c76c490..e453167 100644
--- a/cjdns.python3.patch
+++ b/cjdns.python3.patch
@@ -5,13 +5,5 @@ diff -up ./node_build/dependencies/libuv/gyp_uv.py.python3
./node_build/dependen
-#!/usr/bin/env python
+#!/usr/bin/env python2
- import glob
+ import os
import platform
-@@ -34,6 +34,7 @@ def compiler_version():
- proc = subprocess.Popen(CC.split() + ['-dumpversion'],
stdout=subprocess.PIPE)
- version = proc.communicate()[0].split('.')
- version = map(int, version[:2])
-+ if len(version) < 2: version.append(0)
- version = tuple(version)
- return (version, is_clang)
-
diff --git a/cjdns.sbin.patch b/cjdns.sbin.patch
index 0b0f74f..4ea4324 100644
--- a/cjdns.sbin.patch
+++ b/cjdns.sbin.patch
@@ -109,34 +109,6 @@ diff -up ./contrib/systemd/cjdns-online.sh.sbin
./contrib/systemd/cjdns-online.s
+ cjdns_dev
+ fi
+fi
-diff -up ./contrib/systemd/cjdns.service.sbin ./contrib/systemd/cjdns.service
---- ./contrib/systemd/cjdns.service.sbin 2016-10-11 17:39:44.000000000 -0400
-+++ ./contrib/systemd/cjdns.service 2017-01-13 22:07:35.128118775 -0500
-@@ -1,18 +1,21 @@
- [Unit]
- Description=cjdns: routing engine designed for security, scalability, speed and ease of
use
- Wants=network.target
--After=network.target
-+After=network.target cjdns-loadmodules.service
-+Requires=cjdns-loadmodules.service
-
- [Service]
- ProtectHome=true
- ProtectSystem=true
- SyslogIdentifier=cjdroute
-+CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_SYS_CHROOT
CAP_AUDIT_CONTROL
- ExecStartPre=/bin/sh -ec "if ! test -s /etc/cjdroute.conf; \
- then umask 077; \
-- /usr/bin/cjdroute --genconf > /etc/cjdroute.conf; \
-+ /usr/sbin/cjdroute --genconf | cat > /etc/cjdroute.conf; \
- echo 'WARNING: A new /etc/cjdroute.conf file has been
generated.'; \
- fi"
--ExecStart=/bin/sh -c "exec cjdroute --nobg < /etc/cjdroute.conf"
-+ExecStart=/bin/sh -c "exec /usr/sbin/cjdroute --nobg < /etc/cjdroute.conf"
-+ExecStartPost=/bin/sh /usr/libexec/cjdns/cjdns-up
- Restart=always
-
- [Install]
diff -up ./contrib/systemd/cjdns-wait-online.service.sbin
./contrib/systemd/cjdns-wait-online.service
--- ./contrib/systemd/cjdns-wait-online.service.sbin 2017-01-13 21:43:05.414731254 -0500
+++ ./contrib/systemd/cjdns-wait-online.service 2017-01-13 21:43:05.414731254 -0500
diff --git a/cjdns.selinux.patch b/cjdns.selinux.patch
index d05f088..77d3052 100644
--- a/cjdns.selinux.patch
+++ b/cjdns.selinux.patch
@@ -1,6 +1,6 @@
diff -up ./contrib/selinux/cjdns.te.selinux ./contrib/selinux/cjdns.te
---- ./contrib/selinux/cjdns.te.selinux 2017-02-21 17:56:22.000000000 -0500
-+++ ./contrib/selinux/cjdns.te 2018-03-06 20:08:31.801871372 -0500
+--- ./contrib/selinux/cjdns.te.selinux 2018-01-30 19:04:59.000000000 -0500
++++ ./contrib/selinux/cjdns.te 2018-03-05 01:15:40.302169785 -0500
@@ -7,8 +7,8 @@ require {
type port_t;
type unreserved_port_t;
diff --git a/cjdns.sodium.patch b/cjdns.sodium.patch
index e23dc9d..c2e3393 100644
--- a/cjdns.sodium.patch
+++ b/cjdns.sodium.patch
@@ -72,7 +72,7 @@ diff -up ./contrib/c/privatetopublic.c.sodium
./contrib/c/privatetopublic.c
+ return 1;
+ }
- Hex_decode(privateKey, 32, privateKeyHexIn, 65);
+ Hex_decode(privateKey, 32, privateKeyHexIn, 64);
crypto_scalarmult_curve25519_base(address.key, privateKey);
diff -up ./contrib/c/publictoip6.c.sodium ./contrib/c/publictoip6.c
--- ./contrib/c/publictoip6.c.sodium 2017-05-24 16:42:11.085386456 -0400
@@ -140,7 +140,7 @@ diff -up ./crypto/random/randombytes.c.sodium
./crypto/random/randombytes.c
diff -up ./node_build/make.js.sodium ./node_build/make.js
--- ./node_build/make.js.sodium 2017-02-21 17:56:22.000000000 -0500
+++ ./node_build/make.js 2017-05-24 16:39:15.557233617 -0400
-@@ -244,44 +244,8 @@ Builder.configure({
+@@ -244,48 +244,8 @@ Builder.configure({
}).nThen(function (waitFor) {
@@ -165,13 +165,17 @@ diff -up ./node_build/make.js.sodium ./node_build/make.js
-
- args.unshift(builder.config.optimizeLevel,
'-fomit-frame-pointer');
-
+- if (!/^\-O0$/.test(builder.config.optimizeLevel)) {
+- args.unshift('-D_FORTIFY_SOURCE=2');
+- }
+-
- if (CFLAGS) {
- [].push.apply(args, CFLAGS.split(' '));
- }
-
- if (!builder.config.crossCompiling) {
-- if (NO_MARCH_FLAG.indexOf(process.arch) < -1) {
-- builder.config.cflags.push('-march=native');
+- if (NO_MARCH_FLAG.indexOf(process.arch) == -1) {
+- args.unshift('-march=native');
- }
- }
-
diff --git a/cjdns.spec b/cjdns.spec
index b50da19..c16ae03 100644
--- a/cjdns.spec
+++ b/cjdns.spec
@@ -3,8 +3,10 @@
# Option to enable SUBNODE mode (WIP)
%bcond_with subnode
-# Use the optimized libnacl embedded with cjdns
-%if %{with subnode}
+# Option to use the optimized libnacl embedded with cjdns
+%bcond_without embedded
+
+%if %{with subnode} || %{with embedded}
%global use_embedded 1
%else
%global use_embedded 0
@@ -16,7 +18,7 @@
%if 0%{use_libsodium}
%global nacl_name libsodium
-%global nacl_version 1.0.5
+%global nacl_version 1.0.14
%global nacl_lib %{_libdir}/libsodium.so
%else
%global nacl_name nacl
@@ -57,6 +59,7 @@ License: GPLv3 and MIT and BSD and ISC
URL:
http://hyperboria.net/
Source0:
https://github.com/cjdelisle/cjdns/archive/%{name}-v%{version}.tar.gz
Source1: cjdns.README_Fedora.md
+Source2: cjdns.service
# Add targeted selinux policy
Patch0: cjdns.selinux.patch
# Allow python2.6 for build. Python is not used during the build
@@ -98,9 +101,11 @@ Patch12: cjdns.sign.patch
# Recognize ppc64, ppc64le, and s390x arches
#Patch13: cjdns.ppc64.patch
# getentropy(2) added to glibc in Fedora 26
-Patch14: cjdns.entropy.patch
+# included in cjdns-20.1
+#Patch14: cjdns.entropy.patch
# Fix buffer overrun in JsonBencSerializer.c
-Patch15: cjdns.benc.patch
+# included in cjdns-20.1
+#Patch15: cjdns.benc.patch
# Specify python2 for systems that default to python3
Patch16: cjdns.python3.patch
@@ -128,6 +133,11 @@ Provides: bundled(nacl) = 20110221
%endif
# build system requires nodejs, unfortunately
ExclusiveArch: %{nodejs_arches}
+%if 0%{use_embedded}
+# The nodejs build system for embedded cnacl has no "plan" for s390x.
+# It might work to copy another big endian plan like ppc64.
+ExcludeArch: s390x
+%endif
%description
Cjdns implements an encrypted IPv6 network using public-key cryptography for
@@ -193,6 +203,8 @@ Python graphing tools for cjdns.
%patch4 -b .genconf
%patch5 -b .sbin
+cp %{SOURCE2} contrib/systemd
+
%if !%{use_embedded}
# use system nacl library if provided.
if test -x %{nacl_lib}; then
@@ -221,8 +233,8 @@ fi
%patch9 -b .man
%patch10 -b .tools
#patch13 -b .ppc64
-%patch14 -b .entropy
-%patch15 -b .benc
+#patch14 -b .entropy
+#patch15 -b .benc
%patch16 -b .python3
cp %{SOURCE1} README_Fedora.md
@@ -545,9 +557,6 @@ fi
- selinux: Allow map access to cjdns_exec_t
- disable subnode by default
-* Tue Mar 6 2018 Stuart Gathman <stuart(a)gathman.org> - 19.1-11
-- bz#1551263 allow map permission added since f27
-
* Wed Feb 21 2018 Stuart Gathman <stuart(a)gathman.org> - 20.1-1
- New upstream release
diff --git a/cjdns.tools.patch b/cjdns.tools.patch
index cc6392c..d789d2e 100644
--- a/cjdns.tools.patch
+++ b/cjdns.tools.patch
@@ -25,6 +25,6 @@ diff -up ./tools/traceroute.tools ./tools/traceroute
lastRet = ret;
process.stdout.write(' ' + ret.ms + 'ms\n');
+ if (!ret || !ret.nodes) { return; }
- if (ret.nodes.length === 0) {
- console.log('cornered');
- } else if (ret.nodes[0] !== ret.from) {
+ if (ret.result === 'timeout') {
+ process.stdout.write('\n' + ret.from + ' ' + ret.result
+ '!');
+ } else if (ret.nodes.length === 0) {
diff --git a/cjdns.warnings.patch b/cjdns.warnings.patch
index 94f479d..706786b 100644
--- a/cjdns.warnings.patch
+++ b/cjdns.warnings.patch
@@ -39,20 +39,6 @@ diff -up ./dht/CJDHTConstants.h.warnings ./dht/CJDHTConstants.h
-
+#pragma GCC diagnostic pop
#endif
-diff -up ./dht/dhtcore/NodeStore.c.warnings ./dht/dhtcore/NodeStore.c
---- ./dht/dhtcore/NodeStore.c.warnings 2017-02-21 17:56:22.000000000 -0500
-+++ ./dht/dhtcore/NodeStore.c 2018-03-14 13:24:11.853194505 -0400
-@@ -1770,7 +1770,9 @@ struct NodeList* NodeStore_getPeers(uint
- break;
- }
- switch (j) {
-- default: Bits_memmove(out->nodes, &out->nodes[1], (j - 1) *
sizeof(char*));
-+ default:
-+ Bits_memmove(out->nodes, &out->nodes[1], (j - 1) *
sizeof(char*));
-+ Gcc_FALLTHROUGH;
- case 1: out->nodes[j - 1] = next->child;
- case 0:;
- }
diff -up ./node_build/dependencies/libuv/test/test-getsockname.c.warnings
./node_build/dependencies/libuv/test/test-getsockname.c
--- ./node_build/dependencies/libuv/test/test-getsockname.c.warnings 2018-01-30
19:04:59.000000000 -0500
+++ ./node_build/dependencies/libuv/test/test-getsockname.c 2018-03-14 14:38:20.690851402
-0400
diff --git a/sources b/sources
index 1432de4..3248ec9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (cjdns-v18.tar.gz) =
3b7ed50c81ed51f8deea3999aa0b820f78de53da3d3937c13f572e35bb7c2a6f963d3779c2f0b7b4afc64e6a45ae98c4a6958a0c31d43d4309a47ae3ccbb709b
-SHA512 (cjdns-v19.1.tar.gz) =
9c29bf1d136237bd60e125718bdd2c6d7f5a651d51af50aea3173eed1626a402dac5a2a72f9fb129fc9af24c3b67472a1dfe7b2b6a09bb28d01a120fc667b206
SHA512 (cjdns-v20.2.tar.gz) =
31edd3ff7e62bfe2ab555da1e34d4b900829180d9558eecdd93a3d726126067c8094419683f047abdcabc444e3b2ae933a68ca4fa1b535731f977e07983b7d39
commit a84f3f2d302dc12ce46d79ee962148e0df3f1df6
Author: Stuart D. Gathman <stuart(a)gathman.org>
Date: Wed May 23 16:44:40 2018 -0400
Date order
diff --git a/cjdns.spec b/cjdns.spec
index c6f6332..b50da19 100644
--- a/cjdns.spec
+++ b/cjdns.spec
@@ -545,12 +545,12 @@ fi
- selinux: Allow map access to cjdns_exec_t
- disable subnode by default
-* Wed Feb 21 2018 Stuart Gathman <stuart(a)gathman.org> - 20.1-1
-- New upstream release
-
* Tue Mar 6 2018 Stuart Gathman <stuart(a)gathman.org> - 19.1-11
- bz#1551263 allow map permission added since f27
+* Wed Feb 21 2018 Stuart Gathman <stuart(a)gathman.org> - 20.1-1
+- New upstream release
+
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 19.1-10
- Escape macros in %%changelog