pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2005Q1]: pkgsrc/www Pullup ticket 505 - requested by Shin'ichi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f6de61f3ff47
branches: pkgsrc-2005Q1
changeset: 491058:f6de61f3ff47
user: salo <salo%pkgsrc.org@localhost>
date: Tue May 17 10:29:42 2005 +0000
description:
Pullup ticket 505 - requested by Shin'ichiro TAYA
security update for mozilla
Revisions pulled up:
- pkgsrc/www/mozilla/Makefile 1.145
- pkgsrc/www/mozilla/Makefile.common 1.50-1.51, 1.53-1.54
- pkgsrc/www/mozilla/buildlink3.mk 1.11
- pkgsrc/www/mozilla/distinfo 1.76
- pkgsrc/www/mozilla-gtk2/Makefile 1.22
- pkgsrc/www/mozilla-gtk2/buildlink3.mk 1.9
Module Name: pkgsrc
Committed By: abs
Date: Sat Apr 2 09:46:41 UTC 2005
Modified Files:
pkgsrc/www/mozilla: Makefile.common
Log Message:
cut trailing whitespace
---
Module Name: pkgsrc
Committed By: abs
Date: Sat Apr 2 14:38:15 UTC 2005
Modified Files:
pkgsrc/www/firefox: Makefile
pkgsrc/www/mozilla: Makefile.common
pkgsrc/www/mozilla-gtk2: Makefile
Log Message:
MOZILLA_USE_GTK2 needs --disable-gnomevfs, so make this so in
mozilla/Makefile.common, rather than adding it into each Makefile
(also fixes thunderbird-gtk2).
---
Module Name: pkgsrc
Committed By: taya
Date: Sun Apr 24 14:05:06 UTC 2005
Modified Files:
pkgsrc/www/mozilla: Makefile.common
Log Message:
set CONFIG_GUESS_OVERRIDE, CONFIG_SUB_OVERRIDE, and CONFIG_STATUS_OVERRIDE
explicitly, because it fails to detect them with default setting.
suggested by Todd Willey.
---
Module Name: pkgsrc
Committed By: taya
Date: Sun May 15 02:58:05 UTC 2005
Modified Files:
pkgsrc/www/mozilla: Makefile Makefile.common buildlink3.mk distinfo
pkgsrc/www/mozilla-gtk2: Makefile buildlink3.mk
Log Message:
Update mozilla & mozilla-gtk2 to 1.7.8
This is a security fix release.
Fixed vulnerabilities are follows:
MFSA 2005-44 Privilege escalation via non-DOM property overrides
MFSA 2005-43 "Wrapped" javascript: urls bypass security checks
MFSA 2005-42 Code execution via javascript: IconURL
diffstat:
www/mozilla-gtk2/Makefile | 8 ++++----
www/mozilla-gtk2/buildlink3.mk | 6 +++---
www/mozilla/Makefile | 8 ++++----
www/mozilla/Makefile.common | 18 ++++++++++++++----
www/mozilla/buildlink3.mk | 4 ++--
www/mozilla/distinfo | 11 ++++-------
6 files changed, 31 insertions(+), 24 deletions(-)
diffs (146 lines):
diff -r 9c90c433f3b0 -r f6de61f3ff47 www/mozilla-gtk2/Makefile
--- a/www/mozilla-gtk2/Makefile Mon May 16 18:06:22 2005 +0000
+++ b/www/mozilla-gtk2/Makefile Tue May 17 10:29:42 2005 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.16.2.3 2005/04/22 07:22:34 snj Exp $
+# $NetBSD: Makefile,v 1.16.2.4 2005/05/17 10:29:42 salo Exp $
MOZILLA= mozilla-gtk2
MOZILLA_BIN= mozilla-bin
-MOZ_VER= 1.7.7
+MOZ_VER= 1.7.8
EXTRACT_SUFX= .tar.bz2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2
-SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL}
+#DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2
+#SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL}
DISTINFO_FILE= ${.CURDIR}/../../www/mozilla/distinfo
PATCHDIR= ${.CURDIR}/../../www/mozilla/patches
FILESDIR= ${.CURDIR}/../../www/mozilla/files
diff -r 9c90c433f3b0 -r f6de61f3ff47 www/mozilla-gtk2/buildlink3.mk
--- a/www/mozilla-gtk2/buildlink3.mk Mon May 16 18:06:22 2005 +0000
+++ b/www/mozilla-gtk2/buildlink3.mk Tue May 17 10:29:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5.2.2 2005/04/22 07:22:34 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.5.2.3 2005/05/17 10:29:42 salo Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MOZILLA_GTK2_BUILDLINK3_MK:= ${MOZILLA_GTK2_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@
BUILDLINK_PACKAGES+= mozilla-gtk2
.if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.mozilla-gtk2+= mozilla-gtk2>=1.7.6
-BUILDLINK_RECOMMENDED.mozilla-gtk2+= mozilla-gtk2>=1.7.7
+BUILDLINK_DEPENDS.mozilla-gtk2+= mozilla-gtk2>=1.7.5
+BUILDLINK_RECOMMENDED.mozilla-gtk2+= mozilla-gtk2>=1.7.8
BUILDLINK_PKGSRCDIR.mozilla-gtk2?= ../../www/mozilla-gtk2
.endif # MOZILLA_GTK2_BUILDLINK3_MK
diff -r 9c90c433f3b0 -r f6de61f3ff47 www/mozilla/Makefile
--- a/www/mozilla/Makefile Mon May 16 18:06:22 2005 +0000
+++ b/www/mozilla/Makefile Tue May 17 10:29:42 2005 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.141.2.3 2005/04/22 07:22:33 snj Exp $
+# $NetBSD: Makefile,v 1.141.2.4 2005/05/17 10:29:42 salo Exp $
MOZILLA= mozilla
MOZILLA_BIN= mozilla-bin
-MOZ_VER= 1.7.7
+MOZ_VER= 1.7.8
EXTRACT_SUFX= .tar.bz2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2
-SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL}
+#DISTFILES+= mozilla-source-1.7.3-libart_lgpl.tar.bz2
+#SITES_mozilla-source-1.7.3-libart_lgpl.tar.bz2=${MASTER_SITE_LOCAL}
COMMENT= Full featured gecko-based browser
diff -r 9c90c433f3b0 -r f6de61f3ff47 www/mozilla/Makefile.common
--- a/www/mozilla/Makefile.common Mon May 16 18:06:22 2005 +0000
+++ b/www/mozilla/Makefile.common Tue May 17 10:29:42 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.49 2004/12/25 15:39:42 taya Exp $
+# $NetBSD: Makefile.common,v 1.49.2.1 2005/05/17 10:29:42 salo Exp $
MOZ_DIST_VER?= ${MOZ_VER}
-DISTNAME?= mozilla-source-${MOZ_DIST_VER}
+DISTNAME?= mozilla-${MOZ_DIST_VER}-source
PKGNAME= ${MOZILLA}-${MOZ_VER}
MASTER_SITES?= ${MASTER_SITE_MOZILLA:=mozilla${MOZ_DIST_VER}/source/}
CATEGORIES= www
@@ -21,6 +21,16 @@
USE_X11= yes
GNU_CONFIGURE= yes
+CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess
+CONFIG_GUESS_OVERRIDE+= nsprpub/build/autoconf/config.guess
+CONFIG_GUESS_OVERRIDE+= directory/c-sdk/config/autoconf/config.guess
+CONFIG_SUB_OVERRIDE= build/autoconf/config.sub
+CONFIG_SUB_OVERRIDE+= nsprpub/build/autoconf/config.sub
+CONFIG_SUB_OVERRIDE+= directory/c-sdk/config/autoconf/config.sub
+CONFIG_STATUS_OVERRIDE= build/config.status
+CONFIG_STATUS_OVERRIDE+= nsprpub/config.status
+CONFIG_STATUS_OVERRIDE+= directory/c-sdk/config.status
+
PKGCONFIG_OVERRIDE+= build/unix/mozilla-gtkmozembed.pc
PKGCONFIG_OVERRIDE+= build/unix/mozilla-js.pc
PKGCONFIG_OVERRIDE+= build/unix/mozilla-nspr.pc
@@ -52,7 +62,7 @@
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../net/libIDL/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
+CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs
.else
.include "../../graphics/gdk-pixbuf/buildlink3.mk"
.include "../../net/ORBit/buildlink3.mk"
@@ -191,6 +201,6 @@
SUBST_SED.pc= -e "s|%includedir%|${PREFIX}/include/${MOZILLA}|g" \
-e "s|%libdir%|${PREFIX}/lib/${MOZILLA}|g"
SUBST_MESSAGE.pc= "Fixing pkgconfig files."
-
+
.include "../../mk/autoconf.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9c90c433f3b0 -r f6de61f3ff47 www/mozilla/buildlink3.mk
--- a/www/mozilla/buildlink3.mk Mon May 16 18:06:22 2005 +0000
+++ b/www/mozilla/buildlink3.mk Tue May 17 10:29:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7.2.2 2005/04/22 07:22:33 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.7.2.3 2005/05/17 10:29:42 salo Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MOZILLA_BUILDLINK3_MK:= ${MOZILLA_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
.if !empty(MOZILLA_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.mozilla+= mozilla>=1.7.5
-BUILDLINK_RECOMMENDED.mozilla+= mozilla>=1.7.7
+BUILDLINK_RECOMMENDED.mozilla+= mozilla>=1.7.8
BUILDLINK_PKGSRCDIR.mozilla?= ../../www/mozilla
.endif # MOZILLA_BUILDLINK3_MK
diff -r 9c90c433f3b0 -r f6de61f3ff47 www/mozilla/distinfo
--- a/www/mozilla/distinfo Mon May 16 18:06:22 2005 +0000
+++ b/www/mozilla/distinfo Tue May 17 10:29:42 2005 +0000
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.72.2.3 2005/04/22 07:22:33 snj Exp $
+$NetBSD: distinfo,v 1.72.2.4 2005/05/17 10:29:42 salo Exp $
-SHA1 (mozilla-source-1.7.7.tar.bz2) = c660db518add97ed54e30a901c1e4e60dbafab3a
-RMD160 (mozilla-source-1.7.7.tar.bz2) = 410017e874ba058bf1dbc7f265db95a2311545a0
-Size (mozilla-source-1.7.7.tar.bz2) = 29776225 bytes
-SHA1 (mozilla-source-1.7.3-libart_lgpl.tar.bz2) = cb8f05dc11eb6fd954a15f6c04e2904c8d4d3f94
-RMD160 (mozilla-source-1.7.3-libart_lgpl.tar.bz2) = 4371536b745882de8dbd736ed03f3b661067251b
-Size (mozilla-source-1.7.3-libart_lgpl.tar.bz2) = 102926 bytes
+SHA1 (mozilla-1.7.8-source.tar.bz2) = ca682415a9ba99a3c4bd55636e1f9fda53a2545f
+RMD160 (mozilla-1.7.8-source.tar.bz2) = 3e91b559c2ab76ba6dc1f99fca57b921660ab673
+Size (mozilla-1.7.8-source.tar.bz2) = 30449749 bytes
SHA1 (patch-aa) = be62070f062e8ae13f06bd7b3f4f0d4a9ee67bef
SHA1 (patch-ab) = 77038a3dee47573782d912a928327d046c6d3c7f
SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642
Home |
Main Index |
Thread Index |
Old Index