Commit 5ef594ee authored by phenigma's avatar phenigma

Merge branch 'master' into bionic

Brind open-zwave updates into bionic branch
parents c66a946c 194aa3f2
openzwave (1.5+ds-6) unstable; urgency=medium
* debian/control: use dh11
* debian/control: bump to version 4.1.5 (no changes)
* debian/control: usa salsa VCS URLs
* debian/control: add 'Suggests: libopenzwave-doc' to dev package
(Closes: #849606)
* add gcc8.patch to avoid FTBFS (Closes: #897828)
-- Thorsten Alteholz <debian@alteholz.de> Tue, 10 Jul 2018 19:20:00 +0200
openzwave (1.5+ds-5) unstable; urgency=medium
* debian/control: bump to version 4.0.1 (no changes)
......
......@@ -3,11 +3,16 @@ Maintainer: Debian IoT Maintainers <debian-iot-maintainers@lists.alioth.debian.o
Uploaders: Thorsten Alteholz <debian@alteholz.de>
Section: devel
Priority: optional
Build-Depends: debhelper, dh-exec (>=0.2), g++ (>= 4.4), quilt, libudev-dev, libxml2-utils
Standards-Version: 4.0.1
Build-Depends: debhelper (>=9)
, dh-exec (>=0.2)
, g++ (>= 4.4)
, quilt
, libudev-dev
, libxml2-utils
Standards-Version: 4.1.5
Homepage: http://www.openzwave.com/
Vcs-Browser: https://anonscm.debian.org/cgit/debian-iot/openzwave.git
Vcs-Git: https://anonscm.debian.org/git/debian-iot/openzwave.git
Vcs-Browser: https://salsa.debian.org/debian-iot-team/openzwave
Vcs-Git: https://salsa.debian.org/debian-iot-team/openzwave.git
Package: libopenzwave1.5
Section: libs
......@@ -15,9 +20,9 @@ Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: API to use a Z-Wave controller
OpenZWave is an open-source, cross-platform library designed to enable
anyone to add support for Z-Wave home-automation devices to their
applications, without requiring any in depth knowledge of the Z-Wave
OpenZWave is an open-source, cross-platform library designed to enable
anyone to add support for Z-Wave home-automation devices to their
applications, without requiring any in depth knowledge of the Z-Wave
protocol.
.
This package contains the library.
......@@ -25,11 +30,12 @@ Description: API to use a Z-Wave controller
Package: libopenzwave1.5-dev
Section: libdevel
Depends: ${misc:Depends}, libopenzwave1.5 (= ${binary:Version})
Suggests: libopenzwave-doc
Architecture: any
Description: header files for the openzwave library
OpenZWave is an open-source, cross-platform library designed to enable
anyone to add support for Z-Wave home-automation devices to their
applications, without requiring any in depth knowledge of the Z-Wave
OpenZWave is an open-source, cross-platform library designed to enable
anyone to add support for Z-Wave home-automation devices to their
applications, without requiring any in depth knowledge of the Z-Wave
protocol.
.
This package contains files for developing.
......@@ -39,9 +45,9 @@ Section: doc
Depends: ${misc:Depends}, libjs-jquery
Architecture: all
Description: documentation for the openzwave library
OpenZWave is an open-source, cross-platform library designed to enable
anyone to add support for Z-Wave home-automation devices to their
applications, without requiring any in depth knowledge of the Z-Wave
OpenZWave is an open-source, cross-platform library designed to enable
anyone to add support for Z-Wave home-automation devices to their
applications, without requiring any in depth knowledge of the Z-Wave
protocol.
.
This package contains documentation.
......@@ -49,9 +55,9 @@ Description: documentation for the openzwave library
Package: openzwave
Section: misc
Architecture: any
Depends: libopenzwave1.5 (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Sample Program for libopenzwave
OpenZWave is an open-source, cross-platform library designed to enable
anyone to add support for Z-Wave home-automation devices to their
applications, without requiring any in depth knowledge of the Z-Wave
Depends: libopenzwave1.5 (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Sample Program for libopenzwave
OpenZWave is an open-source, cross-platform library designed to enable
anyone to add support for Z-Wave home-automation devices to their
applications, without requiring any in depth knowledge of the Z-Wave
protocol.
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: open-zwave
Upstream-Contact: Mal Lansell <openzwave@lansell.org>
Source: https://github.com/OpenZWave/open-zwave
......
Description: avoid FTBFS with gcc8
Author: Thorsten Alteholz <debian@alteholz.de>
#Index: openzwave-1.5+ds/cpp/build/support.mk
#===================================================================
#--- openzwave-1.5+ds.orig/cpp/build/support.mk 2018-07-09 13:53:57.470848046 +0200
#+++ openzwave-1.5+ds/cpp/build/support.mk 2018-07-09 13:53:57.458848046 +0200
#@@ -50,9 +50,9 @@
# CXX := $(CROSS_COMPILE)c++
# LD := $(CROSS_COMPILE)c++
# else
#-CC := $(CROSS_COMPILE)gcc
#-CXX := $(CROSS_COMPILE)g++
#-LD := $(CROSS_COMPILE)g++
#+CC := $(CROSS_COMPILE)gcc-8
#+CXX := $(CROSS_COMPILE)g++-8
#+LD := $(CROSS_COMPILE)g++-8
# endif
# ifeq ($(UNAME),Darwin)
# AR := libtool -static -o
Index: openzwave-1.5+ds/cpp/src/command_classes/DoorLockLogging.cpp
===================================================================
--- openzwave-1.5+ds.orig/cpp/src/command_classes/DoorLockLogging.cpp 2018-07-09 13:53:57.470848046 +0200
+++ openzwave-1.5+ds/cpp/src/command_classes/DoorLockLogging.cpp 2018-07-09 14:46:19.842753846 +0200
@@ -304,12 +304,14 @@
}
uint8 userid = (_data[10]);
uint8 usercodelength = (_data[11]);
- char usercode[254];
+ #define USERCODESIZE 254
+ char usercode[USERCODESIZE], tmpusercode[USERCODESIZE+4];
snprintf(usercode, sizeof(usercode), "UserCode:");
if (usercodelength > 0)
for (int i = 0; i < usercodelength; i++ )
{
- snprintf(usercode, sizeof(usercode), "%s %d", usercode, (int)_data[12+i]);
+ snprintf(tmpusercode, sizeof(tmpusercode), "%s %d", usercode, (int)_data[12+i]);
+ snprintf(usercode, USERCODESIZE, "%.253s",tmpusercode);
}
if (valid) {
#hardening.patch
spelling.patch
cppflags.patch
gcc8.patch
......@@ -11,6 +11,9 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
MORECPPFLAGS=$(CFLAGS)
MORELDFLAGS:=-Wl,-z,now
#export CC=gcc-8
#export CXX=g++-8
ifndef DESTDIR
DESTDIR=$(CURDIR)/debian/tmp/
endif
......@@ -49,6 +52,3 @@ override_dh_auto_install:
update_debian_version:
sed -i '1 s/(.*)/($(shell git describe --long --tags --dirty | sed s/-/./g | sed s/^v// ))/' debian/changelog
get-orig-source:
uscan --force-download --debug --repack
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment