Wed Feb 17 22:24:32 2010 UTC ()
Pullup ticket 3009 - requested by tnn
security and bug fixes

Revisions pulled up:
- pkgsrc/devel/nspr/Makefile		by patch to equiv of 1.34
- pkgsrc/devel/xulrunner/dist.mk	by patch to equiv of 1.7
- pkgsrc/devel/xulrunner/distinfo	by patch to equiv of 1.24
- pkgsrc/www/firefox/Makefile		by patch to equiv of 1.70

   --------------------------------------------------------------------
   The attached diff against 2009Q4 updates firefox to 3.5.8.
   This is a security and bugfix update.


(spz)
diff -r1.32 -r1.32.2.1 pkgsrc/devel/nspr/Makefile
diff -r1.3 -r1.3.2.1 pkgsrc/devel/xulrunner/dist.mk
diff -r1.22 -r1.22.2.1 pkgsrc/devel/xulrunner/distinfo
diff -r1.65 -r1.65.2.1 pkgsrc/www/firefox/Makefile
cvs diff -r1.32 -r1.32.2.1 pkgsrc/devel/nspr/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/nspr/Makefile 2009/11/10 16:48:20 1.32
+++ pkgsrc/devel/nspr/Makefile 2010/02/17 22:24:32 1.32.2.1
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.32 2009/11/10 16:48:20 tnn Exp $ 1# $NetBSD: Makefile,v 1.32.2.1 2010/02/17 22:24:32 spz Exp $
2# 2#
3 3
4.include "../../devel/xulrunner/dist.mk" 4.include "../../devel/xulrunner/dist.mk"
5PKGNAME= ${DISTNAME:S/firefox/nspr/:S/3.5/${NSPR_RELEASE}/:S/.source//} 5PKGNAME= ${DISTNAME:S/firefox/nspr/:S/3.5/${NSPR_RELEASE}/:S/.source//}
6NSPR_RELEASE= 4.8.2 6NSPR_RELEASE= 4.8.3
7CATEGORIES= devel 7CATEGORIES= devel
8 8
9MAINTAINER= tnn@NetBSD.org 9MAINTAINER= tnn@NetBSD.org
10HOMEPAGE= http://www.mozilla.org/projects/nspr/index.html 10HOMEPAGE= http://www.mozilla.org/projects/nspr/index.html
11COMMENT= Platform-neutral API for system level and libc like functions 11COMMENT= Platform-neutral API for system level and libc like functions
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_DIRS= nsprpub 17CONFIGURE_DIRS= nsprpub
18 18
19USE_TOOLS+= autoconf213 gmake perl 19USE_TOOLS+= autoconf213 gmake perl
cvs diff -r1.3 -r1.3.2.1 pkgsrc/devel/xulrunner/Attic/dist.mk (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/dist.mk 2009/12/16 08:18:32 1.3
+++ pkgsrc/devel/xulrunner/Attic/dist.mk 2010/02/17 22:24:32 1.3.2.1
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: dist.mk,v 1.3 2009/12/16 08:18:32 tnn Exp $ 1# $NetBSD: dist.mk,v 1.3.2.1 2010/02/17 22:24:32 spz Exp $
2# 2#
3# used by devel/nspr/Makefile 3# used by devel/nspr/Makefile
4# used by devel/xulrunner/Makefile 4# used by devel/xulrunner/Makefile
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8FIREFOX_VER= 3.5.6 8FIREFOX_VER= 3.5.8
9MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 9MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo 12DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo
13PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches 13PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches
14 14
15WRKSRC= ${WRKDIR}/mozilla-1.9.1 15WRKSRC= ${WRKDIR}/mozilla-1.9.1
cvs diff -r1.22 -r1.22.2.1 pkgsrc/devel/xulrunner/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/distinfo 2010/01/10 09:43:06 1.22
+++ pkgsrc/devel/xulrunner/Attic/distinfo 2010/02/17 22:24:32 1.22.2.1
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.22 2010/01/10 09:43:06 tron Exp $ 1$NetBSD: distinfo,v 1.22.2.1 2010/02/17 22:24:32 spz Exp $
2 2
3SHA1 (firefox-3.5.6.source.tar.bz2) = fc1de4ddb9c20c7ba9e297737f926e9d8e32eed4 3SHA1 (firefox-3.5.8.source.tar.bz2) = 4bfb9a274113fb9ee590c00da69d995dc500d4cc
4RMD160 (firefox-3.5.6.source.tar.bz2) = 1002ff196eb8e281c06ef451154b64a903104664 4RMD160 (firefox-3.5.8.source.tar.bz2) = 97a4394d895fc0d8e7be34c090ebe75540108a90
5Size (firefox-3.5.6.source.tar.bz2) = 46914620 bytes 5Size (firefox-3.5.8.source.tar.bz2) = 46954234 bytes
6SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a 6SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a
7SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe 7SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe
8SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d 8SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1 9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
10SHA1 (patch-ae) = 6679dd9c28f8029cc0ed2a32ae60da696099f351 10SHA1 (patch-ae) = 6679dd9c28f8029cc0ed2a32ae60da696099f351
11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df 11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df
12SHA1 (patch-ag) = 62e55040130d5e6cfb10b839fce6abd40a902f08 12SHA1 (patch-ag) = 62e55040130d5e6cfb10b839fce6abd40a902f08
13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac 13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac
14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a 14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
15SHA1 (patch-aj) = 0e357b477aef423e7688dfb0be93cc8abc35e6e0 15SHA1 (patch-aj) = 0e357b477aef423e7688dfb0be93cc8abc35e6e0
16SHA1 (patch-ak) = 635187f582c16f8f044ffbdd950ec5f996d53ca8 16SHA1 (patch-ak) = 635187f582c16f8f044ffbdd950ec5f996d53ca8
17SHA1 (patch-al) = ca1a1fb5f875ab9c84c0afea5d913172a6f7ab57 17SHA1 (patch-al) = ca1a1fb5f875ab9c84c0afea5d913172a6f7ab57
18SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220 18SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220
cvs diff -r1.65 -r1.65.2.1 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2009/12/16 08:18:33 1.65
+++ pkgsrc/www/firefox/Makefile 2010/02/17 22:24:32 1.65.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.65 2009/12/16 08:18:33 tnn Exp $ 1# $NetBSD: Makefile,v 1.65.2.1 2010/02/17 22:24:32 spz Exp $
2# 2#
3 3
4.include "../../devel/xulrunner/dist.mk" 4.include "../../devel/xulrunner/dist.mk"
5PKGNAME= firefox-${FIREFOX_VER} 5PKGNAME= firefox-${FIREFOX_VER}
6CATEGORIES= www 6CATEGORIES= www
7 7
8MAINTAINER= tnn@NetBSD.org 8MAINTAINER= tnn@NetBSD.org
9HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 9HOMEPAGE= http://www.mozilla.com/en-US/firefox/
10COMMENT= Web browser with support for extensions 10COMMENT= Web browser with support for extensions
11 11
12WRKSRC= ${WRKDIR}/mozilla-1.9.1 12WRKSRC= ${WRKDIR}/mozilla-1.9.1
13MOZILLA_DIR= # empty 13MOZILLA_DIR= # empty
14 14
@@ -41,24 +41,24 @@ post-build: @@ -41,24 +41,24 @@ post-build:
41 > ${WRKDIR}/desktop 41 > ${WRKDIR}/desktop
42 ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${FILESDIR}/firefox.sh.in \ 42 ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${FILESDIR}/firefox.sh.in \
43 > ${WRKDIR}/firefox 43 > ${WRKDIR}/firefox
44 44
45INSTALLATION_DIRS+= share/applications share/pixmaps 45INSTALLATION_DIRS+= share/applications share/pixmaps
46post-install: 46post-install:
47 ${INSTALL_DATA} ${WRKDIR}/desktop \ 47 ${INSTALL_DATA} ${WRKDIR}/desktop \
48 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop 48 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
49 ${INSTALL_DATA} ${MOZILLA_ICON} \ 49 ${INSTALL_DATA} ${MOZILLA_ICON} \
50 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png 50 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
51 rm -f ${DESTDIR}${PREFIX}/bin/firefox 51 rm -f ${DESTDIR}${PREFIX}/bin/firefox
52 ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin 52 ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
53 53
54BUILDLINK_API_DEPENDS.xulrunner+= xulrunner-1.9.1.6{,nb*} 54BUILDLINK_API_DEPENDS.xulrunner+= xulrunner-1.9.1.8{,nb*}
55.include "../../devel/xulrunner/buildlink3.mk" 55.include "../../devel/xulrunner/buildlink3.mk"
56PLIST_VARS+= gnome 56PLIST_VARS+= gnome
57.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome) 57.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)
58CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui 58CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui
59PLIST.gnome= yes 59PLIST.gnome= yes
60.else 60.else
61CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui 61CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui
62.endif 62.endif
63.include "../../sysutils/desktop-file-utils/desktopdb.mk" 63.include "../../sysutils/desktop-file-utils/desktopdb.mk"
64.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"