From: Sam Hartman <hartmans@debian.org>
Date: Thu, 12 Mar 2015 16:35:14 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Tag: v1.5.1-debian~14
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=786226f8081d601ed4544db08ec0fb427ea7f2c2;hp=-c

Merge branch 'master' into debian

Most of the 1.5 changes

Conflicts:
	trust_router.spec
---

786226f8081d601ed4544db08ec0fb427ea7f2c2
diff --combined trust_router.spec
index a00abe5,22ee59e..33371a8
--- a/trust_router.spec
+++ b/trust_router.spec
@@@ -1,6 -1,6 +1,6 @@@
  %global optflags %{optflags} -Wno-parentheses
  Name:           trust_router
- Version:        1.4
+ Version:        1.5
  Release:        1%{?dist}
  Summary:        Moonshot Trust Router
  
@@@ -82,7 -82,7 +82,7 @@@ rm -rf $RPM_BUILD_ROO
  
  %pre
  getent group trustrouter > /dev/null || groupadd -r trustrouter
 -getent passwd trustrouter > /dev/null || useradd -r -g trustrouter -d /var/lib/trust_router -s /sbin/nologin -c "GSS-EAP Trust Router service account" trustrouter
 +getent passwd trustrouter > /dev/null || useradd -r -g trustrouter -d /var/lib/trustrouter -s /sbin/nologin -c "GSS-EAP Trust Router service account" trustrouter
  exit 0