[Debian-iot-packaging] [alljoyn-core-1504] 01/01: take care of openssl issue (replace by builtin stuff)

Thorsten Alteholz alteholz at moszumanska.debian.org
Tue Nov 29 19:22:34 UTC 2016 

This is an automated email from the git hooks/post-receive script.

alteholz pushed a commit to branch master
in repository alljoyn-core-1504.

commit 09d9f916ecb3e0256c5b24ef46af28cdceb4ed1b
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Tue Nov 29 18:57:06 2016 +0100

    take care of openssl issue (replace by builtin stuff)
---
 debian/changelog          | 10 ++++++++++
 debian/control            |  4 +++-
 debian/patches/gcc6.patch | 42 ++++++++++++++++++++++++++++++------------
 debian/rules              |  6 +++---
 4 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 74dfc9a..bd8d755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+alljoyn-core-1504 (15.04b-8) unstable; urgency=medium
+
+  * move maintenance to debian-iot team
+  * debian/rules: activate tests again
+  * debian/rules: use builtin crypt (Closes: #828230)
+                  don't use openssl until hassle has ended
+  * debian/control: add dependency for lsb-base (>= 3.0-6)
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Tue, 29 Nov 2016 16:01:37 +0100
+
 alljoyn-core-1504 (15.04b-7) unstable; urgency=medium
 
   * take care of gcc-6 build errors (Closes: #831127)
diff --git a/debian/control b/debian/control
index 37c5caf..a0de739 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: alljoyn-core-1504
 Section: net
 Priority: extra
-Maintainer: Thorsten Alteholz <debian at alteholz.de>
+Maintainer: Debian IoT Maintainers <debian-iot-maintainers at lists.alioth.debian.org>
+Uploaders: Thorsten Alteholz <debian at alteholz.de>
 Build-Depends: dh-exec (>=0.3)
                , dh-systemd (>= 1.5) 
                , debhelper (>=9)
@@ -100,6 +101,7 @@ Description: AllJoyn C development library
 Package: alljoyn-daemon-1504
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+       , lsb-base (>= 3.0-6)
 Description: AllJoyn daemon service
  AllJoyn is a collaborative open-source software framework that makes 
  it easy for developers to write applications that can discover nearby
diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch
index 7965c12..7647909 100644
--- a/debian/patches/gcc6.patch
+++ b/debian/patches/gcc6.patch
@@ -1,9 +1,9 @@
 Author: Thorsten Alteholz <debian at alteholz.de>
 Description: take care of compile errors due to gcc-6
-Index: alljoyn-core-1504-15.04b/common/src/CryptoSRP.cc
+Index: alljoyn-core-1504/common/src/CryptoSRP.cc
 ===================================================================
---- alljoyn-core-1504-15.04b.orig/common/src/CryptoSRP.cc	2016-08-07 15:02:46.000000000 +0200
-+++ alljoyn-core-1504-15.04b/common/src/CryptoSRP.cc	2016-08-07 15:06:30.000000000 +0200
+--- alljoyn-core-1504.orig/common/src/CryptoSRP.cc	2016-11-29 16:16:21.230143887 +0100
++++ alljoyn-core-1504/common/src/CryptoSRP.cc	2016-11-29 16:16:21.222144106 +0100
 @@ -26,7 +26,12 @@
  #include <assert.h>
  #include <ctype.h>
@@ -18,10 +18,10 @@ Index: alljoyn-core-1504-15.04b/common/src/CryptoSRP.cc
  
  #include <qcc/Debug.h>
  #include <qcc/Crypto.h>
-Index: alljoyn-core-1504-15.04b/common/src/SLAPStream.cc
+Index: alljoyn-core-1504/common/src/SLAPStream.cc
 ===================================================================
---- alljoyn-core-1504-15.04b.orig/common/src/SLAPStream.cc	2016-08-07 15:02:46.000000000 +0200
-+++ alljoyn-core-1504-15.04b/common/src/SLAPStream.cc	2016-08-07 15:02:46.000000000 +0200
+--- alljoyn-core-1504.orig/common/src/SLAPStream.cc	2016-11-29 16:16:21.230143887 +0100
++++ alljoyn-core-1504/common/src/SLAPStream.cc	2016-11-29 16:16:21.222144106 +0100
 @@ -465,7 +465,7 @@
              /*
               * Check that the configuration response is valid.
@@ -31,10 +31,10 @@ Index: alljoyn-core-1504-15.04b/common/src/SLAPStream.cc
                  QCC_LogError(ER_FAIL, ("Configuration failed - device is not configuring link correctly %d %d", m_linkParams.packetSize, m_linkParams.maxPacketSize));
                  m_linkState = LINK_DEAD;
                  return;
-Index: alljoyn-core-1504-15.04b/common/src/StringUtil.cc
+Index: alljoyn-core-1504/common/src/StringUtil.cc
 ===================================================================
---- alljoyn-core-1504-15.04b.orig/common/src/StringUtil.cc	2016-08-07 15:02:46.000000000 +0200
-+++ alljoyn-core-1504-15.04b/common/src/StringUtil.cc	2016-08-07 15:06:47.000000000 +0200
+--- alljoyn-core-1504.orig/common/src/StringUtil.cc	2016-11-29 16:16:21.230143887 +0100
++++ alljoyn-core-1504/common/src/StringUtil.cc	2016-11-29 16:16:21.222144106 +0100
 @@ -24,7 +24,12 @@
  
  #include <algorithm>
@@ -49,10 +49,28 @@ Index: alljoyn-core-1504-15.04b/common/src/StringUtil.cc
  
  #include <qcc/String.h>
  #include <qcc/StringUtil.h>
-Index: alljoyn-core-1504-15.04b/common/crypto/openssl/CryptoAES.cc
+Index: alljoyn-core-1504/common/crypto/openssl/CryptoAES.cc
 ===================================================================
---- alljoyn-core-1504-15.04b.orig/common/crypto/openssl/CryptoAES.cc	2016-08-07 15:02:46.000000000 +0200
-+++ alljoyn-core-1504-15.04b/common/crypto/openssl/CryptoAES.cc	2016-08-07 15:06:55.000000000 +0200
+--- alljoyn-core-1504.orig/common/crypto/openssl/CryptoAES.cc	2016-11-29 16:16:21.230143887 +0100
++++ alljoyn-core-1504/common/crypto/openssl/CryptoAES.cc	2016-11-29 16:16:21.222144106 +0100
+@@ -25,7 +25,12 @@
+ #include <algorithm>
+ #include <assert.h>
+ #include <ctype.h>
+-#include <math.h>
++/* need to change include files, problem occurs with gcc-6 */
++#if __GNUC__ >= 6
++ #include <cmath>
++#else
++ #include <math.h>
++#endif
+ 
+ #include <qcc/String.h>
+ #include <qcc/StringUtil.h>
+Index: alljoyn-core-1504/common/crypto/builtin/CryptoAES.cc
+===================================================================
+--- alljoyn-core-1504.orig/common/crypto/builtin/CryptoAES.cc	2016-11-29 13:52:20.511998713 +0100
++++ alljoyn-core-1504/common/crypto/builtin/CryptoAES.cc	2016-11-29 16:17:00.013078197 +0100
 @@ -25,7 +25,12 @@
  #include <algorithm>
  #include <assert.h>
diff --git a/debian/rules b/debian/rules
index 98701fc..68c5664 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=/usr/share/java/csv.jar:/usr/share/java/debug-disable.jar:/usr/share/java/itext.jar
-#XXX deactivate tests for now: export GTEST_DIR=/usr/src/gtest
+#even gtest 1.8.0 is not working: export GTEST_DIR=/usr/src/gtest
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
@@ -22,8 +22,8 @@ OS=linux
 export VERSION := 15.04b
 export SONAME := 1504
 export VARIANT := release
-#XXX deactivate tests for now: export SCONS_ARGS := CPU=$(CPU) OS=$(OS) VARIANT=$(VARIANT) V=1 GTEST_DIR=$(GTEST_DIR)
-export SCONS_ARGS := CPU=$(CPU) OS=$(OS) VARIANT=$(VARIANT) V=1 
+#even gtest 1.8.0 is not working: export SCONS_ARGS := CPU=$(CPU) OS=$(OS) VARIANT=$(VARIANT) V=1 GTEST_DIR=$(GTEST_DIR) CRYPTO=builtin
+export SCONS_ARGS := CPU=$(CPU) OS=$(OS) VARIANT=$(VARIANT) V=1 CRYPTO=builtin
 export BUILD_DIR := $(CURDIR)/build/$(OS)/$(CPU)/$(VARIANT)/dist
 export OBJ_DIR := $(CURDIR)/build/$(OS)/$(CPU)/$(VARIANT)/obj
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/alljoyn-core-1504.git

More information about the Debian-iot-packaging mailing list