[Debian-iot-packaging] [alljoyn-core-1504] 02/02: Imported Debian patch 15.04b-1
Thorsten Alteholz
alteholz at moszumanska.debian.org
Mon May 30 18:00:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to annotated tag debian/15.04b-1
in repository alljoyn-core-1504.
commit 2dde66ccaa05ab4022c559ebf3f2cfe96faff93d
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Mon May 23 19:28:32 2016 +0200
Imported Debian patch 15.04b-1
---
debian/README.Debian | 16 ++++
debian/alljoyn-daemon-1504.init | 77 ++++++++++++++++
debian/alljoyn-daemon-1504.install | 2 +
debian/alljoyn-daemon-1504.manpages | 1 +
debian/alljoyn-daemon-1504.service | 9 ++
debian/alljoyn-daemon.config/alljoyn-daemon.1 | 71 +++++++++++++++
debian/alljoyn-daemon.config/config.xml | 27 ++++++
debian/alljoyn-doc.docs | 3 +
debian/alljoyn-doc.install | 1 +
debian/changelog | 5 +
debian/clean | 1 +
debian/compat | 1 +
debian/control | 126 ++++++++++++++++++++++++++
debian/copyright | 92 +++++++++++++++++++
debian/liballjoyn-c-dev-1504.install | 5 +
debian/liballjoyn-c1504.install | 2 +
debian/liballjoyn-c1504.links | 3 +
debian/liballjoyn-common-dev-1504.install | 2 +
debian/liballjoyn-dev-1504.install | 7 ++
debian/liballjoyn1504.install | 3 +
debian/liballjoyn1504.links | 3 +
debian/patches/add-clean-target.patch | 16 ++++
debian/patches/hardening.patch | 45 +++++++++
debian/patches/remove-bsd-source.patch | 63 +++++++++++++
debian/patches/series | 4 +
debian/patches/soname.patch | 38 ++++++++
debian/rules | 107 ++++++++++++++++++++++
debian/source/format | 1 +
debian/watch | 5 +
29 files changed, 736 insertions(+)
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..5868c97
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,16 @@
+Alljoyn for Debian
+
+This is the core library of Alljoyn.
+
+There are several parts of the Alljoyn framework which are developed by
+different Workgroup. As all workgroups develop with varying speeds,
+several versions of the core library are needed to be able to use all
+parts of the framework.
+
+At the moment following versions of the core are needed:
+ 15.04b -> alljoyn-core-1504
+ 15.09a -> alljoyn-core-1509
+ 16.04 -> alljoyn-core-1604
+
+ -- Thorsten Alteholz <debian at alteholz.de> Mon, 07 Mar 2016 16:28:32 +0100
+
diff --git a/debian/alljoyn-daemon-1504.init b/debian/alljoyn-daemon-1504.init
new file mode 100755
index 0000000..55d5265
--- /dev/null
+++ b/debian/alljoyn-daemon-1504.init
@@ -0,0 +1,77 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: alljoyn-daemon-1504
+# Required-Start: $local_fs $network $named $time $syslog $remote_fs
+# Required-Stop: $local_fs $network $named $time $syslog $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Description: Provides the standalone AllJoyn bus.
+# Short-Description: Provides the standalone AllJoyn bus.
+### END INIT INFO
+
+RUNAS=root
+NAME=alljoyn-daemon
+DAEMON=/usr/bin/$NAME
+PIDFILE=/var/run/$NAME.pid
+LOGFILE=/var/log/$NAME.log
+
+. /lib/lsb/init-functions
+
+start() {
+ if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then
+ echo 'Service already running' >&2
+ return 1
+ fi
+ echo 'Starting service…' >&2
+ start-stop-daemon --start --exec $DAEMON -- "--config-file=/etc/alljoyn-daemon/config.xml &> \"$LOGFILE\" "
+
+# local CMD="$SCRIPT --config-file=/etc/alljoyn-daemon/config.xml &> \"$LOGFILE\" & echo \$!"
+# su -c "$CMD" $RUNAS > "$PIDFILE"
+
+ echo 'Service started' >&2
+}
+
+stop() {
+ if [ ! -f "$PIDFILE" ] || ! kill -0 $(cat "$PIDFILE"); then
+ echo 'Service not running' >&2
+ return 1
+ fi
+ echo 'Stopping service…' >&2
+ start-stop-daemon --stop --pidfile $PIDFILE --exec $DAEMON --oknodo --quiet
+ echo 'Service stopped' >&2
+
+# kill -15 $(cat "$PIDFILE") && rm -f "$PIDFILE"
+}
+
+status() {
+ status_of_proc $DAEMON $NAME
+# printf "%-50s" "Checking $NAME..."
+# if [ -f $PIDFILE ]; then
+# PID=$(cat $PIDFILE)
+# if [ -z "$(ps axf | grep ${PID} | grep -v grep)" ]; then
+# printf "%s\n" "The process appears to be dead but pidfile still exists"
+# else
+# echo "Running, the PID is $PID"
+# fi
+# else
+# printf "%s\n" "Service not running"
+# fi
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ status
+ ;;
+ restart|force-reload)
+ stop
+ start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|status|restart|force-reload}"
+esac
diff --git a/debian/alljoyn-daemon-1504.install b/debian/alljoyn-daemon-1504.install
new file mode 100644
index 0000000..1552986
--- /dev/null
+++ b/debian/alljoyn-daemon-1504.install
@@ -0,0 +1,2 @@
+build/*/*/*/dist/cpp/bin/alljoyn-daemon /usr/bin
+debian/alljoyn-daemon.config/config.xml /etc/alljoyn-daemon
diff --git a/debian/alljoyn-daemon-1504.manpages b/debian/alljoyn-daemon-1504.manpages
new file mode 100644
index 0000000..09864c8
--- /dev/null
+++ b/debian/alljoyn-daemon-1504.manpages
@@ -0,0 +1 @@
+debian/alljoyn-daemon.config/alljoyn-daemon.1
diff --git a/debian/alljoyn-daemon-1504.service b/debian/alljoyn-daemon-1504.service
new file mode 100644
index 0000000..0d325df
--- /dev/null
+++ b/debian/alljoyn-daemon-1504.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Alljoyn Daemon
+Documentation=man:alljoyn-daemon(8)
+
+[Service]
+ExecStart=/usr/bin/alljoyn-daemon --config-file=/etc/alljoyn-daemon/config.xml
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/alljoyn-daemon.config/alljoyn-daemon.1 b/debian/alljoyn-daemon.config/alljoyn-daemon.1
new file mode 100644
index 0000000..601bd8e
--- /dev/null
+++ b/debian/alljoyn-daemon.config/alljoyn-daemon.1
@@ -0,0 +1,71 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
+.TH ALLJOYN-DAEMON "1" "May 2016" "AllJoyn Message Bus Daemon version: v15.04.00b" "User Commands"
+.SH NAME
+alljoyn-daemon \- The AllJoyn Message Bus Daemon version: v15.04.00b
+.SH DESCRIPTION
+alljoyn\-daemon [\-\-session | \fB\-\-system\fR | \fB\-\-internal\fR | \fB\-\-config\-file\fR=\fI\,FILE]\/\fR
+.IP
+[\-\-print\-address[=DESCRIPTOR]] [\-\-print\-pid[=DESCRIPTOR]]
+[\-\-fork | \fB\-\-nofork]\fR [\-\-no\-slap] [\-\-no\-tcp] [\-\-no\-udp]
+[\-\-no\-switch\-user] [\-\-verbosity=LEVEL] [\-\-version]
+.HP
+\fB\-\-session\fR
+.IP
+Use the standard configuration for the per\-login\-session message bus.
+.HP
+\fB\-\-system\fR
+.IP
+Use the standard configuration for the system message bus.
+.HP
+\fB\-\-internal\fR
+.IP
+Use a basic internally defined message bus for AllJoyn.
+.HP
+\fB\-\-config\-file\fR=\fI\,FILE\/\fR
+.IP
+Use the specified configuration file.
+.HP
+\fB\-\-print\-address\fR[=\fI\,DESCRIPTOR\/\fR]
+.IP
+Print the socket address to stdout or the specified descriptor
+.HP
+\fB\-\-print\-pid\fR[=\fI\,DESCRIPTOR\/\fR]
+.IP
+Print the process ID to stdout or the specified descriptor
+.HP
+\fB\-\-fork\fR
+.IP
+Force the daemon to fork and run in the background.
+.HP
+\fB\-\-nofork\fR
+.IP
+Force the daemon to only run in the foreground (override config file
+setting).
+.HP
+\fB\-\-no\-slap\fR
+.IP
+Disable the SLAP transport (override config file setting).
+.HP
+\fB\-\-no\-tcp\fR
+.IP
+Disable the TCP transport (override config file setting).
+.HP
+\fB\-\-no\-udp\fR
+.IP
+Disable the UDP transport (override config file setting).
+.HP
+\fB\-\-no\-switch\-user\fR
+.IP
+Don't switch from root to the user specified in the config file.
+.HP
+\fB\-\-verbosity\fR=\fI\,LEVEL\/\fR
+.IP
+Set the logging level to LEVEL.
+.HP
+\fB\-\-version\fR
+.IP
+Print the version and copyright string, and exit.
+.SH COPYRIGHT
+Copyright AllSeen Alliance.
+.PP
+Build: AllJoyn Library v15.04.00b (Built Thu May 19 13:03:25 UTC 2016 by alljoyn)
diff --git a/debian/alljoyn-daemon.config/config.xml b/debian/alljoyn-daemon.config/config.xml
new file mode 100644
index 0000000..d36bd2d
--- /dev/null
+++ b/debian/alljoyn-daemon.config/config.xml
@@ -0,0 +1,27 @@
+<busconfig>
+
+ <!-- Our well-known bus type, do not change this -->
+ <type>alljoyn</type>
+
+ <property name="router_advertisement_prefix">org.alljoyn.BusNode</property>
+
+ <!-- Only listen on a local socket. (abstract=/path/to/socket
+ means use abstract namespace, don't really create filesystem
+ file; only Linux supports this. Use path=/whatever on other
+ systems.) -->
+ <listen>unix:abstract=alljoyn</listen>
+ <listen>tcp:r4addr=0.0.0.0,r4port=0</listen>
+
+ <limit name="auth_timeout">5000</limit>
+ <limit name="max_incomplete_connections">16</limit>
+ <limit name="max_completed_connections">100</limit>
+ <limit name="max_untrusted_clients">100</limit>
+ <flag name="restrict_untrusted_clients">false</flag>
+
+ <ip_name_service>
+ <property interfaces="*"/>
+ <property disable_directed_broadcast="false"/>
+ <property enable_ipv4="true"/>
+ <property enable_ipv6="true"/>
+ </ip_name_service>
+</busconfig>
diff --git a/debian/alljoyn-doc.docs b/debian/alljoyn-doc.docs
new file mode 100644
index 0000000..7dc2e7a
--- /dev/null
+++ b/debian/alljoyn-doc.docs
@@ -0,0 +1,3 @@
+manifest.txt
+build/*/*/*/dist/cpp/docs
+build/*/*/*/dist/c/docs
diff --git a/debian/alljoyn-doc.install b/debian/alljoyn-doc.install
new file mode 100644
index 0000000..d4f4542
--- /dev/null
+++ b/debian/alljoyn-doc.install
@@ -0,0 +1 @@
+#DOCS#
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..fc559a7
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+alljoyn-core-1504 (15.04b-1) unstable; urgency=medium
+
+ * Initial release (Closes: #825039)
+
+ -- Thorsten Alteholz <debian at alteholz.de> Mon, 23 May 2016 19:28:32 +0200
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..4a97dfa
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+# You must remove unused comment lines for the released package.
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..c1c0804
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,126 @@
+Source: alljoyn-core-1504
+Section: net
+Priority: extra
+Maintainer: Thorsten Alteholz <debian at alteholz.de>
+Build-Depends: dh-exec (>=0.3)
+ , dh-systemd (>= 1.5)
+ , debhelper (>=9)
+ , libssl-dev
+ , libgtest-dev
+ , javahelper
+ , junit
+ , libcsv-java
+ , libmatthew-debug-java
+ , libitext-java
+ , ant
+ , scons
+ , libcap-dev
+Standards-Version: 3.9.8
+Homepage: https://allseenalliance.org/framework
+
+#Package: alljoyn-doc-1504
+#Architecture: all
+#Depends: ${misc:Depends}
+#Section: doc
+#Description: documentation for alljoyn
+# AllJoyn is a collaborative open-source software framework that makes
+# it easy for developers to write applications that can discover nearby
+# devices, and communicate with each other directly regardless of
+# brands, categories, transports, and OSes without the need of the cloud.
+# .
+# The AllJoyn framework is extremely flexible with many features to help
+# make the vision of the Internet of Things come to life.
+# .
+# This package contains the documentation.
+
+Package: liballjoyn1504
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: AllJoyn C++ run-time library
+ AllJoyn is a collaborative open-source software framework that makes
+ it easy for developers to write applications that can discover nearby
+ devices, and communicate with each other directly regardless of
+ brands, categories, transports, and OSes without the need of the cloud.
+ .
+ The AllJoyn framework is extremely flexible with many features to help
+ make the vision of the Internet of Things come to life.
+ .
+ This package contains the C++ run-time library.
+
+Package: liballjoyn-dev-1504
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ liballjoyn1504 (= ${binary:Version}),
+ liballjoyn-common-dev-1504 (= ${binary:Version})
+Section: libdevel
+Description: AllJoyn C++ development library
+ AllJoyn is a collaborative open-source software framework that makes
+ it easy for developers to write applications that can discover nearby
+ devices, and communicate with each other directly regardless of
+ brands, categories, transports, and OSes without the need of the cloud.
+ .
+ The AllJoyn framework is extremely flexible with many features to help
+ make the vision of the Internet of Things come to life.
+ .
+ This package contains the C++ development files.
+
+Package: liballjoyn-c1504
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: AllJoyn C run-time library
+ AllJoyn is a collaborative open-source software framework that makes
+ it easy for developers to write applications that can discover nearby
+ devices, and communicate with each other directly regardless of
+ brands, categories, transports, and OSes without the need of the cloud.
+ .
+ The AllJoyn framework is extremely flexible with many features to help
+ make the vision of the Internet of Things come to life.
+ .
+ This package contains the C run-time library
+
+Package: liballjoyn-c-dev-1504
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ liballjoyn-c1504 (= ${binary:Version}),
+ liballjoyn-common-dev-1504 (= ${binary:Version})
+Section: libdevel
+Description: AllJoyn C development library
+ AllJoyn is a collaborative open-source software framework that makes
+ it easy for developers to write applications that can discover nearby
+ devices, and communicate with each other directly regardless of
+ brands, categories, transports, and OSes without the need of the cloud.
+ .
+ The AllJoyn framework is extremely flexible with many features to help
+ make the vision of the Internet of Things come to life.
+ .
+ This package contains the C development files.
+
+Package: alljoyn-daemon-1504
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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
+ devices, and communicate with each other directly regardless of
+ brands, categories, transports, and OSes without the need of the cloud.
+ .
+ The AllJoyn framework is extremely flexible with many features to help
+ make the vision of the Internet of Things come to life.
+ .
+ This package contains daemon services.
+
+Package: liballjoyn-common-dev-1504
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: libdevel
+Description: AllJoyn common development files
+ AllJoyn is a collaborative open-source software framework that makes
+ it easy for developers to write applications that can discover nearby
+ devices, and communicate with each other directly regardless of
+ brands, categories, transports, and OSes without the need of the cloud.
+ .
+ The AllJoyn framework is extremely flexible with many features to help
+ make the vision of the Internet of Things come to life.
+ .
+ This package contains commmon development files.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..1de3e89
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,92 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: alljoyn
+Source: https://allseenalliance.org/framework
+
+Files: *
+Copyright: AllSeen Alliance
+ 2000-2001 Aaron D. Gifford
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Files: alljoyn_core/router/ConvertUTF.cc
+ alljoyn_core/router/ConvertUTF.h
+Copyright: 2001-2004 Unicode, Inc.
+License: Unicode
+ Disclaimer
+ .
+ This source code is provided as is by Unicode, Inc. No claims are
+ made as to fitness for any particular purpose. No warranties of any
+ kind are expressed or implied. The recipient agrees to determine
+ applicability of information provided. If this file has been
+ purchased on magnetic or optical media from Unicode, Inc., the
+ sole remedy for any claim will be exchange of defective media
+ within 90 days of receipt.
+ .
+ Limitations on Rights to Redistribute This Code
+ .
+ Unicode, Inc. hereby grants the right to freely use the information
+ supplied in this file in the creation of products supporting the
+ Unicode Standard, and to make copies of this file in any form
+ for internal or external distribution as long as this notice
+ remains attached.
+
+Files: external/sha1/hmac_sha1.c
+ external/sha1/hmac_sha1.h
+ external/sha2/sha2.c
+ external/sha2/sha2.h
+Copyright: 1998-2000 Aaron D. Gifford
+License: BSD3
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+Files: external/sha1/sha.h
+ external/sha1/sha1.c
+Copyright: Steve Reid <steve at edmweb.com>
+ Aaron D. Gifford <agifford at infowest.com>
+License: public-domain
+ * - THIS IS 100% IN THE PUBLIC DOMAIN *
+ * The original unmodified version is available at:
+ * ftp://ftp.funet.fi/pub/crypt/hash/sha/sha1.c
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
diff --git a/debian/liballjoyn-c-dev-1504.install b/debian/liballjoyn-c-dev-1504.install
new file mode 100755
index 0000000..5281039
--- /dev/null
+++ b/debian/liballjoyn-c-dev-1504.install
@@ -0,0 +1,5 @@
+#! /usr/bin/dh-exec
+build/*/*/*/dist/c/inc/a* /usr/include/${DEB_HOST_MULTIARCH}
+build/*/*/*/obj/alljoyn_c/liballjoyn_c.so /usr/lib/${DEB_HOST_MULTIARCH}
+build/*/*/*/obj/alljoyn_c/liballjoyn_c.a /usr/lib/${DEB_HOST_MULTIARCH}
+build/*/*/*/obj/common/libcommon_static.a /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/liballjoyn-c1504.install b/debian/liballjoyn-c1504.install
new file mode 100755
index 0000000..3cded9c
--- /dev/null
+++ b/debian/liballjoyn-c1504.install
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+build/*/*/*/obj/alljoyn_c/liballjoyn_c.so.* /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/liballjoyn-c1504.links b/debian/liballjoyn-c1504.links
new file mode 100755
index 0000000..078b2c1
--- /dev/null
+++ b/debian/liballjoyn-c1504.links
@@ -0,0 +1,3 @@
+#! /usr/bin/dh-exec
+# this gives a lintian E:, so better avoid: /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn.so.${VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn.so.${SONAME}
+#/usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn_c.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn_c.so
diff --git a/debian/liballjoyn-common-dev-1504.install b/debian/liballjoyn-common-dev-1504.install
new file mode 100755
index 0000000..a6d29ba
--- /dev/null
+++ b/debian/liballjoyn-common-dev-1504.install
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+build/*/*/*/dist/c/inc/q* /usr/include/${DEB_HOST_MULTIARCH}
diff --git a/debian/liballjoyn-dev-1504.install b/debian/liballjoyn-dev-1504.install
new file mode 100755
index 0000000..d8e0344
--- /dev/null
+++ b/debian/liballjoyn-dev-1504.install
@@ -0,0 +1,7 @@
+#! /usr/bin/dh-exec
+build/*/*/*/dist/cpp/inc/a* /usr/include/${DEB_HOST_MULTIARCH}
+build/*/*/*/obj/alljoyn_core/liballjoyn.so /usr/lib/${DEB_HOST_MULTIARCH}
+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}
diff --git a/debian/liballjoyn1504.install b/debian/liballjoyn1504.install
new file mode 100755
index 0000000..4aaf2b7
--- /dev/null
+++ b/debian/liballjoyn1504.install
@@ -0,0 +1,3 @@
+#! /usr/bin/dh-exec
+build/*/*/*/obj/alljoyn_core/liballjoyn.so.* /usr/lib/${DEB_HOST_MULTIARCH}
+build/*/*/*/dist/cpp/lib/liballjoyn_about.so.* /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/liballjoyn1504.links b/debian/liballjoyn1504.links
new file mode 100755
index 0000000..4e511c2
--- /dev/null
+++ b/debian/liballjoyn1504.links
@@ -0,0 +1,3 @@
+#! /usr/bin/dh-exec
+# this gives a lintian E:, so better avoid: /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn++.so.${VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn++.so.${SONAME}
+#/usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn++.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn++.so
diff --git a/debian/patches/add-clean-target.patch b/debian/patches/add-clean-target.patch
new file mode 100644
index 0000000..39fd51e
--- /dev/null
+++ b/debian/patches/add-clean-target.patch
@@ -0,0 +1,16 @@
+Description: add clean-target to build.xml
+Author: Thorsten Alteholz <debian at alteholz.de>
+Index: alljoyn-core/build.xml
+===================================================================
+--- alljoyn-core.orig/build.xml 2015-08-01 01:31:57.000000000 +0200
++++ alljoyn-core/build.xml 2016-04-28 14:28:39.000000000 +0200
+@@ -78,4 +78,9 @@
+
+ <fail message="Tests failed. Check log and/or reports." if="test.failed" />
+ </target>
++
++ <target name="clean"
++ description="clean up">
++ <!-- at the moment do nothing -->
++ </target>
+ </project>
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..cb73541
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,45 @@
+Description: add hardening flags to Alljoyn scons stuff
+Index: alljoyn-core/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 @@
+ '-fno-unwind-tables',
+ '-ffunction-sections',
+ '-fdata-sections',
++ '-D_FORTIFY_SOURCE=2',
+ '-Wno-long-long'])
+
+ env.Append(CXXFLAGS = ['-Wall',
+@@ -48,12 +49,16 @@
+ '-fno-unwind-tables',
+ '-ffunction-sections',
+ '-fdata-sections',
++ '-D_FORTIFY_SOURCE=2',
+ '-Wno-long-long',
+ '-Wno-deprecated',
+ '-Wno-unknown-pragmas'])
+
+ env.Append(JAVACFLAGS = ['-Xlint', '-Xlint:-serial'])
+
++env.Append(LINKFLAGS = ['-z', 'relro', '-z', 'now'])
++
++
+ # Debug/Release Variants
+ if env['VARIANT'] == 'debug':
+ env.Append(CFLAGS = '-g')
+Index: alljoyn-core/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
+@@ -15,6 +15,10 @@
+
+ Import('router_env', 'router_objs', 'srobj')
+
++router_env.Append(LINKFLAGS = ['-fPIE', '-pie'])
++router_env.Append(CFLAGS = ['-fPIE'])
++router_env.Append(CPPFLAGS = ['-fPIE'])
++
+ # Build the posix daemon and service launcher helper.
+ if router_env['OS'] != 'darwin':
+ daemon_env = router_env.Clone()
diff --git a/debian/patches/remove-bsd-source.patch b/debian/patches/remove-bsd-source.patch
new file mode 100644
index 0000000..8521c12
--- /dev/null
+++ b/debian/patches/remove-bsd-source.patch
@@ -0,0 +1,63 @@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: replace the deprecated _BSD_SOURCE symbol by _DEFAULT_SOURCE
+ Patch has been sent upstream and was merged to master branch
+Index: alljoyn-core/alljoyn_c/samples/basic/basic_c_client.c
+===================================================================
+--- alljoyn-core.orig/alljoyn_c/samples/basic/basic_c_client.c 2016-05-14 11:29:48.000000000 +0200
++++ alljoyn-core/alljoyn_c/samples/basic/basic_c_client.c 2016-05-14 11:30:14.000000000 +0200
+@@ -22,6 +22,7 @@
+ ******************************************************************************/
+ #ifndef _WIN32
+ #define _BSD_SOURCE /* usleep */
++#define _DEFAULT_SOURCE /* usleep */
+ #endif
+ #include <alljoyn_c/AjAPI.h>
+
+Index: alljoyn-core/alljoyn_c/samples/basic/basic_c_service.c
+===================================================================
+--- alljoyn-core.orig/alljoyn_c/samples/basic/basic_c_service.c 2016-05-14 11:29:48.000000000 +0200
++++ alljoyn-core/alljoyn_c/samples/basic/basic_c_service.c 2016-05-14 11:30:19.000000000 +0200
+@@ -25,6 +25,7 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ ******************************************************************************/
+ #ifndef _WIN32
++#define _DEFAULT_SOURCE /* usleep */
+ #define _BSD_SOURCE /* usleep */
+ #endif
+ #ifdef _WIN32
+Index: alljoyn-core/alljoyn_c/samples/secure/DeskTopSharedKSClientC.c
+===================================================================
+--- alljoyn-core.orig/alljoyn_c/samples/secure/DeskTopSharedKSClientC.c 2016-05-14 11:29:48.000000000 +0200
++++ alljoyn-core/alljoyn_c/samples/secure/DeskTopSharedKSClientC.c 2016-05-14 11:30:22.000000000 +0200
+@@ -22,6 +22,7 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ ******************************************************************************/
+ #ifndef _WIN32
++#define _DEFAULT_SOURCE /* usleep */
+ #define _BSD_SOURCE /* usleep */
+ #endif
+ #include <alljoyn_c/AjAPI.h>
+Index: alljoyn-core/alljoyn_c/test/bbcclient.c
+===================================================================
+--- alljoyn-core.orig/alljoyn_c/test/bbcclient.c 2016-05-14 11:29:48.000000000 +0200
++++ alljoyn-core/alljoyn_c/test/bbcclient.c 2016-05-14 11:30:27.000000000 +0200
+@@ -14,6 +14,7 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ ******************************************************************************/
+ #ifndef _WIN32
++#define _DEFAULT_SOURCE /* usleep */
+ #define _BSD_SOURCE /* usleep */
+ #endif
+ #include <alljoyn_c/AjAPI.h>
+Index: alljoyn-core/alljoyn_c/test/bbcservice.c
+===================================================================
+--- alljoyn-core.orig/alljoyn_c/test/bbcservice.c 2016-05-14 11:29:48.000000000 +0200
++++ alljoyn-core/alljoyn_c/test/bbcservice.c 2016-05-14 11:30:30.000000000 +0200
+@@ -14,6 +14,7 @@
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ ******************************************************************************/
+ #ifndef _WIN32
++#define _DEFAULT_SOURCE /* usleep */
+ #define _BSD_SOURCE /* usleep */
+ #endif
+ #include <alljoyn_c/AjAPI.h>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e8f670d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+soname.patch
+add-clean-target.patch
+remove-bsd-source.patch
+hardening.patch
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
new file mode 100644
index 0000000..917cae1
--- /dev/null
+++ b/debian/patches/soname.patch
@@ -0,0 +1,38 @@
+Description: add SONAME to libraries
+Author: Thorsten Alteholz <debian at alteholz.de>
+Index: alljoyn-core/alljoyn_c/src/SConscript
+===================================================================
+--- alljoyn-core.orig/alljoyn_c/src/SConscript 2015-08-01 01:31:57.000000000 +0200
++++ alljoyn-core/alljoyn_c/src/SConscript 2016-04-29 13:41:35.000000000 +0200
+@@ -38,6 +38,6 @@
+ liballjoyn_c_static = env.StaticLibrary('alljoyn_c_static', objs)
+ else:
+ liballjoyn_c_static = env.StaticLibrary('alljoyn_c', objs)
+-liballjoyn_c_shared = env.SharedLibrary('alljoyn_c', objs_shared)
++liballjoyn_c_shared = env.SharedLibrary('alljoyn_c', objs_shared,SHLIBVERSION='1504')
+
+ Return('liballjoyn_c_static', 'liballjoyn_c_shared', 'objs_shared')
+Index: alljoyn-core/alljoyn_core/src/SConscript
+===================================================================
+--- alljoyn-core.orig/alljoyn_core/src/SConscript 2015-08-01 01:31:57.000000000 +0200
++++ alljoyn-core/alljoyn_core/src/SConscript 2016-04-29 13:42:43.000000000 +0200
+@@ -53,6 +53,6 @@
+ # AllJoyn Static Library
+ libs = libenv.StaticLibrary('alljoyn', static_objs)
+ if libenv['LIBTYPE'] != 'static':
+- libs.append(libenv.SharedLibrary('alljoyn', shared_objs))
++ libs.append(libenv.SharedLibrary('alljoyn', shared_objs, SHLIBVERSION='1504'))
+
+ Return ('libs', 'static_objs', 'shared_objs')
+Index: alljoyn-core/services/about/cpp/src/SConscript
+===================================================================
+--- alljoyn-core.orig/services/about/cpp/src/SConscript 2015-08-01 01:31:57.000000000 +0200
++++ alljoyn-core/services/about/cpp/src/SConscript 2016-04-29 13:41:58.000000000 +0200
+@@ -38,6 +38,6 @@
+ # Shared library
+ if about_env.get('LIBTYPE', 'static') != 'static':
+ shobjs = about_env.SharedObject(srcs)
+- libs.append(about_env.SharedLibrary('alljoyn_about', shobjs))
++ libs.append(about_env.SharedLibrary('alljoyn_about', shobjs, SHLIBVERSION='1504'))
+
+ Return ('libs')
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..f957560
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,107 @@
+#!/usr/bin/make -f
+# You must remove unused comment lines for the released package.
+#export DH_VERBOSE = 1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+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
+export GTEST_DIR=/usr/src/gtest
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+CPU=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+OS=linux
+
+export VERSION := 15.04b
+export SONAME := 1504
+export VARIANT := release
+export SCONS_ARGS := CPU=$(CPU) OS=$(OS) VARIANT=$(VARIANT) V=1 GTEST_DIR=$(GTEST_DIR)
+export BUILD_DIR := $(CURDIR)/build/$(OS)/$(CPU)/$(VARIANT)/dist
+export OBJ_DIR := $(CURDIR)/build/$(OS)/$(CPU)/$(VARIANT)/obj
+
+%:
+# dh $@ --with javahelper
+ dh $@ --with systemd
+
+override_dh_auto_build:
+#XXX does not build yet
+# scons BINDINGS=java $(SCONS_ARGS) \
+# WS=off BT=off ICE=off
+
+ scons BINDINGS=c $(SCONS_ARGS) \
+ WS=off BT=off ICE=off
+# (cd $(OBJ_DIR)/alljoyn_c; \
+# mv liballjoyn_c.so liballjoyn.so; \
+# mv liballjoyn_c.so.$(SONAME) liballjoyn.so.$(SONAME) )
+
+ scons BINDINGS=cpp $(SCONS_ARGS) \
+ WS=off BT=off ICE=off
+# (cd $(OBJ_DIR)/alljoyn_core; \
+# mv liballjoyn.so liballjoyn++.so; \
+# mv liballjoyn.so.$(SONAME) liballjoyn++.so.$(SONAME) )
+
+# not able to build js bindings yet:
+# "Must specify either GECKO_BASE or CORDOVA_BASE build variable"
+# scons BINDINGS=js $(SCONS_ARGS) \
+# WS=off BT=off ICE=off
+
+# scons BINDINGS=c $(SCONS_ARGS) \
+# WS=off BT=off ICE=off DOCS=html
+# scons BINDINGS=c $(SCONS_ARGS) \
+# WS=off BT=off ICE=off DOCS=pdf
+
+ 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
+ rm -rf .sconf_temp
+ rm -f config.log
+ rm -rf build
+ touch ./build_core/to-be-removed-now.pyc
+ find ./build_core/* -print|grep "\.pyc"|xargs rm
+ touch ./to-be.removed-now.md5
+ find ./* |grep '\.md5'|xargs rm
+ rm -f alljoyn_c/inc/alljoyn_c/DBusStdDefines.h
+ rm -f alljoyn_c/inc/alljoyn_c/Status.h
+ rm -f alljoyn_c/inc/qcc/posix/platform_types.h
+ rm -rf build
+ dh_auto_clean
+
+override_dh_auto_test:
+ ./build/$(OS)/$(CPU)/$(VARIANT)/test/cpp/bin/cmtest
+ dh_auto_test
+
+override_dh_installchangelogs:
+ dh_installchangelogs alljoyn_core/docs/ReleaseNotes.txt
+ dh_installchangelogs
+
+blubber:
+ rm -f alljoyn_java/bin/jar/alljoyn.jar
+ rm -f alljoyn_java/bin/libs/liballjoyn_java.so
+ rm -f alljoyn_java/bin/libs/liballjoyn_java.so
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocIntrospectWithDescriptionClient/MANIFEST.MF
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocIntrospectWithDescriptionService/MANIFEST.MF
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocMethodsClient/MANIFEST.MF
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocMethodsService/MANIFEST.MF
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocPropertiesClient/MANIFEST.MF
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocPropertiesService/MANIFEST.MF
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocSecurityLogonClient/MANIFEST.MF
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocSecurityLogonService/MANIFEST.MF
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocSecuritySRPClient/MANIFEST.MF
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocSecuritySRPService/MANIFEST.MF
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocSignalClient/MANIFEST.MF
+ rm -f alljoyn_java/samples/java/JavaSDKDoc/JavaSDKDocSignalService/MANIFEST.MF
+ rm -f alljoyn_java/src/org/alljoyn/bus/Status.java
+ touch ./to-be.removed-now.pdf
+ find ./* |grep '\.pdf'|xargs rm
+ touch ./to-be.removed-now.md5
+ find ./* |grep '\.md5'|xargs rm
+ rm -rf alljoyn_core/docs/latex/*
+ rm -rf alljoyn_core/docs/pdf/*
+
+ dh_auto_clean
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..738224a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,5 @@
+version=3
+opts="dversionmangle=s/alljoyn/alljoyn-core/" \
+https://git.allseenalliance.org/cgit/core/alljoyn.git/ /cgit/core/alljoyn.git/snapshot/alljoyn-(15\.04.*)\.tar\.gz
+
+
--
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