utils/gpsd: Update to 3.16

Update gpsd to upstream release 3.16
The local patch is already included upstream, therefore
removed here.

Signed-off-by: Paul Wassi <redacted>

diff --git a/utils/gpsd/Makefile b/utils/gpsd/Makefile
index 4adb5316dd92c017c7846a2548f4ce389537362c..f57ecdc5140b344a38d73aa6f923f97ae56029ec 100644 (file)
--- a/utils/gpsd/Makefile
+++ b/utils/gpsd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gpsd
-PKG_VERSION:=3.15
-PKG_RELEASE:=2
+PKG_VERSION:=3.16
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download-mirror.savannah.gnu.org/releases/gpsd/
-PKG_MD5SUM:=afd79b87337fadf38ee2a7c4314dac79
+PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME)
+PKG_MD5SUM:=68691b5de4c94f82ec4062b042b5eb63
 
 PKG_MAINTAINER:=Pushpal Sidhu <psidhu.devel@gmail.com>
 PKG_LICENSE:=BSD-3-Clause

diff --git a/utils/gpsd/patches/0001-Remove-a-BSD-ism.patch b/utils/gpsd/patches/0001-Remove-a-BSD-ism.patch
deleted file mode 100644 (file)
index 55004ab..0000000
--- a/utils/gpsd/patches/0001-Remove-a-BSD-ism.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 95c99f69e026e8c57aecba545e51c97f3b284e75 Mon Sep 17 00:00:00 2001
-From: "Gary E. Miller" <gem@rellim.com>
-Date: Tue, 23 Jun 2015 14:36:26 -0700
-Subject: [PATCH] Remove a BSD-ism.
-
-CTRL('L') is a BSD-ism.  CTRL() is defined in sys/ttydefaults.h
-which does not always exist.  Instead of adding scons tests for
-needing CTRL() and its include files just replace with a simple
-constant.
-
-Needed for musl and found by Baruch Siach <baruch@tkos.co.il>
----
- gpsmon.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/gpsmon.c b/gpsmon.c
-index c3001c8..58c8300 100644
---- a/gpsmon.c
-+++ b/gpsmon.c
-@@ -583,6 +583,9 @@ static void select_packet_monitor(struct gps_device_t *device)
-       (void)wnoutrefresh(devicewin);
- }
- 
-+/* Control-L character */
-+#define CTRL_L 0x0C
-+
- static char *curses_get_command(void)
- /* char-by-char nonblocking input, return accumulated command line on \n */
- {
-@@ -591,7 +594,8 @@ static char *curses_get_command(void)
-     int c;
- 
-     c = wgetch(cmdwin);
--    if (c == CTRL('L')) {
-+    if (CTRL_L == c) {
-+        /* ^L is to repaint the screen */
-       (void)clearok(stdscr, true);
-       if (active != NULL && (*active)->initialize != NULL)
-           (void)(*active)->initialize();
--- 
-2.6.0
-