packages: roundcubemail/roundcubemail.spec - extra precaution

glen glen at pld-linux.org
Mon Apr 16 22:49:18 CEST 2012


Author: glen                         Date: Mon Apr 16 20:49:18 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- extra precaution

---- Files affected:
packages/roundcubemail:
   roundcubemail.spec (1.125 -> 1.126) 

---- Diffs:

================================================================
Index: packages/roundcubemail/roundcubemail.spec
diff -u packages/roundcubemail/roundcubemail.spec:1.125 packages/roundcubemail/roundcubemail.spec:1.126
--- packages/roundcubemail/roundcubemail.spec:1.125	Mon Apr 16 22:44:15 2012
+++ packages/roundcubemail/roundcubemail.spec	Mon Apr 16 22:49:13 2012
@@ -309,7 +309,11 @@
 )
 
 if grep -q '24ByteDESkey' %{_sysconfdir}/main.inc.php; then
-	%{__sed} -i -e "s/rcmail-\!24ByteDESkey\*Str/$(makedesstr)/" %{_sysconfdir}/main.inc.php
+	des=$(makedesstr)
+	# precaution if random str generation failed
+	if [ c$(echo -n "$des" | wc -c) = c24 ]; then
+		%{__sed} -i -e "s/rcmail-\!24ByteDESkey\*Str/$des/" %{_sysconfdir}/main.inc.php
+	fi
 fi
 
 %pretrans
@@ -414,6 +418,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.126  2012/04/16 20:49:13  glen
+- extra precaution
+
 Revision 1.125  2012/04/16 20:44:15  glen
 - (my) old change: replace default des string in config file for better security
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/roundcubemail/roundcubemail.spec?r1=1.125&r2=1.126



More information about the pld-cvs-commit mailing list