rpms
/
cjdns
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Release 20.3-1

This commit is contained in:
Stuart D. Gathman 2019-05-08 12:27:11 -04:00
parent 67e326fc98
commit 9b2cd28a9f
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cjdns.genconf.patch
View File

@ -1,7 +1,7 @@
diff -up ./client/cjdroute2.c.genconf ./client/cjdroute2.c
--- ./client/cjdroute2.c.genconf 2018-04-18 03:35:41.000000000 -0400
+++ ./client/cjdroute2.c 2019-05-04 12:57:06.880045566 -0400
@@ -334,7 +334,7 @@ static int genconf(struct Random* rand,
--- ./client/cjdroute2.c.genconf 2019-05-02 04:02:32.000000000 -0400
+++ ./client/cjdroute2.c 2019-05-08 12:14:53.146838389 -0400
@@ -336,7 +336,7 @@ static int genconf(struct Random* rand,
" // and ETHInterface will be unable to hot-add new interfaces\n"
" // Use { \"setuser\": 0 } to disable.\n"
" // Default: enabled with keepNetAdmin\n"
@ -10,7 +10,7 @@ diff -up ./client/cjdroute2.c.genconf ./client/cjdroute2.c
"\n"
" // Chroot changes the filesystem root directory which cjdns sees, blocking it\n"
" // from accessing files outside of the chroot sandbox, if the user does not\n"
@@ -346,7 +346,7 @@ static int genconf(struct Random* rand,
@@ -348,7 +348,7 @@ static int genconf(struct Random* rand,
}
else {
printf(" // Default: enabled (using \"/var/run\")\n"
@ -19,10 +19,10 @@ diff -up ./client/cjdroute2.c.genconf ./client/cjdroute2.c
}
printf("\n"
" // Nofiles is a deprecated security feature which prevents cjdns from opening\n"
@@ -647,11 +647,12 @@ int main(int argc, char** argv)
@@ -695,11 +695,12 @@ int main(int argc, char** argv)
char corePipeName[64] = "client-core-";
Random_base32(rand, (uint8_t*)corePipeName+CString_strlen(corePipeName), 31);
String* pipePath = Dict_getStringC(&config, "pipe");
String* pipePath = Dict_getStringC(config, "pipe");
+ String* path = String_CONST(Pipe_PATH);
if (!pipePath) {
- pipePath = String_CONST(Pipe_PATH);

13
cjdns.spec
View File

@ -71,8 +71,8 @@
Name: cjdns
# major version is cjdns protocol version:
Version: 20.2
Release: 7%{?dist}
Version: 20.3
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
@ -130,7 +130,8 @@ Patch12: cjdns.sign.patch
# Specify python2 for systems that default to python3
Patch16: cjdns.python3.patch
# s390x support for embedded cnacl library from Dan Horák <dan@danny.cz>
Patch17: cjdns.s390x.patch
# Included upstream since 20.3
#Patch17: cjdns.s390x.patch
# patch build to use system libuv
Patch18: cjdns.libuv.patch
@ -269,9 +270,6 @@ fi
#patch14 -b .entropy
#patch15 -b .benc
%patch16 -b .python3
%if 0%{use_embedded}
%patch17 -p1 -b .s390x
%endif
%if 0%{use_libuv}
%patch18 -p1 -b .libuv
mkdir dependencies
@ -606,6 +604,9 @@ fi
%{_bindir}/graphStats
%changelog
* Wed May 08 2019 Stuart Gathman <stuart@gathman.org> - 20.3-1
- New upstream version 20.3
* Fri May 03 2019 Stuart Gathman <stuart@gathman.org> - 20.2-7
- Option to use system libuv
- Fix scope of Pipe_PATH String_CONST in config.

9
cjdns.tools.patch
View File

@ -1,6 +1,6 @@
diff -up ./tools/traceroute.tools ./tools/traceroute
--- ./tools/traceroute.tools 2016-03-13 21:23:01.529922250 -0400
+++ ./tools/traceroute 2016-03-13 21:27:38.006631098 -0400
--- ./tools/traceroute.tools 2019-05-02 04:02:32.000000000 -0400
+++ ./tools/traceroute 2019-05-08 12:18:10.958661859 -0400
@@ -83,6 +83,11 @@ var main = function (target) {
cjdns.RouterModule_getPeers("0000.0000.0000.0001", waitFor(function (err, ret) {
@ -13,7 +13,7 @@ diff -up ./tools/traceroute.tools ./tools/traceroute
self = ret.peers[0];
}));
@@ -101,12 +106,13 @@ var main = function (target) {
@@ -101,11 +106,12 @@ var main = function (target) {
}).nThen(function (waitFor) {
@ -23,8 +23,7 @@ diff -up ./tools/traceroute.tools ./tools/traceroute
process.stdout.write(lastRet.from);
tracePath(nodeToIP6(self), lastRet.from, cjdns, function (ret) {
lastRet = ret;
process.stdout.write(' ' + ret.ms + 'ms\n');
+ if (!ret || !ret.nodes) { return; }
process.stdout.write(' ' + ret.ms + 'ms\n');
if (ret.result === 'timeout') {
process.stdout.write('\n' + ret.from + ' ' + ret.result + '!');
} else if (ret.nodes.length === 0) {