diff options
author | Konstantin Shalygin | 2019-11-12 14:11:51 +0700 |
---|---|---|
committer | Konstantin Shalygin | 2019-11-12 14:11:51 +0700 |
commit | 1f33c6133fe236e4bce29b5c0555788a2e073001 (patch) | |
tree | 8eff086b183b97a92c32e15b6f68b295b11bfc0a | |
parent | 79f14b8830a428e7f0f2728f27191827c6383dcc (diff) | |
download | aur-1f33c6133fe236e4bce29b5c0555788a2e073001.tar.gz |
Added upstream patch. Fix c-ares deps.
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | 5213.patch | 30 | ||||
-rw-r--r-- | PKGBUILD | 15 |
3 files changed, 44 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = frr - pkgdesc = FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, NHRP and EIGRP. + pkgdesc = FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP. pkgver = 7.2 - pkgrel = 1 + pkgrel = 2 url = https://frrouting.org/ arch = any license = GPL2 @@ -10,7 +10,6 @@ pkgbase = frr makedepends = gcc makedepends = net-snmp makedepends = bison - makedepends = c-ares makedepends = perl-xml-libxml makedepends = python-sphinx depends = libcap @@ -24,6 +23,7 @@ pkgbase = frr depends = rtrlib depends = libyang depends = libunwind + depends = c-ares optdepends = rsyslog: syslog support provides = quagga provides = quagga_cumulus @@ -38,11 +38,13 @@ pkgbase = frr source = frr.tmpfiles source = frr_7.2_Archlinux.patch source = frr-init-functions + source = 5213.patch sha256sums = 11dff4a4b2f705bf0a4fd2ca2f186b7f91a104d3a2a17c79bb4009d69b38c924 sha256sums = 9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e sha256sums = 6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89 sha256sums = fbbd0b6d40dffbdb850ecabf91ab6bd22da07aa2c7c6406af5e3816988905e02 sha256sums = e6e2592a8b0b18f7f173186fb4ebf23e642b3d912179f0bb36251962ca64cd7a + sha256sums = ff30c1de8008aa02a1bae619644837f835372bca2c2244ef50e8963f8341a4d7 pkgname = frr diff --git a/5213.patch b/5213.patch new file mode 100644 index 000000000000..eb8d87c70960 --- /dev/null +++ b/5213.patch @@ -0,0 +1,30 @@ +From 15e84e5abbf32ab6ad470ee3dbdcfa27c87e455f Mon Sep 17 00:00:00 2001 +From: Mark Stapp <mjs@voltanet.io> +Date: Wed, 23 Oct 2019 09:08:21 -0400 +Subject: [PATCH] lib: Remove include of deprecated sysctl.h + +Stop including deprecated header file; appears to be unused and +it has been deprecated in recent linux. + +Signed-off-by: Mark Stapp <mjs@voltanet.io> +--- + lib/zebra.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/lib/zebra.h b/lib/zebra.h +index b17ef700b4..de9a347e1f 100644 +--- a/lib/zebra.h ++++ b/lib/zebra.h +@@ -52,10 +52,9 @@ typedef unsigned char uint8_t; + #include <sys/types.h> + #include <sys/param.h> + #ifdef HAVE_SYS_SYSCTL_H +-#ifdef GNU_LINUX +-#include <linux/types.h> +-#endif ++#ifndef GNU_LINUX + #include <sys/sysctl.h> ++#endif + #endif /* HAVE_SYS_SYSCTL_H */ + #include <sys/ioctl.h> + #ifdef HAVE_SYS_CONF_H @@ -4,14 +4,14 @@ pkgname='frr' pkgver='7.2' -pkgrel='1' -pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, NHRP and EIGRP.' +pkgrel='2' +pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP.' arch=('any') url="https://frrouting.org/" license=('GPL2') depends=('libcap' 'libnl' 'readline' 'ncurses' 'perl' 'pam' 'json-c' 'net-snmp' - 'rtrlib' 'libyang' 'libunwind') -makedepends=('patch' 'gcc' 'net-snmp' 'bison' 'c-ares' 'perl-xml-libxml' 'python-sphinx') + 'rtrlib' 'libyang' 'libunwind' 'c-ares') +makedepends=('patch' 'gcc' 'net-snmp' 'bison' 'perl-xml-libxml' 'python-sphinx') checkdepends=('python-pytest') optdepends=('rsyslog: syslog support') conflicts=('quagga' 'babeld' 'quagga_cumulus') @@ -23,16 +23,19 @@ source=("https://github.com/FRRouting/${pkgname}/archive/${pkgname}-${pkgver}.ta "${pkgname}.sysusers" "${pkgname}.tmpfiles" "${pkgname}_${pkgver}_Archlinux.patch" - "frr-init-functions") + "frr-init-functions" + "5213.patch") sha256sums=('11dff4a4b2f705bf0a4fd2ca2f186b7f91a104d3a2a17c79bb4009d69b38c924' '9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e' '6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89' 'fbbd0b6d40dffbdb850ecabf91ab6bd22da07aa2c7c6406af5e3816988905e02' - 'e6e2592a8b0b18f7f173186fb4ebf23e642b3d912179f0bb36251962ca64cd7a') + 'e6e2592a8b0b18f7f173186fb4ebf23e642b3d912179f0bb36251962ca64cd7a' + 'ff30c1de8008aa02a1bae619644837f835372bca2c2244ef50e8963f8341a4d7') prepare() { cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}" patch -p1 -i "${srcdir}/${pkgname}_${pkgver}_Archlinux.patch" + patch -p1 -i "${srcdir}/5213.patch" autoreconf -fvi ./configure \ |