summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/feature/tor-nightly-master' into ↵test/tor-bootstrap-robustness_tor-0.3.1.xanonym2017-03-252-0/+5
|\ | | | | | | test/tor-bootstrap-robustness_tor-0.3.1.x
| * Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-masterintrigeri2017-03-142-1/+2
| |\
| * \ Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-masterintrigeri2017-03-093-2109/+3650
| |\ \
| * \ \ Merge branch 'devel' into feature/tor-nightly-masterintrigeri2017-03-0623-48/+307
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/devel' into feature/tor-nightly-masterintrigeri2017-02-0757-199638/+103233
| |\ \ \ \
| * | | | | Install Tor nightly builds from their master branch.intrigeri2016-12-082-2/+2
| | | | | |
| * | | | | Also install tor-geoipdb 0.2.9.x, for consistency.intrigeri2016-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | refs: #12012
| * | | | | Merge remote-tracking branch 'origin/devel' into feature/12012-tor-0.2.9intrigeri2016-12-0210-21/+53
| |\ \ \ \ \
| * | | | | | Pin tor to tor-experimental-0.2.9.x-jessiesegfault2016-12-021-0/+4
| | | | | | |
| * | | | | | Add tor-experimental-0.2.9.x-jessie apt sourcesegfault2016-12-021-0/+1
| | | | | | |
* | | | | | | WIP: ISOanonym2017-03-257-329/+21
| |_|_|_|_|/ |/| | | | |
* | | | | | Clean up libdvd-pkg build files, again (Closes: #11273).intrigeri2017-03-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleanup operation was mistakenly removed in commit:c4e8744ac8ec3386cc82f03dff334885e018cb2f.
* | | | | | Merge branch 'stable' into develintrigeri2017-03-111-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Retry curl and APT operations up to 20 times to make the ISO build more ↵intrigeri2017-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | robust wrt. unreliable Internet connectivity. Thanks to Arnaud <arnaud@preev.io> for the patch!
* | | | | | Pull ttdnsd from our custom APT repository.intrigeri2017-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's gone from the TorProject one. We removed ttdnsd on feature/stretch already, so we'll need to pull it from our custom APT repository only for the next 3 months.
* | | | | | Merge branch 'stable' into develanonym2017-03-062-2108/+3649
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Empty the list of APT overlays: they were mergedanonym2017-03-062-0/+0
| | | | |
| * | | | Update uBlock Origin patterns + settings file.anonym2017-03-061-2108/+3649
| | | | |
* | | | | Don't install virtualbox-guest-x11 (refs: #12298).intrigeri2017-03-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | None of our two options work: * virtualbox-guest-x11 5.1.14 from sid depends on a newer xserver-xorg-core than what we have in jessie(-backports) * virtualbox-guest-x11 5.1.8 from jessie-backports is not co-installable with virtualbox-guest-utils (5.1.14) from sid, that we need to install virtualbox-guest-dkms (5.1.14) from sid, that we need to run Linux 4.9. Presumably, a custom backport of src:virtualbox could address all this. At this point it's unclear whether we can/should/want to commit to maintain that: see "Decide whether we can drop DKMS modules support" in https://tails.boum.org/contribute/meetings/201703/
* | | | | Install virtualbox-guest-* from sid (refs: #12298).intrigeri2017-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version currently in jessie-backports is not compatible with Linux 4.9, and there's basically no chance that it gets updated (the maintainer asked for them to be *removed* from jessie-backports).
* | | | | Merge branch 'stable' into develintrigeri2017-03-056-11/+98
|\ \ \ \ \ | |/ / / /
| * | | | Make notification action ids unique, in case it helps with the weird ↵intrigeri2017-03-053-3/+6
| | | | | | | | | | | | | | | | | | | | behaviour we see when multiple notifications with actions are displayed at the same time. (refs: #12193)
| * | | | Merge branch 'stable' into feature/12193-notify-if-32-bitintrigeri2017-03-052-17/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'stable' into feature/12193-notify-if-32-bitintrigeri2017-03-058-11/+21
| |\ \ \ \ \
| * | | | | | tails-*-notify-user scripts: start doc viewer in a subprocess.anonym2017-03-043-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we `exec()` into `tails-documentation`, these scripts will block until the documentation browser is closed (unless it was already started).
| * | | | | | Merge branch 'stable' into feature/12193-notify-if-32-bitintrigeri2017-03-035-2/+82
| |\ \ \ \ \ \
| * | | | | | | tails-virt-notify-user: use the tails-documentation helper to improve UX ↵intrigeri2017-03-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when one is not connected to Tor yet, and display localized doc when available.
| * | | | | | | tails-32-bit-notify-user: display the local news, and a localized version if ↵intrigeri2017-03-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available (refs: #12193). This will make this work even when offline.
| * | | | | | | tails-32-bit-notify-user: make decisions based on the CPU architecture, not ↵intrigeri2017-03-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the running kernel one (refs: #12193). Otherwise, manually picking the 32-bit kernel on 64-bit hardware would result in the notification being shown.
| * | | | | | | Merge remote-tracking branch 'origin/stable' into feature/12193-notify-if-32-bitintrigeri2017-03-023-15/+103
| |\ \ \ \ \ \ \
| * | | | | | | | Notify the user if running on a 32-bit processor, that won't be supported in ↵intrigeri2017-01-303-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tails 3.0 anymore (refs: #12193).
* | | | | | | | | Merge branch 'stable' into develintrigeri2017-03-052-17/+17
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/feature/12283-tor-browser-6.5.1' into ↵intrigeri2017-03-052-17/+17
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | stable (fix-committed: #12283)
| | * | | | | | | Upgrade Tor Browser to 6.5.1-build2.anonym2017-03-042-17/+17
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | Will-fix: #12283
* | | | | | | | Revert "Enable the bugfix-12217-linux-4.8.15 APT overlay."intrigeri2017-03-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e4ceebcfdd905b57125872ddb190cefdb24a25e3.
* | | | | | | | Revert "Freeze exception: install Linux 4.8.15 from our repo."intrigeri2017-03-051-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d484e0362736a97e2c2b57fa5218115660f0131a.
* | | | | | | | Merge branch 'stable' into develintrigeri2017-03-054-6/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/bugfix/12217-linux-4.8.15' into stable ↵intrigeri2017-03-052-5/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | (fix-committed: #12217)
| | * | | | | | | Freeze exception: install Linux 4.8.15 from our repo.anonym2017-03-041-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will-fix: #12217
| | * | | | | | | Enable the bugfix-12217-linux-4.8.15 APT overlay.anonym2017-03-031-0/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Will-fix: #12217
| * | | | | | | Merge remote-tracking branch 'origin/stable' into stableanonym2017-03-054-5/+10
| |\ \ \ \ \ \ \
| * | | | | | | | Revert "Import tentative fix from iuk.git (refs: #8449, #11839)."anonym2017-03-051-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f6b280136fe8fc3e3bb26979661f7d64daa008b7. A package new tails-iuk package (2.8) with the patch applied has now been uploaded.
| * | | | | | | | Enable the bugfix-8449-iuk-install-robustness APT overlay.anonym2017-03-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refs: #8449
| * | | | | | | | Import tentative fix from iuk.git (refs: #8449, #11839).intrigeri2017-03-031-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taken from branch bugfix/8449-iuk-install-robustness at commit c92bfd7362d4beccb3feb00a735773ad361f513a.
| * | | | | | | | Allow the tails-install-iuk user to run "/usr/bin/nocache /bin/cp *" as root ↵intrigeri2017-03-031-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | (refs: #8449).
* | | | | | | | Merge branch 'stable' into develintrigeri2017-03-054-5/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Disable modules we blacklist for security reasons.anonym2017-03-033-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blacklisted (via `blacklist MODULENAME`) modules are only blocked from being loaded during the boot process, but are still loadable with an explicit `modprobe MODULENAME`, and (worse!) via kernel module auto-loading.
| * | | | | | | Disable modules for more uncommon network protocol.anonym2017-03-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are the ones recommended by CIS in its "4.6 Uncommon Network Protocols" section, in: https://benchmarks.cisecurity.org/tools2/linux/cis_red_hat_enterprise_linux_7_benchmark_v1.1.0.pdf Why not being more CIS compliant? :) Refs: #6457
| * | | | | | | Fix CVE-2017-6074 by disabling the 'dccp' module.anonym2017-03-031-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For details, see: http://seclists.org/oss-sec/2017/q1/471 Will-fix: #12280
* | | | | | | Merge branch 'stable' into develintrigeri2017-03-035-2/+82
|\ \ \ \ \ \ \ | |/ / / / / /