Merge ~paelzer/ubuntu/+source/gpsd:gpsd-fixed-apr-2020-focal into ubuntu/+source/gpsd:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4047/+packages

I'm waiting for the decision if this goes to Debian-unstable and is synced or if groovy needs a delta upload. But that is orthogonal to this MP which prepares the Focal SRU of it.

[Christian Ehrhardt  (paelzer)]

Debian has accepted my changes to git, consider this ready for review please.

[Lucas Kanashiro (lucaskanashiro)]

I am starting to review it.

[Lucas Kanashiro (lucaskanashiro)]

* Changelog:
  - [-] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [x] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
  - [-] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [-] nothing else to drop
  - [-] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [√] no new patches added
  - [√] patches match what was proposed upstream
  - [-] patches correctly included in debian/patches/series
  - [-] patches have correct DEP3 metadata

I think the only thing missing is to run the update-maintainer script. After fixing it you are good to go.

review: Needs Fixing

cdfaf75... by Christian Ehrhardt  on 2020-05-11

update-maintainer

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

Thanks for spotting that I missed this, waiting for the respective Debian upload now to pass the new queue.

[Christian Ehrhardt  (paelzer)]

review: Approve

[Christian Ehrhardt  (paelzer)]

Little extra hiccup to resolve in bug 1878158

[Christian Ehrhardt  (paelzer)]

GPSD was re-imported with the new importer code, so I had to rebase it but as expected this worked fine.
Since it is ready in groovy I'm uploading as focal-sru now.

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/gpsd
 * [new tag] upload/3.20-8ubuntu0.1 -> upload/3.20-8ubuntu0.1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading gpsd_3.20-8ubuntu0.1.dsc: done.
  Uploading gpsd_3.20-8ubuntu0.1.debian.tar.xz: done.
  Uploading gpsd_3.20-8ubuntu0.1_source.buildinfo: done.
  Uploading gpsd_3.20-8ubuntu0.1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

This is merged and migrated

diff --git a/debian/changelog b/debian/changelog
index c8ae18e..18f95b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+<<<<<<< debian/changelog
+=======
+gpsd (3.20-8ubuntu0.1) focal; urgency=medium
+
+  * d/usr.sbin.gpsd: improve apparmor rules for PPS usage
+    (LP: #1872175 LP: #1872178)
+  * d/gpsd.default: add USBAUTO option (LP: #1873415)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 30 Apr 2020 12:40:23 +0200
+
+>>>>>>> debian/changelog
 gpsd (3.20-8) unstable; urgency=medium
 
   * [62aa4951] Remove last traces of python2. (Closes: #936645)
diff --git a/debian/control b/debian/control
index 49610a1..1d1897f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,12 @@
 Source: gpsd
 Section: misc
 Priority: optional
+<<<<<<< debian/control
 Maintainer: Bernd Zeimetz <[e-mail]>
+=======
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bernd Zeimetz <[e-mail]>
+>>>>>>> debian/control
 Build-Depends: debhelper (>= 11),
  po-debconf,
  python3-all-dev (>= 2.6.6-3),
diff --git a/debian/control.in b/debian/control.in
index 9669efc..7c32063 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,12 @@
 Source: gpsd
 Section: misc
 Priority: optional
+<<<<<<< debian/control.in
 Maintainer: Bernd Zeimetz <[e-mail]>
+=======
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bernd Zeimetz <[e-mail]>
+>>>>>>> debian/control.in
 Build-Depends: debhelper (>= 11),
  po-debconf,
  python3-all-dev (>= 2.6.6-3),
diff --git a/debian/gpsd.default b/debian/gpsd.default
index 7d9f1c4..9baa0c6 100644
--- a/debian/gpsd.default
+++ b/debian/gpsd.default
@@ -4,3 +4,9 @@ DEVICES=""
 
 # Other options you want to pass to gpsd
 GPSD_OPTIONS=""
+<<<<<<< debian/gpsd.default
+=======
+
+# Automatically hot add/remove USB GPS devices via gpsdctl
+USBAUTO="false"
+>>>>>>> debian/gpsd.default
diff --git a/debian/usr.sbin.gpsd b/debian/usr.sbin.gpsd
index b181688..b2717e8 100644
--- a/debian/usr.sbin.gpsd
+++ b/debian/usr.sbin.gpsd
@@ -10,7 +10,11 @@
 
 #include <tunables/global>
 
+<<<<<<< debian/usr.sbin.gpsd
 /usr/sbin/gpsd {
+=======
+/usr/sbin/gpsd flags=(attach_disconnected) {
+>>>>>>> debian/usr.sbin.gpsd
   #include <abstractions/base>
   #include <abstractions/nameservice>
 
@@ -73,6 +77,31 @@
   # logging
   /{,var/}run/systemd/journal/dev-log w,
 
+<<<<<<< debian/usr.sbin.gpsd
+=======
+  # 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,
+
+>>>>>>> debian/usr.sbin.gpsd
   # Site-specific additions and overrides. See local/README for details.
   #include <local/usr.sbin.gpsd>
 }