Merge pull request #6006 from freedomofpress/dont_fight_haveged

Fixes #6005 removed haveged from control file
freedomofpress · Jun 21, 2021 · d92911c · d92911c
2 parents c6d220e + 4813135
commit d92911c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/templates/control.j2 b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/templates/control.j2
@@ -8,8 +8,8 @@ Standards-Version: 3.9.8
 
 Package: securedrop-app-code
 Architecture: amd64
-Conflicts: haveged, libapache2-mod-wsgi, supervisor
-Replaces: haveged, libapache2-mod-wsgi, supervisor
+Conflicts: libapache2-mod-wsgi, supervisor
+Replaces: libapache2-mod-wsgi, supervisor
 {% if securedrop_target_distribution == "focal" %}
 Depends: ${dist:Depends}, ${misc:Depends}, ${python3:Depends}, apache2, apparmor-utils, coreutils, gnupg2, libapache2-mod-xsendfile, libpython3.8, paxctld, python3, python3-distutils, redis-server, securedrop-config, securedrop-keyring, sqlite3
 {% else %}