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

Thorsten Alteholz alteholz at moszumanska.debian.org
Tue Nov 29 20:05:44 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-1604.

commit 8cc7b2abf4abfb9e00d6f60a11a20a7adfd41374
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Tue Nov 29 20:55:16 2016 +0100

    take care of openssl issue (replace by builtin stuff)
---
 debian/changelog          |  8 ++++++++
 debian/control            |  3 ++-
 debian/patches/gcc6.patch | 48 ++++++++++++++++++++++++++++++++---------------
 debian/rules              |  4 ++--
 4 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2425d8c..40fd106 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+alljoyn-core-1604 (16.04a-3) unstable; urgency=medium
+
+  * move maintenance to debian-iot team
+  * debian/rules: use builtin crypt (Closes: #844838)
+                  don't use openssl until hassle has ended
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Tue, 29 Nov 2016 20:01:37 +0100
+
 alljoyn-core-1604 (16.04a-2) unstable; urgency=medium
 
   * add liballjoyn_config to this package
diff --git a/debian/control b/debian/control
index e5e8f2d..1632977 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: alljoyn-core-1604
 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)
diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch
index 9ca2531..9acaf06 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-1604-16.04/common/src/CryptoSRP.cc
+Index: alljoyn-core-1604/common/src/CryptoSRP.cc
 ===================================================================
---- alljoyn-core-1604-16.04.orig/common/src/CryptoSRP.cc	2016-08-08 16:39:01.000000000 +0200
-+++ alljoyn-core-1604-16.04/common/src/CryptoSRP.cc	2016-08-08 16:39:01.000000000 +0200
+--- alljoyn-core-1604.orig/common/src/CryptoSRP.cc	2016-11-29 20:31:23.272654327 +0100
++++ alljoyn-core-1604/common/src/CryptoSRP.cc	2016-11-29 20:31:23.176656974 +0100
 @@ -25,7 +25,12 @@
  #include <algorithm>
  #include <ctype.h>
@@ -18,10 +18,10 @@ Index: alljoyn-core-1604-16.04/common/src/CryptoSRP.cc
  
  #include <qcc/Debug.h>
  #include <qcc/Crypto.h>
-Index: alljoyn-core-1604-16.04/common/src/SLAPStream.cc
+Index: alljoyn-core-1604/common/src/SLAPStream.cc
 ===================================================================
---- alljoyn-core-1604-16.04.orig/common/src/SLAPStream.cc	2016-08-08 16:39:01.000000000 +0200
-+++ alljoyn-core-1604-16.04/common/src/SLAPStream.cc	2016-08-08 16:39:01.000000000 +0200
+--- alljoyn-core-1604.orig/common/src/SLAPStream.cc	2016-11-29 20:31:23.272654327 +0100
++++ alljoyn-core-1604/common/src/SLAPStream.cc	2016-11-29 20:31:23.208656091 +0100
 @@ -465,7 +465,7 @@
              /*
               * Check that the configuration response is valid.
@@ -31,10 +31,10 @@ Index: alljoyn-core-1604-16.04/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-1604-16.04/common/src/StringUtil.cc
+Index: alljoyn-core-1604/common/src/StringUtil.cc
 ===================================================================
---- alljoyn-core-1604-16.04.orig/common/src/StringUtil.cc	2016-08-08 16:39:01.000000000 +0200
-+++ alljoyn-core-1604-16.04/common/src/StringUtil.cc	2016-08-08 16:39:01.000000000 +0200
+--- alljoyn-core-1604.orig/common/src/StringUtil.cc	2016-11-29 20:31:23.272654327 +0100
++++ alljoyn-core-1604/common/src/StringUtil.cc	2016-11-29 20:31:23.212655981 +0100
 @@ -24,7 +24,12 @@
  
  #include <algorithm>
@@ -49,10 +49,10 @@ Index: alljoyn-core-1604-16.04/common/src/StringUtil.cc
  
  #include <qcc/String.h>
  #include <qcc/StringUtil.h>
-Index: alljoyn-core-1604-16.04/common/crypto/openssl/CryptoAES.cc
+Index: alljoyn-core-1604/common/crypto/openssl/CryptoAES.cc
 ===================================================================
---- alljoyn-core-1604-16.04.orig/common/crypto/openssl/CryptoAES.cc	2016-08-08 16:39:01.000000000 +0200
-+++ alljoyn-core-1604-16.04/common/crypto/openssl/CryptoAES.cc	2016-08-08 16:39:01.000000000 +0200
+--- alljoyn-core-1604.orig/common/crypto/openssl/CryptoAES.cc	2016-11-29 20:31:23.272654327 +0100
++++ alljoyn-core-1604/common/crypto/openssl/CryptoAES.cc	2016-11-29 20:31:23.228655540 +0100
 @@ -24,7 +24,12 @@
  
  #include <algorithm>
@@ -67,10 +67,10 @@ Index: alljoyn-core-1604-16.04/common/crypto/openssl/CryptoAES.cc
  
  #include <qcc/String.h>
  #include <qcc/StringUtil.h>
-Index: alljoyn-core-1604-16.04/alljoyn_core/src/BusAttachment.cc
+Index: alljoyn-core-1604/alljoyn_core/src/BusAttachment.cc
 ===================================================================
---- alljoyn-core-1604-16.04.orig/alljoyn_core/src/BusAttachment.cc	2016-08-08 16:38:36.000000000 +0200
-+++ alljoyn-core-1604-16.04/alljoyn_core/src/BusAttachment.cc	2016-08-08 16:41:45.000000000 +0200
+--- alljoyn-core-1604.orig/alljoyn_core/src/BusAttachment.cc	2016-11-29 20:31:23.272654327 +0100
++++ alljoyn-core-1604/alljoyn_core/src/BusAttachment.cc	2016-11-29 20:31:23.256654768 +0100
 @@ -2853,9 +2853,13 @@
  {
      QStatus status = ER_OK;
@@ -99,3 +99,21 @@ Index: alljoyn-core-1604-16.04/alljoyn_core/src/BusAttachment.cc
  
      if (ER_OK == status) {
          status = busInternal->RemoveApplicationStateListener(applicationStateListener);
+Index: alljoyn-core-1604/common/crypto/builtin/CryptoAES.cc
+===================================================================
+--- alljoyn-core-1604.orig/common/crypto/builtin/CryptoAES.cc	2016-06-27 19:52:24.000000000 +0200
++++ alljoyn-core-1604/common/crypto/builtin/CryptoAES.cc	2016-11-29 20:31:52.099859514 +0100
+@@ -24,7 +24,12 @@
+ 
+ #include <algorithm>
+ #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>
diff --git a/debian/rules b/debian/rules
index a28585c..9176864 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,8 @@ OS=linux
 export VERSION := 16.04
 export SONAME := 1604
 export VARIANT := release
-#XXX deactivate test 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
+#XXX deactivate test for now: 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-1604.git

More information about the Debian-iot-packaging mailing list