security update to mozilla-firefox-2.0.0.15, fixes MFSA 2008-33,

MFSA 2008-32, MFSA 2008-31, MFSA 2008-30, MFSA 2008-29, MFSA 2008-28,
MFSA 2008-27, MFSA 2008-25, MFSA 2008-24, MFSA 2008-23, MFSA 2008-22,
MFSA 2008-21
http://www.mozilla.org/projects/security/known-vulnerabilities.html#Firefox2.0.0.15
ok kurt@, naddy@
This commit is contained in:
martynas 2008-07-04 13:47:25 +00:00
parent 7a33bb5ecc
commit 9a3396b096
7 changed files with 40 additions and 45 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.94 2008/04/18 15:17:17 martynas Exp $
# $OpenBSD: Makefile,v 1.95 2008/07/04 13:47:25 martynas Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
COMMENT= redesign of Mozilla's browser component
VER= 2.0.0.14
VER= 2.0.0.15
DISTNAME= mozilla
PKGNAME= mozilla-firefox-${VER}
SO_VERSION= 19.0
@ -52,7 +52,7 @@ WANTLIB= X11 Xau Xcomposite Xdamage Xcursor Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
fontconfig freetype glib-2.0 glitz gmodule-2.0 \
gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
png pthread stdc++ z \
pixman-1 png pthread stdc++ z \
Xft Xinerama Xt gthread-2.0 jpeg pangox-1.0
VMEM_WARNING= Yes
@ -115,7 +115,8 @@ DATADIRS= chrome components defaults dictionaries extensions \
pre-configure:
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
${WRKSRC}/browser/app/mozilla.in
${WRKSRC}/browser/app/mozilla.in \
${WRKSRC}/js/src/xpconnect/shell/Makefile.in
@perl -pi -e 's|_SO_VERSION_|${SO_VERSION}|g' \
${WRKSRC}/xpcom/components/nsNativeComponentLoader.cpp

View File

