diff options
| author | Michael Heimpold <mhei@heimpold.de> | 2020-06-18 21:51:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 21:51:13 +0200 |
| commit | 024d36466d5355bcd6950bf9c3362c0eae7c3c34 (patch) | |
| tree | c865e18a5fba593541411476d87064fa933eaf47 /net | |
| parent | 69b6f46c96bf6c541f7a371ed117cc16131b6f4e (diff) | |
| parent | ddbf62c949d01bae73ad3a349e3f1ef8355ac18d (diff) | |
Merge pull request #12545 from tru7/knxd
knxd: bump to version 0.14.39
Diffstat (limited to 'net')
| -rw-r--r-- | net/knxd/Makefile | 6 | ||||
| -rw-r--r-- | net/knxd/patches/0100-version.patch | 2 | ||||
| -rw-r--r-- | net/knxd/patches/0110-usblowlever.patch | 10 |
3 files changed, 4 insertions, 14 deletions
diff --git a/net/knxd/Makefile b/net/knxd/Makefile index a35552755..774062c68 100644 --- a/net/knxd/Makefile +++ b/net/knxd/Makefile @@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knxd -PKG_VERSION:=0.14.38 -PKG_RELEASE:=2 +PKG_VERSION:=0.14.39 +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:=bb0343154ee1d0d91b1b342f04ee163739e906ac530b7490b5aec516bb485d59 +PKG_HASH:=9ed920fa3c4f12ededd4d413f27f149c91ce0846c561a7d19478502c06ac95f1 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 da1cf3402..9ff5a3113 100644 --- a/net/knxd/patches/0100-version.patch +++ b/net/knxd/patches/0100-version.patch @@ -5,4 +5,4 @@ -test -d .git || exit -git describe --tags -+echo -n "0.14.38" ++echo -n "0.14.39" diff --git a/net/knxd/patches/0110-usblowlever.patch b/net/knxd/patches/0110-usblowlever.patch deleted file mode 100644 index c9459b00a..000000000 --- a/net/knxd/patches/0110-usblowlever.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/libserver/usblowlevel.cpp 2020-06-03 16:41:02.128182612 +0200 -+++ b/src/libserver/usblowlevel.cpp 2020-06-03 16:41:31.660704440 +0200 -@@ -155,6 +155,7 @@ - { - t->setAuxName("usbL"); - send_timeout = cfg->value("send-timeout", 1000); -+ loop = nullptr; - read_trigger.set<USBLowLevelDriver,&USBLowLevelDriver::read_trigger_cb>(this); - write_trigger.set<USBLowLevelDriver,&USBLowLevelDriver::write_trigger_cb>(this); - read_trigger.start(); |