From 7e4df53154bf826a2198b4a21c5b7ec54b198285 Mon Sep 17 00:00:00 2001 From: lemmi Date: Fri, 3 May 2019 08:54:42 +0200 Subject: [PATCH] New package: ndppd-0.2.5 --- srcpkgs/ndppd/files/ndppd/log/run | 3 + srcpkgs/ndppd/files/ndppd/run | 3 + srcpkgs/ndppd/patches/0001-Version-bump.patch | 22 +++++++ .../0002-Fixes-strerror_r-GNU-XSI.patch | 55 ++++++++++++++++ .../ndppd/patches/0003-fix-poll-header.patch | 64 +++++++++++++++++++ srcpkgs/ndppd/template | 20 ++++++ 6 files changed, 167 insertions(+) create mode 100755 srcpkgs/ndppd/files/ndppd/log/run create mode 100755 srcpkgs/ndppd/files/ndppd/run create mode 100644 srcpkgs/ndppd/patches/0001-Version-bump.patch create mode 100644 srcpkgs/ndppd/patches/0002-Fixes-strerror_r-GNU-XSI.patch create mode 100644 srcpkgs/ndppd/patches/0003-fix-poll-header.patch create mode 100644 srcpkgs/ndppd/template diff --git a/srcpkgs/ndppd/files/ndppd/log/run b/srcpkgs/ndppd/files/ndppd/log/run new file mode 100755 index 00000000000..6351a7cbc24 --- /dev/null +++ b/srcpkgs/ndppd/files/ndppd/log/run @@ -0,0 +1,3 @@ +#!/bin/sh + +exec logger -t ndppd diff --git a/srcpkgs/ndppd/files/ndppd/run b/srcpkgs/ndppd/files/ndppd/run new file mode 100755 index 00000000000..6c36352ecd3 --- /dev/null +++ b/srcpkgs/ndppd/files/ndppd/run @@ -0,0 +1,3 @@ +#!/bin/sh + +exec ndppd -v diff --git a/srcpkgs/ndppd/patches/0001-Version-bump.patch b/srcpkgs/ndppd/patches/0001-Version-bump.patch new file mode 100644 index 00000000000..c88df86c915 --- /dev/null +++ b/srcpkgs/ndppd/patches/0001-Version-bump.patch @@ -0,0 +1,22 @@ +From 715f9f330d8606d4a7b68900325f9b1455dd5368 Mon Sep 17 00:00:00 2001 +From: Rafael Cossovan +Date: Tue, 3 Apr 2018 17:06:16 -0300 +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 @@ + #define NDPPD_NS_BEGIN namespace ndppd { + #define NDPPD_NS_END } + +-#define NDPPD_VERSION "0.2.4" ++#define NDPPD_VERSION "0.2.5" + + #include + diff --git a/srcpkgs/ndppd/patches/0002-Fixes-strerror_r-GNU-XSI.patch b/srcpkgs/ndppd/patches/0002-Fixes-strerror_r-GNU-XSI.patch new file mode 100644 index 00000000000..8ba9c63b4e1 --- /dev/null +++ b/srcpkgs/ndppd/patches/0002-Fixes-strerror_r-GNU-XSI.patch @@ -0,0 +1,55 @@ +From 1f610129b475b417509b251e022ad46d2210ff50 Mon Sep 17 00:00:00 2001 +From: Rafael Cossovan +Date: Tue, 3 Apr 2018 17:04:35 -0300 +Subject: [PATCH 2/3] Fixes strerror_r GNU/XSI issue #40. + http://www.zverovich.net/2015/03/13/reliable-detection-of-strerror-variants.html + +--- + src/logger.cc | 14 ++++++++++++- + 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]; +- return strerror_r(errno, buf, sizeof(buf)); ++ return strerror_r_wrapper(strerror_r(errno, buf, sizeof(buf)), buf); + } + + logger logger::error() +@@ -221,4 +221,16 @@ + return false; + } + ++// XSI-compliant: int ++std::string logger::strerror_r_wrapper(int, char* s) ++{ ++ return s; ++} ++ ++// GNU-specific: char * ++std::string logger::strerror_r_wrapper(char* s, char*) ++{ ++ return s; ++} ++ + 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 { + + static int _max_pri; + ++ // helpers for strerror_r ++ static std::string strerror_r_wrapper(int, char* s); ++ static std::string strerror_r_wrapper(char* s, char*); + + }; + + diff --git a/srcpkgs/ndppd/patches/0003-fix-poll-header.patch b/srcpkgs/ndppd/patches/0003-fix-poll-header.patch new file mode 100644 index 00000000000..8b60c54a30e --- /dev/null +++ b/srcpkgs/ndppd/patches/0003-fix-poll-header.patch @@ -0,0 +1,64 @@ +From 88b9bc561ce42f2eb97ea041cd8920797b44dd53 Mon Sep 17 00:00:00 2001 +From: Rafael Cossovan +Date: Tue, 3 Apr 2018 17:05:42 -0300 +Subject: [PATCH 3/3] Fixes a compile warning when building with musl: #warning + redirecting incorrect #include to + +--- + src/iface.cc | 2 +- + src/iface.h | 2 +- + src/proxy.h | 2 +- + 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 @@ + #include + #include + #include +-#include ++#include + + #include + +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 @@ + #include + #include + +-#include ++#include + #include + + #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 @@ + #include + #include + +-#include ++#include + + #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 @@ + #include + +-#include ++#include + + #include "ndppd.h" + diff --git a/srcpkgs/ndppd/template b/srcpkgs/ndppd/template new file mode 100644 index 00000000000..48f78c040ab --- /dev/null +++ b/srcpkgs/ndppd/template @@ -0,0 +1,20 @@ +# Template file for 'ndppd' +pkgname=ndppd +version=0.2.5 +revision=1 +build_style=gnu-makefile +short_desc="NDP Proxy Daemon" +maintainer="lemmi " +license="GPL-3.0-or-later" +homepage="https://github.com/DanielAdolfsson/ndppd" +distfiles="https://github.com/DanielAdolfsson/ndppd/archive/${version}.tar.gz" +checksum=ee934167f8357f0bd0015e201a77fbe4d028c59e89dc98113805c6855e1c3992 +patch_args="-Np1" + +do_install() { + vbin ndppd + vman ndppd.1 + vman ndppd.conf.5 + vsv ndppd + vsconf ndppd.conf-dist ndppd.conf +}