From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- net-misc/frr/Manifest | 2 +- net-misc/frr/frr-7.5.1-r2.ebuild | 145 -------------------------------------- net-misc/frr/frr-7.5.1-r3.ebuild | 146 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+), 146 deletions(-) delete mode 100644 net-misc/frr/frr-7.5.1-r2.ebuild create mode 100644 net-misc/frr/frr-7.5.1-r3.ebuild (limited to 'net-misc/frr') diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest index 35332c6e3739..97e870b32f30 100644 --- a/net-misc/frr/Manifest +++ b/net-misc/frr/Manifest @@ -2,5 +2,5 @@ AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285eb AUX frr-openrc-v1 7068 BLAKE2B c790c783ea9c289110b1e85aa23a1adccba36122524cde36798f26c31f82e5381eefb3e5e16b497e84a5aa2faf5bf1f59d12fe8f9b7b3c5d0f504c26ce13fb86 SHA512 34e371bb9bb34e494536091a811084d543c18b302489ce0a56ec3e69c805c22d84d7a928e24e17eba5d4fe6d4e33ac847060da95ded5a02975ba2a2e5a568243 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed DIST frr-7.5.1.tar.gz 6746148 BLAKE2B e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d SHA512 cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e -EBUILD frr-7.5.1-r2.ebuild 3508 BLAKE2B fa2757e877258e6d353b77f454b873d22f24c60355acc536468eacfbd252027c4f230e478287dfbcc962cda792664bf1d7432f3deab54db8b4b011b973a5d072 SHA512 ec2f0cb7916ce4d4be36f63c049d4227d697f59d02fd2bcfe3afabe16b9e3200387ad1690ec22ee94ab6ca71765275bf74f45ec4dbe72b5316fd6a81412d73bd +EBUILD frr-7.5.1-r3.ebuild 3533 BLAKE2B bc225761128d8df40e0b0c66551c8f9fa911e8e5a6b602e733cc6fec2cbf4ad0808654d34d414f6e871c7b6982c816f9a78e400fc644398489c1335881a15acc SHA512 a35298206d1cbaa4415628a0984c90a3e6ec840e501c74e572e0d0a9ea6d469484521b27232b386a636ab9180d9a1ff9bce42ed91d76c6c2225c7cd50ab40d82 MISC metadata.xml 770 BLAKE2B 13813d2c2fc611a87a9d2e516b0fd8fb5f9539339f99837ec08c9ed0ac276f9ee80b0e1afa84d6e52adfde8135b3b6950172faed307ae0dbec423bf1a4acd4bf SHA512 e4989acf1cfaabf52030284acff11ae6408dc8d958286ca1cf68d183526dd6a8379ed7ace5d5348f4e298e792387f3ba0a06dea402d125597aa9032222ff1dcb diff --git a/net-misc/frr/frr-7.5.1-r2.ebuild b/net-misc/frr/frr-7.5.1-r2.ebuild deleted file mode 100644 index 5b7e3d014731..000000000000 --- a/net-misc/frr/frr-7.5.1-r2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit autotools pam python-single-r1 systemd - -DESCRIPTION="The FRRouting Protocol Suite" -HOMEPAGE="https://frrouting.org/" -SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz" -# FRR tarballs have weird format. -S="${WORKDIR}/frr-${P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - acct-user/frr - dev-libs/json-c:0= - >=net-libs/libyang-1.0.184 - sys-libs/libcap - sys-libs/readline:0= - grpc? ( net-libs/grpc ) - nhrp? ( net-dns/c-ares:0= ) - pam? ( sys-libs/pam ) - rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) - snmp? ( net-analyzer/net-snmp )" - -BDEPEND=" - dev-util/clippy - sys-devel/flex - virtual/yacc - doc? ( dev-python/sphinx )" - -DEPEND=" - ${COMMON_DEPEND} - test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )" - -RDEPEND=" - ${COMMON_DEPEND} - $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') - !net-misc/quagga" - -PATCHES=( "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch ) - -src_prepare() { - default - - python_fix_shebang tools - eautoreconf -} - -src_configure() { - local myconf=( - --disable-static - --with-pkg-extra-version="-gentoo" - --enable-configfile-mask=0640 - --enable-logfile-mask=0640 - --prefix="${EPREFIX}"/usr - --libdir="${EPREFIX}"/usr/lib/frr - --sbindir="${EPREFIX}"/usr/lib/frr - --libexecdir="${EPREFIX}"/usr/lib/frr - --sysconfdir="${EPREFIX}"/etc/frr - --localstatedir="${EPREFIX}"/run/frr - --with-moduledir="${EPREFIX}"/usr/lib/frr/modules - --with-clippy="${BROOT}"/usr/bin/clippy - --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples - --enable-user=frr - --enable-group=frr - --enable-vty-group=frr - --enable-multipath=64 - $(use_enable doc) - $(use_enable fpm) - $(use_enable grpc) - $(use_enable ipv6 ospf6d) - $(use_enable ipv6 ripngd) - $(use_enable ipv6 rtadv) - $(use_enable kernel_linux realms) - $(use_enable nhrp nhrpd) - $(usex ospfapi '--enable-ospfclient' '' '' '') - $(use_enable rpki) - $(use_enable snmp) - $(use_enable systemd) - ) - - econf "${myconf[@]}" -} - -src_compile() { - default - - use doc && emake -C doc html -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - - # Install user documentation if asked - use doc && dodoc -r doc/user/_build/html - - # Create configuration directory with correct permissions - keepdir /etc/frr - fowners frr:frr /etc/frr - fperms 775 /etc/frr - - # Create logs directory with the correct permissions - keepdir /var/log/frr - fowners frr:frr /var/log/frr - fperms 775 /var/log/frr - - # Install the default configuration files - insinto /etc/frr - doins tools/etc/frr/vtysh.conf - doins tools/etc/frr/frr.conf - doins tools/etc/frr/daemons - - # Fix permissions/owners. - fowners frr:frr /etc/frr/vtysh.conf - fowners frr:frr /etc/frr/frr.conf - fowners frr:frr /etc/frr/daemons - fperms 640 /etc/frr/vtysh.conf - fperms 640 /etc/frr/frr.conf - fperms 640 /etc/frr/daemons - - # Install logrotate configuration - insinto /etc/logrotate.d - newins redhat/frr.logrotate frr - - # Install PAM configuration file - use pam && newpamd "${FILESDIR}"/frr.pam frr - - # Install init scripts - systemd_dounit tools/frr.service - newinitd "${FILESDIR}"/frr-openrc-v1 frr - - # Conflict files, installed by net-libs/libsmi, bug #758383 - rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die -} diff --git a/net-misc/frr/frr-7.5.1-r3.ebuild b/net-misc/frr/frr-7.5.1-r3.ebuild new file mode 100644 index 000000000000..0a5028d606e5 --- /dev/null +++ b/net-misc/frr/frr-7.5.1-r3.ebuild @@ -0,0 +1,146 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit autotools pam python-single-r1 systemd + +DESCRIPTION="The FRRouting Protocol Suite" +HOMEPAGE="https://frrouting.org/" +SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz" +# FRR tarballs have weird format. +S="${WORKDIR}/frr-${P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + acct-user/frr + dev-libs/json-c:0= + >=net-libs/libyang-1.0.184 + =net-libs/rtrlib-0.6.3[ssh] ) + snmp? ( net-analyzer/net-snmp )" + +BDEPEND=" + dev-util/clippy + sys-devel/flex + virtual/yacc + doc? ( dev-python/sphinx )" + +DEPEND=" + ${COMMON_DEPEND} + test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )" + +RDEPEND=" + ${COMMON_DEPEND} + $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') + !net-misc/quagga" + +PATCHES=( "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch ) + +src_prepare() { + default + + python_fix_shebang tools + eautoreconf +} + +src_configure() { + local myconf=( + --disable-static + --with-pkg-extra-version="-gentoo" + --enable-configfile-mask=0640 + --enable-logfile-mask=0640 + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/lib/frr + --sbindir="${EPREFIX}"/usr/lib/frr + --libexecdir="${EPREFIX}"/usr/lib/frr + --sysconfdir="${EPREFIX}"/etc/frr + --localstatedir="${EPREFIX}"/run/frr + --with-moduledir="${EPREFIX}"/usr/lib/frr/modules + --with-clippy="${BROOT}"/usr/bin/clippy + --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples + --enable-user=frr + --enable-group=frr + --enable-vty-group=frr + --enable-multipath=64 + $(use_enable doc) + $(use_enable fpm) + $(use_enable grpc) + $(use_enable ipv6 ospf6d) + $(use_enable ipv6 ripngd) + $(use_enable ipv6 rtadv) + $(use_enable kernel_linux realms) + $(use_enable nhrp nhrpd) + $(usex ospfapi '--enable-ospfclient' '' '' '') + $(use_enable rpki) + $(use_enable snmp) + $(use_enable systemd) + ) + + econf "${myconf[@]}" +} + +src_compile() { + default + + use doc && emake -C doc html +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + # Install user documentation if asked + use doc && dodoc -r doc/user/_build/html + + # Create configuration directory with correct permissions + keepdir /etc/frr + fowners frr:frr /etc/frr + fperms 775 /etc/frr + + # Create logs directory with the correct permissions + keepdir /var/log/frr + fowners frr:frr /var/log/frr + fperms 775 /var/log/frr + + # Install the default configuration files + insinto /etc/frr + doins tools/etc/frr/vtysh.conf + doins tools/etc/frr/frr.conf + doins tools/etc/frr/daemons + + # Fix permissions/owners. + fowners frr:frr /etc/frr/vtysh.conf + fowners frr:frr /etc/frr/frr.conf + fowners frr:frr /etc/frr/daemons + fperms 640 /etc/frr/vtysh.conf + fperms 640 /etc/frr/frr.conf + fperms 640 /etc/frr/daemons + + # Install logrotate configuration + insinto /etc/logrotate.d + newins redhat/frr.logrotate frr + + # Install PAM configuration file + use pam && newpamd "${FILESDIR}"/frr.pam frr + + # Install init scripts + systemd_dounit tools/frr.service + newinitd "${FILESDIR}"/frr-openrc-v1 frr + + # Conflict files, installed by net-libs/libsmi, bug #758383 + rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die +} -- cgit v1.2.3