From d95971eebcd47dec5ae8bbc284a1f97d26b8b761 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Sun, 1 Dec 2019 00:43:34 +0800
Subject: [PATCH] netifd: downgrade to 2019-08-05

---
 package/network/config/netifd/Makefile        |  8 +++----
 .../files/etc/hotplug.d/iface/00-netstate     |  0
 .../files/etc/hotplug.d/net/20-smp-tune       |  0
 .../etc/uci-defaults/14_migrate-dhcp-release  | 23 -------------------
 .../netifd/files/lib/netifd/proto/dhcp.sh     | 10 ++++----
 5 files changed, 9 insertions(+), 32 deletions(-)
 mode change 100755 => 100644 package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
 mode change 100755 => 100644 package/network/config/netifd/files/etc/hotplug.d/net/20-smp-tune
 delete mode 100755 package/network/config/netifd/files/etc/uci-defaults/14_migrate-dhcp-release

diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
index 1df4d1ee09..31640c80cd 100644
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netifd
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
-PKG_SOURCE_DATE:=2019-11-20
-PKG_SOURCE_VERSION:=e45b1408284c05984b38a910a1f0a07d6c761397
-PKG_MIRROR_HASH:=5f9b96a20bef71dc42492a8eaf407276a656ff00cce18ed8d0c7391c0a52d3e8
+PKG_SOURCE_DATE:=2019-08-05
+PKG_SOURCE_VERSION:=5e02f94411b06f192fb2a7d9be9abde3549153a8
+PKG_MIRROR_HASH:=96e158584c605e96aceb3ce7e8ad8faa8e774ffd67d59558b2d6c2ff49d0f1a5
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_LICENSE:=GPL-2.0
diff --git a/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate b/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
old mode 100755
new mode 100644
diff --git a/package/network/config/netifd/files/etc/hotplug.d/net/20-smp-tune b/package/network/config/netifd/files/etc/hotplug.d/net/20-smp-tune
old mode 100755
new mode 100644
diff --git a/package/network/config/netifd/files/etc/uci-defaults/14_migrate-dhcp-release b/package/network/config/netifd/files/etc/uci-defaults/14_migrate-dhcp-release
deleted file mode 100755
index 651c437cb2..0000000000
--- a/package/network/config/netifd/files/etc/uci-defaults/14_migrate-dhcp-release
+++ /dev/null
@@ -1,23 +0,0 @@
-. /lib/functions.sh
-
-migrate_release() {
-	local config="$1"
-	local proto
-	local release
-
-	config_get proto "$config" proto
-	config_get release "$config" release
-
-	[ "$proto" = "dhcp" ] && [ -n "$release" ] && {
-		norelease="$((!$release))"
-		uci_set network "$config" norelease "$norelease"
-		uci_remove network "$config" release
-	}
-
-}
-
-config_load network
-config_foreach migrate_release interface
-commit network
-
-exit 0
diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
index 3034b2ba68..0d06eba06e 100755
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -14,7 +14,7 @@ proto_dhcp_init_config() {
 	proto_config_add_string clientid
 	proto_config_add_string vendorid
 	proto_config_add_boolean 'broadcast:bool'
-	proto_config_add_boolean 'norelease:bool'
+	proto_config_add_boolean 'release:bool'
 	proto_config_add_string 'reqopts:list(string)'
 	proto_config_add_boolean 'defaultreqopts:bool'
 	proto_config_add_string iface6rd
@@ -35,8 +35,8 @@ proto_dhcp_setup() {
 	local config="$1"
 	local iface="$2"
 
-	local ipaddr hostname clientid vendorid broadcast norelease reqopts defaultreqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes classlessroute
-	json_get_vars ipaddr hostname clientid vendorid broadcast norelease reqopts defaultreqopts iface6rd delegate zone6rd zone mtu6rd customroutes classlessroute
+	local ipaddr hostname clientid vendorid broadcast release reqopts defaultreqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes classlessroute
+	json_get_vars ipaddr hostname clientid vendorid broadcast release reqopts defaultreqopts iface6rd delegate zone6rd zone mtu6rd customroutes classlessroute
 
 	local opt dhcpopts
 	for opt in $reqopts; do
@@ -50,7 +50,7 @@ proto_dhcp_setup() {
 
 	[ "$defaultreqopts" = 0 ] && defaultreqopts="-o" || defaultreqopts=
 	[ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
-	[ "$norelease" = 1 ] && norelease="" || norelease="-R"
+	[ "$release" = 1 ] && release="-R" || release=
 	[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
 	[ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
 	[ "$iface6rd" != 0 -a -f /lib/netifd/proto/6rd.sh ] && append dhcpopts "-O 212"
@@ -70,7 +70,7 @@ proto_dhcp_setup() {
 		${ipaddr:+-r $ipaddr} \
 		${hostname:+-x "hostname:$hostname"} \
 		${vendorid:+-V "$vendorid"} \
-		$clientid $defaultreqopts $broadcast $norelease $dhcpopts
+		$clientid $defaultreqopts $broadcast $release $dhcpopts
 }
 
 proto_dhcp_renew() {