Date: Monday, November 25, 2019 @ 00:09:39 Author: kpcyrd Revision: 533117
archrelease: copy trunk to community-x86_64 Added: cjdns/repos/community-x86_64/1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch (from rev 533116, cjdns/trunk/1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch) cjdns/repos/community-x86_64/PKGBUILD (from rev 533116, cjdns/trunk/PKGBUILD) cjdns/repos/community-x86_64/cjdns.install (from rev 533116, cjdns/trunk/cjdns.install) Deleted: cjdns/repos/community-x86_64/PKGBUILD cjdns/repos/community-x86_64/cjdns.install ------------------------------------------------+ 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch | 22 ++++ PKGBUILD | 107 ++++++++++++----------- cjdns.install | 52 +++++------ 3 files changed, 105 insertions(+), 76 deletions(-) Copied: cjdns/repos/community-x86_64/1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch (from rev 533116, cjdns/trunk/1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch) =================================================================== --- 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch (rev 0) +++ 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3.patch 2019-11-25 00:09:39 UTC (rev 533117) @@ -0,0 +1,22 @@ +From 1b7f09b9492fd9ccbacc4a16f6cc9a623653aba3 Mon Sep 17 00:00:00 2001 +From: Caleb James DeLisle <c...@cjdns.fr> +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; Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-11-25 00:03:31 UTC (rev 533116) +++ PKGBUILD 2019-11-25 00:09:39 UTC (rev 533117) @@ -1,50 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Contributor: Kevin MacMartin <pruri...@gmail.com> -# Contributor: openfbt -# Contributor: Werecat -# Contributor: Xyne - -pkgname=cjdns -pkgver=20.3 -pkgrel=1 -pkgdesc='Routing engine designed for security, scalability, speed and ease of use' -url='https://github.com/cjdelisle/cjdns' -arch=('x86_64') -license=('GPL3') -depends=('glibc' 'sh') -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') - -build() { - cd ${pkgname}-${pkgname}-v${pkgver} - # Pretend to be cross compiling so -march=native is not set. - CROSS="true" CJDNS_RELEASE_VERSION="${pkgver}" \ - node ./node_build/make.js -} - -package() { - cd ${pkgname}-${pkgname}-v${pkgver} - install -Dm 755 cjdroute -t "${pkgdir}/usr/bin" - install -Dm 644 contrib/systemd/{cjdns,cjdns-resume}.service \ - -t "${pkgdir}/usr/lib/systemd/system" - install -Dm 644 doc/man/cjdroute.conf.5 -t "${pkgdir}/usr/share/man/man5" - install -Dm 644 -t "${pkgdir}/usr/share/doc/${pkgname}" \ - README.md \ - doc/admin-api.md \ - doc/configure.md \ - doc/djc_layer_model.md \ - doc/nat-gateway.md \ - doc/network-services.md \ - doc/non-root-user.md \ - doc/security_specification.md \ - doc/shorewall_and_vpn_gateway_howto.md \ - doc/tunnel.md - cp -a tools "${pkgdir}/usr/lib/${pkgname}" - cp -a node_modules "${pkgdir}/usr/lib/${pkgname}/node_modules" -} - -# vim: ts=2 sw=2 et: Copied: cjdns/repos/community-x86_64/PKGBUILD (from rev 533116, cjdns/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-11-25 00:09:39 UTC (rev 533117) @@ -0,0 +1,57 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org> +# Contributor: Kevin MacMartin <pruri...@gmail.com> +# Contributor: openfbt +# Contributor: Werecat +# Contributor: Xyne + +pkgname=cjdns +pkgver=20.4 +pkgrel=1 +pkgdesc='Routing engine designed for security, scalability, speed and ease of use' +url='https://github.com/cjdelisle/cjdns' +arch=('x86_64') +license=('GPL3') +depends=('glibc' 'sh') +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 + 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. + CROSS="true" CJDNS_RELEASE_VERSION="${pkgver}" \ + node ./node_build/make.js +} + +package() { + cd ${pkgname}-${pkgname}-v${pkgver} + install -Dm 755 cjdroute -t "${pkgdir}/usr/bin" + install -Dm 644 contrib/systemd/{cjdns,cjdns-resume}.service \ + -t "${pkgdir}/usr/lib/systemd/system" + install -Dm 644 doc/man/cjdroute.conf.5 -t "${pkgdir}/usr/share/man/man5" + install -Dm 644 -t "${pkgdir}/usr/share/doc/${pkgname}" \ + README.md \ + doc/admin-api.md \ + doc/configure.md \ + doc/djc_layer_model.md \ + doc/nat-gateway.md \ + doc/network-services.md \ + doc/non-root-user.md \ + doc/security_specification.md \ + doc/shorewall_and_vpn_gateway_howto.md \ + doc/tunnel.md + cp -a tools "${pkgdir}/usr/lib/${pkgname}" + cp -a node_modules "${pkgdir}/usr/lib/${pkgname}/node_modules" +} + +# vim: ts=2 sw=2 et: Deleted: cjdns.install =================================================================== --- cjdns.install 2019-11-25 00:03:31 UTC (rev 533116) +++ cjdns.install 2019-11-25 00:09:39 UTC (rev 533117) @@ -1,26 +0,0 @@ -post_install() { - local config_file="cjdroute.conf" - local config_path="/etc/${config_file}" - - if [[ ! -e "${config_path}" ]] ; then - echo "Generating ${config_file}... " - (umask 077 && cjdroute --genconf > "${config_path}") || - echo "ERROR: Failed to generate and install ${config_file}" - echo " - >>> The keys in ${config_path} have been autogenerated during - >>> install, they are not defaults and do not need to be overwritten. - - >>> Protect ${config_path}! A lost conf file means you have - >>> lost your password and connections and anyone who connected - >>> to you will no longer be able to connect. A *compromised* - >>> conf file means that other people can impersonate you on - >>> the network. -" - fi -} - -post_upgrade() { - post_install -} - -# vim: ts=2 sw=2 et: Copied: cjdns/repos/community-x86_64/cjdns.install (from rev 533116, cjdns/trunk/cjdns.install) =================================================================== --- cjdns.install (rev 0) +++ cjdns.install 2019-11-25 00:09:39 UTC (rev 533117) @@ -0,0 +1,26 @@ +post_install() { + local config_file="cjdroute.conf" + local config_path="/etc/${config_file}" + + if [[ ! -e "${config_path}" ]] ; then + echo "Generating ${config_file}... " + (umask 077 && cjdroute --genconf > "${config_path}") || + echo "ERROR: Failed to generate and install ${config_file}" + echo " + >>> The keys in ${config_path} have been autogenerated during + >>> install, they are not defaults and do not need to be overwritten. + + >>> Protect ${config_path}! A lost conf file means you have + >>> lost your password and connections and anyone who connected + >>> to you will no longer be able to connect. A *compromised* + >>> conf file means that other people can impersonate you on + >>> the network. +" + fi +} + +post_upgrade() { + post_install +} + +# vim: ts=2 sw=2 et: