Merge branch 'redhat'

diff --git a/builder b/builder
index 5d0ac73..0eb12e4 100755 (executable)
--- a/builder
+++ b/builder
@@ -82,7 +82,7 @@ def build(package):
             except: pass
             run_cmd(root_command +' make dist-gzip', shell=True)
             run_cmd('cp *.tar.gz ' +dist_dir, shell=True)
-        run_cmd(schroot_command + ' make', shell=True)
+        run_cmd(schroot_command + ' make -j3', shell=True)
 
 def make_install(package):
     with current_directory(package):

diff --git a/libradsec b/libradsec
index 3f8369d..df83d99 160000 (submodule)
--- a/libradsec
+++ b/libradsec
@@ -1 +1 @@
-Subproject commit 3f8369df1ef01f54db172760877fe59f00678116
+Subproject commit df83d99a766a7a6649158aa9281ede960dab0510

diff --git a/moonshot b/moonshot
index bee6867..e8b1ec4 160000 (submodule)
--- a/moonshot
+++ b/moonshot
@@ -1 +1 @@
-Subproject commit bee686709b257689b23e490064dd74c3a5677dca
+Subproject commit e8b1ec41e7a3ecc7acaa19da063d26781304409f

diff --git a/rpm_packages b/rpm_packages
index e413980..e74b5af 100644 (file)
--- a/rpm_packages
+++ b/rpm_packages
@@ -9,4 +9,5 @@ libradsec
 jansson
 moonshot-ui
 mech_eap
+trust_router
 #cyrus-sasl

diff --git a/shibboleth/opensaml2 b/shibboleth/opensaml2
index 3fb6248..bab09c8 160000 (submodule)
--- a/shibboleth/opensaml2
+++ b/shibboleth/opensaml2
@@ -1 +1 @@
-Subproject commit 3fb624804b2b8355446a132b71ed4899c127d0bf
+Subproject commit bab09c84ae8251be0c9192fc9e2729464f5d6719

diff --git a/shibboleth/resolver b/shibboleth/resolver
index a168f04..6d35f0e 160000 (submodule)
--- a/shibboleth/resolver
+++ b/shibboleth/resolver
@@ -1 +1 @@
-Subproject commit a168f04c2e7b0b728115b3325ef3708f92c4f8b3
+Subproject commit 6d35f0ec87aa6a54e3d0a1db6e5dab86f2b7f36f

diff --git a/shibboleth/sp b/shibboleth/sp
index a88b3c8..0a9ddad 160000 (submodule)
--- a/shibboleth/sp
+++ b/shibboleth/sp
@@ -1 +1 @@
-Subproject commit a88b3c840ca70bbaa1dc828790e36b394e3dfba9
+Subproject commit 0a9ddadc097d07ab0245929924eea64b21e61c2f

diff --git a/shibboleth/xmltooling b/shibboleth/xmltooling
index a6c298a..ad7a6a5 160000 (submodule)
--- a/shibboleth/xmltooling
+++ b/shibboleth/xmltooling
@@ -1 +1 @@
-Subproject commit a6c298a3f8f10edca954b03d497da6970132e8b7
+Subproject commit ad7a6a5109ca27aadf85fa88f36ea90cb08ec007

diff --git a/source_packages b/source_packages
index 8cb918f..1efc390 100644 (file)
--- a/source_packages
+++ b/source_packages
@@ -11,4 +11,3 @@ ui
 moonshot
 #cyrus-sasl
 trust_router
-freeradius-server

diff --git a/ui b/ui
index 5bfb76e..e82f5b0 160000 (submodule)
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit 5bfb76eca23e2ef4e711aa53ca3240aa4b95aaf2
+Subproject commit e82f5b0879c3d53b420605ecddad6405f4cbb921