[csw-devel] SF.net SVN: gar:[20407] csw/mgar/pkg/openssl1/trunk/Makefile

[chninkel at users.sourceforge.net]

Revision: 20407
          http://gar.svn.sourceforge.net/gar/?rev=20407&view=rev
Author:   chninkel
Date:     2013-03-10 22:35:23 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
openssl1/trunk: fixed t4 engine patch update script

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2013-03-10 22:34:40 UTC (rev 20406)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2013-03-10 22:35:23 UTC (rev 20407)
@@ -241,18 +241,23 @@
 
 
 T4_ENGINE_FILES =  eng_t4_aes_asm.h eng_t4_bignum.h eng_t4_des_asm.h eng_t4_err.h eng_t4_sha2_asm.h 
-T4_ENGINE_FILES =  eng_t4.c eng_t4_des.c eng_t4_err.c eng_t4_md5.c eng_t4_montmul.c eng_t4_sha1.c eng_t4_sha256.c eng_t4_sha512.c
+T4_ENGINE_FILES += eng_t4.c eng_t4_des.c eng_t4_err.c eng_t4_md5.c eng_t4_montmul.c eng_t4_sha1.c eng_t4_sha256.c eng_t4_sha512.c
 T4_ENGINE_FILES += t4_aes.S t4_des.S t4_md5.S t4_sha1.S t4_sha2.S
 MERCURIAL_URL = https://hg.openindiana.org/upstream/oracle/userland-gate/raw-file/tip/components/openssl/openssl-1.0.1/
 PATCH_DATE = $(shell date +"%Y-%m-%d %H:%M:%S.%N %z")
+TMP_PATCH_FILE = "/tmp/t4_engine_tmp.patch"
 update-t4-patch:
 	@echo "Updating t4 engine patch from $(MERCURIAL_URL)..."
 	@( wget --quiet --output-document=- $(MERCURIAL_URL)/patches/openssl-$(VERSION)-t4-engine.sparc-patch; \
 	   for FILE in $(T4_ENGINE_FILES); do \
 		DIR="engine"; \
 		if echo $$FILE | grep "\.S$$" >/dev/null; then DIR="`basename $$FILE .S | cut -d_ -f2 | cut -b1-3`/asm"; fi; \
+		wget --quiet --output-document=$(TMP_PATCH_FILE) $(MERCURIAL_URL)/engines/t4/$$FILE | sed -e 's/^/+/'; \
+		echo "Index: crypto/$$DIR/$$FILE"; \
+		echo "==================================================================="; \
 		echo "diff -uNr openssl-$(VERSION)/$$DIR/$$FILE openssl-$(VERSION)/$$DIR/$$FILE"; \
 		echo "--- openssl-$(VERSION)/crypto/$$DIR/$$FILE 1970-01-01 01:00:00.000000000 +0100"; \
 		echo "+++ openssl-$(VERSION)/crypto/$$DIR/$$FILE $(PATCH_DATE)"; \
-		wget --quiet --output-document=- $(MERCURIAL_URL)/engines/t4/$$FILE | sed -e 's/^/+/'; \
+		echo "@@ -0,0 +1,`wc -l $(TMP_PATCH_FILE) | awk '{ print $$1 }'` @@"; \
+		sed -e 's/^/+/' "$(TMP_PATCH_FILE)"; \
 	   done; ) > "$(FILEDIR)/openssl-$(VERSION)-t4-engine.sparc-patch"

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