SPECS (RA-branch): proftpd.spec - optimize triggers to use only on...

[hawk]

Author: hawk                         Date: Tue Aug 16 12:15:19 2005 GMT
Module: SPECS                         Tag: RA-branch
---- Log message:
- optimize triggers to use only one sed invocation
- add missing Requires(triggerpostun) for sed 4.0

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

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.136.2.10 SPECS/proftpd.spec:1.136.2.11
--- SPECS/proftpd.spec:1.136.2.10	Mon Aug  8 15:51:36 2005
+++ SPECS/proftpd.spec	Tue Aug 16 14:15:13 2005
@@ -20,7 +20,7 @@
 Summary(zh_CN):	Ň×ÓÚšÜŔíľÄ,°˛ČŤľÄ FTP ˇţÎńĆ÷
 Name:		proftpd
 Version:	1.2.10
-Release:	2
+Release:	2.1
 Epoch:		1
 License:	GPL v2+
 Group:		Daemons
@@ -124,7 +124,8 @@
 PreReq:		rc-inetd
 Requires(post):	fileutils
 Requires(post):	grep
-Requires(post):	sed
+Requires(post):	sed >= 4.0
+Requires(triggerpostun):	sed >= 4.0
 Provides:	proftpd = %{epoch}:%{version}-%{release}
 Provides:	ftpserver
 Obsoletes:	proftpd-standalone
@@ -157,7 +158,8 @@
 Requires(post,preun):	/sbin/chkconfig
 Requires(post):	fileutils
 Requires(post):	grep
-Requires(post):	sed
+Requires(post):	sed >= 4.0
+Requires(triggerpostun):	sed >= 4.0
 Provides:	proftpd = %{epoch}:%{version}-%{release}
 Provides:	ftpserver
 Obsoletes:	proftpd-inetd
@@ -317,37 +319,37 @@
 
 %triggerpostun inetd -- proftpd-inetd < 1.2.10
 echo "Changing deprecated config options"
-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
+cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
+sed -i -e '
+	s/AuthPAMAuthoritative\b/AuthPAM/
+	s/TCPDServiceName/TCPServiceName/
+	s/TlsRsaCertFile/TLSRSACertificateFile/
+	s/TlsRsaKeyFile/TLSRSACertificateKeyFile/
+	s/TlsDsaCertFile/TLSDSACertificateFile/
+	s/TlsDsaKeyFile/TLSDSACertificateKeyFile/
+	s/TlsCrlFile/TLSCARevocationFile/
+	s/TlsDhParamFile/TLSDHParamFile/
+	s/TlsCipherList/TLSCipherSuite/
+	s/TlsCertsOk/TLSVerifyClient/
+	/UseTCPD/d
+' %{_sysconfdir}/proftpd.conf
 
 %triggerpostun standalone -- proftpd-standalone < 1.2.10
 echo "Changing deprecated config options"
-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
+cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
+sed -i -e '
+	s/AuthPAMAuthoritative\b/AuthPAM/
+	s/TCPDServiceName/TCPServiceName/
+	s/TlsRsaCertFile/TLSRSACertificateFile/
+	s/TlsRsaKeyFile/TLSRSACertificateKeyFile/
+	s/TlsDsaCertFile/TLSDSACertificateFile/
+	s/TlsDsaKeyFile/TLSDSACertificateKeyFile/
+	s/TlsCrlFile/TLSCARevocationFile/
+	s/TlsDhParamFile/TLSDHParamFile/
+	s/TlsCipherList/TLSCipherSuite/
+	s/TlsCertsOk/TLSVerifyClient/
+	/UseTCPD/d
+' %{_sysconfdir}/proftpd.conf
 
 %files common
 %defattr(644,root,root,755)
@@ -400,6 +402,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.136.2.11  2005/08/16 12:15:13  hawk
+- optimize triggers to use only one sed invocation
+- add missing Requires(triggerpostun) for sed 4.0
+
 Revision 1.136.2.10  2005/08/08 13:51:36  hawk
 - handle TLS options in triggers
 
================================================================

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