Commit 8af3698b authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'devel' into feature/unsafe-browser

parents ab456aba e91536a9
......@@ -2,6 +2,7 @@
*.mo~
*.po~
*.pot~
*.swp
/*.buildlog
/*.img
/*.iso
......
......@@ -40,12 +40,12 @@ $RUN_LB_CONFIG \
--initramfs=live-boot \
${@}
# build i386 images on amd64 as well, include a bunch of kernels
# build i386 images on amd64 as well, include only 686 kernel
hw_arch="`dpkg --print-architecture`"
if [ "$hw_arch" = i386 -o "$hw_arch" = amd64 ]; then
$RUN_LB_CONFIG \
--architecture i386 \
--linux-flavours "486 686-pae amd64" \
--linux-flavours 486 \
${@}
# build powerpc images on powerpc64 as well, include only powerpc kernel
elif [ "$hw_arch" = powerpc -o "$hw_arch" = powerpc64 ]; then
......
......@@ -13,7 +13,7 @@
# Base for the string that will be passed to "lb config --bootappend-live"
# FIXME: see [[bugs/sdmem_on_eject_broken_for_CD]] for explanation why we
# need to set block.events_dfl_poll_msecs
AMNESIA_APPEND="noswap live-media=removable nopersistent noprompt quiet timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash nox11autologin"
AMNESIA_APPEND="live-media=removable nopersistent noprompt quiet timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash nox11autologin"
### You should not have to change anything bellow this line ####################
......
......@@ -62,6 +62,10 @@ Package: live-config
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: live-config-sysvinit
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: macchanger
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......@@ -238,19 +242,23 @@ Package: laptop-mode-tools
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: xul-ext-adblock-plus
Package: spice-vdagent
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: xul-ext-cookie-monster
Package: torsocks
Pin: origin backports.debian.org
Pin-Priority: 999
Package: xul-ext-adblock-plus
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: xul-ext-foxyproxy-standard
Package: xul-ext-cookie-monster
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: xul-ext-greasemonkey
Package: xul-ext-foxyproxy-standard
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......@@ -299,6 +307,10 @@ Package: *
Pin: origin mozilla.debian.net
Pin-Priority: 991
Package: *
Pin: release o=Debian,n=squeeze-updates
Pin-Priority: 990
Package: *
Pin: release o=Debian,n=squeeze
Pin-Priority: 900
......
#!/bin/sh
# We don't want to swap to the local machine
rm -f /usr/share/initramfs-tools/scripts/live-bottom/13swap
......@@ -7,6 +7,7 @@ apt-get --yes install -t squeeze-backports \
xserver-xorg \
xserver-xorg-core \
xserver-xorg-input-all \
xserver-xorg-video-all
xserver-xorg-video-all \
xserver-xorg-video-qxl
apt-get --yes install -t squeeze-backports libgl1-mesa-dri libgl1-mesa-glx \
libglu1-mesa libdrm-radeon1
......@@ -4,9 +4,9 @@
echo "removing unwanted iceweasel search plugins"
rm -f /usr/share/iceweasel/distribution/searchplugins/common/duckduckgo.xml
rm -f /usr/share/iceweasel/distribution/searchplugins/locale/*/amazon*.xml
rm -f /usr/share/iceweasel/distribution/searchplugins/locale/*/answers.xml
rm -f /usr/share/iceweasel/distribution/searchplugins/locale/*/bing*.xml
rm -f /usr/share/iceweasel/distribution/searchplugins/locale/*/eBay*.xml
rm -f /usr/share/iceweasel/distribution/searchplugins/locale/*/yahoo*.xml
rm -f /etc/iceweasel/searchplugins/common/duckduckgo.xml
rm -f /etc/iceweasel/searchplugins/locale/*/amazon*.xml
rm -f /etc/iceweasel/searchplugins/locale/*/answers.xml
rm -f /etc/iceweasel/searchplugins/locale/*/bing*.xml
rm -f /etc/iceweasel/searchplugins/locale/*/eBay*.xml
rm -f /etc/iceweasel/searchplugins/locale/*/yahoo*.xml
#!/bin/sh
set -e
# Move any /usr/bin/tsocks installed by any package out of the way,
# now (--rename) as well for any future one (hint: apt-get upgrade...).
dpkg-divert --rename --add /usr/bin/tsocks
......@@ -20,7 +20,8 @@ ln -s /usr/bin/gcc-4.4 /usr/bin/gcc-4.6
# Have the modules built for every installed kernel
for KERNEL in /boot/vmlinuz-* ; do
KERNEL_VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
KERNEL_ARCH="$(basename ${KERNEL} | sed -e 's|.*-||')"
VERSION_SCHEME="[[:digit:]]\+\(\.[[:digit:]]\+\)*-[[:digit:]]\+"
KERNEL_ARCH="$(echo ${KERNEL_VERSION} | sed -e "s|${VERSION_SCHEME}-||")"
apt-get install --yes linux-headers-2.6-${KERNEL_ARCH}
......@@ -45,6 +46,10 @@ EOF
# Revert to the real uname.
mv /bin/uname.$$ /bin/uname
# Workaround /usr/lib/dkms/common.postinst which would remove the modules
# during the next iteration
rm -rf /var/lib/dkms/virtualbox-guest
done
# clean the build directory
......
......@@ -2,9 +2,6 @@
echo "Removing unwanted files"
# Get AMNESIA_SUPPORTED_LANGUAGES
. /usr/share/amnesia/build/variables
rm -f /usr/share/icons/gnome/icon-theme.cache
rm -rf \
......@@ -17,12 +14,6 @@ find /usr/share/doc -type f -name changelog.gz -exec rm "{}" \;
find /usr/share/doc -type f -name changelog.Debian.gz -exec rm "{}" \;
find /usr/share/doc -type f -name NEWS.Debian.gz -exec rm "{}" \;
locales=$(echo "$AMNESIA_SUPPORTED_LANGUAGES" | sed 's/ /|/g')
find /usr/share/scribus-ng/translations \
-type f \
-regextype 'posix-egrep' -not -regex ".*scribus\.(${locales}).*" \
-exec rm "{}" \;
rm -rf /tmp/*
find /usr -name "*.pyc" -print0 | xargs -0r rm -f
......
#!/bin/sh
/usr/bin/hardlink -t /usr/share/doc
apt-get --yes purge hardlink
......@@ -9,7 +9,7 @@
MAX_WAIT=120
# Get LIVE_USERNAME
. /etc/live/config.d/username
. /etc/live/config.d/username.conf
for i in $(seq 1 ${MAX_WAIT}) ; do
if pgrep -u "${LIVE_USERNAME}" nm-applet >/dev/null 2>&1 ; then
......
......@@ -22,7 +22,7 @@ DATE_RE='[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][
VERSION_FILE=/etc/amnesia/version
# Get LIVE_USERNAME
. /etc/live/config.d/username
. /etc/live/config.d/username.conf
### Exit conditions
......
......@@ -16,7 +16,7 @@ if pgrep -u "${LIVE_USERNAME}" firefox-bin 1>/dev/null 2>&1; then
fi
# Get LIVE_USERNAME
. /etc/live/config.d/username
. /etc/live/config.d/username.conf
export DISPLAY=':0.0'
export XAUTHORITY="`echo /var/run/gdm3/auth-for-${LIVE_USERNAME}-*/database`"
exec /bin/su -c iceweasel "${LIVE_USERNAME}" &
......@@ -11,7 +11,7 @@ if [ $2 != "up" ]; then
fi
# Get LIVE_USERNAME
. /etc/live/config.d/username
. /etc/live/config.d/username.conf
# Restart Vidalia because it does not automatically reconnect to the new
# Tor instance. Use kill+start as:
......
......@@ -7,8 +7,5 @@
/* Hide HTTPS Everywhere button in the toolbar */
#https-everywhere-button { display: none; }
/* Hide Greasemonkey button in the toolbar */
#greasemonkey-tbb { display: none; }
/* Hide Foxyproxy button in the toolbar */
#foxyproxy-toolbar-icon { display: none; }
<UserScriptConfig>
<Script filename="permanently_enable_html5.user.js" name="Permanently Enable HTML5 on YouTube" namespace="katmagic" description="Permanently enable HTML5 on YouTube." version="" enabled="true" runAt="document-end" basedir="permanently_enable_html5" modified="1320501251000" dependhash="da39a3ee5e6b4b0d3255bfef95601890afd80709" updateAvailable="" lastUpdateCheck="" installurl="https://www.userscripts.org/scripts/source/105433.user.js" updateurl="https://www.userscripts.org/scripts/source/105433.user.js">
<Include>http://youtube.com/*</Include>
<Include>http://*.youtube.com/*</Include>
<Include>https://youtube.com/*</Include>
<Include>https://*.youtube.com/*</Include>
</Script>
</UserScriptConfig>
// ==UserScript==
// @name Permanently Enable HTML5 on YouTube
// @namespace katmagic
// @description Permanently enable HTML5 on YouTube.
// @include http://youtube.com/*
// @include http://*.youtube.com/*
// @include https://youtube.com/*
// @include https://*.youtube.com/*
// ==/UserScript==
/* This is free and unencumbered software released into the public domain. */
var cookies = document.cookie.split("; ");
var subbed = false;
for (var i in cookies) {
if (cookies[i].search("PREF=") == 0) {
subbed = true;
if (cookies[i] == "PREF=") {
// PREF is blank. Set f2.
var c = "PREF=f2=40000000";
} else if (cookies[i].search(/[&=]f2=/) == -1) {
// f2 isn't specified. Set it.
var c = cookies[i] + "&f2=40000000";
} else if (cookies[i].search(/[&=]f2=40000000(&|$)/) == -1) {
// f2 has a value other than 40000000. Set it properly.
var c = cookies[i].replace(/([&=])f2=[^&]*(&|$)/, "$1f2=40000000$2");
} else {
// f2 is already properly set. We needn't do anything.
return;
}
// Log what we did, if we did anything.
console.log( "Changing PREF from '" + cookies[i].substr(5) + "' to '" +
c.substr(5) + "'." );
document.cookie = c + ";domain=.youtube.com";
}
}
if (!subbed) {
// PREF doesn't exist. Create PREF and log about it.
console.log("Creating cookie PREF with value 'f2=40000000'.")
document.cookie = "PREF=f2=40000000;domain=.youtube.com";
}
// Request /html5. For god-knows-what reason, YouTube sometimes (but not always)
// requires a page other than / to have been requested.
var req = new XMLHttpRequest();
req.open("GET", "/html5", false);
req.send();
location.reload(true);
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
<os:ShortName>Scroogle SSL</os:ShortName>
<os:Description>Scroogle SSL</os:Description>
<os:InputEncoding>UTF-8</os:InputEncoding>
<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAACZmZmZAAAAmZmZmZmZAAmZqqqqqpmQCZmQAAAAqZCZqQAAAAAKmZmgAAAAAAqZmaAACaoACpmZoACZAAAKmZmgAKkAAAqZmaAACpmaqpmZoAAAAAAKmZmqAAAAAAqZCZqgAAAJmZAJmaqqqqqZkACZmZmZmZkAAACZmZmZAADwDzgFwAPgA4ABAHyAAQAAAAAAAAAAAAAAAAAAAAAAAAAA4AMAAOADAAAAfAAAAHyAAeADgAHgA8ADAADwDwAA</os:Image>
<SearchForm>https://ssl.scroogle.org/scrapal8.html</SearchForm>
<os:Url type="text/html" method="POST" template="https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi">
<os:Param name="Gw" value="{searchTerms}"/>
</os:Url>
</SearchPlugin>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment