From edec7de1b5f7fc7727da85f844ba75cbbb0c834b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 27 2020 19:00:38 +0000
Subject: import opendnssec-2.1.6-2.module+el8.3.0+6912+d1822d97


---

diff --git a/SOURCES/ods-enforcerd.service b/SOURCES/ods-enforcerd.service
index b660d86..6a629c2 100644
--- a/SOURCES/ods-enforcerd.service
+++ b/SOURCES/ods-enforcerd.service
@@ -4,9 +4,13 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/opendnssec/enforcerd.pid
+User=ods
+Group=ods
+PIDFile=/run/opendnssec/enforcerd.pid
 EnvironmentFile=-/etc/sysconfig/ods
 ExecStart=/usr/sbin/ods-enforcerd $ODS_ENFORCERD_OPT
+ExecStartPost=/bin/bash -c 'while [ ! -S /run/opendnssec/enforcer.sock ]; do sleep 1; echo "Waiting for socket"; done'
+TimeoutStartSec=20
 
 [Install]
 WantedBy=multi-user.target
diff --git a/SOURCES/ods-signerd.service b/SOURCES/ods-signerd.service
index a7b7034..c2218a8 100644
--- a/SOURCES/ods-signerd.service
+++ b/SOURCES/ods-signerd.service
@@ -4,7 +4,9 @@ After=syslog.target network.target ods-enforcerd
 
 [Service]
 Type=simple
-PIDFile=/var/run/opendnssec/signerd.pid
+User=ods
+Group=ods
+PIDFile=/run/opendnssec/signerd.pid
 EnvironmentFile=-/etc/sysconfig/ods
 ExecStart=/usr/sbin/ods-signerd -d $ODS_SIGNERD_OPT
 
diff --git a/SPECS/opendnssec.spec b/SPECS/opendnssec.spec
index 49c3047..7529458 100644
--- a/SPECS/opendnssec.spec
+++ b/SPECS/opendnssec.spec
@@ -4,7 +4,7 @@
 Summary: DNSSEC key and zone management software
 Name: opendnssec
 Version: 2.1.6
-Release: 1%{?prever}%{?dist}
+Release: 2%{?prever}%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
 Source0: http://www.opendnssec.org/files/source/%{?prever:testing/}%{name}-%{version}%{?prever}.tar.gz
@@ -182,6 +182,9 @@ ods-enforcer update all >/dev/null 2>/dev/null ||:
 %systemd_postun_with_restart ods-signerd.service
 
 %changelog
+* Fri May 08 2020 Paul Wouters <pwouters@redhat.com> - 2.1.6-2
+- Resolves: rhbz#1831732 AVC avc: denied { dac_override } for comm="ods-enforcerd
+
 * Wed Apr 15 2020 Paul Wouters <pwouters@redhat.com> - 2.1.6-1
 - Resolves: rhbz#1759888 Rebase OpenDNSSEC to 2.1