From 7ff5b12e90221a9abdac505ec5ab0931d5a2e1a1 Mon Sep 17 00:00:00 2001
From: Hans Dedecker <dedeckeh@gmail.com>
Date: Sat, 29 Jun 2019 21:07:12 +0200
Subject: [PATCH] odhcpd: update to latest git HEAD (FS#2019)

e73bf11 config: ra_management compatibility support
d818380 odhcpd: router: Fix out of scope memory access
94a1c94 dhcpv6-ia: free assignment when validity timer expires
752fc2c router: speed up initial router advertisements
09aa022 router: close socket upon NETEV_IFINDEX_CHANGE fixed
79eb160 router: fix previous commit
6034b5c router: close socket upon NETEV_IFINDEX_CHANGE
000182f router: fix lingering uloop socket descriptor
f6c2242 router: support ra_lifetime being 0
d111809 router: make RA flags configurable (FS#2019)

Update odhcpd defaults according to the new RA flags implementation

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---
 package/network/services/odhcpd/Makefile              | 4 ++--
 package/network/services/odhcpd/files/odhcpd.defaults | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile
index 9f378f9e622..ce0eefe06ce 100644
--- a/package/network/services/odhcpd/Makefile
+++ b/package/network/services/odhcpd/Makefile
@@ -13,8 +13,8 @@ PKG_RELEASE:=3
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git
 PKG_SOURCE_DATE:=2019-05-17
-PKG_SOURCE_VERSION:=41a74cba1bec349d1e1c5be4442e7fddb2d4adf7
-PKG_MIRROR_HASH:=b9ad88274843584629a15ac4200f910e1f14734d7b02650a0305540733fb7398
+PKG_SOURCE_VERSION:=d11180932b2fb8784aaad0830c032e42b8bb64ac
+PKG_MIRROR_HASH:=56f9222996aa1ad0729d95e43a1c5e0892c1de41527e906a1bd704ef888da182
 
 PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
 PKG_LICENSE:=GPL-2.0
diff --git a/package/network/services/odhcpd/files/odhcpd.defaults b/package/network/services/odhcpd/files/odhcpd.defaults
index 2d8a6f0b1a4..5a1706f7856 100644
--- a/package/network/services/odhcpd/files/odhcpd.defaults
+++ b/package/network/services/odhcpd/files/odhcpd.defaults
@@ -25,5 +25,8 @@ set dhcp.odhcpd.leasetrigger=/usr/sbin/odhcpd-update
 set dhcp.odhcpd.loglevel=4
 set dhcp.lan.dhcpv6=$MODE
 set dhcp.lan.ra=$MODE
+set dhcp.lan.ra_slaac=1
+add_list dhcp.lan.ra_flags=managed-config
+add_list dhcp.lan.ra_flags=other-config
 commit dhcp
 EOF
-- 
GitLab