update to gpsd-2.36. new device drivers, stability fixes, and a fix for

date handling in leap years.
This commit is contained in:
ckuethe 2008-01-04 18:57:07 +00:00
parent 9ca2e064cf
commit f94f392cc8
6 changed files with 12 additions and 77 deletions

View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.18 2007/11/14 09:43:40 steven Exp $
# $OpenBSD: Makefile,v 1.19 2008/01/04 18:57:07 ckuethe Exp $
COMMENT-main= service daemon that monitors one or more GPSes
COMMENT-motif= motif-based test apps using gpsd
COMMENT-php= web-based gpsd monitor in php
COMMENT-python= python bindings for gpsd
VERSION= 2.34
VERSION= 2.36
DISTNAME= gpsd-${VERSION}
PKGNAME-main= gpsd-${VERSION}
PKGNAME-motif= gpsd-motif-${VERSION}p0
PKGNAME-motif= gpsd-motif-${VERSION}
PKGNAME-php= gpsd-php-${VERSION}
PKGNAME-python= gpsd-python-${VERSION}p1
PKGNAME-python= gpsd-python-${VERSION}
SHARED_LIBS= gps 16.0
CATEGORIES= misc geo
@ -28,7 +28,9 @@ MASTER_SITES= ${MASTER_SITE_BERLIOS:=gpsd/}
USE_LIBTOOL= yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-ntpshm
CONFIGURE_ARGS+= --disable-ntpshm \
--enable-gpsd-user=_gpsd \
--disable-garmintxt
PSEUDO_FLAVORS= no_motif no_python
FLAVOR?=

View File

@ -1,5 +1,5 @@
MD5 (gpsd-2.34.tar.gz) = GtB+EPNORv/a8QaIdD8vQw==
RMD160 (gpsd-2.34.tar.gz) = zv6fCMgWRZe9BOUWItIXWkB4G9s=
SHA1 (gpsd-2.34.tar.gz) = ltirmURdxoE25O42IqWPTEZPdRA=
SHA256 (gpsd-2.34.tar.gz) = OejWKdpGnSAyrTVU/1AtJw4QN0kHB9euDoot57BiY9g=
SIZE (gpsd-2.34.tar.gz) = 668063
MD5 (gpsd-2.36.tar.gz) = u1TondtP3Hr4u8VTRlL5zg==
RMD160 (gpsd-2.36.tar.gz) = qjxHQdukwH8UX2L7An4rowPRYoQ=
SHA1 (gpsd-2.36.tar.gz) = T67g4+HlQicC81SoWEn9Tow6mMI=
SHA256 (gpsd-2.36.tar.gz) = DJv3lrky2rK6q3CCl4DszeQRPAjOZJdo+s1QENbaZAo=
SIZE (gpsd-2.36.tar.gz) = 736220

View File

@ -1,14 +0,0 @@
$OpenBSD: nopython-Makefile_in,v 1.1 2007/09/04 21:06:07 jolan Exp $
--- Makefile.in.orig Thu Dec 14 16:13:13 2006
+++ Makefile.in Thu Aug 30 21:11:18 2007
@@ -1428,8 +1428,8 @@ uninstall-man: uninstall-man1 uninstall-man3 uninstall
packet_names.h: packet_states.h
sed -e '/^ *\([A-Z][A-Z0-9_]*\),/s// "\1",/' -e '/_states/s//_names/' <packet_states.h >packet_names.h
-gpspacket.so: gpspacket.c libgps.la
- python setup.py build_ext --inplace
+#gpspacket.so: gpspacket.c libgps.la
+# $(PYTHON) setup.py build_ext --inplace
@HAVE_XSLT_PROCESSOR_TRUE@.xml.1:
@HAVE_XSLT_PROCESSOR_TRUE@ $(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-gpsd_c,v 1.3 2007/02/08 23:03:38 ckuethe Exp $
--- gpsd.c.orig Thu Dec 14 16:43:39 2006
+++ gpsd.c Wed Jan 10 19:12:30 2007
@@ -66,7 +66,7 @@
* The name of a tty device from which to pick up whatever the local
* owning group for tty devices is. Used when we drop privileges.
*/
-#define PROTO_TTY "/dev/ttyS0"
+#define PROTO_TTY "/dev/tty00"
#define sub_index(s) (s - subscribers)
@@ -1374,7 +1374,7 @@ int main(int argc, char *argv[])
(void)chmod(argv[i], stb.st_mode|S_IRGRP|S_IWGRP);
/*
* Drop privileges. Up to now we've been running as root. Instead,
- * set the user ID to 'nobody' and the group ID to the owning group
+ * set the user ID to '_gpsd' and the group ID to the owning group
* of a prototypical TTY device. This limits the scope of any
* compromises in the code. It requires that all GPS devices have
* their group read/write permissions set.
@@ -1384,7 +1384,7 @@ int main(int argc, char *argv[])
if (setgid(stb.st_gid) != 0)
gpsd_report(LOG_ERROR, "setgid() failed, errno %s\n", strerror(errno));
}
- pw = getpwnam("nobody");
+ pw = getpwnam("_gpsd");
if (pw)
(void)seteuid(pw->pw_uid);
}

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-libgpsd_core_c,v 1.1 2007/02/08 23:03:38 ckuethe Exp $
--- libgpsd_core.c.orig Thu Feb 8 14:07:31 2007
+++ libgpsd_core.c Thu Feb 8 14:08:52 2007
@@ -107,6 +107,7 @@ void gpsd_deactivate(struct gps_device_t
# endif /* PPS_ENABLE */
#ifdef ALLOW_RECONFIGURE
if (session->enable_reconfigure
+ && session->device_type != NULL
&& session->device_type->revert != NULL) {
session->device_type->revert(session);
session->enable_reconfigure = false;

View File

@ -1,12 +0,0 @@
$OpenBSD: python-Makefile_in,v 1.1 2007/09/04 21:06:07 jolan Exp $
--- Makefile.in.orig Wed Jan 10 19:13:52 2007
+++ Makefile.in Wed Jan 10 19:14:53 2007
@@ -1429,7 +1429,7 @@ packet_names.h: packet_states.h
sed -e '/^ *\([A-Z][A-Z0-9_]*\),/s// "\1",/' -e '/_states/s//_names/' <packet_states.h >packet_names.h
gpspacket.so: gpspacket.c libgps.la
- python setup.py build_ext --inplace
+ $(PYTHON) setup.py build_ext --inplace
@HAVE_XSLT_PROCESSOR_TRUE@.xml.1:
@HAVE_XSLT_PROCESSOR_TRUE@ $(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<