All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joachim Wiberg <troglobit@gmail.com>
To: buildroot@buildroot.org
Cc: Joachim Wiberg <troglobit@gmail.com>,
	Matt Weber <matthew.weber@collins.com>
Subject: [Buildroot] [PATCH 1/2] package/smcroute: bump version to v2.5.4
Date: Sat, 13 Nov 2021 16:31:21 +0100	[thread overview]
Message-ID: <20211113153122.1745140-2-troglobit@gmail.com> (raw)
In-Reply-To: <20211113153122.1745140-1-troglobit@gmail.com>

 - Drop backported patch, included in new release
 - https://github.com/troglobit/smcroute/releases/tag/2.5.4

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 ...Avoid-trying-to-delete-inactive-VIFs.patch | 51 -------------------
 package/smcroute/smcroute.hash                |  3 +-
 package/smcroute/smcroute.mk                  |  2 +-
 3 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 package/smcroute/0001-Avoid-trying-to-delete-inactive-VIFs.patch

diff --git a/package/smcroute/0001-Avoid-trying-to-delete-inactive-VIFs.patch b/package/smcroute/0001-Avoid-trying-to-delete-inactive-VIFs.patch
deleted file mode 100644
index 07f49dffcf..0000000000
--- a/package/smcroute/0001-Avoid-trying-to-delete-inactive-VIFs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8ce1d117a31e35d97fb955b82edf13514267eaab Mon Sep 17 00:00:00 2001
-From: Joachim Wiberg <troglobit@gmail.com>
-Date: Tue, 28 Sep 2021 11:09:47 +0200
-Subject: [PATCH] Avoid trying to delete inactive VIFs
-Organization: Westermo Network Technologies AB
-
-When probing interfaces at startup, there's a check for IFF_MULTICAST,
-if this flag is not set we try to delete its corresponding VIF/MIF.
-This is for hanlding .conf reload scenarios where an interface has had
-its MULTICAST flag dropped.
-
-However, when starting up on Linux systems, the loopback interface has
-no MULTICAST flag set.  This leads to the following bogus warning:
-
-   Failed deleting VIF for iface lo: Resource temporarily unavailable
-
-This patch makes sure to check if we have a registered kernel VIF/MIF
-for an interface before attempting to delete it.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
----
- src/mroute.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/mroute.c b/src/mroute.c
-index 291e9c4..6a80a47 100644
---- a/src/mroute.c
-+++ b/src/mroute.c
-@@ -298,6 +298,9 @@ static int mroute4_del_vif(struct iface *iface)
- 	if (iface->mrdisc)
- 		rc = mrdisc_deregister(iface->vif);
- 
-+	if (iface->vif == ALL_VIFS)
-+		return 0;
-+
- 	if (kern_vif_del(iface)) {
- 		switch (errno) {
- 		case ENOENT:
-@@ -910,6 +913,9 @@ static int mroute6_del_mif(struct iface *iface)
- {
- 	int rc = 0;
- 
-+	if (iface->mif == ALL_VIFS)
-+		return 0;
-+
- 	if (kern_mif_del(iface) && errno != ENOENT) {
- 		switch (errno) {
- 		case ENOENT:
--- 
-2.25.1
-
diff --git a/package/smcroute/smcroute.hash b/package/smcroute/smcroute.hash
index 26d55adf88..ddc38eddd2 100644
--- a/package/smcroute/smcroute.hash
+++ b/package/smcroute/smcroute.hash
@@ -1,6 +1,5 @@
 # Upstream .sha256 from GitHub
-sha256	4342b95c99e410cab75e9ee80f20480e0170d8b07b8e31553ba1bec3e377fc56  smcroute-2.5.3.tar.gz
+sha256	96b890fd6fbf8553010f62beda991742f7b4e7e8aea3e75335fb6048b15869da  smcroute-2.5.4.tar.gz
 
 # Locally generated
 sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
-sha256  d260ea4b9d4b01317568850c3271e3923b546ea4ad57c899e79434f1cc8bcf0b  0001-Avoid-trying-to-delete-inactive-VIFs.patch
diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk
index 913647e7bf..81f540088a 100644
--- a/package/smcroute/smcroute.mk
+++ b/package/smcroute/smcroute.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SMCROUTE_VERSION = 2.5.3
+SMCROUTE_VERSION = 2.5.4
 SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION)
 SMCROUTE_LICENSE = GPL-2.0+
 SMCROUTE_LICENSE_FILES = COPYING
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  reply	other threads:[~2021-11-13 15:31 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-13 15:31 [Buildroot] [PATCH 0/2] package/smcroute: bump version and add myself to DEVELOPERS Joachim Wiberg
2021-11-13 15:31 ` Joachim Wiberg [this message]
2021-11-13 17:03   ` [Buildroot] [PATCH 1/2] package/smcroute: bump version to v2.5.4 Thomas Petazzoni
2021-11-13 15:31 ` [Buildroot] [PATCH 2/2] DEVELOPERS: add Joachim Wiberg as co-maintainer of SMCRoute Joachim Wiberg
2021-11-13 17:03   ` Thomas Petazzoni
2021-11-17 22:05   ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211113153122.1745140-2-troglobit@gmail.com \
    --to=troglobit@gmail.com \
    --cc=buildroot@buildroot.org \
    --cc=matthew.weber@collins.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.