[patch] ebuild patch

gentoo-frr-ebuild.patch (text/plain), 1.76 KB, created by David Lamparter on 2025-01-30 18:45:48 UTC

--- net-misc/frr/frr-10.1.1.ebuild	2024-10-04 10:41:20.000000000 +0200
+++ net-misc/frr/frr-10.1.1-r9999.ebuild	2025-01-30 05:26:50.784761636 +0100
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools pam python-single-r1 systemd
+inherit out-of-source autotools pam python-single-r1 systemd
 
 DESCRIPTION="The FRRouting Protocol Suite"
 HOMEPAGE="https://frrouting.org/"
@@ -70,7 +70,7 @@
 	eautoreconf
 }
 
-src_configure() {
+my_src_configure() {
 	local myconf=(
 		LEX=flex
 		--with-pkg-extra-version="-gentoo"
@@ -79,8 +79,9 @@
 		--libdir="${EPREFIX}"/usr/lib/frr
 		--sbindir="${EPREFIX}"/usr/lib/frr
 		--libexecdir="${EPREFIX}"/usr/lib/frr
-		--sysconfdir="${EPREFIX}"/etc/frr
-		--localstatedir="${EPREFIX}"/run/frr
+		--sysconfdir="${EPREFIX}"/etc
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
 		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
 		--enable-user=frr
 		--enable-group=frr
@@ -99,18 +100,18 @@
 	econf "${myconf[@]}"
 }
 
-src_compile() {
+my_src_compile() {
 	default
 
 	use doc && emake -C doc html
 }
 
-src_test() {
+my_src_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	default
 }
 
-src_install() {
+my_src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
 
@@ -124,7 +125,7 @@
 
 	# Install the default configuration files
 	insinto /etc/frr
-	doins tools/etc/frr/{vtysh.conf,frr.conf,daemons}
+	doins "${S}"/tools/etc/frr/{vtysh.conf,frr.conf,daemons}
 
 	# Fix permissions/owners.
 	fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons}
@@ -132,7 +133,7 @@
 
 	# Install logrotate configuration
 	insinto /etc/logrotate.d
-	newins redhat/frr.logrotate frr
+	newins "${S}"/redhat/frr.logrotate frr
 
 	# Install PAM configuration file
 	use pam && newpamd "${FILESDIR}"/frr.pam frr