From 8f5ed0f95f44f7fdb80fe5b9afd96472d102ad10 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E8=B0=A2=E8=87=B4=E9=82=A6=20=28XIE=20Zhibang=29?=
 <Yeking@Red54.com>
Date: Wed, 13 Nov 2024 15:00:59 +0800
Subject: [PATCH] ndppd: update to version 0.2.6
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: 谢致邦 (XIE Zhibang) <Yeking@Red54.com>
---
 ndppd/Makefile                                |  8 ++++----
 ndppd/patches/0001-Version-bump.patch         |  4 +---
 .../0002-Fixes-strerror_r-GNU-XSI.patch       | 20 ++++++++-----------
 ndppd/patches/0003-fix-poll-header.patch      | 13 +++---------
 4 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/ndppd/Makefile b/ndppd/Makefile
index 8fcc93f..1e8311b 100644
--- a/ndppd/Makefile
+++ b/ndppd/Makefile
@@ -8,17 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ndppd
-PKG_VERSION:=0.2.5
-PKG_RELEASE:=2
+PKG_VERSION:=0.2.6
+PKG_RELEASE:=1
 
 # Latest release
 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_HASH:=969d438462e0c65a8c9060d8d263c5c47ba8145fb9aaa663864bbad11ad7eb7a
 PKG_LICENSE:=GPL-3.0-or-later
 
 # Development snapshot
-#PKG_SOURCE_URL=git://github.com/Tuhox/ndppd.git
+#PKG_SOURCE_URL=git://github.com/DanielAdolfsson/ndppd.git
 #PKG_SOURCE_VERSION=master
 #PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/ndppd/patches/0001-Version-bump.patch b/ndppd/patches/0001-Version-bump.patch
index c88df86..64b6c0a 100644
--- a/ndppd/patches/0001-Version-bump.patch
+++ b/ndppd/patches/0001-Version-bump.patch
@@ -7,8 +7,6 @@ Subject: [PATCH 1/3] Forgot to bump the version.
  src/ndppd.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/ndppd.h b/src/ndppd.h
-index 57ba829..3e11221 100644
 --- a/src/ndppd.h
 +++ b/src/ndppd.h
 @@ -21,7 +21,7 @@
@@ -16,7 +14,7 @@ index 57ba829..3e11221 100644
  #define NDPPD_NS_END     }
  
 -#define NDPPD_VERSION   "0.2.4"
-+#define NDPPD_VERSION   "0.2.5"
++#define NDPPD_VERSION   "0.2.6"
  
  #include <assert.h>
  
diff --git a/ndppd/patches/0002-Fixes-strerror_r-GNU-XSI.patch b/ndppd/patches/0002-Fixes-strerror_r-GNU-XSI.patch
index 8ba9c63..6568f74 100644
--- a/ndppd/patches/0002-Fixes-strerror_r-GNU-XSI.patch
+++ b/ndppd/patches/0002-Fixes-strerror_r-GNU-XSI.patch
@@ -9,22 +9,21 @@ Subject: [PATCH 2/3] Fixes strerror_r GNU/XSI issue #40.
  src/logger.h  |  3 +++
  2 files changed, 15 insertions(+), 1 deletions(-)
 
-diff --git a/src/logger.cc b/src/logger.cc
-index 6ddbea9..6ccb2a0 100644
 --- a/src/logger.cc
 +++ b/src/logger.cc
-@@ -84,6 +84,6 @@ std::string logger::err()
- {
-     char buf[2048];
+@@ -89,7 +89,7 @@ std::string logger::err()
+         return "Unknown error";
+     return buf;
+ #else
 -    return strerror_r(errno, buf, sizeof(buf));
 +    return strerror_r_wrapper(strerror_r(errno, buf, sizeof(buf)), buf);
+ #endif
  }
  
- logger logger::error()
-@@ -221,4 +221,16 @@ 
+@@ -228,4 +228,16 @@ bool logger::verbosity(const std::string
      return false;
  }
-
+ 
 +// XSI-compliant: int
 +std::string logger::strerror_r_wrapper(int, char* s)
 +{
@@ -38,11 +37,9 @@ index 6ddbea9..6ccb2a0 100644
 +}
 +
  NDPPD_NS_END
-diff --git a/src/logger.h b/src/logger.h
-index 7d3d7db..0446595 100644
 --- a/src/logger.h
 +++ b/src/logger.h
-@@ -91,6 +91,9 @@ class logger {
+@@ -91,6 +91,9 @@ private:
  
      static int _max_pri;
  
@@ -52,4 +49,3 @@ index 7d3d7db..0446595 100644
  
  };
  
-
diff --git a/ndppd/patches/0003-fix-poll-header.patch b/ndppd/patches/0003-fix-poll-header.patch
index 8b60c54..2e91431 100644
--- a/ndppd/patches/0003-fix-poll-header.patch
+++ b/ndppd/patches/0003-fix-poll-header.patch
@@ -11,8 +11,6 @@ Subject: [PATCH 3/3] Fixes a compile warning when building with musl: #warning
  src/rule.h   | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/src/iface.cc b/src/iface.cc
-index f569d3c..7cbb57f 100644
 --- a/src/iface.cc
 +++ b/src/iface.cc
 @@ -30,7 +30,7 @@
@@ -24,8 +22,6 @@ index f569d3c..7cbb57f 100644
  
  #include <linux/filter.h>
  
-diff --git a/src/iface.h b/src/iface.h
-index 9db59ab..df7ff35 100644
 --- a/src/iface.h
 +++ b/src/iface.h
 @@ -20,7 +20,7 @@
@@ -37,8 +33,6 @@ index 9db59ab..df7ff35 100644
  #include <net/ethernet.h>
  
  #include "ndppd.h"
-diff --git a/src/proxy.h b/src/proxy.h
-index 8141b2a..9299d9a 100644
 --- a/src/proxy.h
 +++ b/src/proxy.h
 @@ -19,7 +19,7 @@
@@ -50,15 +44,14 @@ index 8141b2a..9299d9a 100644
  
  #include "ndppd.h"
  
-diff --git a/src/rule.h b/src/rule.h
-index 0c2f79a..23086e6 100644
 --- a/src/rule.h
 +++ b/src/rule.h
-@@ -20,6 +20,6 @@
+@@ -20,7 +20,7 @@
  #include <map>
+ #include <list>
  
 -#include <sys/poll.h>
 +#include <poll.h>
  
  #include "ndppd.h"
-
+ 
-- 
2.30.2