From a687798ac38958fe5a48c5d6164bd9e64c1972db Mon Sep 17 00:00:00 2001
From: Othmar Truniger <github@truniger.ch>
Date: Thu, 9 Apr 2020 19:29:47 +0200
Subject: [PATCH] knxd: bump to version 0.14.35

Signed-off-by: Othmar Truniger <github@truniger.ch>
---
 net/knxd/Makefile                   |  4 ++--
 net/knxd/patches/0099-openwrt.patch |  5 +++--
 net/knxd/patches/0100-version.patch | 12 ++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 net/knxd/patches/0100-version.patch

diff --git a/net/knxd/Makefile b/net/knxd/Makefile
index 5381fb90b..19c2caac6 100644
--- a/net/knxd/Makefile
+++ b/net/knxd/Makefile
@@ -11,12 +11,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=knxd
-PKG_VERSION:=0.14.31
+PKG_VERSION:=0.14.35
 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:=3bc21f1db9a72d4e6ad817f60e70af8421ede1529a57a2c12b70304e51a79d02
+PKG_HASH:=697bc68b64a27f0be478d8c861498533d18f0aef067cf95e9dc5e7c0653f1044
 
 PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
 PKG_LICENSE:=GPL-2.0-or-later
diff --git a/net/knxd/patches/0099-openwrt.patch b/net/knxd/patches/0099-openwrt.patch
index b1da96ce9..346a79b95 100644
--- a/net/knxd/patches/0099-openwrt.patch
+++ b/net/knxd/patches/0099-openwrt.patch
@@ -1,8 +1,9 @@
 --- a/src/client/Makefile.am 2017-01-25 20:17:14.000000000 +0100
 +++ b/src/client/Makefile.am 2017-01-25 20:18:50.639995000 +0100
 @@ -4,5 +4,5 @@
- BUILDJAVA =
+ BUILDJAVA = 
  endif
-
+ 
 -SUBDIRS=def c $(BUILDJAVA) php perl cs python pascal ruby lua go .
 +SUBDIRS=def c $(BUILDJAVA) php perl cs .
+ 
diff --git a/net/knxd/patches/0100-version.patch b/net/knxd/patches/0100-version.patch
new file mode 100644
index 000000000..b782088d8
--- /dev/null
+++ b/net/knxd/patches/0100-version.patch
@@ -0,0 +1,12 @@
+--- a/tools/version.sh  2020-04-08 19:39:40.349461034 +0200
++++ b/tools/version.sh  2020-04-08 19:40:26.354277094 +0200
+@@ -1,8 +1,2 @@
+ #!/bin/sh
+-sed -ne '1s/.*(\(.*\)).*/\1/' -e '1s/-1$//' -e '1p' debian/changelog | tr -d "\n"
+-test -d .git || exit
+-git=$(git rev-parse --short HEAD)
+-lgit=$(git rev-parse --short $(git rev-list -1 HEAD debian/changelog) )
+-if test "$git" != "$lgit" ; then
+-	echo -n ":$git"
+-fi
++echo -n "0.14.35"