SECURITY update to SeaMonkey 1.0.8; ok kurt@, martynas

For details see
http://www.mozilla.org/projects/security/known-vulnerabilities.html#SeaMonkey
This commit is contained in:
naddy 2007-03-16 17:20:55 +00:00
parent 706b3d4b4b
commit e14534e6ba
18 changed files with 43 additions and 194 deletions

View File

@ -1,22 +1,22 @@
# $OpenBSD: Makefile,v 1.5 2007/02/22 00:40:59 naddy Exp $
# $OpenBSD: Makefile,v 1.6 2007/03/16 17:20:55 naddy Exp $
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
COMMENT-main= "integrated mozilla application suite"
COMMENT-devel= "devel files for Gecko"
VER= 1.0.7
VER= 1.0.8
DISTNAME= seamonkey-${VER}.source
PKGNAME= seamonkey-${VER}
PKGNAME-main= seamonkey-${VER}p3
PKGNAME-devel= seamonkey-devel-${VER}p3
PKGNAME-main= seamonkey-${VER}
PKGNAME-devel= seamonkey-devel-${VER}
SO_VERSION= 9.3
SO_VERSION= 9.4
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
.for _lib in accessibility appcomps auth autoconfig browsercomps \
browserdirprovider caps chrome commandlines composer cookie docshell \
editor embedcomponents fileview gfx_gtk gfxps gfxpsshar gkgfx \
editor embedcomponents fileview freebl3 gfx_gtk gfxps gfxpsshar gkgfx \
gklayout gkplugin gtkembedmoz gtkxtbin htmlpars i18n imglib2 inspector \
jar50 jsd jsj mork mozfind mozjs necko necko2 nsappshell nss3 \
nssckbi oji permissions pipboot pipnss pippki pref rdf \
@ -103,7 +103,8 @@ MAKE_ENV= MOZ_CO_PROJECT=suite \
LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \
BUILD_OFFICIAL=1 \
MOZILLA_OFFICIAL=1 \
SO_VERSION="${SO_VERSION}"
SO_VERSION="${SO_VERSION}" \
NSPR_LIB_DIR="${LOCALBASE}/lib"
CONFIGURE_ENV= ${MAKE_ENV} \
PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"

View File

