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

Thorsten Alteholz alteholz at moszumanska.debian.org
Tue Nov 29 19:51:17 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-1509.

commit f774ed4c4d679939e01af6494d08c2d39de8fbfc
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Tue Nov 29 20:41:32 2016 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 365b5a2..8860ee6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+alljoyn-core-1509 (15.09a-5) unstable; urgency=medium
+
+  * move maintenance to debian-iot team
+  * debian/rules: use builtin crypt (Closes: #844800)
+                  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 18:01:37 +0100
+
 alljoyn-core-1509 (15.09a-4) unstable; urgency=medium
 
   * take care of gcc-6 build errors (Closes: #831091)
diff --git a/debian/control b/debian/control
index a84b08e..77f29e4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: alljoyn-core-1509
 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)
@@ -102,6 +103,7 @@ Description: AllJoyn C development library
 Package: alljoyn-daemon-1509
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+       , lsb-base (>= 3.0-6)
 Conflicts: alljoyn-daemon-1504
 Description: AllJoyn daemon service
  AllJoyn is a collaborative open-source software framework that makes 
diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch
index 92823fc..8e865f2 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-1509-15.09a/common/src/CryptoSRP.cc
+Index: alljoyn-core-1509/common/src/CryptoSRP.cc
 ===================================================================
---- alljoyn-core-1509-15.09a.orig/common/src/CryptoSRP.cc	2016-08-07 15:46:12.000000000 +0200
-+++ alljoyn-core-1509-15.09a/common/src/CryptoSRP.cc	2016-08-07 15:46:12.000000000 +0200
+--- alljoyn-core-1509.orig/common/src/CryptoSRP.cc	2016-11-29 20:25:42.530050441 +0100
++++ alljoyn-core-1509/common/src/CryptoSRP.cc	2016-11-29 20:25:42.526050551 +0100
 @@ -26,7 +26,12 @@
  #include <assert.h>
  #include <ctype.h>
@@ -18,10 +18,10 @@ Index: alljoyn-core-1509-15.09a/common/src/CryptoSRP.cc
  
  #include <qcc/Debug.h>
  #include <qcc/Crypto.h>
-Index: alljoyn-core-1509-15.09a/common/src/SLAPStream.cc
+Index: alljoyn-core-1509/common/src/SLAPStream.cc
 ===================================================================
---- alljoyn-core-1509-15.09a.orig/common/src/SLAPStream.cc	2016-08-07 15:46:12.000000000 +0200
-+++ alljoyn-core-1509-15.09a/common/src/SLAPStream.cc	2016-08-07 15:46:12.000000000 +0200
+--- alljoyn-core-1509.orig/common/src/SLAPStream.cc	2016-11-29 20:25:42.530050441 +0100
++++ alljoyn-core-1509/common/src/SLAPStream.cc	2016-11-29 20:25:42.526050551 +0100
 @@ -465,7 +465,7 @@
              /*
               * Check that the configuration response is valid.
@@ -31,10 +31,10 @@ Index: alljoyn-core-1509-15.09a/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-1509-15.09a/common/src/StringUtil.cc
+Index: alljoyn-core-1509/common/src/StringUtil.cc
 ===================================================================
---- alljoyn-core-1509-15.09a.orig/common/src/StringUtil.cc	2016-08-07 15:46:12.000000000 +0200
-+++ alljoyn-core-1509-15.09a/common/src/StringUtil.cc	2016-08-07 15:46:12.000000000 +0200
+--- alljoyn-core-1509.orig/common/src/StringUtil.cc	2016-11-29 20:25:42.530050441 +0100
++++ alljoyn-core-1509/common/src/StringUtil.cc	2016-11-29 20:25:42.526050551 +0100
 @@ -24,7 +24,12 @@
  
  #include <algorithm>
@@ -49,10 +49,28 @@ Index: alljoyn-core-1509-15.09a/common/src/StringUtil.cc
  
  #include <qcc/String.h>
  #include <qcc/StringUtil.h>
-Index: alljoyn-core-1509-15.09a/common/crypto/openssl/CryptoAES.cc
+Index: alljoyn-core-1509/common/crypto/openssl/CryptoAES.cc
 ===================================================================
---- alljoyn-core-1509-15.09a.orig/common/crypto/openssl/CryptoAES.cc	2016-08-07 15:46:12.000000000 +0200
-+++ alljoyn-core-1509-15.09a/common/crypto/openssl/CryptoAES.cc	2016-08-07 15:46:12.000000000 +0200
+--- alljoyn-core-1509.orig/common/crypto/openssl/CryptoAES.cc	2016-11-29 20:25:42.530050441 +0100
++++ alljoyn-core-1509/common/crypto/openssl/CryptoAES.cc	2016-11-29 20:25:42.526050551 +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-1509/common/crypto/builtin/CryptoAES.cc
+===================================================================
+--- alljoyn-core-1509.orig/common/crypto/builtin/CryptoAES.cc	2016-06-27 19:51:00.000000000 +0200
++++ alljoyn-core-1509/common/crypto/builtin/CryptoAES.cc	2016-11-29 20:31:09.845024552 +0100
 @@ -25,7 +25,12 @@
  #include <algorithm>
  #include <assert.h>
diff --git a/debian/rules b/debian/rules
index 13e8841..71f18d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,8 @@ OS=linux
 export VERSION := 15.09a
 export SONAME := 1509
 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-1509.git

More information about the Debian-iot-packaging mailing list