SPECS: apache-mod_gnutls.spec - with apr_memcache - generate dhfil...

[adamg]

Author: adamg                        Date: Fri Sep 14 09:10:06 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- with apr_memcache
- generate dhfile/rsafile during post

---- Files affected:
SPECS:
   apache-mod_gnutls.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_gnutls.spec
diff -u SPECS/apache-mod_gnutls.spec:1.7 SPECS/apache-mod_gnutls.spec:1.8
--- SPECS/apache-mod_gnutls.spec:1.7	Sun Sep  9 01:28:53 2007
+++ SPECS/apache-mod_gnutls.spec	Fri Sep 14 11:10:01 2007
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - with apr_memcache: http://www.outoforder.cc/projects/libs/apr_memcache
 %define		mod_name	gnutls
 %define 	apxs		/usr/sbin/apxs
 Summary:	SSL v3, TLS 1.0 and TLS 1.1 encryption for Apache HTTPD
@@ -21,6 +19,7 @@
 URL:		http://www.outoforder.cc/projects/apache/mod_gnutls/
 BuildRequires:	apache-apxs
 BuildRequires:	apache-devel >= 2.0.42
+BuildRequires:	apr_memcache-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gnutls-devel >= 1.2.0
@@ -84,17 +83,24 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+if [ "$1" = "1" ]; then
+	echo "Generating dhfile/rsafile - this may take some time..."
+        d=/etc/httpd/tls
+        [ -f "$d/dhfile" ] || /usr/bin/certtool --generate-dh-params --bits 1024 --outfile $d/dhfile
+        [ -f "$d/rsafile" ] || /usr/bin/certtool --generate-privkey --bits 512 --outfile $d/rsafile
+fi
 %service -q httpd restart
 
 %postun
 if [ "$1" = "0" ]; then
 	%service -q httpd restart
+	rm -f /etc/httpd/tls/{dhfile,rsafile}
 fi
 
 %files
 %defattr(644,root,root,755)
 %attr(750,root,root) %dir %{_sysconfdir}/tls
-%attr(640,root,root) %verify(not md5 mtime size) %{_sysconfdir}/tls/*
+%dir %{_sysconfdir}/tls
 %attr(640,root,root) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_gnutls.conf
 %attr(755,root,root) %{_pkglibdir}/*
 
@@ -104,6 +110,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007/09/14 09:10:01  adamg
+- with apr_memcache
+- generate dhfile/rsafile during post
+
 Revision 1.7  2007/09/08 23:28:53  adamg
 - set paths to dhfile / rsafile (-paths.patch)
 - config file
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_gnutls.spec?r1=1.7&r2=1.8&f=u