Browse Source

merge with debian 3.22-2

master
Boian Bonev 3 years ago
parent
commit
a673fdd8d3
  1. 0
      contrib/skyview.php
  2. 17
      debian/changelog
  3. 1
      debian/libqgpsmmLIBGPSSONAME.symbols
  4. 31
      debian/usr.sbin.gpsd

0
contrib/skyview.php

17
debian/changelog

@ -1,9 +1,22 @@
gpsd (3.22-1-devuan1) unstable; urgency=medium
gpsd (3.22-2-devuan1) unstable; urgency=medium
* Merge with debian changes for 3.22
* Merge with debian changes for 3.22-1
* Merge with debian changes for 3.22-2
-- Boian Bonev <bbonev@ipacct.com> Tue, 12 Jan 2021 12:49:27 +0000
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) unstable; urgency=medium
[ Pino Toscano ]

1
debian/libqgpsmmLIBGPSSONAME.symbols

@ -88,6 +88,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

31
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,
@ -72,6 +97,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,
@ -100,3 +128,4 @@
# Site-specific additions and overrides. See local/README for details.
#include <local/usr.sbin.gpsd>
}
# vim:syntax=apparmor

Loading…
Cancel
Save