On 10/25/2013 03:46 PM, Petr Viktorin wrote:
On 10/25/2013 02:09 PM, Martin Kosek wrote:
On 10/25/2013 12:33 PM, Petr Viktorin wrote:
On 10/25/2013 10:31 AM, Martin Kosek wrote:
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

[...]

Right. I used service.print_msg as you suggested on IRC.

ACK, pushed to:
master: 4bed0de60d5bac005c9c54c7376b8dd873d1dd1d (fixed up spec changelog)
ipa-3-3: 6d24870c870d0cff0857dd7219d5475854bf8b85

Jenkins found one more issue: wrong date(s) in the changelog(s).

Pushed as one-liner to master: 88154b5709a898b94aa0338f16af67b37c9a95ff
and two-liner to ipa-3-3: c8a4f041ced515cf164003534a07aa675d0f323a

--
PetrĀ³
From 2f09fa9b0bafb8575d8726347c00b3ea484265a3 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pvikt...@redhat.com>
Date: Fri, 25 Oct 2013 15:30:59 +0200
Subject: [PATCH] Fix date in last changelog entry

---
 freeipa.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 21ed8f90c384da56ee6fd08156e19d1beadc9c57..11ae934d928370eb13f45162a13f40a9acd64b74 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -832,7 +832,7 @@ fi
 %endif # ONLY_CLIENT
 
 %changelog
-* Fri Aug 25 2013 Martin Kosek <mko...@redhat.com> - 3.3.90-4
+* Fri Oct 25 2013 Martin Kosek <mko...@redhat.com> - 3.3.90-4
 - Remove mod_ssl conflict, it can now live with mod_nss installed
 
 * Wed Sep 4 2013 Ana Krivokapic <akriv...@redhat.com> - 3.3.90-3
-- 
1.8.3.1

From 284e466bc3c43ef36c59cfa539b91350a9e73199 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pvikt...@redhat.com>
Date: Fri, 25 Oct 2013 15:30:59 +0200
Subject: [PATCH] freeipa.spec: Fix changelog dates

---
 freeipa.spec.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index eee32a5a2b097339f6ca432c649d4e13c54594c7..a091164907735d659be61fe29221cbce6934c77d 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -832,13 +832,13 @@ fi
 %endif # ONLY_CLIENT
 
 %changelog
-* Fri Aug 25 2013 Martin Kosek <mko...@redhat.com> - 3.3.2-1
+* Fri Oct 25 2013 Martin Kosek <mko...@redhat.com> - 3.3.2-1
 - Remove mod_ssl conflict, it can now live with mod_nss installed
 
 * Wed Sep 4 2013 Ana Krivokapic <akriv...@redhat.com> - 3.3.0-3
 - Conform to tmpfiles.d packaging guidelines
 
-* Wed Aug 29 2013 Petr Viktorin <pvikt...@redhat.com> - 3.3.0-2
+* Wed Aug 28 2013 Petr Viktorin <pvikt...@redhat.com> - 3.3.0-2
 - Add man pages to the tests subpackage
 
 * Mon Aug 12 2013 Petr Viktorin <pvikt...@redhat.com> - 3.3.0-1
-- 
1.8.3.1

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to