Changeset 9483


Ignore:
Timestamp:
May 22, 2013, 9:01:05 AM (6 years ago)
Author:
fasma
Message:

New patch for firefox, adding KDE support

Location:
packages/anvil/firefox
Files:
6 added
4 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • packages/anvil/firefox/cmiffy/cmiffy

    r9099 r9483  
    4545# RENAME_DIRS = {'debian/old_name1/' : 'debian/new_name1/'}
    4646
    47 FILES_ADD = {}
     47FILES_ADD = {'firefox-kde.patch' : 'debian/patches/', 'mozilla-kde.patch' : 'debian/patches/'}
    4848FILES_DEL = []
    4949RENAME_DIRS = {}
  • packages/anvil/firefox/cmiffy/debdiff.patch

    r9019 r9483  
    1 diff -Naur firefox-20.0+build1.orig/debian/apport/source_firefox.py.in firefox-20.0+build1/debian/apport/source_firefox.py.in
    2 --- firefox-20.0+build1.orig/debian/apport/source_firefox.py.in 2013-03-29 02:42:46.000000000 +0000
    3 +++ firefox-20.0+build1/debian/apport/source_firefox.py.in      2013-04-12 11:39:44.000000000 +0100
    4 @@ -506,7 +506,7 @@
    5              ]
    6  
    7              append_dirs = [ 'defaults/preferences/*.js' ]
    8 -%%if DISTRIB_VERSION < 1104
    9 +%%if DISTRIB_VERSION < 16
    10              locations.append('/@MOZ_LIBDIR@/defaults/syspref/*.js')
    11              append_dirs.append('defaults/syspref/*.js')
    12  %%endif
    13 diff -Naur firefox-20.0+build1.orig/debian/build/mozbuild.mk firefox-20.0+build1/debian/build/mozbuild.mk
    14 --- firefox-20.0+build1.orig/debian/build/mozbuild.mk   2013-03-29 02:42:46.000000000 +0000
    15 +++ firefox-20.0+build1/debian/build/mozbuild.mk        2013-04-12 11:41:43.000000000 +0100
    16 @@ -177,7 +177,10 @@
     1diff -Naur firefox-21.0+build2.orig/debian/build/mozbuild.mk firefox-21.0+build2/debian/build/mozbuild.mk
     2--- firefox-21.0+build2.orig/debian/build/mozbuild.mk   2013-05-12 20:11:51.000000000 +0100
     3+++ firefox-21.0+build2/debian/build/mozbuild.mk        2013-05-21 08:38:08.127656560 +0100
     4@@ -159,7 +159,10 @@
     5 export LDFLAGS
    176 export DEB_BUILD_HARDENING=1
    18  export MOZCONFIG=$(CURDIR)/debian/config/mozconfig
    197 ifeq (Ubuntu, $(DISTRIB))
    208-export MOZ_UA_VENDOR=Ubuntu
     
    2614 ifneq (1,$(MOZ_BUILD_UNOFFICIAL))
    2715 export BUILD_OFFICIAL=1
    28 @@ -207,7 +210,7 @@
     16@@ -187,7 +190,7 @@
    2917                -DMOZ_OBJDIR="$(MOZ_OBJDIR)" -DDEB_BUILDDIR="$(DEB_BUILDDIR)" -DMOZ_PYTHON="$(MOZ_PYTHON)" -DMOZ_PROFILEDIR="$(MOZ_PROFILEDIR)" \
    3018                -DMOZ_PKG_BASENAME="$(MOZ_PKG_BASENAME)" -DMOZ_DEFAULT_PROFILEDIR="$(MOZ_DEFAULT_PROFILEDIR)" \
    3119                -DMOZ_DEFAULT_APP_NAME="$(MOZ_DEFAULT_APP_NAME)" -DMOZ_DEFAULT_APP_BASENAME="$(MOZ_DEFAULT_APP_BASENAME)" \
    32 -               -DDISTRIB_VERSION="$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)" -DMOZ_TESTDIR="$(MOZ_TESTDIR)"
    33 +               -DDISTRIB_VERSION="$(DISTRIB_VERSION_MAJOR)" -DMOZ_TESTDIR="$(MOZ_TESTDIR)"
     20-               -DDISTRIB_VERSION="$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)"
     21+               -DDISTRIB_VERSION="$(DISTRIB_VERSION_MAJOR)"
    3422 
    3523 ifeq (1, $(MOZ_ENABLE_BREAKPAD))
    3624 MOZ_DEFINES += -DMOZ_ENABLE_BREAKPAD
    37 diff -Naur firefox-20.0+build1.orig/debian/config/mozconfig.in firefox-20.0+build1/debian/config/mozconfig.in
    38 --- firefox-20.0+build1.orig/debian/config/mozconfig.in 2013-03-29 02:42:46.000000000 +0000
    39 +++ firefox-20.0+build1/debian/config/mozconfig.in      2013-04-12 11:42:20.000000000 +0100
    40 @@ -13,7 +13,7 @@
     25diff -Naur firefox-21.0+build2.orig/debian/config/mozconfig.in firefox-21.0+build2/debian/config/mozconfig.in
     26--- firefox-21.0+build2.orig/debian/config/mozconfig.in 2013-05-12 20:11:51.000000000 +0100
     27+++ firefox-21.0+build2/debian/config/mozconfig.in      2013-05-21 08:38:08.127656560 +0100
     28@@ -11,9 +11,9 @@
     29 ac_add_options --disable-updater
     30 ac_add_options --enable-application=browser
    4131 ac_add_options --enable-startup-notification
    42  ac_add_options --with-distribution-id=com.ubuntu
     32-ac_add_options --with-distribution-id=com.ubuntu
     33+ac_add_options --with-distribution-id=com.caixamagica
    4334 %%if DEB_HOST_ARCH == armel
    4435-%%if DISTRIB_VERSION < 1210
     
    4738 %%else
    4839 ac_add_options --disable-methodjit
    49 diff -Naur firefox-20.0+build1.orig/debian/control firefox-20.0+build1/debian/control
    50 --- firefox-20.0+build1.orig/debian/control     2013-03-29 02:42:51.000000000 +0000
    51 +++ firefox-20.0+build1/debian/control  2013-04-16 14:16:40.000000000 +0100
    52 @@ -31,7 +31,7 @@
    53         mesa-common-dev,
    54         libnotify-dev (>= 0.4),
    55         libxrender-dev,
    56 -       yasm-1 (>= 1.1) | yasm (>= 1.1),
    57 +       yasm (>= 1.1),
    58         libdbusmenu-gtk-dev,
    59         unzip,
    60         dbus-x11,
    61 diff -Naur firefox-20.0+build1.orig/debian/control.in firefox-20.0+build1/debian/control.in
    62 --- firefox-20.0+build1.orig/debian/control.in  2013-03-29 02:42:51.000000000 +0000
    63 +++ firefox-20.0+build1/debian/control.in       2013-04-16 14:16:40.000000000 +0100
    64 @@ -31,7 +31,7 @@
    65         mesa-common-dev,
    66         libnotify-dev (>= 0.4),
    67         libxrender-dev,
    68 -       yasm-1 (>= 1.1) | yasm (>= 1.1),
    69 +       yasm (>= 1.1),
    70         libdbusmenu-gtk-dev,
    71         unzip,
    72         dbus-x11,
    73 diff -Naur firefox-20.0+build1.orig/debian/distribution.ini firefox-20.0+build1/debian/distribution.ini
    74 --- firefox-20.0+build1.orig/debian/distribution.ini    2013-03-29 02:42:46.000000000 +0000
    75 +++ firefox-20.0+build1/debian/distribution.ini 2013-04-10 10:03:56.000000000 +0100
     40diff -Naur firefox-21.0+build2.orig/debian/control firefox-21.0+build2/debian/control
     41--- firefox-21.0+build2.orig/debian/control     2013-05-12 20:11:58.000000000 +0100
     42+++ firefox-21.0+build2/debian/control  2013-05-21 08:38:08.135656561 +0100
     43@@ -191,7 +191,7 @@
     44        ttf-liberation,
     45        gnome-session,
     46        gnome-settings-daemon,
     47-       ubuntu-settings,
     48+       caixamagica-settings,
     49        light-themes,
     50        unzip
     51 Provides: ${app:Provides}
     52diff -Naur firefox-21.0+build2.orig/debian/control.in firefox-21.0+build2/debian/control.in
     53--- firefox-21.0+build2.orig/debian/control.in  2013-05-12 20:11:58.000000000 +0100
     54+++ firefox-21.0+build2/debian/control.in       2013-05-21 08:38:08.135656561 +0100
     55@@ -191,7 +191,7 @@
     56        ttf-liberation,
     57        gnome-session,
     58        gnome-settings-daemon,
     59-       ubuntu-settings,
     60+       caixamagica-settings,
     61        light-themes,
     62        unzip
     63 Provides: ${app:Provides}
     64diff -Naur firefox-21.0+build2.orig/debian/distribution.ini firefox-21.0+build2/debian/distribution.ini
     65--- firefox-21.0+build2.orig/debian/distribution.ini    2013-05-12 20:11:51.000000000 +0100
     66+++ firefox-21.0+build2/debian/distribution.ini 2013-05-21 08:38:08.135656561 +0100
    7667@@ -1,9 +1,9 @@
    7768 [Global]
     
    8980+app.distributor.channel = “caixamagica”
    9081+app.partner.ubuntu = “caixamagica”
    91 diff -Naur firefox-20.0+build1.orig/debian/firefox.desktop.in firefox-20.0+build1/debian/firefox.desktop.in
    92 --- firefox-20.0+build1.orig/debian/firefox.desktop.in  2013-03-29 02:42:46.000000000 +0000
    93 +++ firefox-20.0+build1/debian/firefox.desktop.in       2013-04-12 11:43:07.000000000 +0100
    94 @@ -158,7 +158,7 @@
    95  GenericName[vi]=Trình duyệt Web
    96  GenericName[zh_CN]=眑络浏览噚
    97  GenericName[zh_TW]=網路瀏芜噚
    98 -%%if DISTRIB_VERSION >= 1204
    99 +%%if DISTRIB_VERSION >= 18
    100  Keywords=Internet;WWW;Browser;Web;Explorer
    101  Keywords[ast]=Internet;WWW;Restolador;Web;Esplorador
    102  Keywords[ca]=Internet;WWW;Navegador;Web;Explorador;Explorer
    103 @@ -194,8 +194,8 @@
    104  Categories=GNOME;GTK;Network;WebBrowser;
    105  MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
    106  StartupNotify=true
    107 -%%if DISTRIB_VERSION >= 1104
    108 -%%if DISTRIB_VERSION >= 1204
    109 +%%if DISTRIB_VERSION >= 16
    110 +%%if DISTRIB_VERSION >= 18
    111  Actions=NewWindow;NewPrivateWindow;
    112  %%define TARGET_ENV OnlyShowIn=Unity;
    113  %%define NEW_WINDOW_SECTION [Desktop Action NewWindow]
    114 diff -Naur firefox-20.0+build1.orig/debian/firefox-dev.install.in firefox-20.0+build1/debian/firefox-dev.install.in
    115 --- firefox-20.0+build1.orig/debian/firefox-dev.install.in      2013-03-29 02:42:46.000000000 +0000
    116 +++ firefox-20.0+build1/debian/firefox-dev.install.in   2013-04-12 11:43:27.000000000 +0100
     82diff -Naur firefox-21.0+build2.orig/debian/firefox-dev.install.in firefox-21.0+build2/debian/firefox-dev.install.in
     83--- firefox-21.0+build2.orig/debian/firefox-dev.install.in      2013-05-12 20:11:51.000000000 +0100
     84+++ firefox-21.0+build2/debian/firefox-dev.install.in   2013-05-21 08:38:08.135656561 +0100
    11785@@ -1,4 +1,4 @@
    11886-%%if DISTRIB_VERSION >= 1210
     
    12189 %%else
    12290 @MOZ_INCDIR@
    123 @@ -8,7 +8,7 @@
    124  @MOZ_SDKDIR@/*.h
    125  @MOZ_SDKDIR@/sdk/bin
    126  
    127 -%%if DISTRIB_VERSION < 1204
    128 +%%if DISTRIB_VERSION < 18
    129  debian/pkgconfig/mozilla-nspr.pc usr/lib/pkgconfig
    130  debian/pkgconfig/libxul.pc usr/lib/pkgconfig
    131  %%endif
    132 diff -Naur firefox-20.0+build1.orig/debian/firefox-dev.links.in firefox-20.0+build1/debian/firefox-dev.links.in
    133 --- firefox-20.0+build1.orig/debian/firefox-dev.links.in        2013-03-29 02:42:46.000000000 +0000
    134 +++ firefox-20.0+build1/debian/firefox-dev.links.in     2013-04-12 11:43:40.000000000 +0100
     91diff -Naur firefox-21.0+build2.orig/debian/firefox-dev.links.in firefox-21.0+build2/debian/firefox-dev.links.in
     92--- firefox-21.0+build2.orig/debian/firefox-dev.links.in        2013-05-12 20:11:51.000000000 +0100
     93+++ firefox-21.0+build2/debian/firefox-dev.links.in     2013-05-21 08:38:08.135656561 +0100
    13594@@ -1,4 +1,4 @@
    13695-%%if DISTRIB_VERSION < 1210
     
    13998 @MOZ_IDLDIR@ @MOZ_SDKDIR@/idl
    14099 @MOZ_INCDIR@ @MOZ_SDKDIR@/include
    141 diff -Naur firefox-20.0+build1.orig/debian/firefox.dirs.in firefox-20.0+build1/debian/firefox.dirs.in
    142 --- firefox-20.0+build1.orig/debian/firefox.dirs.in     2013-03-29 02:42:46.000000000 +0000
    143 +++ firefox-20.0+build1/debian/firefox.dirs.in  2013-04-12 11:44:04.000000000 +0100
    144 @@ -6,7 +6,7 @@
    145  etc/apparmor.d/disable
    146  etc/apport/native-origins.d
    147  etc/apport/blacklist.d
    148 -%%if DISTRIB_VERSION == 1110
    149 +%%if DISTRIB_VERSION == 17
    150  @MOZ_ADDONDIR@/distribution/searchplugins/common
    151  %%else
    152  @MOZ_LIBDIR@/distribution/searchplugins/common
    153 diff -Naur firefox-20.0+build1.orig/debian/firefox.install.in firefox-20.0+build1/debian/firefox.install.in
    154 --- firefox-20.0+build1.orig/debian/firefox.install.in  2013-03-29 02:42:46.000000000 +0000
    155 +++ firefox-20.0+build1/debian/firefox.install.in       2013-04-12 11:44:31.000000000 +0100
    156 @@ -13,7 +13,7 @@
    157  @MOZ_LIBDIR@/plugin-container
    158  @MOZ_LIBDIR@/webapprt-stub
    159  @MOZ_LIBDIR@/chrome.manifest
    160 -%%if DISTRIB_VERSION == 1110
    161 +%%if DISTRIB_VERSION == 17
    162  debian/distribution.ini @MOZ_ADDONDIR@/distribution
    163  %%else
    164  debian/distribution.ini @MOZ_LIBDIR@/distribution
    165 @@ -41,7 +41,7 @@
    166  debian/vendor-firefox.js @MOZ_LIBDIR@/defaults/preferences
    167  debian/vendor-webapprt.js @MOZ_LIBDIR@/webapprt/defaults/preferences
    168  
    169 -%%if DISTRIB_VERSION >= 1104
    170 +%%if DISTRIB_VERSION >= 16
    171  debian/syspref.js etc/@MOZ_PKG_NAME@
    172  %%else
    173  debian/@MOZ_PKG_BASENAME@.js etc/@MOZ_PKG_NAME@/pref
    174 @@ -49,6 +49,6 @@
    175  
    176  debian/usr.bin.@MOZ_PKG_NAME@ etc/apparmor.d
    177  
    178 -%%if DISTRIB_VERSION <= 1004
    179 +%%if DISTRIB_VERSION <= 15
    180  debian/@MOZ_APP_NAME@-restart-required.update-notifier @MOZ_LIBDIR@
    181  %%endif
    182 diff -Naur firefox-20.0+build1.orig/debian/firefox.links.in firefox-20.0+build1/debian/firefox.links.in
    183 --- firefox-20.0+build1.orig/debian/firefox.links.in    2013-03-29 02:42:46.000000000 +0000
    184 +++ firefox-20.0+build1/debian/firefox.links.in 2013-04-12 11:44:54.000000000 +0100
    185 @@ -1,12 +1,12 @@
    186  @MOZ_ADDONDIR@/extensions @MOZ_LIBDIR@/extensions
    187  @MOZ_ADDONDIR@/plugins @MOZ_LIBDIR@/plugins
    188  @MOZ_ADDONDIR@/searchplugins @MOZ_LIBDIR@/searchplugins
    189 -%%if DISTRIB_VERSION == 1110
    190 +%%if DISTRIB_VERSION == 17
    191  @MOZ_ADDONDIR@/distribution @MOZ_LIBDIR@/distribution
    192  %%else
    193  @MOZ_ADDONDIR@/distribution/extensions @MOZ_LIBDIR@/distribution/extensions
    194  %%endif
    195 -%%if DISTRIB_VERSION <= 1004
    196 +%%if DISTRIB_VERSION <= 15
    197  usr/share/myspell/dicts @MOZ_LIBDIR@/dictionaries
    198  %%else
    199  usr/share/hunspell @MOZ_LIBDIR@/dictionaries
    200 @@ -14,7 +14,7 @@
    201  usr/share/hyphen @MOZ_LIBDIR@/hyphenation
    202  @MOZ_LIBDIR@/firefox.sh usr/bin/@MOZ_APP_NAME@
    203  @MOZ_LIBDIR@/icons/mozicon128.png usr/share/pixmaps/@MOZ_APP_NAME@.png
    204 -%%if DISTRIB_VERSION >= 1104
    205 +%%if DISTRIB_VERSION >= 16
    206  etc/@MOZ_PKG_NAME@/syspref.js @MOZ_LIBDIR@/defaults/preferences/syspref.js
    207  %%else
    208  etc/@MOZ_PKG_NAME@/pref @MOZ_LIBDIR@/defaults/syspref
    209 diff -Naur firefox-20.0+build1.orig/debian/firefox-locale.preinst.in firefox-20.0+build1/debian/firefox-locale.preinst.in
    210 --- firefox-20.0+build1.orig/debian/firefox-locale.preinst.in   2013-03-29 02:42:46.000000000 +0000
    211 +++ firefox-20.0+build1/debian/firefox-locale.preinst.in        2013-04-12 11:45:15.000000000 +0100
    212 @@ -7,7 +7,7 @@
    213  MOZ_ADDONDIR=/@MOZ_ADDONDIR@
    214  
    215  if [ "$1" = "install" ] || [ "$1" = "upgrade" ] ; then
    216 -%%if DISTRIB_VERSION >= 1204
    217 +%%if DISTRIB_VERSION >= 18
    218  # ${LIBDIR}/distribution was a symlink in 11.10
    219      if [ -h ${MOZ_LIBDIR}/distribution ] ; then
    220          rm -f ${MOZ_LIBDIR}/distribution
    221 @@ -15,7 +15,7 @@
    222  %%endif
    223  
    224  # This used to be a symlink
    225 -%%if DISTRIB_VERSION == 1110
    226 +%%if DISTRIB_VERSION == 17
    227      if [ -h ${MOZ_ADDONDIR}/distribution/searchplugins ]; then
    228          rm -f ${MOZ_ADDONDIR}/distribution/searchplugins
    229  %%else
    230 diff -Naur firefox-20.0+build1.orig/debian/firefox.postinst.in firefox-20.0+build1/debian/firefox.postinst.in
    231 --- firefox-20.0+build1.orig/debian/firefox.postinst.in 2013-03-29 02:42:46.000000000 +0000
    232 +++ firefox-20.0+build1/debian/firefox.postinst.in      2013-04-12 11:46:49.000000000 +0100
    233 @@ -54,7 +54,7 @@
    234              ubuntu_version=`lsb_release -rs | cut -d '.' -f-2 | tr -d '.'`
    235          fi
    236          # Setup the extra include files for Ubuntu 10.10 and higher
    237 -        if [ "$ubuntu_version" -ge '1010' ]; then
    238 +        if [ "$ubuntu_version" -ge '15' ]; then
    239              # Add the local/ include
    240              LOCAL_APP_PROFILE="/etc/apparmor.d/local/usr.bin.$MOZ_PKG_NAME"
    241              test -e "$LOCAL_APP_PROFILE" || {
    242 @@ -97,7 +97,7 @@
    243          # Reload AppArmor profile
    244          DISABLE_APP_PROFILE="/etc/apparmor.d/disable/usr.bin.$MOZ_PKG_NAME"
    245          if [ ! -f "$DISABLE_APP_PROFILE" ] && aa-status --enabled 2>/dev/null; then
    246 -            if [ "$ubuntu_version" -ge '1010' ]; then
    247 +            if [ "$ubuntu_version" -ge '15' ]; then
    248                  apparmor_parser -r -T -W "$APP_PROFILE" || true
    249              else
    250                  apparmor_parser -r "$APP_PROFILE" || true
    251 @@ -115,11 +115,11 @@
    252      finish_rm_conffile "/etc/${MOZ_PKG_NAME}/profile/chrome/userChrome-example.css"
    253      finish_rm_conffile "/etc/${MOZ_PKG_NAME}/profile/chrome/userContent-example.css"
    254  
    255 -%%if DISTRIB_VERSION >= 1104
    256 +%%if DISTRIB_VERSION >= 16
    257      finish_mv_conffile "/etc/${MOZ_PKG_NAME}/pref/firefox.js" "/etc/${MOZ_PKG_NAME}/syspref.js"
    258  %%endif
    259  
    260 -%%if DISTRIB_VERSION == 1110
    261 +%%if DISTRIB_VERSION == 17
    262      if [ -d $MOZ_LIBDIR/distribution ] && [ ! -h $MOZ_LIBDIR/distribution ]; then \
    263          rmdir --ignore-fail-on-non-empty $MOZ_LIBDIR/distribution
    264      fi
    265 @@ -145,7 +145,7 @@
    266  
    267  echo "Please restart all running instances of $MOZ_APP_NAME, or you will experience problems."
    268  
    269 -%%if DISTRIB_VERSION <= 1004
    270 +%%if DISTRIB_VERSION <= 15
    271  if [ -d $UPDATENOTIFIERDIR ] ; then
    272    # pgrep matches application names from /proc/<pid>/status which is
    273    # truncated according to sys/procfs.h definition. Problem is it's
    274 diff -Naur firefox-20.0+build1.orig/debian/firefox.postrm.in firefox-20.0+build1/debian/firefox.postrm.in
    275 --- firefox-20.0+build1.orig/debian/firefox.postrm.in   2013-03-29 02:42:46.000000000 +0000
    276 +++ firefox-20.0+build1/debian/firefox.postrm.in        2013-04-12 11:47:26.000000000 +0100
    277 @@ -56,7 +56,7 @@
    278      abort_rm_conffile "/etc/${MOZ_PKG_NAME}/profile/chrome/userChrome-example.css"
    279      abort_rm_conffile "/etc/${MOZ_PKG_NAME}/profile/chrome/userContent-example.css"
    280  
    281 -%%if DISTRIB_VERSION >= 1104
    282 +%%if DISTRIB_VERSION >= 16
    283      abort_mv_conffile "/etc/${MOZ_PKG_NAME}/pref/firefox.js"
    284  %%endif
    285  fi
    286 diff -Naur firefox-20.0+build1.orig/debian/firefox.preinst.in firefox-20.0+build1/debian/firefox.preinst.in
    287 --- firefox-20.0+build1.orig/debian/firefox.preinst.in  2013-03-29 02:42:46.000000000 +0000
    288 +++ firefox-20.0+build1/debian/firefox.preinst.in       2013-04-12 11:47:52.000000000 +0100
    289 @@ -90,11 +90,11 @@
    290      prepare_rm_conffile "${MOZ_PKG_NAME}" "/etc/${MOZ_PKG_NAME}/profile/chrome/userChrome-example.css"
    291      prepare_rm_conffile "${MOZ_PKG_NAME}" "/etc/${MOZ_PKG_NAME}/profile/chrome/userContent-example.css"
    292  
    293 -%%if DISTRIB_VERSION >= 1104
    294 +%%if DISTRIB_VERSION >= 16
    295      prepare_mv_conffile "${MOZ_PKG_NAME}" "/etc/${MOZ_PKG_NAME}/pref/firefox.js"
    296  %%endif
    297  
    298 -%%if DISTRIB_VERSION >= 1204
    299 +%%if DISTRIB_VERSION >= 18
    300      # ${LIBDIR}/distribution was a symlink in 11.10
    301      if [ -h ${MOZ_LIBDIR}/distribution ] ; then
    302          rm -f ${MOZ_LIBDIR}/distribution
    303 @@ -102,7 +102,7 @@
    304  %%endif
    305  
    306      # This used to be a symlink
    307 -%%if DISTRIB_VERSION == 1110
    308 +%%if DISTRIB_VERSION == 17
    309      if [ -h ${MOZ_ADDONDIR}/distribution/searchplugins ]; then
    310          rm -f ${MOZ_ADDONDIR}/distribution/searchplugins
    311  %%else
    312 diff -Naur firefox-20.0+build1.orig/debian/firefox.prerm.in firefox-20.0+build1/debian/firefox.prerm.in
    313 --- firefox-20.0+build1.orig/debian/firefox.prerm.in    2013-03-29 02:42:46.000000000 +0000
    314 +++ firefox-20.0+build1/debian/firefox.prerm.in 2013-04-12 11:48:07.000000000 +0100
    315 @@ -5,7 +5,7 @@
    316  MOZ_APP_NAME=@MOZ_APP_NAME@
    317  
    318  if [ "$1" = "remove" ] ; then
    319 -%%if DISTRIB_VERSION <= 1004
    320 +%%if DISTRIB_VERSION <= 15
    321      rm -f /var/lib/update-notifier/user.d/$MOZ_APP_NAME-restart-required
    322  %%endif
    323      update-alternatives --remove gnome-www-browser /usr/bin/$MOZ_APP_NAME
    324 diff -Naur firefox-20.0+build1.orig/debian/patches/caixamagica-bookmarks.patch firefox-20.0+build1/debian/patches/caixamagica-bookmarks.patch
    325 --- firefox-20.0+build1.orig/debian/patches/caixamagica-bookmarks.patch 1970-01-01 01:00:00.000000000 +0100
    326 +++ firefox-20.0+build1/debian/patches/caixamagica-bookmarks.patch      2013-04-10 10:03:56.000000000 +0100
     100diff -Naur firefox-21.0+build2.orig/debian/firefox.links.in firefox-21.0+build2/debian/firefox.links.in
     101--- firefox-21.0+build2.orig/debian/firefox.links.in    2013-05-12 20:11:51.000000000 +0100
     102+++ firefox-21.0+build2/debian/firefox.links.in 2013-05-21 08:38:08.143656562 +0100
     103@@ -12,5 +12,5 @@
     104 @MOZ_LIBDIR@/browser/icons/mozicon128.png usr/share/pixmaps/@MOZ_APP_NAME@.png
     105 etc/@MOZ_PKG_NAME@/syspref.js @MOZ_LIBDIR@/browser/defaults/preferences/syspref.js
     106 
     107-# Compat with ubuntu-defaults-builder (see comment in firefox.install.in)
     108+# Compat with caixamagica-defaults-builder (see comment in firefox.install.in)
     109 @MOZ_LIBDIR@/distribution/distribution.ini @MOZ_LIBDIR@/browser/distribution/distribution.ini
     110diff -Naur firefox-21.0+build2.orig/debian/patches/caixamagica-bookmarks.patch firefox-21.0+build2/debian/patches/caixamagica-bookmarks.patch
     111--- firefox-21.0+build2.orig/debian/patches/caixamagica-bookmarks.patch 1970-01-01 01:00:00.000000000 +0100
     112+++ firefox-21.0+build2/debian/patches/caixamagica-bookmarks.patch      2013-05-21 08:38:08.143656562 +0100
    327113@@ -0,0 +1,24 @@
    328114+Description: Caixa Magica Bookmarks
     
    350136+     <DL><p>
    351137+         <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
    352 diff -Naur firefox-20.0+build1.orig/debian/patches/disable_jit_test.patch firefox-20.0+build1/debian/patches/disable_jit_test.patch
    353 --- firefox-20.0+build1.orig/debian/patches/disable_jit_test.patch      1970-01-01 01:00:00.000000000 +0100
    354 +++ firefox-20.0+build1/debian/patches/disable_jit_test.patch   2013-04-16 14:15:58.000000000 +0100
     138diff -Naur firefox-21.0+build2.orig/debian/patches/disable_jit_test.patch firefox-21.0+build2/debian/patches/disable_jit_test.patch
     139--- firefox-21.0+build2.orig/debian/patches/disable_jit_test.patch      1970-01-01 01:00:00.000000000 +0100
     140+++ firefox-21.0+build2/debian/patches/disable_jit_test.patch   2013-05-21 08:38:08.143656562 +0100
    355141@@ -0,0 +1,16 @@
    356142+diff -Naur firefox-20.0+build1.orig/js/src/Makefile.in firefox-20.0+build1/js/src/Makefile.in
     
    370156+ check:: check-jit-test
    371157+
    372 diff -Naur firefox-20.0+build1.orig/debian/patches/disable_test_browserGlue_distributio_MenuLinkAfter.patch firefox-20.0+build1/debian/patches/disable_test_browserGlue_distributio_MenuLinkAfter.patch
    373 --- firefox-20.0+build1.orig/debian/patches/disable_test_browserGlue_distributio_MenuLinkAfter.patch    1970-01-01 01:00:00.000000000 +0100
    374 +++ firefox-20.0+build1/debian/patches/disable_test_browserGlue_distributio_MenuLinkAfter.patch 2013-04-16 14:15:58.000000000 +0100
     158diff -Naur firefox-21.0+build2.orig/debian/patches/disable_test_browserGlue_distributio_MenuLinkAfter.patch firefox-21.0+build2/debian/patches/disable_test_browserGlue_distributio_MenuLinkAfter.patch
     159--- firefox-21.0+build2.orig/debian/patches/disable_test_browserGlue_distributio_MenuLinkAfter.patch    1970-01-01 01:00:00.000000000 +0100
     160+++ firefox-21.0+build2/debian/patches/disable_test_browserGlue_distributio_MenuLinkAfter.patch 2013-05-21 08:38:08.143656562 +0100
    375161@@ -0,0 +1,16 @@
    376162+diff -Naur firefox-20.0+build1.orig/browser/components/places/tests/unit/test_browserGlue_distribution.js firefox-20.0+build1/browser/components/places/tests/unit/test_browserGlue_distribution.js
     
    390176+   // Check the custom bookmarks exist on toolbar.
    391177+   let toolbarItemId =
    392 diff -Naur firefox-20.0+build1.orig/debian/patches/series.in firefox-20.0+build1/debian/patches/series.in
    393 --- firefox-20.0+build1.orig/debian/patches/series.in   2013-03-29 02:42:46.000000000 +0000
    394 +++ firefox-20.0+build1/debian/patches/series.in        2013-04-16 14:16:28.000000000 +0100
    395 @@ -1,8 +1,8 @@
     178diff -Naur firefox-21.0+build2.orig/debian/patches/series.in firefox-21.0+build2/debian/patches/series.in
     179--- firefox-21.0+build2.orig/debian/patches/series.in   2013-05-12 20:11:51.000000000 +0100
     180+++ firefox-21.0+build2/debian/patches/series.in        2013-05-21 08:38:08.143656562 +0100
     181@@ -1,6 +1,8 @@
    396182-ubuntu-bookmarks.patch
    397183+caixamagica-bookmarks.patch
    398184 normalize-distribution-searchplugins.patch
    399185 allow-lockPref-everywhere.patch
    400 -#@DIST=lucid,maverick,natty,oneiric@mozilla-kde.patch
    401 -#@DIST=lucid,maverick,natty,oneiric@firefox-kde.patch
    402186+mozilla-kde.patch
    403187+firefox-kde.patch
    404  #@DIST=!lucid,maverick@unity-globalmenu-build-support.patch
    405  #@DIST=lucid,maverick@add-syspref-dir.patch
    406  #@DIST=lucid@use-new-yasm-in-lucid.patch
    407 @@ -13,6 +13,8 @@
     188 unity-globalmenu-build-support.patch
     189 ubuntu-ua-string-changes.patch
     190 dont-include-hyphenation-patterns.patch
     191@@ -8,6 +10,8 @@
     192 fix-makefile-substitution-bug.patch
    408193 webapprt-support-for-langpacks.patch
    409194 no_neon_on_arm.patch
    410  python-virtualenv-multiarch-fix.patch
    411 +disable_jit_test.patch
    412 +disable_test_browserGlue_distributio_MenuLinkAfter.patch
     195+#disable_jit_test.patch
     196+#disable_test_browserGlue_distributio_MenuLinkAfter.patch
     197 #unity-menubar.patch
    413198 test-integration/mochitest-optional-websock-log.patch
    414  test-integration/reftest-output-junit-xml.patch
    415  test-integration/mochitest-output-junit-xml.patch
    416 diff -Naur firefox-20.0+build1.orig/debian/rules firefox-20.0+build1/debian/rules
    417 --- firefox-20.0+build1.orig/debian/rules       2013-03-29 02:42:46.000000000 +0000
    418 +++ firefox-20.0+build1/debian/rules    2013-04-12 11:51:05.000000000 +0100
    419 @@ -23,7 +23,7 @@
    420  MOZ_BRANDING_OPTION    := --with-branding=$(MOZ_BRANDING_DIR)
    421  endif
    422  
    423 -ifneq (,$(filter oneiric, $(DISTRIB_CODENAME)))
    424 +ifneq (,$(filter oneiric finisterra, $(DISTRIB_CODENAME)))
    425  MOZ_SEARCHPLUGIN_DIR   = $(MOZ_ADDONDIR)/distribution/searchplugins
    426  else
    427  MOZ_SEARCHPLUGIN_DIR   = $(MOZ_LIBDIR)/distribution/searchplugins
    428 @@ -32,7 +32,7 @@
    429  ifneq (,$(filter lucid, $(DISTRIB_CODENAME)))
    430  MOZ_PKG_SUPPORT_SUGGESTS       = $(MOZ_PKG_NAME)-gnome-support, kmozillahelper (>= 0.6)
    431  else
    432 -ifneq (,$(filter lucid maverick natty oneiric, $(DISTRIB_CODENAME)))
    433 +ifneq (,$(filter lucid maverick natty horn oneiric finisterra mondego coral, $(DISTRIB_CODENAME)))
    434  MOZ_PKG_SUPPORT_SUGGESTS       = $(MOZ_PKG_NAME)-gnome-support | firefox-kde-support
    435  endif
    436  endif
    437 @@ -70,13 +70,13 @@
    438                                                 $(NULL)
    439  
    440  debian/usr.bin.firefox.in:
    441 -       if [ '$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)' -ge '1204' ]; then \
    442 +       if [ '$(DISTRIB_VERSION_MAJOR)' -ge '18' ]; then \
    443                 cp $(CURDIR)/debian/usr.bin.firefox.apparmor.12.04 $(CURDIR)/debian/usr.bin.firefox.in ; \
    444 -       elif [ '$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)' -ge '1104' ]; then \
    445 +       elif [ '$(DISTRIB_VERSION_MAJOR)' -ge '16' ]; then \
    446                 cp $(CURDIR)/debian/usr.bin.firefox.apparmor.11.04 $(CURDIR)/debian/usr.bin.firefox.in ; \
    447 -       elif [ '$(DISTRIB_VERSION_MAJOR)$(DISTRIB_VERSION_MINOR)' -ge '1010' ]; then \
    448 +       elif [ '$(DISTRIB_VERSION_MAJOR)' -ge '15' ]; then \
    449                 cp $(CURDIR)/debian/usr.bin.firefox.apparmor.10.10 $(CURDIR)/debian/usr.bin.firefox.in ; \
    450 -       elif [ "$(DISTRIB_VERSION_MAJOR)" -ge "10" ]; then \
    451 +       elif [ "$(DISTRIB_VERSION_MAJOR)" -ge "14" ]; then \
    452                 cp $(CURDIR)/debian/usr.bin.firefox.apparmor.10.04 $(CURDIR)/debian/usr.bin.firefox.in ; \
    453         else \
    454                 cp $(CURDIR)/debian/usr.bin.firefox.apparmor.9.10 $(CURDIR)/debian/usr.bin.firefox.in ; \
    455 @@ -97,15 +97,15 @@
    456                     mozilla-plugin-pcmanx (<= 0.3.9-2ubuntu2), mozplugger (<= 1.14.1-2~exp3ubuntu1), \
    457                     xine-plugin (<= 1.0.2-2ubuntu1)
    458  else
    459 -ifneq (,$(filter natty, $(DISTRIB_CODENAME)))
    460 +ifneq (,$(filter natty horn, $(DISTRIB_CODENAME)))
    461  PLUGIN_BREAKS := flashplugin-installer (<= 11.2.202.233ubuntu0.11.04.2), adobe-flashplugin (<= 11.1.102.63-0natty1)
    462  PLUGIN_CONFLICTS := gcu-plugin (<=  0.12.7-1ubuntu1)
    463  else
    464 -ifneq (,$(filter oneiric, $(DISTRIB_CODENAME)))
    465 +ifneq (,$(filter oneiric finisterra, $(DISTRIB_CODENAME)))
    466  PLUGIN_BREAKS := flashplugin-installer (<= 11.2.202.233ubuntu0.11.10.3), adobe-flashplugin (<= 11.1.102.63-0oneiric1)
    467  PLUGIN_CONFLICTS := gcu-plugin (<= 0.12.8-1ubuntu3)
    468  else
    469 -ifneq (,$(filter precise, $(DISTRIB_CODENAME)))
    470 +ifneq (,$(filter precise mondego, $(DISTRIB_CODENAME)))
    471  PLUGIN_BREAKS := flashplugin-installer (<= 11.1.102.63ubuntu1), adobe-flashplugin (<= 11.1.102.63-0precise1)
    472  PLUGIN_CONFLICTS := gcu-plugin (<= 0.12.10-1ubuntu1)
    473  endif
    474 @@ -118,12 +118,12 @@
    475  WRITE_SUBSTVARS = $(shell echo "$(2)=$(3)" | sed -n 's/[ \t\n]\+/ /g p' >> debian/$(1).substvars)
    476  
     199 test-integration/automation-output-junit-xml.patch
     200diff -Naur firefox-21.0+build2.orig/debian/rules firefox-21.0+build2/debian/rules
     201--- firefox-21.0+build2.orig/debian/rules       2013-05-12 20:11:51.000000000 +0100
     202+++ firefox-21.0+build2/debian/rules    2013-05-21 08:38:08.143656562 +0100
     203@@ -68,9 +68,9 @@
    477204 ifeq (firefox, $(MOZ_PKG_NAME))
    478 -ifeq (,$(filter lucid maverick natty oneiric precise, $(DISTRIB_CODENAME)))
    479 +ifeq (,$(filter lucid maverick natty oneiric precise finisterra mondego, $(DISTRIB_CODENAME)))
     205 ifeq (,$(filter precise, $(DISTRIB_CODENAME)))
    480206 install/firefox::
    481207-       $(call WRITE_SUBSTVARS,firefox,transitional:Replaces,kubuntu-firefox-installer)
    482208+       $(call WRITE_SUBSTVARS,firefox,transitional:Replaces,caixamagicakde-firefox-installer)
    483209 else
    484  ifeq (,$(filter lucid, $(DISTRIB_CODENAME)))
    485210-FIREFOX_REPLACES = abrowser, abrowser-branding, firefox-branding, kubuntu-firefox-installer
    486211+FIREFOX_REPLACES = abrowser, abrowser-branding, firefox-branding, caixamagicakde-firefox-installer
     
    488213                 firefox-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1), $(PLUGIN_BREAKS)
    489214 install/firefox::
    490 @@ -138,7 +138,7 @@
    491                     abrowser-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1), firefox-branding (<= 4.0~b11+build3+nobinonly-0ubuntu1), \
    492                     $(PLUGIN_CONFLICTS)
    493  FIREFOX_REPLACES = firefox-3.6, firefox-3.5, firefox-3.0, firefox-3.6-gnome-support, firefox-2, firefox-2-libthai, \
    494 -                  firefox-2-dom-inspector, abrowser, abrowser-branding, firefox-branding, kubuntu-firefox-installer
    495 +                  firefox-2-dom-inspector, abrowser, abrowser-branding, firefox-branding, caixamagicakde-firefox-installer
    496  install/firefox::
    497         $(call WRITE_SUBSTVARS,firefox,transitional:Provides,$(FIREFOX_PROVIDES))
    498         $(call WRITE_SUBSTVARS,firefox,transitional:Conflicts,$(FIREFOX_CONFLICTS))
     215@@ -97,10 +97,7 @@
     216                fi \
     217        done < $(CURDIR)/debian/config/locales.shipped
     218 
     219-pre-build:: make-langpack-preinsts
     220-       @cp $(DEB_SRCDIR)/toolkit/content/widgets/dialog.xml $(DEB_SRCDIR)/toolkit/content/widgets/dialog-kde.xml
     221-       @cp $(DEB_SRCDIR)/toolkit/content/widgets/preferences.xml $(DEB_SRCDIR)/toolkit/content/widgets/preferences-kde.xml
     222-       @cp $(DEB_SRCDIR)/browser/base/content/browser.xul $(DEB_SRCDIR)/browser/base/content/browser-kde.xul
     223+pre-build::
     224 
     225 ifneq ($(MOZ_APP_BASENAME),$(MOZ_DEFAULT_APP_BASENAME))
     226        @echo "Setting MOZ_APP_UA_NAME to $(MOZ_DEFAULT_APP_BASENAME)"
     227diff -Naur firefox-21.0+build2.orig/debian/usr.bin.firefox.apparmor.12.04 firefox-21.0+build2/debian/usr.bin.firefox.apparmor.12.04
     228--- firefox-21.0+build2.orig/debian/usr.bin.firefox.apparmor.12.04      2013-05-12 20:11:51.000000000 +0100
     229+++ firefox-21.0+build2/debian/usr.bin.firefox.apparmor.12.04   2013-05-21 08:38:08.143656562 +0100
     230@@ -16,6 +16,7 @@
     231   #include <abstractions/cups-client>
     232   #include <abstractions/dbus-session>
     233   #include <abstractions/gnome>
     234+  #include <abstractions/kde>
     235   #include <abstractions/nameservice>
     236   #include <abstractions/p11-kit>
     237 
     238@@ -34,8 +35,8 @@
     239   /etc/ r,
     240   /etc/mime.types r,
     241   /etc/mailcap r,
     242-  /etc/xdg/*buntu/applications/defaults.list    r, # for all derivatives
     243-  /usr/share/xubuntu/applications/defaults.list r,
     244+  /etc/xdg/caixamagica*/applications/defaults.list    r, # for all derivatives
     245+  /usr/share/caixamagicaxfce/applications/defaults.list r,
     246   owner @{HOME}/.local/share/applications/defaults.list r,
     247   owner @{HOME}/.local/share/applications/mimeapps.list r,
     248   owner @{HOME}/.local/share/applications/mimeinfo.cache r,
     249diff -Naur firefox-21.0+build2.orig/debian/usr.bin.firefox.apparmor.18 firefox-21.0+build2/debian/usr.bin.firefox.apparmor.18
     250--- firefox-21.0+build2.orig/debian/usr.bin.firefox.apparmor.18 1970-01-01 01:00:00.000000000 +0100
     251+++ firefox-21.0+build2/debian/usr.bin.firefox.apparmor.18      2013-05-21 08:38:08.143656562 +0100
     252@@ -0,0 +1,157 @@
     253+# vim:syntax=apparmor
     254+# Author: Jamie Strandboge <jamie@canonical.com>
     255+
     256+# Declare an apparmor variable to help with overrides
     257+@{MOZ_LIBDIR}=/@MOZ_LIBDIR@
     258+
     259+#include <tunables/global>
     260+
     261+# We want to confine the binaries that match:
     262+#  /@MOZ_LIBDIR@/@MOZ_APP_NAME@
     263+#  /@MOZ_LIBDIR@/firefox
     264+# but not:
     265+#  /@MOZ_LIBDIR@/firefox.sh
     266+/@MOZ_LIBDIR@/firefox{,*[^s][^h]} {
     267+  #include <abstractions/audio>
     268+  #include <abstractions/cups-client>
     269+  #include <abstractions/dbus-session>
     270+  #include <abstractions/gnome>
     271+  #include <abstractions/kde>
     272+  #include <abstractions/nameservice>
     273+  #include <abstractions/p11-kit>
     274+
     275+  # Addons
     276+  #include <abstractions/ubuntu-browsers.d/firefox>
     277+
     278+  # for networking
     279+  network inet stream,
     280+  network inet6 stream,
     281+  @{PROC}/[0-9]*/net/if_inet6 r,
     282+  @{PROC}/[0-9]*/net/ipv6_route r,
     283+  @{PROC}/[0-9]*/net/dev r,
     284+  @{PROC}/[0-9]*/net/wireless r,
     285+
     286+  # should maybe be in abstractions
     287+  /etc/ r,
     288+  /etc/mime.types r,
     289+  /etc/mailcap r,
     290+  /etc/xdg/caixamagica*/applications/defaults.list    r, # for all derivatives
     291+  /usr/share/caixamagicaxfce/applications/defaults.list r,
     292+  owner @{HOME}/.local/share/applications/defaults.list r,
     293+  owner @{HOME}/.local/share/applications/mimeapps.list r,
     294+  owner @{HOME}/.local/share/applications/mimeinfo.cache r,
     295+  owner /tmp/** m,
     296+  owner /var/tmp/** m,
     297+  /tmp/.X[0-9]*-lock r,
     298+
     299+  /etc/timezone r,
     300+  /etc/wildmidi/wildmidi.cfg r,
     301+
     302+  # firefox specific
     303+  /etc/firefox*/ r,
     304+  /etc/firefox*/** r,
     305+  /etc/xul-ext/** r,
     306+  /etc/xulrunner-2.0*/ r,
     307+  /etc/xulrunner-2.0*/** r,
     308+  /etc/gre.d/ r,
     309+  /etc/gre.d/* r,
     310+
     311+  # noisy
     312+  deny @{MOZ_LIBDIR}/** w,
     313+  deny /@MOZ_ADDONDIR@/** w,
     314+  deny /usr/lib/xulrunner-addons/** w,
     315+  deny /usr/lib/xulrunner-*/components/*.tmp w,
     316+  deny /.suspended r,
     317+  deny /boot/initrd.img* r,
     318+  deny /boot/vmlinuz* r,
     319+  deny /var/cache/fontconfig/ w,
     320+  deny @{HOME}/.local/share/recently-used.xbel r,
     321+
     322+  # TODO: investigate
     323+  deny /usr/bin/gconftool-2 x,
     324+
     325+  # These are needed when a new user starts firefox and firefox.sh is used
     326+  @{MOZ_LIBDIR}/** ixr,
     327+  /usr/bin/basename ixr,
     328+  /usr/bin/dirname ixr,
     329+  /usr/bin/pwd ixr,
     330+  /sbin/killall5 ixr,
     331+  /bin/which ixr,
     332+  /usr/bin/tr ixr,
     333+  @{PROC}/ r,
     334+  @{PROC}/[0-9]*/cmdline r,
     335+  @{PROC}/[0-9]*/mountinfo r,
     336+  @{PROC}/[0-9]*/stat r,
     337+  owner @{PROC}/[0-9]*/task/[0-9]*/stat r,
     338+  @{PROC}/[0-9]*/status r,
     339+  @{PROC}/filesystems r,
     340+  owner @{HOME}/.thumbnails/*/*.png r,
     341+
     342+  /etc/mtab r,
     343+  /etc/fstab r,
     344+
     345+  # Needed for the crash reporter
     346+  owner @{PROC}/[0-9]*/environ r,
     347+  owner @{PROC}/[0-9]*/auxv r,
     348+  /etc/lsb-release r,
     349+  /usr/bin/expr ix,
     350+  /sys/devices/system/cpu/ r,
     351+  /sys/devices/system/cpu/** r,
     352+
     353+  # about:memory
     354+  owner @{PROC}/[0-9]*/statm r,
     355+  owner @{PROC}/[0-9]*/smaps r,
     356+
     357+  # Needed for container to work in xul builds
     358+  /usr/lib/xulrunner-*/plugin-container ixr,
     359+
     360+  # allow access to documentation and other files the user may want to look
     361+  # at in /usr and /opt
     362+  /usr/ r,
     363+  /usr/** r,
     364+  /opt/ r,
     365+  /opt/** r,
     366+
     367+  # so browsing directories works
     368+  / r,
     369+  /**/ r,
     370+
     371+  # Default profile allows downloads to ~/Downloads and uploads from ~/Public
     372+  owner @{HOME}/ r,
     373+  owner @{HOME}/Public/ r,
     374+  owner @{HOME}/Public/* r,
     375+  owner @{HOME}/Downloads/ r,
     376+  owner @{HOME}/Downloads/* rw,
     377+
     378+  # per-user firefox configuration
     379+  owner @{HOME}/.{firefox,mozilla}/ rw,
     380+  owner @{HOME}/.{firefox,mozilla}/** rw,
     381+  owner @{HOME}/.{firefox,mozilla}/**/*.{db,parentlock,sqlite}* k,
     382+  owner @{HOME}/.{firefox,mozilla}/plugins/** rm,
     383+  owner @{HOME}/.{firefox,mozilla}/**/plugins/** rm,
     384+  owner @{HOME}/.config/ibus/bus/ w,
     385+  owner @{HOME}/.gnome2/firefox*-bin-* rw,
     386+
     387+  #
     388+  # Extensions
     389+  # /usr/share/.../extensions/... is already covered by '/usr/** r', above.
     390+  # Allow 'x' for downloaded extensions, but inherit policy for safety
     391+  owner @{HOME}/.mozilla/**/extensions/** mixr,
     392+
     393+  deny @{MOZ_LIBDIR}/update.test w,
     394+  deny /usr/lib/mozilla/extensions/**/ w,
     395+  deny /usr/lib/xulrunner-addons/extensions/**/ w,
     396+  deny /usr/share/mozilla/extensions/**/ w,
     397+  deny /usr/share/mozilla/ w,
     398+
     399+  # Miscellaneous (to be abstracted)
     400+  # Ideally these would use a child profile. They are all ELF executables
     401+  # so running with 'Ux', while not ideal, is ok because we will at least
     402+  # benefit from glibc's secure execute.
     403+  /usr/bin/mkfifo Uxr,  # investigate
     404+  /bin/ps Uxr,
     405+  /bin/uname Uxr,
     406+
     407+  # Site-specific additions and overrides. See local/README for details.
     408+  #include <local/usr.bin.firefox>
     409+}
Note: See TracChangeset for help on using the changeset viewer.