[Debian-iot-packaging] [alljoyn-core-1504] 02/02: Import Debian changes 15.04b+dfsg.1-1
Thorsten Alteholz
alteholz at moszumanska.debian.org
Tue Aug 15 20:15:39 UTC 2017
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 68d8c2420a4fd966bfbfaeeb0dce231a1530fdf6
Merge: 09d9f91 ca78037
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Wed Aug 9 19:01:37 2017 +0100
Import Debian changes 15.04b+dfsg.1-1
alljoyn-core-1504 (15.04b+dfsg.1-1) unstable; urgency=medium
* add gcc7 patch (Closes: #853304)
* remove non-DFSG files alljoyn_core/router/ConvertUTF.*
* debian/control: change priority: from extra to optional
* debian/control: bump standard to 4.0.1 (no changes)
alljoyn_core/router/ConvertUTF.cc | 596 --------------------------------------
alljoyn_core/router/ConvertUTF.h | 161 ----------
debian/changelog | 9 +
debian/control | 4 +-
debian/copyright | 23 +-
debian/patches/gcc7.patch | 20 ++
debian/patches/series | 1 +
debian/watch | 2 +-
8 files changed, 34 insertions(+), 782 deletions(-)
diff --cc debian/changelog
index bd8d755,0000000..e10d81c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,63 -1,0 +1,72 @@@
++alljoyn-core-1504 (15.04b+dfsg.1-1) unstable; urgency=medium
++
++ * add gcc7 patch (Closes: #853304)
++ * remove non-DFSG files alljoyn_core/router/ConvertUTF.*
++ * debian/control: change priority: from extra to optional
++ * debian/control: bump standard to 4.0.1 (no changes)
++
++ -- Thorsten Alteholz <debian at alteholz.de> Wed, 09 Aug 2017 19:01:37 +0100
++
+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)
+ * deactivating gtest for now as it does not work with gcc-6
+ (-> look at #833636)
+
+ -- Thorsten Alteholz <debian at alteholz.de> Sun, 07 Aug 2016 12:31:37 +0200
+
+alljoyn-core-1504 (15.04b-6) unstable; urgency=medium
+
+ * put some software for testing the library to
+ /usr/lib/${DEB_HOST_MULTIARCH}/alljoyn/1504/bin
+
+ -- Thorsten Alteholz <debian at alteholz.de> Wed, 29 Jun 2016 22:11:32 +0200
+
+alljoyn-core-1504 (15.04b-5) unstable; urgency=medium
+
+ * add patch to remove -Bsymbolic for creating shared libraries
+ with soname
+
+ -- Thorsten Alteholz <debian at alteholz.de> Wed, 22 Jun 2016 19:28:32 +0200
+
+alljoyn-core-1504 (15.04b-4) unstable; urgency=medium
+
+ * debian/rules: there still is i386 available, so map all i.86 to x86
+ (Closes: #826766) thanks to Adam Conrad for the patch
+ * debian/rules: remove build_core/conf/linux/arm as it is only used
+ for Alljoyn-arm and cross compiling
+ thanks to Adam Conrad for the patch
+ * debian/rules: allow sh4 as native architecture
+ (so finally: Closes: #825218)
+ thanks to Aaron M. Ucko for his suggestions
+
+ -- Thorsten Alteholz <debian at alteholz.de> Mon, 13 Jun 2016 19:28:32 +0200
+
+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
+
+ -- Thorsten Alteholz <debian at alteholz.de> Sat, 28 May 2016 22:28:32 +0200
+
+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 --cc debian/control
index a0de739,0000000..e7f2b3b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,130 -1,0 +1,130 @@@
+Source: alljoyn-core-1504
+Section: net
- Priority: extra
++Priority: optional
+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)
+ , libssl-dev
+ , libgtest-dev
+ , junit
+ , libcsv-java
+ , libmatthew-debug-java
+ , libitext-java
+ , scons
+ , libcap-dev
+# , javahelper
+# , ant
- Standards-Version: 3.9.8
++Standards-Version: 4.0.1
+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
+#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}
+ , 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
+ 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}, python
+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 --cc debian/copyright
index 1de3e89,0000000..684a5d6
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,92 -1,0 +1,71 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: alljoyn
+Source: https://allseenalliance.org/framework
++Files-Excluded: ./alljoyn_core/router/ConvertUTF.h ./alljoyn_core/router/ConvertUTF.cc
+
+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 --cc debian/patches/gcc7.patch
index 0000000,0000000..4926469
new file mode 100644
--- /dev/null
+++ b/debian/patches/gcc7.patch
@@@ -1,0 -1,0 +1,20 @@@
++Description: patch to make it compile with gcc7
++ though the snprintf() check seems to be a false positive mentioned in #78969
++ (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78969)
++Author: Thorsten Alteholz <debian at alteholz.de>
++Index: alljoyn-core-1504-15.04b/alljoyn_core/samples/secure/DeskTopSharedKSService.cc
++===================================================================
++--- alljoyn-core-1504-15.04b.orig/alljoyn_core/samples/secure/DeskTopSharedKSService.cc 2017-08-09 15:09:23.918872241 +0200
+++++ alljoyn-core-1504-15.04b/alljoyn_core/samples/secure/DeskTopSharedKSService.cc 2017-08-10 08:41:16.555754324 +0200
++@@ -167,9 +167,9 @@
++ if (authCount <= 3) {
++ /* seed the random number */
++ srand(time(NULL));
++- int pin = rand() % 1000000;
+++ unsigned int pin = (unsigned int)rand() % 1000000;
++ char pinStr[7];
++- snprintf(pinStr, 7, "%06d", pin);
+++ snprintf(pinStr, 7, "%06u", pin);
++ printf("One Time Password : %s\n", pinStr);
++ fflush(stdout);
++ creds.SetPassword(pinStr);
diff --cc debian/patches/series
index 2d343d8,0000000..b31b632
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,0 +1,10 @@@
+soname.patch
+add-clean-target.patch
+remove-bsd-source.patch
+hardening.patch
+more-native-cpus.patch
+remove-build.xml
+time.patch
+no-bsymbolic.patch
+gcc6.patch
++gcc7.patch
diff --cc debian/watch
index 738224a,0000000..dca0f67
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,5 -1,0 +1,5 @@@
+version=3
- opts="dversionmangle=s/alljoyn/alljoyn-core/" \
++opts="dversionmangle=s/alljoyn/alljoyn-core/,dversionmangle=s/\+(debian|dfsg|ds|deb)(\.?\d+)?$//" \
+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