[httpd/f15] fix #707917 - add httpd-ssl-pass-dialog to ask for SSL password using systemd

[jorton]

commit f3a111cc0ecc1bf60b22613407f0fd520ece7486
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Wed Aug 10 08:04:14 2011 +0200

    fix #707917 - add httpd-ssl-pass-dialog to ask for SSL password using systemd

 httpd-ssl-pass-dialog |    3 +++
 httpd.spec            |   10 ++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/httpd-ssl-pass-dialog b/httpd-ssl-pass-dialog
new file mode 100755
index 0000000..1e850cd
--- /dev/null
+++ b/httpd-ssl-pass-dialog
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /bin/systemd-ask-password "Enter SSL pass phrase for $1 ($2) : "
diff --git a/httpd.spec b/httpd.spec
index 6578056..d6fb06c 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -15,6 +15,7 @@ Source1: index.html
 Source3: httpd.logrotate
 Source4: httpd.init
 Source5: httpd.sysconf
+Source6: httpd-ssl-pass-dialog
 Source10: httpd.conf
 Source11: ssl.conf
 Source12: welcome.conf
@@ -306,6 +307,11 @@ mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -m755 $RPM_SOURCE_DIR/httpd.init \
 	$RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
 
+# install http-ssl-pass-dialog
+mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}
+install -m755 $RPM_SOURCE_DIR/httpd-ssl-pass-dialog \
+	$RPM_BUILD_ROOT/%{_libexecdir}/httpd-ssl-pass-dialog
+
 # install log rotation stuff
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \
@@ -485,6 +491,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.dir
 %attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.pag
 %attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.sem
+%{_libexecdir}/httpd-ssl-pass-dialog
 
 %files devel
 %defattr(-,root,root)
@@ -500,6 +507,9 @@ rm -rf $RPM_BUILD_ROOT
 - update to 2.2.21
 - restore authnoprov patch (#736104)
 
+* Wed Aug 10 2011 Jan Kaluza <jkaluza at redhat.com> - 2.2.19-5
+- fix #707917 - add httpd-ssl-pass-dialog to ask for SSL password using systemd
+
 * Wed Jul 20 2011 Jan Kaluza <jkaluza at redhat.com> - 2.2.19-2
 - fix #716621 - suexec now works without setuid bit
 - fix #689091 - backported patch from 2.3 branch to support IPv6 in logresolve