r20023 - in /desktop/unstable/epiphany-webkit/debian: changelog patches/12_safetypes.patch

[kov at users.alioth.debian.org]

Author: kov
Date: Sun May 17 23:58:19 2009
New Revision: 20023

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20023
Log:
Merge r19784 from epiphany-browser

Modified:
    desktop/unstable/epiphany-webkit/debian/changelog
    desktop/unstable/epiphany-webkit/debian/patches/12_safetypes.patch

Modified: desktop/unstable/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-webkit/debian/changelog?rev=20023&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/changelog (original)
+++ desktop/unstable/epiphany-webkit/debian/changelog Sun May 17 23:58:19 2009
@@ -3,6 +3,7 @@
   [ Josselin Mouette ]
   * Add libglib2.0-doc and libgtk2.0-doc to b-d-i to ensure proper
     xrefs.
+  * 12_safetypes.patch: make application/x-desktop an unsafe MIME type.
 
  -- Gustavo Noronha Silva <kov at debian.org>  Sun, 17 May 2009 20:50:26 -0300
 

Modified: desktop/unstable/epiphany-webkit/debian/patches/12_safetypes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-webkit/debian/patches/12_safetypes.patch?rev=20023&op=diff
==============================================================================
--- desktop/unstable/epiphany-webkit/debian/patches/12_safetypes.patch (original)
+++ desktop/unstable/epiphany-webkit/debian/patches/12_safetypes.patch Sun May 17 23:58:19 2009
@@ -1,7 +1,7 @@
-Index: epiphany-2.22.3/data/mime-types-permissions.xml
+Index: epiphany-2.24.3/data/mime-types-permissions.xml
 ===================================================================
---- epiphany-2.22.3.orig/data/mime-types-permissions.xml	2007-09-28 16:36:06.000000000 +0200
-+++ epiphany-2.22.3/data/mime-types-permissions.xml	2008-07-22 13:25:14.764345469 +0200
+--- epiphany-2.24.3.orig/data/mime-types-permissions.xml	2007-09-28 16:36:06.000000000 +0200
++++ epiphany-2.24.3/data/mime-types-permissions.xml	2009-04-25 20:05:33.172045478 +0200
 @@ -19,6 +19,7 @@
  <mime-type type="application/postscript"/>
  <mime-type type="application/ram"/>
@@ -10,7 +10,15 @@
  <mime-type type="application/rtf"/>
  <mime-type type="application/sdp"/>
  <mime-type type="application/smil"/>
-@@ -206,6 +207,7 @@
+@@ -88,7 +89,6 @@
+ <mime-type type="application/x-dbase"/>
+ <mime-type type="application/x-dbm"/>
+ <mime-type type="application/x-designer"/>
+-<mime-type type="application/x-desktop"/>
+ <mime-type type="application/x-dia-diagram"/>
+ <mime-type type="application/x-dvi"/>
+ <mime-type type="application/x-e-theme"/>
+@@ -206,6 +206,7 @@
  <mime-type type="application/x-zip-compressed"/>
  <mime-type type="application/x-zoo"/>
  <mime-type type="application/xhtml+xml"/>
@@ -18,3 +26,11 @@
  <mime-type type="application/zip"/>
  <mime-type type="audio/ac3"/>
  <mime-type type="audio/AMR"/>
+@@ -438,6 +439,7 @@
+ <mime-type type="application/x-csh"/>
+ <mime-type type="application/x-dc-rom"/>
+ <mime-type type="application/x-deb"/>
++<mime-type type="application/x-desktop"/>
+ <mime-type type="application/x-executable"/>
+ <mime-type type="application/x-gameboy-rom"/>
+ <mime-type type="application/x-genesis-rom"/>