* [pve-devel] [PATCH frr 1/3] update patches
2021-07-13 15:24 [pve-devel] [PATCH frr 0/3] update to 7.5.1 Alexandre Derumier
@ 2021-07-13 15:24 ` Alexandre Derumier
2021-07-13 15:24 ` [pve-devel] [PATCH frr 2/3] Work around the sphinx-build error that doesn't copy images to texinfo Alexandre Derumier
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Alexandre Derumier @ 2021-07-13 15:24 UTC (permalink / raw)
To: pve-devel
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
.../patches/pve/0001-enable-bgp-daemon.patch | 10 ++++----
...on-for-RT-auto-derivation-to-force-A.patch | 24 +++++++++----------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/debian/patches/pve/0001-enable-bgp-daemon.patch b/debian/patches/pve/0001-enable-bgp-daemon.patch
index a9818c9..42417b3 100644
--- a/debian/patches/pve/0001-enable-bgp-daemon.patch
+++ b/debian/patches/pve/0001-enable-bgp-daemon.patch
@@ -1,7 +1,7 @@
-From f098e90f4d690e771f63f48e0540a470faa91892 Mon Sep 17 00:00:00 2001
+From 249e602260f1c5bacffb7bc5bd0f5e8db635050d Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Wed, 25 Nov 2020 12:41:32 +0100
-Subject: [PATCH] enable bgp && bfd daemons
+Subject: [PATCH 1/2] enable bgp && bfd daemons
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
@@ -9,12 +9,12 @@ Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons
-index 8bec3c5bb..7cdfa840c 100644
+index f6d512be7..4cddea326 100644
--- a/tools/etc/frr/daemons
+++ b/tools/etc/frr/daemons
@@ -14,7 +14,7 @@
#
- # The watchfrr and zebra daemons are always started.
+ # The watchfrr, zebra and staticd daemons are always started.
#
-bgpd=no
+bgpd=yes
@@ -31,5 +31,5 @@ index 8bec3c5bb..7cdfa840c 100644
vrrpd=no
--
-2.20.1
+2.30.2
diff --git a/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch b/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
index 3306fbc..20c2d3e 100644
--- a/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
+++ b/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
@@ -1,7 +1,7 @@
-From c3e66b067564281a58fcf3b99559d289a75090e9 Mon Sep 17 00:00:00 2001
+From 159e7b812c722f663de48049d2070401dcb246b5 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Tue, 17 Nov 2020 06:01:26 +0100
-Subject: [PATCH 1/3] bgpd : add an option for RT auto-derivation to force AS
+Subject: [PATCH 2/2] bgpd : add an option for RT auto-derivation to force AS
Allow to define a custom AS for autort AS:VNI
@@ -16,10 +16,10 @@ Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
3 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
-index 84e8960ee..73acc5d7b 100644
+index fa4145cf7..9ab60abe5 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
-@@ -512,7 +512,11 @@ static void form_auto_rt(struct bgp *bgp, vni_t vni, struct list *rtl)
+@@ -509,7 +509,11 @@ static void form_auto_rt(struct bgp *bgp, vni_t vni, struct list *rtl)
if (bgp->advertise_autort_rfc8365)
vni |= EVPN_AUTORT_VXLAN;
@@ -32,7 +32,7 @@ index 84e8960ee..73acc5d7b 100644
ecomadd = ecommunity_new();
ecommunity_add_val(ecomadd, &eval, false, false);
-@@ -4238,7 +4242,11 @@ void evpn_rt_delete_auto(struct bgp *bgp, vni_t vni, struct list *rtl)
+@@ -4253,7 +4257,11 @@ void evpn_rt_delete_auto(struct bgp *bgp, vni_t vni, struct list *rtl)
if (bgp->advertise_autort_rfc8365)
vni |= EVPN_AUTORT_VXLAN;
@@ -46,10 +46,10 @@ index 84e8960ee..73acc5d7b 100644
ecom_auto = ecommunity_new();
ecommunity_add_val(ecom_auto, &eval, false, false);
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
-index e9e2aafeb..6cc6bba33 100644
+index 2f207f8ab..fac80c0d7 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
-@@ -3226,32 +3226,48 @@ DEFUN (no_bgp_evpn_advertise_all_vni,
+@@ -3213,32 +3213,48 @@ DEFUN (no_bgp_evpn_advertise_all_vni,
return CMD_SUCCESS;
}
@@ -111,7 +111,7 @@ index e9e2aafeb..6cc6bba33 100644
return CMD_SUCCESS;
}
-@@ -5596,6 +5612,9 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi,
+@@ -5599,6 +5615,9 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi,
if (bgp->advertise_autort_rfc8365)
vty_out(vty, " autort rfc8365-compatible\n");
@@ -121,7 +121,7 @@ index e9e2aafeb..6cc6bba33 100644
if (bgp->advertise_gw_macip)
vty_out(vty, " advertise-default-gw\n");
-@@ -5732,8 +5751,8 @@ void bgp_ethernetvpn_init(void)
+@@ -5735,8 +5754,8 @@ void bgp_ethernetvpn_init(void)
install_element(BGP_EVPN_NODE, &evpnrt5_network_cmd);
install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_all_vni_cmd);
install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_all_vni_cmd);
@@ -133,10 +133,10 @@ index e9e2aafeb..6cc6bba33 100644
install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_default_gw_cmd);
install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_svi_ip_cmd);
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
-index d22fd008d..941066e2e 100644
+index 19aa1ce5f..2ace67112 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
-@@ -614,6 +614,9 @@ struct bgp {
+@@ -616,6 +616,9 @@ struct bgp {
/* EVPN - use RFC 8365 to auto-derive RT */
int advertise_autort_rfc8365;
@@ -147,5 +147,5 @@ index d22fd008d..941066e2e 100644
* Flooding mechanism for BUM packets for VxLAN-EVPN.
*/
--
-2.20.1
+2.30.2
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread* [pve-devel] [PATCH frr 3/3] bump to 7.5.1
2021-07-13 15:24 [pve-devel] [PATCH frr 0/3] update to 7.5.1 Alexandre Derumier
2021-07-13 15:24 ` [pve-devel] [PATCH frr 1/3] update patches Alexandre Derumier
2021-07-13 15:24 ` [pve-devel] [PATCH frr 2/3] Work around the sphinx-build error that doesn't copy images to texinfo Alexandre Derumier
@ 2021-07-13 15:24 ` Alexandre Derumier
2021-07-13 17:36 ` [pve-devel] applied-series: [PATCH frr 0/3] update " Thomas Lamprecht
3 siblings, 0 replies; 5+ messages in thread
From: Alexandre Derumier @ 2021-07-13 15:24 UTC (permalink / raw)
To: pve-devel
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
Makefile | 2 +-
debian/changelog | 6 ++++++
debian/compat | 1 +
debian/control | 9 +++++----
4 files changed, 13 insertions(+), 5 deletions(-)
create mode 100644 debian/compat
diff --git a/Makefile b/Makefile
index 5ed61ca..39a5d10 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
PACKAGE=frr
-VER=7.4
+VER=7.5.1
PKGREL=1+pve
SRCDIR=frr
diff --git a/debian/changelog b/debian/changelog
index 062bcf5..a6517df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frr (7.5.1-1+pve) pve; urgency=medium
+
+ * update submodule to latest 7.5.1 tag
+
+ -- Proxmox Support Team <support@proxmox.com> Wed, 13 Jul 2021 12:00:45 +0100
+
frr (7.4-1+pve) pve; urgency=medium
* update submodule to latest 7.4 stable branch
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..9a03714
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
\ No newline at end of file
diff --git a/debian/control b/debian/control
index ab2df20..fca6956 100644
--- a/debian/control
+++ b/debian/control
@@ -24,17 +24,17 @@ Build-Depends:
libsnmp-dev,
libssh-dev <!pkg.frr.nortrlib>,
libsystemd-dev <!pkg.frr.nosystemd>,
- libyang-dev (>= 0.16.74),
+ libyang-dev (>= 1.0.184),
pkg-config,
python3,
python3-dev,
python3-sphinx,
python3-pytest <!nocheck>,
texinfo (>= 4.7)
-Standards-Version: 4.2.1
+Standards-Version: 4.4.1
Homepage: https://www.frrouting.org/
-Vcs-Browser: https://github.com/FRRouting/frr/
-Vcs-Git: https://github.com/FRRouting/frr.git
+Vcs-Browser: https://github.com/FRRouting/frr/tree/debian/master
+Vcs-Git: https://github.com/FRRouting/frr.git -b debian/master
Package: frr
Architecture: linux-any
@@ -104,6 +104,7 @@ Build-Profiles: <!pkg.frr.nortrlib>
Package: frr-doc
Section: doc
Architecture: all
+Multi-Arch: foreign
Depends:
${misc:Depends},
libjs-jquery,
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread