diff options
| author | Martin Kosek <mkosek@redhat.com> | 2013-10-25 10:22:08 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2013-10-25 15:35:39 +0200 |
| commit | 4bed0de60d5bac005c9c54c7376b8dd873d1dd1d (patch) | |
| tree | 055daf74853095047110f7548ba0289a3b365dbb /freeipa.spec.in | |
| parent | 0880d030ae7211b9d2e7279195e67f4f5712a69c (diff) | |
| download | freeipa.git-4bed0de60d5bac005c9c54c7376b8dd873d1dd1d.tar.gz freeipa.git-4bed0de60d5bac005c9c54c7376b8dd873d1dd1d.tar.xz freeipa.git-4bed0de60d5bac005c9c54c7376b8dd873d1dd1d.zip | |
Remove mod_ssl conflict
Since mod_nss-1.0.8-24, mod_nss and mod_ssl can co-exist on one
machine (of course, when listening to different ports).
To make sure that mod_ssl is not configured to listen on 443
(default mod_ssl configuration), add a check to the installer checking
of either mod_nss or mod_ssl was configured to listen on that port.
https://fedorahosted.org/freeipa/ticket/3974
Diffstat (limited to 'freeipa.spec.in')
| -rw-r--r-- | freeipa.spec.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in index 5b37c4c4..21ed8f90 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -121,7 +121,7 @@ Requires: mod_auth_kerb >= 5.4-16 %else Requires: mod_auth_kerb >= 5.4-8 %endif -Requires: mod_nss +Requires: mod_nss >= 1.0.8-24 Requires: python-ldap Requires: python-krbV Requires: acl @@ -166,10 +166,6 @@ Conflicts: bind < 9.8.2-0.4.rc2 # member. Conflicts: nss-pam-ldapd < 0.8.4 -# mod_proxy provides a single API to communicate over SSL. If mod_ssl -# is even loaded into Apache then it grabs this interface. -Conflicts: mod_ssl - Obsoletes: ipa-server >= 1.0 %description server @@ -836,6 +832,9 @@ fi %endif # ONLY_CLIENT %changelog +* Fri Aug 25 2013 Martin Kosek <mkosek@redhat.com> - 3.3.90-4 +- Remove mod_ssl conflict, it can now live with mod_nss installed + * Wed Sep 4 2013 Ana Krivokapic <akrivoka@redhat.com> - 3.3.90-3 - Conform to tmpfiles.d packaging guidelines |