SPECS: proftpd.spec - handle TLS options in triggers

[hawk]

Author: hawk                         Date: Mon Aug  8 13:55:43 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- handle TLS options in triggers

---- Files affected:
SPECS:
   proftpd.spec (1.205 -> 1.206) 

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.205 SPECS/proftpd.spec:1.206
--- SPECS/proftpd.spec:1.205	Mon Aug  8 13:35:39 2005
+++ SPECS/proftpd.spec	Mon Aug  8 15:55:38 2005
@@ -322,6 +322,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
@@ -331,6 +339,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
@@ -386,6 +402,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.206  2005/08/08 13:55:38  hawk
+- handle TLS options in triggers
+
 Revision 1.205  2005/08/08 11:35:39  hawk
 - fixed triggers (how they were supposed to work if they weren't included
   in subpackages at all?)
================================================================

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