Pullup ticket #2612 - tnn

firefox3: security update

Revisions pulled up:
- www/firefox3/Makefile			1.10 (via patch)
- www/firefox3/distinfo			1.10
- www/firefox3/patches/patch-dm		delete
---
Module Name:	pkgsrc
Committed By:	tnn
Date:		Wed Dec 17 15:43:01 UTC 2008

Modified Files:
	pkgsrc/www/firefox3: Makefile distinfo
Removed Files:
	pkgsrc/www/firefox3/patches: patch-dm

Log Message:
Update to firefox3-3.0.5.
pkgsrc changes:
- drop the external sqlite3 dependency and add --disable-system-sqlite,
  until the linkage issues have been resolved. (both external and
internal sqlite3 were linked previously.)
- remove patch-dm which doesn't seem to be needed.
  (was inherited from firefox2, hardcoded a /usr/pkg run path)

upstream changes:
- Fixed several security issues.
- Fixed several stability issues.
- Official releases for the Bengali, Esperanto, Galician, Hindi, and
Latvian languages are now available.
- Replaced the End-User License Agreement with a new "Know Your Rights"
info bar on initial install.
- When installing multiple signed XPIs simultaneously, previous
versions of Firefox would fail.
- Fixed several issues found in the accessibility implementation.
- Added the ability to send OS-specific system notes in the crash
reporter.

3 files changed, 8 insertions, 24 deletions

diff --git a/www/firefox3/Makefile b/www/firefox3/Makefile
index 05fe9792e36..1e8e8034238 100644
--- a/www/firefox3/Makefile
+++ b/www/firefox3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7.2.1 2008/11/17 09:57:55 rtr Exp $
+# $NetBSD: Makefile,v 1.7.2.2 2008/12/17 21:06:45 tron Exp $
 
 MOZILLA=		firefox3	# allow coexisting with firefox2
 COMMENT=		Lightweight gecko-based web browser
@@ -13,7 +13,6 @@ INSTALLATION_DIRS=	lib/pkgconfig
 CHECK_PORTABILITY_SKIP=	security/nss/tests/libpkix/libpkix.sh
 
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.6.4
-.include "../../databases/sqlite3/buildlink3.mk"
 
 PYTHON_FOR_BUILD_ONLY=	yes
 .include "../../lang/python/application.mk"
@@ -23,7 +22,7 @@ CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 .include "../../www/firefox/Makefile-firefox.common"
 
 MAINTAINER=		tnn@NetBSD.org
-MOZ_VER=		3.0.4
+MOZ_VER=		3.0.5
 
 DESCR_SRC=		${.CURDIR}/../../www/firefox/DESCR
 
@@ -84,5 +83,7 @@ CONFIGURE_ARGS+=	--enable-default-toolkit=cairo-gtk2
 CONFIGURE_ARGS+=	--disable-dbus
 # Avoids needing curl on Linux
 CONFIGURE_ARGS+=	--disable-crashreporter
+#CONFIGURE_ARGS+=	--disable-system-sqlite 
+.include "../../databases/sqlite3/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox3/distinfo b/www/firefox3/distinfo
index 7a033fc42e7..9e94cb5fa12 100644
--- a/www/firefox3/distinfo
+++ b/www/firefox3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5.2.1 2008/11/17 09:57:55 rtr Exp $
+$NetBSD: distinfo,v 1.5.2.2 2008/12/17 21:06:45 tron Exp $
 
-SHA1 (firefox-3.0.4-source.tar.bz2) = 16715b4af7ca2bad6baa8d450a3fd9cb375ad6d6
-RMD160 (firefox-3.0.4-source.tar.bz2) = 99e34b76feca22c74287b1e8d78a042c313c3f97
-Size (firefox-3.0.4-source.tar.bz2) = 36989339 bytes
+SHA1 (firefox-3.0.5-source.tar.bz2) = f934e073efaad3d4dde847c8491fa9529564d5d2
+RMD160 (firefox-3.0.5-source.tar.bz2) = ec6e7eab65649c5c79587a5a8ffb9b6b386b5a18
+Size (firefox-3.0.5-source.tar.bz2) = 36948252 bytes
 SHA1 (patch-aa) = f995b5e53fa11ecb659ab2dd10551db1c71cc5f3
 SHA1 (patch-ab) = dd388a040f99f71a79cf03a328de810e8d623374
 SHA1 (patch-ac) = c814530c1a8574739b7557d007563232b6070c51
@@ -27,7 +27,6 @@ SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a
 SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473
 SHA1 (patch-dk) = 0d676fbaf581fe3f513481010745278df6bf77ae
 SHA1 (patch-dl) = cba07cba5717a75c89f007aba36295dccc1c25ab
-SHA1 (patch-dm) = eb86aee54fd213eb64a89e5bc2754971db9648f4
 SHA1 (patch-do) = bdb018e157dcb5ef706b69184d8b739cfd32d8c3
 SHA1 (patch-dr) = 377b1d83079ada4d819b6702c1010cdd900575fc
 SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
diff --git a/www/firefox3/patches/patch-dm b/www/firefox3/patches/patch-dm
deleted file mode 100644
index 4faea9ac169..00000000000
--- a/www/firefox3/patches/patch-dm
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-dm,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
-
-diff -ruN ../Orig/mozilla/security/nss/cmd/platlibs.mk ./security/nss/cmd/platlibs.mk
---- ../Orig/mozilla/security/nss/cmd/platlibs.mk	2005-04-07 06:35:41.000000000 +0900
-+++ ./security/nss/cmd/platlibs.mk	2005-12-04 19:44:52.000000000 +0900
-@@ -186,8 +186,8 @@
- # If GNU ld is used, we must use the -rpath-link option to tell
- # the linker where to find libsoftokn3.so, an implicit dependency
- # of libnss3.so.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH)))
--EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
-+ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_ARCH)))
-+EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib -R/usr/pkg/lib/firefox
- endif
- 
- ifeq ($(OS_ARCH), SunOS)