Index: Makefile =================================================================== RCS file: /cvs/ports/misc/gpsd/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- Makefile 2006/04/24 16:38:10 1.7 +++ Makefile 2006/06/15 01:36:07 @@ -3,10 +3,10 @@ COMMENT= "service daemon that monitors one or more GPSes" COMMENT-motif= "motif-based test apps using gpsd" -VERSION= 2.29 +VERSION= 2.33 DISTNAME= gpsd-${VERSION} -PKGNAME= gpsd-${VERSION}p2 -PKGNAME-motif= gpsd-motif-${VERSION}p0 +PKGNAME= gpsd-${VERSION} +PKGNAME-motif= gpsd-motif-${VERSION} SHARED_LIBS= gps 16.0 CATEGORIES= misc @@ -25,7 +25,9 @@ MASTER_SITES= http://download.berlios.de/gpsd/ USE_LIBTOOL= yes -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE= autoconf +AUTOCONF_VERSION=2.59 +AUTOMAKE_VERSION=1.9 CONFIGURE_ARGS+= --disable-ntpshm CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" Index: distinfo =================================================================== RCS file: /cvs/ports/misc/gpsd/distinfo,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 distinfo --- distinfo 2005/09/05 00:34:59 1.1.1.1 +++ distinfo 2006/06/15 01:36:07 @@ -1,4 +1,4 @@ -MD5 (gpsd-2.29.tar.gz) = 3ff80db0e7d906457e5a7a1b04fcb4ec -RMD160 (gpsd-2.29.tar.gz) = bde27102cfcf1d434ca684b075c7fb31af0d73bc -SHA1 (gpsd-2.29.tar.gz) = bfbfab28922ad566e67409ea1d57108057d75eea -SIZE (gpsd-2.29.tar.gz) = 602411 +MD5 (gpsd-2.33.tar.gz) = 03b57754091e4a34e27c78e1dc35c55e +RMD160 (gpsd-2.33.tar.gz) = 175b90cb8dda1d85964078a4f14cec84b0cc4885 +SHA1 (gpsd-2.33.tar.gz) = 0dbb3dad459fc4a0ca7e4ba5884e67c93d4b679f +SIZE (gpsd-2.33.tar.gz) = 639348 Index: patches/patch-Makefile_in =================================================================== RCS file: patch-Makefile_in diff -N patch-Makefile_in --- /dev/null Sat Aug 30 18:16:59 1997 +++ patches/patch-Makefile_in Thu Jun 15 01:36:07 2006 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- Makefile.in.orig Wed Jun 7 09:08:35 2006 ++++ Makefile.in Wed Jun 14 19:24:28 2006 +@@ -334,7 +334,7 @@ target_alias = @target_alias@ + # Build stuff depending on Motif + # + @HAVE_MOTIF_TRUE@MOTIF_PROGS = xgps xgpsspeed +-XMLTO = xmlto ++XMLTO = true + @HAVE_DBUS_TRUE@INCLUDES = $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_API_SUBJECT_TO_CHANGE=1 + @HAVE_DBUS_TRUE@DBUSPROGS = gpxlogger + @HAVE_DBUS_TRUE@gpxlogger_LDADD = $(DBUS_GLIB_LIBS) -lm Index: patches/patch-gpsd_c =================================================================== RCS file: /cvs/ports/misc/gpsd/patches/patch-gpsd_c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-gpsd_c --- patches/patch-gpsd_c 2005/09/05 00:34:59 1.1.1.1 +++ patches/patch-gpsd_c 2006/06/15 01:36:07 @@ -1,7 +1,7 @@ -$OpenBSD: patch-gpsd_c,v 1.1.1.1 2005/09/05 00:34:59 marcm Exp $ ---- gpsd.c.orig Fri Aug 5 04:59:38 2005 -+++ gpsd.c Sun Aug 21 18:16:13 2005 -@@ -68,7 +68,7 @@ +$OpenBSD$ +--- gpsd.c.orig Fri Jun 9 06:34:09 2006 ++++ gpsd.c Wed Jun 14 19:24:24 2006 +@@ -64,7 +64,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. */ @@ -10,7 +10,16 @@ static fd_set all_fds; static int debuglevel; -@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) +@@ -1244,7 +1244,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. +@@ -1254,7 +1254,7 @@ int main(int argc, char *argv[]) if (setgid(stb.st_gid) != 0) gpsd_report(0, "setgid() failed, errno %s\n", strerror(errno)); } Index: patches/patch-gpsd_h =================================================================== RCS file: /cvs/ports/misc/gpsd/patches/patch-gpsd_h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-gpsd_h --- patches/patch-gpsd_h 2005/09/05 00:34:59 1.1.1.1 +++ patches/patch-gpsd_h 2006/06/15 01:36:07 @@ -1,17 +0,0 @@ -$OpenBSD: patch-gpsd_h,v 1.1.1.1 2005/09/05 00:34:59 marcm Exp $ ---- gpsd.h.orig Sun Aug 21 13:39:32 2005 -+++ gpsd.h Sun Aug 21 13:39:49 2005 -@@ -171,13 +171,11 @@ struct gps_device_t { - #define SIRF_GE_232 0x04 /* SiRF at firmware rev >= 232 */ - #define UBLOX 0x08 /* uBlox firmware with packet 0x62 */ - unsigned long satcounter; --#ifdef NTPSHM_ENABLE - unsigned int time_seen; - #define TIME_SEEN_GPS_1 0x01 /* Seen GPS time variant 1? */ - #define TIME_SEEN_GPS_2 0x02 /* Seen GPS time variant 2? */ - #define TIME_SEEN_UTC_1 0x04 /* Seen UTC time variant 1? */ - #define TIME_SEEN_UTC_2 0x08 /* Seen UTC time variant 2? */ --#endif /* NTPSHM_ENABLE */ - } sirf; - #endif /* SIRFII_ENABLE */ - #ifdef TSIP_ENABLE Index: patches/patch-serial_c =================================================================== RCS file: /cvs/ports/misc/gpsd/patches/patch-serial_c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-serial_c --- patches/patch-serial_c 2005/09/05 00:34:59 1.1.1.1 +++ patches/patch-serial_c 2006/06/15 01:36:07 @@ -1,12 +0,0 @@ -$OpenBSD: patch-serial_c,v 1.1.1.1 2005/09/05 00:34:59 marcm Exp $ ---- serial.c.orig Tue Aug 16 17:07:13 2005 -+++ serial.c Sun Aug 21 14:12:28 2005 -@@ -97,7 +97,7 @@ void gpsd_set_speed(struct gps_device_t - int gpsd_open(struct gps_device_t *session) - { - gpsd_report(1, "opening GPS data source at '%s'\n", session->gpsdata.gps_device); -- if ((session->gpsdata.gps_fd = open(session->gpsdata.gps_device, O_RDWR|O_NOCTTY)) < 0) { -+ if ((session->gpsdata.gps_fd = open(session->gpsdata.gps_device, O_RDWR|O_NONBLOCK|O_NOCTTY)) < 0) { - gpsd_report(1, "device open failed: %s\n", strerror(errno)); - return -1; - } Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/misc/gpsd/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- pkg/PLIST 2005/09/16 09:51:27 1.2 +++ pkg/PLIST 2006/06/15 01:36:07 @@ -3,6 +3,7 @@ @newuser _gpsd:551:dialer::GPS server:/nonexistent:/sbin/nologin %%SHARED%% bin/cgps +bin/cgpxlogger bin/gpsfake bin/gpsflash bin/gpspipe @@ -14,13 +15,13 @@ include/libgpsmm.h lib/libgps.a lib/libgps.la +@man man/man1/gps.1 @man man/man1/gpsfake.1 @man man/man1/gpsflash.1 @man man/man1/gpspipe.1 @man man/man1/gpsprof.1 @man man/man1/rtcmdecode.1 @man man/man1/sirfmon.1 -@man man/man1/xgps.1 @man man/man3/libgps.3 @man man/man3/libgpsd.3 @man man/man3/libgpsmm.3