Merge tag 'debian/3.22-2'debian/3.22-2+linaro1

gpsd Debian release 3.22-2

Conflicts:
	debian/changelog

3 files changed, 49 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index bc0ad9c..1c3c248 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+gpsd (3.22-2+linaro1) unstable; urgency=medium
+
+  * Update debian version.
+
+ -- Anibal Limón <anibal.limon@linaro.org>  Wed, 13 Jan 2021 14:46:39 -0600
+
+gpsd (3.22-2) unstable; urgency=medium
+
+  [ Bernd Zeimetz ]
+  * [66691096] Update Apparmor profile from upstream git HEAD.
+    Thanks to Christian Ehrhardt (Closes: #976152) (LP: #1894330)
+
+  [ Christian Ehrhardt ]
+  * [63f0cbf0] symbols: nanowait came back as (int, timespec*)
+    Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+
+ -- Bernd Zeimetz <bzed@debian.org>  Wed, 13 Jan 2021 19:20:14 +0100
+
 gpsd (3.22-1+linaro1) unstable; urgency=medium
 
   * Update patch for service support with Qualcomm PDS.
diff --git a/debian/libqgpsmmLIBGPSSONAME.symbols b/debian/libqgpsmmLIBGPSSONAME.symbols
index e483e6f..84edae2 100644
--- a/debian/libqgpsmmLIBGPSSONAME.symbols
+++ b/debian/libqgpsmmLIBGPSSONAME.symbols
@@ -86,6 +86,7 @@ libQgpsmm.so.LIBGPSSONAME libqgpsmmLIBGPSSONAME #MINVER#
  (c++)"getled64(char const*, int)@Base" 3.9
  (c++)"getlef32(char const*, int)@Base" 3.9
  (c++)"putbef32(char*, int, float)@Base" 3.9
+ (c++)"nanowait(int, timespec*)@Base" 3.22
 #MISSING: 3.21.1~dev# (c++)"nanowait(int, int)@Base" 3.19
 #MISSING: 3.5# deg_to_str@Base 3.3
  earth_distance@Base 3.3
diff --git a/debian/usr.sbin.gpsd b/debian/usr.sbin.gpsd
index 7d16715..db95a6f 100644
--- a/debian/usr.sbin.gpsd
+++ b/debian/usr.sbin.gpsd
@@ -1,11 +1,29 @@
-# vim:syntax=apparmor
 # ------------------------------------------------------------------
 #
 # Copyright (C) 2018 Canonical Ltd.
+# This file is Copyright 2020 by the GPSD project
+# SPDX-License-Identifier: BSD-2-clause
 #
 # This software is distributed under a BSD-style license. See the
 # file "COPYING" in the top-level directory of the distribution for details.
 #
+# Apparmor profiles are meant to cover and allow for the most common use
+# cases and that is what this profile tries to cover. Due to the nature of
+# the program there are various different use-cases and if you trigger
+# apparmor denies (see dmesg and journal) it is recommended to add matching
+# local overrides for your use-case. See:
+# gitlab.com/apparmor/apparmor/-/blob/master/profiles/apparmor.d/local/README
+# This way your changes do not conflict with further updates of the program.
+#
+# If you consider this use case common please report a bug upstream so that
+# the rule can be added to the default profile.
+#
+# If instead you are just frustrated and want to get it silenced it is
+# recommended to set it to complain mode:
+#  $ sudo aa-complain usr.sbin.gpsd
+# That way nothing will be blocked anymore, but you will be able to see and
+# report the denials of your use case. That way there is a chance to update
+# the default profile for it.
 # ------------------------------------------------------------------
 
 #include <tunables/global>
@@ -14,6 +32,7 @@
   #include <abstractions/base>
   #include <abstractions/nameservice>
 
+  # For shmctl()
   capability ipc_lock,
   capability net_bind_service,
   capability sys_nice,
@@ -25,6 +44,8 @@
   # for all the remote connection options
   network dgram,
   network stream,
+  network bluetooth,
+  network can raw,
 
   # own binary
   /usr/sbin/gpsd rmix,
@@ -34,6 +55,10 @@
   /sys/dev/char     r,
   /sys/dev/char/**  r,
 
+  # Bluetooth devices, for Bluetooth GNSS receivers
+  /dev/rfcomm* rw,
+  owner /dev/rfcomm* w,
+
   # pps related devices
   /dev/pps[0-9]*              rw,
   /sys/devices/virtual/pps    r,
@@ -70,6 +95,9 @@
   /{,var/}run/chrony.tty{,S,USB,AMA}[0-9]*.sock rw,
   /tmp/chrony.tty{,S,USB,AMA}[0-9]*.sock rw,
 
+  # for gpsfake:
+  /tmp/gpsfake-*.sock rw,
+
   # logging
   /{,var/}run/systemd/journal/dev-log w,
 
@@ -98,3 +126,4 @@
   # Site-specific additions and overrides. See local/README for details.
   #include <local/usr.sbin.gpsd>
 }
+# vim:syntax=apparmor