diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 53 | ||||
| -rw-r--r-- | frr.sysusers | 5 | ||||
| -rw-r--r-- | frr.tmpfiles | 3 | ||||
| -rw-r--r-- | frr_9.0_Archlinux.patch | 13 |
6 files changed, 36 insertions, 58 deletions
@@ -1,6 +1,6 @@ pkgbase = frr pkgdesc = FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP - pkgver = 9.1 + pkgver = 10.0 pkgrel = 1 url = https://frrouting.org arch = x86_64 @@ -10,7 +10,6 @@ pkgbase = frr checkdepends = python-pytest makedepends = patch makedepends = gcc - makedepends = net-snmp makedepends = bison makedepends = perl-xml-libxml makedepends = python-sphinx @@ -27,6 +26,7 @@ pkgbase = frr depends = libunwind depends = c-ares depends = protobuf-c + depends = pcre2 optdepends = rsyslog: syslog support provides = quagga provides = quagga_cumulus @@ -36,13 +36,11 @@ pkgbase = frr backup = etc/frr/frr.conf backup = etc/frr/daemons backup = etc/frr/vtysh.conf - source = https://github.com/FRRouting/frr/archive/frr-9.1.tar.gz - source = frr.sysusers - source = frr.tmpfiles - source = frr_9.0_Archlinux.patch - sha256sums = c4516fa3ef4286c665af809cfbe3a6e7e24a254a7bfb7247e1f7744dcd3bd5da - sha256sums = 9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e - sha256sums = 6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89 - sha256sums = f4964d2138496ec883e149cf888d7b6456b0e3eea01e494a1e834475568749f7 + source = https://github.com/FRRouting/frr/archive/frr-10.0.tar.gz + source = https://gitlab.com/redhat/centos-stream/rpms/frr/-/raw/c10s/frr-tmpfiles.conf + source = https://gitlab.com/redhat/centos-stream/rpms/frr/-/raw/c10s/frr-sysusers.conf + sha256sums = 279e0044449a183bccd05d04e00a86702ec0a44c93080318ab5fb7662d52a42b + sha256sums = edd7b01b11f2be66bb6b4531496d1eaf6536add9f4b549c659b27f5a32cdc512 + sha256sums = c6f5a54402aa5f11e21dac3bd0e6cdeadfbf7937e9b34775b5fd368a9ca96fa4 pkgname = frr diff --git a/.gitignore b/.gitignore index 131022867403..41b6efa2ae9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ pkg/* src/* *.tar.* -frr/* +*.conf @@ -3,15 +3,15 @@ # Contributor: Evgeny Cherkashin <eugeneai@irnok.net> pkgname='frr' -pkgver='9.1' +pkgver='10.0' pkgrel='1' pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP' arch=('x86_64' 'aarch64' 'armv7h') url="https://frrouting.org" license=('GPL2') depends=('libcap' 'libnl' 'readline' 'ncurses' 'perl' 'pam' 'json-c' 'net-snmp' - 'rtrlib' 'libyang>=2.1.128' 'libunwind' 'c-ares' 'protobuf-c') -makedepends=('patch' 'gcc' 'net-snmp' 'bison' 'perl-xml-libxml' 'python-sphinx') + 'rtrlib' 'libyang>=2.1.128' 'libunwind' 'c-ares' 'protobuf-c' 'pcre2') +makedepends=('patch' 'gcc' 'bison' 'perl-xml-libxml' 'python-sphinx') checkdepends=('python-pytest') optdepends=('rsyslog: syslog support') conflicts=('quagga' 'babeld' 'quagga_cumulus') @@ -20,27 +20,30 @@ backup=("etc/${pkgname}/${pkgname}.conf" "etc/${pkgname}/daemons" "etc/${pkgname}/vtysh.conf") source=("https://github.com/FRRouting/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz" - "${pkgname}.sysusers" - "${pkgname}.tmpfiles" - "${pkgname}_9.0_Archlinux.patch") -sha256sums=('c4516fa3ef4286c665af809cfbe3a6e7e24a254a7bfb7247e1f7744dcd3bd5da' - '9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e' - '6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89' - 'f4964d2138496ec883e149cf888d7b6456b0e3eea01e494a1e834475568749f7') + "https://gitlab.com/redhat/centos-stream/rpms/${pkgname}/-/raw/c10s/${pkgname}-tmpfiles.conf" + "https://gitlab.com/redhat/centos-stream/rpms/${pkgname}/-/raw/c10s/${pkgname}-sysusers.conf") +sha256sums=('279e0044449a183bccd05d04e00a86702ec0a44c93080318ab5fb7662d52a42b' + 'edd7b01b11f2be66bb6b4531496d1eaf6536add9f4b549c659b27f5a32cdc512' + 'c6f5a54402aa5f11e21dac3bd0e6cdeadfbf7937e9b34775b5fd368a9ca96fa4') prepare() { - cd "${pkgname}-${pkgname}-${pkgver}" - patch -p1 -i "../${pkgname}_9.0_Archlinux.patch" + # Systemd use /run, not the /var/run + sed -ri 's|/var/run/'"${pkgname}"'|/run/'"${pkgname}"'|g' "${pkgname}-sysusers.conf" + cd "${pkgname}-${pkgname}-${pkgver}" # RPKI hacks from SPEC sed -i -e 's/^\(bgpd_options=\)\(.*\)\(".*\)/\1\2 -M rpki\3/' "tools/etc/${pkgname}/daemons" + # Systemd use /run, not the /var/run + sed -ri 's|/var/run/'"${pkgname}"'|/run/'"${pkgname}"'|g' "redhat/${pkgname}.logrotate" + # Hardcoded path + sed -ri 's|/usr/lib/'"${pkgname}"'|/usr/bin|g' "tools/${pkgname}-reload" autoreconf -fvi ./configure \ --prefix="/usr" \ --sbindir="/usr/bin" \ - --sysconfdir="/etc/${pkgname}" \ - --localstatedir="/run/${pkgname}" \ + --sysconfdir="/etc" \ + --localstatedir="/run" \ --with-libpam \ --enable-snmp="agentx" \ --enable-multipath=256 \ @@ -49,6 +52,7 @@ prepare() { --enable-vty-group="${pkgname}vty" \ --enable-configfile-mask="0640" \ --enable-logfile-mask="0640" \ + --enable-pcre2posix \ --enable-shell-access \ --enable-rpki \ --enable-fpm @@ -67,28 +71,25 @@ check() { package() { cd "${pkgname}-${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - install -Dm0644 "../${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" - install -Dm0644 "../${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" + install -Dm0644 "../${pkgname}-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" + install -Dm0644 "../${pkgname}-sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" + rm -rf "${pkgdir}/usr/bin/ssd" pushd "redhat" - sed -ri 's|/var/run/frr|/run/frr|g' "${pkgname}.logrotate" install -Dm0644 "${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}" install -Dm0644 "${pkgname}.pam" "${pkgdir}/etc/pam.d/${pkgname}" popd pushd "tools" sed -ri 's|/usr/lib/frr/|/usr/bin/|g' "${pkgname}.service" - install -Dm0644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" + install -Dm0644 "${pkgname}.service" -t "${pkgdir}/usr/lib/systemd/system" popd pushd "tools/etc" - install -Dm0644 "${pkgname}/daemons" "${pkgdir}/etc/${pkgname}/daemons" - install -Dm0644 "iproute2/rt_protos.d/${pkgname}.conf" "${pkgdir}/etc/iproute2/rt_protos.d/${pkgname}.conf" - install -Dm0644 "${pkgname}/${pkgname}.conf" "${pkgdir}/etc/${pkgname}/${pkgname}.conf" - install -Dm0644 "${pkgname}/vtysh.conf" "${pkgdir}/etc/${pkgname}/vtysh.conf" - install -Dm0644 "rsyslog.d/45-${pkgname}.conf" "${pkgdir}/etc/rsyslog.d/45-${pkgname}.conf" + install -Dm0644 "${pkgname}/daemons" -t "${pkgdir}/etc/${pkgname}" + install -Dm0644 "iproute2/rt_protos.d/${pkgname}.conf" -t "${pkgdir}/etc/iproute2/rt_protos.d" + install -Dm0644 "${pkgname}/${pkgname}.conf" -t "${pkgdir}/etc/${pkgname}" + install -Dm0644 "${pkgname}/vtysh.conf" -t "${pkgdir}/etc/${pkgname}" + install -Dm0644 "rsyslog.d/45-${pkgname}.conf" -t "${pkgdir}/etc/rsyslog.d" popd - - chown -R 177:177 "${pkgdir}/etc/frr" } diff --git a/frr.sysusers b/frr.sysusers deleted file mode 100644 index 676a75278b22..000000000000 --- a/frr.sysusers +++ /dev/null @@ -1,5 +0,0 @@ -# Create frr user -u frr 177 - /run/frr -# Create frrvty group and add frr user to this group -g frrvty 178 -m frr frrvty diff --git a/frr.tmpfiles b/frr.tmpfiles deleted file mode 100644 index 8a0fdb57b978..000000000000 --- a/frr.tmpfiles +++ /dev/null @@ -1,3 +0,0 @@ -d /etc/frr 0750 frr frr -d /var/log/frr 0750 frr frr -d /run/frr 0750 frr frr diff --git a/frr_9.0_Archlinux.patch b/frr_9.0_Archlinux.patch deleted file mode 100644 index cfe0dd5d7f0e..000000000000 --- a/frr_9.0_Archlinux.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naupr frr-frr-9.0_orig/tools/frr-reload frr-frr-9.0/tools/frr-reload ---- frr-frr-9.0_orig/tools/frr-reload 2023-08-04 02:30:29.000000000 +0700 -+++ frr-frr-9.0/tools/frr-reload 2023-08-07 16:36:22.229312970 +0700 -@@ -1,7 +1,7 @@ - #!/bin/sh - --if test -e /usr/lib/frr/frr-reload.py; then -- exec /usr/lib/frr/frr-reload.py --reload /etc/frr/frr.conf -+if test -e /usr/bin/frr-reload.py; then -+ exec /usr/bin/frr-reload.py --reload /etc/frr/frr.conf - fi - >&2 echo "Please install frr-pythontools package. Required for reload" - exit 1 |