bump version to 2022.02.9

add miyoo_defconfig

package/iputils/Config.in

@@ -3,7 +3,7 @@ config BR2_PACKAGE_IPUTILS
 	depends on BR2_USE_MMU # fork()
 	help
 	  This package is set of small useful utilities for Linux
-	  networking. It includes complete versions of ping, traceroute,
+	  networking. It includes complete versions of ping, arping,
 	  etc.
 
 	  https://github.com/iputils/iputils
@@ -46,23 +46,12 @@ config BR2_PACKAGE_IPUTILS_RDISC_SERVER
 	help
 	  Builds rdisc with server code.
 
-config BR2_PACKAGE_IPUTILS_TFTPD
-	bool "tftpd"
-	help
-	  Installs tftpd.
-
 config BR2_PACKAGE_IPUTILS_TRACEPATH
 	bool "tracepath"
 	default y
 	help
 	  Installs tracepath.
 
-config BR2_PACKAGE_IPUTILS_TRACEROUTE6
-	bool "traceroute6"
-	default y
-	help
-	  Installs traceroute6.
-
 config BR2_PACKAGE_IPUTILS_NINFOD
 	bool "ninfod"
 	default y

package/iputils/iputils.hash

@@ -1,6 +1,6 @@
-# https://github.com/iputils/iputils/releases/download/s20200821/sha256sum.asc
-sha256 f265da0d02dd2259efd8c57a9c2e0c8bb3361abb14639fcffb26707be5783a5b  iputils-20200821.tar.gz
+# https://github.com/iputils/iputils/releases/download/20211215/sha256sum.asc
+sha256  b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf  iputils-20211215.tar.gz
 # Locally computed
-sha256 b8ea785d12fa6a44916601104dd746216957e93f13a26d3eb858b3b5a4ad66ab  LICENSE
-sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712  Documentation/LICENSE.BSD3
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documentation/LICENSE.GPL2
+sha256  973281334c2da6364fa6bdc44c1f0f8d60d80d73c782982ffc5d53b0a31aa042  LICENSE
+sha256  9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712  Documentation/LICENSE.BSD3
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documentation/LICENSE.GPL2

package/iputils/iputils.mk

@@ -11,10 +11,11 @@
 # and IPv6 updates.
 # http://www.spinics.net/lists/netdev/msg279881.html
 
-IPUTILS_VERSION = 20200821
-IPUTILS_SITE = $(call github,iputils,iputils,s$(IPUTILS_VERSION))
+IPUTILS_VERSION = 20211215
+IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION))
 IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause
 IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2
+IPUTILS_CPE_ID_VENDOR = iputils_project
 IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 # Selectively build binaries
@@ -22,10 +23,17 @@ IPUTILS_CONF_OPTS += \
 	-DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \
 	-DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \
 	-DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \
-	-DBUILD_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \
+	-DENABLE_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \
 	-DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \
-	-DBUILD_TRACEROUTE6=$(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),true,false) \
-	-DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false)
+	-DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \
+	-DSKIP_TESTS=true
+
+# Selectively select the appropriate SELinux refpolicy modules
+IPUTILS_SELINUX_MODULES = \
+	$(if $(BR2_PACKAGE_IPUTILS_ARPING),netutils) \
+	$(if $(BR2_PACKAGE_IPUTILS_PING),netutils) \
+	$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) \
+	$(if $(BR2_PACKAGE_IPUTILS_RDISC),rdisc)
 
 #
 # arping
@@ -69,21 +77,6 @@ else
 IPUTILS_CONF_OPTS += -DBUILD_PING=false
 endif
 
-#
-# tftpd
-#
-ifeq ($(BR2_PACKAGE_IPUTILS_TFTPD),y)
-IPUTILS_CONF_OPTS += -DBUILD_TFTPD=true
-
-define IPUTILS_MOVE_TFTPD_BINARY
-	mv $(TARGET_DIR)/usr/bin/tftpd $(TARGET_DIR)/usr/sbin/tftpd
-endef
-IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_TFTPD_BINARY
-
-else
-IPUTILS_CONF_OPTS += -DBUILD_TFTPD=false
-endif
-
 # Handle libraries
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
 IPUTILS_CONF_OPTS += -DUSE_CAP=true
@@ -124,9 +117,6 @@ define IPUTILS_PERMISSIONS
 	$(if $(BR2_PACKAGE_IPUTILS_PING),\
 		/bin/ping             f 755 0 0 - - - - -
 		|xattr cap_net_raw+p,)
-	$(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),\
-		/usr/bin/traceroute6  f 755 0 0 - - - - -
-		|xattr cap_net_raw+p,)
 endef
 else
 define IPUTILS_PERMISSIONS
@@ -136,8 +126,6 @@ define IPUTILS_PERMISSIONS
 		/usr/bin/clockdiff    f 4755 0 0 - - - - -,)
 	$(if $(BR2_PACKAGE_IPUTILS_PING),\
 		/bin/ping             f 4755 0 0 - - - - -,)
-	$(if $(BR2_PACKAGE_IPUTILS_TRACEROUTE6),\
-		/usr/bin/traceroute6  f 4755 0 0 - - - - -,)
 endef
 endif