]> git.hoellein.online Git - zenbook/commitdiff
committing changes in /etc made by "apt-get install gpsd-clients"
authorroot <root@localhost>
Wed, 27 May 2020 07:13:22 +0000 (09:13 +0200)
committerroot <root@localhost>
Wed, 27 May 2020 07:13:22 +0000 (09:13 +0200)
Package changes:
+gpsd 3.20-8ubuntu0.1 amd64
+gpsd-clients 3.20-8ubuntu0.1 amd64
+libgps26 3.20-8ubuntu0.1 amd64
+python3-gps 3.20-8ubuntu0.1 amd64

.etckeeper
apparmor.d/local/usr.sbin.gpsd [new file with mode: 0644]
apparmor.d/usr.sbin.gpsd [new file with mode: 0644]
default/gpsd [new file with mode: 0644]
passwd
passwd-
shadow
shadow-
systemd/system/sockets.target.wants/gpsd.socket [new symlink]

index 1317766a7d047df25604e12ebd83edcad9fca7ae..1a71ee83565e8f42ecb1d6ef2fb4bc798d2cb411 100755 (executable)
@@ -660,6 +660,7 @@ maybe chmod 0644 'apparmor.d/local/usr.lib.snapd.snap-confine.real'
 maybe chmod 0644 'apparmor.d/local/usr.lib.telepathy'
 maybe chmod 0644 'apparmor.d/local/usr.sbin.cups-browsed'
 maybe chmod 0644 'apparmor.d/local/usr.sbin.cupsd'
+maybe chmod 0644 'apparmor.d/local/usr.sbin.gpsd'
 maybe chmod 0644 'apparmor.d/local/usr.sbin.ippusbxd'
 maybe chmod 0644 'apparmor.d/local/usr.sbin.ntpd'
 maybe chmod 0644 'apparmor.d/local/usr.sbin.rsyslogd'
@@ -699,6 +700,7 @@ maybe chmod 0644 'apparmor.d/usr.lib.snapd.snap-confine.real'
 maybe chmod 0644 'apparmor.d/usr.lib.telepathy'
 maybe chmod 0644 'apparmor.d/usr.sbin.cups-browsed'
 maybe chmod 0644 'apparmor.d/usr.sbin.cupsd'
+maybe chmod 0644 'apparmor.d/usr.sbin.gpsd'
 maybe chmod 0644 'apparmor.d/usr.sbin.ippusbxd'
 maybe chmod 0644 'apparmor.d/usr.sbin.mysqld'
 maybe chmod 0644 'apparmor.d/usr.sbin.ntpd'
@@ -1562,6 +1564,7 @@ maybe chmod 0644 'default/devpts'
 maybe chmod 0644 'default/dump1090-mutability'
 maybe chmod 0644 'default/fwlogwatch'
 maybe chmod 0644 'default/google-chrome'
+maybe chmod 0644 'default/gpsd'
 maybe chmod 0644 'default/grub'
 maybe chmod 0755 'default/grub.d'
 maybe chmod 0644 'default/grub.d/init-select.cfg'
