[Debian-iot-packaging] [alljoyn-core-1504] 01/01: Imported Debian patch 15.04b-3

Thorsten Alteholz alteholz at moszumanska.debian.org
Mon Jun 6 20:27:30 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 048d9cb6112db5b1b029b5e064af2bdc4e3e7425
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Mon May 30 18:28:32 2016 +0200

    Imported Debian patch 15.04b-3
---
 debian/changelog                          |  7 +++++++
 debian/control                            |  4 +++-
 debian/liballjoyn-common-dev-1504.install |  2 ++
 debian/liballjoyn-dev-1504.install        |  1 +
 debian/patches/hardening.patch            | 18 ++++++++++--------
 debian/patches/more-native-cpus.patch     |  2 +-
 debian/patches/remove-build.xml           |  4 ++++
 debian/patches/series                     |  1 +
 debian/patches/time.patch                 | 27 +++++++++++++++++++++++++++
 debian/rules                              | 14 ++++++++++++--
 10 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c99b7b3..1dc56f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alljoyn-core-1504 (15.04b-3) unstable; urgency=medium
+
+  * add some more architectures
+  * debian/control: add VCS URLs
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Mon, 30 May 2016 18:28:32 +0200
+
 alljoyn-core-1504 (15.04b-2) unstable; urgency=medium
 
   * Upload with patch to support more architectures
diff --git a/debian/control b/debian/control
index 8291db4..37c5caf 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,8 @@ Build-Depends: dh-exec (>=0.3)
 #               , ant
 Standards-Version: 3.9.8
 Homepage: https://allseenalliance.org/framework
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-iot/alljoyn-core-1504.git
+Vcs-Git: https://anonscm.debian.org/git/debian-iot/alljoyn-core-1504.git
 
 #Package: alljoyn-doc-1504
 #Architecture: all
@@ -111,7 +113,7 @@ Description: AllJoyn daemon service
 
 Package: liballjoyn-common-dev-1504
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, python
 Section: libdevel
 Description: AllJoyn common development files
  AllJoyn is a collaborative open-source software framework that makes 
diff --git a/debian/liballjoyn-common-dev-1504.install b/debian/liballjoyn-common-dev-1504.install
index a6d29ba..d4c50da 100755
--- a/debian/liballjoyn-common-dev-1504.install
+++ b/debian/liballjoyn-common-dev-1504.install
@@ -1,2 +1,4 @@
 #! /usr/bin/dh-exec
 build/*/*/*/dist/c/inc/q* /usr/include/${DEB_HOST_MULTIARCH}
+common/inc/q* /usr/include/${DEB_HOST_MULTIARCH}
+build_core /usr/share/alljoyn
diff --git a/debian/liballjoyn-dev-1504.install b/debian/liballjoyn-dev-1504.install
index d8e0344..7ff7051 100755
--- a/debian/liballjoyn-dev-1504.install
+++ b/debian/liballjoyn-dev-1504.install
@@ -5,3 +5,4 @@ build/*/*/*/obj/alljoyn_core/liballjoyn.a /usr/lib/${DEB_HOST_MULTIARCH}
 #build/*/*/*/dist/cpp/lib/liballjoyn_about.so /usr/lib/${DEB_HOST_MULTIARCH}
 build/*/*/*/obj/about/cpp/src/liballjoyn_about.so /usr/lib/${DEB_HOST_MULTIARCH}
 build/*/*/*/dist/cpp/lib/liballjoyn_about.a /usr/lib/${DEB_HOST_MULTIARCH}
+build/*/*/*/dist/cpp/lib/libajrouter.a /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index cb73541..58c474d 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -1,21 +1,23 @@
 Description: add hardening flags to Alljoyn scons stuff
-Index: alljoyn-core/build_core/conf/linux/SConscript
+Index: alljoyn-core-1504-15.04b/build_core/conf/linux/SConscript
 ===================================================================
---- alljoyn-core.orig/build_core/conf/linux/SConscript	2016-05-15 12:01:14.000000000 +0200
-+++ alljoyn-core/build_core/conf/linux/SConscript	2016-05-15 12:01:14.000000000 +0200
-@@ -36,6 +36,7 @@
+--- alljoyn-core-1504-15.04b.orig/build_core/conf/linux/SConscript	2016-05-31 11:17:45.000000000 +0200
++++ alljoyn-core-1504-15.04b/build_core/conf/linux/SConscript	2016-05-31 11:18:23.000000000 +0200
+@@ -36,6 +36,8 @@
                       '-fno-unwind-tables',
                       '-ffunction-sections',
                       '-fdata-sections',
 +                     '-D_FORTIFY_SOURCE=2',
++                     '-fPIC',
                       '-Wno-long-long'])
  
  env.Append(CXXFLAGS = ['-Wall',
-@@ -48,12 +49,16 @@
+@@ -48,12 +50,17 @@
                         '-fno-unwind-tables',
                         '-ffunction-sections',
                         '-fdata-sections',
 +                       '-D_FORTIFY_SOURCE=2',
++                       '-fPIC',
                         '-Wno-long-long',
                         '-Wno-deprecated',
                         '-Wno-unknown-pragmas'])
@@ -28,10 +30,10 @@ Index: alljoyn-core/build_core/conf/linux/SConscript
  # Debug/Release Variants
  if env['VARIANT'] == 'debug':
     env.Append(CFLAGS = '-g')
-Index: alljoyn-core/alljoyn_core/router/posix/SConscript
+Index: alljoyn-core-1504-15.04b/alljoyn_core/router/posix/SConscript
 ===================================================================
