Merge branch 'rawhide' into epel8

Remove few changelog entries from rawhide.

.gitignore

@@ -1,4 +1,3 @@
 /stubby-0.3.1.tar.gz
 /stubby-0.4.0.tar.gz
 /stubby-0.4.2.tar.gz
-/stubby-0.4.3.tar.gz

sources

@@ -1 +1 @@
-SHA512 (stubby-0.4.3.tar.gz) = 422d46b03200178acab6129d0268b5732fa2f439ad164c2ce771e68cd01737b4248d5a678ba0da716af41a24110f6b41ef3bcc567ad6fd94838a9be2d2cc8da3
+SHA512 (stubby-0.4.2.tar.gz) = baa75d78f912de7701607578846df5837fdd810f9854a9d7593395e21f2684d3fb4431eb827454d3fcbaab8906d302a9011bb0ad289dbdf788de6eea4ed478be

stubby-0.4-systemd.service.patch

@@ -0,0 +1,25 @@
+From 1e2779daa85957701c91bbe491693a35790e4d73 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Sat, 15 Oct 2022 13:52:53 +0200
+Subject: [PATCH] Private users prevents running on systemd
+
+Original value does not work on systemd v250, Fedora 36.
+---
+ systemd/stubby.service | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/systemd/stubby.service b/systemd/stubby.service
+index 3cba0e6..f0e631b 100644
+--- a/systemd/stubby.service
++++ b/systemd/stubby.service
+@@ -18,7 +18,6 @@ MemoryDenyWriteExecute=true
+ NoNewPrivileges=true
+ PrivateDevices=true
+ PrivateTmp=true
+-PrivateUsers=true
+ ProtectClock=true
+ ProtectControlGroups=true
+ ProtectHome=true
+-- 
+2.37.3
+

stubby.spec

@@ -1,6 +1,8 @@
+%define __cmake_in_source_build 1
+
 Name:           stubby
-Version:        0.4.3
-Release:        7%{?dist}
+Version:        0.4.2
+Release:        2%{?dist}
 Summary:        Application that act as a local DNS Privacy stub resolver
 
 License:        BSD-3-Clause
@@ -12,6 +14,8 @@ Obsoletes:      getdns-stubby < 1.7.0-1
 %{?systemd_requires}
 
 Patch1:         stubby-0.3.1-dnssec-ta.patch
+# https://github.com/getdnsapi/stubby/pull/324
+Patch2:         stubby-0.4-systemd.service.patch
 
 BuildRequires: gcc
 BuildRequires: make
@@ -31,10 +35,10 @@ DNS Privacy resolver increasing end user privacy.
 
 %build
 %cmake -DCMAKE_BUILD_TYPE:STRING=Release
-%cmake_build
+%make_build
 
 %install
-%cmake_install
+%make_install
 find %{buildroot} -size 0 -delete
 mkdir -p %{buildroot}%{_unitdir}
 install -pm 0644 systemd/stubby.service %{buildroot}%{_unitdir}/stubby.service
@@ -66,27 +70,6 @@ fi
 
 
 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Jan 03 2023 Petr Menšík <pemensik@redhat.com> - 0.4.3-1
-- Update to 0.4.3 (#2156047)
-
 * Sat Oct 15 2022 Petr Menšík <pemensik@redhat.com> - 0.4.2-2
 - Private users do not work with dynamic users
 - Provide path to unbound-anchor key, but keep it commented out
@@ -98,18 +81,6 @@ fi
 * Fri Sep 30 2022 Petr Menšík <pemensik@redhat.com> - 0.4.0-6
 - Update License tag to SPDX identifier
 
-* Tue Aug  2 2022 Joe Orton <jorton@redhat.com> - 0.4.0-5
-- fix build (#2113738)
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
 * Mon Jun 07 2021 Paul Wouters <paul.wouters@aiven.io> - 0.4.0-1
 - Resolves: rhbz#1968092 stubby-0.4.0 is available