Merge tag '0.3.6' into develop

SecureDrop 0.3.6

Whenever we release a version, we update the name of the signed tag to
verify and checkout in the install documentation. 0.3.6 still has the
old Markdown documentation, in order to incorporate this change into
develop, I manually added the same change to the ReST file where these
instructions ended up after the RTD reorg (set_up_admin_tails.rst).

changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.3.6
+
+This is an emergency release to update the copy of the FPF code signing public
+key in the repo because it expired on Oct 26. This fix is required for new
+installs to succeed; otherwise, the installation will fail because apt's
+package authentication fails if the corresponding key is expired.
+
 ## 0.3.5
 
 The issues for this release were tracked with the 0.3.5 milestone on Github: https://github.com/freedomofpress/securedrop/milestones/0.3.5

docs/set_up_admin_tails.rst

@@ -78,8 +78,8 @@ key.
 .. code:: sh
 
     cd securedrop/
-    git checkout 0.3.5
-    git tag -v 0.3.5
+    git checkout 0.3.6
+    git tag -v 0.3.6
 
 You should see ``Good signature from "Freedom of the Press Foundation
 Master Signing Key"`` in the output of that last command.

install_files/ansible-base/group_vars/securedrop.yml

@@ -2,7 +2,7 @@
 # Variables that apply to both the app and monitor server go in this file
 # If the monitor or app server need different values define the variable in 
 # hosts_vars/app.yml or host_vars/mon.yml host_vars/development.yml
-securedrop_app_code_version: "0.3.5"
+securedrop_app_code_version: "0.3.6"
 
 tor_wait_for_hidden_services: yes
 tor_hidden_services_parent_dir: "/var/lib/tor/services"

install_files/ansible-base/roles/install_fpf_repo/files/fpf-signing-key.pub

@@ -1,6 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
-Comment: GPGTools - https://gpgtools.org
+Version: GnuPG v1.4.12 (GNU/Linux)
 
 mQINBFRNWrgBEADfl/2taspxLMo0b+uKqMdXvvyF/ChvHthwr2ms+R2E1v5dXy/n
 SXBNCxMfNprr2svR0b+cgxF/VoSd5qpbR8xA4z3yPx3ke6LLBC5pRa+sVEmDUdCA