---- alljoyn-core.orig/alljoyn_core/router/posix/SConscript	2016-05-15 12:01:14.000000000 +0200
-+++ alljoyn-core/alljoyn_core/router/posix/SConscript	2016-05-15 12:01:40.000000000 +0200
+--- alljoyn-core-1504-15.04b.orig/alljoyn_core/router/posix/SConscript	2016-05-31 11:17:45.000000000 +0200
++++ alljoyn-core-1504-15.04b/alljoyn_core/router/posix/SConscript	2016-05-31 11:17:45.000000000 +0200
 @@ -15,6 +15,10 @@
  
  Import('router_env', 'router_objs', 'srobj')
diff --git a/debian/patches/more-native-cpus.patch b/debian/patches/more-native-cpus.patch
index 98dfb39..2af3dc3 100644
--- a/debian/patches/more-native-cpus.patch
+++ b/debian/patches/more-native-cpus.patch
@@ -9,7 +9,7 @@ Index: alljoyn-core-1504-15.04b/build_core/SConscript
      else:
          default_target_cpu = 'x86'
 -    allowed_target_cpus = ('x86', 'x86_64', 'arm', 'openwrt')
-+    allowed_target_cpus = ('x86', 'x86_64', 'arm', 'openwrt', 's390x', 'arm64', 'armhf', 'i386', 'mips', 'mipsel', 'powerpc', 'powerpc64le', 'alpha', 'hppa', 'm68k', 'mips64el', 'powerpcspe', 'ppc64', 'sparc64')
++    allowed_target_cpus = ('x86', 'x86_64', 'arm', 'openwrt', 's390x', 'aarch64', 'arm64', 'armhf', 'i386', 'mips', 'mipsel', 'powerpc', 'powerpc64le', 'alpha', 'hppa', 'm68k', 'mips64el', 'powerpcspe', 'powerpc64', 'sparc64')
  
      default_msvc_version = None
  
diff --git a/debian/patches/remove-build.xml b/debian/patches/remove-build.xml
index bca5469..3742ba1 100644
--- a/debian/patches/remove-build.xml
+++ b/debian/patches/remove-build.xml
@@ -1,3 +1,7 @@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: On some buildds (mips*) there seems to be a problem with 
+  Java. So in order to completely deactivate ant (even from dh_clean),
+  this file needs to disappear.
 Index: alljoyn-core-1504-15.04b/build.xml
 ===================================================================
 --- alljoyn-core-1504-15.04b.orig/build.xml	2016-05-27 19:34:27.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 593d503..8059482 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ remove-bsd-source.patch
 hardening.patch
 more-native-cpus.patch
 remove-build.xml
+time.patch
diff --git a/debian/patches/time.patch b/debian/patches/time.patch
new file mode 100644
index 0000000..234db3a
--- /dev/null
+++ b/debian/patches/time.patch
@@ -0,0 +1,27 @@
+Description: patch cherry picked from upstream
+   ASACORE-2884 - Fixed an issue on systems where time_t is implemented 
+   as a 32-bit integer. The problem was that the 32-bit time_t was being 
+   cast as a 64-bit integer and padded with 0's. When the pointer to the 
+   64-bit integer was cast as a pointer to a 32-bit time_t it was 
+   pointing to the 32 bits of padded 0's
+   -> https://git.allseenalliance.org/gerrit/#/c/7559/
+Index: alljoyn-core-1504-15.04b/common/os/posix/time.cc
+===================================================================
+--- alljoyn-core-1504-15.04b.orig/common/os/posix/time.cc	2016-06-01 14:00:47.000000000 +0200
++++ alljoyn-core-1504-15.04b/common/os/posix/time.cc	2016-06-01 14:05:26.000000000 +0200
+@@ -140,11 +140,13 @@
+ }
+ 
+ struct tm* qcc::ConvertTimeToStructure(const int64_t* timer) {
+-    return gmtime((time_t*)timer);
++    time_t t = static_cast<time_t>(*timer);
++    return gmtime(&t);
+ }
+ 
+ struct tm* qcc::ConvertToLocalTime(const int64_t* timer) {
+-    return localtime((time_t*)timer);
++    time_t t = static_cast<time_t>(*timer);
++    return localtime(&t);
+ }
+ 
+ size_t qcc::FormatTime(char* strDest, size_t maxSize, const char* format, const struct tm* timeptr)
diff --git a/debian/rules b/debian/rules
index 6f3568b..2529236 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,9 +59,7 @@ override_dh_auto_build:
 
 	touch ./to-be.removed-now.md5
 	find ./* |grep '\.md5'|xargs rm
-
 	dh_auto_build
-	ls -l $(BUILD_DIR)/..
 
 override_dh_auto_clean:
 	rm -f .sconsign.dblite
@@ -86,6 +84,18 @@ override_dh_installchangelogs:
 	dh_installchangelogs alljoyn_core/docs/ReleaseNotes.txt
 	dh_installchangelogs 
 
+override_dh_install:
+	dh_install
+	find
+	# we put build_core into the common package but
+	# don't need any compiled or other stuff, so byebye
+	touch ./debian/liballjoyn-common-dev-1504/to-be-removed-now.pyc
+	find ./debian/liballjoyn-common-dev-1504/* -print|grep "\.pyc"|xargs rm
+	rm -f ./debian/liballjoyn-common-dev-1504/usr/share/alljoyn/build_core/tools/bin/.gitignore
+	rm -f ./debian/liballjoyn-common-dev-1504/usr/share/alljoyn/build_core/tools/scons/.gitignore
+	rm -f ./debian/liballjoyn-common-dev-1504/usr/share/alljoyn/build_core/tools/bin/whitespace.py
+
+
 blubber:
 	rm -f alljoyn_java/bin/jar/alljoyn.jar
 	rm -f alljoyn_java/bin/libs/liballjoyn_java.so

-- 
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