bug 505832 - Ship an add-on blocklist by default, r=Neil
authorRobert Kaiser <kairo@kairo.at>
Tue, 01 Sep 2009 20:12:06 +0200
changeset 3480 02903d938d67c49bb1e8dacd634d6a14cc385bbc
parent 3479 6308cada419ad8d4829ee048d22d2cc33bc0bcae
child 3481 33eddeb4cdea0581f89dc6e53009bfcbd426c685
child 3614 b5e0aff84bf4077a47919481912ad0bd11c6a8d8
push idunknown
push userunknown
push dateunknown
reviewersNeil
bugs505832
bug 505832 - Ship an add-on blocklist by default, r=Neil
suite/app/Makefile.in
suite/app/blocklist.xml
suite/installer/unix/packages
suite/installer/windows/packages
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -273,16 +273,19 @@ libs::
 ifeq ($(OS_ARCH),WINNT)
 	$(EXIT_ON_ERROR) \
 	$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/suite/installer/license.txt > $(DIST)/bin/license.txt
 else
 	$(INSTALL) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/
 endif
 	touch $(DIST)/bin/.autoreg
 
+libs:: blocklist.xml
+	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
+
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 
 # copy .dmg contents into obj dir branding
 export::
 ifndef MOZ_BRANDING_DIRECTORY
 	$(NSINSTALL) -D $(DIST)/branding
 	cp $(topsrcdir)/suite/branding/package/mac/dsstore $(DIST)/branding/dsstore
 	cp $(topsrcdir)/suite/branding/package/mac/background.png $(DIST)/branding/background.png
new file mode 100644
--- /dev/null
+++ b/suite/app/blocklist.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist">
+  <emItems>
+    <emItem id="langpack-vi-VN@firefox.mozilla.org">
+      <versionRange minVersion="2.0" maxVersion="2.0"/>
+    </emItem>
+    <emItem id="support@daemon-tools.cc">
+      <versionRange minVersion=" " maxVersion="1.0.0.5"/>
+    </emItem>
+  </emItems>
+<pluginItems>
+  <pluginItem>
+    <match name="filename" exp="NPFFAddOn.dll"/>
+    <versionRange>
+      <targetApplication id="{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}">
+        <versionRange minVersion="" maxVersion="*"/>
+      </targetApplication>
+    </versionRange>
+  </pluginItem>
+  <pluginItem>
+    <match name="name" exp="^Yahoo Application State Plugin$"/>
+    <match name="description" exp="^Yahoo Application State Plugin$"/>
+    <match name="filename" exp="npYState.dll"/>
+    <versionRange>
+      <targetApplication id="{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}">
+        <versionRange minVersion="1.0.0.5" maxVersion="*"/>
+      </targetApplication>
+    </versionRange>
+  </pluginItem>
+  <pluginItem>
+    <match name="name" exp="QuickTime Plug-in 7[.]1[.]"/>
+    <match name="filename" exp="npqtplugin.?[.]dll"/>
+    <versionRange>
+      <targetApplication id="{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}">
+        <versionRange minVersion="1.0.0.5" maxVersion="*"/>
+      </targetApplication>
+    </versionRange>
+  </pluginItem>
+</pluginItems>
+</blocklist>
--- a/suite/installer/unix/packages
+++ b/suite/installer/unix/packages
@@ -43,16 +43,17 @@ bin/libxul.so
 [browser]
 bin/README
 bin/license.txt
 bin/@MOZ_APP_NAME@-bin
 bin/@MOZ_APP_NAME@
 bin/run-mozilla.sh
 bin/application.ini
 bin/platform.ini
+bin/blocklist.xml
 
 bin/mozilla-xremote-client
 bin/plugins/libnullplugin.so
 bin/libsqlite3.so
 #ifndef MOZ_STATIC_BUILD
 bin/libgfxpsshar.so
 bin/libgkgfx.so
 bin/libgtkxtbin.so
--- a/suite/installer/windows/packages
+++ b/suite/installer/windows/packages
@@ -54,16 +54,17 @@ bin\mozcpp19.dll
 
 [browser]
 ; files listed in xpcom (missing in this section) will be installed as part of the browser
 bin\README.txt,bin\readme.txt
 bin\license.txt
 bin\@MOZ_APP_NAME@.exe
 bin\application.ini
 bin\platform.ini
+bin\blocklist.xml
 
 bin\plugins\npnul32.dll
 bin\AccessibleMarshal.dll
 bin\sqlite3.dll
 #ifndef MOZ_STATIC_BUILD
 bin\gkgfx.dll
 bin\gksvggdiplus.dll
 bin\jsj3250.dll