@@ -14,119 +13,51 @@ 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
-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
-=rj6E
------END PGP PUBLIC KEY BLOCK-----
+IEtleYkCPQQTAQoAJwIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAUCVjFRVQUJ
+A8UqGwAKCRC63eDH/J9oGKqgEACOIM5lZrEOK4hE8T44FMnARbzhRwYoCLjwtAyt
+Czjtkxc4DmJxBqgu6/Ea2hoRIK03HSn0jkGpmG2d1TYPFJMpSqIXfbMwCFEmxNY7
+L7Z2CxYT+jhuWAiyXkPopypvdrGevXUZBAJCcvT6OLyMZnqsBTv0HK3ARMXda+BZ
+M4c/bgQ3M2Lk7H8CZF9Dasdm3K/KmX/1W3p53JZ2D2w02Q2kQPPE5sVQ8b1OpDbu
+vSlCw4wWbuewCZbRgNXkMnyD6qPgL9naRcw0Hpek1AwPkT2mw9vGR2nsew9dgEcT
+KbBwhUitzx4l3s+c+4RDDnSlJ79Ajyvs/PrX8xINkMbZ+m84mI3fQSv2JraPlnWD
+0tG/lwKFILLxEFVgyXFkmSOltlu3ObAiRNs1WLWIOEqrrAhiu1Bon961edgZNRhY
+52vxvuq/eyRSdh6HdDTf72kiPBcwvMR/Gs0it1pJpm74XZIwB8uMybtQW4JJVPNx
+fXM2keCSLv49xCB6bF/8ZoDOOwUh7GHqNuHKWMU7R3LylqdXXJYnsuBmaaLXz4Jy
+6mi/CGJquphSEEI+QAmqP9dWhaVZCFll2ywuRm+jqmWkrMWH2R0mfoO1imIcESht
+8n/DWqQUwZi7kWT90IoeRxMMC9lZYvoK4eq8JGDJYmIyNEA+wrEwcqflAgQTskPZ
+Fexgd7kCDQRUTVtMARAAt2Num2h20s6ofkZpppw3QGuilADNbU+MgmvFCS2hNbnx
+fzKc8i5ppEqHa9PxiHMVN99K6BVRqXl3Q4dFuY/tB97apmznP3eQAaIWjEtkxJqd
+5dEds0fHbjiyEwKqNInWAga0yjcxpXtg4STCWufLOyZ0RaSb4V5Kmq7Q1lvLqtkn
+zaoG7kY6DzfMEHhtyemXLSKhm36oC3YmSQ+jTpCpcRjZqGlGFhjjFCUPTcHU+ARw
+i7DwUSO79or59UbPM/tolf6EwAWnj6r9SKzgx5Ut1Ku1k4Vn53GGVLt714ioeqFf
+ClFQhvlnBKhKWY4+r7gA+D8LKUJjXPwyoAq1Ix5Ysjix5zIUNhNHKFB58W8QQXtG
+myQSjM6HHLwF94uCkr4pdRP2q2aWfC2XLY2sTTNgAZ68cWJGOSUsQjpGnXM+0PC0
+u8stL+dsaR/720byfZ36YN8DWZn2160A0aXl5ZWdN1eCqbg54lGwi5spfQJe88Xz
+rKrMKq1Nw1OrkZgNjE7aymx72CM3LuuAvbNT68cLt8YSqD5dJDO2UZS7i+z911cp
+3e79TR7kZZQ/jOmjP0MvVsIs/3d/Ja/07LYVdOeFAeJg8XRkNWXy0S5qvuYbudb6
+WebK1oNbZx30ujU3ERtse9pBRaHsnxj1kX5Hqw6N+1gm/fECGXQlmdILTwqcP7EA
+EQEAAYkEPgQYAQoACQUCVE1bTAIbAgIpCRC63eDH/J9oGMFdIAQZAQoABgUCVE1b
+TAAKCRDgLgtZSDO5o1mPEACVq2SXLLWNx5FY62oNAWysrQ+nTp0kMFa8Z/5NOatp
+yGGlSYTKtObMiEV5T5LJ2m7RD8AG5Muf0brM2pTb+vGSkS7DLJ5l6a3jfy7f9oc6
+FvqzSPjP6yK5s/v3bRacjtUOK++RXv79BZpLJ0R8QZLfh3QLNft1rLM8cCNvolKt
+HHR8Lbb/EZ1U7nKH4nMBsdzrlrQgICg4yJsXIvMUwkksr/14iH8Eq1I7Bakj/m+V
+8sJxDFVfDCo8qF9v5+d+WIcNVDzaBdZWghdW7wywjvNsud6tHQ51edHdQaYADUar
+B+tjscOF3id7efvPpSBRH9kCZDXp2EhUiquRhJvjV9zP5CKNPeXaSiOXLO0r5fOg
+tIWBVjCR7Hxw+t7RpfCRYPvwrKV/mJfIr3ckWL0fugYC88f8baBPtoMnqMw4khSk
+lgvtUULAsPruzqaVlMnGY5plpMN1/vjNMvcXb+S3kooUzShMxCXRaY7QJT8mv+BC
+Pt04TLNkOTMECSl94ieJj5xXchpnVRnSBgf9YZgXvy+HJQVzqeD/TOLi/Uz6q0ru
+FfpLhGc4fXHCWNsTCQB3iSV5EVoQf/ddZIr6OgJEecO0V756cq1x6gtKPyP6Y02N
+3CaZGIA8weNqngqhFNgBwf1AIRn1e4fLIccN1g9zK+dJNeASKvxmv87XOQLzoqW1
+1mZ+EAC/f/2OfwqyDW3Ng2Vt6RtWeAkOHeumYIaCgccPOk25P6nVTd5zkYh5LYYu
+LTH2PXoZAvDWHUlUE/lE1CoRyatS2aZjkI2lOjzmHM5XoFMAUdCYfwtEa4yJxijV
+Rii2at/QzDf1gIncxyi5QJfEcjr3ytcc4/j1PVghF25bBeCfyMFXQDoeDzRAnvtm
+KGCmzJ9pBYaVOwEIFpVSLwXgFRSoPO59SP0kBDoQm5pvWYlyWNYU53Fi1g0Dytym
+1sTP39T9qen+WVYzsMRPmoQBNptN6U4m3dzss/OaVALiB9ut8oNsLm/qoiwTXjDi
+BnJGs1DvrqCxxHQIvWJ1GXFBtBAsCodYYGmH8C7eJfj72LHimieqcT0RMLHilTKn
+WviMP2JOu132/Sd/cEVNJxp5bRkV0WmLZhGOk5l8x0X58HGanNRLFQiW5PsatVW7
+op8bP/16RPmzgraiynQHbBRB9xI7MHi6zzkFgBSiizmqS1hu25Xu9Fi41R9C8u3c
+1TOgCKfxhJCH+EGou83jIR/Hqt6h8E3FPRF0RB18nQWsoxJHGDfLZkMd4xBZZVc6
+KrqkNREyWQyMPk0weafzD7jsjb2WEQ2Hpmh6xXIgdTijMWbF7rP+Z3f1FvsEc8vA
+PsG4Rmyw0d1Ckam5mLZX99+ZdCRXTpkfse2YhrU5jv6T/fiC9Q==
+=Wwa6
+-----END PGP PUBLIC KEY BLOCK-----

install_files/securedrop-app-code/DEBIAN/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://freedom.press/securedrop
 Package: securedrop-app-code
-Version: 0.3.5
+Version: 0.3.6
 Architecture: amd64
 Depends: python-pip,apparmor-utils,gnupg2,haveged,python,python-pip,secure-delete,sqlite,apache2-mpm-worker,libapache2-mod-wsgi,libapache2-mod-xsendfile,redis-server,supervisor
 Description: Packages the SecureDrop application code pip dependencies and apparmor profiles. This package will put the apparmor profiles in enforce mode. This package does use pip to install the pip wheelhouse

install_files/securedrop-app-code/usr/share/doc/securedrop-app-code/changelog.Debian

@@ -1,3 +1,9 @@
+securedrop-app-code (0.3.6) trusty; urgency=medium
+
+  * Update the expiration date on the FPF code signing public key (expired Oct 26)
+
+ -- SecureDrop Team <[email protected]>  Thu, 29 Oct 2015 01:42:27 +0000
+
 securedrop-app-code (0.3.5) trusty; urgency=medium
 
  * Use certificate verification instead of fingerprint verification by default for the OSSEC Postfix configuration (#1076)

install_files/securedrop-ossec-agent/DEBIAN/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://freedom.press/securedrop
 Package: securedrop-ossec-agent
-Version: 2.8.2+0.3.5
+Version: 2.8.2+0.3.6
 Architecture: amd64
 Depends: ossec-agent
 Replaces: ossec-agent

install_files/securedrop-ossec-server/DEBIAN/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://freedom.press/securedrop
 Package: securedrop-ossec-server
-Version: 2.8.2+0.3.5
+Version: 2.8.2+0.3.6
 Architecture: amd64
 Depends: ossec-server
 Replaces: ossec-server

securedrop/version.py

@@ -1 +1 @@
-__version__ = '0.3.5'
+__version__ = '0.3.6'