Date: Tuesday, January 21, 2020 @ 20:49:16 Author: kpcyrd Revision: 553334
upgpkg: cjdns 20.5-1 Modified: cjdns/trunk/PKGBUILD Deleted: cjdns/trunk/1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch ------------------------------------------------+ 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch | 22 ---------------------- PKGBUILD | 16 +++++----------- 2 files changed, 5 insertions(+), 33 deletions(-) Deleted: 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch =================================================================== --- 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch 2020-01-21 20:41:47 UTC (rev 553333) +++ 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch 2020-01-21 20:49:16 UTC (rev 553334) @@ -1,22 +0,0 @@ -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 2020-01-21 20:41:47 UTC (rev 553333) +++ PKGBUILD 2020-01-21 20:49:16 UTC (rev 553334) @@ -6,7 +6,7 @@ # Contributor: Xyne pkgname=cjdns -pkgver=20.4 +pkgver=20.5 pkgrel=1 pkgdesc='Routing engine designed for security, scalability, speed and ease of use' url='https://github.com/cjdelisle/cjdns' @@ -14,18 +14,12 @@ license=('GPL3') depends=('glibc' 'sh') optdepends=('nodejs: optional utilities support') -makedepends=('nodejs' 'python2') +makedepends=('nodejs' 'python') install=cjdns.install -source=(${pkgname}-${pkgver}.tar.gz::https://github.com/cjdelisle/${pkgname}/archive/cjdns-v${pkgver}.tar.gz - 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch) -sha512sums=('5a6bd36b2edd07fa883efa4b14dd8a7ba0189bf43404e27ab6ae3b0c2f1e63ce738c52b34416f51f93c9752f6654ea95eac2c71897d2a1e19f4a6d1ca3bad46d' - 'c7bb9d1550661221f5fb08f31384a5d06b9c2c8531c1f5bbc14624a99adc21f19873c01a553b20198790e8bf72ea763de4e486e13b02df5356f397549692ba9c') +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/cjdelisle/${pkgname}/archive/cjdns-v${pkgver}.tar.gz) +sha512sums=('36ae20182b9e9601ae64630cb0fa96caccbe5279be48520ea8b457a15437da5c9b48a5ae5588bd76ef819efe696b5a582a906a50e4dbe7760bb96fa7d1d63ea3') +b2sums=('8b1b4d98cefa5f61c8d9025e8a339d0ac6823ea687ac21821cbcdb0782ad066746bac959a1f886120f2d4b633876c32a9125ea5c0614cd773d8ed2e49d57270e') -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.
