Bug 858231, clean up security/patches directory, r=wtc, DONTBUILD
authorKai Engert <kaie@kuix.de>
Thu, 06 Jun 2013 02:06:49 +0200
changeset 145662 796a79fc347a878cbb3c32465a45b1a0258c7f05
parent 145661 b1da96acb0dcc9cf44803bcd8dde0808ad0ccf4e
child 145663 8f48c49425ab36aa32130ace7892e4e43db849b5
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswtc, DONTBUILD
bugs858231
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 858231, clean up security/patches directory, r=wtc, DONTBUILD
security/patches/README
security/patches/revert-bug-808217.patch
--- a/security/patches/README
+++ b/security/patches/README
@@ -1,6 +1,2 @@
 This directory contains patches that were added locally
 on top of the NSS release.
-
-revert-bug-808217.patch: Revert the patch for bug 808217 because it
-broke the "B2G Arm opt", "B2G Arm debug", and "Android 2.2 Armv6 opt"
-build bots. See bug 874261.
deleted file mode 100644
--- a/security/patches/revert-bug-808217.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/cmd/bltest/blapitest.c b/cmd/bltest/blapitest.c
---- a/cmd/bltest/blapitest.c
-+++ b/cmd/bltest/blapitest.c
-@@ -1028,17 +1028,18 @@ bltestCopyIO(PLArenaPool *arena, bltestI
- }
- 
- void
- misalignBuffer(PLArenaPool *arena, bltestIO *io, int off)
- {
-     ptrdiff_t offset = (ptrdiff_t)io->buf.data % WORDSIZE;
-     int length = io->buf.len;
-     if (offset != off) {
--	SECITEM_ReallocItemV2(arena, &io->buf, length + 2*WORDSIZE);
-+	SECITEM_ReallocItem(arena, &io->buf, length, length + 2*WORDSIZE);
-+	io->buf.len = length + 2*WORDSIZE; /* why doesn't realloc do this? */
- 	/* offset may have changed? */
- 	offset = (ptrdiff_t)io->buf.data % WORDSIZE;
- 	if (offset != off) {
- 	    memmove(io->buf.data + off, io->buf.data, length);
- 	    io->pBuf.data = io->buf.data + off;
- 	    io->pBuf.len = length;
- 	} else {
- 	    io->pBuf.data = io->buf.data;
-diff --git a/cmd/lib/secutil.c b/cmd/lib/secutil.c
---- a/cmd/lib/secutil.c
-+++ b/cmd/lib/secutil.c
-@@ -525,17 +525,17 @@ SECU_ReadDERFromFile(SECItem *der, PRFil
- 		*trailer = '\0';
- 	    if (!body || !trailer) {
- 		fprintf(stderr, "input has header but no trailer\n");
- 		PORT_Free(filedata.data);
- 		return SECFailure;
- 	    }
- 	} else {
- 	    /* need one additional byte for zero terminator */
--	    rv = SECITEM_ReallocItemV2(NULL, &filedata, filedata.len+1);
-+	    rv = SECITEM_ReallocItem(NULL, &filedata, filedata.len, filedata.len+1);
- 	    if (rv != SECSuccess) {
- 		PORT_Free(filedata.data);
- 		return rv;
- 	    }
- 	    body = (char*)filedata.data;
- 	    body[filedata.len-1] = '\0';
- 	}
-