From 1a690796a3df17e976002506f06096075a287d7b Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis <gabriel@kerneis.info>
Date: Mon, 27 May 2013 06:48:05 +0100
Subject: [PATCH] ndppd: new upstream release 0.2.3

Also update maintainer email address and cherry-pick commit 00da8bf to
prevent daemonizing before reading the configuration file.

Signed-off-by: Gabriel Kerneis <gabriel@kerneis.info>
---
 ndppd/Makefile                                |  8 +--
 ...ix-issue-2-ndppd-d-monizes-too-early.patch | 53 +++++++++++++++++++
 2 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 ndppd/patches/0001-Fix-issue-2-ndppd-d-monizes-too-early.patch

diff --git a/ndppd/Makefile b/ndppd/Makefile
index b7c3282..c5f1d20 100644
--- a/ndppd/Makefile
+++ b/ndppd/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ndppd
-PKG_VERSION:=0.2.2
-PKG_RELEASE:=2
+PKG_VERSION:=0.2.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 # Latest release
 PKG_SOURCE_URL:=http://www.priv.nu/projects/ndppd/files/
-PKG_MD5SUM:=d90c4b65777a62274c1837dba341e5a8
+PKG_MD5SUM:=d6f3243bb7fc04c8085371c9acddc50e
 
 # Development snapshot
 #PKG_SOURCE_URL=git://github.com/Tuhox/ndppd.git
@@ -30,7 +30,7 @@ define Package/ndppd
   CATEGORY:=Network
   TITLE:=NDP Proxy Daemon
   URL:=http://www.priv.nu/projects/ndppd/
-  MAINTAINER:=Gabriel Kerneis <kerneis@pps.jussieu.fr>
+  MAINTAINER:=Gabriel Kerneis <gabriel@kerneis.info>
   DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS)
 endef
 
diff --git a/ndppd/patches/0001-Fix-issue-2-ndppd-d-monizes-too-early.patch b/ndppd/patches/0001-Fix-issue-2-ndppd-d-monizes-too-early.patch
new file mode 100644
index 0000000..dad23f5
--- /dev/null
+++ b/ndppd/patches/0001-Fix-issue-2-ndppd-d-monizes-too-early.patch
@@ -0,0 +1,53 @@
+From 00da8bf7bab88a3827af4110fb27df9cde542e32 Mon Sep 17 00:00:00 2001
+From: Daniel Adolfsson <daniel@priv.nu>
+Date: Tue, 12 Feb 2013 13:25:22 +0100
+Subject: [PATCH] =?UTF-8?q?Fix=20issue=20#2=20-=20ndppd=20d=C3=A6monizes=20t?=
+ =?UTF-8?q?oo=20early?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/ndppd.cc |   18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/src/ndppd.cc b/src/ndppd.cc
+index 6ac19e8..20ced6f 100644
+--- a/src/ndppd.cc
++++ b/src/ndppd.cc
+@@ -201,15 +201,6 @@ int main(int argc, char* argv[], char* env[])
+         }
+     }
+ 
+-    if (daemon) {
+-        logger::syslog(true);
+-
+-        if (daemonize() < 0) {
+-            logger::error() << "Failed to daemonize process";
+-            return 1;
+-        }
+-    }
+-
+     if (!pidfile.empty()) {
+         std::ofstream pf;
+         pf.open(pidfile.c_str(), std::ios::out | std::ios::trunc);
+@@ -225,8 +216,15 @@ int main(int argc, char* argv[], char* env[])
+ 
+     if (!configure(config_path))
+         return -1;
++    
++    if (daemon) {
++        logger::syslog(true);
+ 
+-    //route::load("/proc/net/ipv6_route");
++        if (daemonize() < 0) {
++            logger::error() << "Failed to daemonize process";
++            return 1;
++        }
++    }
+ 
+     // Time stuff.
+ 
+-- 
+1.7.10.4
+
-- 
2.30.2