[nss-softokn] - regenerate the patch with gendiff so it applies cleanly

Elio Maldonado emaldonado at fedoraproject.org
Tue Jun 14 22:17:57 UTC 2011


commit dce1375da2099274de308e35946a9acb164795f2
Author: Elio Maldonado <emaldona at emaldonadesktop.localdomain>
Date:   Tue Jun 14 15:15:26 2011 -0700

    - regenerate the patch with gendiff so it applies cleanly

 bz709517.patch |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/bz709517.patch b/bz709517.patch
index 6322c24..e5e730a 100644
--- a/bz709517.patch
+++ b/bz709517.patch
@@ -1,12 +1,6 @@
-? .rijndael.h.swp
-? patch
-Index: intel-aes.s
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/freebl/intel-aes.s,v
-retrieving revision 1.3.2.1
-diff -u -p -r1.3.2.1 intel-aes.s
---- intel-aes.s	18 Nov 2010 01:31:18 -0000	1.3.2.1
-+++ intel-aes.s	1 Jun 2011 22:58:18 -0000
+diff -up ./mozilla/security/nss/lib/freebl/intel-aes.s.709517 ./mozilla/security/nss/lib/freebl/intel-aes.s
+--- ./mozilla/security/nss/lib/freebl/intel-aes.s.709517	2011-06-14 15:09:30.889379023 -0700
++++ ./mozilla/security/nss/lib/freebl/intel-aes.s	2011-06-14 15:09:55.594460793 -0700
 @@ -1654,8 +1654,8 @@ intel_aes_decrypt_cbc_256:
  	.byte 0x66,0x41,0x0f,0x38,0xdf,0xc8	/* aesdeclast %xmm8, %xmm1 */
  	movdqu	112(%rdi), %xmm8


More information about the scm-commits mailing list