knxd: new upstream version 0.14.50

Signed-off-by: Othmar Truniger <github@truniger.ch>

diff --git a/net/knxd/Makefile b/net/knxd/Makefile
index e70085a0b22d420944f5c3ccab881dced3ac78f1..9bb1cf068d93ee00f95fa069597a8d1f06d50ea1 100644 (file)
--- a/net/knxd/Makefile
+++ b/net/knxd/Makefile
@@ -11,12 +11,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=knxd
-PKG_VERSION:=0.14.39
-PKG_RELEASE:=2
+PKG_VERSION:=0.14.50
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/knxd/knxd/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=9ed920fa3c4f12ededd4d413f27f149c91ce0846c561a7d19478502c06ac95f1
+PKG_HASH:=c9189dc0b05b208b06be311d2792ce11092aee8d51d04083568ae49bd10b7cd8
 
 PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
 PKG_LICENSE:=GPL-2.0-or-later

diff --git a/net/knxd/patches/0100-version.patch b/net/knxd/patches/0100-version.patch
index d597753da8d4ca1fe26114b655431ce7ae7e3937..9800a66dcc5c0b14019ba91458f68de432501a1f 100644 (file)
--- a/net/knxd/patches/0100-version.patch
+++ b/net/knxd/patches/0100-version.patch
@@ -1,8 +1,9 @@
 --- a/tools/version.sh
 +++ b/tools/version.sh
-@@ -1,4 +1,3 @@
+@@ -1,5 +1,3 @@
  #!/bin/sh
  
 -test -d .git || exit
--git describe --tags
-+echo -n "0.14.39"
+-# git describe --tags
+-git log --format=format:%D | perl -ne 'next unless s#.*tag: ##; s#,.*##; next if m#/#; print; exit;'
++echo -n "0.14.50"

diff --git a/net/knxd/patches/020-cdefs.patch b/net/knxd/patches/020-cdefs.patch
deleted file mode 100644 (file)
index a1bc124..0000000
--- a/net/knxd/patches/020-cdefs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/include/eibclient.h
-+++ b/src/include/eibclient.h
-@@ -27,10 +27,11 @@
- #ifndef EIBCLIENT_H
- #define EIBCLIENT_H
- 
--#include <sys/cdefs.h>
- #include <stdint.h>
- 
--__BEGIN_DECLS;
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- #include "eibloadresult.h"
- 
-@@ -935,5 +936,7 @@ int EIB_Cache_LastUpdates2_async (EIBCon
-                                   uint32_t * end);
- 
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- #endif