Merge commit '2.5.0' into moonshot-packaging-fixes

Conflicts:
	shibboleth.spec.in

diff --cc shibboleth.spec.in
index 391c41c,207eeed..90882f5
--- 1/shibboleth.spec.in
--- 2/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@@ -19,10 -20,12 +20,10 @@@ BuildRequires:     libxerces-c-devel >= 2.8
  BuildRequires:        libxml-security-c-devel >= 1.4.0
  BuildRequires:        libxmltooling-devel >= 1.5
  BuildRequires:        libsaml-devel >= 2.5
 +BuildRequires: krb5-moonshot-devel
 +
  %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
- %{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
+ %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
 -%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
 -Requires:             libcurl-openssl >= 7.21.7
 -BuildRequires:        chrpath
 -%endif
  BuildRequires:  gcc-c++, zlib-devel, boost-devel >= 1.32.0
  %{!?_without_doxygen:BuildRequires: doxygen}
  %{!?_without_odbc:BuildRequires:unixODBC-devel}