[csw-devel] SF.net SVN: gar:[6879] csw/mgar/pkg/ca_certificates/trunk

[chninkel at users.sourceforge.net]

Revision: 6879
          http://gar.svn.sourceforge.net/gar/?rev=6879&view=rev
Author:   chninkel
Date:     2009-10-17 15:19:22 +0000 (Sat, 17 Oct 2009)

Log Message:
-----------
ca_certificates: postinstall should not fail if /opt/csw is shared by nfs or among solaris zones

Modified Paths:
--------------
    csw/mgar/pkg/ca_certificates/trunk/Makefile
    csw/mgar/pkg/ca_certificates/trunk/checksums
    csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall

Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/Makefile	2009-10-17 14:43:44 UTC (rev 6878)
+++ csw/mgar/pkg/ca_certificates/trunk/Makefile	2009-10-17 15:19:22 UTC (rev 6879)
@@ -40,6 +40,7 @@
 	cd "$(DESTDIR)/$(sharedstatedir)/ca-certificates/mozilla" && perl "$(CURDIR)/$(WORKDIR)/certdata2pem.pl" < "$(CURDIR)/$(WORKDIR)/certdata.txt"
 
 install-custom: install-certificates $(WORKDIR)/hash.db $(WORKDIR)/LICENSE
+	ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl"
 	ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl/certs"
 	ginstall -d "$(DESTDIR)/$(sharedstatedir)/ca-certificates"
 	ginstall -D "$(WORKDIR)/update-ca-certificates" "$(DESTDIR)/$(sbindir)/update-ca-certificates"

Modified: csw/mgar/pkg/ca_certificates/trunk/checksums
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/checksums	2009-10-17 14:43:44 UTC (rev 6878)
+++ csw/mgar/pkg/ca_certificates/trunk/checksums	2009-10-17 15:19:22 UTC (rev 6879)
@@ -5,5 +5,5 @@
 c7fd74bceddf27039a26a5f1dfede163  download/README.CSW
 787d361f8d8b8ecf89e83bb813fdaec5  download/CSWcacertificates.gspec
 31227010faaad1c2b9893ba91d6b16bb  download/CSWcacertificates.depend
-32e6ea27867c760d2279330fd4c480d3  download/CSWcacertificates.postinstall
+3f166eabf87f3f97ce51351eb070724d  download/CSWcacertificates.postinstall
 0e166bd746f506c06e1001b0c6274958  download/CSWcacertificates.postremove

Modified: csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall	2009-10-17 14:43:44 UTC (rev 6878)
+++ csw/mgar/pkg/ca_certificates/trunk/files/CSWcacertificates.postinstall	2009-10-17 15:19:22 UTC (rev 6879)
@@ -1,3 +1,15 @@
+# workaround to not fail if /opt/csw is read-only
+# in the nfs-shared or sparse zone case
+# this is temporary until configuration is moved in /etc/opt/csw
+if touch /opt/csw/.ca_certificate.test  2>/dev/null; then
+	rm -f /opt/csw/.ca_certificate.test
+else
+	echo "WARNING: /opt/csw seems to be read-only, certification authorities list will not be updated"
+	echo "         if /opt/csw is shared by nfs or among solaris zones, this is normal and you don't have
+	echo "         to worry about it, the certification authorities list present on the nfs server or in 
+	echo "         the global zone will be used."
+	exit 0
+fi
 
 # Update ca lists
 if [ -n "${BASEDIR}" ]; then


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