Updated init and conf files for bug #281705.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 24 insertions, 20 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 63a98faf1b26..9c4dc60c4f51 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.42 2009/08/01 17:01:19 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.43 2009/08/23 00:01:40 nerdboy Exp $
+
+  22 Aug 2009; Steve Arnold <nerdboy@gentoo.org> files/gpsd.conf,
+  files/gpsd.init:
+  Updated init and conf files for bug #281705.  Newer gpsd appears to play
+  much better with start-stop-daemon now (plus the gpsd arguments have
+  changed again).
 
   01 Aug 2009; Steve Arnold <nerdboy@gentoo.org> gpsd-2.39.ebuild:
   Made python a hard dependency for this version (upstream changes, see 
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index cace58ab9d3c..5dbf5e04c20f 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -2,13 +2,13 @@ AUX 40-usb-serial.rules 213 RMD160 f29e28c0ea6e349811d26676da9d9eea56dfb167 SHA1
 AUX 99-gpsd-usb.rules 2139 RMD160 eb3bba2a845debfbf0a740bfec636a708a5dd9ea SHA1 375b1b8b2b92cb35e4893f3f3832e8d6b9cdba5e SHA256 78d048d3925c2c6ac591e0639bb219ed258405ce3bbbd8ae7ace396454c8bf75
 AUX gpsd-2.33-duplicate-device-add-hang.patch 1094 RMD160 651375eacec543581266b3bfbf996ee31f4bbc03 SHA1 b00cd23f00bdd24280664c8a38efa752838909fe SHA256 504784c891073fa8825704c9e94598fceb1c95c0750566e230ace19e7c777b83
 AUX gpsd-2.33-hotplug-background-fix.patch 2231 RMD160 1b5d0326501627ec99dd08fb10a2b0eaed2f69e1 SHA1 9ba7b5a3f802d12527ad6937121027a41ecccbce SHA256 acf258d1b15fda4aa303105a62807d28cde1173817a7e46ad719be479cf28a33
-AUX gpsd.conf 1067 RMD160 8447ea231556079586993b51836da40618b8b185 SHA1 e25bc5aa7acd239dc28fc850ab8debcdd55e8f59 SHA256 ac7e21d444926fe37377b8a6ed61773d17bf4c1faafe1474dee3e6b8d578e833
-AUX gpsd.init 894 RMD160 44c6eba4d7e81fb7226e0432a2eba2ab30988d8a SHA1 3bc473dcca4ab4695ca68e679df63b949d974197 SHA256 7c5ade04f6ea215fcdb7cbe36fce2570568a7eb3795e874520983afe58193c82
+AUX gpsd.conf 1144 RMD160 13e4290aefa0dacc4cdb3de90d372e5d46cc1def SHA1 73657f8f0b14d803e0bf2b0575a464178ac3d734 SHA256 d41db7375281d881495f7cf9630c3b5e8c0ac1352e0dcf01e07a760066a05068
+AUX gpsd.init 951 RMD160 b23f4e3192b3a24bc8f6083c1ab88c09fd973245 SHA1 4efd39d33752125f8e69b6d8fa0dae8cbf5a2463 SHA256 53955992324f9db039e68ba8df8ff9c868bfd55d09984f10fdf57082bba5d877
 DIST gpsd-2.32.tar.gz 617947 RMD160 87cd19a4e8126ee98f8a6908829569a2a1dc5ccd SHA1 9fd6010834f1c56e755ea6515dba80431544a277 SHA256 95bee94daaf0168387152223fac186ba40d7b02657bfc0336c90edc5ea15bf10
 DIST gpsd-2.38.tar.gz 776598 RMD160 e5c8a05170286fd7aac87c9d182cfdf5a8f6c6b0 SHA1 310cad336e06faed34a7bd3503b169b502520925 SHA256 ae828da850ac0590fd47768856c4ec29021332204182abe4ad94098d72168474
 DIST gpsd-2.39.tar.gz 834649 RMD160 9e643156a71433a02d64284130dff200eb276527 SHA1 d3f33da9f8e789119366ec4781957eed118aa08f SHA256 ee3b2fb403112c3871e7e4fdb915cdc25b020f3208318ba61e9ac37692832a21
 EBUILD gpsd-2.32.ebuild 3401 RMD160 f13804b204afd6e4ef0fadaabc70601721b9f7c5 SHA1 851d86a9eaf1b80777dc171ae61332833d5c29af SHA256 ae1e659d5f9eee39c325e55ca66156d3a8678e022f30b1d0e059d2b1624763ba
 EBUILD gpsd-2.38.ebuild 5405 RMD160 216ee67f760bb433a3673cca9ccc49e915c549c4 SHA1 38f378f09c974ecdc1f0fc270520dbe982921981 SHA256 d0a47f98f21703d0f05059e39c5214540236101d93d58271d8dd655c4f7f3987
 EBUILD gpsd-2.39.ebuild 5081 RMD160 24e8812f2fe58bedc495bda43281ff93baaef14d SHA1 3192788e67f5de029298ff9fe48e7a9cf993742f SHA256 ae3278093b23b113a348cf60d924de04d17f72db2455b47caf361115e2e35932
-MISC ChangeLog 8881 RMD160 27be7af50e8e1be4cd54139085a68120469983aa SHA1 e5a012d3ec7ad384a8b0da7d212a0db26e74d9cb SHA256 d5bebededdf3e263c69c9494bb49045f5feee101d04547b925344b781348112f
+MISC ChangeLog 9131 RMD160 bdb81065583912be017f3dacd4146a5b446aca11 SHA1 5e071cf5eec87135bdcd696e6a87f9d6c6021965 SHA256 00438e474f9d745c10e77afc9e9292e5c2f00d6b9a03e6099329360460bbad52
 MISC metadata.xml 888 RMD160 0eba5567425a4a4f782558810e5c993debc9a4cd SHA1 5698bec7ea6f864fa3cc1c7347445bf1e2490131 SHA256 687e6f5954c47a4c4940f6ef6cdf3f1870207f200bd07c2bd1487dca5ee0ffb9
diff --git a/sci-geosciences/gpsd/files/gpsd.conf b/sci-geosciences/gpsd/files/gpsd.conf
index f9c7c4a2d763..baf9bb1695d0 100644
--- a/sci-geosciences/gpsd/files/gpsd.conf
+++ b/sci-geosciences/gpsd/files/gpsd.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.6 2008/02/23 20:03:59 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.7 2009/08/23 00:01:40 nerdboy Exp $
 
 # Config file for gpsd server
 
@@ -8,21 +8,19 @@
 # setup for USB/Serial, Garmin, or other, however, without hotplug,
 # gpsd still needs to have the device set on the commandline.
 
-# Set GPS_DEV to the device to be used by the gpsd server.
-# This device must have the group tty and be writable (see
-# the INSTALL file in the docs).
+# A device may be a local serial device for GPS input, or a URL of 
+# the form:
+#      [{dgpsip|ntrip}://][user:passwd@]host[:port][/stream]
+# in which case it specifies an input source for DGPS or ntrip data.
+# Set GPS_DEV to the device to be used by the gpsd server (see the
+# INSTALL file in the docs for more info).  Run gpsd -h to see a list
+# supported driver types (most are enabled by default).
 
 # This example is for a Deluo GPS Serial/USB converter dongle, really
 # a pl2303 chip - CONFIG_USB_SERIAL_PL2303 in modern 2.6 kernels.
 # The normal udev config provides the correct /dev/ttyUSB0 device.
-# The second example is just a normal serial port...
 
-#GPS_DEV="/dev/ttyUSB0"
+GPS_DEV="/dev/ttyUSB0"
 
-#GPS_DEV="/dev/ttyS0
-
-# Use the following for gpsd with ntp instead of the older one below
-#GPSD_OPTS="-n ${GPS_DEV}"
-
-GPSD_OPTS="-P /var/run/gpsd.pid -f GPS0 -F /var/run/gpsd.sock"
+GPSD_OPTS="-b -n -P /var/run/gpsd.pid -F /var/run/gpsd.sock"
 
diff --git a/sci-geosciences/gpsd/files/gpsd.init b/sci-geosciences/gpsd/files/gpsd.init
index d3b7d3501006..35219c2a46f6 100755
--- a/sci-geosciences/gpsd/files/gpsd.init
+++ b/sci-geosciences/gpsd/files/gpsd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.6 2007/06/11 03:04:29 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.7 2009/08/23 00:01:40 nerdboy Exp $
 
 # You can use this init script to manage a serial port GPS or other
 # non-hotplug device (or any device for that matter).  By design,
@@ -22,14 +22,14 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting gpsd"
-	touch /var/run/gpsd.pid
-	/usr/sbin/gpsd ${GPSD_OPTS} ${GPS_DEV}
+	start-stop-daemon --start --quiet --exec /usr/sbin/gpsd \
+		-- ${GPSD_OPTS} ${GPS_DEV}
 	eend $? "Failed to start gpsd"
 }
 
 stop() {
 	ebegin "Stopping gpsd"
-	killall -q gpsd >/dev/null
+	start-stop-daemon --stop --quiet --pidfile /var/run/gpsd.pid
 	eend $? "Failed to stop gpsd"
 	rm -f /var/run/gpsd.pid
 }