diff --git a/cjdns.entropy.patch b/cjdns.entropy.patch index 0177f3c..344ab3a 100644 --- a/cjdns.entropy.patch +++ b/cjdns.entropy.patch @@ -1,13 +1,12 @@ diff -up ./crypto/random/seed/GetEntropyRandomSeed.c.entropy ./crypto/random/seed/GetEntropyRandomSeed.c ---- ./crypto/random/seed/GetEntropyRandomSeed.c.entropy 2016-10-11 17:39:44.000000000 -0400 -+++ ./crypto/random/seed/GetEntropyRandomSeed.c 2017-02-18 13:59:03.131999629 -0500 -@@ -21,7 +21,11 @@ - #include - #include +--- ./crypto/random/seed/GetEntropyRandomSeed.c.entropy 2017-02-24 00:23:48.994554470 -0500 ++++ ./crypto/random/seed/GetEntropyRandomSeed.c 2017-02-24 00:28:07.022641392 -0500 +@@ -23,8 +23,9 @@ --#ifndef __OPENBSD__ -+#define GetEntropyRandomSeed_GLIBC_HAS_IT \ -+ (defined(__GNU_LIBRARY__) && defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 25)) + #define GetEntropyRandomSeed_GLIBC_HAS_IT \ + (defined(__GNU_LIBRARY__) && defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 25)) +- +-#if !defined(__OPENBSD__) && !GetEntropyRandomSeed_GLIBC_HAS_IT +/* gcc warns against using defined() inside #define, so just copy definition */ +#if !defined(__OPENBSD__) && \ +!(defined(__GNU_LIBRARY__) && defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 25)) diff --git a/cjdns.sign.patch b/cjdns.sign.patch index 3b36ea4..c4d8f8b 100644 --- a/cjdns.sign.patch +++ b/cjdns.sign.patch @@ -2,7 +2,7 @@ diff -up ./crypto/Sign.c.sign ./crypto/Sign.c --- ./crypto/Sign.c.sign 2016-10-11 17:39:44.000000000 -0400 +++ ./crypto/Sign.c 2016-10-14 20:59:49.143754098 -0400 @@ -13,6 +13,7 @@ - * along with this program. If not, see . + * along with this program. If not, see . */ +#ifdef SUBNODE diff --git a/cjdns.spec b/cjdns.spec index babb1b4..c260968 100644 --- a/cjdns.spec +++ b/cjdns.spec @@ -42,8 +42,8 @@ Name: cjdns # major version is cjdns protocol version: -Version: 18 -Release: 7%{?dist} +Version: 19.1 +Release: 1%{?dist} Summary: The privacy-friendly network without borders Group: System Environment/Base # cjdns is all GPLv3 except libuv which is MIT and BSD and ISC @@ -211,7 +211,7 @@ fi %patch9 -b .man %patch10 -b .tools -%patch13 -b .ppc64 +#patch13 -b .ppc64 %patch14 -b .entropy %patch15 -b .benc %patch16 -b .python3 @@ -513,6 +513,9 @@ fi %{_bindir}/graphStats %changelog +* Fri Feb 24 2017 Stuart D. Gathman 19.1-1 +- New upstream release + * Sat Feb 18 2017 Stuart D. Gathman 18-7 - Fix errors and document nits found by gcc7 diff --git a/cjdns.warnings.patch b/cjdns.warnings.patch index 64e6543..44f2cbf 100644 --- a/cjdns.warnings.patch +++ b/cjdns.warnings.patch @@ -87,7 +87,7 @@ diff -up ./util/platform/Sockaddr.c.warnings ./util/platform/Sockaddr.c +++ ./util/platform/Sockaddr.c 2017-02-18 14:33:13.145294735 -0500 @@ -12,6 +12,7 @@ * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ +#pragma GCC diagnostic ignored "-Wstrict-aliasing" #include "util/events/libuv/UvWrapper.h"