diff --git a/Config.in.legacy b/Config.in.legacy index 23c3ee29ee..66a166a2a9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2021.11" +config BR2_PACKAGE_MROUTED_RSRR + bool "RSRR for RSVP removed in mrouted v4.4" + select BR2_LEGACY + 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_BINUTILS_VERSION_CSKY bool "binutils csky version 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