SPECS (RA-branch): proftpd.spec - handle TLS options in triggers

[hawk]

Author: hawk                         Date: Mon Aug  8 13:51:41 2005 GMT
Module: SPECS                         Tag: RA-branch
---- Log message:
- handle TLS options in triggers

---- Files affected:
SPECS:
   proftpd.spec (1.136.2.9 -> 1.136.2.10) 

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.136.2.9 SPECS/proftpd.spec:1.136.2.10
--- SPECS/proftpd.spec:1.136.2.9	Mon Aug  8 13:30:58 2005
+++ SPECS/proftpd.spec	Mon Aug  8 15:51:36 2005
@@ -320,6 +320,14 @@
 cp /etc/ftpd/proftpd.conf /etc/ftpd/proftpd.conf.backup
 sed -i -e 's/AuthPAMAuthoritative\b/AuthPAM/' /etc/ftpd/proftpd.conf
 sed -i -e 's/TCPDServiceName/TCPServiceName/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaCertFile/TLSRSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaKeyFile/TLSRSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaCertFile/TLSDSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaKeyFile/TLSDSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCrlFile/TLSCARevocationFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDhParamFile/TLSDHParamFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCipherList/TLSCipherSuite/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCertsOk/TLSVerifyClient/' /etc/ftpd/proftpd.conf
 grep -v UseTCPD /etc/ftpd/proftpd.conf > /etc/ftpd/proftpd.conf.tmp
 mv -f /etc/ftpd/proftpd.conf.tmp /etc/ftpd/proftpd.conf
 chmod 640 /etc/ftpd/proftpd.conf
@@ -329,6 +337,14 @@
 cp /etc/ftpd/proftpd.conf /etc/ftpd/proftpd.conf.backup
 sed -i -e 's/AuthPAMAuthoritative\b/AuthPAM/' /etc/ftpd/proftpd.conf
 sed -i -e 's/TCPDServiceName/TCPServiceName/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaCertFile/TLSRSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsRsaKeyFile/TLSRSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaCertFile/TLSDSACertificateFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDsaKeyFile/TLSDSACertificateKeyFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCrlFile/TLSCARevocationFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsDhParamFile/TLSDHParamFile/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCipherList/TLSCipherSuite/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TlsCertsOk/TLSVerifyClient/' /etc/ftpd/proftpd.conf
 grep -v UseTCPD /etc/ftpd/proftpd.conf > /etc/ftpd/proftpd.conf.tmp
 mv -f /etc/ftpd/proftpd.conf.tmp /etc/ftpd/proftpd.conf
 chmod 640 /etc/ftpd/proftpd.conf
@@ -384,6 +400,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.136.2.10  2005/08/08 13:51:36  hawk
+- handle TLS options in triggers
+
 Revision 1.136.2.9  2005/08/08 11:30:58  hawk
 - merged 1.2.10-6 from HEAD fixed typos and triggers
 - release 2 for Ra (wasn't built for Ac)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.136.2.9&r2=1.136.2.10&f=u