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

[chninkel at users.sourceforge.net]

Revision: 17994
          http://gar.svn.sourceforge.net/gar/?rev=17994&view=rev
Author:   chninkel
Date:     2012-05-11 18:27:59 +0000 (Fri, 11 May 2012)
Log Message:
-----------
added a temporary static hash.db file

Modified Paths:
--------------
    csw/mgar/pkg/ca_certificates/trunk/Makefile
    csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates

Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/Makefile	2012-05-11 17:27:04 UTC (rev 17993)
+++ csw/mgar/pkg/ca_certificates/trunk/Makefile	2012-05-11 18:27:59 UTC (rev 17994)
@@ -49,12 +49,12 @@
 include gar/category.mk
 
 $(WORKDIR)/hash.db: install-certificates
-	rm -f $(WORKDIR)/hash.db
-	find "$(DESTDIR)/$(sharedstatedir)/$(NAME)" -name *.pem | while read FILE; do \
-		for HASH_TYPE in $(HASH_TYPES); do \
-			echo "`basename $$FILE`=`/opt/csw/bin/openssl x509 -$$HASH_TYPE -fingerprint -noout -in "$$FILE" | head -n 1`.0" >> $(WORKDIR)/hash.db; \
-		done; \
-	done
+	#rm -f $(WORKDIR)/hash.db
+	#find "$(DESTDIR)/$(sharedstatedir)/$(NAME)" -name *.pem | while read FILE; do \
+	#	for HASH_TYPE in $(HASH_TYPES); do \
+	#		echo "`basename $$FILE`=`/opt/csw/bin/openssl x509 -$$HASH_TYPE -fingerprint -noout -in "$$FILE" | head -n 1`.0" >> $(WORKDIR)/hash.db; \
+	#	done; \
+	#done
 
 $(WORKDIR)/LICENSE: $(WORKDIR)/certdata.txt
 	sed -ne '/BEGIN LICENSE BLOCK/,/END LICENSE BLOCK/p' "$(WORKDIR)/certdata.txt" | grep -v "LICENSE BLOCK" \
@@ -70,7 +70,7 @@
 	ginstall -d "$(DESTDIR)/$(sysconfdir)/ssl/certs"
 	ginstall -d "$(DESTDIR)/$(sharedstatedir)/$(NAME)"
 	ginstall -D "$(WORKDIR)/update-ca-certificates" "$(DESTDIR)/$(sbindir)/update-ca-certificates"
-	ginstall -D "$(WORKDIR)/hash.db" "$(DESTDIR)/$(sharedstatedir)/$(NAME)/hash.db"
+	ginstall -D "$(FILEDIR)/hash.db" "$(DESTDIR)/$(sharedstatedir)/$(NAME)/hash.db"
 	ginstall -D "$(WORKDIR)/README.CSW" "$(DESTDIR)/$(docdir)/$(NAME)/README.CSW"
 	ginstall -D "$(WORKDIR)/LICENSE" "$(DESTDIR)/$(docdir)/$(NAME)/license"
 	

Modified: csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates	2012-05-11 17:27:04 UTC (rev 17993)
+++ csw/mgar/pkg/ca_certificates/trunk/files/update-ca-certificates	2012-05-11 18:27:59 UTC (rev 17994)
@@ -147,7 +147,7 @@
 elif [ -f "$CACERTS_DIR/hash.db" ]; then
 	cd "$CERTSDIR"
 	for FILE in *.pem; do
-		HASHES="`awk -F= " \\\$1 == \"$FILE\" { print \\\$2 }" "$CACERTS_DIR/hash.db"`"
+		HASHES=`awk -F= " \\\$1 == \"$FILE\" { print \\\$2 }" "$CACERTS_DIR/hash.db"`
 		if [ -n "$HASHES" ]; then
 			for HASH in $HASHES; do
 				ln -s "$FILE" "$HASH"

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