@ -1,5 +1,5 @@
MD5 (firefox-2.0.0.14-source.tar.bz2) = npwTunuB+T8voQxvJW7jHg==
RMD160 (firefox-2.0.0.14-source.tar.bz2) = Me7DRUlGz7HFe9cfMsKkGYInYAY=
SHA1 (firefox-2.0.0.14-source.tar.bz2) = 3iY2daE3qOKyV1fE0pLno+JDT3Q=
SHA256 (firefox-2.0.0.14-source.tar.bz2) = rwRbWKtWC7ZTXl9joQJ9zKuYyhI6GxYd3UzFL6UFqQE=
SIZE (firefox-2.0.0.14-source.tar.bz2) = 37510819
MD5 (firefox-2.0.0.15-source.tar.bz2) = 74J5c4MMxkU634yjuIqcbQ==
RMD160 (firefox-2.0.0.15-source.tar.bz2) = GIYTtQdS5S9pk9ziQTe3MR84XvY=
SHA1 (firefox-2.0.0.15-source.tar.bz2) = ItWwycWfXQz4BdCrmhF/Ouk0AMk=
SHA256 (firefox-2.0.0.15-source.tar.bz2) = 5HZJbRs8wsqqVke56cy6N4C52spORN+pyqr0FkjExKk=
SIZE (firefox-2.0.0.15-source.tar.bz2) = 40279750

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-js_src_xpconnect_shell_Makefile_in,v 1.1 2008/07/04 13:47:25 martynas Exp $
--- js/src/xpconnect/shell/Makefile.in.orig Tue Apr 5 15:35:51 2005
+++ js/src/xpconnect/shell/Makefile.in Wed Jul 2 13:36:12 2008
@@ -56,6 +56,8 @@ REQUIRES = xpconnect \
CPPSRCS = xpcshell.cpp
LIBS = \
+ -Wl,-rpath-link,_LOCALBASE_/lib/ \
+ -Wl,-rpath-link,_X11BASE_/lib/ \
$(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \

View File

@ -1,16 +1,7 @@
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.8 2007/03/27 16:04:37 martynas Exp $
--- security/coreconf/OpenBSD.mk.orig Sun Apr 25 18:02:17 2004
+++ security/coreconf/OpenBSD.mk Thu Mar 22 20:29:45 2007
@@ -42,7 +42,7 @@ CC = gcc
CCC = g++
RANLIB = ranlib
-CPU_ARCH := $(shell uname -p)
+CPU_ARCH := $(shell arch -s)
ifeq ($(CPU_ARCH),i386)
OS_REL_CFLAGS = -Di386
CPU_ARCH = x86
@@ -55,7 +55,7 @@ OS_LIBS += -pthread
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.9 2008/07/04 13:47:25 martynas Exp $
--- security/coreconf/OpenBSD.mk.orig Sun May 6 11:08:36 2007
+++ security/coreconf/OpenBSD.mk Wed Jul 2 11:52:33 2008
@@ -56,7 +56,7 @@ OS_LIBS += -pthread
DSO_LDOPTS += -pthread
endif
@ -19,12 +10,3 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.8 2007/03/27 16:04:37 martynas
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
@@ -64,7 +64,7 @@ OS_LIBS =
ARCH = openbsd
DSO_CFLAGS = -fPIC -DPIC
-DSO_LDOPTS = -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
DSO_LDFLAGS =
MKSHLIB = $(CC) $(DSO_LDOPTS)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.1 2007/01/12 21:46:17 kurt Exp $
--- security/manager/ssl/src/Makefile.in.orig Wed Jan 10 13:09:11 2007
+++ security/manager/ssl/src/Makefile.in Wed Jan 10 14:17:42 2007
@@ -126,7 +126,10 @@ REQUIRES = nspr \
$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.2 2008/07/04 13:47:25 martynas Exp $
--- security/manager/ssl/src/Makefile.in.orig Wed Jun 4 23:42:03 2008
+++ security/manager/ssl/src/Makefile.in Wed Jul 2 11:53:02 2008
@@ -127,7 +127,10 @@ REQUIRES = nspr \
EXTRA_DEPS = $(NSS_DEP_LIBS)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.1 2007/01/12 21:46:17 kurt Exp $
--- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 15 21:24:30 2006
+++ security/manager/ssl/src/nsNSSComponent.cpp Wed Jan 10 18:13:16 2007
@@ -699,11 +699,10 @@ nsNSSComponent::InstallLoadableRoots()
$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.2 2008/07/04 13:47:25 martynas Exp $
--- security/manager/ssl/src/nsNSSComponent.cpp.orig Wed Jun 4 23:42:04 2008
+++ security/manager/ssl/src/nsNSSComponent.cpp Wed Jul 2 11:52:33 2008
@@ -700,11 +700,10 @@ nsNSSComponent::InstallLoadableRoots()
return;
const char *possible_ckbi_locations[] = {
@ -16,7 +16,7 @@ $OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.1 2007/01/12 21:
};
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
@@ -712,7 +711,7 @@ nsNSSComponent::InstallLoadableRoots()
@@ -713,7 +712,7 @@ nsNSSComponent::InstallLoadableRoots()
if (!possible_ckbi_locations[il])
{

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2008/02/11 18:13:44 bernd Exp $
@comment $OpenBSD: PLIST,v 1.19 2008/07/04 13:47:25 martynas Exp $
@conflict mozilla-firebird-*
@pkgpath www/mozilla-firefox,-main
bin/firefox
@ -292,7 +292,7 @@ mozilla-firefox/extensions/inspector@mozilla.org/defaults/preferences/inspector.
mozilla-firefox/extensions/inspector@mozilla.org/install.rdf
mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
mozilla-firefox/firefox-bin
@bin mozilla-firefox/firefox-bin
mozilla-firefox/greprefs/
mozilla-firefox/greprefs/all.js
mozilla-firefox/greprefs/security-prefs.js
@ -314,12 +314,12 @@ mozilla-firefox/init.d/README
@lib mozilla-firefox/libxpcom_compat.so.${LIBxpcom_compat_VERSION}
@lib mozilla-firefox/libxpcom_core.so.${LIBxpcom_core_VERSION}
@lib mozilla-firefox/libxpistub.so.${LIBxpistub_VERSION}
mozilla-firefox/mozilla-firefox-bin
mozilla-firefox/mozilla-xremote-client
@bin mozilla-firefox/mozilla-firefox-bin
@bin mozilla-firefox/mozilla-xremote-client
mozilla-firefox/plugins/
@lib mozilla-firefox/plugins/libnullplugin.so.${LIBnullplugin_VERSION}
@lib mozilla-firefox/plugins/libunixprintplugin.so.${LIBunixprintplugin_VERSION}
mozilla-firefox/regxpcom
@bin mozilla-firefox/regxpcom
mozilla-firefox/res/
mozilla-firefox/res/EditorOverride.css
mozilla-firefox/res/arrow.gif