Updated with specific daemon user for uucp group.

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

4 files changed, 41 insertions, 12 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 9c4dc60c4f51..66652f0f729d 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.43 2009/08/23 00:01:40 nerdboy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.44 2010/01/03 07:29:03 nerdboy Exp $
+
+*gpsd-2.39-r1 (03 Jan 2010)
+
+  03 Jan 2010; Steve Arnold <nerdboy@gentoo.org> -gpsd-2.39.ebuild,
+  +gpsd-2.39-r1.ebuild, metadata.xml:
+  Updated with specific daemon user for uucp group.  Currently controlled
+  via use flag.
 
   22 Aug 2009; Steve Arnold <nerdboy@gentoo.org> files/gpsd.conf,
   files/gpsd.init:
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 5dbf5e04c20f..1ace06aeb7b1 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -9,6 +9,6 @@ DIST gpsd-2.38.tar.gz 776598 RMD160 e5c8a05170286fd7aac87c9d182cfdf5a8f6c6b0 SHA
 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 9131 RMD160 bdb81065583912be017f3dacd4146a5b446aca11 SHA1 5e071cf5eec87135bdcd696e6a87f9d6c6021965 SHA256 00438e474f9d745c10e77afc9e9292e5c2f00d6b9a03e6099329360460bbad52
-MISC metadata.xml 888 RMD160 0eba5567425a4a4f782558810e5c993debc9a4cd SHA1 5698bec7ea6f864fa3cc1c7347445bf1e2490131 SHA256 687e6f5954c47a4c4940f6ef6cdf3f1870207f200bd07c2bd1487dca5ee0ffb9
+EBUILD gpsd-2.39-r1.ebuild 5526 RMD160 ad4a124ee9606b953f3e35db9260611d88a56914 SHA1 e37255e1c237e49535af95ea9e4e96461341869c SHA256 54fddc802cf2a0cdb918f736c2c3c121c56d999419c2ade9c42ed99149cd92e0
+MISC ChangeLog 9357 RMD160 5afbf9a87a80919d19516d736feafdf40f429967 SHA1 4bf242f296f18bd93deedfa51a1f79c04e8e5d4c SHA256 c1b9b3be6f7c37e3744b567e7d355da60d5854ef971d1186f381194d852a1da3
+MISC metadata.xml 1036 RMD160 a8eb31ca3ab1bce798c241acd2978facb680d4d6 SHA1 e59e389ad669d2ec8d7bb6b51eccdc4d39adf778 SHA256 0a99a5aee08d78d720fa0b07712660cba2ea9c229ed99ca6e488f3dea5e1116e
diff --git a/sci-geosciences/gpsd/gpsd-2.39.ebuild b/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild
index 92e0db0a6dd8..06e305fac230 100644
--- a/sci-geosciences/gpsd/gpsd-2.39.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.39.ebuild,v 1.4 2009/08/01 19:30:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.39-r1.ebuild,v 1.1 2010/01/03 07:29:03 nerdboy Exp $
+
+EAPI="2"
 
 inherit autotools eutils distutils flag-o-matic
 
@@ -12,7 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="dbus garmin minimal ntp ocean tntc usb X"
+IUSE="dbus garmin +gpsd_user -minimal ntp ocean pl2303 tntc usb X"
 
 RDEPEND="X? (
 		x11-libs/libXmu
@@ -42,17 +44,26 @@ DEPEND="${RDEPEND}
 		dev-libs/libxslt
 	)"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+pkg_setup() {
+	# Run the gpsd daemon as user gpsd and group uucp, see bug #282130
+	if use gpsd_user; then
+		enewuser gpsd -1 -1 -1 "uucp"
+	else
+		einfo "USE=gpsd_user is dsiabled; no gpsd user added."
+	fi
+}
+
+src_prepare() {
 	# add -lm to setup.py again (see bug #250757)
 	sed -i \
 	    -e "s:, gpspacket_sources:, gpspacket_sources, libraries=['m']:g" \
 	    -e "s:geoid.c\"]:geoid.c\"], libraries=['m']:g" \
 	    setup.py || die "sed 1 failed"
+
 	# fix Garmin text struct
 	sed -i -e "s:RTCM2_PACKET;:RTCM2_PACKET,:g" \
 	    drivers.c || die "sed 2 failed"
+
 	# add missing include file (see bug #162361)
 	sed -i -e "s:gps.h libgpsmm.h:gps.h libgpsmm.h gpsd_config.h:g" \
 	    Makefile.am || die "sed 3 failed"
@@ -60,11 +71,14 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 
 	local my_conf="--enable-shared --with-pic --enable-static"
 		# --enable-superstar2 is missing a header file
 
+	# Drop privs to user gpsd, see bug #282130
+	use gpsd_user && my_conf="${my_conf} --enable-gpsd-user=gpsd"
+
 	distutils_python_version
 
 	if ! use ntp; then
@@ -88,7 +102,9 @@ src_compile() {
 		$(use_enable garmin garmintxt) \
 		|| die "econf failed"
 	fi
+}
 
+src_compile() {
 	# still needs an explicit link flag (bug #250757)
 	append-ldflags -Wl,-z,-defs -Wl,--no-undefined
 
@@ -110,6 +126,10 @@ src_install() {
 		doexe gpsd.hotplug
 		insinto /etc/udev/rules.d
 		doins "${FILESDIR}"/99-gpsd-usb.rules
+		if use pl2303; then
+			dosed "s:#SYSFS:SYSFS:g" \
+			    /etc/udev/rules.d/99-gpsd-usb.rules
+		fi
 		keepdir /var/run/usb # needed for REMOVER
 	else
 		newconfd "${FILESDIR}"/gpsd.conf gpsd
diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml
index 07bcaf2ce779..608ecca5be53 100644
--- a/sci-geosciences/gpsd/metadata.xml
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -12,10 +12,12 @@
 </longdescription>
 <use>
   <flag name='garmin'>Enable support for Garmin simple text protocol</flag>
+  <flag name='gpsd_user'>Add gpsd user for daemon privileges.</flag>
   <flag name='minimal'>Reduced install set, limited number of devices and 
    client, no X deps</flag>
   <flag name='ntp'>Enable <pkg>net-misc/ntp</pkg> shared memory interface
     and PPS kernel support for GPS time</flag>
+  <flag name='pl2303'>Enable udev rules for PL2303 USB-serial converter</flag>
   <flag name='ocean'>Enable OceanServer support</flag>
   <flag name='tntc'>Enable True North Technologies digital compass support</flag>
 </use>