diff mbox series

[v2,1/1] package/mrouted: bump version to v4.4

Message ID 20211103213416.3223626-1-troglobit@gmail.com
State Accepted
Headers show
Series [v2,1/1] package/mrouted: bump version to v4.4 | expand

Commit Message

Joachim Wiberg Nov. 3, 2021, 9:34 p.m. UTC 
- Upstream has .sha256 checksums now, drop redundant .md5
 - Upstream has dropped RSRR support, drop Config.in support
 - Add BR2_PACKAGE_MROUTED_RSRR to Config.in.legacy

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 Config.in.legacy             |  8 ++++++++
 package/mrouted/Config.in    | 13 -------------
 package/mrouted/mrouted.hash |  5 ++---
 package/mrouted/mrouted.mk   |  8 +-------
 4 files changed, 11 insertions(+), 23 deletions(-)

Comments

Thomas Petazzoni Nov. 3, 2021, 9:55 p.m. UTC | #1 
On Wed,  3 Nov 2021 22:34:16 +0100
Joachim Wiberg <troglobit@gmail.com> wrote:

>  - Upstream has .sha256 checksums now, drop redundant .md5
>  - Upstream has dropped RSRR support, drop Config.in support
>  - Add BR2_PACKAGE_MROUTED_RSRR to Config.in.legacy
> 
> Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
> ---
>  Config.in.legacy             |  8 ++++++++
>  package/mrouted/Config.in    | 13 -------------
>  package/mrouted/mrouted.hash |  5 ++---
>  package/mrouted/mrouted.mk   |  8 +-------
>  4 files changed, 11 insertions(+), 23 deletions(-)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/Config.in.legacy b/Config.in.legacy
index 23c3ee29ee..008acd1d83 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -165,6 +165,14 @@  config BR2_PACKAGE_CANFESTIVAL
 	  This package has been removed as it is unmaintained since
 	  November 2017.
 
+config BR2_PACKAGE_MROUTED_RSRR
+	bool "RSRR for RSVP removed in mrouted v4.4"
+	help
+	  The RSRR configure option and feature was dropped in upstream
+	  mrouted as of v4.4.  This feature was marked as experimental
+	  since its inception well before v4.0 and was never deployed
+	  in the field outside of academia.
+
 config BR2_PACKAGE_NMAP_NDIFF
 	bool "The ndiff utility has been removed"
 	select BR2_LEGACY
diff --git a/package/mrouted/Config.in b/package/mrouted/Config.in
index f8dd173c4a..95b4fb3825 100644
--- a/package/mrouted/Config.in
+++ b/package/mrouted/Config.in
@@ -11,16 +11,3 @@  config BR2_PACKAGE_MROUTED
 	  Note: at least two interfaces with MULTICAST flag is requried.
 
 	  http://github.com/troglobit/mrouted
-
-if BR2_PACKAGE_MROUTED
-
-config BR2_PACKAGE_MROUTED_RSRR
-	bool "enable RSRR for RSVP"
-	help
-	  Routing Support for Resource Reservation, currently used by
-	  RSVP. This is an EXPERIMENTAL feature.
-
-	  For details, see:
-	    http://tools.ietf.org/html/draft-ietf-rsvp-routing-02
-
-endif
diff --git a/package/mrouted/mrouted.hash b/package/mrouted/mrouted.hash
index 188293025f..affb323b4b 100644
--- a/package/mrouted/mrouted.hash
+++ b/package/mrouted/mrouted.hash
@@ -1,6 +1,5 @@ 
-# From https://github.com/troglobit/mrouted/releases/download/4.2/mrouted-4.2.tar.gz.md5
-md5  b921f9e152e039efdac745438ef8362c  mrouted-4.2.tar.gz
+# From https://github.com/troglobit/mrouted/releases/download/4.4/mrouted-4.4.tar.gz.sha256
+sha256  095439e544d69c91ed64fa87db7e35bc2155eef48b7f268281d80946d2c6b953  mrouted-4.4.tar.gz
 
 # Locally calculated
-sha256  689541334ea951286054b771640e9d0f26b6a3242ff7f3894a3ef1b680811b34  mrouted-4.2.tar.gz
 sha256  834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29  LICENSE
diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk
index 95da0c622c..4014b8f896 100644
--- a/package/mrouted/mrouted.mk
+++ b/package/mrouted/mrouted.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-MROUTED_VERSION = 4.2
+MROUTED_VERSION = 4.4
 MROUTED_SITE = \
 	https://github.com/troglobit/mrouted/releases/download/$(MROUTED_VERSION)
 MROUTED_DEPENDENCIES = host-bison
@@ -12,12 +12,6 @@  MROUTED_LICENSE = BSD-3-Clause
 MROUTED_LICENSE_FILES = LICENSE
 MROUTED_CPE_ID_VENDOR = troglobit
 
-ifeq ($(BR2_PACKAGE_MROUTED_RSRR),y)
-MROUTED_CONF_OPTS += --enable-rsrr
-else
-MROUTED_CONF_OPTS += --disable-rsrr
-endif
-
 define MROUTED_INSTALL_INIT_SYSV
 	$(INSTALL) -m 755 -D package/mrouted/S41mrouted \
 		$(TARGET_DIR)/etc/init.d/S41mrouted