diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index d04055b..43299eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1 @@ -/dhcpcd-6.10.1.tar.xz -/dhcpcd-6.11.2.tar.xz -/dhcpcd-6.11.3.tar.xz -/dhcpcd-9.4.0.tar.xz -/dhcpcd-9.4.0.tar.xz.distinfo.asc -/dhcpcd-9.4.1.tar.xz -/dhcpcd-9.4.1.tar.xz.distinfo.asc -/dhcpcd-10.0.1.tar.xz -/dhcpcd-10.0.1.tar.xz.asc -/dhcpcd-10.0.2.tar.xz -/dhcpcd-10.0.2.tar.xz.asc -/dhcpcd-10.0.4.tar.xz -/dhcpcd-10.0.4.tar.xz.asc -/dhcpcd-10.0.5.tar.xz -/dhcpcd-10.0.5.tar.xz.asc -/dhcpcd-10.0.6.tar.xz -/dhcpcd-10.0.6.tar.xz.asc +dhcpcd-10.0.6.tar.xz diff --git a/99-prefixlen b/99-prefixlen deleted file mode 100644 index c7a2fcc..0000000 --- a/99-prefixlen +++ /dev/null @@ -1,26 +0,0 @@ -# 99-prefixlen - dhcpcd hook to override DHCPv6 IA_NA prefix length -# -# dhcpcd assigns DHCPv6 IA_NA addresses with /128 per RFC 8415. This hook -# overrides the prefix length when DHCPCD_IPV6_PREFIXLEN is set, replacing -# /128 with the requested prefix on each lease event. -# -# Usage: set DHCPCD_IPV6_PREFIXLEN via the env directive in /etc/dhcpcd.conf: -# -# interface eth0 -# ia_na 1 -# env DHCPCD_IPV6_PREFIXLEN=64 -# -# The hook is a no-op when DHCPCD_IPV6_PREFIXLEN is not set. - -if [ -n "$DHCPCD_IPV6_PREFIXLEN" ]; then - case "$reason" in - BOUND6|RENEW6|REBIND6|REBOOT6) - if [ -n "$new_dhcp6_ia_na1_ia_addr1" ]; then - ip -6 addr del "${new_dhcp6_ia_na1_ia_addr1}/128" dev "$interface" 2>/dev/null - ip -6 addr replace "${new_dhcp6_ia_na1_ia_addr1}/${DHCPCD_IPV6_PREFIXLEN}" dev "$interface" \ - valid_lft "$new_dhcp6_ia_na1_ia_addr1_vltime" \ - preferred_lft "$new_dhcp6_ia_na1_ia_addr1_pltime" - fi - ;; - esac -fi diff --git a/changelog b/changelog deleted file mode 100644 index eb8dd15..0000000 --- a/changelog +++ /dev/null @@ -1,66 +0,0 @@ -* Thu Jan 19 2023 Fedora Release Engineering - 9.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 9.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 9.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Nov 01 2021 Petr Menšík - 9.4.1-1 -- Update to 9.4.1 (#2016639) - -* Wed Jul 21 2021 Fedora Release Engineering - 9.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Mar 22 2021 Petr Menšík - 9.4.0-2 -- Reenable net device binding - -* Fri Mar 19 2021 Petr Menšík - 9.4.0-1 -- Update to 9.4.0 - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 6.11.3-13 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 6.11.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 6.11.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 6.11.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 6.11.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 6.11.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 31 2018 Florian Weimer - 6.11.3-7 -- Rebuild with fixed binutils - -* Thu Jul 12 2018 Fedora Release Engineering - 6.11.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 6.11.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 6.11.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 6.11.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 6.11.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Aug 26 2016 Pavel Šimerda - 6.11.3-1 -- New version 6.11.3 - -* Wed Aug 10 2016 Pavel Šimerda - 6.11.2-1 -- New version 6.11.2 - -* Fri Feb 19 2016 Pavel Šimerda - 6.10.1-4 -- initial version diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/dhcpcd-10.0.6.tar.xz.asc b/dhcpcd-10.0.6.tar.xz.asc new file mode 100644 index 0000000..4034f84 --- /dev/null +++ b/dhcpcd-10.0.6.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEp4XtJ1WVXZ6T6ln2WX+X6prUVUkFAmWAZ/QACgkQWX+X6prU +VUnDeAgAmDWEct0N1exa2PhibL5qhcp6e9Vwpf7msghJKS1DgVKWM3KuTKr3Slsw +BZ8O1iOisStVv4PzDxaqDjpHt+vpDZKyRaEDv/VZZQuvBJhPzoZABdAnabnesW48 +Ef25GQbHlpGbsvMNXHQdjNDNvvzLTMlhwJZgqQmKu0IBLq9zoR0EwxUUwXzDY9EK +Z59ma/wI5D20unIkW1DE+Xb8IkvU1gmHxVPMh06tJC44+mrvVvTRlcPZFazGQfWR +O3aWir+I03dhTPO6Ad9T4dytbM3npcUd+wG8/vqIiypmpq7mY8uWTOvkCPyMqhWR +bvezRsdBy6H4kHODki5DkN/CMvn0Cg== +=vUON +-----END PGP SIGNATURE----- diff --git a/dhcpcd-online.service b/dhcpcd-online.service deleted file mode 100644 index a00e9c5..0000000 --- a/dhcpcd-online.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Wait for dhcpcd to get online -Requisite=dhcpcd.service -After=dhcpcd.service -Before=network-online.target - -[Service] -Type=oneshot -ExecStart=dhcpcd-online - -[Install] -WantedBy=network-online.target diff --git a/dhcpcd.spec b/dhcpcd.spec index be5c517..a4c8fa8 100644 --- a/dhcpcd.spec +++ b/dhcpcd.spec @@ -1,3 +1,13 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.8.1) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 11; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + %global forgeurl0 https://github.com/NetworkConfiguration/dhcpcd Name: dhcpcd @@ -15,7 +25,6 @@ Source3: %{name}.service Source4: %{name}@.service Source5: systemd-sysusers.conf Source6: systemd-tmpfiles.conf -Source7: 99-prefixlen Patch1: dhcpcd-RHEL-72083.patch # https://redhat.atlassian.net/browse/RHEL-191220 @@ -64,7 +73,6 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service install -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}@.service install -D -m 644 %{SOURCE5} %{buildroot}%{_sysusersdir}/%{name}.conf install -D -m 644 %{SOURCE6} %{buildroot}%{_tmpfilesdir}/%{name}.conf -install -D -m 444 %{SOURCE7} %{buildroot}%{_libexecdir}/%{name}-hooks/99-prefixlen install -d %{buildroot}%{_sharedstatedir}/%{_name} %pre @@ -103,4 +111,59 @@ install -d %{buildroot}%{_sharedstatedir}/%{_name} %{_sharedstatedir}/%{name} %changelog -%autochangelog +## START: Generated by rpmautospec +* Wed Jul 01 2026 Martin Osvald - 10.0.6-11 +- Fix CVE-2026-14258 + +* Thu Jan 08 2026 Martin Osvald - 10.0.6-10 +- Create /var/lib/dhcpcd directory through systemd-tmpfiles + +* Tue Sep 23 2025 Martin Osvald - 10.0.6-9 +- Install sysusers.d config + +* Tue Jul 15 2025 František Hrdina - 10.0.6-8 +- Update location of fmf plans + +* Thu Jan 02 2025 Florian Weimer - 10.0.6-7 +- Allow the rt_sigprocmask syscall (RHEL-72083) + +* Tue Oct 29 2024 Troy Dawson - 10.0.6-6 +- Bump release for October 2024 mass rebuild: + +* Thu Jun 27 2024 František Hrdina - 10.0.6-5 +- Update of fmf plans and gating for c10s + +* Mon Jun 24 2024 Troy Dawson - 10.0.6-4 +- Bump release for June 2024 mass rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 10.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 10.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Dec 21 2023 Martin Osvald - 10.0.6-1 +- Update to 10.0.6 (rhbz#2255164) +- fix missing directory ownership and license + +* Thu Nov 23 2023 Martin Osvald - 10.0.5-1 +- Update to 10.0.5 (rhbz#2249203) + +* Wed Oct 25 2023 Pavol Žáčik - 10.0.4-1 +- Update to 10.04 + +* Sun Jul 23 2023 Petr Menšík - 10.0.2-7 +- More attempts to fix testing of ipv6 too + +* Sun Jul 23 2023 Petr Menšík - 10.0.2-6 +- Fix building on recent epel + +* Sun Jul 23 2023 Petr Menšík - 10.0.2-5 +- IPv4 tests fixes + +* Sun Jul 23 2023 Petr Menšík - 10.0.2-4 +- Use /run directory, build test + +* Sun Jul 23 2023 Petr Menšík - 10.0.2-3 +- RPMAUTOSPEC: unresolvable merge +## END: Generated by rpmautospec diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 1b16508..0000000 --- a/gating.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_testing -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} - -#Rawhide ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} - -#gating rhel ---- !Policy -product_versions: - - rhel-* -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional} - - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} \ No newline at end of file diff --git a/plans.fmf b/plans.fmf deleted file mode 100644 index 7bf5085..0000000 --- a/plans.fmf +++ /dev/null @@ -1,36 +0,0 @@ -/tier1-internal: - plan: - import: - url: https://gitlab.com/redhat/centos-stream/tests/dhcpcd.git - name: /plans/tier1/internal - -/tier1-public: - plan: - import: - url: https://gitlab.com/redhat/centos-stream/tests/dhcpcd.git - name: /plans/tier1/public - -/tier2-tier3-internal: - plan: - import: - url: https://gitlab.com/redhat/centos-stream/tests/dhcpcd.git - name: /plans/tier2-tier3/internal - -/tier2-tier3-public: - plan: - import: - url: https://gitlab.com/redhat/centos-stream/tests/dhcpcd.git - name: /plans/tier2-tier3/public - -/others-internal: - plan: - import: - url: https://gitlab.com/redhat/centos-stream/tests/dhcpcd.git - name: /plans/others/internal - -/others-public: - plan: - import: - url: https://gitlab.com/redhat/centos-stream/tests/dhcpcd.git - name: /plans/others/public - diff --git a/rpminspect.yaml b/rpminspect.yaml deleted file mode 100644 index 9e015b1..0000000 --- a/rpminspect.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -badfuncs: - allowed: -# This is a rpminspect false positive. Both functions are deprecated in favor of inet_pton/inet_ntop, -# but there is no exploitable security issue in dhcpcd's specific usage: -# - inet_aton() only parses trusted admin config; error returns are checked. -# - inet_ntoa() is used in a single-threaded context with no double-evaluation in any single format call. -# Fixing it would require patching ~40 call sites in the upstream source to use inet_ntop(AF_INET, ...) -# with a local buffer, which is a cosmetic/correctness improvement, not a security fix. - /usr/sbin/dhcpcd: - - inet_aton - - inet_ntoa - diff --git a/sources b/sources index 28fddbd..304dfc4 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (dhcpcd-10.0.6.tar.xz) = 403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004 -SHA512 (dhcpcd-10.0.6.tar.xz.asc) = a564c7624aaa5587fba3a4a0884dd1ad4b0a2703673c9996df87606550086d3d38ef286b88e16c6cf7dc4185c688dd12bc4c638fb1474a280cd13ee10b8ff1ac