Create /var/lib/dhcpd through systemd-tmpfiles

Update fmf plans and gating
Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
2026-01-07 08:45:15 +01:00 · 2025-08-01 10:46:46 +02:00 · 2025-07-23 19:14:26 +00:00 · 2025-03-14 09:46:04 +01:00 · 2025-03-05 07:16:37 +01:00 · 2025-03-02 09:24:40 +01:00
10 changed files with 1668 additions and 1462 deletions
--- a/0031-Correct-declarations-of-ia_na_-no-match-and-ia_pd_-n.patch
+++ b/0031-Correct-declarations-of-ia_na_-no-match-and-ia_pd_-n.patch
@ -0,0 +1,39 @@
+From f7eb324f5b0deef285b0eaa0d504af77f06c779f Mon Sep 17 00:00:00 2001
+From: Stepan Broz <sbroz@redhat.com>
+Date: Fri, 24 Jan 2025 15:41:41 +0100
+Subject: [PATCH] Correct declarations of ia_na_[no]match and ia_pd_[no]match
+ in server/dhcpv6.c.
+
+---
+ server/dhcpv6.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/server/dhcpv6.c b/server/dhcpv6.c
+index 7d61dc5..c1f227c 100644
+--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
+@@ -5852,8 +5852,8 @@ iterate_over_ia_na(struct data_string *reply_ret,
+ 		   const struct data_string *client_id,
+ 		   const struct data_string *server_id,
+ 		   const char *packet_type,
+-		   void (*ia_na_match)(),
+-		   void (*ia_na_nomatch)())
+		   void (*ia_na_match)(const struct data_string *, const struct data_string *, struct iasubopt *),
+		   void (*ia_na_nomatch)(const struct data_string *, const struct data_string *, u_int32_t *, struct packet *, char *, int *, int))
+ {
+ 	struct option_state *opt_state;
+ 	struct host_decl *packet_host;
+@@ -6354,8 +6354,8 @@ iterate_over_ia_pd(struct data_string *reply_ret,
+ 		   const struct data_string *client_id,
+ 		   const struct data_string *server_id,
+ 		   const char *packet_type,
+-		   void (*ia_pd_match)(),
+-		   void (*ia_pd_nomatch)())
+		   void (*ia_pd_match)(const struct data_string *, const struct data_string *, struct iasubopt *),
+		   void (*ia_pd_nomatch)(const struct data_string *, const struct data_string *, u_int32_t *, struct packet *, char *, int *, int))
+ {
+ 	struct data_string reply_new;
+ 	int reply_len;
+-- 
+2.48.1
+
--- a/1432
+++ b/1432
--- a/dhcp.spec
+++ b/dhcp.spec
--- a/gating.yaml
+++ b/gating.yaml
@ -1,16 +1,25 @@
 --- !Policy
 product_versions:
  - fedora-*
-decision_contexts: [bodhi_update_push_testing]
+decision_context: bodhi_update_push_testing
 subject_type: koji_build
 rules:
  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}

-#gating rawhide
+#Rawhide
 --- !Policy
 product_versions:
  - fedora-*
-decision_contexts: [bodhi_update_push_stable]
+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}
--- a/plans.fmf
+++ b/plans.fmf
@ -0,0 +1,35 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/dhcp.git
+      name: /plans/others/public
--- a/plans/all.fmf
+++ b/plans/all.fmf
@ -1,6 +0,0 @@
-summary: Test plan with all beakerlib tests
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/dhcp.git
-execute:
-    how: tmt
--- a/plans/tier1-public.fmf
+++ b/plans/tier1-public.fmf
@ -1,7 +0,0 @@
-summary: Public (Fedora) Tier1 beakerlib tests
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/dhcp.git
-    filter: 'tier: 1'
-execute:
-    how: tmt
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,22 @@
+---
+badfuncs:
+  # Adding waiver for all these functions to stop rpminspec to complain about them.
+  # The DHCP is EOL software so there is no chance to get them replaced
+  # with alternatives upstream.
+  allowed:
+    /usr/bin/omshell:
+      - gethostbyname
+      - inet_ntoa
+    /usr/sbin/dhcpd:
+      - gethostbyaddr
+      - gethostbyname
+      - inet_ntoa
+    /usr/sbin/dhclient:
+      - gethostbyname
+      - inet_ntoa
+    /usr/sbin/dhcrelay:
+      - gethostbyname
+      - inet_ntoa
+    /usr/sbin/keama:
+      - gethostbyname
+
--- a/systemd-sysusers.conf
+++ b/systemd-sysusers.conf
--- a/systemd-tmpfiles.conf
+++ b/systemd-tmpfiles.conf
@ -0,0 +1 @@
+d /var/lib/dhcpd 0755 dhcpd dhcpd -
Author	SHA1	Message	Date
Martin Osvald	296b65af2c	Create /var/lib/dhcpd through systemd-tmpfiles	2026-01-07 08:45:15 +01:00
František Hrdina	d900da1822	Update fmf plans and gating	2025-08-01 10:46:46 +02:00
Fedora Release Engineering	2d6dab7b83	Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild	2025-07-23 19:14:26 +00:00
Martin Osvald	7716face33	Do not ship dhclient and dhcpd in EPEL10	2025-03-14 09:46:04 +01:00
Martin Osvald	42af780724	Replace %filter_requires_in macro with __requires_exclude_from	2025-03-05 07:16:37 +01:00
Martin Osvald	696d558837	Add provided bind version to libs-static	2025-03-02 09:24:40 +01:00
Martin Osvald	b90c696929	Remove old dhcp-keama sub-package Keama is provided by Kea's sub-package kea-keama.	2025-03-02 09:12:58 +01:00
Martin Osvald	c19a20e0d2	Convert to %autorelease and %autochangelog [skip changelog]	2025-03-02 08:59:05 +01:00
Stepan Broz	5f057ac436	Correct function declarations in server/dhcpv6.c	2025-01-24 16:04:53 +01:00
Fedora Release Engineering	2b135856ff	Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild	2025-01-16 15:40:23 +00:00
Fedora Release Engineering	5b60d71c11	Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild	2024-07-17 20:54:14 +00:00
Fedora Release Engineering	baddcc1dad	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-24 09:22:32 +00:00
Fedora Release Engineering	214610d603	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-19 17:05:44 +00:00
Martin Osvald	e226f99ab0	Mark dhcp (sub)packages as deprecated Add rpminspect.yaml badfuncs waiver	2023-11-21 10:02:24 +01:00
Martin Osvald	abc5de5e2f	SPDX migration	2023-10-02 14:28:51 +02:00