diff --git a/apparmor.d/local/usr.sbin.gpsd b/apparmor.d/local/usr.sbin.gpsd
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/apparmor.d/usr.sbin.gpsd b/apparmor.d/usr.sbin.gpsd
new file mode 100644 (file)
index 0000000..7d16715
--- /dev/null
@@ -0,0 +1,100 @@
+# vim:syntax=apparmor
+# ------------------------------------------------------------------
+#
+# Copyright (C) 2018 Canonical Ltd.
+#
+# This software is distributed under a BSD-style license. See the
+# file "COPYING" in the top-level directory of the distribution for details.
+#
+# ------------------------------------------------------------------
+
+#include <tunables/global>
+
+/usr/sbin/gpsd flags=(attach_disconnected) {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+
+  capability ipc_lock,
+  capability net_bind_service,
+  capability sys_nice,
+  capability fsetid,
+  capability setgid,
+  capability setuid,
+  capability sys_resource,
+
+  # for all the remote connection options
+  network dgram,
+  network stream,
+
+  # own binary
+  /usr/sbin/gpsd rmix,
+
+  # common serial paths to GPS devices
+  /dev/tty{,S,USB,AMA,ACM}[0-9]*    rw,
+  /sys/dev/char     r,
+  /sys/dev/char/**  r,
+
+  # pps related devices
+  /dev/pps[0-9]*              rw,
+  /sys/devices/virtual/pps    r,
+  /sys/devices/virtual/pps/** r,
+
+  # gpsd device to share
+  /dev/gpsd[0-9] rw,
+
+  # libusb device access to GPS devices
+  /proc/      r,
+  /dev/       r,
+  /sys/class/ r,
+  /sys/bus/   r,
+  /dev/bus/usb/ r,
+  /sys/bus/usb/devices/ r,
+  /sys/devices/pci[0-9]*/**/{uevent,busnum,devnum,speed,descriptors} r,
+  /run/udev/data/+usb* r,
+  /run/udev/data/c189* r,
+
+  # common config path (by default unused)
+  /etc/gpsd/* r,
+  # gpsd will call this on device attach/detach allowing for custom handlers
+  /bin/dash rix,
+  /bin/bash rix,
+  /etc/gpsd/device-hook ix,
+
+  # control socket e.g. for gpsdctl
+  /{,var/}run/gpsd.sock rw,
+
+  # enumerate own FDs
+  @{PROC}/@{pid}/fd/ r,
+
+  # default paths feeding GPS data into chrony
+  /{,var/}run/chrony.tty{,S,USB,AMA}[0-9]*.sock rw,
+  /tmp/chrony.tty{,S,USB,AMA}[0-9]*.sock rw,
+
+  # logging
+  /{,var/}run/systemd/journal/dev-log w,
+
+  # required for pps initialization
+  capability sys_time,
+  /sys/devices/virtual/pps/ r,
+
+  # to submit data to chrony
+  ptrace read peer=/usr/sbin/chronyd,
+
+  # for libusb in case USB based GPS devices are used
+  /sys/devices/**/usb[0-9]*/** r,
+
+  # triggered on fusercount, not strictly required and unsafe to allow
+  # adding an explicit denial rule silences the warnings
+  deny ptrace read peer=unconfined,
+  deny capability sys_ptrace,
+  deny capability dac_read_search,
+  deny capability dac_override,
+
+  # gpsd tries to load pps_ldisc directly, but gpsd doesn't need
+  # the general power of cap 'sys_module', pps_ldisc is auto-loaded
+  # by the kernel when gpsd is creating the pps device
+  deny capability sys_module,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.sbin.gpsd>
+}
diff --git a/default/gpsd b/default/gpsd
new file mode 100644 (file)
index 0000000..7d9f1c4
--- /dev/null
@@ -0,0 +1,6 @@
+# Devices gpsd should collect to at boot time.
+# They need to be read/writeable, either by user gpsd or the group dialout.
+DEVICES=""
+
+# Other options you want to pass to gpsd
+GPSD_OPTIONS=""
diff --git a/passwd b/passwd
index e2ab46fa4cf2028a3f31c41c11a2b603e9a7d5b7..8a7683c9d179cf9eaddff1d231de0cdaf1d957e1 100644 (file)
--- a/passwd
+++ b/passwd
@@ -59,3 +59,4 @@ nvidia-persistenced:x:133:146:NVIDIA Persistence Daemon,,,:/nonexistent:/sbin/no
 dump1090:x:134:65534::/usr/share/dump1090-mutability:/usr/sbin/nologin
 nx:x:135:1015::/var/NX/nx:/etc/NX/nxserver
 tss:x:136:147:TPM software stack,,,:/var/lib/tpm:/bin/false
+gpsd:x:137:20:GPSD system user,,,:/run/gpsd:/bin/false
diff --git a/passwd- b/passwd-
index d9f37338d081b6b4af0f7b0d7a1f520273ea5740..263ed346d74cebeabadcc96b79428a6d0ff99f56 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -58,4 +58,5 @@ tcpdump:x:132:145::/nonexistent:/usr/sbin/nologin
 nvidia-persistenced:x:133:146:NVIDIA Persistence Daemon,,,:/nonexistent:/sbin/nologin
 dump1090:x:134:65534::/usr/share/dump1090-mutability:/usr/sbin/nologin
 nx:x:135:1015::/var/NX/nx:/etc/NX/nxserver
-tss:x:136:147::/var/lib/tpm:/bin/false
+tss:x:136:147:TPM software stack,,,:/var/lib/tpm:/bin/false
+gpsd:x:137:20::/run/gpsd:/bin/false
diff --git a/shadow b/shadow
index e0aea1abb6e2691a72d131fd5ac1d530b55beffc..095c016a8fb44bb521d69b8f906e3197b7272f84 100644 (file)
--- a/shadow
+++ b/shadow
@@ -59,3 +59,4 @@ nvidia-persistenced:*:18219:0:99999:7:::
 dump1090:*:18302:0:99999:7:::
 nx:*:18347:0:99999:7:::
 tss:*:18407:0:99999:7:::
+gpsd:*:18409:0:99999:7:::
diff --git a/shadow- b/shadow-
index e0aea1abb6e2691a72d131fd5ac1d530b55beffc..095c016a8fb44bb521d69b8f906e3197b7272f84 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -59,3 +59,4 @@ nvidia-persistenced:*:18219:0:99999:7:::
 dump1090:*:18302:0:99999:7:::
 nx:*:18347:0:99999:7:::
 tss:*:18407:0:99999:7:::
+gpsd:*:18409:0:99999:7:::
diff --git a/systemd/system/sockets.target.wants/gpsd.socket b/systemd/system/sockets.target.wants/gpsd.socket
new file mode 120000 (symlink)
index 0000000..e417964
--- /dev/null
@@ -0,0 +1 @@
+/lib/systemd/system/gpsd.socket
\ No newline at end of file