Date: Monday, November 25, 2019 @ 00:03:31 Author: kpcyrd Revision: 533116
upgpkg: cjdns 20.4-1 Added: cjdns/trunk/1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch Modified: cjdns/trunk/PKGBUILD ------------------------------------------------+ 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch | 22 ++++++++++++++++++++++ PKGBUILD | 15 +++++++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) Added: 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch =================================================================== --- 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch (rev 0) +++ 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch 2019-11-25 00:03:31 UTC (rev 533116) @@ -0,0 +1,22 @@ +From 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3 Mon Sep 17 00:00:00 2001 +From: Caleb James DeLisle <[email protected]> +Date: Sun, 24 Nov 2019 23:47:30 +0100 +Subject: [PATCH] New GCC wants strncpy limit to be less than the output size + +--- + util/platform/netdev/NetPlatform_linux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/platform/netdev/NetPlatform_linux.c b/util/platform/netdev/NetPlatform_linux.c +index 8206ebad5..967ee261e 100644 +--- a/util/platform/netdev/NetPlatform_linux.c ++++ b/util/platform/netdev/NetPlatform_linux.c +@@ -78,7 +78,7 @@ static int socketForIfName(const char* interfaceName, + } + + 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; Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-25 00:01:15 UTC (rev 533115) +++ PKGBUILD 2019-11-25 00:03:31 UTC (rev 533116) @@ -1,4 +1,5 @@ # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org> # Contributor: Kevin MacMartin <[email protected]> # Contributor: openfbt # Contributor: Werecat @@ -5,7 +6,7 @@ # Contributor: Xyne pkgname=cjdns -pkgver=20.3 +pkgver=20.4 pkgrel=1 pkgdesc='Routing engine designed for security, scalability, speed and ease of use' url='https://github.com/cjdelisle/cjdns' @@ -15,10 +16,16 @@ optdepends=('nodejs: optional utilities support') makedepends=('nodejs' 'python2') install=cjdns.install -source=(${pkgname}-${pkgver}.tar.gz::https://github.com/cjdelisle/${pkgname}/archive/cjdns-v${pkgver}.tar.gz) -sha256sums=('e8ca2cc5d5ba71e39a702299106dd2a965005703284cec91b3e94691cdce6f65') -sha512sums=('ae38b33b47a567893e63bc925c91d07b5554f0c7147f90429cac41cfe35a429f507e3adc9463175a1714140169eaae370ab8c8255e82ddd9b2b32f09adae1cea') +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/cjdelisle/${pkgname}/archive/cjdns-v${pkgver}.tar.gz + 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch) +sha512sums=('5a6bd36b2edd07fa883efa4b14dd8a7ba0189bf43404e27ab6ae3b0c2f1e63ce738c52b34416f51f93c9752f6654ea95eac2c71897d2a1e19f4a6d1ca3bad46d' + 'c7bb9d1550661221f5fb08f31384a5d06b9c2c8531c1f5bbc14624a99adc21f19873c01a553b20198790e8bf72ea763de4e486e13b02df5356f397549692ba9c') +prepare() { + cd ${pkgname}-${pkgname}-v${pkgver} + patch --forward --strip=1 --input="${srcdir}/1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch" +} + build() { cd ${pkgname}-${pkgname}-v${pkgver} # Pretend to be cross compiling so -march=native is not set.
