Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 21177781874 for <~alpine/aports@lists.alpinelinux.org>; Mon, 29 Jun 2020 16:13:57 +0000 (UTC) Received: by mail-qk1-f175.google.com with SMTP id 80so15740677qko.7 for <~alpine/aports@lists.alpinelinux.org>; Mon, 29 Jun 2020 09:13:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=4G4kMW0H1LLmVpm2DuohjXOksMXVIj7lHr7Eh/9umhY=; b=F5mtrmeSC65Ht6ZcXSGDvLCyGHVoCGxOwdKJG9+NcXaCSp1AM4c4/sJkba5i0wXSor S7x4BdsJ6mhNZ7ZfWfv7jmtnNXFaZiMo3eCyaVFZSS4ALHcsCVrZv7vlaI+Dr7kzcy7r MnK1v5gvyxvXVzFQK0Au2+IqViLsj3dWbxr5LGzvfw/Xbs0Co9EkHsykgZFRY82ujo1D 0O2MM/btdmY+LGsijyjfCsHN5DBVG78oixqJKrvVO5TlUujg0N2ITinGRYR/popJfbmB aw+TVLCRxlbfgIw4s5xRbfgvz7ei3h5KQAGl+Uxks6a2AfJvA+d+7dx0J0gGjnMLWjMF 9Kmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4G4kMW0H1LLmVpm2DuohjXOksMXVIj7lHr7Eh/9umhY=; b=eHuLkjRZbl3Az6IlF9+5YWAOH5tfcttKcrW1z73zEEtt/TYNfgN/8WCfyzWyDFaYbs SaSF7xA02uoQbp9rzUyekIXZxapktIyOWzeQEUymflzzTZOGe2RR80Efy8pq5LZvK8GS 3srb8qg7YJ8GBd45Kw9mbozmjj5n2aOoiHcPsVsl1UsaL/gLX/0JYtcLcH0Q3r4EoGFQ VJLEs+OKewfAbUiZteoAgc2D54UrXNX8ZCq7IJTmOB5bqiEuKPWzyjmvOJL1p9ZGzRiJ lCu9LLZ62CE+aQkIL6pMyGKz0kTEazIAB4Y09KvtgGzDDxW+uP9iILxFUM/Xj15p1dLH Im5Q== X-Gm-Message-State: AOAM533nnAuq4NvGFDyDzxpL93vtaGUdvDZAtlgUvXUXxyFuAJhJyssd 4lNXe6yCHgAYkohijBVJ6b3FJbRVu6Q= X-Google-Smtp-Source: ABdhPJyXNcxR013FlE5BsVU8Q6TSuXDUHFTNEMGGxjvgqaZfqXL2eM4bPXzFTmyELFhcJZeqa60QGA== X-Received: by 2002:a37:6894:: with SMTP id d142mr15606707qkc.440.1593447236280; Mon, 29 Jun 2020 09:13:56 -0700 (PDT) Received: from enterprise ([2804:431:cfcc:f955:b8e8:81d2:c9c:df71]) by smtp.gmail.com with ESMTPSA id l46sm148080qtf.7.2020.06.29.09.13.55 for <~alpine/aports@lists.alpinelinux.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 09:13:56 -0700 (PDT) Date: Mon, 29 Jun 2020 13:13:49 -0300 From: Leo To: ~alpine/aports@lists.alpinelinux.org Subject: Re: [PATCH v2] testing/yggdrasil: new aport Message-ID: <20200629131349.20cd5cd0@enterprise> In-Reply-To: <20200628201013.5113-1-sir@cmpwn.com> References: <20200628201013.5113-1-sir@cmpwn.com> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-alpine-linux-musl) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Sun, 28 Jun 2020 14:10:14 -0600 Drew DeVault wrote: > --- > This needs to run as root, I mistakenly created a user for yggdrasil > in v1. > > testing/yggdrasil/APKBUILD | 48 > +++++++++++++++++++++++++++++++ testing/yggdrasil/modules.conf | > 1 + testing/yggdrasil/yggdrasil.confd | 4 +++ > testing/yggdrasil/yggdrasil.initd | 21 ++++++++++++++ > 4 files changed, 74 insertions(+) > create mode 100644 testing/yggdrasil/APKBUILD > create mode 100644 testing/yggdrasil/modules.conf > create mode 100644 testing/yggdrasil/yggdrasil.confd > create mode 100644 testing/yggdrasil/yggdrasil.initd > > diff --git a/testing/yggdrasil/APKBUILD b/testing/yggdrasil/APKBUILD > new file mode 100644 > index 0000000000..5081fe24dd > --- /dev/null > +++ b/testing/yggdrasil/APKBUILD > @@ -0,0 +1,48 @@ > +# Maintainer: Drew DeVault > +pkgname=yggdrasil > +pkgver=0.3.14 > +pkgrel=0 > +pkgdesc="An experiment in scalable routing as an encrypted IPv6 > overlay network" +url="https://yggdrasil-network.github.io/" > +arch="all" > +license="LGPL-3.0-only" > +makedepends="go" > +source=" > + > $pkgname-$pkgver.tar.gz::https://github.com/yggdrasil-network/yggdrasil-go/archive/v$pkgver.tar.gz > + $pkgname.confd > + $pkgname.initd > + modules.conf > +" > +builddir="$srcdir/$pkgname-go-$pkgver" > +options="!check" # upstream test suite is broken/unusual > +subpackages="$pkgname-openrc" > + > +build() { > + go mod vendor > + pkgsrc=github.com/yggdrasil-network/yggdrasil-go/src/version > + LDFLAGS="$LDFLAGS -X $pkgsrc.buildName=$pkgname -X > $PKGSRC.buildVersion=$pkgver" > + for cmd in yggdrasil yggdrasilctl > + do > + go build \ > + -trimpath \ > + -mod=vendor \ > + -ldflags "-extldflags $LDFLAGS" \ > + ./cmd/$cmd > + done > +} > + > +package() { > + install -Dm755 yggdrasil "$pkgdir"/usr/bin/yggdrasil > + install -Dm755 yggdrasilctl "$pkgdir"/usr/bin/yggdrasilctl > + install -Dm644 "$srcdir"/yggdrasil.confd \ > + "$pkgdir"/etc/conf.d/yggdrasil > + install -Dm755 "$srcdir"/yggdrasil.initd \ > + "$pkgdir"/etc/init.d/yggdrasil > + install -Dm644 "$srcdir"/modules.conf \ > + "$pkgdir"/etc/modules-load.d/yggdrasil.conf > +} > + > +sha512sums="3c3e92c7d49a08d2390a5d7226387c83b5575d55ae90b1209a103b50659ae60d978e39ee9247f548efe90228c3ce544b17bb205f9dcbc7f67262beaf9b7c38bf > yggdrasil-0.3.14.tar.gz > +089221d9dd703b21714ac5ec04f23218083d216ff259fdd76942c9b2089ee4ca908b360dca0c1f4fa2e0bb1de7d57f0c638d8db9bc782cbe0ed1733f6888171a > yggdrasil.confd > +2c08ea638be7632d930e0a80e85ce5311f6703870eada5ad41dd6033f1837a9a41b3d567af807e55004af1f06dfd69e6a49e321340e2b0113b73f5a25237879d > yggdrasil.initd > +871b650ff982be061532b4c5fe4812f41e6e2c58fc69b24f8a745f9a43389da44e742a69b0467b3c3d9e2b031af0728e20f10fa4584695c4f5ac87768a1fd34e > modules.conf" diff --git a/testing/yggdrasil/modules.conf > b/testing/yggdrasil/modules.conf new file mode 100644 index > 0000000000..0cb2f0a64b --- /dev/null +++ > b/testing/yggdrasil/modules.conf @@ -0,0 +1 @@ +tun > diff --git a/testing/yggdrasil/yggdrasil.confd > b/testing/yggdrasil/yggdrasil.confd new file mode 100644 > index 0000000000..a162ffba4e > --- /dev/null > +++ b/testing/yggdrasil/yggdrasil.confd > @@ -0,0 +1,4 @@ > +yggdrasil_config_file=/etc/yggdrasil.conf > + > +output_log=/var/log/yggdrasil.log > +error_log=/var/log/yggdrasil.log > diff --git a/testing/yggdrasil/yggdrasil.initd > b/testing/yggdrasil/yggdrasil.initd new file mode 100644 > index 0000000000..9fab7d7c58 > --- /dev/null > +++ b/testing/yggdrasil/yggdrasil.initd > @@ -0,0 +1,21 @@ > +#!/sbin/openrc-run > +name="yggdrasil" > +description="An experiment in scalable routing as an encrypted IPv6 > overlay network" +supervisor=supervise-daemon > +command=/usr/bin/yggdrasil > +command_args="-useconffile $yggdrasil_config_file" > +command_user="yggdrasil:yggdrasil" > + > +depend() { > + need net > + after firewall > + before radvd > +} > + > +start_pre() { > + [ -n "$output_log" ] && checkpath -f "$output_log" \ > + -m 644 -o yggdrasil:yggdrasil || true > + [ -n "$error_log" ] && checkpath -f "$error_log" \ > + -m 644 -o yggdrasil:yggdrasil || true > + checkpath /var/run/yggdrasil.sock -m 755 -o > yggdrasil:yggdrasil +} Applied