Cherry pick changes from master to fix the build
- Use Bug-872124-fix-pk11wrap-locking.patch as it is master - Fix the apply to use -p 0 so it applies cleanly - Update the changelog date
This commit is contained in:
Elio Maldonado
parent
b285bf571f
commit
0a8619f20d
|
|
@ -1,10 +1,10 @@
|
|||
Index: lib/cryptohi/keythi.h
|
||||
Index: ./mozilla/security/nss/lib/cryptohi/keythi.h
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/nss/lib/cryptohi/keythi.h,v
|
||||
retrieving revision 1.17
|
||||
diff -u -p -r1.17 keythi.h
|
||||
--- lib/cryptohi/keythi.h 16 May 2012 12:34:15 -0000 1.17
|
||||
+++ lib/cryptohi/keythi.h 2 Nov 2012 18:09:53 -0000
|
||||
--- ./mozilla/security/nss/lib/cryptohi/keythi.h 16 May 2012 12:34:15 -0000 1.17
|
||||
+++ ./mozilla/security/nss/lib/cryptohi/keythi.h 2 Nov 2012 18:09:53 -0000
|
||||
@@ -214,7 +214,12 @@ typedef struct SECKEYPublicKeyStr SECKEY
|
||||
#define SECKEY_HAS_ATTRIBUTE_SET(key,attribute) \
|
||||
(0 != (key->staticflags & SECKEY_Attributes_Cached)) ? \
|
||||
|
|
@ -19,13 +19,13 @@ diff -u -p -r1.17 keythi.h
|
|||
|
||||
/*
|
||||
** A generic key structure
|
||||
Index: lib/cryptohi/seckey.c
|
||||
Index: ./mozilla/security/nss/lib/cryptohi/seckey.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/nss/lib/cryptohi/seckey.c,v
|
||||
retrieving revision 1.68
|
||||
diff -u -p -r1.68 seckey.c
|
||||
--- lib/cryptohi/seckey.c 25 Jun 2012 21:48:39 -0000 1.68
|
||||
+++ lib/cryptohi/seckey.c 2 Nov 2012 18:09:53 -0000
|
||||
--- ./mozilla/security/nss/lib/cryptohi/seckey.c 25 Jun 2012 21:48:39 -0000 1.68
|
||||
+++ ./mozilla/security/nss/lib/cryptohi/seckey.c 2 Nov 2012 18:09:53 -0000
|
||||
@@ -1918,7 +1918,7 @@ loser:
|
||||
}
|
||||
|
||||
|
|
@ -35,13 +35,13 @@ diff -u -p -r1.68 seckey.c
|
|||
key->staticflags |= SECKEY_##attribute; \
|
||||
} else { \
|
||||
key->staticflags &= (~SECKEY_##attribute); \
|
||||
Index: lib/pk11wrap/pk11akey.c
|
||||
Index: ./mozilla/security/nss/lib/pk11wrap/pk11akey.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11akey.c,v
|
||||
retrieving revision 1.36
|
||||
diff -u -p -r1.36 pk11akey.c
|
||||
--- lib/pk11wrap/pk11akey.c 25 Apr 2012 14:50:04 -0000 1.36
|
||||
+++ lib/pk11wrap/pk11akey.c 2 Nov 2012 18:09:54 -0000
|
||||
--- ./mozilla/security/nss/lib/pk11wrap/pk11akey.c 25 Apr 2012 14:50:04 -0000 1.36
|
||||
+++ ./mozilla/security/nss/lib/pk11wrap/pk11akey.c 2 Nov 2012 18:09:54 -0000
|
||||
@@ -740,7 +740,7 @@ PK11_MakePrivKey(PK11SlotInfo *slot, Key
|
||||
CK_KEY_TYPE pk11Type = CKK_RSA;
|
||||
|
||||
|
|
@ -69,13 +69,13 @@ diff -u -p -r1.36 pk11akey.c
|
|||
|
||||
PK11_SETATTRS(&setTemplate, CKA_ID, cka_id->data, cka_id->len);
|
||||
|
||||
Index: lib/pk11wrap/pk11auth.c
|
||||
Index: ./mozilla/security/nss/lib/pk11wrap/pk11auth.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11auth.c,v
|
||||
retrieving revision 1.16
|
||||
diff -u -p -r1.16 pk11auth.c
|
||||
--- lib/pk11wrap/pk11auth.c 16 May 2012 12:34:19 -0000 1.16
|
||||
+++ lib/pk11wrap/pk11auth.c 2 Nov 2012 18:09:54 -0000
|
||||
--- ./mozilla/security/nss/lib/pk11wrap/pk11auth.c 16 May 2012 12:34:19 -0000 1.16
|
||||
+++ ./mozilla/security/nss/lib/pk11wrap/pk11auth.c 2 Nov 2012 18:09:54 -0000
|
||||
@@ -45,8 +45,9 @@ static struct PK11GlobalStruct {
|
||||
* Check the user's password. Log into the card if it's correct.
|
||||
* succeed if the user is already logged in.
|
||||
|
|
@ -165,13 +165,13 @@ diff -u -p -r1.16 pk11auth.c
|
|||
PORT_Memset(password, 0, PORT_Strlen(password));
|
||||
PORT_Free(password);
|
||||
if (rv != SECWouldBlock) break;
|
||||
Index: lib/pk11wrap/pk11merge.c
|
||||
Index: ./mozilla/security/nss/lib/pk11wrap/pk11merge.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11merge.c,v
|
||||
retrieving revision 1.10
|
||||
diff -u -p -r1.10 pk11merge.c
|
||||
--- lib/pk11wrap/pk11merge.c 25 Apr 2012 14:50:05 -0000 1.10
|
||||
+++ lib/pk11wrap/pk11merge.c 2 Nov 2012 18:09:54 -0000
|
||||
--- ./mozilla/security/nss/lib/pk11wrap/pk11merge.c 25 Apr 2012 14:50:05 -0000 1.10
|
||||
+++ ./mozilla/security/nss/lib/pk11wrap/pk11merge.c 2 Nov 2012 18:09:54 -0000
|
||||
@@ -169,15 +169,15 @@ pk11_getPrivateKeyUsage(PK11SlotInfo *sl
|
||||
{
|
||||
unsigned int usage = 0;
|
||||
|
|
@ -234,13 +234,13 @@ diff -u -p -r1.10 pk11merge.c
|
|||
flags |= CKF_VERIFY_RECOVER;
|
||||
}
|
||||
return flags;
|
||||
Index: lib/pk11wrap/pk11obj.c
|
||||
Index: ./mozilla/security/nss/lib/pk11wrap/pk11obj.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11obj.c,v
|
||||
retrieving revision 1.27
|
||||
diff -u -p -r1.27 pk11obj.c
|
||||
--- lib/pk11wrap/pk11obj.c 29 Jun 2012 17:46:25 -0000 1.27
|
||||
+++ lib/pk11wrap/pk11obj.c 2 Nov 2012 18:09:54 -0000
|
||||
--- ./mozilla/security/nss/lib/pk11wrap/pk11obj.c 29 Jun 2012 17:46:25 -0000 1.27
|
||||
+++ ./mozilla/security/nss/lib/pk11wrap/pk11obj.c 2 Nov 2012 18:09:54 -0000
|
||||
@@ -146,7 +146,7 @@ PK11_ReadULongAttribute(PK11SlotInfo *sl
|
||||
*/
|
||||
CK_BBOOL
|
||||
|
|
@ -362,13 +362,13 @@ diff -u -p -r1.27 pk11obj.c
|
|||
pk11_CloseSession(slot,session,owner);
|
||||
*outLen = out;
|
||||
if (crv != CKR_OK) {
|
||||
Index: lib/pk11wrap/pk11priv.h
|
||||
Index: ./mozilla/security/nss/lib/pk11wrap/pk11priv.h
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11priv.h,v
|
||||
retrieving revision 1.18
|
||||
diff -u -p -r1.18 pk11priv.h
|
||||
--- lib/pk11wrap/pk11priv.h 16 May 2012 12:34:20 -0000 1.18
|
||||
+++ lib/pk11wrap/pk11priv.h 2 Nov 2012 18:09:55 -0000
|
||||
--- ./mozilla/security/nss/lib/pk11wrap/pk11priv.h 16 May 2012 12:34:20 -0000 1.18
|
||||
+++ ./mozilla/security/nss/lib/pk11wrap/pk11priv.h 2 Nov 2012 18:09:55 -0000
|
||||
@@ -59,8 +59,9 @@ void PK11_CleanKeyList(PK11SlotInfo *slo
|
||||
/************************************************************
|
||||
* Slot Password Management
|
||||
|
|
|
|||
2
nss.spec
2
nss.spec
|
|
@ -584,7 +584,7 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Nov 04 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-5
|
||||
* Mon Nov 05 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-5
|
||||
- Fix pk11wrap locking which fixes 'fedpkg new-sources' and 'fedpkg update' hangs
|
||||
- Bug 872124 - nss-3.14 breaks fedpkg new-sources
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue