[csw-devel] SF.net SVN: gar:[15177] csw/mgar/pkg/openssl/trunk/files

[chninkel at users.sourceforge.net]

Revision: 15177
          http://gar.svn.sourceforge.net/gar/?rev=15177&view=rev
Author:   chninkel
Date:     2011-07-21 01:44:03 +0000 (Thu, 21 Jul 2011)

Log Message:
-----------
openssl: fixed certificates migration preinstall code (should fix #4807) (2)

Modified Paths:
--------------
    csw/mgar/pkg/openssl/trunk/files/CSWosslrt.preinstall
    csw/mgar/pkg/openssl/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.preinstall
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.preinstall	2011-07-21 01:04:24 UTC (rev 15176)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.preinstall	2011-07-21 01:44:03 UTC (rev 15177)
@@ -4,14 +4,16 @@
 # under the ca_certificates package control
 # /opt/csw/ssl/certs should now be a symbolic links 
 if [ "$MOVE_CERTS" = "Yes" ]; then
+	( 
 	cd /opt/csw/ssl/certs
-	if [ $? -ne 0 ] && [ `pwd` = "/opt/csw/ssl/certs" ]; then
+	if [ $? -eq 0 ] && [ `pwd` = "/opt/csw/ssl/certs" ]; then
 		find . -type f | while read FILE; do
 			mkdir -p -m 0755 "/opt/csw/etc/ssl/certs/`dirname $FILE`"
 			mv "$FILE" "/opt/csw/etc/ssl/certs/$FILE"
 		done		
 		find . ! -name "." -type d -exec rmdir '{}' ';'
 	fi
+	)
 	rmdir "/opt/csw/ssl/certs" 2>/dev/null || mv "/opt/csw/ssl/certs" "/opt/csw/ssl/certs.sav"
 fi
 

Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2011-07-21 01:04:24 UTC (rev 15176)
+++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2011-07-21 01:44:03 UTC (rev 15177)
@@ -1,6 +1,7 @@
 openssl (0.9.8r,REV=2011.07.20) unstable
 
   * Fixed openssl.cnf paths in ca man page.
+  * Fixed certificates migration code (Closes: #4807)
 
    -- Yann Rouillard <yann at opencsw.org>  Wed, 20 Jul 2011 15:59:52 +0200
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.