Compare commits

...

13 Commits

Author SHA1 Message Date
Boian Bonev c0f0eb866b
Fix version 2 weeks ago
Boian Bonev 28d28a216c
Refresh patches 2 weeks ago
Boian Bonev cd26dee9cf
Merge remote-tracking branch 'elbrus/pkg-gpsd-fix-ftbfs-997178' 2 weeks ago
Paul Gevers 26d20ea1d4
Update d/changelog for release 3.22-4.1 2 weeks ago
Christian Ehrhardt 1760657093
d/p/gpsmon-gpsmon.c-Fix-silly-warning.patch: fix FTFBS (Closes: #997178) 10 months ago
Bernd Zeimetz 082ec701b3 Updating changelog 1 year ago
Bernd Zeimetz c6af361ae1 Fix patch 1 year ago
Bernd Zeimetz 2df40c7640 Fix: GPSD time will jump back 1024 weeks at after week=2180 1 year ago
Bernd Zeimetz f70ff0c055 Updating changelog 1 year ago
Bernd Zeimetz c582b2aac1 gpsd-tools: add missing Breaks+Replaces 1 year ago
Bernd Zeimetz 2dfbaa074f Updating debian/control from debian/control.in 1 year ago
Bernd Zeimetz 5c2402531f Mark String::QString(QString const&)@Base as optional. 1 year ago
Bernd Zeimetz c6838e372f Remove duplicate lines from symbol files. 1 year ago
  1. 16
      debian/changelog
  2. 1
      debian/libqgpsmmLIBGPSSONAME.symbols
  3. 84
      debian/patches/7f30d88d0_gpsd-timebase.c-Don-t-compute-wrong-GPS-rollover-after-2020-10-23
  4. 8
      debian/patches/desktop-add-keywords.patch
  5. 6
      debian/patches/gpsd_hotplug_rules_disable_generic_serial_converters
  6. 27
      debian/patches/gpsmon-gpsmon.c-Fix-silly-warning.patch
  7. 14
      debian/patches/ignore-test-xgps_deps_check
  8. 4
      debian/patches/no-read-only.patch
  9. 1
      debian/patches/series
  10. 6
      debian/patches/spelling.patch
  11. 4
      debian/patches/unify-udev-rules.patch
  12. 12
      debian/rules

16
debian/changelog

@ -1,3 +1,19 @@
gpsd (3.22-4.1devuan1) unstable; urgency=medium
* Merge with all debian changes for 3.22-4.1
-- Boian Bonev <bbonev@ipacct.com> Fri, 16 Sep 2022 13:52:59 +0000
gpsd (3.22-4.1) unstable; urgency=medium
* Non-maintainer upload
[ Christian Ehrhardt ]
* [17606570] d/p/gpsmon-gpsmon.c-Fix-silly-warning.patch: fix FTFBS
(Closes: #997178)
-- Paul Gevers <elbrus@debian.org> Sun, 11 Sep 2022 16:45:05 +0200
gpsd (3.22-4+devuan2) unstable; urgency=high
* Merge with all debian changes for 3.22-4

1
debian/libqgpsmmLIBGPSSONAME.symbols

@ -39,7 +39,6 @@ libQgpsmm.so.LIBGPSSONAME libqgpsmmLIBGPSSONAME #MINVER#
#MISSING: 3.18# (c++|optional)"QDebug::~QDebug()@Base" 3.3
(c++|optional)"QString::~QString()@Base" 3.3
(c++|optional)"QString::QString(QString const&)@Base" 3.3
(c++|optional)"QString::QString(QString const&)@Base" 3.3
(c++|optional)"QList<QString>::~QList()@Base" 3.5
(c++)"typeinfo for gpsmm@Base" 3.3
(c++)"typeinfo name for gpsmm@Base" 3.3

84
debian/patches/7f30d88d0_gpsd-timebase.c-Don-t-compute-wrong-GPS-rollover-after-2020-10-23

@ -1,7 +1,5 @@
Index: pkg-gpsd/NEWS
===================================================================
--- pkg-gpsd.orig/NEWS
+++ pkg-gpsd/NEWS
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
GPSD project news
@ -13,10 +11,8 @@ Index: pkg-gpsd/NEWS
Added client/gpscsv to convert gpsd JSON to csv.
Added client/gpsplot to dynamically plot gpsd JSON.
Added client/gpssubframe to decode gpsd SUBFRAME JSON.
Index: pkg-gpsd/drivers/drivers.c
===================================================================
--- pkg-gpsd.orig/drivers/drivers.c
+++ pkg-gpsd/drivers/drivers.c
--- a/drivers/drivers.c
+++ b/drivers/drivers.c
@@ -24,15 +24,17 @@ ssize_t generic_get(struct gps_device_t
return packet_get(session->gpsdata.gps_fd, &session->lexer);
}
@ -60,10 +56,8 @@ Index: pkg-gpsd/drivers/drivers.c
}
/**************************************************************************
Index: pkg-gpsd/gps/fake.py
===================================================================
--- pkg-gpsd.orig/gps/fake.py
+++ pkg-gpsd/gps/fake.py
--- a/gps/fake.py
+++ b/gps/fake.py
@@ -185,7 +185,7 @@ class TestLoad(object):
commentlen += len(packet)
# Some comments are magic
@ -98,10 +92,8 @@ Index: pkg-gpsd/gps/fake.py
else:
if type_latch is None:
type_latch = ptype
Index: pkg-gpsd/gpsd/libgpsd_core.c
===================================================================
--- pkg-gpsd.orig/gpsd/libgpsd_core.c
+++ pkg-gpsd/gpsd/libgpsd_core.c
--- a/gpsd/libgpsd_core.c
+++ b/gpsd/libgpsd_core.c
@@ -1514,65 +1514,80 @@ gps_mask_t gpsd_poll(struct gps_device_t
session->gpsdata.online.tv_nsec = 0;
}
@ -248,10 +240,8 @@ Index: pkg-gpsd/gpsd/libgpsd_core.c
}
if (session->lexer.outbuflen == 0) { /* got new data, but no packet */
Index: pkg-gpsd/gpsd/timebase.c
===================================================================
--- pkg-gpsd.orig/gpsd/timebase.c
+++ pkg-gpsd/gpsd/timebase.c
--- a/gpsd/timebase.c
+++ b/gpsd/timebase.c
@@ -199,8 +199,8 @@ SPDX-License-Identifier: BSD-2-clause
#include "../include/gpsd.h"
@ -401,10 +391,8 @@ Index: pkg-gpsd/gpsd/timebase.c
// gcc needs the (time_t)week to not overflow. clang got it right.
// if time_t is 32-bits, then still 2038 issues
Index: pkg-gpsd/test/daemon/ais-nmea.log
===================================================================
--- pkg-gpsd.orig/test/daemon/ais-nmea.log
+++ pkg-gpsd/test/daemon/ais-nmea.log
--- a/test/daemon/ais-nmea.log
+++ b/test/daemon/ais-nmea.log
@@ -1,5 +1,5 @@
# From: Владимир Калачихин <v.kalachikhin@gmail.com>
-# Date: 8 APril 2020
@ -412,10 +400,8 @@ Index: pkg-gpsd/test/daemon/ais-nmea.log
# Note: NMEA 0183 and AIS data
#
$GPGSA,A,3,11,32,14,28,22,03,10,08,17,,,,2.02,1.03,1.74*00
Index: pkg-gpsd/test/daemon/nmea-fuzzy-cases.log
===================================================================
--- pkg-gpsd.orig/test/daemon/nmea-fuzzy-cases.log
+++ pkg-gpsd/test/daemon/nmea-fuzzy-cases.log
--- a/test/daemon/nmea-fuzzy-cases.log
+++ b/test/daemon/nmea-fuzzy-cases.log
@@ -1,6 +1,6 @@
# Name: NMEA cases causing "fuzzy arithmetic" problems (+1 non-failure).
# Submitter: Fred Wright <fw@fwright.net>
@ -424,10 +410,8 @@ Index: pkg-gpsd/test/daemon/nmea-fuzzy-cases.log
# Note: Lifted from nmea-rtk.log (Trimble NMEA with RTK-4 fix).
#
# This file is Copyright 2020 by the GPSD project
Index: pkg-gpsd/test/daemon/nmea-rtk.log
===================================================================
--- pkg-gpsd.orig/test/daemon/nmea-rtk.log
+++ pkg-gpsd/test/daemon/nmea-rtk.log
--- a/test/daemon/nmea-rtk.log
+++ b/test/daemon/nmea-rtk.log
@@ -1,7 +1,7 @@
# Name: Trimble NMEA with RTK-4 fix.
# Chipset: Trimble
@ -437,10 +421,8 @@ Index: pkg-gpsd/test/daemon/nmea-rtk.log
# Note: Part of the file is just 3D Fix. Part is RTK fix.
#
# This file is Copyright 2020 by the GPSD project
Index: pkg-gpsd/test/daemon/quectel.log
===================================================================
--- pkg-gpsd.orig/test/daemon/quectel.log
+++ pkg-gpsd/test/daemon/quectel.log
--- a/test/daemon/quectel.log
+++ b/test/daemon/quectel.log
@@ -1,6 +1,6 @@
# Chipset: Quectel EC2526EC21
# Submitter: Tom Isaacson <tom.isaacson@teknique.com>
@ -449,10 +431,8 @@ Index: pkg-gpsd/test/daemon/quectel.log
# Location: Auckland, NZ 36.44 S, 174.44E
#
# Note: Odd signal loss behavior with $GPGGA and $GPRMC.
Index: pkg-gpsd/test/daemon/quectelLC79D-1.log
===================================================================
--- pkg-gpsd.orig/test/daemon/quectelLC79D-1.log
+++ pkg-gpsd/test/daemon/quectelLC79D-1.log
--- a/test/daemon/quectelLC79D-1.log
+++ b/test/daemon/quectelLC79D-1.log
@@ -1,6 +1,6 @@
# Chipset: Quectel LC79D
# Submitter: Filip Jan Kubicz <filip.kubicz@tier.app>
@ -461,10 +441,8 @@ Index: pkg-gpsd/test/daemon/quectelLC79D-1.log
# Location: Kamien, Poland, 50.02457296N 19.58828604E
#
# Note: Odd PRN 103 in GAGSA and GAGSV.
Index: pkg-gpsd/test/daemon/quectelLC79D.log
===================================================================
--- pkg-gpsd.orig/test/daemon/quectelLC79D.log
+++ pkg-gpsd/test/daemon/quectelLC79D.log
--- a/test/daemon/quectelLC79D.log
+++ b/test/daemon/quectelLC79D.log
@@ -1,6 +1,6 @@
# Chipset: Quectel LC79D
# Submitter: Filip Jan Kubicz <filip.kubicz@tier.app>
@ -473,10 +451,8 @@ Index: pkg-gpsd/test/daemon/quectelLC79D.log
# Location: Kamien, Poland, 50.02457296N 19.58828604E
#
# Note: Odd PRN 102 in GAGSV.
Index: pkg-gpsd/test/daemon/trimble-lassen_iq-3dfix.log.chk
===================================================================
--- pkg-gpsd.orig/test/daemon/trimble-lassen_iq-3dfix.log.chk
+++ pkg-gpsd/test/daemon/trimble-lassen_iq-3dfix.log.chk
--- a/test/daemon/trimble-lassen_iq-3dfix.log.chk
+++ b/test/daemon/trimble-lassen_iq-3dfix.log.chk
@@ -8,22 +8,22 @@ $GPRMC,,V,,S,,W,,,,,*35
$GPGSA,A,1,,,,,,,,,,,,,,,,*32
{"class":"TPV","mode":1}
@ -507,10 +483,8 @@ Index: pkg-gpsd/test/daemon/trimble-lassen_iq-3dfix.log.chk
$GPRMC,,V,,S,,W,,,,,*35
$GPGSA,A,1,19,18,1,11,3,22,9,,,,,,,,,*08
{"class":"TPV","mode":1}
Index: pkg-gpsd/test/daemon/trimble-lassen_iq-playacar.log.chk
===================================================================
--- pkg-gpsd.orig/test/daemon/trimble-lassen_iq-playacar.log.chk
+++ pkg-gpsd/test/daemon/trimble-lassen_iq-playacar.log.chk
--- a/test/daemon/trimble-lassen_iq-playacar.log.chk
+++ b/test/daemon/trimble-lassen_iq-playacar.log.chk
@@ -1,38 +1,38 @@
-$GPRMC,040929.00,V,,S,,W,0.0000,0.000,120419,,*22
+$GPRMC,040929.00,V,,S,,W,0.0000,0.000,270899,,*20
@ -569,10 +543,8 @@ Index: pkg-gpsd/test/daemon/trimble-lassen_iq-playacar.log.chk
$GPZDA,040938.00,22,12,2006,00,00*67
$GPGGA,040938.00,2037.7075,N,08704.0535,W,1,05,2.34,27.91,M,-15.010,M,,*66
$GPRMC,040938.00,A,2037.7075,N,08704.0535,W,0.0730,,221206,-2.0,W*65
Index: pkg-gpsd/test/daemon/ublox-zed-f9p-nmea.log
===================================================================
--- pkg-gpsd.orig/test/daemon/ublox-zed-f9p-nmea.log
+++ pkg-gpsd/test/daemon/ublox-zed-f9p-nmea.log
--- a/test/daemon/ublox-zed-f9p-nmea.log
+++ b/test/daemon/ublox-zed-f9p-nmea.log
@@ -1,7 +1,7 @@
# Name: ZED-F9P NMEA
# Chipset: u-blox ZED-F9P, firmware hpg1.11

8
debian/patches/desktop-add-keywords.patch

@ -10,8 +10,6 @@ Fix lintian warnings:
packaging/X11/xgpsspeed.desktop | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/packaging/X11/xgps.desktop b/packaging/X11/xgps.desktop
index 05b2d9e..5c1bc3c 100644
--- a/packaging/X11/xgps.desktop
+++ b/packaging/X11/xgps.desktop
@@ -1,5 +1,4 @@
@ -20,13 +18,11 @@ index 05b2d9e..5c1bc3c 100644
Name=xgps
GenericName=GPS information
Comment=Display GPS information from a gpsd daemon
@@ -8,3 +7,4 @@ Icon=/usr/share/gpsd/gpsd-logo.png
@@ -8,3 +7,4 @@ Icon=/usr/local/share/gpsd/icons/gpsd-lo
Terminal=false
Type=Application
Categories=Application;Maps;Utility;
+Keywords=gps;satellite;lock;realtime
diff --git a/packaging/X11/xgpsspeed.desktop b/packaging/X11/xgpsspeed.desktop
index f24e72d..5d7e67c 100644
--- a/packaging/X11/xgpsspeed.desktop
+++ b/packaging/X11/xgpsspeed.desktop
@@ -1,5 +1,4 @@
@ -35,7 +31,7 @@ index f24e72d..5d7e67c 100644
Name=xgpsspeed
GenericName=GPS speedometer
Comment=Display GPS speed from a gpsd daemon
@@ -8,3 +7,4 @@ Icon=/usr/share/gpsd/gpsd-logo.png
@@ -8,3 +7,4 @@ Icon=/usr/local/share/gpsd/icons/gpsd-lo
Terminal=false
Type=Application
Categories=Application;Maps;Utility;

6
debian/patches/gpsd_hotplug_rules_disable_generic_serial_converters

@ -2,10 +2,8 @@ Disable hotplugging of ftdi/pl2302 usb<>serial adapters.
These adapters are too common to hit them with the gpsd hotplug script.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550964
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696020
Index: pkg-gpsd/gpsd.rules.in
===================================================================
--- pkg-gpsd.orig/gpsd.rules.in
+++ pkg-gpsd/gpsd.rules.in
--- a/gpsd.rules.in
+++ b/gpsd.rules.in
@@ -23,13 +23,15 @@
SUBSYSTEM!="tty", GOTO="gpsd_rules_end"

27
debian/patches/gpsmon-gpsmon.c-Fix-silly-warning.patch

@ -0,0 +1,27 @@
From 283fc17de89f666d16b8cef45e7b8ecd602927cf Mon Sep 17 00:00:00 2001
From: "Gary E. Miller" <gem@rellim.com>
Date: Fri, 10 Sep 2021 18:07:20 -0700
Subject: [PATCH] gpsmon/gpsmon.c: Fix silly warning.
gpsd-3.23.1~dev/gpsmon/gpsmon.c:458:27: error: format string is not a string
literal (potentially insecure) [-Werror,-Wformat-security]
Origin: upstream, https://gitlab.com/gpsd/gpsd/-/commit/283fc17de8
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997178
Last-Update: 2021-11-25
---
gpsmon/gpsmon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/gpsmon/gpsmon.c
+++ b/gpsmon/gpsmon.c
@@ -459,7 +459,7 @@ static void refresh_cmdwin(void)
{
report_lock();
(void)wmove(cmdwin, 0, 0);
- (void)wprintw(cmdwin, type_name);
+ (void)wprintw(cmdwin, "%s", type_name);
promptlen = strlen(type_name);
if (fallback != NULL && strcmp(fallback->type_name, type_name) != 0) {
(void)waddch(cmdwin, (chtype)' ');

14
debian/patches/ignore-test-xgps_deps_check

@ -1,8 +1,6 @@
Index: pkg-gpsd/SConscript
===================================================================
--- pkg-gpsd.orig/SConscript
+++ pkg-gpsd/SConscript
@@ -1607,40 +1607,6 @@ if not cleaning and not helping and conf
--- a/SConscript
+++ b/SConscript
@@ -1609,40 +1609,6 @@ if not cleaning and not helping and conf
config.env['xgps_deps'] = True
@ -43,7 +41,7 @@ Index: pkg-gpsd/SConscript
config.env['PYTHON'] = target_python_path
# For regress-driver
config.env['ENV']['PYTHON'] = target_python_path
@@ -2089,7 +2055,6 @@ python_misc = [
@@ -2091,7 +2057,6 @@ python_misc = [
"maskaudit.py",
"tests/test_clienthelpers.py",
"tests/test_misc.py",
@ -51,7 +49,7 @@ Index: pkg-gpsd/SConscript
"www/gpscap.py",
"valgrind-audit.py"
]
@@ -2985,15 +2950,6 @@ method_regress = UtilityWithHerald(
@@ -2993,15 +2958,6 @@ method_regress = UtilityWithHerald(
'method-regress', [test_packet], [
'$SRCDIR/tests/test_packet -c >/dev/null', ])
@ -67,7 +65,7 @@ Index: pkg-gpsd/SConscript
# Run test builds on remote machines
flocktest = Utility("flocktest", [], "cd devtools; ./flocktest " + gitrepo)
@@ -3017,7 +2973,6 @@ test_nondaemon = [
@@ -3025,7 +2981,6 @@ test_nondaemon = [
method_regress,
packet_regress,
rtcm_regress,

4
debian/patches/no-read-only.patch

@ -6,8 +6,8 @@ Author: Boian Bonev <bbonev@ipacct.com>
Forwarded: not-needed
Last-Update: 2021-01-14
--- gpsd-3.22-1.orig/SConscript
+++ gpsd-3.22-1/SConscript
--- a/SConscript
+++ b/SConscript
@@ -2268,7 +2268,7 @@ for (tgt, src) in templated.items():
if not iswww:
env.Default(builder)

1
debian/patches/series

@ -5,3 +5,4 @@ desktop-add-keywords.patch
no-read-only.patch
spelling.patch
7f30d88d0_gpsd-timebase.c-Don-t-compute-wrong-GPS-rollover-after-2020-10-23
gpsmon-gpsmon.c-Fix-silly-warning.patch

6
debian/patches/spelling.patch

@ -10,8 +10,6 @@ Forwarded: yes
Suggested-by: lintian
diff --git a/clients/gpsdecode.c b/clients/gpsdecode.c
index f10e42379..462d464fd 100644
--- a/clients/gpsdecode.c
+++ b/clients/gpsdecode.c
@@ -722,7 +722,7 @@ static void usage(void)
@ -32,8 +30,6 @@ index f10e42379..462d464fd 100644
" -s split24 \n"
" -t TYPES Types, comma separated.\n"
" -u Unscaled\n"
diff --git a/clients/gpspipe.c b/clients/gpspipe.c
index 54ea93593..0184505ba 100644
--- a/clients/gpspipe.c
+++ b/clients/gpspipe.c
@@ -109,7 +109,7 @@ static void usage(void)
@ -45,8 +41,6 @@ index 54ea93593..0184505ba 100644
" --output FILE Write output to FILE.\n"
" --pps Include PPS JSON in NMEA or raw mode.\n"
" --profile Include profiling info in the JSON.\n"
diff --git a/gpsd/gpsd.c b/gpsd/gpsd.c
index 3fee684ab..b7070f82a 100644
--- a/gpsd/gpsd.c
+++ b/gpsd/gpsd.c
@@ -2073,7 +2073,7 @@ int main(int argc, char *argv[])

4
debian/patches/unify-udev-rules.patch

@ -7,11 +7,9 @@ Forwarded: not-needed
gpsd.rules.in | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/gpsd.rules.in b/gpsd.rules.in
index d43f02a..100f2b5 100644
--- a/gpsd.rules.in
+++ b/gpsd.rules.in
@@ -54,9 +56,8 @@ ATTRS{idVendor}=="1546", ATTRS{idProduct
@@ -56,9 +56,8 @@ ATTRS{idVendor}=="1546", ATTRS{idProduct
ATTRS{idVendor}=="0e8d", ATTRS{idProduct}=="3329", SYMLINK+="gps%n", @UDEVCOMMAND@
# Telit wireless solutions (tested with HE910G) [linux module: cdc_acm]
ATTRS{interface}=="Telit Wireless Module Port", ATTRS{bInterfaceNumber}=="06", SYMLINK+="gps%n", @UDEVCOMMAND@

12
debian/rules

@ -122,6 +122,18 @@ ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
# disable tests on hurd due to weird ipv6 errors
# http://deb.li/4C46AEAC.7040906@bzed.de
ifeq (,$(findstring hurd,$(DEB_HOST_ARCH_OS)))
# remove those binary tests we can't patch with quilt.
rm -f test/daemon/garmin18x-bin.log
rm -f test/daemon/sirfstarv.log
rm -f test/daemon/trimble-lasseniq-bin2d.log
rm -f test/daemon/ublox-ned-m8t-sbfrx3.log
rm -f test/daemon/ublox-neo-m8t-s.log
rm -f test/daemon/ublox-neo-m8t.log
rm -f test/daemon/ublox-zed-f9p-hp.log
rm -f test/daemon/ublox-zed-f9p_hpg1.11.log
rm -f test/daemon/ublox-zed-f9t-rtcm3.log
#-$(SCONS_ENV) $(PYTHON3) /usr/bin/scons check
endif
endif

Loading…
Cancel
Save