diff -u xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/changelog xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/changelog --- xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/changelog +++ xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/changelog @@ -1,3 +1,12 @@ +xulrunner-1.9 (1.9.0.1+build1+nobinonly-0ubuntu2) intrepid; urgency=low + + * Add debian/patches/maxpathlen_unix.patch: calculate MAXPATHLEN + correctly on Linux to avoid buffer overflows when calling realpath() + when MAXPATHLEN < PATH_MAX (LP: #263014). + * debian/rules: revert -U_FORTIFY_SOURCE since overflow has been found. + + -- Kees Cook Fri, 29 Aug 2008 22:50:58 -0700 + xulrunner-1.9 (1.9.0.1+build1+nobinonly-0ubuntu1) intrepid; urgency=low * LP: #247494 - new upstream stability/security release (v1.9.0.1 build1) diff -u xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/rules xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/rules --- xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/rules +++ xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/rules @@ -58,9 +58,9 @@ # workaround multiple crashes in xulrunner in Intrepid (at least 3 in realpath()) # caused by Intrepid shipping gcc 4.3 with -D_FORTIFY_SOURCE=2 by default -CPPFLAGS=-U_FORTIFY_SOURCE -export CPPFLAGS -$(warning export CPPFLAGS=$(CPPFLAGS)) +#CPPFLAGS=-U_FORTIFY_SOURCE +#export CPPFLAGS +#$(warning export CPPFLAGS=$(CPPFLAGS)) # enable below to disable symbolic-functions linkage # LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//') diff -u xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/patches/series xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/patches/series --- xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/patches/series +++ xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/patches/series @@ -25,0 +26 @@ +maxpathlen_unix.patch only in patch2: unchanged: --- xulrunner-1.9-1.9.0.1+build1+nobinonly.orig/debian/patches/maxpathlen_unix.patch +++ xulrunner-1.9-1.9.0.1+build1+nobinonly/debian/patches/maxpathlen_unix.patch @@ -0,0 +1,37 @@ +Index: mozilla/toolkit/xre/nsAppRunner.h +=================================================================== +--- mozilla.orig/toolkit/xre/nsAppRunner.h 2008-08-30 07:59:55.000000000 -0700 ++++ mozilla/toolkit/xre/nsAppRunner.h 2008-08-30 08:01:00.000000000 -0700 +@@ -42,8 +42,14 @@ + #include + #endif + ++#ifdef XP_UNIX ++#include ++#endif ++ + #ifndef MAXPATHLEN +-#ifdef _MAX_PATH ++#ifdef PATH_MAX ++#define MAXPATHLEN PATH_MAX ++#elif defined(_MAX_PATH) + #define MAXPATHLEN _MAX_PATH + #elif defined(CCHMAXPATH) + #define MAXPATHLEN CCHMAXPATH +Index: mozilla/xpcom/build/nsXPCOMPrivate.h +=================================================================== +--- mozilla.orig/xpcom/build/nsXPCOMPrivate.h 2008-08-30 08:34:51.000000000 -0700 ++++ mozilla/xpcom/build/nsXPCOMPrivate.h 2008-08-30 08:35:59.000000000 -0700 +@@ -261,7 +261,11 @@ + #endif + + #ifdef AIX +-#include ++#include // MAXPATHLEN ++#endif ++ ++#ifdef XP_UNIX ++#include // PATH_MAX + #endif + + #ifndef MAXPATHLEN