Compare commits
No commits in common. "rawhide" and "f35" have entirely different histories.
11 changed files with 1463 additions and 1831 deletions
|
|
@ -1,151 +0,0 @@
|
|||
Downstream-only patch.
|
||||
Upstream bind9 development has changed configure significantly:
|
||||
https://gitlab.isc.org/isc-projects/bind9
|
||||
|
||||
From 035224d94d4cf93257cf5440a2e4e129540e81e8 Mon Sep 17 00:00:00 2001
|
||||
From: Arjun Shankar <arjun@redhat.com>
|
||||
Date: Thu, 20 Apr 2023 15:34:01 +0200
|
||||
Subject: [PATCH] Port to C99
|
||||
|
||||
---
|
||||
bind/bind-9.11.36/configure | 14 +++++++-------
|
||||
bind/bind-9.11.36/configure.ac | 14 +++++++-------
|
||||
2 files changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/bind/bind-9.11.36/configure b/bind/bind-9.11.36/configure
|
||||
index 368112f..c50d873 100755
|
||||
--- a/bind/bind-9.11.36/configure
|
||||
+++ b/bind/bind-9.11.36/configure
|
||||
@@ -20016,7 +20016,7 @@ else
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
-main() {
|
||||
+int main() {
|
||||
char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_run "$LINENO"; then :
|
||||
@@ -20056,7 +20056,7 @@ else
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
-main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 :
|
||||
+int main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 :
|
||||
inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 :
|
||||
(inet_pton(AF_INET6, "::1.2.3.4", a) != 1)); }
|
||||
_ACEOF
|
||||
@@ -21346,7 +21346,7 @@ else
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}
|
||||
+int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_run "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: int" >&5
|
||||
@@ -21363,7 +21363,7 @@ else
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}
|
||||
+int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_run "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: long int" >&5
|
||||
@@ -21380,7 +21380,7 @@ else
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
-main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}
|
||||
+int main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_run "$LINENO"; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: long long int" >&5
|
||||
@@ -21759,7 +21759,7 @@ int
|
||||
main ()
|
||||
{
|
||||
|
||||
- main() { asm("ics"); exit(0); }
|
||||
+ int main() { asm("ics"); exit(0); }
|
||||
|
||||
;
|
||||
return 0;
|
||||
@@ -21782,7 +21782,7 @@ else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
- main() { asm("ics"); exit(0); }
|
||||
+ int main() { asm("ics"); exit(0); }
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_run "$LINENO"; then :
|
||||
diff --git a/bind/bind-9.11.36/configure.ac b/bind/bind-9.11.36/configure.ac
|
||||
index 030c4d7..e74af09 100644
|
||||
--- a/bind/bind-9.11.36/configure.ac
|
||||
+++ b/bind/bind-9.11.36/configure.ac
|
||||
@@ -3274,7 +3274,7 @@ AC_TRY_RUN([
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
-main() {
|
||||
+int main() {
|
||||
char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);}],
|
||||
[AC_MSG_RESULT(yes)
|
||||
ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP"],
|
||||
@@ -3297,7 +3297,7 @@ AC_TRY_RUN([
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
-main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 :
|
||||
+int main() { char a[16]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 :
|
||||
inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 :
|
||||
(inet_pton(AF_INET6, "::1.2.3.4", a) != 1)); }],
|
||||
[AC_MSG_RESULT(yes)
|
||||
@@ -3901,7 +3901,7 @@ AC_TRY_RUN([
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}],
|
||||
+int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));}],
|
||||
[AC_MSG_RESULT(int)
|
||||
ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE int"],
|
||||
[
|
||||
@@ -3909,7 +3909,7 @@ AC_TRY_RUN([
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
-main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}],
|
||||
+int main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));}],
|
||||
[AC_MSG_RESULT(long int)
|
||||
ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long int"],
|
||||
[
|
||||
@@ -3917,7 +3917,7 @@ AC_TRY_RUN([
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
-main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}],
|
||||
+int main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));}],
|
||||
[AC_MSG_RESULT(long long int)
|
||||
ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int"],
|
||||
[AC_MSG_ERROR([unable to determine sizeof rlim_cur])
|
||||
@@ -4117,7 +4117,7 @@ case "$enable_atomic" in
|
||||
if test "X$GCC" = "Xyes"; then
|
||||
AC_MSG_CHECKING([if asm("ics"); works])
|
||||
AC_TRY_COMPILE(,[
|
||||
- main() { asm("ics"); exit(0); }
|
||||
+ int main() { asm("ics"); exit(0); }
|
||||
],
|
||||
[AC_MSG_RESULT(yes)
|
||||
use_atomic=yes],
|
||||
@@ -4125,7 +4125,7 @@ case "$enable_atomic" in
|
||||
saved_cflags="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -Wa,-many"
|
||||
AC_TRY_RUN([
|
||||
- main() { asm("ics"); exit(0); }
|
||||
+ int main() { asm("ics"); exit(0); }
|
||||
],
|
||||
[AC_MSG_RESULT([yes, required -Wa,-many])
|
||||
use_atomic=yes],
|
||||
--
|
||||
2.40.0
|
||||
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
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
|
||||
|
||||
15
gating.yaml
15
gating.yaml
|
|
@ -1,25 +1,16 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_testing
|
||||
decision_contexts: [bodhi_update_push_testing]
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
||||
|
||||
#Rawhide
|
||||
#gating rawhide
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_stable
|
||||
decision_contexts: [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}
|
||||
|
|
|
|||
35
plans.fmf
35
plans.fmf
|
|
@ -1,35 +0,0 @@
|
|||
/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
|
||||
6
plans/all.fmf
Normal file
6
plans/all.fmf
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
summary: Test plan with all beakerlib tests
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://src.fedoraproject.org/tests/dhcp.git
|
||||
execute:
|
||||
how: tmt
|
||||
7
plans/tier1-public.fmf
Normal file
7
plans/tier1-public.fmf
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
summary: Public (Fedora) Tier1 beakerlib tests
|
||||
discover:
|
||||
how: fmf
|
||||
url: https://src.fedoraproject.org/tests/dhcp.git
|
||||
filter: 'tier: 1'
|
||||
execute:
|
||||
how: tmt
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
---
|
||||
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
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
#Type Name ID GECOS Home directory Shell
|
||||
g dhcpd 177
|
||||
u dhcpd 177 "DHCP server" / /sbin/nologin
|
||||
|
|
@ -1 +0,0 @@
|
|||
d /var/lib/dhcpd 0755 dhcpd dhcpd -
|
||||
Loading…
Add table
Add a link
Reference in a new issue