diff --git a/meta-digi-dey/recipes-connectivity/dhcp/dhcp/0001-keep-resolv.conf-rights.patch b/meta-digi-dey/recipes-connectivity/dhcp/dhcp/0001-keep-resolv.conf-rights.patch deleted file mode 100644 index 30d5f705c..000000000 --- a/meta-digi-dey/recipes-connectivity/dhcp/dhcp/0001-keep-resolv.conf-rights.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Isaac Hermida -Date: Tue, 30 Jan 2018 17:00:29 +0100 -Subject: [PATCH] keep resolv.conf rights - -Option --reference does not exist for busybox chmod/chown, so you get an ugly -error and file rights are modified. - -https://jira.digi.com/browse/DEL-5642 - -Signed-off-by: Isaac Hermida ---- - client/scripts/linux | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - -diff --git a/client/scripts/linux b/client/scripts/linux -index 1712d7d195a3..7e3d217a7b95 100755 ---- a/client/scripts/linux -+++ b/client/scripts/linux -@@ -73,11 +73,8 @@ make_resolv_conf() { - sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf - fi - -- if [ -f /etc/resolv.conf ]; then -- chown --reference=/etc/resolv.conf $new_resolv_conf -- chmod --reference=/etc/resolv.conf $new_resolv_conf -- fi -- mv -f $new_resolv_conf /etc/resolv.conf -+ cat $new_resolv_conf > /etc/resolv.conf -+ rm -f $new_resolv_conf - # DHCPv6 - elif [ -n "$new_dhcp6_domain_search" ] || [ -n "$new_dhcp6_name_servers" ]; then - new_resolv_conf=/etc/resolv.conf.dhclient-new -@@ -100,11 +97,8 @@ make_resolv_conf() { - sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf - fi - -- if [ -f /etc/resolv.conf ]; then -- chown --reference=/etc/resolv.conf $new_resolv_conf -- chmod --reference=/etc/resolv.conf $new_resolv_conf -- fi -- mv -f $new_resolv_conf /etc/resolv.conf -+ cat $new_resolv_conf > /etc/resolv.conf -+ rm -f $new_resolv_conf - fi - } - diff --git a/meta-digi-dey/recipes-connectivity/dhcp/dhcp/0002-dhclient-Check-if-the-rebind-time-has-expired-when-r.patch b/meta-digi-dey/recipes-connectivity/dhcp/dhcp/0002-dhclient-Check-if-the-rebind-time-has-expired-when-r.patch deleted file mode 100644 index debc6d446..000000000 --- a/meta-digi-dey/recipes-connectivity/dhcp/dhcp/0002-dhclient-Check-if-the-rebind-time-has-expired-when-r.patch +++ /dev/null @@ -1,72 +0,0 @@ -From: Gabriel Valcazar -Date: Mon, 5 Mar 2018 10:00:23 +0100 -Subject: [PATCH] dhclient: Check if the rebind time has expired when renewing - the lease - -If the system time suffers a big jump, the client will start the renewal -process but it will end prematurely due to the expiry of the lease time. By -adding this check, a time jump can be detected and the active lease can be -updated with the correct expiry dates. - -https://jira.digi.com/browse/DEL-5233 - -Signed-off-by: Gabriel Valcazar ---- - client/dhclient.c | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - -diff --git a/client/dhclient.c b/client/dhclient.c -index dcf3f1a..9074373 100644 ---- a/client/dhclient.c -+++ b/client/dhclient.c -@@ -101,6 +101,8 @@ char *mockup_relay = NULL; - - char *progname = NULL; - -+TIME time_of_binding; -+ - void run_stateless(int exit_mode, u_int16_t port); - - static isc_result_t write_duid(struct data_string *duid); -@@ -1440,6 +1442,9 @@ void bind_lease (client) - client->active = client->new; - client->new = NULL; - -+ /* Save the time at which the binding occurred. */ -+ time_of_binding = cur_time; -+ - /* Set up a timeout to start the renewal process. */ - tv.tv_sec = client->active->renewal; - tv.tv_usec = ((client->active->renewal - cur_tv.tv_sec) > 1) ? -@@ -1472,6 +1477,30 @@ void state_bound (cpp) - - ASSERT_STATE(state, S_BOUND); - -+ /* -+ * The T2 lease time for the active lease should never be expired when -+ * reaching this state. If so, it means there has been a time jump in -+ * the system's clock. In this case, update the lease with the correct -+ * times and create a new state_bound timeout. -+ */ -+ if (cur_time > client->active->rebind) { -+ struct timeval tv; -+ -+ TIME time_jump = cur_time - time_of_binding; -+ client->active->renewal += time_jump; -+ client->active->rebind += time_jump; -+ client->active->expiry += time_jump; -+ -+ rewrite_client_leases(); -+ -+ /* Set up a timeout to start the renewal process. */ -+ tv.tv_sec = client->active->renewal; -+ tv.tv_usec = ((client->active->renewal - cur_tv.tv_sec) > 1) ? -+ random() % 1000000 : cur_tv.tv_usec; -+ add_timeout(&tv, state_bound, client, 0, 0); -+ return; -+ } -+ - /* T1 has expired. */ - make_request (client, client -> active); - client -> xid = client -> packet.xid; - diff --git a/meta-digi-dey/recipes-connectivity/dhcp/dhcp_4.4.1.bbappend b/meta-digi-dey/recipes-connectivity/dhcp/dhcp_4.4.1.bbappend deleted file mode 100644 index fff60a133..000000000 --- a/meta-digi-dey/recipes-connectivity/dhcp/dhcp_4.4.1.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (C) 2018, Digi International Inc. - -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -SRC_URI += " \ - file://0001-keep-resolv.conf-rights.patch \ - file://0002-dhclient-Check-if-the-rebind-time-has-expired-when-r.patch \ -"