X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=trust_router.spec;h=2283be0189da2c5a3a0ee1cffe59fc3dc738bc7c;hb=09c39eeca9a525447435d3e1766a7350c730f0f8;hp=a33ec3fd7c927d380fa67b7ba319fd64290cf71c;hpb=c860965405f262db15adc929708b4b4431483c97;p=trust_router.git

diff --git a/trust_router.spec b/trust_router.spec
index a33ec3f..2283be0 100644
--- a/trust_router.spec
+++ b/trust_router.spec
@@ -1,6 +1,6 @@
 %global optflags %{optflags} -Wno-parentheses
 Name:           trust_router
-Version:        1.3.1
+Version:        3.4.0~2
 Release:        1%{?dist}
 Summary:        Moonshot Trust Router
 
@@ -10,10 +10,12 @@ URL:            http://www.project-moonshot.org/
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  krb5-devel 
+BuildRequires: autoconf, automake, m4, libtool
+BuildRequires:  krb5-devel, glib2-devel
 BuildRequires: jansson-devel >= 2.4
-BuildRequires: sqlite-devel, openssl-devel, libtalloc-devel
-Requires:       moonshot-gss-eap, sqlite
+BuildRequires: sqlite-devel, openssl-devel, libtalloc-devel, libevent-devel
+%{?el7:BuildRequires: systemd}
+Requires:       moonshot-gss-eap >= 0.9.3, sqlite
 
 %description
 The trust router provides a mechanism for discovering the topology of
@@ -42,7 +44,7 @@ packages that wish trust_router functionality.
 
 %prep
 %setup -q
-
+autoreconf -f -i
 
 %build
 %configure --disable-static
@@ -56,17 +58,20 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 # Install config files
 install -D -m 755 redhat/init $RPM_BUILD_ROOT/%{_initrddir}/trust_router
-install -D -m 640 redhat/trusts.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/trusts.cfg
-install -D -m 640 redhat/default-main.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/conf.d/default/main.cfg
-install -D -m 640 redhat/tr-test-main.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/conf.d/tr-test/main.cfg
+install -D -m 640 redhat/organizations.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/organizations.cfg
+install -D -m 640 redhat/default-internal.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/conf.d/default/internal.cfg
+install -D -m 640 redhat/tr-test-internal.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/conf.d/tr-test/internal.cfg
 install -D -m 640 redhat/sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/trust_router
+install -D -m 640 redhat/sysconfig.tids $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/tids
+install -D -m 755 redhat/tids.init $RPM_BUILD_ROOT/%{_initrddir}/tids
 
 # Link shared config
-ln -s ../../trusts.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/conf.d/default/trusts.cfg
-ln -s ../../trusts.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/conf.d/tr-test/trusts.cfg
+ln -s ../../organizations.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/conf.d/default/organizations.cfg
+ln -s ../../organizations.cfg $RPM_BUILD_ROOT/%{_sysconfdir}/trust_router/conf.d/tr-test/organizations.cfg
 
 # Install wrapper scripts
 install -D -m 755 redhat/tidc-wrapper $RPM_BUILD_ROOT/%{_bindir}/tidc-wrapper
+install -D -m 755 redhat/tids-wrapper $RPM_BUILD_ROOT/%{_bindir}/tids-wrapper
 install -D -m 755 redhat/trust_router-wrapper $RPM_BUILD_ROOT/%{_bindir}/trust_router-wrapper
 
 # As we're building an RPM, we don't need the init scripts etc. in /usr/share
@@ -77,22 +82,30 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/trust_router/redhat
 rm -rf $RPM_BUILD_ROOT
 
 
+%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
+exit 0
+
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
 %post
-id trustrouter 2>/dev/null || adduser --system  -d /var/lib/trust_router trustrouter
-
 # Data directory
-test -d /var/lib/trust_router ||mkdir /var/lib/trust_router
-chown trustrouter:trustrouter /var/lib/trust_router
-sqlite3 </usr/share/trust_router/schema.sql /var/lib/trust_router/keys
-chown trustrouter:trustrouter /var/lib/trust_router/keys
-chmod 660 /var/lib/trust_router/keys
+tr_home=/var/lib/trust_router
+tr_schema=${tr_home}/.schema_1.5.2
+test -d ${tr_home} ||mkdir ${tr_home}
+chown trustrouter:trustrouter ${tr_home}
+test -e $tr_schema || rm -f $tr_home/keys
+sqlite3 </usr/share/trust_router/schema.sql ${tr_home}/keys
+touch $tr_schema
+chown trustrouter:trustrouter ${tr_home}/keys
+chmod 660 ${tr_home}/keys
 
 # Log Directory
-mkdir /var/log/trust_router
+test -d /var/log/trust_router ||mkdir /var/log/trust_router
 chown root:trustrouter /var/log/trust_router
 chmod 770 /var/log/trust_router
 
@@ -101,12 +114,22 @@ chmod 770 /var/log/trust_router
 %files
 %defattr(-,root,root,-)
 %doc README
+#%{_bindir}/tidc
+#%{_bindir}/tidc-wrapper
+#%{_bindir}/tids
+#%{_bindir}/tids-wrapper
+#%{_bindir}/trmon
+#%{_bindir}/trust_router
+#%{_bindir}/trust_router-wrapper
 %{_bindir}/*
 %{_datadir}/trust_router/schema.sql
-#/lib/systemd/system/tids.service
 
+%{_initrddir}/tids
 %{_initrddir}/trust_router
 
+%{?el7:%{_unitdir}/tids.service}
+
+%config(noreplace) %{_sysconfdir}/sysconfig/tids
 %config(noreplace) %{_sysconfdir}/sysconfig/trust_router
 
 %dir %attr(755,root,trustrouter) %{_sysconfdir}/trust_router
@@ -114,11 +137,11 @@ chmod 770 /var/log/trust_router
 %dir %attr(755,root,trustrouter) %{_sysconfdir}/trust_router/conf.d/default
 %dir %attr(755,root,trustrouter) %{_sysconfdir}/trust_router/conf.d/tr-test
 
-%attr(640,root,trustrouter) %config(noreplace) %{_sysconfdir}/trust_router/trusts.cfg
-%attr(640,root,trustrouter) %config(noreplace) %{_sysconfdir}/trust_router/conf.d/default/main.cfg
-%attr(640,root,trustrouter) %config(noreplace) %{_sysconfdir}/trust_router/conf.d/tr-test/main.cfg
-%attr(640,root,trustrouter) %config(noreplace) %{_sysconfdir}/trust_router/conf.d/default/trusts.cfg
-%attr(640,root,trustrouter) %config(noreplace) %{_sysconfdir}/trust_router/conf.d/tr-test/trusts.cfg
+%attr(640,root,trustrouter) %config(noreplace) %{_sysconfdir}/trust_router/organizations.cfg
+%attr(640,root,trustrouter) %config(noreplace) %{_sysconfdir}/trust_router/conf.d/default/internal.cfg
+%attr(640,root,trustrouter) %config(noreplace) %{_sysconfdir}/trust_router/conf.d/tr-test/internal.cfg
+%attr(640,root,trustrouter) %config(noreplace) %{_sysconfdir}/trust_router/conf.d/default/organizations.cfg
+%attr(640,root,trustrouter) %config(noreplace) %{_sysconfdir}/trust_router/conf.d/tr-test/organizations.cfg
 
 %files libs
 %defattr(-,root,root,-)
@@ -128,6 +151,3 @@ chmod 770 /var/log/trust_router
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
-
-
-