ndppd: bump to 0.2.5

* Remove downstream patches
 * Use github/codeload for source URL
 * Use PKG_HASH
This commit is contained in:
David Guglielmi 2018-06-17 18:47:39 +02:00
parent f785dc0e9b
commit 3b0ad89f33
No known key found for this signature in database
GPG Key ID: 1642DEF553D8A29E
3 changed files with 4 additions and 80 deletions

View File

@ -8,14 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ndppd
PKG_VERSION:=0.2.3
PKG_VERSION:=0.2.5
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_VERSION).tar.gz
# Latest release
PKG_SOURCE_URL:=https://github.com/DanielAdolfsson/ndppd/archive
PKG_MD5SUM:=1391c063db64b47541e58da12e5ae60d
PKG_SOURCE_URL:=https://codeload.github.com/DanielAdolfsson/ndppd/tar.gz/$(PKG_VERSION)?
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=ee934167f8357f0bd0015e201a77fbe4d028c59e89dc98113805c6855e1c3992
PKG_LICENSE:=GPL-3.0+
# Development snapshot

View File

@ -1,53 +0,0 @@
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

View File

@ -1,22 +0,0 @@
From f19fa4be6ac87032c01f2db57ccb484f83c62604 Mon Sep 17 00:00:00 2001
From: Daniel Adolfsson <daniel@priv.nu>
Date: Fri, 8 Apr 2016 13:32:22 +0200
Subject: [PATCH] Fix a cast so it can be compiled with gcc-6
---
src/iface.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/iface.cc b/src/iface.cc
index 3ce893f..5f165eb 100644
--- a/src/iface.cc
+++ b/src/iface.cc
@@ -147,7 +147,7 @@ ptr<iface> iface::open_pfd(const std::string& name)
// Bail if it's* not* ND_NEIGHBOR_SOLICIT.
BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, ND_NEIGHBOR_SOLICIT, 0, 1),
// Keep packet.
- BPF_STMT(BPF_RET | BPF_K, -1),
+ BPF_STMT(BPF_RET | BPF_K, (u_int32_t)-1),
// Drop packet.
BPF_STMT(BPF_RET | BPF_K, 0)
};