Compare commits

..

No commits in common. "rawhide" and "f34" have entirely different histories.

4 changed files with 43 additions and 102 deletions

3
.gitignore vendored
View file

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

View file

@ -1 +1 @@
SHA512 (stubby-0.4.3.tar.gz) = 422d46b03200178acab6129d0268b5732fa2f439ad164c2ce771e68cd01737b4248d5a678ba0da716af41a24110f6b41ef3bcc567ad6fd94838a9be2d2cc8da3
SHA512 (stubby-0.3.1.tar.gz) = 34e2eb7f37ed7323469b5bd9791c62834c1b1a9698e2d8e3bd3aebdc4e9cb0c71a855e85f5301a13bc1f7ef89d6f337a769dc39465fb0d67e147b1371730d5fa

View file

@ -1,28 +1,11 @@
From 3dc07827ba060247b714efdc00f2fc5617163204 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 14:21:39 +0200
Subject: [PATCH] Use trust anchor path maintained by unbound-anchor
Other packages use it as well. Point to single file, which might be
reused by other packages. But keep the path commented out and use by
default just built-in trust anchor.
---
stubby.yml.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stubby.yml.example b/stubby.yml.example
index 1af0468..b86cd65 100644
--- a/stubby.yml.example
+++ b/stubby.yml.example
@@ -171,7 +171,7 @@ listen_addresses:
# Specify the location of the installed trust anchor files to override the
diff -up getdns-1.6.0/stubby/stubby.yml.example.anchor getdns-1.6.0/stubby/stubby.yml.example
--- getdns-1.6.0/stubby/stubby.yml.example.anchor 2020-03-11 23:57:32.380258063 +0100
+++ getdns-1.6.0/stubby/stubby.yml.example 2020-03-11 23:59:59.545636591 +0100
@@ -157,6 +157,7 @@ listen_addresses:
# Specify the location of the installed trust anchor file to override the
# default location (see above)
# dnssec_trust_anchors:
-# - "/etc/unbound/getdns-root.key"
+# - "/var/lib/unbound/root.key"
# dnssec_trust_anchors: "/etc/unbound/getdns-root.key"
+dnssec_trust_anchors: "/var/lib/unbound/root.key"
################################## UPSTREAMS ################################
--
2.37.3

View file

@ -1,38 +1,50 @@
%global git_commit 7939e9652acb120d43d37db2eb0dea986f29785b
%global git_date 20200318
%global git_short_commit %(echo %{git_commit} | cut -c -8)
%global git_suffix %{git_date}git%{git_short_commit}
Name: stubby
Version: 0.4.3
Release: 7%{?dist}
Version: 0.3.1
Release: 0.8.%{git_suffix}%{?dist}
Summary: Application that act as a local DNS Privacy stub resolver
License: BSD-3-Clause
URL: https://github.com/getdnsapi/stubby
Source0: https://github.com/getdnsapi/stubby/archive/v%{version}/stubby-%{version}.tar.gz
License: BSD
URL: https://github.com/getdnsapi/%{name}
Source0: https://github.com/getdnsapi/stubby/archive/%{git_commit}/%{name}-%{version}.tar.gz
Provides: getdns-stubby = 1.7.0-1
Obsoletes: getdns-stubby < 1.7.0-1
Provides: getdns-stubby = 1.6.0-2
Obsoletes: getdns-stubby < 1.6.0-2
Requires: systemd
%{?systemd_requires}
BuildRequires: gcc
BuildRequires: make
BuildRequires: cmake
BuildRequires: getdns-devel
BuildRequires: libyaml-devel
BuildRequires: systemd-rpm-macros
Patch1: stubby-0.3.1-dnssec-ta.patch
BuildRequires: gcc
BuildRequires: make
BuildRequires: cmake
BuildRequires: getdns-devel >= 0.7.0
BuildRequires: openssl-devel
BuildRequires: libyaml-devel
BuildRequires: systemd-rpm-macros
%description
Stubby is a local DNS Privacy stub resolver (using DNS-over-TLS).
Stubby encrypts DNS queries sent from a client machine to a
Stubby encrypts DNS queries sent from a client machine to a
DNS Privacy resolver increasing end user privacy.
%prep
%autosetup -p1
%autosetup -n stubby-%{git_commit}
%build
%cmake -DCMAKE_BUILD_TYPE:STRING=Release
%cmake -DCMAKE_BUILD_TYPE:STRING=Release .
%cmake_build
%install
%cmake_install
find %{buildroot} -size 0 -delete
@ -44,8 +56,8 @@ install -pm 0644 systemd/stubby.service %{buildroot}%{_unitdir}/stubby.service
%post
# systemd would replace it with symlink
if [ ! -L "%{_localstatedir}/cache/stubby" -a -d "%{_localstatedir}/cache/stubby" ]; then
mv "%{_localstatedir}/cache/stubby"{,.rpmsave}
if [ ! -L "%{_localstatedir}/cache/%{name}" -a -d "%{_localstatedir}/cache/%{name}" ]; then
mv "%{_localstatedir}/cache/%{name}"{,.rpmsave}
fi
%systemd_post %{name}
@ -53,11 +65,11 @@ fi
%systemd_postun_with_restart %{name}
%files
%{_bindir}/stubby
%config(noreplace) %{_sysconfdir}/stubby
%ghost %{_localstatedir}/cache/stubby
%{_bindir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}
%ghost %{_localstatedir}/cache/%{name}
%{_unitdir}/stubby.service
%{_mandir}/man1/stubby.1.gz
%{_mandir}/man1/%{name}.1.gz
%dir %{_docdir}/%{name}
%{_docdir}/%{name}/AUTHORS
%license %{_docdir}/%{name}/COPYING
@ -66,57 +78,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
* Thu Oct 13 2022 Petr Menšík <pemensik@redhat.com> - 0.4.2-1
- Update to 0.4.2 (#1974450)
- Use unbound-anchor key again
* 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
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.3.1-0.9.20200318git7939e965
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-0.8.20200318git7939e965
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild