* [gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-nss-3.15.patch
@ 2013-06-21 4:09 Mike Gilbert (floppym)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert (floppym) @ 2013-06-21 4:09 UTC (permalink / raw
To: gentoo-commits
floppym 13/06/21 04:09:19
Added: chromium-nss-3.15.patch
Log:
Beta channel bump. Backport nss-3.15 compatibility patch.
(Portage version: 2.2.0_alpha181/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path
1.1 www-client/chromium/files/chromium-nss-3.15.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-nss-3.15.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-nss-3.15.patch?rev=1.1&content-type=text/plain
Index: chromium-nss-3.15.patch
===================================================================
--- a/net/third_party/nss/ssl/bodge/secitem_array.c
+++ b/net/third_party/nss/ssl/bodge/secitem_array.c
@@ -6,6 +6,7 @@
* Support routines for SECItemArray data structure.
*/
+#include "nssutil.h"
#include "seccomon.h"
#include "secitem.h"
#include "secerr.h"
@@ -13,10 +14,15 @@
typedef struct SECItemArrayStr SECItemArray;
+#define NSSUTIL_VERSION_NUM \
+ (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH)
+#if NSSUTIL_VERSION_NUM < 31500
+// Added in NSS 3.15.
struct SECItemArrayStr {
SECItem *items;
unsigned int len;
};
+#endif
SECItemArray *
SECITEM_AllocArray(PLArenaPool *arena, SECItemArray *array, unsigned int len)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-nss-3.15.patch
@ 2013-07-26 16:17 PaweA Hajdan (phajdan.jr)
0 siblings, 0 replies; 2+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2013-07-26 16:17 UTC (permalink / raw
To: gentoo-commits
phajdan.jr 13/07/26 16:17:15
Modified: chromium-nss-3.15.patch
Log:
Update the nss-3.15 patch to also work for gcc-4.5, bug #476832 by Matteo 'The Peach' Pescarin.
(Portage version: 2.1.12.2/cvs/Linux i686, signed Manifest commit with key 30427902)
Revision Changes Path
1.2 www-client/chromium/files/chromium-nss-3.15.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-nss-3.15.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-nss-3.15.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-nss-3.15.patch?r1=1.1&r2=1.2
Index: chromium-nss-3.15.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/files/chromium-nss-3.15.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chromium-nss-3.15.patch 21 Jun 2013 04:09:19 -0000 1.1
+++ chromium-nss-3.15.patch 26 Jul 2013 16:17:15 -0000 1.2
@@ -10,12 +10,12 @@
#include "secerr.h"
@@ -13,10 +14,15 @@
- typedef struct SECItemArrayStr SECItemArray;
-
+#define NSSUTIL_VERSION_NUM \
+ (NSSUTIL_VMAJOR * 10000 + NSSUTIL_VMINOR * 100 + NSSUTIL_VPATCH)
+#if NSSUTIL_VERSION_NUM < 31500
+// Added in NSS 3.15.
+ typedef struct SECItemArrayStr SECItemArray;
+
struct SECItemArrayStr {
SECItem *items;
unsigned int len;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-07-26 16:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-21 4:09 [gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-nss-3.15.patch Mike Gilbert (floppym)
-- strict thread matches above, loose matches on Subject: below --
2013-07-26 16:17 PaweA Hajdan (phajdan.jr)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox