Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package knxd. Changes: * debian/copyright used a bad tag * knxd-dev needs to depend on knxd-tools (library symlink) * updated version number in RPM spec file * replaced a hex constant with predefined (same-value) macro for more code readability diff --git a/debian/changelog b/debian/changelog index 4216c12..b69338c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +knxd (0.14.30-1) unstable; urgency=medium + + * Use a constant, dammit + + -- Matthias Urlichs <[email protected]> Mon, 18 Mar 2019 08:54:33 +0100 + +knxd (0.14.29-5) unstable; urgency=medium + + * Add dependency from knxd-dev to -tools (for libeibclient.so) + Closes:#924188 + + -- Matthias Urlichs <[email protected]> Sun, 17 Mar 2019 16:06:48 +0100 + knxd (0.14.29-3) unstable; urgency=medium * Remove homedir after purge. Closes: #920832 @@ -14,7 +27,7 @@ knxd (0.14.29-1) unstable; urgency=medium * Addressed Debian ftpmaster concerns. - -- Matthias Urlichs <[email protected]> Sat, 19 Jan 2019 14:09:08 +0100 + -- Matthias Urlichs <[email protected]> Sat, 19 Jan 2019 14:35:42 +0100 knxd (0.14.28-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 4191faf..23c92e3 100644 --- a/debian/control +++ b/debian/control @@ -41,7 +41,8 @@ Description: tools to use knxd Package: knxd-dev Architecture: any -Depends: ${misc:Depends} +Depends: ${misc:Depends}, + knxd-tools (= ${binary:Version}) Description: development files for knxd KNX is a standard protocol for home and building control. . diff --git a/debian/copyright b/debian/copyright index 9b19750..e2f1c1b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -32,7 +32,7 @@ Copyright: © 2015-2019 Matthias Urlichs <[email protected]> License: GPL-2.0+ -File: m4/ax_cxx_compile_stdcxx.m4 +Files: m4/ax_cxx_compile_stdcxx.m4 Copyright: © 2008 Benjamin Kosnik <[email protected]> © 2012 Zack Weinberg <[email protected]> @@ -41,33 +41,33 @@ Copyright: © 2015 Paul Norman <[email protected]> © 2015 Moritz Klammler <[email protected]> © 2016 Krzesimir Nowak <[email protected]> -License: +License: MIT-like Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. This file is offered as-is, without any warranty. -File: m4/ccforbuild.m4 +Files: m4/ccforbuild.m4 Copyright: © 2000-2006 Free Software Foundation, Inc. License: LGPL-2.1+ -File: m4/compileroption.m4 +Files: m4/compileroption.m4 Copyright: © 1999-2006 Ralf S. Engelschall <[email protected]> License: LGPL-2.1+ -File: m4/features.m4 +Files: m4/features.m4 Copyright: © 2014 Luis R. Rodriguez <[email protected]> License: AGPL-3.0+ -File: m4/paths.m4 +Files: m4/paths.m4 Copyright: © 2014 Luis R. Rodriguez <[email protected]> License: GPL-2.0+ -File: m4/systemd.m4 +Files: m4/systemd.m4 Copyright: © 2014 Luis R. Rodriguez <[email protected]> © 2015 Marc Joliet <[email protected]> @@ -91,7 +91,12 @@ Copyright: © 2015-2017 Matthias Urlichs <[email protected]> License: GPL-2.0+ -Files: src/client/{lua,ruby}/* +Files: src/client/lua/* +Copyright: + © 2014 Elias Karakoulakis <[email protected]> +License: GPL-2.0+ + +Files: src/client/ruby/* Copyright: © 2014 Elias Karakoulakis <[email protected]> License: GPL-2.0+ @@ -130,7 +135,7 @@ License: BSD-3-clause (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -File: src/examples/vbusmonitor1time.c +Files: src/examples/vbusmonitor1time.c Copyright: © 2005-2008 Martin Koegler <[email protected]> © 2010 Michael Markstaller <[email protected]> @@ -153,7 +158,13 @@ Copyright: © 2014 Michael Markstaller <[email protected]> License: GPL-2.0+ -File: src/tools/eib{read,write}-cgi.c +Files: src/tools/eibread-cgi.c +Copyright: + © 2005-2010 Martin Koegler <[email protected]> + © 2010 Michael Markstaller <[email protected]> +License: GPL-2.0+ + +Files: src/tools/eibwrite-cgi.c Copyright: © 2005-2010 Martin Koegler <[email protected]> © 2010 Michael Markstaller <[email protected]> @@ -165,7 +176,7 @@ Copyright: © 2015-2017 Matthias Urlichs <[email protected]> License: GPL-2.0+ -File: tools/list_AUTHORS +Files: tools/list_AUTHORS Copyright: © 2015 Richard Hartmann <[email protected]> License: GPL-2.0+ diff --git a/rpm/knxd.spec b/rpm/knxd.spec index 9d2d6cf..cb1e150 100644 --- a/rpm/knxd.spec +++ b/rpm/knxd.spec @@ -4,7 +4,7 @@ # Summary: A KNX daemon and tools Name: knxd -Version: 0.14.15 +Version: 0.14.30 Release: 0%{?dist} Group: Applications/Interpreters Source: %{name}-%{version}.tar.gz diff --git a/src/libserver/eibnetserver.cpp b/src/libserver/eibnetserver.cpp index 2e9f1f4..0db3155 100644 --- a/src/libserver/eibnetserver.cpp +++ b/src/libserver/eibnetserver.cpp @@ -643,7 +643,7 @@ EIBnetServer::handle_packet (EIBNetIPPacket *p1, EIBNetIPSocket *isock) goto out; } r2.channel = r1.channel; - r2.status = 0x21; + r2.status = E_CONNECTION_ID; ITER(i, connections) if ((*i)->channel == r1.channel) { @@ -667,7 +667,7 @@ EIBnetServer::handle_packet (EIBNetIPPacket *p1, EIBNetIPSocket *isock) t->TracePacket (2, "unparseable DISCONNECT_REQUEST", p1->data); goto out; } - r2.status = 0x21; + r2.status = E_CONNECTION_ID; r2.channel = r1.channel; ITER(i,connections) if ((*i)->channel == r1.channel) unblock knxd/0.14.30-1 -- System Information: Debian Release: buster/sid APT prefers stable APT policy: (700, 'stable'), (650, 'testing'), (600, 'unstable'), (550, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system)
