* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/FORT-validator/files/, net-misc/FORT-validator/
@ 2021-02-11 19:17 Alarig Le Lay
0 siblings, 0 replies; 4+ messages in thread
From: Alarig Le Lay @ 2021-02-11 19:17 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/FORT-validator/files/, net-misc/FORT-validator/
@ 2022-12-23 22:30 Alarig Le Lay
0 siblings, 0 replies; 4+ messages in thread
From: Alarig Le Lay @ 2022-12-23 22:30 UTC (permalink / raw
To: gentoo-commits
commit: de74d9c051926997d42c698bb8e0dca003f391fc
Author: Alarig Le Lay <alarig <AT> swordarmor <DOT> fr>
AuthorDate: Fri Dec 23 22:26:48 2022 +0000
Commit: Alarig Le Lay <alarig <AT> swordarmor <DOT> fr>
CommitDate: Fri Dec 23 22:29:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=de74d9c0
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 <AT> swordarmor.fr>
...or-1.5.0.ebuild => FORT-validator-1.5.2.ebuild} | 20 ++++++------
...or-1.4.2.ebuild => FORT-validator-1.5.3.ebuild} | 24 ++++++---------
...build => FORT-validator-1.5.3_p20220607.ebuild} | 36 ++++++++++------------
net-misc/FORT-validator/Manifest | 6 ++--
net-misc/FORT-validator/files/fort-1.5-initd | 1 -
5 files changed, 40 insertions(+), 47 deletions(-)
diff --git a/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.2.ebuild
similarity index 79%
rename from net-misc/FORT-validator/FORT-validator-1.5.0.ebuild
rename to net-misc/FORT-validator/FORT-validator-1.5.2.ebuild
index c3c640eac..80f8c60c3 100644
--- a/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.5.2.ebuild
@@ -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"
}
diff --git a/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild
similarity index 58%
rename from net-misc/FORT-validator/FORT-validator-1.4.2.ebuild
rename to net-misc/FORT-validator/FORT-validator-1.5.3.ebuild
index 645a3e3e9..d96515b72 100644
--- a/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.5.3.ebuild
@@ -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."
}
diff --git a/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.3_p20220607.ebuild
similarity index 51%
rename from net-misc/FORT-validator/FORT-validator-1.4.1.ebuild
rename to net-misc/FORT-validator/FORT-validator-1.5.3_p20220607.ebuild
index e31d270e4..ee859b588 100644
--- a/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.5.3_p20220607.ebuild
@@ -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."
}
diff --git a/net-misc/FORT-validator/Manifest b/net-misc/FORT-validator/Manifest
index 8741ee164..abcac86d6 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-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
diff --git a/net-misc/FORT-validator/files/fort-1.5-initd b/net-misc/FORT-validator/files/fort-1.5-initd
index a7c36a1a9..4685a496f 100644
--- a/net-misc/FORT-validator/files/fort-1.5-initd
+++ b/net-misc/FORT-validator/files/fort-1.5-initd
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/FORT-validator/files/, net-misc/FORT-validator/
@ 2024-06-03 1:18 Lucio Sauer
0 siblings, 0 replies; 4+ messages in thread
From: Lucio Sauer @ 2024-06-03 1:18 UTC (permalink / raw
To: gentoo-commits
commit: 5d0270aaf228fe067d2226de9888908bb23e6a09
Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Mon Jun 3 00:31:46 2024 +0000
Commit: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Mon Jun 3 01:18:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5d0270aa
net-misc/FORT-validator: declare read-only parameter's type as const
Fixes build failure due to -Wincompatible-pointer-types
Closes: https://bugs.gentoo.org/928331
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
...1.5.4.ebuild => FORT-validator-1.5.4-r1.ebuild} | 4 +++-
...1.6.1.ebuild => FORT-validator-1.6.1-r1.ebuild} | 4 +++-
...1.6.2.ebuild => FORT-validator-1.6.2-r1.ebuild} | 4 +++-
.../files/FORT-validator-1.5.4-GCC14.patch | 28 ++++++++++++++++++++++
4 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild
similarity index 95%
rename from net-misc/FORT-validator/FORT-validator-1.5.4.ebuild
rename to net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild
index 3d59fe305..b6df06436 100644
--- a/net-misc/FORT-validator/FORT-validator-1.5.4.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,6 +18,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="caps"
+PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch
+
DEPEND="
acct-group/fort
acct-user/fort
diff --git a/net-misc/FORT-validator/FORT-validator-1.6.1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild
similarity index 94%
rename from net-misc/FORT-validator/FORT-validator-1.6.1.ebuild
rename to net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild
index c4ee310ed..1eb18db5b 100644
--- a/net-misc/FORT-validator/FORT-validator-1.6.1.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,6 +18,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="caps"
+PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch
+
DEPEND="
acct-group/fort
acct-user/fort
diff --git a/net-misc/FORT-validator/FORT-validator-1.6.2.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild
similarity index 94%
rename from net-misc/FORT-validator/FORT-validator-1.6.2.ebuild
rename to net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild
index 89351a5ad..7e33ba238 100644
--- a/net-misc/FORT-validator/FORT-validator-1.6.2.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,6 +16,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="caps"
+PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch
+
DEPEND="
acct-group/fort
acct-user/fort
diff --git a/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch b/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch
new file mode 100644
index 000000000..7a417fd24
--- /dev/null
+++ b/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch
@@ -0,0 +1,28 @@
+https://github.com/NICMx/FORT-validator/pull/137
+
+Since we don't manipulate any struct members, I believe we can safely take a
+const xmlError * argument instead, as per libxml2's documentation .
+
+I also believe we can drop the string-termination handling, because C strings
+end with \0 and therefore ptr[strlen(ptr)-1] is always \0.
+
+Author: Lucio Sauer <watermanpaint@posteo.net>
+--- a/src/xml/relax_ng.c
++++ b/src/xml/relax_ng.c
+@@ -36,14 +36,9 @@ relax_ng_log_warn(void *ctx, const char *msg, ...)
+ }
+
+ static void
+-relax_ng_log_str_err(void *userData, xmlErrorPtr error)
++relax_ng_log_str_err(void *userData, const xmlError *error)
+ {
+- char *ptr;
+-
+- ptr = error->message;
+- if (ptr[strlen(ptr) - 1] == '\n')
+- ptr[strlen(ptr) - 1] = '\0';
+- pr_val_err("%s (at line %d)", ptr, error->line);
++ pr_val_err("%s (at line %d)", error->message, error->line);
+ }
+
+ /* Initialize global schema to parse RRDP files */
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-misc/FORT-validator/files/, net-misc/FORT-validator/
@ 2024-06-05 13:23 Lucio Sauer
0 siblings, 0 replies; 4+ messages in thread
From: Lucio Sauer @ 2024-06-05 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 0e9bffaf0c73a064861831d8081da3047f9b2862
Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Wed Jun 5 13:06:18 2024 +0000
Commit: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Wed Jun 5 13:19:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0e9bffaf
net-misc/FORT-validator: restore compat with older libxml2 versions
5d0270aaf228fe067d2226de9888908bb23e6a09 broke compatibility with
<dev-libs/libxml2-2.12.0 due to API changes.
Backport commits that fix previous patch.
Bug: https://bugs.gentoo.org/928331
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
....4-r1.ebuild => FORT-validator-1.5.4-r2.ebuild} | 2 +-
....1-r1.ebuild => FORT-validator-1.6.1-r2.ebuild} | 2 +-
....2-r1.ebuild => FORT-validator-1.6.2-r2.ebuild} | 2 +-
.../files/FORT-validator-1.5.4-GCC14.patch | 28 -------------------
.../FORT-validator-1.5.4-libxml2-2.12.0.patch | 31 ++++++++++++++++++++++
5 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.4-r2.ebuild
similarity index 96%
rename from net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild
rename to net-misc/FORT-validator/FORT-validator-1.5.4-r2.ebuild
index b24747b38..2918d6134 100644
--- a/net-misc/FORT-validator/FORT-validator-1.5.4-r1.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.5.4-r2.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="caps test"
RESTRICT="!test? ( test )"
-PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch
+PATCHES="${FILESDIR}"/${PN}-1.5.4-libxml2-2.12.0.patch
DEPEND="
acct-group/fort
diff --git a/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.1-r2.ebuild
similarity index 96%
rename from net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild
rename to net-misc/FORT-validator/FORT-validator-1.6.1-r2.ebuild
index c8938f818..0ab008b61 100644
--- a/net-misc/FORT-validator/FORT-validator-1.6.1-r1.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.6.1-r2.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="caps test"
RESTRICT="!test? ( test )"
-PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch
+PATCHES="${FILESDIR}"/${PN}-1.5.4-libxml2-2.12.0.patch
DEPEND="
acct-group/fort
diff --git a/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.2-r2.ebuild
similarity index 96%
rename from net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild
rename to net-misc/FORT-validator/FORT-validator-1.6.2-r2.ebuild
index c7d69b4de..f65c32359 100644
--- a/net-misc/FORT-validator/FORT-validator-1.6.2-r1.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.6.2-r2.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="caps test"
RESTRICT="!test? ( test )"
-PATCHES="${FILESDIR}"/${PN}-1.5.4-GCC14.patch
+PATCHES="${FILESDIR}"/${PN}-1.5.4-libxml2-2.12.0.patch
DEPEND="
acct-group/fort
diff --git a/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch b/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch
deleted file mode 100644
index 7a417fd24..000000000
--- a/net-misc/FORT-validator/files/FORT-validator-1.5.4-GCC14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/NICMx/FORT-validator/pull/137
-
-Since we don't manipulate any struct members, I believe we can safely take a
-const xmlError * argument instead, as per libxml2's documentation .
-
-I also believe we can drop the string-termination handling, because C strings
-end with \0 and therefore ptr[strlen(ptr)-1] is always \0.
-
-Author: Lucio Sauer <watermanpaint@posteo.net>
---- a/src/xml/relax_ng.c
-+++ b/src/xml/relax_ng.c
-@@ -36,14 +36,9 @@ relax_ng_log_warn(void *ctx, const char *msg, ...)
- }
-
- static void
--relax_ng_log_str_err(void *userData, xmlErrorPtr error)
-+relax_ng_log_str_err(void *userData, const xmlError *error)
- {
-- char *ptr;
--
-- ptr = error->message;
-- if (ptr[strlen(ptr) - 1] == '\n')
-- ptr[strlen(ptr) - 1] = '\0';
-- pr_val_err("%s (at line %d)", ptr, error->line);
-+ pr_val_err("%s (at line %d)", error->message, error->line);
- }
-
- /* Initialize global schema to parse RRDP files */
diff --git a/net-misc/FORT-validator/files/FORT-validator-1.5.4-libxml2-2.12.0.patch b/net-misc/FORT-validator/files/FORT-validator-1.5.4-libxml2-2.12.0.patch
new file mode 100644
index 000000000..f050f418e
--- /dev/null
+++ b/net-misc/FORT-validator/files/FORT-validator-1.5.4-libxml2-2.12.0.patch
@@ -0,0 +1,31 @@
+Backport commits 58a94fc..cdf9248 that enable compatibility with
+>=dev-libs/libxml2-2.12.0.
+
+Author: Lucio Sauer <watermanpaint@posteo.net>
+--- a/src/xml/relax_ng.c
++++ b/src/xml/relax_ng.c
+@@ -35,15 +35,17 @@ relax_ng_log_warn(void *ctx, const char *msg, ...)
+ VLOG_MSG(warn)
+ }
+
++/* Signature changed at libxml2 commit 61034116d0a3c8b295c6137956adc3ae55720. */
++#if LIBXML_VERSION >= 21200
++#define XMLERROR_PARAMTYPE const xmlError *
++#else
++#define XMLERROR_PARAMTYPE xmlErrorPtr
++#endif
++
+ static void
+-relax_ng_log_str_err(void *userData, xmlErrorPtr error)
++relax_ng_log_str_err(void *userData, XMLERROR_PARAMTYPE error)
+ {
+- char *ptr;
+-
+- ptr = error->message;
+- if (ptr[strlen(ptr) - 1] == '\n')
+- ptr[strlen(ptr) - 1] = '\0';
+- pr_val_err("%s (at line %d)", ptr, error->line);
++ pr_val_err("%s (at line %d)", error->message, error->line);
+ }
+
+ /* Initialize global schema to parse RRDP files */
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-05 13:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-03 1:18 [gentoo-commits] repo/proj/guru:dev commit in: net-misc/FORT-validator/files/, net-misc/FORT-validator/ Lucio Sauer
-- strict thread matches above, loose matches on Subject: below --
2024-06-05 13:23 Lucio Sauer
2022-12-23 22:30 Alarig Le Lay
2021-02-11 19:17 Alarig Le Lay
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox