Commit bad25665 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/stable' into bugfix/15794-feedback-on-failure-to-lock

parents 45fe6558 6b0fbd32
......@@ -37,21 +37,16 @@ Pin: release o=Debian,n=sid
Pin-Priority: 999
Explanation: src:firmware-nonfree
Package: firmware-linux firmware-linux-nonfree firmware-atheros firmware-brcm80211 firmware-intel-sound firmware-ipw2x00 firmware-iwlwifi firmware-libertas firmware-misc-nonfree firmware-realtek firmware-ti-connectivity
Package: firmware-linux firmware-linux-nonfree firmware-amd-graphics firmware-atheros firmware-brcm80211 firmware-intel-sound firmware-ipw2x00 firmware-iwlwifi firmware-libertas firmware-misc-nonfree firmware-realtek firmware-ti-connectivity
Pin: release o=Debian,n=sid
Pin-Priority: 990
Explanation: Exception to src:firmware-nonfree pinning due to Debian#928631
Package: firmware-amd-graphics
Pin: release o=Debian,n=stretch-backports
Pin-Priority: 990
Package: firmware-zd1211
Pin: release o=Debian,n=sid
Pin-Priority: 999
Package: fonts-noto*
Pin: release o=Debian,n=sid
Pin: release o=Debian,n=buster
Pin-Priority: 999
Explanation: src:gdk-pixbuf
......@@ -61,7 +56,7 @@ Pin-Priority: -1
Explanation: not available in Stretch; XXX:Buster: remove this entry
Package: hunspell-id hunspell-tr
Pin: release o=Debian,n=sid
Pin: release o=Debian,n=buster
Pin-Priority: 990
Package: intel-microcode
......@@ -125,10 +120,6 @@ Package: tails-installer
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: tor tor-geoipdb
Pin: release o=TorProject,n=tor-experimental-0.4.0.x-stretch
Pin-Priority: 999
Package: virtualbox*
Pin: release o=Debian,n=stretch-backports
Pin-Priority: 999
......
......@@ -217,6 +217,13 @@ apply_prefs_hacks() {
perl -pi -E \
's/^(pref\("browser.uiCustomization.state",.*\\"loop-button\\")/$1,\\"stop-reload-button\\"/' \
defaults/preferences/000-tor-browser.js
# Hide the security level button in the unsafe browser (#16735)
UNSAFE_BROWSER_PREFS=/usr/share/tails/chroot-browsers/unsafe-browser/prefs.js
echo "\n// Hide the security level button" >> "${UNSAFE_BROWSER_PREFS}"
grep -E '^pref\("browser.uiCustomization.state"' defaults/preferences/000-tor-browser.js | \
perl -p -E 's/(.*)\\"security-level-button\\",/user_$1/' >> "${UNSAFE_BROWSER_PREFS}"
# Append our custom prefs
cat /usr/share/tails/tor-browser-prefs.js \
>> defaults/preferences/000-tor-browser.js
......@@ -269,7 +276,7 @@ install_debian_extensions() {
destination="${1}"
shift
apt-get install --yes "${@}"
ln -s /usr/share/webext/ublock-origin/ \
ln -s '/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/uBlock0@raymondhill.net' \
"${destination}"/'uBlock0@raymondhill.net'
patch -p1 < /usr/share/tails/uBlock-disable-autoUpdate.diff
}
......
<?xml version='1.0' encoding='UTF-8' ?>
<account version='1.0'>
<account>
<protocol>prpl-irc</protocol>
<name>XXX_NICK_XXX@irc.oftc.net</name>
<statuses>
<status type='available' name='Available' active='true'>
<attributes/>
</status>
<status type='away' name='Away' active='false'>
<attributes/>
</status>
<status type='offline' name='Offline' active='false'>
<attributes/>
</status>
</statuses>
<settings>
<setting name='username' type='string'>XXX_NICK_XXX</setting>
<setting name='encoding' type='string'>UTF-8,ISO-8859-1</setting>
<setting name='realname' type='string'>XXX_NICK_XXX</setting>
<setting name='port' type='int'>6697</setting>
<setting name='ssl' type='bool'>1</setting>
</settings>
<settings ui='gtk-gaim'>
<setting name='auto-login' type='bool'>0</setting>
</settings>
<current_error/>
</account>
<account>
<protocol>prpl-irc</protocol>
<name>XXX_NICK_XXX@127.0.0.1</name>
<statuses>
<status type='available' name='Available' active='true'>
<attributes/>
</status>
<status type='away' name='Away' active='false'>
<attributes/>
</status>
<status type='offline' name='Offline' active='false'>
<attributes/>
</status>
</statuses>
<settings>
<setting name='username' type='string'>XXX_NICK_XXX</setting>
<setting name='encoding' type='string'>UTF-8,ISO-8859-1</setting>
<setting name='realname' type='string'>XXX_NICK_XXX</setting>
<setting name='port' type='int'>6668</setting>
<setting name='ssl' type='bool'>0</setting>
</settings>
<settings ui='gtk-gaim'>
<setting name='auto-login' type='bool'>0</setting>
</settings>
<proxy>
<type>none</type>
</proxy>
<current_error/>
</account>
</account>
<?xml version='1.0' encoding='UTF-8' ?>
<purple version='1.0'>
<privacy>
<account proto='prpl-irc' name='XXX_NICK_XXX@irc.oftc.net' mode='1'/>
</privacy>
</purple>
......@@ -25,3 +25,14 @@
/* Hide HTTPS Everywhere button in the toolbar */
#https-everywhere-button { display: none; }
/* Hide the uBlock sidebar, that's opened on first launch
References:
- https://github.com/gorhill/uBlock/releases/tag/1.16.6
- https://github.com/uBlock-LLC/uBlock/issues/1764 */
vbox#sidebar-box[sidebarcommand="_UUID~ADDON_-sidebar-action"] {
display: none !important;
}
vbox#sidebar-box[sidebarcommand="ublock0_raymondhill_net-sidebar-action"] {
display: none !important;
}
ENV{ID_FS_LABEL}=="TailsData", ENV{UDISKS_IGNORE}="1"
# We set UDISKS_IGNORE on the TailsData partition of the live boot
# device to hide it in GNOME apps. This prevents spurious notifications
# being shown when setting up persistence.
ENV{ID_FS_LABEL}=="TailsData", PROGRAM="/lib/bilibop/test $devnode", ENV{UDISKS_IGNORE}="1"
#!/bin/sh
# List of at least 2000 possible nicknames
NICKS_LIST=/usr/share/tails/firstnames.txt
# returns true with probability $1
prob()
{
# sh doesn't have bash's $RANDOM, so we implement it
RANDOM=$(expr $(od -Anv -N4 -tu4 /dev/urandom) % 32768)
# we compare with > instead of <= due to mismatch between bash and bc
# on what values true and false have.
return $(echo "scale = 10; ${RANDOM}/32767 > ${1}" | bc)
}
leet_nick()
{
# we leave the first letter due to restrictions on nicks in IRC
first=$(expr substr ${1} 1 1)
rest=${1#?}
rest=$(echo "${rest}" | tr 'e' '3' | tr 'i' '1' | tr 'o' '0')
echo "${first}${rest}"
}
generate_nick()
{
NICK=$(/usr/local/bin/lc.py -g 1 --min 4 --max 10 "${NICKS_LIST}")
if prob 0.90; then
NICK=$(echo "${NICK}" | tr '[:upper:]' '[:lower:]')
fi
if prob 0.05; then
if prob 0.50; then
NICK="${NICK}_"
else
NICK="${NICK}^"
fi
fi
if prob 0.05; then
NICK=$(leet_nick "${NICK}")
fi
echo ${NICK}
}
Configure_pidgin ()
{
echo "- configuring Pidgin"
NICK=$(generate_nick)
for file in accounts.xml blist.xml ; do
sudo -H -u "${LIVE_USERNAME}" sed -i'' "s,XXX_NICK_XXX,${NICK}," "/home/${LIVE_USERNAME}/.purple/${file}"
done
# Creating state file
touch /var/lib/live/config/pidgin
}
Configure_pidgin
#!/usr/bin/python3
# The MIT License
#
# Copyright (c) 2011 Christopher Pound
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
# lc.py -- language confluxer (http://www.ruf.rice.edu/~pound/lc.py)
#
# - Written by Christopher Pound (pound@rice.edu), July 1993.
# - Loren Miller suggested I make sure lc starts by picking a
# letter pair that was at the beginning of a data word, Oct 95.
# - Cleaned it up a little bit, March 95; more, September 01
# - Python version, Jul 09
#
# The datafile should be a bunch of words from some language
# with minimal punctuation or garbage (# starts a comment).
from optparse import OptionParser
import random
import re
import sys
class Pseudolanguage:
def __init__(self, **dict):
"""Set up a new pseudolanguage"""
dict.setdefault('name', '')
self.name = dict['name']
self.parsed = False
self.data = {}
self.inits = {}
self.pairs = {}
def incorporate(self, files):
"""Load list of files for this pseudolanguage into self.data"""
self.parsed = False
for f in files:
words = []
with open(f) as text:
for line in text:
line = line.strip()
line = re.sub(r"#.*", "", line)
words.extend(re.split(r"\s+", line))
self.data[f] = words
def delete(self, files):
"""Delete a list of languages from self.data"""
self.parsed = False
for f in files:
del self.data[f]
def parse(self):
"""Parse pseudolanguage's data into self.inits and self.pairs"""
if not self.parsed:
self.inits.clear()
self.pairs.clear()
for f in self.data:
for word in self.data[f]:
word += ' '
if len(word) > 3:
if word[0:2] in self.inits:
self.inits[word[0:2]].append(word[2:3])
else:
self.inits[word[0:2]] = [word[2:3]]
pos = 0
while pos < len(word)-2:
if word[pos:pos+2] in self.pairs:
self.pairs[word[pos:pos+2]].append(word[pos+2])
else:
self.pairs[word[pos:pos+2]] = [word[pos+2]]
pos = pos + 1
self.parsed = True
def dump(self):
"""Print the current parsed data; use pickle for inflatable dumps"""
self.parse()
print('name = """', self.name, '"""')
print("dump = { 'inits': ", self.inits, ",")
print("'pairs': ", self.pairs, " }")
def generate(self, number, min, max):
"""Generate list of words of min and max lengths"""
self.parse()
wordlist = []
while len(wordlist) < number:
word = random.choice(list(self.inits.keys()))
while word.find(' ') == -1:
word += random.choice(self.pairs[word[-2:]])
word = word.strip()
if len(word) >= min and len(word) <= max:
wordlist.append(word)
return wordlist
if __name__ == '__main__':
usage = "usage: %prog [options] datafile1 [datafile2 ...]"
parser = OptionParser(usage=usage, version="%prog 1.0")
parser.add_option("-d", "--dump", action="store_true",
dest="dump", default=False,
help="Dump internal representation of the pseudolanguage")
parser.add_option("-g", "--generate", type="int", dest="num",
help="Generate specified number of words")
parser.add_option("--min", type="int", dest="min", default=3,
help="Set the minimum length of each word")
parser.add_option("--max", type="int", dest="max", default=9,
help="Set the maximum length of each word")
parser.add_option("--name", dest="name", default=' ',
help="Set the name of the pseudolanguage")
(options, args) = parser.parse_args()
aLanguage = Pseudolanguage(name=options.name)
aLanguage.incorporate(args)
if options.dump:
aLanguage.dump()
else:
results = aLanguage.generate(options.num, options.min, options.max)
for word in results:
print(word)
......@@ -25,8 +25,6 @@ from tailslib.additionalsoftware import ( # NOQA: E402
get_packages_list_path,
filter_package_details)
_ = gettext.gettext
UI_FILE = "/usr/share/tails/additional-software/configuration-window.ui"
......
......@@ -15,8 +15,6 @@ from gi.repository import GLib
gi.require_version('Notify', '0.7')
from gi.repository import Notify # NOQA: E402
_ = gettext.gettext
class ASPNotifier(object):
"""Display a notification and exit with a meaningful code."""
......
......@@ -32,8 +32,6 @@ from tailslib.persistence import (
from tailslib.utils import launch_x_application
_ = gettext.gettext
ASP_STATE_DIR = "/run/live-additional-software"
ASP_STATE_PACKAGES = os.path.join(ASP_STATE_DIR, "packages")
ASP_STATE_INSTALLER_ASKED = os.path.join(ASP_STATE_DIR, "installer-asked")
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<interface domain="tails">
<requires lib="gtk+" version="3.20"/>
<object class="GtkHeaderBar" id="headerbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title">Additional Software</property>
<property name="title" translatable="yes">Additional Software</property>
<property name="has_subtitle">False</property>
<property name="show_close_button">True</property>
<property name="decoration_layout">:close</property>
......
......@@ -5,7 +5,6 @@ debootstrap/*
root/.gnupg/S.gpg-agent*
tmp/*
usr/share/doc/tails/website/blueprint/*
usr/share/doc/tails/website/contribute/how/translate/translation_progress.html
usr/share/doc/tails/website/promote/slides/*
usr/share/doc/tails/website/torrents/rss.html
usr/share/icons/*/.icon-theme.cache
......
Michael
Christopher
Jason
David
James
John
Robert
Brian
William
Matthew
Joseph
Daniel
Kevin
Eric
Jeffrey
Richard
Scott
Mark
Steven
Thomas
Timothy
Anthony
Charles
Joshua
Ryan
Jeremy
Paul
Andrew
Gregory
Chad
Kenneth
Jonathan
Stephen
Shawn
Aaron
Adam
Patrick
Justin
Sean
Edward
Todd
Donald
Ronald
Benjamin
Keith
Bryan
Gary
Jose
Nathan
Douglas
Brandon
Nicholas
George
Travis
Peter
Craig
Bradley
Larry
Dennis
Shane
Raymond
Troy
Jerry
Samuel
Frank
Jesse
Jeffery
Juan
Terry
Corey
Phillip
Marcus
Derek
Rodney
Joel
Carlos
Randy
Jacob
Jamie
Tony
Russell
Brent
Billy
Antonio
Derrick
Kyle
Erik
Johnny
Marc
Carl
Philip
Roger
Bobby
Brett
Danny
Curtis
Jon
Vincent
Cory
Jimmy
Victor
Lawrence
Dustin
Gerald
Walter
Joe
Alexander
Christian
Chris
Alan
Shannon
Wayne
Jared
Gabriel
Martin
Willie
Jay
Luis
Micheal
Henry
Wesley
Randall
Brad
Darren
Roy
Arthur
Albert
Ricky
Lance
Allen
Lee
Bruce
Andre
Mario
Frederick
Louis
Darrell
Damon
Shaun
Nathaniel
Zachary
Casey
Adrian
Jesus
Jeremiah
Jack
Ronnie
Dale
Tyrone
Manuel
Ricardo
Harold
Kelly
Barry
Reginald
Ian
Glenn
Ernest
Steve
Seth
Eugene
Clinton
Miguel
Tommy
Eddie
Leonard
Maurice
Roberto
Dwayne
Jerome
Ralph
Marvin
Francisco
Jorge
Neil
Alex
Dean
Kristopher
Calvin
Kurt
Theodore
Ruben
Jermaine
Tracy