commit: 597fee0f4592a7176881ab520dd0c51bfc253c7c Author: Alarig Le Lay <alarig <AT> swordarmor <DOT> fr> AuthorDate: Thu Feb 11 19:16:55 2021 +0000 Commit: Alarig Le Lay <alarig <AT> swordarmor <DOT> fr> CommitDate: Thu Feb 11 19:16:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=597fee0f
net-misc/FORT-validator: New release 1.5.0 and init adaptation Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Alarig Le Lay <alarig <AT> swordarmor.fr> .../FORT-validator/FORT-validator-1.4.0.ebuild | 77 ---------------------- .../FORT-validator/FORT-validator-1.4.1.ebuild | 8 +-- .../FORT-validator/FORT-validator-1.4.2.ebuild | 8 +-- ...or-1.3.0.ebuild => FORT-validator-1.5.0.ebuild} | 17 ++--- net-misc/FORT-validator/Manifest | 3 +- .../files/{fort-confd => fort-1.4-confd} | 0 .../files/{fort-initd => fort-1.4-initd} | 2 +- .../files/{fort.service => fort-1.4.service} | 0 .../files/{fort-confd => fort-1.5-confd} | 5 +- .../files/{fort-initd => fort-1.5-initd} | 3 +- .../files/{fort.service => fort-1.5.service} | 2 +- net-misc/FORT-validator/files/fort-config.json | 4 +- 12 files changed, 25 insertions(+), 104 deletions(-) diff --git a/net-misc/FORT-validator/FORT-validator-1.4.0.ebuild b/net-misc/FORT-validator/FORT-validator-1.4.0.ebuild deleted file mode 100644 index ce424e3a..00000000 --- a/net-misc/FORT-validator/FORT-validator-1.4.0.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools fcaps systemd - -DESCRIPTION="FORT validator is an open source RPKI validator" -HOMEPAGE="https://fortproject.net/validator?2" -SRC_URI="https://github.com/NICMx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -MY_PN="fort" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="caps libressl" - -DEPEND=" - acct-group/fort - acct-user/fort - caps? ( sys-libs/libcap ) - dev-libs/jansson - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) -" -RDEPEND=" - ${DEPEND} - net-misc/rsync -" -BDEPEND=" - sys-devel/autoconf - sys-devel/automake -" - -PATCHES="${FILESDIR}/${PN}-skip-online-test.patch" - -src_prepare() { - default - - eautoreconf -} - -src_install() { - newinitd "${FILESDIR}/${MY_PN}-initd" ${MY_PN} - newconfd "${FILESDIR}/${MY_PN}-confd" ${MY_PN} - - emake DESTDIR="${D}" install - insinto /usr/share/${MY_PN}/ - insopts -m0644 -o "${MY_PN}" - diropts -m0755 -o "${MY_PN}" - doins -r examples/tal/ - - dodoc -r examples/ - - insinto /etc/fort - newins "${FILESDIR}/fort-config.json" config.json - - exeinto "/usr/libexec/${MY_PN}" - doexe fort_setup.sh - - systemd_dounit "${FILESDIR}/${MY_PN}.service" -} - -pkg_postinst() { - fcaps cap_net_bind_service usr/bin/fort - - einfo "" - einfo "ARIN TAL is disabled by default because the ARIN Relying Party" - einfo "Agreement must be accepted beforehead. Start fort, run" - einfo "" - einfo " su -s /bin/sh -c '${EROOT}/usr/libexec/${MY_PN}/fort_setup.sh /usr/share/${MY_PN}/tal/' fort" - einfo "" - einfo "as root and restart fort to enable it." - einfo "The configuration file generation will provide a config file, but a" - einfo "simpler one is shiped with the ebuid. Use the one you prefer." -} diff --git a/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild b/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild index ce424e3a..072bcd25 100644 --- a/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,8 +42,8 @@ src_prepare() { } src_install() { - newinitd "${FILESDIR}/${MY_PN}-initd" ${MY_PN} - newconfd "${FILESDIR}/${MY_PN}-confd" ${MY_PN} + newinitd "${FILESDIR}/${MY_PN}-1.4-initd" ${MY_PN} + newconfd "${FILESDIR}/${MY_PN}-1.4-confd" ${MY_PN} emake DESTDIR="${D}" install insinto /usr/share/${MY_PN}/ @@ -59,7 +59,7 @@ src_install() { exeinto "/usr/libexec/${MY_PN}" doexe fort_setup.sh - systemd_dounit "${FILESDIR}/${MY_PN}.service" + systemd_dounit "${FILESDIR}/${MY_PN}-1.4.service" } pkg_postinst() { diff --git a/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild b/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild index 25374596..c642fbdf 100644 --- a/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -43,8 +43,8 @@ src_prepare() { } src_install() { - newinitd "${FILESDIR}/${MY_PN}-initd" ${MY_PN} - newconfd "${FILESDIR}/${MY_PN}-confd" ${MY_PN} + newinitd "${FILESDIR}/${MY_PN}-1.4-initd" ${MY_PN} + newconfd "${FILESDIR}/${MY_PN}-1.4-confd" ${MY_PN} emake DESTDIR="${ED}" install insinto /usr/share/${MY_PN}/ @@ -60,7 +60,7 @@ src_install() { exeinto "/usr/libexec/${MY_PN}" doexe fort_setup.sh - systemd_dounit "${FILESDIR}/${MY_PN}.service" + systemd_dounit "${FILESDIR}/${MY_PN}-1.4.service" } pkg_postinst() { diff --git a/net-misc/FORT-validator/FORT-validator-1.3.0.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild similarity index 64% rename from net-misc/FORT-validator/FORT-validator-1.3.0.ebuild rename to net-misc/FORT-validator/FORT-validator-1.5.0.ebuild index ce424e3a..15a56605 100644 --- a/net-misc/FORT-validator/FORT-validator-1.3.0.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,8 +42,8 @@ src_prepare() { } src_install() { - newinitd "${FILESDIR}/${MY_PN}-initd" ${MY_PN} - newconfd "${FILESDIR}/${MY_PN}-confd" ${MY_PN} + newinitd "${FILESDIR}/${MY_PN}-1.5-initd" ${MY_PN} + newconfd "${FILESDIR}/${MY_PN}-1.5-confd" ${MY_PN} emake DESTDIR="${D}" install insinto /usr/share/${MY_PN}/ @@ -59,19 +59,16 @@ src_install() { exeinto "/usr/libexec/${MY_PN}" doexe fort_setup.sh - systemd_dounit "${FILESDIR}/${MY_PN}.service" + systemd_dounit "${FILESDIR}/${MY_PN}-1.5.service" } pkg_postinst() { fcaps cap_net_bind_service usr/bin/fort einfo "" - einfo "ARIN TAL is disabled by default because the ARIN Relying Party" - einfo "Agreement must be accepted beforehead. Start fort, run" + einfo "You have to init the TALs before the first run. To do so, run " einfo "" - einfo " su -s /bin/sh -c '${EROOT}/usr/libexec/${MY_PN}/fort_setup.sh /usr/share/${MY_PN}/tal/' fort" + einfo " su -s /bin/sh -c '${EROOT}/usr/bin/${MY_PN} --init-tals --tal /usr/share/${MY_PN}/tal/' fort" einfo "" - einfo "as root and restart fort to enable it." - einfo "The configuration file generation will provide a config file, but a" - einfo "simpler one is shiped with the ebuid. Use the one you prefer." + einfo "as root." } diff --git a/net-misc/FORT-validator/Manifest b/net-misc/FORT-validator/Manifest index 89dcf1bb..8741ee16 100644 --- a/net-misc/FORT-validator/Manifest +++ b/net-misc/FORT-validator/Manifest @@ -1,4 +1,3 @@ -DIST FORT-validator-1.3.0.tar.gz 444918 BLAKE2B 3a8fb8cce5c71d22ab402d6b6a1478f173641a3876bad04e9fde4373d2a6b49395ff692aa048579886a82a799ed7849fc51d86c798b0b0ea9c594b4eb532b367 SHA512 0aed86979e6b9c3142cc9a53d13a619dbe22a3e05bcc26f30fda5048ac3e9d31b83307fbd4a68543eaf948954dbaba54edbce9b90ab0189d15c3629b220d094c -DIST FORT-validator-1.4.0.tar.gz 468621 BLAKE2B f531f06136e8052ca8a001c91c8209bba7f0da6dcbb8cbccf9d7b3d39e2366951f48f254614def4749a8eb3f83bf01afaf9e2b013eecbc8fcd0c4274c4c3496a SHA512 dfbd94c9fbd8a4eac9f43030ebfa005febc01e4a39fccdd58fbfcc79aadfe0eeb2f8a2f4836c8d14c3e957f58e91466650ff1a266144f4b4f731495f8a74e460 DIST FORT-validator-1.4.1.tar.gz 468737 BLAKE2B d1cbe115ba4d5e650d83e5793773028d545d7e56e8a7247ddc10673e0925ff278ebbc35f1161423d6f2b0bea6c8cb3416d8d87afea8c414bb69b5b95b9c8bf06 SHA512 aac4039bfad71fe9d9747abf8b2121d8b801c07feac83238c994b406241d2fefcf46bebc899298be84fddb90bbc345b117613a4bd4d45fbb38da89d1040ed393 DIST FORT-validator-1.4.2.tar.gz 471694 BLAKE2B 9c5f3a2a6b79dbd62248e125d665d31561c2efee0b7df31215d16d55b56b56dee8dd6e5c34e9d01e36e82383dec49d6bb59fc3f078be000f166f46c4c08ead33 SHA512 c06c5552282584c0c671cec04d11a6072c5d19b3cc5a6e140088e6774c9b03a5fb00e9929e3f278f61207083f10f332282dba2c9395a28e78c190599c077c9fd +DIST FORT-validator-1.5.0.tar.gz 482884 BLAKE2B 704f9d9f9c9cea54f8831f669eac62d5298da8ccacfdae5a4ecc30ee126be610679ff25a929d5ead64cb02fd63bdeaebc7027312d7fcb6d49bd0d563bb256fa2 SHA512 3da44896c69685c0a49e418b10e70ad34a5c621a32982203eb3def5462af014d1f807e29e3e9a7555b381ad976e8e19c2cc0973149c9c6253ee845a14fb86023 diff --git a/net-misc/FORT-validator/files/fort-confd b/net-misc/FORT-validator/files/fort-1.4-confd similarity index 100% copy from net-misc/FORT-validator/files/fort-confd copy to net-misc/FORT-validator/files/fort-1.4-confd diff --git a/net-misc/FORT-validator/files/fort-initd b/net-misc/FORT-validator/files/fort-1.4-initd similarity index 94% copy from net-misc/FORT-validator/files/fort-initd copy to net-misc/FORT-validator/files/fort-1.4-initd index 25e6b309..9a7e54a2 100644 --- a/net-misc/FORT-validator/files/fort-initd +++ b/net-misc/FORT-validator/files/fort-1.4-initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 name="fort validator daemon" diff --git a/net-misc/FORT-validator/files/fort.service b/net-misc/FORT-validator/files/fort-1.4.service similarity index 100% copy from net-misc/FORT-validator/files/fort.service copy to net-misc/FORT-validator/files/fort-1.4.service diff --git a/net-misc/FORT-validator/files/fort-confd b/net-misc/FORT-validator/files/fort-1.5-confd similarity index 79% rename from net-misc/FORT-validator/files/fort-confd rename to net-misc/FORT-validator/files/fort-1.5-confd index 92936757..9afc111a 100644 --- a/net-misc/FORT-validator/files/fort-confd +++ b/net-misc/FORT-validator/files/fort-1.5-confd @@ -11,5 +11,6 @@ #FORT_OPTS="--tal /usr/share/fort/tal/ \ # --local-repository ${FORT_BASEDIR} # --log.output syslog -# --server.address ::" -FORT_OPTS="--configuration-file /etc/fort/config.json" +# --server.address :: +# --daemon" +FORT_OPTS="--configuration-file /etc/fort/config.json --daemon" diff --git a/net-misc/FORT-validator/files/fort-initd b/net-misc/FORT-validator/files/fort-1.5-initd similarity index 91% rename from net-misc/FORT-validator/files/fort-initd rename to net-misc/FORT-validator/files/fort-1.5-initd index 25e6b309..a7c36a1a 100644 --- a/net-misc/FORT-validator/files/fort-initd +++ b/net-misc/FORT-validator/files/fort-1.5-initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 name="fort validator daemon" @@ -8,7 +8,6 @@ command=/usr/bin/fort command_args="${FORT_OPTS}" command_user="fort" pidfile="/run/${RC_SVCNAME}.pid" -command_background=true depend() { need net diff --git a/net-misc/FORT-validator/files/fort.service b/net-misc/FORT-validator/files/fort-1.5.service similarity index 98% rename from net-misc/FORT-validator/files/fort.service rename to net-misc/FORT-validator/files/fort-1.5.service index 4f24f8d1..cd1914e3 100644 --- a/net-misc/FORT-validator/files/fort.service +++ b/net-misc/FORT-validator/files/fort-1.5.service @@ -4,7 +4,7 @@ Documentation=man:fort(8) Documentation=https://nicmx.github.io/FORT-validator/ [Service] -ExecStart=/usr/bin/fort --configuration-file /etc/fort/config.json +ExecStart=/usr/bin/fort --configuration-file /etc/fort/config.json --daemon Type=simple User=fort AmbientCapabilities=CAP_NET_BIND_SERVICE diff --git a/net-misc/FORT-validator/files/fort-config.json b/net-misc/FORT-validator/files/fort-config.json index b3d5fecd..895a3f5e 100644 --- a/net-misc/FORT-validator/files/fort-config.json +++ b/net-misc/FORT-validator/files/fort-config.json @@ -2,7 +2,9 @@ "tal": "/usr/share/fort/tal/", "local-repository": "/var/cache/fort/repository/", "server": { - "address": "::" + "address": [ + "::" + ] }, "log": { "output": "syslog"