@ -1,5 +1,5 @@
MD5 (seamonkey-1.0.7.source.tar.gz) = 947d01cb1f45ed34be3b612368f94418
RMD160 (seamonkey-1.0.7.source.tar.gz) = 3998ab4ee254c0097e7480163254a25029e39997
SHA1 (seamonkey-1.0.7.source.tar.gz) = 336839a764d030b2384dd662a29f16a18c374241
SHA256 (seamonkey-1.0.7.source.tar.gz) = aba84d57c37b5510283ecfb513bf36be696ddf06d27f9c349667dd7c016792a2
SIZE (seamonkey-1.0.7.source.tar.gz) = 46504734
MD5 (seamonkey-1.0.8.source.tar.gz) = d195cdaae9f6a6e78d894497a525e0f7
RMD160 (seamonkey-1.0.8.source.tar.gz) = 07f329323dcb0c53c61a79dcddf9c2f55b1a15f3
SHA1 (seamonkey-1.0.8.source.tar.gz) = 4cb425dcfa256cb48dd71de696ca2a73285ad3b1
SHA256 (seamonkey-1.0.8.source.tar.gz) = 0cffbb74aefc6532bcc77e9bd6e6b2f4d387d8b85b3d09fab821bd4b91139b83
SIZE (seamonkey-1.0.8.source.tar.gz) = 46586187

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- gfx/src/ps/nsFontMetricsPS.cpp.orig Fri Oct 6 19:26:54 2006
+++ gfx/src/ps/nsFontMetricsPS.cpp Wed Nov 8 10:28:51 2006
@@ -1044,8 +1044,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
nsFontPSXft::~nsFontPSXft()
{
- if (mEntry->mFace)
+ if (mEntry->mFace) {
FT_Done_Face(mEntry->mFace);
+ mEntry->mFace = nsnull;
+ }
if (FT_Done_FreeType(mFreeTypeLibrary))
return;
@@ -2336,8 +2338,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
nsXftType1Generator::~nsXftType1Generator()
{
- if (mEntry->mFace)
+ if (mEntry->mFace) {
FT_Done_Face(mEntry->mFace);
+ mEntry->mFace = nsnull;
+ }
if (FT_Done_FreeType(mFreeTypeLibrary))
return;

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-security_coreconf_rules_mk,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- security/coreconf/rules.mk.orig Fri Apr 15 02:36:28 2005
+++ security/coreconf/rules.mk Sat Sep 10 09:47:32 2005
@@ -352,7 +352,6 @@ ifdef XP_OS2_VACPP
$OpenBSD: patch-security_coreconf_rules_mk,v 1.2 2007/03/16 17:20:55 naddy Exp $
--- security/coreconf/rules.mk.orig Tue Feb 13 21:41:48 2007
+++ security/coreconf/rules.mk Thu Mar 1 21:32:47 2007
@@ -358,7 +358,6 @@ ifdef XP_OS2_VACPP
else
$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
endif
- chmod +x $@
ifeq ($(OS_TARGET),Darwin)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-security_manager_Makefile_in,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- security/manager/Makefile.in.orig Mon Nov 6 14:42:50 2006
+++ security/manager/Makefile.in Mon Nov 6 14:41:57 2006
@@ -79,7 +79,7 @@ endif
$OpenBSD: patch-security_manager_Makefile_in,v 1.2 2007/03/16 17:20:55 naddy Exp $
--- security/manager/Makefile.in.orig Tue Feb 13 21:43:11 2007
+++ security/manager/Makefile.in Thu Mar 1 21:33:21 2007
@@ -118,7 +118,7 @@ endif
# NSS makefiles are not safe for parallel execution.
DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
DEFAULT_GMAKE_FLAGS += CC="$(CC)"

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-security_nss_Makefile,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- security/nss/Makefile.orig Mon Nov 6 14:33:02 2006
+++ security/nss/Makefile Mon Nov 6 14:33:51 2006
$OpenBSD: patch-security_nss_Makefile,v 1.2 2007/03/16 17:20:55 naddy Exp $
--- security/nss/Makefile.orig Tue Feb 13 21:41:24 2007
+++ security/nss/Makefile Thu Mar 1 21:32:47 2007
@@ -78,7 +78,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
@ -8,5 +8,5 @@ $OpenBSD: patch-security_nss_Makefile,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
-nss_build_all: build_coreconf build_nspr build_dbm all
+nss_build_all: build_coreconf build_dbm all
build_coreconf:
cd $(CORE_DEPTH)/coreconf ; $(MAKE)
nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-security_nss_cmd_pkiutil_platlibs_mk,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- security/nss/cmd/pkiutil/platlibs.mk.orig Mon Nov 6 18:34:15 2006
+++ security/nss/cmd/pkiutil/platlibs.mk Mon Nov 6 18:34:40 2006
@@ -50,8 +50,6 @@ EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lnsspki3 \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-security_nss_cmd_platlibs_mk,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- security/nss/cmd/platlibs.mk.orig Mon Nov 6 17:57:12 2006
+++ security/nss/cmd/platlibs.mk Mon Nov 6 21:13:35 2006
@@ -136,10 +136,7 @@ EXTRA_SHARED_LIBS += \
$(NULL)
else
EXTRA_SHARED_LIBS += \
- -L$(DIST)/lib \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
endif
endif
@@ -222,9 +219,7 @@ EXTRA_SHARED_LIBS += \
-lssl3 \
-lsmime3 \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-security_nss_lib_ckfw_builtins_Makefile,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- security/nss/lib/ckfw/builtins/Makefile.orig Mon Nov 6 20:15:16 2006
+++ security/nss/lib/ckfw/builtins/Makefile Mon Nov 6 20:15:58 2006
@@ -68,8 +68,8 @@ endif
else
EXTRA_LIBS += \
- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
$(NULL)
endif

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.orig Tue Nov 7 08:42:33 2006
+++ security/nss/lib/fortcrypt/swfort/pkcs11/Makefile Tue Nov 7 08:44:01 2006
@@ -98,8 +98,8 @@ EXTRA_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
$(CRYPTO_LIB) \
$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
$(NULL)
endif

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-security_nss_lib_freebl_Makefile,v 1.1 2007/03/16 17:20:55 naddy Exp $
--- security/nss/lib/freebl/Makefile.orig Thu Mar 1 23:51:15 2007
+++ security/nss/lib/freebl/Makefile Thu Mar 1 23:51:34 2007
@@ -192,7 +192,7 @@ endif
# to bind the blapi function references in FREEBLVector vector
# (ldvector.c) to the blapi functions defined in the freebl
# shared libraries.
-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET)))
+ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
MKSHLIB += -Wl,-Bsymbolic
endif

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-security_nss_lib_nss_config_mk,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- security/nss/lib/nss/config.mk.orig Mon Nov 6 15:46:02 2006
+++ security/nss/lib/nss/config.mk Mon Nov 6 15:46:24 2006
@@ -74,9 +74,7 @@ else
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lsoftokn3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
endif

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-security_nss_lib_smime_config_mk,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- security/nss/lib/smime/config.mk.orig Mon Nov 6 15:45:25 2006
+++ security/nss/lib/smime/config.mk Mon Nov 6 15:45:49 2006
@@ -68,9 +68,7 @@ else
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
ifeq ($(OS_ARCH), Darwin)

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-security_nss_lib_softoken_config_mk,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- security/nss/lib/softoken/config.mk.orig Mon Nov 6 15:41:50 2006
+++ security/nss/lib/softoken/config.mk Mon Nov 6 15:45:13 2006
@@ -80,10 +80,7 @@ else
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \
- -L$(DIST)/lib/ \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
endif

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-security_nss_lib_ssl_config_mk,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- security/nss/lib/ssl/config.mk.orig Mon Nov 6 15:44:07 2006
+++ security/nss/lib/ssl/config.mk Mon Nov 6 15:44:53 2006
@@ -73,9 +73,7 @@ else
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
ifeq ($(OS_ARCH), BeOS)

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-xpcom_glue_standalone_Makefile_in,v 1.1.1.1 2006/12/22 23:32:28 kurt Exp $
--- xpcom/glue/standalone/Makefile.in.orig Thu Jan 5 20:35:20 2006
+++ xpcom/glue/standalone/Makefile.in Wed May 3 13:26:43 2006
@@ -62,6 +62,9 @@ endif
ifneq (,$(filter AIX DragonFly FreeBSD Linux NetBSD OpenBSD SunOS,$(OS_ARCH)))
LINKSRC = nsGlueLinkingDlopen.cpp
endif
+ifeq (OpenBSD,$(OS_ARCH))
+LINKSRC = nsGlueLinkingDlopen.cpp
+endif
ifeq (OS2,$(OS_ARCH))
LINKSRC = nsGlueLinkingOS2.cpp
endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1.1.1 2006/12/22 23:32:29 kurt Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.2 2007/03/16 17:20:55 naddy Exp $
@lib seamonkey/components/libaccessibility.so.${LIBaccessibility_VERSION}
@lib seamonkey/components/libaddrbook.so.${LIBaddrbook_VERSION}
@lib seamonkey/components/libappcomps.so.${LIBappcomps_VERSION}
@ -76,6 +76,7 @@
@lib seamonkey/components/libxpconnect.so.${LIBxpconnect_VERSION}
@lib seamonkey/components/libxpinstall.so.${LIBxpinstall_VERSION}
@lib seamonkey/components/libxremoteservice.so.${LIBxremoteservice_VERSION}
@lib seamonkey/libfreebl3.so.${LIBfreebl3_VERSION}
@lib seamonkey/libgfxpsshar.so.${LIBgfxpsshar_VERSION}
@lib seamonkey/libgkgfx.so.${LIBgkgfx_VERSION}
@lib seamonkey/libgtkembedmoz.so.${LIBgtkembedmoz_VERSION}

View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST-devel,v 1.3 2007/01/12 23:11:12 kurt Exp $
@comment $OpenBSD: PLIST-devel,v 1.4 2007/03/16 17:20:55 naddy Exp $
@conflict seamonkey-<1.0.7p1
bin/seamonkey-config
lib/pkgconfig/
lib/pkgconfig/seamonkey-gtkmozembed.pc
lib/pkgconfig/seamonkey-js.pc
@comment lib/pkgconfig/seamonkey-nspr.pc
@ -2858,8 +2859,6 @@ seamonkey/include/nss/ssl.h
seamonkey/include/nss/sslerr.h
seamonkey/include/nss/sslproto.h
seamonkey/include/nss/sslt.h
seamonkey/include/nss/swfort.h
seamonkey/include/nss/swfortt.h
seamonkey/include/nss/watcomfx.h
seamonkey/include/oji/
seamonkey/include/oji/ProxyJNI.h