From 4eca0a587f20cabb1752f54f8f9d924611ec352a Mon Sep 17 00:00:00 2001
From: eaglegai <eaglegai@163.com>
Date: Fri, 3 Mar 2023 08:18:36 +0000
Subject: [PATCH] change run directory from /var/run to /run

---
 tmpfiles-unbound.conf |  2 +-
 unbound.spec          | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tmpfiles-unbound.conf b/tmpfiles-unbound.conf
index d625589..bb88f01 100644
--- a/tmpfiles-unbound.conf
+++ b/tmpfiles-unbound.conf
@@ -1 +1 @@
-D /var/run/unbound 0755 unbound unbound -
+D /run/unbound 0755 unbound unbound -
diff --git a/unbound.spec b/unbound.spec
index 141ba1a..a78c333 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -2,7 +2,7 @@
 
 Name:          unbound
 Version:       1.17.0
-Release:       1
+Release:       2
 Summary:       Unbound is a validating, recursive, caching DNS resolver
 License:       BSD-3-Clause
 Url:           https://nlnetlabs.nl/projects/unbound/about/
@@ -84,7 +84,7 @@ popd
             --enable-relro-now --enable-pie \\\
             --enable-subnet --enable-ipsecmod \\\
             --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \\\
-            --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid \\\
+            --with-pidfile=%{_rundir}/%{name}/%{name}.pid \\\
             --enable-sha2 --disable-gost --enable-ecdsa \\\
             --with-rootkey-file=%{_sharedstatedir}/unbound/root.key \\\
             --enable-linux-ip-local-port-range
@@ -124,7 +124,7 @@ install -p -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{_unitdir}/unbound-anchor.service
 
 %delete_la
 
-install -d $RPM_BUILD_ROOT%{_localstatedir}/run/unbound
+install -d $RPM_BUILD_ROOT%{_rundir}/unbound
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/unbound/{keys.d,conf.d,local.d}
 install -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/unbound/keys.d/
@@ -181,6 +181,7 @@ popd
 %defattr(-,root,root)
 %doc doc/CREDITS doc/FEATURES doc/README doc/LICENSE
 %attr(0644,root,root) %{_tmpfilesdir}/unbound.conf
+%attr(0755,unbound,unbound) %dir %{_rundir}/%{name}
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/unbound.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %dir %attr(0755,root,unbound) %{_sysconfdir}/%{name}/keys.d
@@ -233,6 +234,12 @@ popd
 %{_mandir}/man*
 
 %changelog
+* Fri Mar 03 2023 gaihuiying <eaglegai@163.com> - 1.17.0-2
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:change run directory from /var/run to /run to fix "/usr/lib/tmpfiles.d/unbound.conf:1: xxxx"
+
 * Tue Nov 08 2022 gaihuiying <eaglegai@163.com> - 1.17.0-1
 - Type:requirement
 - CVE:NA
-- 
Gitee