From 95cbc04fc873aa036e930545bd97ee0026016489 Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Sat, 7 Aug 2021 17:23:40 +0200 Subject: [PATCH] net-misc/FORT-validator: Version bump to 1.5.1 and libressl removal Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Alarig Le Lay --- .../FORT-validator-1.4.2.ebuild | 5 ++- .../FORT-validator-1.5.0.ebuild | 5 ++- ...4.1.ebuild => FORT-validator-1.5.1.ebuild} | 36 ++++++++----------- net-misc/FORT-validator/Manifest | 2 +- 4 files changed, 20 insertions(+), 28 deletions(-) rename net-misc/FORT-validator/{FORT-validator-1.4.1.ebuild => FORT-validator-1.5.1.ebuild} (53%) 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 c642fbd..51e3b38 100644 --- a/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild @@ -14,15 +14,14 @@ SRC_URI="https://github.com/NICMx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="caps libressl" +IUSE="caps" DEPEND=" acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl " RDEPEND=" ${DEPEND} diff --git a/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild index fa2d973..dc0ea32 100644 --- a/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild @@ -14,15 +14,14 @@ SRC_URI="https://github.com/NICMx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="caps libressl" +IUSE="caps" DEPEND=" acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl " RDEPEND=" ${DEPEND} diff --git a/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.1.ebuild similarity index 53% rename from net-misc/FORT-validator/FORT-validator-1.4.1.ebuild rename to net-misc/FORT-validator/FORT-validator-1.5.1.ebuild index 072bcd2..d8222cd 100644 --- a/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild +++ b/net-misc/FORT-validator/FORT-validator-1.5.1.ebuild @@ -5,24 +5,23 @@ 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" - LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="caps libressl" +IUSE="caps" DEPEND=" acct-group/fort acct-user/fort caps? ( sys-libs/libcap ) dev-libs/jansson - libressl? ( dev-libs/libressl:0= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl " RDEPEND=" ${DEPEND} @@ -33,19 +32,20 @@ BDEPEND=" sys-devel/automake " -PATCHES="${FILESDIR}/${PN}-skip-online-test.patch" - 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}" @@ -56,22 +56,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." } diff --git a/net-misc/FORT-validator/Manifest b/net-misc/FORT-validator/Manifest index 8741ee1..4f0692d 100644 --- a/net-misc/FORT-validator/Manifest +++ b/net-misc/FORT-validator/Manifest @@ -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-validator-1.5.1.tar.gz 482518 BLAKE2B b0753dd32fc04f9a9e8d36b6b8b4870a79cc37410a2d5a10b7605401132863899fa9ecc1d112264a0e387f90123519941ed44de81f49d10d7bed08d8ade060a6 SHA512 4e1a58cf1f1c2e8ff214011c3bc704cc1eeb12b88f9e27547b3e7a0b374f33c463b32c00a68a749dc9901d6b315476b58b4dd4cb8dd795af36b5c37e1664afaa