[httpd/f15] Revert last commit, I have commited it to bad branch...

[Jan Kaluža]

commit 13c6b83954d5427ada60300c0e6fe848511a2caa
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Wed Aug 10 07:50:47 2011 +0200

    Revert last commit, I have commited it to bad branch...
    
    This reverts commit cb64cdb39dfb397e26fc4dff5f5963c0105d158d.

 httpd-ssl-pass-dialog |    3 ---
 httpd.spec            |   13 +------------
 ssl.conf              |    2 +-
 3 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/httpd.spec b/httpd.spec
index c5cf7d9..0d55ae6 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,14 +8,13 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.19
-Release: 3%{?dist}
+Release: 2%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 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
@@ -305,11 +304,6 @@ 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 \
@@ -442,7 +436,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/ht*
 %{_sbindir}/apachectl
 %{_sbindir}/rotatelogs
-
 # cap_dac_override needed to write to /var/log/httpd
 %caps(cap_setuid,cap_setgid,cap_dac_override+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec
 
@@ -490,7 +483,6 @@ 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)
@@ -502,9 +494,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
-* Wed Aug 10 2011 Jan Kaluza <jkaluza at redhat.com> - 2.2.19-3
-- 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
diff --git a/ssl.conf b/ssl.conf
index d335c89..384c354 100644
--- a/ssl.conf
+++ b/ssl.conf
@@ -28,7 +28,7 @@ Listen 443
 #   Configure the pass phrase gathering process.
 #   The filtering dialog program (`builtin' is a internal
 #   terminal dialog) has to provide the pass phrase on stdout.
-SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog
+SSLPassPhraseDialog  builtin
 
 #   Inter-Process Session Cache:
 #   Configure the SSL Session Cache: First the mechanism