pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2009Q3]: pkgsrc Pullup ticket #2923 - requested by tnn
details: https://anonhg.NetBSD.org/pkgsrc/rev/629e3d74abe7
branches: pkgsrc-2009Q3
changeset: 399956:629e3d74abe7
user: tron <tron%pkgsrc.org@localhost>
date: Wed Oct 28 18:13:23 2009 +0000
description:
Pullup ticket #2923 - requested by tnn
xulrunner: security update
firefox: security update
Revisions pulled up:
- devel/xulrunner/Makefile 1.24-1.25
- devel/xulrunner/PLIST 1.17-1.18
- devel/xulrunner/distinfo 1.13-1.14
- devel/xulrunner/mozilla-common.mk 1.2
- devel/xulrunner/patches/patch-aa 1.2
- devel/xulrunner/patches/patch-aq 1.3
- devel/xulrunner/patches/patch-ay 1.1
- devel/xulrunner/patches/patch-mf 1.2
- devel/xulrunner/patches/patch-mn 1.2
- devel/xulrunner/patches/patch-nb delete
- devel/xulrunner/patches/patch-nc delete
- devel/xulrunner/patches/patch-pd 1.2
- devel/xulrunner/patches/patch-ra 1.1
- devel/xulrunner/patches/patch-rb 1.1
- devel/xulrunner/patches/patch-rc 1.1
- www/firefox/Makefile 1.60-1.61
- www/firefox/PLIST 1.39
- www/firefox/distinfo delete
- www/firefox/patches/patch-aa delete
- www/firefox/patches/patch-ao delete
- www/firefox/patches/patch-ma delete
- www/firefox/patches/patch-mi delete
- www/firefox/patches/patch-mk delete
- www/firefox/patches/patch-mm delete
- www/firefox/patches/patch-ra delete
- www/firefox/patches/patch-rb delete
- www/firefox/patches/patch-rc delete
---
Module Name: pkgsrc
Committed By: tnn
Date: Sun Oct 11 10:49:57 UTC 2009
Modified Files:
pkgsrc/devel/xulrunner: Makefile PLIST distinfo
pkgsrc/devel/xulrunner/patches: patch-aa
pkgsrc/www/firefox: Makefile
Added Files:
pkgsrc/devel/xulrunner/patches: patch-ay patch-ra patch-rb
patch-rc Removed Files:
pkgsrc/www/firefox: distinfo
pkgsrc/www/firefox/patches: patch-aa patch-ao patch-ma patch-mi
patch-mk patch-mm patch-ra patch-rb patch-rc
Log Message:
- allow firefox and xulrunner to share some infrastructure
- install headers for plugin and liveconnect (needed by openjdk7-icedtea-plugin)
- bump revision for both packages
---
Module Name: pkgsrc
Committed By: tnn
Date: Wed Oct 28 11:36:36 UTC 2009
Modified Files:
pkgsrc/devel/xulrunner: Makefile PLIST distinfo
mozilla-common.mk pkgsrc/devel/xulrunner/patches: patch-aq patch-mf
patch-mn patch-pd pkgsrc/www/firefox: Makefile PLIST
Removed Files:
pkgsrc/devel/xulrunner/patches: patch-nb patch-nc
Log Message:
Security and bugfix update of firefox (to 3.5.4) and xulrunner (to
1.9.1.4) Also fix broken DESTDIR support.
Fixes the following security issues:
MFSA 2009-64 Crashes with evidence of memory corruption (rv:1.9.1.4/
1.9.0.15) MFSA 2009-63 Upgrade media libraries to fix memory safety bugs
MFSA 2009-62 Download filename spoofing with RTL override
MFSA 2009-61 Cross-origin data theft through document.getSelection()
MFSA 2009-59 Heap buffer overflow in string to number conversion
MFSA 2009-57 Chrome privilege escalation in XPCVariant::VariantDataToJS
() MFSA 2009-56 Heap buffer overflow in GIF color map parser
MFSA 2009-55 Crash in proxy auto-configuration regexp parsing
MFSA 2009-54 Crash with recursive web-worker calls
MFSA 2009-53 Local downloaded file tampering
MFSA 2009-52 Form history vulnerable to stealing
diffstat:
devel/xulrunner/Makefile | 86 ++++++--------------------------------
devel/xulrunner/PLIST | 50 +++++++++++++++++++++-
devel/xulrunner/distinfo | 24 +++++----
devel/xulrunner/mozilla-common.mk | 4 +-
devel/xulrunner/patches/patch-aa | 22 ++++++++-
devel/xulrunner/patches/patch-aq | 15 ++++--
devel/xulrunner/patches/patch-ay | 40 ++++++++++++++++++
devel/xulrunner/patches/patch-mf | 10 ++--
devel/xulrunner/patches/patch-mn | 8 +-
devel/xulrunner/patches/patch-nb | 35 ---------------
devel/xulrunner/patches/patch-nc | 20 ---------
devel/xulrunner/patches/patch-pd | 8 +-
devel/xulrunner/patches/patch-ra | 9 ++++
devel/xulrunner/patches/patch-rb | 7 +++
devel/xulrunner/patches/patch-rc | 12 +++++
print/scribus/Makefile | 4 +-
www/firefox/Makefile | 54 +++--------------------
www/firefox/PLIST | 3 +-
www/firefox/distinfo | 14 ------
www/firefox/patches/patch-aa | 78 -----------------------------------
www/firefox/patches/patch-ao | 24 ----------
www/firefox/patches/patch-ma | 23 ----------
www/firefox/patches/patch-mi | 15 ------
www/firefox/patches/patch-mk | 19 --------
www/firefox/patches/patch-mm | 19 --------
www/firefox/patches/patch-ra | 9 ----
www/firefox/patches/patch-rb | 7 ---
www/firefox/patches/patch-rc | 12 -----
28 files changed, 201 insertions(+), 430 deletions(-)
diffs (truncated from 1098 to 300 lines):
diff -r 4ed4bcd3dfbd -r 629e3d74abe7 devel/xulrunner/Makefile
--- a/devel/xulrunner/Makefile Fri Oct 23 10:28:23 2009 +0000
+++ b/devel/xulrunner/Makefile Wed Oct 28 18:13:23 2009 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2009/09/27 17:52:22 tnn Exp $
+# $NetBSD: Makefile,v 1.23.2.1 2009/10/28 18:13:23 tron Exp $
#
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= ${DISTNAME:S/firefox/xulrunner/:S/3.5/1.9.1/:S/.source//}
-FIREFOX_VER= 3.5.3
-PKGREVISION= 5
+FIREFOX_VER= 3.5.4
CATEGORIES= devel www
MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
EXTRACT_SUFX= .tar.bz2
@@ -14,14 +13,7 @@
COMMENT= XML User Interface Language runtime environment
WRKSRC= ${WRKDIR}/mozilla-1.9.1
-GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config perl gmake autoconf213
-USE_LANGUAGES= c c++
-
-BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
-
-PKG_DESTDIR_SUPPORT= user-destdir
-CHECK_PORTABILITY_SKIP= security/nss/tests/libpkix/libpkix.sh
+MOZILLA_DIR= # empty
PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding-unstable.pc.in
PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in
@@ -34,62 +26,19 @@
PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nss.pc.in
PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-plugin.pc.in
-PRIVILEGED_STAGES= clean
-
-CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess
-CONFIG_GUESS_OVERRIDE+= js/src/build/autoconf/config.guess
-CONFIG_GUESS_OVERRIDE+= nsprpub/build/autoconf/config.guess
-CONFIG_SUB_OVERRIDE= build/autoconf/config.sub
-CONFIG_SUB_OVERRIDE+= js/src/build/autoconf/config.sub
-CONFIG_SUB_OVERRIDE+= nsprpub/build/autoconf/config.sub
-
CONFIGURE_ARGS+= --enable-application=xulrunner
CONFIGURE_ARGS+= --enable-libxul
-CONFIGURE_ARGS+= --disable-tests --disable-pedantic
-CONFIGURE_ARGS+= --enable-crypto
-CONFIGURE_ARGS+= --enable-optimize=-O2 --with-pthreads
-CONFIGURE_ARGS+= --disable-javaxpcom
-CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
-CONFIGURE_ARGS+= --enable-svg --enable-mathml
-CONFIGURE_ARGS+= --enable-system-cairo
-CONFIGURE_ARGS+= --with-system-jpeg
-CONFIGURE_ARGS+= --with-system-zlib --with-system-bz2
-CONFIGURE_ARGS+= --enable-system-sqlite
-CONFIGURE_ARGS+= --disable-crashreporter
ALL_ENV+= MOZILLA_PKG_NAME=xulrunner
-SUBST_CLASSES+= fix-paths
-SUBST_STAGE.fix-paths= pre-configure
-SUBST_MESSAGE.fix-paths= Fixing absolute paths.
-SUBST_FILES.fix-paths= xpcom/build/nsXPCOMPrivate.h
-SUBST_FILES.fix-paths+= xulrunner/app/nsRegisterGREUnix.cpp
-SUBST_FILES.fix-paths+= xulrunner/installer/Makefile.in
-SUBST_FILES.fix-paths+= extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java
-SUBST_FILES.fix-paths+= xpcom/io/nsAppFileLocationProvider.cpp
-SUBST_SED.fix-paths= -e 's,/etc/gre.d,${PREFIX}/lib/xulrunner/gre.d,g'
-SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
-
-PYTHON_FOR_BUILD_ONLY= yes
-.include "../../lang/python/application.mk"
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
-
+.include "mozilla-common.mk"
.include "options.mk"
-.include "../../mk/bsd.prefs.mk"
pre-configure:
cd ${WRKSRC} && autoconf
cd ${WRKSRC}/js/src && autoconf
cd ${WRKSRC}/nsprpub && autoconf
-# Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
-.PHONY: create-rm-wrapper
-pre-configure: create-rm-wrapper
-create-rm-wrapper:
- printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
- ${WRAPPER_DIR}/bin/rm
- chmod +x ${WRAPPER_DIR}/bin/rm
-
INCLUDE_SUBDIRS=\
caps chardet commandhandler content cookie docshell dom \
downloads embedcomponents exthandler fastfind find gfx \
@@ -97,34 +46,29 @@
locale loginmgr mimetype necko nkcache nspr oji pipboot pipnss \
places pref profdirserviceprovider rdf shistory spellchecker \
string thebes toolkitcomps uconv uriloader webbrowserpersist \
- webbrwsr webshell widget windowwatcher xpcom xpconnect xulapp
+ webbrwsr webshell widget windowwatcher xpcom xpconnect xulapp \
+ plugin liveconnect
post-install:
# XXX fix the pkg-config files instead
rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
- ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue.a \
+ ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue.a \
${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a
- ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue_s.a \
+ ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue_s.a \
${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a
- ${INSTALL_LIB} ${WRKSRC}/dist/lib/libunicharutil_external_s.a \
+ ${INSTALL_LIB} ${WRKSRC}/dist/lib/libunicharutil_external_s.a \
${DESTDIR}${PREFIX}/lib/xulrunner
- cd ${WRKSRC}/dist/include && \
- ${INSTALL_DATA} `find ${INCLUDE_SUBDIRS} -name "*.h" -print` \
+.for dir in ${INCLUDE_SUBDIRS}
+ cd ${WRKSRC}/dist/include && \
+ ${INSTALL_DATA} `find ${dir} -name "*.h" -print` \
+ ${DESTDIR}${PREFIX}/include/xulrunner/unstable
+.endfor
+ cd ${WRKSRC}/dist/include && ${INSTALL_DATA} \
js/jsproto.tbl mozilla-config.h gtkembedmoz/gtkmozembed_glue.cpp \
${DESTDIR}${PREFIX}/include/xulrunner/unstable
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/xulrunner/unstable/obsolete
cd ${WRKSRC}/dist/include/nspr/obsolete && ${INSTALL_DATA} protypes.h \
${DESTDIR}${PREFIX}/include/xulrunner/unstable/obsolete
-.if ${OPSYS} == "Linux"
-.include "../../audio/alsa-lib/buildlink3.mk"
-.endif
-.include "../../archivers/bzip2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.6.10
-.include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../net/libIDL/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 4ed4bcd3dfbd -r 629e3d74abe7 devel/xulrunner/PLIST
--- a/devel/xulrunner/PLIST Fri Oct 23 10:28:23 2009 +0000
+++ b/devel/xulrunner/PLIST Wed Oct 28 18:13:23 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/10/06 15:46:32 tnn Exp $
+@comment $NetBSD: PLIST,v 1.16.2.1 2009/10/28 18:13:23 tron Exp $
bin/xulrunner
include/xulrunner/stable/base64.h
include/xulrunner/stable/blapit.h
@@ -572,6 +572,7 @@
include/xulrunner/unstable/jshash.h
include/xulrunner/unstable/jsinterp.h
include/xulrunner/unstable/jsiter.h
+include/xulrunner/unstable/jsjava.h
include/xulrunner/unstable/jslock.h
include/xulrunner/unstable/jslong.h
include/xulrunner/unstable/jsmath.h
@@ -619,6 +620,12 @@
${PLIST.jit}include/xulrunner/unstable/nanojit.h
include/xulrunner/unstable/necko-config.h
include/xulrunner/unstable/netCore.h
+include/xulrunner/unstable/netscape_javascript_JSException.h
+include/xulrunner/unstable/netscape_javascript_JSObject.h
+include/xulrunner/unstable/npapi.h
+include/xulrunner/unstable/npfunctions.h
+include/xulrunner/unstable/npruntime.h
+include/xulrunner/unstable/nptypes.h
include/xulrunner/unstable/nsASocketHandler.h
include/xulrunner/unstable/nsAString.h
include/xulrunner/unstable/nsAXPCNativeCallContext.h
@@ -717,6 +724,7 @@
include/xulrunner/unstable/nsDateTimeFormatCID.h
include/xulrunner/unstable/nsDebug.h
include/xulrunner/unstable/nsDebugImpl.h
+include/xulrunner/unstable/nsDefaultPlugin.h
include/xulrunner/unstable/nsDependentString.h
include/xulrunner/unstable/nsDependentSubstring.h
include/xulrunner/unstable/nsDeque.h
@@ -872,6 +880,7 @@
include/xulrunner/unstable/nsICipherInfo.h
include/xulrunner/unstable/nsIClassInfo.h
include/xulrunner/unstable/nsIClassInfoImpl.h
+include/xulrunner/unstable/nsIClassicPluginFactory.h
include/xulrunner/unstable/nsIClientAuthDialogs.h
include/xulrunner/unstable/nsIClipboard.h
include/xulrunner/unstable/nsIClipboardCommands.h
@@ -924,6 +933,7 @@
include/xulrunner/unstable/nsICookiePermission.h
include/xulrunner/unstable/nsICookiePromptService.h
include/xulrunner/unstable/nsICookieService.h
+include/xulrunner/unstable/nsICookieStorage.h
include/xulrunner/unstable/nsICryptoFIPSInfo.h
include/xulrunner/unstable/nsICryptoHMAC.h
include/xulrunner/unstable/nsICryptoHash.h
@@ -1345,6 +1355,7 @@
include/xulrunner/unstable/nsIEnumerator.h
include/xulrunner/unstable/nsIEnvironment.h
include/xulrunner/unstable/nsIErrorService.h
+include/xulrunner/unstable/nsIEventHandler.h
include/xulrunner/unstable/nsIEventListener.h
include/xulrunner/unstable/nsIEventListenerManager.h
include/xulrunner/unstable/nsIEventStateManager.h
@@ -1369,6 +1380,7 @@
include/xulrunner/unstable/nsIFileProtocolHandler.h
include/xulrunner/unstable/nsIFileStreams.h
include/xulrunner/unstable/nsIFileURL.h
+include/xulrunner/unstable/nsIFileUtilities.h
include/xulrunner/unstable/nsIFind.h
include/xulrunner/unstable/nsIFocusController.h
include/xulrunner/unstable/nsIFocusEventSuppressor.h
@@ -1405,6 +1417,7 @@
include/xulrunner/unstable/nsIHTMLContentSink.h
include/xulrunner/unstable/nsIHTMLDocument.h
include/xulrunner/unstable/nsIHTMLToTextSink.h
+include/xulrunner/unstable/nsIHTTPHeaderListener.h
include/xulrunner/unstable/nsIHandlerService.h
include/xulrunner/unstable/nsIHashable.h
include/xulrunner/unstable/nsIHelperAppLauncherDialog.h
@@ -1441,12 +1454,15 @@
include/xulrunner/unstable/nsIInterfaceInfoManager.h
include/xulrunner/unstable/nsIInterfaceRequestor.h
include/xulrunner/unstable/nsIInterfaceRequestorUtils.h
+include/xulrunner/unstable/nsIJRILiveConnectPIPeer.h
+include/xulrunner/unstable/nsIJRILiveConnectPlugin.h
include/xulrunner/unstable/nsIJRIPlugin.h
include/xulrunner/unstable/nsIJSContextStack.h
include/xulrunner/unstable/nsIJSEventListener.h
include/xulrunner/unstable/nsIJSNativeInitializer.h
include/xulrunner/unstable/nsIJSON.h
include/xulrunner/unstable/nsIJSRuntimeService.h
+include/xulrunner/unstable/nsIJVMAuthTools.h
include/xulrunner/unstable/nsIJVMConfigManager.h
include/xulrunner/unstable/nsIJVMConsole.h
include/xulrunner/unstable/nsIJVMManager.h
@@ -1468,6 +1484,7 @@
include/xulrunner/unstable/nsIListBoxObject.h
include/xulrunner/unstable/nsIListControlFrame.h
include/xulrunner/unstable/nsILiveConnectManager.h
+include/xulrunner/unstable/nsILiveconnect.h
include/xulrunner/unstable/nsILivemarkService.h
include/xulrunner/unstable/nsILoadContext.h
include/xulrunner/unstable/nsILoadGroup.h
@@ -1550,6 +1567,22 @@
include/xulrunner/unstable/nsIPhonetic.h
include/xulrunner/unstable/nsIPipe.h
include/xulrunner/unstable/nsIPlatformCharset.h
+include/xulrunner/unstable/nsIPlugin.h
+include/xulrunner/unstable/nsIPluginDocument.h
+include/xulrunner/unstable/nsIPluginHost.h
+include/xulrunner/unstable/nsIPluginInputStream.h
+include/xulrunner/unstable/nsIPluginInstance.h
+include/xulrunner/unstable/nsIPluginInstanceInternal.h
+include/xulrunner/unstable/nsIPluginInstanceOwner.h
+include/xulrunner/unstable/nsIPluginInstancePeer.h
+include/xulrunner/unstable/nsIPluginInstancePeer2.h
+include/xulrunner/unstable/nsIPluginManager.h
+include/xulrunner/unstable/nsIPluginManager2.h
+include/xulrunner/unstable/nsIPluginStreamInfo.h
+include/xulrunner/unstable/nsIPluginStreamListener.h
+include/xulrunner/unstable/nsIPluginTag.h
+include/xulrunner/unstable/nsIPluginTagInfo.h
+include/xulrunner/unstable/nsIPluginTagInfo2.h
include/xulrunner/unstable/nsIPluginWidget.h
include/xulrunner/unstable/nsIPopupBoxObject.h
include/xulrunner/unstable/nsIPosixLocale.h
@@ -1681,6 +1714,7 @@
include/xulrunner/unstable/nsIScriptableDateFormat.h
include/xulrunner/unstable/nsIScriptableInputStream.h
include/xulrunner/unstable/nsIScriptableInterfaces.h
+include/xulrunner/unstable/nsIScriptablePlugin.h
include/xulrunner/unstable/nsIScriptableRegion.h
include/xulrunner/unstable/nsIScriptableUConv.h
include/xulrunner/unstable/nsIScrollBoxObject.h
@@ -1691,7 +1725,9 @@
include/xulrunner/unstable/nsISecretDecoderRing.h
include/xulrunner/unstable/nsISecureBrowserUI.h
include/xulrunner/unstable/nsISecureEnv.h
+include/xulrunner/unstable/nsISecureLiveconnect.h
include/xulrunner/unstable/nsISecurityCheckedComponent.h
+include/xulrunner/unstable/nsISecurityContext.h
include/xulrunner/unstable/nsISecurityEventSink.h
include/xulrunner/unstable/nsISecurityInfoProvider.h
include/xulrunner/unstable/nsISecurityPref.h
@@ -1837,6 +1873,7 @@
include/xulrunner/unstable/nsIWidget.h
include/xulrunner/unstable/nsIWin32Locale.h
include/xulrunner/unstable/nsIWindowWatcher.h
+include/xulrunner/unstable/nsIWindowlessPlugInstPeer.h
include/xulrunner/unstable/nsIWritablePropertyBag.h
include/xulrunner/unstable/nsIWritablePropertyBag2.h
include/xulrunner/unstable/nsIWyciwygChannel.h
@@ -1920,6 +1957,8 @@
include/xulrunner/unstable/nsPIDOMStorage.h
include/xulrunner/unstable/nsPIDOMWindow.h
include/xulrunner/unstable/nsPIPlacesDatabase.h
+include/xulrunner/unstable/nsPIPluginHost.h
+include/xulrunner/unstable/nsPIPluginInstancePeer.h
include/xulrunner/unstable/nsPIPromptService.h
Home |
Main Index |
Thread Index |
Old Index