From 335a719665f6fd692ef79862a72628de6cf08b2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 21:09:26 +0000 Subject: [PATCH 01/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stubby.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stubby.spec b/stubby.spec index faeb0e1..add001a 100644 --- a/stubby.spec +++ b/stubby.spec @@ -7,7 +7,7 @@ Name: stubby Version: 0.3.1 -Release: 0.7.%{git_suffix}%{?dist} +Release: 0.8.%{git_suffix}%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD @@ -78,6 +78,9 @@ fi %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.3.1-0.8.20200318git7939e965 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Oct 16 2020 Petr Menšík - 0.3.1-0.7.20200318git7939e965 - Move only directory, not symlink on upgrade (#1884575) From bcf6fbb5bcf7d368e8f4da41442a757274a052c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:14 +0100 Subject: [PATCH 02/20] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- stubby.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stubby.spec b/stubby.spec index add001a..acf1baf 100644 --- a/stubby.spec +++ b/stubby.spec @@ -7,7 +7,7 @@ Name: stubby Version: 0.3.1 -Release: 0.8.%{git_suffix}%{?dist} +Release: 0.9.%{git_suffix}%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD @@ -78,6 +78,10 @@ fi %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 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 - 0.3.1-0.8.20200318git7939e965 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 4d78ba6d0781e4afbf78340ba395f663daf856ad Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 7 Jun 2021 11:48:50 -0400 Subject: [PATCH 03/20] - Resolves: rhbz#1968092 stubby-0.4.0 is available --- .gitignore | 1 + sources | 2 +- stubby.spec | 49 ++++++++++++++++++++----------------------------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 405b0ce..00e9789 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /stubby-0.3.1.tar.gz +/stubby-0.4.0.tar.gz diff --git a/sources b/sources index e73652d..bea98d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stubby-0.3.1.tar.gz) = 34e2eb7f37ed7323469b5bd9791c62834c1b1a9698e2d8e3bd3aebdc4e9cb0c71a855e85f5301a13bc1f7ef89d6f337a769dc39465fb0d67e147b1371730d5fa +SHA512 (stubby-0.4.0.tar.gz) = 2529a42cc786f4363e9d0ea12e40fc30c197492cbec4722763f6839cc9ec922985219374f8bf7df02dea51a1029b41b46a1547028492776efbf4d7a45fe86958 diff --git a/stubby.spec b/stubby.spec index acf1baf..1be1cef 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,50 +1,38 @@ -%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.3.1 -Release: 0.9.%{git_suffix}%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD -URL: https://github.com/getdnsapi/%{name} -Source0: https://github.com/getdnsapi/stubby/archive/%{git_commit}/%{name}-%{version}.tar.gz +URL: https://github.com/getdnsapi/stubby +Source0: https://github.com/getdnsapi/stubby/archive/v%{version}/stubby-%{version}.tar.gz -Provides: getdns-stubby = 1.6.0-2 -Obsoletes: getdns-stubby < 1.6.0-2 -Requires: systemd +Provides: getdns-stubby = 1.7.0-1 +Obsoletes: getdns-stubby < 1.7.0-1 +Requires: getdns >= 1.7.0 +Requires: systemd %{?systemd_requires} BuildRequires: gcc BuildRequires: make BuildRequires: cmake -BuildRequires: getdns-devel +BuildRequires: getdns-devel >= 0.7.0 BuildRequires: libyaml-devel BuildRequires: systemd-rpm-macros -Patch1: stubby-0.3.1-dnssec-ta.patch - - %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 -n stubby-%{git_commit} - +%autosetup %build %cmake -DCMAKE_BUILD_TYPE:STRING=Release . %cmake_build - %install %cmake_install find %{buildroot} -size 0 -delete @@ -56,8 +44,8 @@ install -pm 0644 systemd/stubby.service %{buildroot}%{_unitdir}/stubby.service %post # systemd would replace it with symlink -if [ ! -L "%{_localstatedir}/cache/%{name}" -a -d "%{_localstatedir}/cache/%{name}" ]; then - mv "%{_localstatedir}/cache/%{name}"{,.rpmsave} +if [ ! -L "%{_localstatedir}/cache/stubby" -a -d "%{_localstatedir}/cache/stubby" ]; then + mv "%{_localstatedir}/cache/stubby"{,.rpmsave} fi %systemd_post %{name} @@ -65,11 +53,11 @@ fi %systemd_postun_with_restart %{name} %files -%{_bindir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name} -%ghost %{_localstatedir}/cache/%{name} +%{_bindir}/stubby +%config(noreplace) %{_sysconfdir}/stubby +%ghost %{_localstatedir}/cache/stubby %{_unitdir}/stubby.service -%{_mandir}/man1/%{name}.1.gz +%{_mandir}/man1/stubby.1.gz %dir %{_docdir}/%{name} %{_docdir}/%{name}/AUTHORS %license %{_docdir}/%{name}/COPYING @@ -78,6 +66,9 @@ fi %changelog +* Mon Jun 07 2021 Paul Wouters - 0.4.0-1 +- Resolves: rhbz#1968092 stubby-0.4.0 is available + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 0.3.1-0.9.20200318git7939e965 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 96b7b8018bdc42ec270e2b4a32e5d0a4b960fb01 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 7 Jun 2021 13:15:52 -0400 Subject: [PATCH 04/20] add openssl buildrequirement, minor cleanup --- stubby.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/stubby.spec b/stubby.spec index 1be1cef..ca792c1 100644 --- a/stubby.spec +++ b/stubby.spec @@ -9,17 +9,15 @@ Source0: https://github.com/getdnsapi/stubby/archive/v%{version}/stubby-% Provides: getdns-stubby = 1.7.0-1 Obsoletes: getdns-stubby < 1.7.0-1 -Requires: getdns >= 1.7.0 -Requires: systemd %{?systemd_requires} -BuildRequires: gcc -BuildRequires: make -BuildRequires: cmake -BuildRequires: getdns-devel >= 0.7.0 -BuildRequires: libyaml-devel -BuildRequires: systemd-rpm-macros - +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). From ff62ea3f9916edee6e88e764d4a27b0d18e3fb18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 18:24:05 +0000 Subject: [PATCH 05/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stubby.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stubby.spec b/stubby.spec index ca792c1..280612e 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD @@ -64,6 +64,9 @@ fi %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jun 07 2021 Paul Wouters - 0.4.0-1 - Resolves: rhbz#1968092 stubby-0.4.0 is available From 353cd0f3777ea5510d9d73368a4c68c1f63b506b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:47:07 +0000 Subject: [PATCH 06/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stubby.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stubby.spec b/stubby.spec index 280612e..3781d50 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby Version: 0.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD @@ -64,6 +64,9 @@ fi %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 5e0544d9ec25763c993293a711554050f2f883e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 09:32:54 +0000 Subject: [PATCH 07/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stubby.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stubby.spec b/stubby.spec index 3781d50..ac4be78 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby Version: 0.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD @@ -64,6 +64,9 @@ fi %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 6d02ced5fda6ab6f48428aee2c875251a5b3ea02 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 2 Aug 2022 08:16:33 +0100 Subject: [PATCH 08/20] fix build (#2113738) Resolves: rhbz#2113738 --- stubby.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/stubby.spec b/stubby.spec index ac4be78..0b47e4e 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby Version: 0.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD @@ -28,7 +28,7 @@ DNS Privacy resolver increasing end user privacy. %autosetup %build -%cmake -DCMAKE_BUILD_TYPE:STRING=Release . +%cmake -DCMAKE_BUILD_TYPE:STRING=Release %cmake_build %install @@ -64,6 +64,9 @@ fi %changelog +* Tue Aug 2 2022 Joe Orton - 0.4.0-5 +- fix build (#2113738) + * Sat Jul 23 2022 Fedora Release Engineering - 0.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 9ec25f1c422e18ebf216bdfe9d58251f2f870d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Fri, 30 Sep 2022 13:28:36 +0200 Subject: [PATCH 09/20] Update License tag to SPDX identifier --- stubby.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/stubby.spec b/stubby.spec index 0b47e4e..560bdba 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,9 +1,9 @@ Name: stubby Version: 0.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Application that act as a local DNS Privacy stub resolver -License: BSD +License: BSD-3-Clause URL: https://github.com/getdnsapi/stubby Source0: https://github.com/getdnsapi/stubby/archive/v%{version}/stubby-%{version}.tar.gz @@ -64,6 +64,9 @@ fi %changelog +* Fri Sep 30 2022 Petr Menšík - 0.4.0-6 +- Update License tag to SPDX identifier + * Tue Aug 2 2022 Joe Orton - 0.4.0-5 - fix build (#2113738) From a7bced6e6ca4fa82a02873d4e847d6551c79e3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Fri, 14 Oct 2022 00:28:51 +0200 Subject: [PATCH 10/20] Update to 0.4.2 (#1974450) --- .gitignore | 1 + sources | 2 +- stubby-0.3.1-dnssec-ta.patch | 11 ----------- stubby.spec | 7 +++++-- 4 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 stubby-0.3.1-dnssec-ta.patch diff --git a/.gitignore b/.gitignore index 00e9789..4a8d2f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /stubby-0.3.1.tar.gz /stubby-0.4.0.tar.gz +/stubby-0.4.2.tar.gz diff --git a/sources b/sources index bea98d2..1d95bfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stubby-0.4.0.tar.gz) = 2529a42cc786f4363e9d0ea12e40fc30c197492cbec4722763f6839cc9ec922985219374f8bf7df02dea51a1029b41b46a1547028492776efbf4d7a45fe86958 +SHA512 (stubby-0.4.2.tar.gz) = baa75d78f912de7701607578846df5837fdd810f9854a9d7593395e21f2684d3fb4431eb827454d3fcbaab8906d302a9011bb0ad289dbdf788de6eea4ed478be diff --git a/stubby-0.3.1-dnssec-ta.patch b/stubby-0.3.1-dnssec-ta.patch deleted file mode 100644 index 4018f79..0000000 --- a/stubby-0.3.1-dnssec-ta.patch +++ /dev/null @@ -1,11 +0,0 @@ -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" -+dnssec_trust_anchors: "/var/lib/unbound/root.key" - - - ################################## UPSTREAMS ################################ diff --git a/stubby.spec b/stubby.spec index 560bdba..90d948b 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby -Version: 0.4.0 -Release: 6%{?dist} +Version: 0.4.2 +Release: 1%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD-3-Clause @@ -64,6 +64,9 @@ fi %changelog +* Thu Oct 13 2022 Petr Menšík - 0.4.2-1 +- Update to 0.4.2 (#1974450) + * Fri Sep 30 2022 Petr Menšík - 0.4.0-6 - Update License tag to SPDX identifier From 651e372cda72ff6801752abf3eed22a51e33d958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Fri, 14 Oct 2022 00:36:06 +0200 Subject: [PATCH 11/20] Use unbound-anchor key again --- stubby-0.3.1-dnssec-ta.patch | 28 ++++++++++++++++++++++++++++ stubby.spec | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 stubby-0.3.1-dnssec-ta.patch diff --git a/stubby-0.3.1-dnssec-ta.patch b/stubby-0.3.1-dnssec-ta.patch new file mode 100644 index 0000000..4694013 --- /dev/null +++ b/stubby-0.3.1-dnssec-ta.patch @@ -0,0 +1,28 @@ +From 81ab1eb15280b99d2384fe4e6b512e79d4b1d543 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Fri, 14 Oct 2022 00:34:15 +0200 +Subject: [PATCH] Use trust anchor maintained by unbound-anchor + +Other packages use it as well. Point to single file, which might be +reused by other packages. +--- + stubby.yml.example | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/stubby.yml.example b/stubby.yml.example +index 1af0468..2296b73 100644 +--- a/stubby.yml.example ++++ b/stubby.yml.example +@@ -172,6 +172,9 @@ listen_addresses: + # default location (see above) + # dnssec_trust_anchors: + # - "/etc/unbound/getdns-root.key" ++# Fedora package maintains it in this location ++dnssec_trust_anchors: ++ - "/var/lib/unbound/root.key" + + + ################################## UPSTREAMS ################################ +-- +2.37.3 + diff --git a/stubby.spec b/stubby.spec index 90d948b..240c672 100644 --- a/stubby.spec +++ b/stubby.spec @@ -11,6 +11,8 @@ Provides: getdns-stubby = 1.7.0-1 Obsoletes: getdns-stubby < 1.7.0-1 %{?systemd_requires} +Patch1: stubby-0.3.1-dnssec-ta.patch + BuildRequires: gcc BuildRequires: make BuildRequires: cmake @@ -66,6 +68,7 @@ fi %changelog * Thu Oct 13 2022 Petr Menšík - 0.4.2-1 - Update to 0.4.2 (#1974450) +- Use unbound-anchor key again * Fri Sep 30 2022 Petr Menšík - 0.4.0-6 - Update License tag to SPDX identifier From eaf1ff9e12fd29481a19744499bd56663cfa585d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Sat, 15 Oct 2022 13:32:38 +0200 Subject: [PATCH 12/20] Private users do not work with dynamic users Used dynamic user together with private users does not work. --- stubby-0.4-systemd.service.patch | 25 +++++++++++++++++++++++++ stubby.spec | 9 +++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 stubby-0.4-systemd.service.patch diff --git a/stubby-0.4-systemd.service.patch b/stubby-0.4-systemd.service.patch new file mode 100644 index 0000000..d44c127 --- /dev/null +++ b/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?= +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 + diff --git a/stubby.spec b/stubby.spec index 240c672..0e1b47c 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby Version: 0.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD-3-Clause @@ -12,6 +12,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 @@ -27,7 +29,7 @@ Stubby encrypts DNS queries sent from a client machine to a DNS Privacy resolver increasing end user privacy. %prep -%autosetup +%autosetup -p1 %build %cmake -DCMAKE_BUILD_TYPE:STRING=Release @@ -66,6 +68,9 @@ fi %changelog +* Sat Oct 15 2022 Petr Menšík - 0.4.2-2 +- Private users do not work with dynamic users + * Thu Oct 13 2022 Petr Menšík - 0.4.2-1 - Update to 0.4.2 (#1974450) - Use unbound-anchor key again From 7708e3bbfd73eddbdbbe99799d54371b648d9c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Sat, 15 Oct 2022 14:23:07 +0200 Subject: [PATCH 13/20] Provide path to unbound-anchor key, but commented out --- stubby-0.3.1-dnssec-ta.patch | 26 +++++++++++++------------- stubby.spec | 1 + 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/stubby-0.3.1-dnssec-ta.patch b/stubby-0.3.1-dnssec-ta.patch index 4694013..6454043 100644 --- a/stubby-0.3.1-dnssec-ta.patch +++ b/stubby-0.3.1-dnssec-ta.patch @@ -1,25 +1,25 @@ -From 81ab1eb15280b99d2384fe4e6b512e79d4b1d543 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Fri, 14 Oct 2022 00:34:15 +0200 -Subject: [PATCH] Use trust anchor maintained by unbound-anchor +From 3dc07827ba060247b714efdc00f2fc5617163204 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= +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. +reused by other packages. But keep the path commented out and use by +default just built-in trust anchor. --- - stubby.yml.example | 3 +++ - 1 file changed, 3 insertions(+) + stubby.yml.example | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubby.yml.example b/stubby.yml.example -index 1af0468..2296b73 100644 +index 1af0468..b86cd65 100644 --- a/stubby.yml.example +++ b/stubby.yml.example -@@ -172,6 +172,9 @@ listen_addresses: +@@ -171,7 +171,7 @@ listen_addresses: + # Specify the location of the installed trust anchor files to override the # default location (see above) # dnssec_trust_anchors: - # - "/etc/unbound/getdns-root.key" -+# Fedora package maintains it in this location -+dnssec_trust_anchors: -+ - "/var/lib/unbound/root.key" +-# - "/etc/unbound/getdns-root.key" ++# - "/var/lib/unbound/root.key" ################################## UPSTREAMS ################################ diff --git a/stubby.spec b/stubby.spec index 0e1b47c..a557a26 100644 --- a/stubby.spec +++ b/stubby.spec @@ -70,6 +70,7 @@ fi %changelog * Sat Oct 15 2022 Petr Menšík - 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 - 0.4.2-1 - Update to 0.4.2 (#1974450) From a736995dbd122da5b5137d10482f1593892b0d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Tue, 3 Jan 2023 11:26:16 +0100 Subject: [PATCH 14/20] Update to 0.4.3 (#2156047) --- .gitignore | 1 + sources | 2 +- stubby-0.4-systemd.service.patch | 25 ------------------------- stubby.spec | 9 +++++---- 4 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 stubby-0.4-systemd.service.patch diff --git a/.gitignore b/.gitignore index 4a8d2f6..7457a28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /stubby-0.3.1.tar.gz /stubby-0.4.0.tar.gz /stubby-0.4.2.tar.gz +/stubby-0.4.3.tar.gz diff --git a/sources b/sources index 1d95bfe..d805cfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stubby-0.4.2.tar.gz) = baa75d78f912de7701607578846df5837fdd810f9854a9d7593395e21f2684d3fb4431eb827454d3fcbaab8906d302a9011bb0ad289dbdf788de6eea4ed478be +SHA512 (stubby-0.4.3.tar.gz) = 422d46b03200178acab6129d0268b5732fa2f439ad164c2ce771e68cd01737b4248d5a678ba0da716af41a24110f6b41ef3bcc567ad6fd94838a9be2d2cc8da3 diff --git a/stubby-0.4-systemd.service.patch b/stubby-0.4-systemd.service.patch deleted file mode 100644 index d44c127..0000000 --- a/stubby-0.4-systemd.service.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1e2779daa85957701c91bbe491693a35790e4d73 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= -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 - diff --git a/stubby.spec b/stubby.spec index a557a26..afd6477 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby -Version: 0.4.2 -Release: 2%{?dist} +Version: 0.4.3 +Release: 1%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD-3-Clause @@ -12,8 +12,6 @@ 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 @@ -68,6 +66,9 @@ fi %changelog +* Tue Jan 03 2023 Petr Menšík - 0.4.3-1 +- Update to 0.4.3 (#2156047) + * Sat Oct 15 2022 Petr Menšík - 0.4.2-2 - Private users do not work with dynamic users - Provide path to unbound-anchor key, but keep it commented out From b3593c3cba6157d70354471f4f25467e7bf89fb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 04:11:31 +0000 Subject: [PATCH 15/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stubby.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stubby.spec b/stubby.spec index afd6477..c4f2fb7 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby Version: 0.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD-3-Clause @@ -66,6 +66,9 @@ fi %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 03 2023 Petr Menšík - 0.4.3-1 - Update to 0.4.3 (#2156047) From 652fc3d19eccef0b13b8d5db53d4989dcba50376 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:39:50 +0000 Subject: [PATCH 16/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- stubby.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stubby.spec b/stubby.spec index c4f2fb7..58619bc 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby Version: 0.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD-3-Clause @@ -66,6 +66,9 @@ fi %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3717567e30badd872c0e6f88e21286b4840e3578 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 04:31:09 +0000 Subject: [PATCH 17/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- stubby.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stubby.spec b/stubby.spec index 58619bc..35a158e 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby Version: 0.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD-3-Clause @@ -66,6 +66,9 @@ fi %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.4.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 12b82978f2d17d80971a49ca4a1ba2be5008ee56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:34:45 +0000 Subject: [PATCH 18/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- stubby.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stubby.spec b/stubby.spec index 35a158e..fad97d1 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby Version: 0.4.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD-3-Clause @@ -66,6 +66,9 @@ fi %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.4.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.4.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cb56af18a26b05eb2086eb829e8b87249a7e8290 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:48:31 +0000 Subject: [PATCH 19/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- stubby.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stubby.spec b/stubby.spec index fad97d1..4502aba 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby Version: 0.4.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD-3-Clause @@ -66,6 +66,9 @@ fi %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 0.4.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3e252b7c5da9cddc91ab85f661ea3f9a5d58b1df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:48:56 +0000 Subject: [PATCH 20/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- stubby.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stubby.spec b/stubby.spec index 4502aba..12fc5f9 100644 --- a/stubby.spec +++ b/stubby.spec @@ -1,6 +1,6 @@ Name: stubby Version: 0.4.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Application that act as a local DNS Privacy stub resolver License: BSD-3-Clause @@ -66,6 +66,9 @@ fi %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.4.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0.4.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild