[arch-commits] Commit in gpsd/trunk (PKGBUILD gpsd-3.11-gpsdctl-service.patch)

[Bartłomiej Piotrowski]

    Date: Sunday, January 18, 2015 @ 18:39:52
  Author: bpiotrowski
Revision: 229535

upgpkg: gpsd 3.11-4

modify gpsdctl at .service to reflect configuration files location (FS#42359)

Added:
  gpsd/trunk/gpsd-3.11-gpsdctl-service.patch
Modified:
  gpsd/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   11 +++++++----
 gpsd-3.11-gpsdctl-service.patch |   18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-18 17:24:23 UTC (rev 229534)
+++ PKGBUILD	2015-01-18 17:39:52 UTC (rev 229535)
@@ -6,7 +6,7 @@
 
 pkgname=gpsd
 pkgver=3.11
-pkgrel=3
+pkgrel=4
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64')
 url="http://catb.org/gpsd/"
@@ -15,11 +15,13 @@
 optdepends=('php: generate a PHP status page for your GPS'
             'php-gd: image support for the PHP status page'
             'pygtk: GUI frontends')
-makedepends=('scons' 'docbook-xsl' 'chrpath')
+makedepends=('scons' 'docbook-xsl' 'chrpath' 'hardening-wrapper')
 backup=('etc/gpsd.conf')
 install="${pkgname}.install"
 source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'gpsd.conf')
+        'gpsd.conf'
+        'gpsd-3.11-gpsdctl-service.patch')
+validpgpkeys=('3CE764D4FAFF5FA810B203BFADF516D38421F11C') # Eric S. Raymond
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -86,4 +88,5 @@
 
 md5sums=('ba28369992886fccb85ce560e4727e20'
          'SKIP'
-         '3e963df3f9f7ef3572ecc648ae829315')
+         '3e963df3f9f7ef3572ecc648ae829315'
+         '45932e924a0a415ce3c82d8a118fd7be')

Added: gpsd-3.11-gpsdctl-service.patch
===================================================================
--- gpsd-3.11-gpsdctl-service.patch	                        (rev 0)
+++ gpsd-3.11-gpsdctl-service.patch	2015-01-18 17:39:52 UTC (rev 229535)
@@ -0,0 +1,18 @@
+diff --git a/systemd/gpsdctl at .service b/systemd/gpsdctl at .service
+index 58c5176..3d1590d 100644
+--- a/systemd/gpsdctl at .service
++++ b/systemd/gpsdctl at .service
+@@ -6,8 +6,9 @@ After=dev-%i.device
+ 
+ [Service]
+ Type=oneshot
+-Environment="GPSD_SOCKET=/var/run/gpsd.sock"
+-EnvironmentFile=-/etc/default/gpsd
++EnvironmentFile=/etc/gpsd.conf
+ RemainAfterExit=yes
+-ExecStart=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl add /dev/%I || :"
+-ExecStop=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl remove /dev/%I || :"
++
++ExecStartPre=/usr/bin/chmod a+rw /dev/%I
++ExecStart=/usr/bin/gpsdctl add /dev/%I
++ExecStop=/usr/bin/gpsdctl remove /dev/%I