Whole bunch of improvements to Debian packaging from Ondrej Sury (thanks!).

4 files changed, 122 insertions, 30 deletions

diff --git a/source/debian/control b/source/debian/control
index 72c8714..fcca634 100644
--- a/source/debian/control
+++ b/source/debian/control
@@ -3,12 +3,20 @@ Maintainer: APT Builder Robot <aptbot@cryptech.is>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), libsqlite3-0, libsqlite3-dev, python (>= 2.7), python-yaml
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               libsqlite3-dev,
+               python (>= 2.7),
+               python-yaml
 Homepage: http://trac.cryptech.is/wiki
 
 Package: cryptech-alpha
 Architecture: any
-Depends: libc6 (>= 2.13), ${misc:Depends}, libsqlite3-0, python-serial
+Depends: python,
+         python-serial (>= 3.0),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Description: Cryptech open-source crypto software
  "cryptech-alpha" contains software for use with the Cryptech Project
  "Alpha" development board.
diff --git a/source/debian/copyright b/source/debian/copyright
index ec25460..5dda2b7 100644
--- a/source/debian/copyright
+++ b/source/debian/copyright
@@ -1,27 +1,94 @@
-Copyright (c) 2015-2016, NORDUnet A/S All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-- 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.
-
-- Neither the name of the NORDUnet nor the names of its contributors may
-  be used to endorse or promote products derived from this software
-  without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
-HOLDER 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.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cryptech-alpha
+Source: https://trac.cryptech.is/browser
+Comment: not-complete, libcli and the ARRGH parts are missing
+	 crc32 is taken from old RFC thus non-free
+
+Files: *
+Copyright: 2014-2016 NORDUnet A/S
+License: BSD-3-clause
+
+Files: sw/stm32/syscalls.c
+Copyright: 2009 Michael Fischer
+License: BSD-3-clause
+
+Files: sw/thirdparty/libtfm/*
+Copyright: 2004 Sam Hocevar <sam@hocevar.net>
+License: public-domain or WTFPL-2
+
+Files: sw/stm32/libraries/mbed/targets/cmsis/*
+       sw/stm32/libraries/mbed/rtos/rtos/*
+Copyright: 2009-2015 ARM Limited
+License: BSD-3-clause
+
+Files: sw/stm32/libraries/mbed/api/mbed_error.h
+Copyright: 2006-2013 ARM Limited
+License: Apache-2.0
+
+Files: sw/stm32/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4/*
+       sw/stm32/projects/bootloader/startup_stm32f429xx.S
+Copyright: 2014-2015 STMicroelectronics
+License: BSD-3-clause
+
+Files: sw/stm32/libraries/mbed/rtos/rtx/*
+Copyright: 1999-2009 KEIL
+	   2009-2013 ARM Germany GmbH
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: 2014-2016 NORDUnet A/S
+License: BSD-3-clause
+
+License: BSD-3-clause
+ 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 author nor the names of its contributors may be
+    used to endorse or promote products derived from this software without
+    specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
+
+License: WTFPL-2
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+ .
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ .
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
+
+License: Apache-2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with this
+ work for additional information regarding copyright ownership.  The ASF
+ licenses this file to You under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+      http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ License for the specific language governing permissions and limitations under
+ the License.
+ .
+ On Debian systems, the full text of the Apache Software License version 2 can
+ be found in the file `/usr/share/common-licenses/Apache-2.0'.
diff --git a/source/debian/rules b/source/debian/rules
index 2d33f6a..88d6c5a 100755
--- a/source/debian/rules
+++ b/source/debian/rules
@@ -1,4 +1,21 @@
 #!/usr/bin/make -f
 
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+# DH_VERBOSE = 1
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic -fno-omit-frame-pointer
+# package maintainers to append LDFLAGS
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
 %:
-	dh $@
+	dh $@ --with python2
diff --git a/source/sw/pkcs11 b/source/sw/pkcs11
-Subproject 133bb3907f478e3ccc1dc8f8fb15e924f37a0d9
+Subproject ef142cd0ba5e60baee56b8aaafac9a835958a67