From 64a153bd841332fbb5604a893b8b22c8b3be9cbb Mon Sep 17 00:00:00 2001 From: Kushal Das Date: Fri, 6 Dec 2019 18:09:12 +0530 Subject: [PATCH] Adds initial packaging for securedrop-log --- Makefile | 4 +++ scripts/build-debianpackage | 2 +- securedrop-log/debian/changelog-buster | 5 ++++ securedrop-log/debian/compat | 1 + securedrop-log/debian/control | 16 +++++++++++ securedrop-log/debian/copyright | 27 +++++++++++++++++++ securedrop-log/debian/rules | 11 ++++++++ securedrop-log/debian/securedrop-log.install | 1 + securedrop-log/debian/securedrop-log.links | 1 + securedrop-log/debian/securedrop-log.triggers | 7 +++++ 10 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 securedrop-log/debian/changelog-buster create mode 100644 securedrop-log/debian/compat create mode 100644 securedrop-log/debian/control create mode 100644 securedrop-log/debian/copyright create mode 100755 securedrop-log/debian/rules create mode 100644 securedrop-log/debian/securedrop-log.install create mode 100644 securedrop-log/debian/securedrop-log.links create mode 100644 securedrop-log/debian/securedrop-log.triggers diff --git a/Makefile b/Makefile index 4c067090..030c3c38 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,10 @@ securedrop-workstation-svs-disp: ## Builds Debian metapackage for Disposable VM securedrop-export: ## Builds Debian package for Qubes Workstation export scripts PKG_NAME="securedrop-export" ./scripts/build-debianpackage +.PHONY: securedrop-log +securedrop-log: ## Builds Debian package for Qubes Workstation securedrop-log scripts + PKG_NAME="securedrop-log" ./scripts/build-debianpackage + .PHONY: install-deps install-deps: ## Install initial Debian packaging dependencies ./scripts/install-deps diff --git a/scripts/build-debianpackage b/scripts/build-debianpackage index 881a41a0..2c4b5450 100755 --- a/scripts/build-debianpackage +++ b/scripts/build-debianpackage @@ -44,7 +44,7 @@ cp -r "$CUR_DIR/$PKG_NAME/" "$TOP_BUILDDIR/" # If the package is contained in the list, it should be a python package. In # that case, we should extract tarball, and validate wheel hashes. -if [[ "${PKG_NAME}" =~ ^(securedrop-client|securedrop-proxy|securedrop-export)$ ]]; then +if [[ "${PKG_NAME}" =~ ^(securedrop-client|securedrop-proxy|securedrop-export|securedrop-log)$ ]]; then echo "${PKG_NAME} is a Python package" if [[ -z "${PKG_PATH:-}" ]]; then diff --git a/securedrop-log/debian/changelog-buster b/securedrop-log/debian/changelog-buster new file mode 100644 index 00000000..58f196c7 --- /dev/null +++ b/securedrop-log/debian/changelog-buster @@ -0,0 +1,5 @@ +securedrop-log (0.0.1+buster) unstable; urgency=medium + + * Initial release on Debian buster + + -- Kushal Das Fri, 06 Dec 2019 11:05:38 +0530 diff --git a/securedrop-log/debian/compat b/securedrop-log/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/securedrop-log/debian/compat @@ -0,0 +1 @@ +9 diff --git a/securedrop-log/debian/control b/securedrop-log/debian/control new file mode 100644 index 00000000..977c310f --- /dev/null +++ b/securedrop-log/debian/control @@ -0,0 +1,16 @@ +Source: securedrop-log +Section: utils +Priority: optional +Maintainer: SecureDrop Team +Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools, dh-virtualenv +Standards-Version: 3.9.8 +Homepage: https://github.com/freedomofpress/securedrop-log +Vcs-Git: https://github.com/freedomofpress/securedrop-log.git +X-Python-3-Version: >= 3.7 + +Package: securedrop-log +Architecture: all +Depends: ${python3:Depends}, ${misc:Depends} +Description: Python module and qrexec service to store logs for SecureDrop Workstation + This package provides Python module and qrexec service files to create a logging VM in + SecureDrop Workstation project in Qubes. diff --git a/securedrop-log/debian/copyright b/securedrop-log/debian/copyright new file mode 100644 index 00000000..3809e439 --- /dev/null +++ b/securedrop-log/debian/copyright @@ -0,0 +1,27 @@ +Upstream-Name: securedrop-log +Source: https://github.com/freedomofpress/securedrop-log + +Files: * +Copyright: 2019 Freedom of the Press Foundation +License: GPL-3.0+ + +Files: debian/* +Copyright: 2019 Freedom of the Press Foundation +License: GPL-3.0+ + +License: GPL-3.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/securedrop-log/debian/rules b/securedrop-log/debian/rules new file mode 100755 index 00000000..1894e45a --- /dev/null +++ b/securedrop-log/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +%: + dh $@ --with python-virtualenv --python /usr/bin/python3 --setuptools --index-url https://dev-bin.ops.securedrop.org/simple --requirements build-requirements.txt + +override_dh_strip_nondeterminism: + find ./debian/ -type f -name '*.pyc' -delete + find ./debian/ -type f -name 'pip-selfcheck.json' -delete + find -type f -name RECORD -exec sed -i -e '/.*\.pyc.*/d' {} + + dh_strip_nondeterminism $@ + diff --git a/securedrop-log/debian/securedrop-log.install b/securedrop-log/debian/securedrop-log.install new file mode 100644 index 00000000..cf0dfe84 --- /dev/null +++ b/securedrop-log/debian/securedrop-log.install @@ -0,0 +1 @@ +securedrop.Log etc/qubes-rpc/ diff --git a/securedrop-log/debian/securedrop-log.links b/securedrop-log/debian/securedrop-log.links new file mode 100644 index 00000000..f84c93fc --- /dev/null +++ b/securedrop-log/debian/securedrop-log.links @@ -0,0 +1 @@ +opt/venvs/securedrop-log/bin/securedrop-log usr/sbin/securedrop-log diff --git a/securedrop-log/debian/securedrop-log.triggers b/securedrop-log/debian/securedrop-log.triggers new file mode 100644 index 00000000..d24bbda1 --- /dev/null +++ b/securedrop-log/debian/securedrop-log.triggers @@ -0,0 +1,7 @@ +# Register interest in Python interpreter changes; and +# don't make the Python package dependent on the virtualenv package +# processing (noawait) +interest-noawait /usr/bin/python3 + +# Also provide a symbolic trigger for all dh-virtualenv packages +interest dh-virtualenv-interpreter-update