-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pullup ticket 3219 - requested by tnn
security update
Revisions pulled up:
- pkgsrc/devel/nspr/Makefile 1.37
- pkgsrc/devel/nspr/PLIST 1.11
- pkgsrc/devel/nss/Makefile 1.38
- pkgsrc/devel/xulrunner/PLIST 1.24
- pkgsrc/devel/xulrunner/dist.mk 1.14
- pkgsrc/devel/xulrunner/distinfo 1.36
- pkgsrc/devel/xulrunner/mozilla-common.mk 1.16
- pkgsrc/devel/xulrunner/patches/patch-ag 1.2
- pkgsrc/devel/xulrunner/patches/patch-al 1.2
- pkgsrc/devel/xulrunner/patches/patch-ap 1.4
- pkgsrc/devel/xulrunner/patches/patch-mc 1.2
- pkgsrc/devel/xulrunner/patches/patch-mm 1.3
- pkgsrc/devel/xulrunner/patches/patch-mn 1.3
-------------------------------------------------------------------------
Modified Files:
pkgsrc/devel/nspr: Makefile PLIST
Log Message:
Update to nspr-4.8.6 (via firefox-3.6.9). Changes unknown.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/nspr/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/nspr/PLIST
-------------------------------------------------------------------------
Modified Files:
pkgsrc/devel/nss: Makefile
Log Message:
Update to nss-3.12.7.0 (via firefox-3.6.9). Changes unknown.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/nss/Makefile
-------------------------------------------------------------------------
Modified Files:
pkgsrc/devel/xulrunner: PLIST dist.mk distinfo mozilla-common.mk
pkgsrc/devel/xulrunner/patches: patch-ag patch-al patch-ap
patch-mc patch-mm patch-mn
Log Message:
Update to firefox-3.6.9 (xulrunner-1.9.2.9)
MFSA 2010-63 Information leak via XMLHttpRequest statusText
MFSA 2010-62 Copy-and-paste or drag-and-drop into designMode document allows XSS
MFSA 2010-61 UTF-7 XSS by overriding document charset using <object> type
attribute
MFSA 2010-59 SJOW creates scope chains ending in outer object
MFSA 2010-58 Crash on Mac using fuzzed font in data: URL
MFSA 2010-57 Crash and remote code execution in normalizeDocument
MFSA 2010-56 Dangling pointer vulnerability in nsTreeContentView
MFSA 2010-55 XUL tree removal crash and remote code execution
MFSA 2010-54 Dangling pointer vulnerability in nsTreeSelection
MFSA 2010-53 Heap buffer overflow in nsTextFrameUtils::TransformText
MFSA 2010-52 Windows XP DLL loading vulnerability
MFSA 2010-51 Dangling pointer vulnerability using DOM plugin array
MFSA 2010-50 Frameset integer overflow vulnerability
MFSA 2010-49 Miscellaneous memory safety hazards (rv:1.9.2.9/ 1.9.1.12)
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/xulrunner/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/xulrunner/dist.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/xulrunner/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/xulrunner/mozilla-common.mk
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-ag \
pkgsrc/devel/xulrunner/patches/patch-al
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/xulrunner/patches/patch-ap
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/xulrunner/patches/patch-mc
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/xulrunner/patches/patch-mm \
pkgsrc/devel/xulrunner/patches/patch-mn- Loading branch information
spz
committed
Sep 11, 2010
1 parent
b816376
commit 07c4668
Showing
13 changed files
with
67 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,16 @@ | ||
| $NetBSD: patch-al,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ | ||
| $NetBSD: patch-al,v 1.1.1.1.8.1 2010/09/11 14:59:16 spz Exp $ | ||
|
|
||
| # Reported upstream as https://bugzilla.mozilla.org/show_bug.cgi?id=471179 | ||
|
|
||
| --- nsprpub/pr/src/misc/prsystem.c.orig 2009-06-29 18:15:07.000000000 +0200 | ||
| +++ nsprpub/pr/src/misc/prsystem.c | ||
| @@ -284,6 +284,20 @@ PR_IMPLEMENT(PRUint64) PR_GetPhysicalMem | ||
| long pageCount = sysconf(_SC_PHYS_PAGES); | ||
| bytes = (PRUint64) pageSize * pageCount; | ||
| --- storage/src/mozStorageConnection.cpp.orig 2010-08-24 21:32:09.000000000 +0000 | ||
| +++ storage/src/mozStorageConnection.cpp | ||
| @@ -405,6 +405,11 @@ Connection::initialize(nsIFile *aDatabas | ||
| break; | ||
| } | ||
|
|
||
| +#elif defined(NETBSD) | ||
| + | ||
| + int mib[2]; | ||
| + int rc; | ||
| + uint64_t memSize; | ||
| + size_t len = sizeof(memSize); | ||
| + | ||
| + mib[0] = CTL_HW; | ||
| + mib[1] = HW_PHYSMEM64; | ||
| + rc = sysctl( mib, 2, &memSize, &len, NULL, 0 ); | ||
| + if ( -1 != rc ) { | ||
| + bytes = memSize; | ||
| + } | ||
| + // XXX tnn: the configure script demands that sqlite3 is compiled with | ||
| + // SECURE_DELETE on by default. sqlite3 in pkgsrc does not have that, | ||
| + // so instead we enable secure_delete manually here. | ||
| + (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING("PRAGMA secure_delete = 1;")); | ||
| + | ||
| #elif defined(HPUX) | ||
| return NS_OK; | ||
| } | ||
|
|
||
| struct pst_static info; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| $NetBSD: patch-ap,v 1.3 2009/09/20 15:30:54 sno Exp $ | ||
| $NetBSD: patch-ap,v 1.3.8.1 2010/09/11 14:59:16 spz Exp $ | ||
|
|
||
| --- media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2009-08-24 17:52:50.000000000 +0200 | ||
| --- media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2010-08-24 21:32:05.000000000 +0000 | ||
| +++ media/liboggz/include/oggz/oggz_off_t_generated.h | ||
| @@ -59,7 +59,7 @@ | ||
|
|
||
| #include <sys/types.h> | ||
|
|
||
| -#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) | ||
| +#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) | ||
| -#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) | ||
| +#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) | ||
| typedef off_t oggz_off_t; | ||
| #else | ||
| typedef loff_t oggz_off_t; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| $NetBSD: patch-mn,v 1.2 2009/10/28 11:36:36 tnn Exp $ | ||
| $NetBSD: patch-mn,v 1.2.6.1 2010/09/11 14:59:16 spz Exp $ | ||
|
|
||
| Make sure we link correctly with sqlite3 from pkgsrc. | ||
|
|
||
| --- security/nss/lib/softoken/config.mk.orig 2009-10-16 17:14:19.000000000 +0200 | ||
| --- security/nss/lib/softoken/config.mk.orig 2010-08-24 21:32:09.000000000 +0000 | ||
| +++ security/nss/lib/softoken/config.mk | ||
| @@ -83,7 +83,7 @@ EXTRA_SHARED_LIBS += \ | ||
| @@ -80,7 +80,7 @@ else | ||
| # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. | ||
| EXTRA_SHARED_LIBS += \ | ||
| -L$(DIST)/lib \ | ||
| - -l$(SQLITE_LIB_NAME) \ | ||
| + `pkg-config --libs sqlite3` \ | ||
| -L$(NSSUTIL_LIB_DIR) \ | ||
| -lnssutil3 \ | ||
| - -lsqlite3 \ | ||
| + `pkg-config --libs sqlite3` \ | ||
| -L$(NSPR_LIB_DIR) \ | ||
| -lplc4 \ | ||
| -lplds4 \ |