summaryrefslogtreecommitdiffstats
path: root/wiki
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2017-01-06 19:48:31 +0000
committersajolida <sajolida@pimienta.org>2017-01-06 19:48:31 +0000
commit2f26ed8a4f9811eaf175d5e9f5f019ea068f3765 (patch)
treea79fa1003f84e92ae4ab0d7b3dab43658744eea9 /wiki
parentfbc8337336fa35b75b4675fab19f943cdd44a1e5 (diff)
parenta3f2380004af06e443946ff7aaf8f357ac004981 (diff)
Merge remote-tracking branch 'origin/master'
Conflicts: wiki/src/blueprint/monthly_report/report_2016_12.mdwn
Diffstat (limited to 'wiki')
-rw-r--r--wiki/src/blueprint/Social_Contract.mdwn47
-rw-r--r--wiki/src/blueprint/monthly_meeting.mdwn1
-rw-r--r--wiki/src/blueprint/monthly_report/report_2016_12.mdwn47
-rw-r--r--wiki/src/blueprint/reproducible_builds.mdwn2
-rw-r--r--wiki/src/contribute/build.mdwn5
-rw-r--r--wiki/src/contribute/calendar.mdwn24
-rw-r--r--wiki/src/contribute/release_process/icedove.mdwn8
7 files changed, 100 insertions, 34 deletions
diff --git a/wiki/src/blueprint/Social_Contract.mdwn b/wiki/src/blueprint/Social_Contract.mdwn
index b35a7df..cdff434 100644
--- a/wiki/src/blueprint/Social_Contract.mdwn
+++ b/wiki/src/blueprint/Social_Contract.mdwn
@@ -1 +1,46 @@
-We would like to have one :)
+# Social contract
+
+Issue number: https://labs.riseup.net/code/issues/11669
+
+## Introduction
+
+The Tails Social Contract is a set of commitments that we as contributors to the Tails project stand by. This work is derived from the Debian Social Contract and Tor Project's Social Contract. If you have any questions or comments, feel free to email: <tails-project@boum.org>.
+
+This is a promise from our developer community to the rest of the world, affirming a commitment to our beliefs.
+
+## 1. By developing Tails and publishing related documentation we try to provide usable tools for anonymity and privacy.
+
+We believe that privacy, the free exchange of ideas, and equal access to information are essential to free and open societies. Through our community standards and the code we write and deploy, we provide tools that empower all people to protect and advance these rights.
+
+
+## 2. Tails and the related documentation is and will remain free software
+
+Equal access to information includes the free availability of our code and documentation as well as the transparency of our decision making processes. Tails will always be free to use, remix, adapt and distribute.
+
+When we write new components of the Tails system, we will license them in a manner consistent with the [Debian Free Software Guidelines](https://www.debian.org/social_contract).
+
+##3. We will give back to the Free Software community
+
+Tails is a privacy-oriented [Debian Derivative](https://wiki.debian.org/Derivatives).
+
+We want usable security and privacy-oriented tools to become a standard for the Free Software community as a whole.
+
+Bugfixes, code improvements, Debian packaging, as well as work on usability issues which we include in Tails will be upstreamed whenever possible. This way, our modifications will benefit others and can be improved upon further by a wider audience of people.
+
+## 4. We will never harm our users intentionally
+
+We will always do our best to write secure code and make the right decisions. We will never willingly include backdoors or malicious software nor will we cooperate with any entity wanting us to harm our users.
+
+As Tails is created in a transparent manner, anyone is encouraged to participate, review it and point out problems. Mistakes sometimes happen. We will be honest about them and fix them when they are reported to us.
+
+## 5. We will not hide problems
+
+Our entire bug report database is and will stay open for public view at all times. Reports that are filed here will promptly become visible to others.
+
+Whenever severe security issues are reported to us in private, we will test them and ensure we promptly fix these issues. We will notify our users whenever such an issue has been reported to us. However, for the security of our users, we might not disclose such a severe issue immediately, before releasing a fix.
+
+## 6. We are honest about the capabilities and limits of Tails and related technologies
+
+We encourage users to inform themselves and decide if Tails is suitable for their use case, fits their security needs and whether it can and should be trusted. We work diligently to keep our community up-to-date through our various communication channels about the current state of our software and its limitations. We encourage users to read our documentation as well as third-party documentation in order to make an informed decision and engage in a learning process about the tools we ship.
+
+We provide and explain methods of verification so that anyone can ensure that they downloaded a genuine copy of Tails.
diff --git a/wiki/src/blueprint/monthly_meeting.mdwn b/wiki/src/blueprint/monthly_meeting.mdwn
index 4495976..f2c1010 100644
--- a/wiki/src/blueprint/monthly_meeting.mdwn
+++ b/wiki/src/blueprint/monthly_meeting.mdwn
@@ -20,3 +20,4 @@ Discussions
- [[!tails_ticket 12098 desc="Spurious screensaver activation while synchronizing the system clock"]]
- [[!tails_ticket 11882 desc="disable recent usage and history in privacy settings by default"]]
- [[!tails_ticket 12076 desc="Have a sponsor per release"]]
+ - [[!tails_ticket 12104 desc="Can we drop DKMS modules support?"]]
diff --git a/wiki/src/blueprint/monthly_report/report_2016_12.mdwn b/wiki/src/blueprint/monthly_report/report_2016_12.mdwn
index 8c08090..7ebcc6e 100644
--- a/wiki/src/blueprint/monthly_report/report_2016_12.mdwn
+++ b/wiki/src/blueprint/monthly_report/report_2016_12.mdwn
@@ -6,24 +6,24 @@
Releases
========
-* [[Tails VERSION was released on MONTH DAY|news/version_VERSION]] ([major|minor] release).
+* Tails 2.9 was cancelled due to CVE-2016-1252.
+* [[Tails 2.9.1 was released on 12 14|news/version_2.9.1]] (minor release).
-* Tails VERSION+1 is [[scheduled for MONTH DAY|contribute/calendar]].
+* Tails 2.10 is [[scheduled for 01 24|contribute/calendar]].
-The following changes were introduced in Tails VERSION:
+The following changes were introduced in Tails 2.9.1:
-XXX: Copy the "Changes" section of the release notes, and compact a bit:
-
-- Remove lines about software upgrade (that's not Tails itself).
-- Remove screenshots.
-- Remove "New features" and "Upgrades and changes" headlines.
-- Remove line about Changelog.
+* Switch to *DuckDuckGo* as the default search engine in *Tor Browser*.
+ The previous default search engine, *Disconnect.me*, has already been
+ redirecting to *Duck Duck Go* for some time.
Code
====
-XXX: List important code work that is not covered already by the Release
- section (for example, the changes being worked on for the next version).
+We've had a great sprint about porting Tails to Debian Stretch.
+Most of our time was spent integrating the new Greeter as well as bug fixing,
+polishing, and updating the test suite.
+[https://mailman.boum.org/pipermail/tails-dev/2016-December/011121.html](Report from the sprint)
Documentation and website
=========================
@@ -48,16 +48,17 @@ XXX: Report only if more scenarios have been written and add the diff from the p
Funding
=======
-- We continued our donation campaign and wrote about [[Mediapart being
- the first news organizations to support Tails on a regular
- basis|news/mediapart]] and about the [[amazing results of our first
- donation campaign|news/33c3]] which will likely bring us more than
- 100000 € in donations.
+- We continued our donation campaign which will likely bring us more
+ than 100000 € in donations.
+
+- The [[independent French investigative journal Mediapart has decided
+ to support|news/mediapart]] Tails financially every year. Thank you
+ very much!
- We submitted a concept note to OTF for 2017-2018.
-- We were contacted by private sponsors interested in being recognized
- as Tails patrons.
+- We were contacted by private sponsors interested in donating and being
+ recognized as Tails patrons.
Outreach
========
@@ -65,21 +66,13 @@ Outreach
Past events
-----------
-Upcoming events
----------------
+From December 27th to December 30th, we were at 33C3 in Hamburg/Germany.
On-going discussions
====================
XXX: Link to the thread on <https://mailman.boum.org/pipermail/tails-XXX/>.
-Press and testimonials
-======================
-
-XXX: Copy content from press/media_appearances_2016.mdwn
- This page is continuously updated by tails-press@boum.org, so if
- it's empty there might be nothing special to report.
-
Translation
===========
diff --git a/wiki/src/blueprint/reproducible_builds.mdwn b/wiki/src/blueprint/reproducible_builds.mdwn
index 34ea3ae..3723a38 100644
--- a/wiki/src/blueprint/reproducible_builds.mdwn
+++ b/wiki/src/blueprint/reproducible_builds.mdwn
@@ -2,7 +2,7 @@ This is about [[!tails_ticket 5630]].
[[!toc levels=2]]
-<div class="why">
+<a id="why"></a>
# Why we want reproducible builds
diff --git a/wiki/src/contribute/build.mdwn b/wiki/src/contribute/build.mdwn
index f0f99eb..9521e16 100644
--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -244,10 +244,9 @@ uncommitted changes. This behaviour can be controlled by:
The fastest build you could pretend to get can be done by setting:
- export TAILS_BUILD_OPTIONS="ram cache extproxy gzipcomp"
+ export TAILS_BUILD_OPTIONS="ram extproxy gzipcomp"
-This will force the build to happen in RAM and allow skipping the
-boostrap stage if one is cached, and will use use an HTTP proxy
+This will force the build to happen in RAM, and will use use an HTTP proxy
external to the virtual machine, and SquashFS compression will be done
using *gzip*.
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index ceadc11..bb1bb22 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -1,12 +1,32 @@
[[!meta title="Calendar"]]
-* 2017-01-24: Release 2.10 (Firefox 45.7) - anonym is the RM
+* 2017-01-12:
+ - Feature Freeze: All feature branches targeting Tails 2.10 *must*
+ be merged into the `devel` branch by noon, CET.
+ - Build and upload Tails 2.10~rc1.
+ - Start testing Tails 2.10~rc1 during late CET if building the image
+ went smoothly.
+
+* 2017-01-13:
+ - Finish testing Tails 2.10~rc1 by the afternoon, CET.
+ - Release Tails 2.10~rc1.
+
+* 2017-01-23:
+ - All branches targeting Tails 2.10 *must* be merged into the
+ `testing` branch by noon, CET.
+ - The upcoming Tor Browser is hopefully out so we can import it.
+ - Build and upload Tails 2.10 ISO image and IUKs.
+ - Hopefully start testing Tails 2.10.
+
+* 2017-01-24:
+ - Finish testing Tails 2.10 by the afternoon, CET.
+ - Release Tails 2.10 during late CET.
* 2017-03-07: Release 2.11 (Firefox 45.8, 52.0) - bertagaz is the RM
* 2017-04-18: Release 2.12 (Firefox 45.9, 52.1) - anonym is the RM
-* 2017-06-13: Release 3.0? (Firefox 52.2) - anonym is the RM
+* 2017-06-13: Release 3.0? (Firefox 52.2) - intrigeri is the RM
* 2017-08-08: Release 3.1? (Firefox 52.3)
- bertagaz is the RM?
diff --git a/wiki/src/contribute/release_process/icedove.mdwn b/wiki/src/contribute/release_process/icedove.mdwn
index f06b38e..5707001 100644
--- a/wiki/src/contribute/release_process/icedove.mdwn
+++ b/wiki/src/contribute/release_process/icedove.mdwn
@@ -71,6 +71,14 @@ released:
CHANGES_FILE="../icedove_${VERSION}~deb8u1+tails1_i386.changes"
changestool "${CHANGES_FILE}" includeallsources
+1. Due to [[!tails_ticket 11531]] we won't be able to push the tag
+ generated by `bgp` so we have to replace it with a differently
+ named tag:
+
+ NEW_TAG="$(echo ${TAG} | sed 's/%1//')"
+ git tag -s "${NEW_TAG}" -m "icedove Debian release 1:${VERSION}" "${TAG}"
+ TAG="${NEW_TAG}"
+
1. Git push and upload packages:
git push origin "${TAG}" tails/jessie