summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes/usr/share
diff options
context:
space:
mode:
Diffstat (limited to 'config/chroot_local-includes/usr/share')
-rw-r--r--config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/README5
-rw-r--r--config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/de/startpage-https-de.xml (renamed from config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/de/startpage-https-de.xml)4
-rw-r--r--config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/es/startpage-https-es.xml (renamed from config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/es/startpage-https-es.xml)4
-rw-r--r--config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/fr/startpage-https-fr.xml (renamed from config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/fr/startpage-https-fr.xml)4
-rw-r--r--config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/it/startpage-https-it.xml (renamed from config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/it/startpage-https-it.xml)4
-rw-r--r--config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/pt/startpage-https-pt.xml (renamed from config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/pt/startpage-https-pt.xml)4
-rw-r--r--config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes2
-rw-r--r--config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/README5
-rw-r--r--config/chroot_local-includes/usr/share/amnesia/iceweasel/sql/permissions.sql6
-rw-r--r--config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in9
-rw-r--r--config/chroot_local-includes/usr/share/applications/i2p.desktop.in9
-rw-r--r--config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in9
-rw-r--r--config/chroot_local-includes/usr/share/tails/firefox-localstore-win8.rdf38
-rw-r--r--config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt1
-rw-r--r--config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt15
-rwxr-xr-xconfig/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled4
16 files changed, 59 insertions, 64 deletions
diff --git a/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/README b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/README
new file mode 100644
index 0000000..1965fa9
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/README
@@ -0,0 +1,5 @@
+When Tails is built, the searchplugins defined in these directories
+will be symlinked to the corresponding locale directory in
+/usr/local/lib/tor-browser/distribution/searchplugins/locale with
+one twist: if a language has more than one locale, the searchplugins
+will be symlinked in all the corresponding directories.
diff --git a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/de/startpage-https-de.xml b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/de/startpage-https-de.xml
index c8b725e..1bcd2b2 100644
--- a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/de/startpage-https-de.xml
+++ b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/de/startpage-https-de.xml
@@ -1,6 +1,6 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Startpage HTTPS - Deutsch</os:ShortName>
-<os:Description>Startpage HTTPS - Deutsch Search Bar</os:Description>
+<os:ShortName>Startpage - Deutsch</os:ShortName>
+<os:Description>Startpage - Deutsch Search Bar</os:Description>
<os:InputEncoding>utf-8</os:InputEncoding>
<os:Image width="16" height="16">data:image/x-icon;base64,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</os:Image>
<UpdateInterval>3</UpdateInterval>
diff --git a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/es/startpage-https-es.xml b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/es/startpage-https-es.xml
index 85cadde..8d4cda8 100644
--- a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/es/startpage-https-es.xml
+++ b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/es/startpage-https-es.xml
@@ -1,6 +1,6 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Startpage HTTPS - Espanol</os:ShortName>
-<os:Description>Startpage HTTPS - Espanol Search Bar</os:Description>
+<os:ShortName>Startpage - Espanol</os:ShortName>
+<os:Description>Startpage - Espanol Search Bar</os:Description>
<os:InputEncoding>utf-8</os:InputEncoding>
<os:Image width="16" height="16">data:image/x-icon;base64,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</os:Image>
<UpdateInterval>3</UpdateInterval>
diff --git a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/fr/startpage-https-fr.xml b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/fr/startpage-https-fr.xml
index b22fece..af07166 100644
--- a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/fr/startpage-https-fr.xml
+++ b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/fr/startpage-https-fr.xml
@@ -1,6 +1,6 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Startpage HTTPS - Francais</os:ShortName>
-<os:Description>Startpage HTTPS - Francais Search Bar</os:Description>
+<os:ShortName>Startpage - Francais</os:ShortName>
+<os:Description>Startpage - Francais Search Bar</os:Description>
<os:InputEncoding>utf-8</os:InputEncoding>
<os:Image width="16" height="16">data:image/x-icon;base64,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</os:Image>
<UpdateInterval>3</UpdateInterval>
diff --git a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/it/startpage-https-it.xml b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/it/startpage-https-it.xml
index f51834e..0e6386a 100644
--- a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/it/startpage-https-it.xml
+++ b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/it/startpage-https-it.xml
@@ -1,6 +1,6 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Startpage HTTPS - Italiano</os:ShortName>
-<os:Description>Startpage HTTPS - Italiano Search Bar</os:Description>
+<os:ShortName>Startpage - Italiano</os:ShortName>
+<os:Description>Startpage - Italiano Search Bar</os:Description>
<os:InputEncoding>utf-8</os:InputEncoding>
<os:Image width="16" height="16">data:image/x-icon;base64,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</os:Image>
<UpdateInterval>3</UpdateInterval>
diff --git a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/pt/startpage-https-pt.xml b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/pt/startpage-https-pt.xml
index 7013584..2dd39e9 100644
--- a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/pt/startpage-https-pt.xml
+++ b/config/chroot_local-includes/usr/share/amnesia/browser/searchplugins/locale/pt/startpage-https-pt.xml
@@ -1,6 +1,6 @@
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Startpage HTTPS - Portugues</os:ShortName>
-<os:Description>Startpage HTTPS - Portugues Search Bar</os:Description>
+<os:ShortName>Startpage - Portugues</os:ShortName>
+<os:Description>Startpage - Portugues Search Bar</os:Description>
<os:InputEncoding>utf-8</os:InputEncoding>
<os:Image width="16" height="16">data:image/x-icon;base64,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</os:Image>
<UpdateInterval>3</UpdateInterval>
diff --git a/config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes b/config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes
index af7415a..1f8f60c 100644
--- a/config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes
+++ b/config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes
@@ -5,6 +5,8 @@ tmp/*
usr/share/amnesia/packages/*
usr/share/applications/vidalia.desktop
usr/share/doc/tails/website/blueprint/*
+usr/share/doc/tails/website/forum/*
+usr/share/doc/tails/website/promote/slides/*
usr/share/icons/*/.icon-theme.cache
usr/share/icons/*/icon-theme.cache
usr/share/inkscape/examples/*
diff --git a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/README b/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/README
deleted file mode 100644
index 89f95fe..0000000
--- a/config/chroot_local-includes/usr/share/amnesia/iceweasel/searchplugins/locale/README
+++ /dev/null
@@ -1,5 +0,0 @@
-When Tails is built, the searchplugins defined in these directories
-will be symlinked to the corresponding locale directory in
-/etc/iceweasel/searchplugins/locale. With one twist: if a language
-has more than one locale, the searchplugins will be symlinked in all
-the corresponding directories.
diff --git a/config/chroot_local-includes/usr/share/amnesia/iceweasel/sql/permissions.sql b/config/chroot_local-includes/usr/share/amnesia/iceweasel/sql/permissions.sql
deleted file mode 100644
index b93f2dd..0000000
--- a/config/chroot_local-includes/usr/share/amnesia/iceweasel/sql/permissions.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-PRAGMA foreign_keys=OFF;
-BEGIN TRANSACTION;
-CREATE TABLE moz_hosts ( id INTEGER PRIMARY KEY,host TEXT,type TEXT,permission INTEGER);
-INSERT INTO "moz_hosts" VALUES(1,'update.mozilla.org','install',1);
-INSERT INTO "moz_hosts" VALUES(2,'addons.mozilla.org','install',1);
-COMMIT;
diff --git a/config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in b/config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in
new file mode 100644
index 0000000..f42b6ae
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Categories=Network;
+_Comment=Anonymous overlay network browser
+Exec=sudo /usr/local/sbin/i2p-browser
+Icon=/usr/share/i2p/eepsite/docroot/favicon.ico
+_Name=I2P Browser
+_GenericName=Anonymous overlay network browser
+Terminal=false
+Type=Application
diff --git a/config/chroot_local-includes/usr/share/applications/i2p.desktop.in b/config/chroot_local-includes/usr/share/applications/i2p.desktop.in
deleted file mode 100644
index b038096..0000000
--- a/config/chroot_local-includes/usr/share/applications/i2p.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Categories=Network;
-_Comment=Anonymous overlay network
-Exec=/usr/local/bin/tails-start-i2p
-Icon=/usr/share/i2p/eepsite/docroot/favicon.ico
-_Name=i2p
-_GenericName=Anonymous overlay network
-Terminal=false
-Type=Application
diff --git a/config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in b/config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in
new file mode 100644
index 0000000..316a74f
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Tor Browser
+_Comment=Anonymous Web Browser
+_GenericName=Anonymous Web Browser
+Categories=Network;
+Icon=/usr/local/lib/tor-browser/browser/icons/mozicon128.png
+Terminal=false
+Type=Application
+Exec=/usr/local/bin/tor-browser
diff --git a/config/chroot_local-includes/usr/share/tails/firefox-localstore-win8.rdf b/config/chroot_local-includes/usr/share/tails/firefox-localstore-win8.rdf
index 9725fc0..caf677d 100644
--- a/config/chroot_local-includes/usr/share/tails/firefox-localstore-win8.rdf
+++ b/config/chroot_local-includes/usr/share/tails/firefox-localstore-win8.rdf
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <RDF:Description RDF:about="chrome://browser/content/browser.xul#nav-bar"
+ <RDF:Description RDF:about="chrome://browser/content/browser.xul#addon-bar"
collapsed="true"
- currentset="torbutton-button,noscript-tbb,reload-button,stop-button,foxyproxy-toolbar-icon,search-container,downloads-button,webrtc-status-button,window-controls,social-share-button,torbutton-context-menu,https-everywhere-button"
+ currentset="torbutton-button,noscript-tbb,reload-button,stop-button,search-container,downloads-button,webrtc-status-button,window-controls,social-share-button,torbutton-context-menu,https-everywhere-button"
iconsize="small" />
<RDF:Description RDF:about="about:config#valueCol"
ordinal="7" />
@@ -16,38 +16,12 @@
<NC:persist RDF:resource="chrome://browser/content/browser.xul#TabsToolbar"/>
<NC:persist RDF:resource="chrome://browser/content/browser.xul#sidebar-box"/>
<NC:persist RDF:resource="chrome://browser/content/browser.xul#sidebar-title"/>
+ <NC:persist RDF:resource="chrome://browser/content/browser.xul#main-window"/>
</RDF:Description>
- <RDF:Description RDF:about="about:config#lockCol"
- ordinal="3" />
- <RDF:Description RDF:about="chrome://browser/content/browser.xul#TabsToolbar"
- currentset="unified-back-forward-button,urlbar-container,appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,bookmarks-menu-button,home-button,tabs-closebutton" />
- <RDF:Description RDF:about="chrome://browser/content/browser.xul#navigator-toolbox"
- abp-iconposition="visible,addon-bar,addonbar-closebutton"
- iconsize="small" />
- <RDF:Description RDF:about="chrome://browser/content/browser.xul#sidebar-title"
- value="" />
- <RDF:Description RDF:about="about:config">
- <NC:persist RDF:resource="about:config#prefCol"/>
- <NC:persist RDF:resource="about:config#lockCol"/>
- <NC:persist RDF:resource="about:config#typeCol"/>
- <NC:persist RDF:resource="about:config#valueCol"/>
- </RDF:Description>
- <RDF:Description RDF:about="chrome://browser/content/browser.xul#sidebar-box"
- sidebarcommand=""
- width=""
- src="" />
- <RDF:Description RDF:about="about:config#typeCol"
- ordinal="5" />
- <RDF:Description RDF:about="chrome://browser/content/browser.xul#PersonalToolbar"
- currentset="personal-bookmarks"
- collapsed="true" />
<RDF:Description RDF:about="chrome://browser/content/browser.xul#toolbar-menubar"
autohide="true"
currentset="menubar-items" />
- <RDF:Description RDF:about="about:config#prefCol"
- ordinal="1"
- sortDirection="ascending" />
- <RDF:Description RDF:about="chrome://browser/content/browser.xul#addon-bar"
- collapsed="true"
- currentset="abp-toolbarbutton,addonbar-closebutton,spring,status-bar" />
+ <RDF:Description RDF:about="chrome://browser/content/browser.xul#navigator-toolbox"
+ iconsize="small"
+ abp-iconposition="hidden,addon-bar,addonbar-closebutton" />
</RDF:RDF>
diff --git a/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt b/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
new file mode 100644
index 0000000..02091a4
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt
@@ -0,0 +1 @@
+http://people.torproject.org/~gk/builds/
diff --git a/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
new file mode 100644
index 0000000..9ce7b6f
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt
@@ -0,0 +1,15 @@
+40214c8c396a16acebd2cfa55807ebaa420a37ff1d7c4b6ac183c71b208eacd3 tor-browser-linux32-4.0_ar.tar.xz
+aa96c1fb30c142ea70a51c06dd2be64ae07dd29d85e362473330a2b060af4d78 tor-browser-linux32-4.0_de.tar.xz
+b2fad95b8f20f09ce2ad9bb638e66b7790e91ce8ca14faea56a5ab0495504c22 tor-browser-linux32-4.0_en-US.tar.xz
+2985e83bef151527fa04c34aa3d02d88effb0285b51711e8fc344c75382e237b tor-browser-linux32-4.0_es-ES.tar.xz
+18866e5813e009188e5faabe57ff4bd7c38703f4c9e60aab9623d57d3dec0b8c tor-browser-linux32-4.0_fa.tar.xz
+621cf15714fa7ec8b7a3b462715ba6d4850d5b40ed56a049d35dc7cb241f81a9 tor-browser-linux32-4.0_fr.tar.xz
+5f810083a9f2654da1bed77a3258838ade898500fef913f95e318023b325b2cd tor-browser-linux32-4.0_it.tar.xz
+7e946cb84fe37c5e2c8939e0f56dc92b1cb5b27eb41a991fca041fd8fe4679cd tor-browser-linux32-4.0_ko.tar.xz
+24bdeeaed21bddcf75a062173b7b366fd26a1244065d961236199e388a6563c2 tor-browser-linux32-4.0_nl.tar.xz
+210d6ec704e6a0636e866436062b1639814d7ff979d2fb96dc5b2f3a081c7714 tor-browser-linux32-4.0_pl.tar.xz
+281a54210efaf9da7e4df7469d4efa0fdebe6163fad2aa688edaeb48d13d418d tor-browser-linux32-4.0_pt-PT.tar.xz
+9c9e9ed287e51c2e265b331ac6bad8e0a44706ed7a1ec128312d9b95b64e66ea tor-browser-linux32-4.0_ru.tar.xz
+b771d4fa62a7ea5ee16965ebd1cedb9470bbe801fb9c58c617710e0ea5e8837d tor-browser-linux32-4.0_tr.tar.xz
+d645ec6e8704bc2a58c258cdf51deb0c58bba8783883052df997255373f6a588 tor-browser-linux32-4.0_vi.tar.xz
+e41fb3dfe6464d45be8a8a40d6f80ab0806336161e3dfefeefa42437d870c932 tor-browser-linux32-4.0_zh-CN.tar.xz
diff --git a/config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled b/config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled
index fb5e94a..b5adb8e 100755
--- a/config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled
+++ b/config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled
@@ -8,6 +8,6 @@
TEXTDOMAIN="tails"
export TEXTDOMAIN
-zenity --warning --title="`gettext \"TrueCrypt will soon be removed from Tails\"`" \
- --text="`gettext \"TrueCrypt will soon be removed from Tails due to license and development concerns.\"`"
+zenity --warning --title="`gettext \"TrueCrypt will be removed in Tails 1.2.1\"`" \
+ --text="`gettext \"TrueCrypt is no longer maintained and is said to be insecure by its own authors. Therefore, it will be removed in Tails 1.2.1 (November 25). We recommend that you learn how to <a href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'>open TrueCrypt volumes with cryptsetup</a> as soon as possible.\"`"
exec /usr/bin/truecrypt