Include a fix for the build when using GCC 7.1.1 (by xulpher)

3 files changed, 83 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5eaf42217a21..9b78f2d3b299 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon May 29 03:39:12 UTC 2017
+# Fri Jun 16 19:28:20 UTC 2017
 pkgbase = cjdns-git
 	pkgdesc = A routing engine designed for security, scalability, speed and ease of use
-	pkgver = 19.1.r113.g5f20ccf6
+	pkgver = 19.1.r121.g66b60035
 	pkgrel = 1
 	url = https://github.com/cjdelisle/cjdns
 	arch = i686
@@ -23,7 +23,9 @@ pkgbase = cjdns-git
 	options = !strip
 	options = !buildflags
 	source = git+https://github.com/cjdelisle/cjdns#branch=crashey
+	source = build-fix.patch
 	sha512sums = SKIP
+	sha512sums = f8effe23cde89aed048a796bc181fac0a5dc272132d819d91b7c777ec30e00cf7682e4f7e50413d6b2ecab366d5eb8925fb91f6b2ab063faebf5604004f3ec09
 
 pkgname = cjdns-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8991ed885ce0..a52bdae67697 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _pkgname=cjdns
 pkgname=$_pkgname-git
-pkgver=19.1.r113.g5f20ccf6
+pkgver=19.1.r121.g66b60035
 pkgrel=1
 pkgdesc='A routing engine designed for security, scalability, speed and ease of use'
 url='https://github.com/cjdelisle/cjdns'
@@ -14,20 +14,35 @@ arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
 options=('!distcc' '!strip' '!buildflags')
 depends=('bash')
 makedepends=('git' 'nodejs' 'python2')
+
 optdepends=(
   'cjdnsify: allows you to run some programs bound to your cjdns address'
   'cjdns-git-sysvinit: support for sysvinit (rc.d)'
 )
+
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("git+$url#branch=crashey")
-sha512sums=('SKIP')
+
+source=(
+  "git+$url#branch=crashey"
+  'build-fix.patch'
+)
+
+sha512sums=(
+  'SKIP'
+  'f8effe23cde89aed048a796bc181fac0a5dc272132d819d91b7c777ec30e00cf7682e4f7e50413d6b2ecab366d5eb8925fb91f6b2ab063faebf5604004f3ec09'
+)
 
 pkgver() {
   cd $_pkgname
   git describe --tags | sed 's|^[^-]*-v||;s|-|.r|;s|-|.|g'
 }
 
+prepare() {
+  cd $_pkgname
+  patch -p1 < ../build-fix.patch
+}
+
 build() {
   cd $_pkgname
   bash 'do'
diff --git a/build-fix.patch b/build-fix.patch
new file mode 100644
index 000000000000..a3be41614f40
--- /dev/null
+++ b/build-fix.patch
@@ -0,0 +1,61 @@
+From 00e32c6ec3044c32d1a3ec7eac3343dd360e143e Mon Sep 17 00:00:00 2001
+From: xulfer <xulfer at cheapbsd.net>
+Date: Fri, 16 Jun 2017 13:39:28 -0500
+Subject: [PATCH] Fixed some issues with newer GCC versions.
+
+A few new warnings popped up with newer GCC versions that
+prevented building due to -Werror.  These should appear to be
+fixed for now, but may not be compatible with BSD versions so
+more testing may be required.
+
+diff --git a/benc/serialization/json/JsonBencSerializer.c b/benc/serialization/json/JsonBencSerializer.c
+index edc1f3d2..7d1690f6 100644
+--- a/benc/serialization/json/JsonBencSerializer.c
++++ b/benc/serialization/json/JsonBencSerializer.c
+@@ -72,15 +72,15 @@ static int32_t serializeString(struct Writer* writer,
+     Writer_write(writer, "\"", 1);
+     size_t i;
+     uint8_t chr;
+-    char buffer[4];
++    char buffer[5];
+     for (i = 0; i < string->len; i++) {
+         chr = (uint8_t) string->bytes[i] & 0xFF;
+         /* Nonprinting chars, \ and " are hex'd */
+         if (chr < 126 && chr > 31 && chr != '\\' && chr != '"') {
+-            snprintf(buffer, 4, "%c", chr);
++            snprintf(buffer, 5, "%c", chr);
+             Writer_write(writer, buffer, 1);
+         } else {
+-            snprintf(buffer, 4, "\\x%.2X", chr);
++            snprintf(buffer, 5, "\\x%.2X", chr);
+             Writer_write(writer, buffer, 4);
+         }
+     }
+diff --git a/dht/dhtcore/NodeStore.c b/dht/dhtcore/NodeStore.c
+index decab6c0..5199d865 100644
+--- a/dht/dhtcore/NodeStore.c
++++ b/dht/dhtcore/NodeStore.c
+@@ -1771,7 +1771,9 @@ struct NodeList* NodeStore_getPeers(uint64_t label,
+         }
+         switch (j) {
+             default: Bits_memmove(out->nodes, &out->nodes[1], (j - 1) * sizeof(char*));
++                     __attribute__ ((fallthrough)); // C and C++03
+             case 1: out->nodes[j - 1] = next->child;
++                     __attribute__ ((fallthrough)); // C and C++03
+             case 0:;
+         }
+     }
+diff --git a/subnode/GetPeersResponder.c b/subnode/GetPeersResponder.c
+index 5110d0dd..a37fd38e 100644
+--- a/subnode/GetPeersResponder.c
++++ b/subnode/GetPeersResponder.c
+@@ -81,7 +81,9 @@ static void onGetPeers(Dict* msg,
+         }
+         switch (j) {
+             default: Bits_memmove(ptrList, &ptrList[1], (j - 1) * sizeof(char*));
++                     __attribute__ ((fallthrough)); // C and C++03
+             case 1: ptrList[j - 1] = peer;
++                     __attribute__ ((fallthrough)); // C and C++03
+             case 0:;
+         }
+     }