net-misc/FORT-validator: Deleting 1.4.1..1.5.0, adding 1.5.2 1.5.3

Closes: https://bugs.gentoo.org/show_bug.cgi?id=887867
Signed-off-by: Alarig Le Lay <alarig@swordarmor.fr>
This commit is contained in:
Alarig Le Lay
2022-12-23 23:26:48 +01:00
parent 213917e0c8
commit de74d9c051
5 changed files with 40 additions and 47 deletions

View File

@@ -5,11 +5,11 @@ EAPI=7
inherit autotools fcaps systemd
MY_PN="fort"
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"
SRC_URI="https://github.com/NICMx/${PN}/releases/download/${PV}/fort-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
@@ -21,7 +21,7 @@ DEPEND="
acct-user/fort
caps? ( sys-libs/libcap )
dev-libs/jansson
dev-libs/openssl:0=
dev-libs/openssl
"
RDEPEND="
${DEPEND}
@@ -32,11 +32,14 @@ BDEPEND="
sys-devel/automake
"
PATCHES="${FILESDIR}/${PN}-skip-online-test.patch"
S="${WORKDIR}/fort-${PV}"
src_prepare() {
default
# Don't strip CFLAGS
sed -i 's/fort_CFLAGS =/fort_CFLAGS = ${CFLAGS} /' src/Makefile.am || die
# Don't test network
sed -i '/http/d' test/Makefile.am || die
eautoreconf
}
@@ -44,7 +47,7 @@ src_install() {
newinitd "${FILESDIR}/${MY_PN}-1.5-initd" ${MY_PN}
newconfd "${FILESDIR}/${MY_PN}-1.5-confd" ${MY_PN}
emake DESTDIR="${D}" install
emake DESTDIR="${ED}" install
insinto /usr/share/${MY_PN}/
insopts -m0644 -o "${MY_PN}"
diropts -m0755 -o "${MY_PN}"
@@ -55,9 +58,6 @@ src_install() {
insinto /etc/fort
newins "${FILESDIR}/fort-config.json" config.json
exeinto "/usr/libexec/${MY_PN}"
doexe fort_setup.sh
systemd_dounit "${FILESDIR}/${MY_PN}-1.5.service"
}

View File

@@ -9,7 +9,7 @@ MY_PN="fort"
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"
SRC_URI="https://github.com/NICMx/${PN}/releases/download/${PV}/fort-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
@@ -21,7 +21,7 @@ DEPEND="
acct-user/fort
caps? ( sys-libs/libcap )
dev-libs/jansson
dev-libs/openssl:0=
dev-libs/openssl
"
RDEPEND="
${DEPEND}
@@ -32,6 +32,8 @@ BDEPEND="
sys-devel/automake
"
S="${WORKDIR}/${MY_PN}-${PV}"
src_prepare() {
default
# Don't strip CFLAGS
@@ -42,8 +44,8 @@ src_prepare() {
}
src_install() {
newinitd "${FILESDIR}/${MY_PN}-1.4-initd" ${MY_PN}
newconfd "${FILESDIR}/${MY_PN}-1.4-confd" ${MY_PN}
newinitd "${FILESDIR}/${MY_PN}-1.5-initd" ${MY_PN}
newconfd "${FILESDIR}/${MY_PN}-1.5-confd" ${MY_PN}
emake DESTDIR="${ED}" install
insinto /usr/share/${MY_PN}/
@@ -56,22 +58,16 @@ src_install() {
insinto /etc/fort
newins "${FILESDIR}/fort-config.json" config.json
exeinto "/usr/libexec/${MY_PN}"
doexe fort_setup.sh
systemd_dounit "${FILESDIR}/${MY_PN}-1.4.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."
}

View File

@@ -5,11 +5,12 @@ EAPI=7
inherit autotools fcaps systemd
MY_PN="fort"
MY_PV="issue83"
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"
SRC_URI="https://github.com/NICMx/${PN}/archive/refs/heads/${MY_PV}.zip -> ${MY_PN}-${PV}.zip"
LICENSE="MIT"
SLOT="0"
@@ -21,7 +22,7 @@ DEPEND="
acct-user/fort
caps? ( sys-libs/libcap )
dev-libs/jansson
dev-libs/openssl:0=
dev-libs/openssl
"
RDEPEND="
${DEPEND}
@@ -32,19 +33,22 @@ BDEPEND="
sys-devel/automake
"
PATCHES="${FILESDIR}/${PN}-skip-online-test.patch"
S="${WORKDIR}/${PN}-${MY_PV}"
src_prepare() {
default
# Don't strip CFLAGS
sed -i 's/fort_CFLAGS =/fort_CFLAGS = ${CFLAGS} /' src/Makefile.am || die
# Don't test network
sed -i '/http/d' test/Makefile.am || die
eautoreconf
}
src_install() {
newinitd "${FILESDIR}/${MY_PN}-1.4-initd" ${MY_PN}
newconfd "${FILESDIR}/${MY_PN}-1.4-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
emake DESTDIR="${ED}" install
insinto /usr/share/${MY_PN}/
insopts -m0644 -o "${MY_PN}"
diropts -m0755 -o "${MY_PN}"
@@ -55,22 +59,16 @@ src_install() {
insinto /etc/fort
newins "${FILESDIR}/fort-config.json" config.json
exeinto "/usr/libexec/${MY_PN}"
doexe fort_setup.sh
systemd_dounit "${FILESDIR}/${MY_PN}-1.4.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."
}

View File

@@ -1,3 +1,3 @@
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
DIST fort-1.5.2.tar.gz 562414 BLAKE2B cbe5a5a47ec7a47176ab1cdd9b3ed26e5a73dd238a364d0ec54a5955316e4813a715180652ad2092ed9cf5c843dc7677d33ed831adb5bcabc156995fbf4c208b SHA512 77c9484314067f5612a5a076ae7e16423f41b79220fc911599f867426dedf7b2276b8f8109ad0b17a714c463f3080b734d1562f6b7ed2265583b1ab6c7f32436
DIST fort-1.5.3.tar.gz 564257 BLAKE2B f0a6c9899c968f6697c79c0f541275874bc7aa23d6e42113d4be23b6338eb3007557a0260e601575719b90b8e87c4483bb13a40a6ac0724e17cf8157ce40d6ba SHA512 1b97bec1b031cd717d4012b0faec36785ba5c8e06ca46b4a017a08c3f2a038d2224c740a6b84f1c853c996c203af9ac975506d5c0e379a7cab82554318136a99
DIST fort-1.5.3_p20220607.zip 719847 BLAKE2B 10ed3913e6482e15da64f48ce42a0eb9d14b5e39875f8b2ac1dc71da9cccfaa952a3bbb71030bc6c025aa9966087db20e0a574af6da8424b0b24e8d51e98fb23 SHA512 2dfa61a99edffb678ba338165610445921380bf98c32958b4c425dfa055a212ec4edcbf68758f43fdb4f36769a79fceca46e82abdc471e4bea22caf28c879eb3

View File

@@ -7,7 +7,6 @@ description="FORT validator is an open source RPKI validator."
command=/usr/bin/fort
command_args="${FORT_OPTS}"
command_user="fort"
pidfile="/run/${RC_SVCNAME}.pid"
depend() {
need net