diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 499b105..168e771 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,9 @@ /dhcp-4.3.6.tar.gz /dhcp-4.4.1.tar.gz /dhcp-4.4.2b1.tar.gz +/dhcp-4.4.2-P1.tar.gz +/dhcp-4.4.2-P1.tar.gz.asc +/dhcp-4.4.3.tar.gz +/dhcp-4.4.3.tar.gz.asc +/dhcp-4.4.3-P1.tar.gz +/dhcp-4.4.3-P1.tar.gz.asc diff --git a/0001-change-bug-url.patch b/0001-change-bug-url.patch index b6afa57..8c8211f 100644 --- a/0001-change-bug-url.patch +++ b/0001-change-bug-url.patch @@ -1,15 +1,14 @@ -From 23dfbc560028bf7429196db1a3826f8b80c19d3e Mon Sep 17 00:00:00 2001 +From 5e9162c5ad7aa98f7f673ac7a7f46905ba2deea4 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:09:57 +0100 -Subject: [PATCH 01/26] change bug url -Cc: pzhukov@redhat.com +Subject: [PATCH 01/28] change bug url --- omapip/errwarn.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/omapip/errwarn.c b/omapip/errwarn.c -index e30f8a0..09a3004 100644 +index 38dd9c5..d88e392 100644 --- a/omapip/errwarn.c +++ b/omapip/errwarn.c @@ -48,6 +48,41 @@ void (*log_cleanup) (void); @@ -74,5 +73,5 @@ index e30f8a0..09a3004 100644 log_error ("exiting."); -- -2.14.5 +2.35.1 diff --git a/0002-additional-dhclient-options.patch b/0002-additional-dhclient-options.patch index d700c00..4b5696b 100644 --- a/0002-additional-dhclient-options.patch +++ b/0002-additional-dhclient-options.patch @@ -1,23 +1,22 @@ -From a26161b0fd45cdbeed3038ac63ff04e3b727248f Mon Sep 17 00:00:00 2001 +From af18c830fe55f6be0b89997a36b611d981e3c25d Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:19:47 +0100 -Subject: [PATCH 02/26] additional dhclient options -Cc: pzhukov@redhat.com +Subject: [PATCH 02/28] additional dhclient options --- client/clparse.c | 10 +- - client/dhclient.8 | 27 ++++++ - client/dhclient.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++- + client/dhclient.8 | 27 +++++ + client/dhclient.c | 271 +++++++++++++++++++++++++++++++++++++++++++- common/conflex.c | 2 + includes/dhcpd.h | 3 + - includes/dhctoken.h | 1 + - 6 files changed, 308 insertions(+), 6 deletions(-) + includes/dhctoken.h | 3 +- + 6 files changed, 309 insertions(+), 7 deletions(-) diff --git a/client/clparse.c b/client/clparse.c -index eaf48a8..7212e3a 100644 +index 74ca499..bb63825 100644 --- a/client/clparse.c +++ b/client/clparse.c -@@ -189,6 +189,7 @@ isc_result_t read_client_conf () +@@ -192,6 +192,7 @@ isc_result_t read_client_conf () /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache) */ top_level_config.requested_lease = 7200; @@ -25,7 +24,7 @@ index eaf48a8..7212e3a 100644 group_allocate (&top_level_config.on_receipt, MDL); if (!top_level_config.on_receipt) -@@ -394,7 +395,8 @@ void read_client_leases () +@@ -397,7 +398,8 @@ void read_client_leases () interface-declaration | LEASE client-lease-statement | ALIAS client-lease-statement | @@ -35,7 +34,7 @@ index eaf48a8..7212e3a 100644 void parse_client_statement (cfile, ip, config) struct parse *cfile; -@@ -817,6 +819,12 @@ void parse_client_statement (cfile, ip, config) +@@ -820,6 +822,12 @@ void parse_client_statement (cfile, ip, config) parse_lease_id_format(cfile); break; @@ -49,10 +48,10 @@ index eaf48a8..7212e3a 100644 default: lose = 0; diff --git a/client/dhclient.8 b/client/dhclient.8 -index ebc750f..6d7fbdb 100644 +index 861ff56..5029dac 100644 --- a/client/dhclient.8 +++ b/client/dhclient.8 -@@ -134,6 +134,33 @@ dhclient - Dynamic Host Configuration Protocol Client +@@ -135,6 +135,33 @@ dhclient - Dynamic Host Configuration Protocol Client .B -w ] [ @@ -87,7 +86,7 @@ index ebc750f..6d7fbdb 100644 .I seconds ] diff --git a/client/dhclient.c b/client/dhclient.c -index 825ab00..26a333c 100644 +index 46dc3a7..6c1c09a 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -41,6 +41,12 @@ @@ -103,7 +102,7 @@ index 825ab00..26a333c 100644 TIME default_lease_time = 43200; /* 12 hours... */ TIME max_lease_time = 86400; /* 24 hours... */ -@@ -110,6 +116,10 @@ char *mockup_relay = NULL; +@@ -113,6 +119,10 @@ char *mockup_relay = NULL; char *progname = NULL; @@ -114,7 +113,7 @@ index 825ab00..26a333c 100644 void run_stateless(int exit_mode, u_int16_t port); static isc_result_t write_duid(struct data_string *duid); -@@ -183,8 +193,12 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s"; +@@ -189,8 +199,12 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s"; " [-s server-addr] [-cf config-file]\n" \ " [-df duid-file] [-lf lease-file]\n" \ " [-pf pid-file] [--no-pid] [-e VAR=val]\n" \ @@ -129,7 +128,7 @@ index 825ab00..26a333c 100644 #define DHCLIENT_USAGEH "{--version|--help|-h}" static void -@@ -243,6 +257,16 @@ main(int argc, char **argv) { +@@ -249,6 +263,16 @@ main(int argc, char **argv) { #else progname = argv[0]; #endif @@ -146,7 +145,7 @@ index 825ab00..26a333c 100644 /* Initialize client globals. */ memset(&default_duid, 0, sizeof(default_duid)); -@@ -558,6 +582,89 @@ main(int argc, char **argv) { +@@ -564,6 +588,89 @@ main(int argc, char **argv) { std_dhcid = 1; } else if (!strcmp(argv[i], "-v")) { quiet = 0; @@ -236,7 +235,7 @@ index 825ab00..26a333c 100644 } else if (argv[i][0] == '-') { usage("Unknown command: %s", argv[i]); } else if (interfaces_requested < 0) { -@@ -754,6 +861,156 @@ main(int argc, char **argv) { +@@ -760,6 +867,156 @@ main(int argc, char **argv) { /* Parse the dhclient.conf file. */ read_client_conf(); @@ -393,7 +392,7 @@ index 825ab00..26a333c 100644 /* Parse the lease database. */ read_client_leases(); -@@ -3226,7 +3483,8 @@ void make_discover (client, lease) +@@ -3472,7 +3729,8 @@ void make_discover (client, lease) client -> packet.xid = random (); client -> packet.secs = 0; /* filled in by send_discover. */ @@ -403,7 +402,7 @@ index 825ab00..26a333c 100644 client -> packet.flags = 0; else client -> packet.flags = htons (BOOTP_BROADCAST); -@@ -3311,7 +3569,9 @@ void make_request (client, lease) +@@ -3557,7 +3815,9 @@ void make_request (client, lease) } else { memset (&client -> packet.ciaddr, 0, sizeof client -> packet.ciaddr); @@ -414,7 +413,7 @@ index 825ab00..26a333c 100644 client -> packet.flags = 0; else client -> packet.flags = htons (BOOTP_BROADCAST); -@@ -3374,7 +3634,8 @@ void make_decline (client, lease) +@@ -3620,7 +3880,8 @@ void make_decline (client, lease) client -> packet.hops = 0; client -> packet.xid = client -> xid; client -> packet.secs = 0; /* Filled in by send_request. */ @@ -425,7 +424,7 @@ index 825ab00..26a333c 100644 else client -> packet.flags = htons (BOOTP_BROADCAST); diff --git a/common/conflex.c b/common/conflex.c -index 045b655..71c0bf5 100644 +index 8b01dfb..1fa2be3 100644 --- a/common/conflex.c +++ b/common/conflex.c @@ -832,6 +832,8 @@ intern(char *atom, enum dhcp_token dfv) { @@ -438,10 +437,10 @@ index 045b655..71c0bf5 100644 case 'c': if (!strcasecmp(atom + 1, "ase")) diff --git a/includes/dhcpd.h b/includes/dhcpd.h -index 5930e6a..018fa34 100644 +index f68b228..3b2e2ca 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h -@@ -1269,6 +1269,9 @@ struct client_config { +@@ -1284,6 +1284,9 @@ struct client_config { int lease_id_format; /* format for IDs in lease file, TOKEN_OCTAL or TOKEN_HEX */ @@ -452,17 +451,19 @@ index 5930e6a..018fa34 100644 /* Per-interface state used in the dhcp client... */ diff --git a/includes/dhctoken.h b/includes/dhctoken.h -index 5920f4f..7e7215a 100644 +index e6d125f..6daa422 100644 --- a/includes/dhctoken.h +++ b/includes/dhctoken.h -@@ -377,6 +377,7 @@ enum dhcp_token { +@@ -377,7 +377,8 @@ enum dhcp_token { TOKEN_HEX = 677, TOKEN_OCTAL = 678, - KEY_ALGORITHM = 679 -+ BOOTP_BROADCAST_ALWAYS = 680 + KEY_ALGORITHM = 679, +- DISCONNECT = 680 ++ BOOTP_BROADCAST_ALWAYS = 680, ++ DISCONNECT = 681 }; #define is_identifier(x) ((x) >= FIRST_TOKEN && \ -- -2.14.5 +2.35.1 diff --git a/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch b/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch index 2953c0f..c6e9376 100644 --- a/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch +++ b/0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch @@ -1,18 +1,17 @@ -From af504e99abde04b881768d18eaa0054b36b16303 Mon Sep 17 00:00:00 2001 +From be8f73c399c0f89192e57453db153aaa48fcbb2e Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:21:14 +0100 -Subject: [PATCH 03/26] Handle releasing interfaces requested by /sbin/ifup -Cc: pzhukov@redhat.com +Subject: [PATCH 03/28] Handle releasing interfaces requested by /sbin/ifup --- - client/dhclient.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + client/dhclient.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/client/dhclient.c b/client/dhclient.c -index 26a333c..2a2e9e6 100644 +index 6c1c09a..07679a7 100644 --- a/client/dhclient.c +++ b/client/dhclient.c -@@ -787,9 +787,81 @@ main(int argc, char **argv) { +@@ -793,9 +793,81 @@ main(int argc, char **argv) { } } fclose(pidfd); @@ -95,5 +94,5 @@ index 26a333c..2a2e9e6 100644 log_info("%s %s", message, PACKAGE_VERSION); log_info(copyright); -- -2.14.5 +2.35.1 diff --git a/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch b/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch index 7f414a3..96e0b09 100644 --- a/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch +++ b/0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch @@ -1,9 +1,8 @@ -From 7e8cc8388ac31c5c2b1a423c6b2da0491b19f6f9 Mon Sep 17 00:00:00 2001 +From 0a640394cb6f4a97fb87e53f049fba23523035c8 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:22:41 +0100 -Subject: [PATCH 04/26] Support unicast BOOTP for IBM pSeries systems (and +Subject: [PATCH 04/28] Support unicast BOOTP for IBM pSeries systems (and maybe others) -Cc: pzhukov@redhat.com --- server/bootp.c | 12 +++++++++++- @@ -11,7 +10,7 @@ Cc: pzhukov@redhat.com 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/server/bootp.c b/server/bootp.c -index 26a7607..2212f31 100644 +index 919d483..338aac0 100644 --- a/server/bootp.c +++ b/server/bootp.c @@ -52,6 +52,7 @@ void bootp (packet) @@ -48,10 +47,10 @@ index 26a7607..2212f31 100644 /* If it comes from a client that already knows its address and is not requesting a broadcast response, and we can diff --git a/server/dhcp.c b/server/dhcp.c -index 6f3a91f..20f2a62 100644 +index 0b261c2..ae805a6 100644 --- a/server/dhcp.c +++ b/server/dhcp.c -@@ -5224,6 +5224,7 @@ int locate_network (packet) +@@ -5332,6 +5332,7 @@ int locate_network (packet) struct data_string data; struct subnet *subnet = (struct subnet *)0; struct option_cache *oc; @@ -59,7 +58,7 @@ index 6f3a91f..20f2a62 100644 #if defined(DHCPv6) && defined(DHCP4o6) if (dhcpv4_over_dhcpv6 && (packet->dhcp4o6_response != NULL)) { -@@ -5245,12 +5246,24 @@ int locate_network (packet) +@@ -5353,12 +5354,24 @@ int locate_network (packet) from the interface, if there is one. If not, fail. */ if (!oc && !packet -> raw -> giaddr.s_addr) { if (packet -> interface -> shared_network) { @@ -89,7 +88,7 @@ index 6f3a91f..20f2a62 100644 } /* If there's an option indicating link connection, and it's valid, -@@ -5277,7 +5290,10 @@ int locate_network (packet) +@@ -5384,7 +5397,10 @@ int locate_network (packet) data_string_forget (&data, MDL); } else { ia.len = 4; @@ -101,7 +100,7 @@ index 6f3a91f..20f2a62 100644 } /* If we know the subnet on which the IP address lives, use it. */ -@@ -5285,7 +5301,10 @@ int locate_network (packet) +@@ -5392,7 +5408,10 @@ int locate_network (packet) shared_network_reference (&packet -> shared_network, subnet -> shared_network, MDL); subnet_dereference (&subnet, MDL); @@ -114,5 +113,5 @@ index 6f3a91f..20f2a62 100644 /* Otherwise, fail. */ -- -2.14.5 +2.35.1 diff --git a/0005-Change-default-requested-options.patch b/0005-Change-default-requested-options.patch index 34ff7b5..98c1957 100644 --- a/0005-Change-default-requested-options.patch +++ b/0005-Change-default-requested-options.patch @@ -1,8 +1,7 @@ -From a2a3554ff9e05d1a8e2c8aa843f1b6a33fce87e3 Mon Sep 17 00:00:00 2001 +From f994c4d208a8fe88cbf78d4374c8d44793f0598e Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:24:24 +0100 -Subject: [PATCH 05/26] Change default requested options -Cc: pzhukov@redhat.com +Subject: [PATCH 05/28] Change default requested options Add NIS domain, NIS servers, NTP servers, interface-mtu and domain-search to the list of default requested DHCP options @@ -11,7 +10,7 @@ to the list of default requested DHCP options 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/client/clparse.c b/client/clparse.c -index 7212e3a..39b95a0 100644 +index bb63825..e63ea08 100644 --- a/client/clparse.c +++ b/client/clparse.c @@ -31,7 +31,7 @@ @@ -23,7 +22,7 @@ index 7212e3a..39b95a0 100644 /* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 2 + 1]; -@@ -116,6 +116,31 @@ isc_result_t read_client_conf () +@@ -119,6 +119,31 @@ isc_result_t read_client_conf () option_code_hash_lookup(&default_requested_options[8], dhcpv6_universe.code_hash, &code, 0, MDL); @@ -56,5 +55,5 @@ index 7212e3a..39b95a0 100644 if (default_requested_options[code] == NULL) log_fatal("Unable to find option definition for " -- -2.14.5 +2.35.1 diff --git a/0006-Various-man-page-only-fixes.patch b/0006-Various-man-page-only-fixes.patch index a98783c..9d012de 100644 --- a/0006-Various-man-page-only-fixes.patch +++ b/0006-Various-man-page-only-fixes.patch @@ -1,8 +1,7 @@ -From 846779467f7393b19e8d206405116e1e26e16efc Mon Sep 17 00:00:00 2001 +From d359a7dc30e0423f9b90129291538cad1ee6a6d9 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:25:53 +0100 -Subject: [PATCH 06/26] Various man-page-only fixes -Cc: pzhukov@redhat.com +Subject: [PATCH 06/28] Various man-page-only fixes --- client/dhclient-script.8 | 22 +++++++++++++++++++++- @@ -12,7 +11,7 @@ Cc: pzhukov@redhat.com 4 files changed, 58 insertions(+), 7 deletions(-) diff --git a/client/dhclient-script.8 b/client/dhclient-script.8 -index 3553afd..0db5516 100644 +index 5e5bd3d..37ecdc5 100644 --- a/client/dhclient-script.8 +++ b/client/dhclient-script.8 @@ -43,7 +43,7 @@ customizations are needed, they should be possible using the enter and @@ -52,7 +51,7 @@ index 3553afd..0db5516 100644 When dhclient needs to invoke the client configuration script, it defines a set of variables in the environment, and then invokes diff --git a/client/dhclient.conf.5 b/client/dhclient.conf.5 -index fa3b908..566a881 100644 +index dbe6f7e..8bac980 100644 --- a/client/dhclient.conf.5 +++ b/client/dhclient.conf.5 @@ -228,7 +228,8 @@ responding to the client send the client its values for the specified @@ -84,10 +83,10 @@ index fa3b908..566a881 100644 .SH SAMPLE The following configuration file was used on a laptop running NetBSD diff --git a/common/dhcp-options.5 b/common/dhcp-options.5 -index 33d4804..d9e1197 100644 +index 51f80f7..a784b32 100644 --- a/common/dhcp-options.5 +++ b/common/dhcp-options.5 -@@ -1068,6 +1068,21 @@ classless IP routing - it does not include a subnet mask. Since +@@ -1075,6 +1075,21 @@ classless IP routing - it does not include a subnet mask. Since classless IP routing is now the most widely deployed routing standard, this option is virtually useless, and is not implemented by any of the popular DHCP clients, for example the Microsoft DHCP client. @@ -110,7 +109,7 @@ index 33d4804..d9e1197 100644 .PP .nf diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5 -index 17330d4..89b5540 100644 +index 691e5dd..b7e79ea 100644 --- a/server/dhcpd.conf.5 +++ b/server/dhcpd.conf.5 @@ -527,6 +527,9 @@ pool { @@ -153,7 +152,7 @@ index 17330d4..89b5540 100644 secret pRP5FapFoJ95JEL06sv4PQ==; }; -@@ -2912,7 +2915,8 @@ statement +@@ -2918,7 +2921,8 @@ statement The \fInext-server\fR statement is used to specify the host address of the server from which the initial boot file (specified in the \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should @@ -164,5 +163,5 @@ index 17330d4..89b5540 100644 .PP The -- -2.14.5 +2.35.1 diff --git a/0007-Change-paths-to-conform-to-our-standards.patch b/0007-Change-paths-to-conform-to-our-standards.patch index 87c4f8c..40434f6 100644 --- a/0007-Change-paths-to-conform-to-our-standards.patch +++ b/0007-Change-paths-to-conform-to-our-standards.patch @@ -1,8 +1,7 @@ -From ac65289663532db0bc1de449ca2a0eb4c8c2ca6f Mon Sep 17 00:00:00 2001 +From d8da92991d93a3d1c9fc474696aee25b99623c42 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:26:34 +0100 -Subject: [PATCH 07/26] Change paths to conform to our standards -Cc: pzhukov@redhat.com +Subject: [PATCH 07/28] Change paths to conform to our standards --- doc/examples/dhcpd-dhcpv6.conf | 2 +- @@ -23,10 +22,10 @@ index 448a6a6..2357824 100644 # Static definition (must be global) host myclient { diff --git a/includes/dhcpd.h b/includes/dhcpd.h -index 018fa34..3632a6b 100644 +index 3b2e2ca..4a57002 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h -@@ -1545,7 +1545,7 @@ typedef unsigned char option_mask [16]; +@@ -1561,7 +1561,7 @@ typedef unsigned char option_mask [16]; #else /* !DEBUG */ #ifndef _PATH_DHCPD_CONF @@ -35,7 +34,7 @@ index 018fa34..3632a6b 100644 #endif /* DEBUG */ #ifndef _PATH_DHCPD_DB -@@ -1567,11 +1567,11 @@ typedef unsigned char option_mask [16]; +@@ -1583,11 +1583,11 @@ typedef unsigned char option_mask [16]; #endif /* DEBUG */ #ifndef _PATH_DHCLIENT_CONF @@ -50,5 +49,5 @@ index 018fa34..3632a6b 100644 #ifndef _PATH_DHCLIENT_PID -- -2.14.5 +2.35.1 diff --git a/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch b/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch index 8294563..46ac860 100644 --- a/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch +++ b/0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch @@ -1,9 +1,8 @@ -From d2da34706f140101c34f6a9806c258411806a939 Mon Sep 17 00:00:00 2001 +From 39ce1ca26128f4a5d018a567157320ba1f68f4ea Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:27:18 +0100 -Subject: [PATCH 08/26] Make sure all open file descriptors are closed-on-exec +Subject: [PATCH 08/28] Make sure all open file descriptors are closed-on-exec for SELinux -Cc: pzhukov@redhat.com ISC-bug: #19148 --- @@ -23,10 +22,10 @@ ISC-bug: #19148 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/client/clparse.c b/client/clparse.c -index 39b95a0..44387ed 100644 +index e63ea08..902b523 100644 --- a/client/clparse.c +++ b/client/clparse.c -@@ -288,7 +288,7 @@ int read_client_conf_file (const char *name, struct interface_info *ip, +@@ -291,7 +291,7 @@ int read_client_conf_file (const char *name, struct interface_info *ip, int token; isc_result_t status; @@ -35,7 +34,7 @@ index 39b95a0..44387ed 100644 return uerr2isc (errno); cfile = NULL; -@@ -364,7 +364,7 @@ void read_client_leases () +@@ -367,7 +367,7 @@ void read_client_leases () /* Open the lease file. If we can't open it, just return - we can safely trust the server to remember our state. */ @@ -45,10 +44,10 @@ index 39b95a0..44387ed 100644 cfile = NULL; diff --git a/client/dhclient.c b/client/dhclient.c -index 2a2e9e6..a86ab9e 100644 +index 07679a7..aefc119 100644 --- a/client/dhclient.c +++ b/client/dhclient.c -@@ -273,11 +273,11 @@ main(int argc, char **argv) { +@@ -279,11 +279,11 @@ main(int argc, char **argv) { /* Make sure that file descriptors 0 (stdin), 1, (stdout), and 2 (stderr) are open. To do this, we assume that when we open a file the lowest available file descriptor is used. */ @@ -63,7 +62,7 @@ index 2a2e9e6..a86ab9e 100644 if (fd == 2) log_perror = 0; /* No sense logging to /dev/null. */ else if (fd != -1) -@@ -765,7 +765,7 @@ main(int argc, char **argv) { +@@ -771,7 +771,7 @@ main(int argc, char **argv) { long temp; int e; @@ -72,7 +71,7 @@ index 2a2e9e6..a86ab9e 100644 e = fscanf(pidfd, "%ld\n", &temp); oldpid = (pid_t)temp; -@@ -820,7 +820,7 @@ main(int argc, char **argv) { +@@ -826,7 +826,7 @@ main(int argc, char **argv) { strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx); sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name); @@ -81,7 +80,7 @@ index 2a2e9e6..a86ab9e 100644 e = fscanf(pidfd, "%ld\n", &temp); oldpid = (pid_t)temp; -@@ -845,7 +845,7 @@ main(int argc, char **argv) { +@@ -851,7 +851,7 @@ main(int argc, char **argv) { int dhc_running = 0; char procfn[256] = ""; @@ -90,7 +89,7 @@ index 2a2e9e6..a86ab9e 100644 if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) { snprintf(procfn,256,"/proc/%u",dhcpid); dhc_running = (access(procfn, F_OK) == 0); -@@ -3808,7 +3808,7 @@ void rewrite_client_leases () +@@ -4054,7 +4054,7 @@ void rewrite_client_leases () if (leaseFile != NULL) fclose (leaseFile); @@ -99,7 +98,7 @@ index 2a2e9e6..a86ab9e 100644 if (leaseFile == NULL) { log_error ("can't create %s: %m", path_dhclient_db); return; -@@ -4003,7 +4003,7 @@ write_duid(struct data_string *duid) +@@ -4249,7 +4249,7 @@ write_duid(struct data_string *duid) return DHCP_R_INVALIDARG; if (leaseFile == NULL) { /* XXX? */ @@ -108,7 +107,7 @@ index 2a2e9e6..a86ab9e 100644 if (leaseFile == NULL) { log_error("can't create %s: %m", path_dhclient_db); return ISC_R_IOERROR; -@@ -4207,7 +4207,7 @@ int write_client_lease (client, lease, rewrite, makesure) +@@ -4453,7 +4453,7 @@ int write_client_lease (client, lease, rewrite, makesure) return 1; if (leaseFile == NULL) { /* XXX */ @@ -117,7 +116,7 @@ index 2a2e9e6..a86ab9e 100644 if (leaseFile == NULL) { log_error ("can't create %s: %m", path_dhclient_db); return 0; -@@ -4786,9 +4786,9 @@ void detach () +@@ -5039,9 +5039,9 @@ void detach () (void) close(2); /* Reopen them on /dev/null. */ @@ -130,7 +129,7 @@ index 2a2e9e6..a86ab9e 100644 write_client_pid_file (); -@@ -4806,14 +4806,14 @@ void write_client_pid_file () +@@ -5059,14 +5059,14 @@ void write_client_pid_file () return; } @@ -148,7 +147,7 @@ index 2a2e9e6..a86ab9e 100644 close(pfdesc); log_error ("Can't fdopen %s: %m", path_dhclient_pid); diff --git a/common/bpf.c b/common/bpf.c -index 16076fe..67b6d64 100644 +index 0bffcbf..d2a0549 100644 --- a/common/bpf.c +++ b/common/bpf.c @@ -94,7 +94,7 @@ int if_register_bpf (info) @@ -161,20 +160,20 @@ index 16076fe..67b6d64 100644 if (errno == EBUSY) { continue; diff --git a/common/dlpi.c b/common/dlpi.c -index 3990bf1..a941258 100644 +index f2332c0..bf6e21f 100644 --- a/common/dlpi.c +++ b/common/dlpi.c @@ -817,7 +817,7 @@ dlpiopen(const char *ifname) { } *dp = '\0'; - + - return open (devname, O_RDWR, 0); + return open (devname, O_RDWR | O_CLOEXEC, 0); } /* diff --git a/common/nit.c b/common/nit.c -index d822c15..a9132bc 100644 +index ba62488..4ebfa4a 100644 --- a/common/nit.c +++ b/common/nit.c @@ -75,7 +75,7 @@ int if_register_nit (info) @@ -187,7 +186,7 @@ index d822c15..a9132bc 100644 log_fatal ("Can't open NIT device for %s: %m", info -> name); diff --git a/common/resolv.c b/common/resolv.c -index a01f520..b209e3f 100644 +index 5fd683f..3535f3e 100644 --- a/common/resolv.c +++ b/common/resolv.c @@ -43,7 +43,7 @@ void read_resolv_conf (parse_time) @@ -200,7 +199,7 @@ index a01f520..b209e3f 100644 return; } diff --git a/common/upf.c b/common/upf.c -index 9785879..e0a524f 100644 +index 37e5cb2..b7c0649 100644 --- a/common/upf.c +++ b/common/upf.c @@ -71,7 +71,7 @@ int if_register_upf (info) @@ -213,7 +212,7 @@ index 9785879..e0a524f 100644 if (errno == EBUSY) { continue; diff --git a/omapip/trace.c b/omapip/trace.c -index 45bd508..5ea7486 100644 +index dc9185f..a605d18 100644 --- a/omapip/trace.c +++ b/omapip/trace.c @@ -136,10 +136,10 @@ isc_result_t trace_begin (const char *filename, @@ -239,10 +238,10 @@ index 45bd508..5ea7486 100644 log_error("Can't open tracefile %s: %m", filename); return; diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c -index d8caaaf..ea1be18 100644 +index 946ef1b..a7b1286 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c -@@ -296,11 +296,11 @@ main(int argc, char **argv) { +@@ -305,11 +305,11 @@ main(int argc, char **argv) { /* Make sure that file descriptors 0(stdin), 1,(stdout), and 2(stderr) are open. To do this, we assume that when we open a file the lowest available file descriptor is used. */ @@ -257,7 +256,7 @@ index d8caaaf..ea1be18 100644 if (fd == 2) log_perror = 0; /* No sense logging to /dev/null. */ else if (fd != -1) -@@ -776,13 +776,13 @@ main(int argc, char **argv) { +@@ -800,13 +800,13 @@ main(int argc, char **argv) { /* Create the pid file. */ if (no_pid_file == ISC_FALSE) { pfdesc = open(path_dhcrelay_pid, @@ -274,7 +273,7 @@ index d8caaaf..ea1be18 100644 log_error("Can't fdopen %s: %m", path_dhcrelay_pid); diff --git a/server/confpars.c b/server/confpars.c -index d2cedfe..2743979 100644 +index 103af1e..5a6396b 100644 --- a/server/confpars.c +++ b/server/confpars.c @@ -118,7 +118,7 @@ isc_result_t read_conf_file (const char *filename, struct group *group, @@ -287,7 +286,7 @@ index d2cedfe..2743979 100644 log_error ("Can't open lease database %s: %m --", path_dhcpd_db); diff --git a/server/db.c b/server/db.c -index 67e6cc1..6181528 100644 +index cecbf6b..4243a92 100644 --- a/server/db.c +++ b/server/db.c @@ -1154,7 +1154,7 @@ int new_lease_file (int test_mode) @@ -309,7 +308,7 @@ index 67e6cc1..6181528 100644 close(db_fd); goto fdfail; diff --git a/server/dhcpd.c b/server/dhcpd.c -index 55ffae7..530a923 100644 +index 3522889..845d0cc 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -300,11 +300,11 @@ main(int argc, char **argv) { @@ -350,10 +349,10 @@ index 55ffae7..530a923 100644 IGNORE_RET (chdir("/")); diff --git a/server/ldap.c b/server/ldap.c -index 5126d24..555545c 100644 +index e3e48f4..1a68936 100644 --- a/server/ldap.c +++ b/server/ldap.c -@@ -1446,7 +1446,7 @@ ldap_start (void) +@@ -1447,7 +1447,7 @@ ldap_start (void) if (ldap_debug_file != NULL && ldap_debug_fd == -1) { @@ -363,5 +362,5 @@ index 5126d24..555545c 100644 log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file, strerror (errno)); -- -2.14.5 +2.35.1 diff --git a/0009-Fix-garbage-in-format-string-error.patch b/0009-Fix-garbage-in-format-string-error.patch index f9d81ab..5844b73 100644 --- a/0009-Fix-garbage-in-format-string-error.patch +++ b/0009-Fix-garbage-in-format-string-error.patch @@ -1,8 +1,7 @@ -From a0a2186ce52a31357d4eb3c32d7d6887e4603814 Mon Sep 17 00:00:00 2001 +From cfe6414644b68d5b6b5ba150bf57cff0a709a59e Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:28:13 +0100 -Subject: [PATCH 09/26] Fix 'garbage in format string' error -Cc: pzhukov@redhat.com +Subject: [PATCH 09/28] Fix 'garbage in format string' error RHBZ: 450042 --- @@ -10,10 +9,10 @@ RHBZ: 450042 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/tables.c b/common/tables.c -index c1aa214..d2294c0 100644 +index be37737..ce12fcd 100644 --- a/common/tables.c +++ b/common/tables.c -@@ -215,7 +215,7 @@ static struct option dhcp_options[] = { +@@ -222,7 +222,7 @@ static struct option dhcp_options[] = { { "name-service-search", "Sa", &dhcp_universe, 117, 1 }, #endif { "subnet-selection", "I", &dhcp_universe, 118, 1 }, @@ -23,5 +22,5 @@ index c1aa214..d2294c0 100644 { "vivso", "Evendor.", &dhcp_universe, 125, 1 }, #if 0 -- -2.14.5 +2.35.1 diff --git a/0010-Handle-null-timeout.patch b/0010-Handle-null-timeout.patch index 2b6e49b..4659e0c 100644 --- a/0010-Handle-null-timeout.patch +++ b/0010-Handle-null-timeout.patch @@ -1,8 +1,7 @@ -From ed7610cdb2e8ebdbaee618e477879e7e008d4f29 Mon Sep 17 00:00:00 2001 +From 7653f3ea80230d4b38bff1c65164aa18c6e51519 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:29:08 +0100 -Subject: [PATCH 10/26] Handle null timeout -Cc: pzhukov@redhat.com +Subject: [PATCH 10/28] Handle null timeout Handle cases in add_timeout() where the function is called with a NULL value for the 'when' parameter @@ -13,7 +12,7 @@ ISC-Bugs: #19867 (rejected) 1 file changed, 4 insertions(+) diff --git a/common/dispatch.c b/common/dispatch.c -index 0207ad3..d7fe200 100644 +index 7def34c..9741ff5 100644 --- a/common/dispatch.c +++ b/common/dispatch.c @@ -209,6 +209,10 @@ void add_timeout (when, where, what, ref, unref) @@ -28,5 +27,5 @@ index 0207ad3..d7fe200 100644 t = (struct timeout *)0; for (q = timeouts; q; q = q->next) { -- -2.14.5 +2.35.1 diff --git a/0011-Drop-unnecessary-capabilities.patch b/0011-Drop-unnecessary-capabilities.patch index 4277baf..ff3b3cc 100644 --- a/0011-Drop-unnecessary-capabilities.patch +++ b/0011-Drop-unnecessary-capabilities.patch @@ -1,8 +1,7 @@ -From 3b37f4b7bb3a17f8bd655be919915a1912062ea6 Mon Sep 17 00:00:00 2001 +From 7ea2433d716172f160c9380ed0bb852fafe845a2 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:30:28 +0100 -Subject: [PATCH 11/26] Drop unnecessary capabilities -Cc: pzhukov@redhat.com +Subject: [PATCH 11/28] Drop unnecessary capabilities dhclient (#517649, #546765), dhcpd/dhcrelay (#699713) --- @@ -29,10 +28,10 @@ index d177159..0689185 100644 man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) diff --git a/client/dhclient-script.8 b/client/dhclient-script.8 -index 0db5516..2eddb8f 100644 +index 37ecdc5..1a88e0e 100644 --- a/client/dhclient-script.8 +++ b/client/dhclient-script.8 -@@ -243,6 +243,16 @@ repeatedly initialized to the values provided by one server, and then +@@ -249,6 +249,16 @@ repeatedly initialized to the values provided by one server, and then the other. Assuming the information provided by both servers is valid, this shouldn't cause any real problems, but it could be confusing. @@ -50,10 +49,10 @@ index 0db5516..2eddb8f 100644 dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and dhclient.leases(5). diff --git a/client/dhclient.8 b/client/dhclient.8 -index 6d7fbdb..0145b9f 100644 +index 5029dac..bacf3bc 100644 --- a/client/dhclient.8 +++ b/client/dhclient.8 -@@ -134,6 +134,9 @@ dhclient - Dynamic Host Configuration Protocol Client +@@ -135,6 +135,9 @@ dhclient - Dynamic Host Configuration Protocol Client .B -w ] [ @@ -63,7 +62,7 @@ index 6d7fbdb..0145b9f 100644 .B -B ] [ -@@ -328,6 +331,32 @@ not to exit when it doesn't find any such interfaces. The +@@ -329,6 +332,32 @@ not to exit when it doesn't find any such interfaces. The program can then be used to notify the client when a network interface has been added or removed, so that the client can attempt to configure an IP address on that interface. @@ -97,7 +96,7 @@ index 6d7fbdb..0145b9f 100644 .BI \-n Do not configure any interfaces. This is most likely to be useful in diff --git a/client/dhclient.c b/client/dhclient.c -index a86ab9e..5d3f5bc 100644 +index aefc119..b49fcb3 100644 --- a/client/dhclient.c +++ b/client/dhclient.c @@ -41,6 +41,10 @@ @@ -111,7 +110,7 @@ index a86ab9e..5d3f5bc 100644 /* * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define * that when building ISC code. -@@ -266,6 +270,9 @@ main(int argc, char **argv) { +@@ -272,6 +276,9 @@ main(int argc, char **argv) { int timeout_arg = 0; char *arg_conf = NULL; int arg_conf_len = 0; @@ -121,7 +120,7 @@ index a86ab9e..5d3f5bc 100644 /* Initialize client globals. */ memset(&default_duid, 0, sizeof(default_duid)); -@@ -665,6 +672,10 @@ main(int argc, char **argv) { +@@ -671,6 +678,10 @@ main(int argc, char **argv) { dhclient_request_options = argv[i]; @@ -132,7 +131,7 @@ index a86ab9e..5d3f5bc 100644 } else if (argv[i][0] == '-') { usage("Unknown command: %s", argv[i]); } else if (interfaces_requested < 0) { -@@ -725,6 +736,19 @@ main(int argc, char **argv) { +@@ -731,6 +742,19 @@ main(int argc, char **argv) { path_dhclient_script = s; } @@ -153,10 +152,10 @@ index a86ab9e..5d3f5bc 100644 initialize_common_option_spaces(); diff --git a/configure.ac b/configure.ac -index a797438..15fc0d7 100644 +index b2c306b..300117f 100644 --- a/configure.ac +++ b/configure.ac -@@ -612,6 +612,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn)); +@@ -603,6 +603,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void foo() __attribute__((noreturn)); # Look for optional headers. AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h) @@ -199,10 +198,10 @@ index a797438..15fc0d7 100644 AC_SEARCH_LIBS(socket, [socket]) AC_SEARCH_LIBS(inet_ntoa, [nsl]) diff --git a/relay/Makefile.am b/relay/Makefile.am -index 2ba5979..8900e0b 100644 +index 5562b69..4c5cfa6 100644 --- a/relay/Makefile.am +++ b/relay/Makefile.am -@@ -6,7 +6,8 @@ dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ +@@ -8,6 +8,7 @@ dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ @BINDLIBIRSDIR@/libirs.@A@ \ @BINDLIBDNSDIR@/libdns.@A@ \ @BINDLIBISCCFGDIR@/libisccfg.@A@ \ @@ -211,9 +210,8 @@ index 2ba5979..8900e0b 100644 + $(CAPNG_LDADD) man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) - diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c -index ea1be18..7b4f4f1 100644 +index a7b1286..0dc17d6 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -32,6 +32,11 @@ @@ -228,7 +226,7 @@ index ea1be18..7b4f4f1 100644 TIME default_lease_time = 43200; /* 12 hours... */ TIME max_lease_time = 86400; /* 24 hours... */ struct tree_cache *global_options[256]; -@@ -590,6 +595,10 @@ main(int argc, char **argv) { +@@ -614,6 +619,10 @@ main(int argc, char **argv) { if (++i == argc) usage(use_noarg, argv[i-1]); dhcrelay_sub_id = argv[i]; @@ -239,7 +237,7 @@ index ea1be18..7b4f4f1 100644 #endif } else if (!strcmp(argv[i], "-pf")) { if (++i == argc) -@@ -660,6 +669,17 @@ main(int argc, char **argv) { +@@ -684,6 +693,17 @@ main(int argc, char **argv) { #endif } @@ -257,7 +255,7 @@ index ea1be18..7b4f4f1 100644 if (!quiet) { log_info("%s %s", message, PACKAGE_VERSION); log_info(copyright); -@@ -816,6 +836,15 @@ main(int argc, char **argv) { +@@ -840,6 +860,15 @@ main(int argc, char **argv) { signal(SIGTERM, dhcp_signal_handler); /* kill */ #endif @@ -274,5 +272,5 @@ index ea1be18..7b4f4f1 100644 dispatch(); -- -2.14.5 +2.35.1 diff --git a/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch b/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch index 866527c..2ab5a5e 100644 --- a/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch +++ b/0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch @@ -1,25 +1,24 @@ -From 01b1dcfef129a4eccfaf0f63a216774019f82dca Mon Sep 17 00:00:00 2001 +From 7e6299e72feaaf7e8bd499614999ba8a07dd1a8a Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:32:35 +0100 -Subject: [PATCH 12/26] RFC 3442 - Classless Static Route Option for DHCPv4 +Subject: [PATCH 12/28] RFC 3442 - Classless Static Route Option for DHCPv4 (#516325) -Cc: pzhukov@redhat.com (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #24572]) --- - client/clparse.c | 13 ++++++++++-- - common/dhcp-options.5 | 43 +++++++++++++++++++++++++++++++++++++++ - common/inet.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ - common/options.c | 49 +++++++++++++++++++++++++++++++++++++++++++- - common/parse.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++- + client/clparse.c | 13 ++++++++-- + common/dhcp-options.5 | 43 +++++++++++++++++++++++++++++++++ + common/inet.c | 54 +++++++++++++++++++++++++++++++++++++++++ + common/options.c | 49 ++++++++++++++++++++++++++++++++++++- + common/parse.c | 56 ++++++++++++++++++++++++++++++++++++++++++- common/tables.c | 2 ++ includes/dhcp.h | 1 + includes/dhcpd.h | 2 ++ - includes/dhctoken.h | 5 +++-- - 9 files changed, 219 insertions(+), 6 deletions(-) + includes/dhctoken.h | 3 ++- + 9 files changed, 218 insertions(+), 5 deletions(-) diff --git a/client/clparse.c b/client/clparse.c -index 44387ed..862e4f9 100644 +index 902b523..57f6456 100644 --- a/client/clparse.c +++ b/client/clparse.c @@ -31,7 +31,7 @@ @@ -31,7 +30,7 @@ index 44387ed..862e4f9 100644 /* There can be 2 extra requested options for DHCPv4-over-DHCPv6. */ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 2 + 1]; -@@ -87,7 +87,11 @@ isc_result_t read_client_conf () +@@ -90,7 +90,11 @@ isc_result_t read_client_conf () dhcp_universe.code_hash, &code, 0, MDL); /* 4 */ @@ -44,7 +43,7 @@ index 44387ed..862e4f9 100644 option_code_hash_lookup(&default_requested_options[3], dhcp_universe.code_hash, &code, 0, MDL); -@@ -141,6 +145,11 @@ isc_result_t read_client_conf () +@@ -144,6 +148,11 @@ isc_result_t read_client_conf () option_code_hash_lookup(&default_requested_options[13], dhcp_universe.code_hash, &code, 0, MDL); @@ -57,10 +56,10 @@ index 44387ed..862e4f9 100644 if (default_requested_options[code] == NULL) log_fatal("Unable to find option definition for " diff --git a/common/dhcp-options.5 b/common/dhcp-options.5 -index d9e1197..2343b19 100644 +index a784b32..86f04ed 100644 --- a/common/dhcp-options.5 +++ b/common/dhcp-options.5 -@@ -110,6 +110,26 @@ hexadecimal, separated by colons. For example: +@@ -117,6 +117,26 @@ hexadecimal, separated by colons. For example: or option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f; .fi @@ -87,7 +86,7 @@ index d9e1197..2343b19 100644 .SH SETTING OPTION VALUES USING EXPRESSIONS Sometimes it's helpful to be able to set the value of a DHCP option based on some value that the client has sent. To do this, you can -@@ -1086,6 +1106,29 @@ dhclient-script will create routes: +@@ -1093,6 +1113,29 @@ dhclient-script will create routes: .RE .PP .nf @@ -118,7 +117,7 @@ index d9e1197..2343b19 100644 [\fB,\fR \fIip-address\fR...]\fB;\fR .fi diff --git a/common/inet.c b/common/inet.c -index c4da73c..981fb92 100644 +index 0f7f168..7c446d4 100644 --- a/common/inet.c +++ b/common/inet.c @@ -519,6 +519,60 @@ free_iaddrcidrnetlist(struct iaddrcidrnetlist **result) { @@ -183,10 +182,10 @@ index c4da73c..981fb92 100644 /* XXX: should use a const pointer rather than passing the structure */ const char * diff --git a/common/options.c b/common/options.c -index fc0e088..3034cf0 100644 +index 92c8fee..66433c4 100644 --- a/common/options.c +++ b/common/options.c -@@ -729,7 +729,11 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket, +@@ -734,7 +734,11 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket, * packet. */ priority_list[priority_len++] = DHO_SUBNET_MASK; @@ -199,7 +198,7 @@ index fc0e088..3034cf0 100644 priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS; priority_list[priority_len++] = DHO_HOST_NAME; priority_list[priority_len++] = DHO_FQDN; -@@ -1804,6 +1808,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) +@@ -1812,6 +1816,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) unsigned long tval; isc_boolean_t a_array = ISC_FALSE; int len_used; @@ -207,7 +206,7 @@ index fc0e088..3034cf0 100644 if (emit_commas) comma = ','; -@@ -1812,6 +1817,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) +@@ -1820,6 +1825,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) memset (enumbuf, 0, sizeof enumbuf); @@ -215,7 +214,7 @@ index fc0e088..3034cf0 100644 /* Figure out the size of the data. */ for (l = i = 0; option -> format [i]; i++, l++) { if (l >= sizeof(fmtbuf) - 1) -@@ -2004,6 +2010,33 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) +@@ -2029,6 +2035,33 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) if (numhunk < 0) numhunk = 1; @@ -249,7 +248,7 @@ index fc0e088..3034cf0 100644 /* Cycle through the array (or hunk) printing the data. */ for (i = 0; i < numhunk; i++) { if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) { -@@ -2159,6 +2192,20 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) +@@ -2197,6 +2230,20 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes) strcpy(op, piaddr(iaddr)); dp += 4; break; @@ -271,12 +270,12 @@ index fc0e088..3034cf0 100644 iaddr.len = 16; memcpy(iaddr.iabuf, dp, 16); diff --git a/common/parse.c b/common/parse.c -index 3ac4ebf..f17bc0b 100644 +index b123a6c..7cf4f2a 100644 --- a/common/parse.c +++ b/common/parse.c @@ -344,6 +344,39 @@ int parse_ip_addr (cfile, addr) return 0; - } + } +/* + * destination-descriptor :== NUMBER DOT NUMBER | @@ -336,7 +335,7 @@ index 3ac4ebf..f17bc0b 100644 case IP6_ADDRESS: type = '6'; break; -@@ -5101,6 +5139,15 @@ int parse_option_token (rv, cfile, fmt, expr, uniform, lookups) +@@ -5124,6 +5162,15 @@ int parse_option_token (rv, cfile, fmt, expr, uniform, lookups) } break; @@ -352,7 +351,7 @@ index 3ac4ebf..f17bc0b 100644 case '6': /* IPv6 address. */ if (!parse_ip6_addr(cfile, &addr)) { return 0; -@@ -5378,6 +5425,13 @@ int parse_option_decl (oc, cfile) +@@ -5401,6 +5448,13 @@ int parse_option_decl (oc, cfile) goto exit; len = ip_addr.len; dp = ip_addr.iabuf; @@ -367,7 +366,7 @@ index 3ac4ebf..f17bc0b 100644 alloc: if (hunkix + len > sizeof hunkbuf) { diff --git a/common/tables.c b/common/tables.c -index d2294c0..f1be07d 100644 +index ce12fcd..96521a6 100644 --- a/common/tables.c +++ b/common/tables.c @@ -45,6 +45,7 @@ HASH_FUNCTIONS (option_code, const unsigned *, struct option, @@ -378,7 +377,7 @@ index d2294c0..f1be07d 100644 6 - IPv6 address l - 32-bit signed integer L - 32-bit unsigned integer -@@ -216,6 +217,7 @@ static struct option dhcp_options[] = { +@@ -223,6 +224,7 @@ static struct option dhcp_options[] = { #endif { "subnet-selection", "I", &dhcp_universe, 118, 1 }, { "domain-search", "D", &dhcp_universe, 119, 1 }, @@ -387,11 +386,11 @@ index d2294c0..f1be07d 100644 { "vivso", "Evendor.", &dhcp_universe, 125, 1 }, #if 0 diff --git a/includes/dhcp.h b/includes/dhcp.h -index 0a74137..95bf539 100644 +index cafe172..5a73129 100644 --- a/includes/dhcp.h +++ b/includes/dhcp.h -@@ -158,6 +158,7 @@ struct dhcp_packet { - #define DHO_ASSOCIATED_IP 92 +@@ -159,6 +159,7 @@ struct dhcp_packet { + #define DHO_V6_ONLY_PREFERRED 108 /* RFC8925 */ #define DHO_SUBNET_SELECTION 118 /* RFC3011! */ #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */ +#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */ @@ -399,10 +398,10 @@ index 0a74137..95bf539 100644 #define DHO_VIVSO_SUBOPTIONS 125 diff --git a/includes/dhcpd.h b/includes/dhcpd.h -index 3632a6b..2ac39ae 100644 +index 4a57002..25e1c72 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h -@@ -2951,6 +2951,7 @@ isc_result_t range2cidr(struct iaddrcidrnetlist **result, +@@ -2967,6 +2967,7 @@ isc_result_t range2cidr(struct iaddrcidrnetlist **result, const struct iaddr *lo, const struct iaddr *hi); isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result); const char *piaddr (struct iaddr); @@ -410,7 +409,7 @@ index 3632a6b..2ac39ae 100644 char *piaddrmask(struct iaddr *, struct iaddr *); char *piaddrcidr(const struct iaddr *, unsigned int); u_int16_t validate_port(char *); -@@ -3169,6 +3170,7 @@ void parse_client_lease_declaration (struct parse *, +@@ -3189,6 +3190,7 @@ void parse_client_lease_declaration (struct parse *, int parse_option_decl (struct option_cache **, struct parse *); void parse_string_list (struct parse *, struct string_list **, int); int parse_ip_addr (struct parse *, struct iaddr *); @@ -419,21 +418,19 @@ index 3632a6b..2ac39ae 100644 void parse_reject_statement (struct parse *, struct client_config *); diff --git a/includes/dhctoken.h b/includes/dhctoken.h -index 7e7215a..b4d93ba 100644 +index 6daa422..3f5334e 100644 --- a/includes/dhctoken.h +++ b/includes/dhctoken.h -@@ -376,8 +376,9 @@ enum dhcp_token { - LEASE_ID_FORMAT = 676, - TOKEN_HEX = 677, +@@ -378,7 +378,8 @@ enum dhcp_token { TOKEN_OCTAL = 678, -- KEY_ALGORITHM = 679 -- BOOTP_BROADCAST_ALWAYS = 680 -+ KEY_ALGORITHM = 679, -+ BOOTP_BROADCAST_ALWAYS = 680, -+ DESTINATION_DESCRIPTOR = 681 + KEY_ALGORITHM = 679, + BOOTP_BROADCAST_ALWAYS = 680, +- DISCONNECT = 681 ++ DESTINATION_DESCRIPTOR = 681, ++ DISCONNECT = 682 }; #define is_identifier(x) ((x) >= FIRST_TOKEN && \ -- -2.14.5 +2.35.1 diff --git a/0013-DHCPv6-over-PPP-support-626514.patch b/0013-DHCPv6-over-PPP-support-626514.patch index 5e0a6ba..a5d03f4 100644 --- a/0013-DHCPv6-over-PPP-support-626514.patch +++ b/0013-DHCPv6-over-PPP-support-626514.patch @@ -1,8 +1,7 @@ -From 234747fbfd6c6429619ba843713d5b39fb4a513d Mon Sep 17 00:00:00 2001 +From fe89d58ea8627c66feffa81997daa024834eeb15 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:33:06 +0100 -Subject: [PATCH 13/26] DHCPv6 over PPP support (#626514) -Cc: pzhukov@redhat.com +Subject: [PATCH 13/28] DHCPv6 over PPP support (#626514) --- client/dhc6.c | 3 ++- @@ -15,10 +14,10 @@ Cc: pzhukov@redhat.com 7 files changed, 54 insertions(+), 5 deletions(-) diff --git a/client/dhc6.c b/client/dhc6.c -index 16a0838..3171828 100644 +index 35cf3d0..88fd07d 100644 --- a/client/dhc6.c +++ b/client/dhc6.c -@@ -5744,7 +5744,8 @@ make_client6_options(struct client_state *client, struct option_state **op, +@@ -5737,7 +5737,8 @@ make_client6_options(struct client_state *client, struct option_state **op, */ if ((oc = lookup_option(&dhcpv6_universe, *op, D6O_CLIENTID)) == NULL) { @@ -29,10 +28,10 @@ index 16a0838..3171828 100644 log_fatal("Failure assembling a DUID."); diff --git a/client/dhclient.c b/client/dhclient.c -index 5d3f5bc..301132c 100644 +index b49fcb3..a99e21f 100644 --- a/client/dhclient.c +++ b/client/dhclient.c -@@ -1202,8 +1202,8 @@ main(int argc, char **argv) { +@@ -1223,8 +1223,8 @@ main(int argc, char **argv) { if (default_duid.buffer != NULL) data_string_forget(&default_duid, MDL); @@ -43,7 +42,7 @@ index 5d3f5bc..301132c 100644 } } -@@ -3956,7 +3956,7 @@ write_options(struct client_state *client, struct option_state *options, +@@ -4202,7 +4202,7 @@ write_options(struct client_state *client, struct option_state *options, * is not how it is intended. Upcoming rearchitecting the client should * address this "one daemon model." */ @@ -52,7 +51,7 @@ index 5d3f5bc..301132c 100644 form_duid(struct data_string *duid, const char *file, int line) { struct interface_info *ip; -@@ -3969,6 +3969,15 @@ form_duid(struct data_string *duid, const char *file, int line) +@@ -4215,6 +4215,15 @@ form_duid(struct data_string *duid, const char *file, int line) if (ip == NULL) log_fatal("Impossible condition at %s:%d.", MDL); @@ -68,7 +67,7 @@ index 5d3f5bc..301132c 100644 if ((ip->hw_address.hlen == 0) || (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf))) log_fatal("Impossible hardware address length at %s:%d.", MDL); -@@ -4014,6 +4023,8 @@ form_duid(struct data_string *duid, const char *file, int line) +@@ -4260,6 +4269,8 @@ form_duid(struct data_string *duid, const char *file, int line) log_info("Created duid %s.", str); dfree(str, MDL); } @@ -78,7 +77,7 @@ index 5d3f5bc..301132c 100644 /* Write the default DUID to the lease store. */ diff --git a/common/bpf.c b/common/bpf.c -index 67b6d64..ffbd09a 100644 +index d2a0549..aede242 100644 --- a/common/bpf.c +++ b/common/bpf.c @@ -650,6 +650,22 @@ get_hw_addr(const char *name, struct hardware *hw) { @@ -105,7 +104,7 @@ index 67b6d64..ffbd09a 100644 log_fatal("Unsupported device type %d for \"%s\"", sa->sdl_type, name); diff --git a/common/lpf.c b/common/lpf.c -index 82a279b..b0ed01c 100644 +index bd20b3f..bb8822a 100644 --- a/common/lpf.c +++ b/common/lpf.c @@ -563,6 +563,22 @@ get_hw_addr(const char *name, struct hardware *hw) { @@ -132,7 +131,7 @@ index 82a279b..b0ed01c 100644 log_fatal("Unsupported device type %ld for \"%s\"", (long int)sa->sa_family, name); diff --git a/includes/dhcp.h b/includes/dhcp.h -index 95bf539..4cc547a 100644 +index 5a73129..7202f1d 100644 --- a/includes/dhcp.h +++ b/includes/dhcp.h @@ -80,6 +80,8 @@ struct dhcp_packet { @@ -145,10 +144,10 @@ index 95bf539..4cc547a 100644 extensions field). */ #define DHCP_OPTIONS_COOKIE "\143\202\123\143" diff --git a/includes/dhcpd.h b/includes/dhcpd.h -index 2ac39ae..faa9251 100644 +index 25e1c72..4c5e877 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h -@@ -3051,7 +3051,7 @@ void client_dns_remove(struct client_state *client, struct iaddr *addr); +@@ -3071,7 +3071,7 @@ void client_dns_remove(struct client_state *client, struct iaddr *addr); void dhcpv4_client_assignments(void); void dhcpv6_client_assignments(void); @@ -158,7 +157,7 @@ index 2ac39ae..faa9251 100644 void dhcp4o6_start(void); diff --git a/server/dhcpv6.c b/server/dhcpv6.c -index a7110f9..c5ce7e8 100644 +index 0ea0532..7d61dc5 100644 --- a/server/dhcpv6.c +++ b/server/dhcpv6.c @@ -482,6 +482,9 @@ generate_new_server_duid(void) { @@ -172,5 +171,5 @@ index a7110f9..c5ce7e8 100644 if (p == NULL) { return ISC_R_UNEXPECTED; -- -2.14.5 +2.35.1 diff --git a/0014-IPoIB-support-660681.patch b/0014-IPoIB-support-660681.patch index a792e4f..b9b15e0 100644 --- a/0014-IPoIB-support-660681.patch +++ b/0014-IPoIB-support-660681.patch @@ -1,24 +1,23 @@ -From 6d74c2d0ceadef2eb1c43c2da47f1d5b732adf8c Mon Sep 17 00:00:00 2001 +From 90d64318e17df066c27b8e99ba6ab7f51154917b Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:34:21 +0100 -Subject: [PATCH 14/26] IPoIB support (#660681) -Cc: pzhukov@redhat.com +Subject: [PATCH 14/28] IPoIB support (#660681) (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #24249]) --- - client/dhclient.c | 32 +++++++ - common/bpf.c | 32 +++++++ + client/dhclient.c | 33 ++++++ + common/bpf.c | 32 ++++++ common/discover.c | 4 +- - common/lpf.c | 262 +++++++++++++++++++++++++++++++++++++++++++++++++----- + common/lpf.c | 274 ++++++++++++++++++++++++++++++++++++++++++---- common/socket.c | 8 +- includes/dhcpd.h | 6 +- - 6 files changed, 315 insertions(+), 29 deletions(-) + 6 files changed, 329 insertions(+), 28 deletions(-) diff --git a/client/dhclient.c b/client/dhclient.c -index 301132c..dc9080e 100644 +index a99e21f..48edddf 100644 --- a/client/dhclient.c +++ b/client/dhclient.c -@@ -205,6 +205,8 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s"; +@@ -211,6 +211,8 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s"; #define DHCLIENT_USAGEH "{--version|--help|-h}" @@ -27,9 +26,9 @@ index 301132c..dc9080e 100644 static void usage(const char *sfmt, const char *sarg) { -@@ -1191,6 +1193,13 @@ main(int argc, char **argv) { +@@ -1213,6 +1215,14 @@ main(int argc, char **argv) { } - srandom(seed + cur_time + (unsigned)getpid()); + srandom(seed); + /* Setup specific Infiniband options */ + for (ip = interfaces; ip; ip = ip->next) { @@ -38,10 +37,11 @@ index 301132c..dc9080e 100644 + setup_ib_interface(ip); + } + } - ++ /* * Establish a default DUID. We always do so for v6 and -@@ -1486,6 +1495,29 @@ int find_subnet (struct subnet **sp, + * do so if desired for v4 via the -D or -i options +@@ -1507,6 +1517,29 @@ int find_subnet (struct subnet **sp, return 0; } @@ -72,7 +72,7 @@ index 301132c..dc9080e 100644 * * Each routine is called from the dhclient_state_machine() in one of diff --git a/common/bpf.c b/common/bpf.c -index ffbd09a..568e3d9 100644 +index aede242..812cac3 100644 --- a/common/bpf.c +++ b/common/bpf.c @@ -237,11 +237,43 @@ int dhcp_bpf_relay_filter_len = @@ -120,10 +120,10 @@ index ffbd09a..568e3d9 100644 struct bpf_insn dhcp_bpf_tr_filter [] = { /* accept all token ring packets due to variable length header */ diff --git a/common/discover.c b/common/discover.c -index 6ef8852..65881fc 100644 +index ed338b4..e562225 100644 --- a/common/discover.c +++ b/common/discover.c -@@ -894,7 +894,7 @@ discover_interfaces(int state) { +@@ -899,7 +899,7 @@ discover_interfaces(int state) { if_register_send(tmp); } else { /* get_hw_addr() was called by register. */ @@ -132,7 +132,7 @@ index 6ef8852..65881fc 100644 } break; #ifdef DHCPv6 -@@ -907,7 +907,7 @@ discover_interfaces(int state) { +@@ -912,7 +912,7 @@ discover_interfaces(int state) { so now we have to call it explicitly to not leave the hardware address unknown (some code expects it cannot be. */ @@ -142,7 +142,7 @@ index 6ef8852..65881fc 100644 if_register_linklocal6(tmp); } diff --git a/common/lpf.c b/common/lpf.c -index b0ed01c..b732a86 100644 +index bb8822a..fcaa13d 100644 --- a/common/lpf.c +++ b/common/lpf.c @@ -45,6 +45,17 @@ @@ -230,7 +230,35 @@ index b0ed01c..b732a86 100644 } } } -@@ -330,6 +353,54 @@ static void lpf_tr_filter_setup (info) +@@ -253,6 +276,18 @@ static void lpf_gen_filter_setup (info) + + memset(&p, 0, sizeof(p)); + ++ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) { ++ p.len = dhcp_ib_bpf_filter_len; ++ p.filter = dhcp_ib_bpf_filter; ++ ++ /* Patch the server port into the LPF program... ++ XXX ++ changes to filter program may require changes ++ to the insn number(s) used below! ++ XXX */ ++ dhcp_ib_bpf_filter[6].k = ntohs (local_port); ++ } else { ++ + /* Set up the bpf filter program structure. This is defined in + bpf.c */ + p.len = dhcp_bpf_filter_len; +@@ -275,6 +310,8 @@ static void lpf_gen_filter_setup (info) + #endif + dhcp_bpf_filter [8].k = ntohs (local_port); + ++ } ++ + if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p, + sizeof p) < 0) { + if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || +@@ -330,6 +367,54 @@ static void lpf_tr_filter_setup (info) #endif /* USE_LPF_RECEIVE */ #ifdef USE_LPF_SEND @@ -285,7 +313,7 @@ index b0ed01c..b732a86 100644 ssize_t send_packet (interface, packet, raw, len, from, to, hto) struct interface_info *interface; struct packet *packet; -@@ -350,6 +421,11 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto) +@@ -350,6 +435,11 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto) return send_fallback (interface, packet, raw, len, from, to, hto); @@ -297,7 +325,7 @@ index b0ed01c..b732a86 100644 if (hto == NULL && interface->anycast_mac_addr.hlen) hto = &interface->anycast_mac_addr; -@@ -370,6 +446,42 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto) +@@ -370,6 +460,42 @@ ssize_t send_packet (interface, packet, raw, len, from, to, hto) #endif /* USE_LPF_SEND */ #ifdef USE_LPF_RECEIVE @@ -340,7 +368,7 @@ index b0ed01c..b732a86 100644 ssize_t receive_packet (interface, buf, len, from, hfrom) struct interface_info *interface; unsigned char *buf; -@@ -408,6 +520,10 @@ ssize_t receive_packet (interface, buf, len, from, hfrom) +@@ -408,6 +534,10 @@ ssize_t receive_packet (interface, buf, len, from, hfrom) }; #endif /* PACKET_AUXDATA */ @@ -351,7 +379,7 @@ index b0ed01c..b732a86 100644 length = recvmsg (interface->rfdesc, &msg, 0); if (length <= 0) return length; -@@ -521,11 +637,33 @@ void maybe_setup_fallback () +@@ -521,11 +651,33 @@ void maybe_setup_fallback () #endif #if defined (USE_LPF_RECEIVE) || defined (USE_LPF_HWADDR) @@ -388,12 +416,8 @@ index b0ed01c..b732a86 100644 if (strlen(name) >= sizeof(tmp.ifr_name)) { log_fatal("Device name too long: \"%s\"", name); -@@ -539,16 +677,61 @@ get_hw_addr(const char *name, struct hardware *hw) { - memset(&tmp, 0, sizeof(tmp)); - strcpy(tmp.ifr_name, name); - if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) { -- log_fatal("Error getting hardware address for \"%s\": %m", -+ log_fatal("Error getting hardware address for \"%s\": %m", +@@ -542,13 +694,58 @@ get_hw_addr(const char *name, struct hardware *hw) { + log_fatal("Error getting hardware address for \"%s\": %m", name); } + close(sock); @@ -453,7 +477,7 @@ index b0ed01c..b732a86 100644 break; case ARPHRD_IEEE802: #ifdef ARPHRD_IEEE802_TR -@@ -556,18 +739,50 @@ get_hw_addr(const char *name, struct hardware *hw) { +@@ -556,18 +753,50 @@ get_hw_addr(const char *name, struct hardware *hw) { #endif /* ARPHRD_IEEE802_TR */ hw->hlen = 7; hw->hbuf[0] = HTYPE_IEEE802; @@ -508,7 +532,7 @@ index b0ed01c..b732a86 100644 hw->hlen = 0; hw->hbuf[0] = HTYPE_RESERVED; /* 0xdeadbeef should never occur on the wire, -@@ -580,10 +795,13 @@ get_hw_addr(const char *name, struct hardware *hw) { +@@ -580,10 +809,13 @@ get_hw_addr(const char *name, struct hardware *hw) { break; #endif default: @@ -526,10 +550,10 @@ index b0ed01c..b732a86 100644 } #endif diff --git a/common/socket.c b/common/socket.c -index 483eb9c..6e1caac 100644 +index 3953eac..903d034 100644 --- a/common/socket.c +++ b/common/socket.c -@@ -350,7 +350,7 @@ void if_register_send (info) +@@ -358,7 +358,7 @@ void if_register_send (info) info->wfdesc = if_register_socket(info, AF_INET, 0, NULL); /* If this is a normal IPv4 address, get the hardware address. */ if (strcmp(info->name, "fallback") != 0) @@ -538,7 +562,7 @@ index 483eb9c..6e1caac 100644 #if defined (USE_SOCKET_FALLBACK) /* Fallback only registers for send, but may need to receive as well. */ -@@ -413,7 +413,7 @@ void if_register_receive (info) +@@ -421,7 +421,7 @@ void if_register_receive (info) #endif /* IP_PKTINFO... */ /* If this is a normal IPv4 address, get the hardware address. */ if (strcmp(info->name, "fallback") != 0) @@ -547,7 +571,7 @@ index 483eb9c..6e1caac 100644 if (!quiet_interface_discovery) log_info ("Listening on Socket/%s%s%s", -@@ -567,7 +567,7 @@ if_register6(struct interface_info *info, int do_multicast) { +@@ -577,7 +577,7 @@ if_register6(struct interface_info *info, int do_multicast) { if (req_multi) if_register_multicast(info); @@ -556,7 +580,7 @@ index 483eb9c..6e1caac 100644 if (!quiet_interface_discovery) { if (info->shared_network != NULL) { -@@ -623,7 +623,7 @@ if_register_linklocal6(struct interface_info *info) { +@@ -633,7 +633,7 @@ if_register_linklocal6(struct interface_info *info) { info->rfdesc = sock; info->wfdesc = sock; @@ -566,7 +590,7 @@ index 483eb9c..6e1caac 100644 if (!quiet_interface_discovery) { if (info->shared_network != NULL) { diff --git a/includes/dhcpd.h b/includes/dhcpd.h -index faa9251..0c1a0aa 100644 +index 4c5e877..e9e52e7 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -485,6 +485,9 @@ struct packet { @@ -579,7 +603,7 @@ index faa9251..0c1a0aa 100644 struct hardware { u_int8_t hlen; u_int8_t hbuf[HARDWARE_ADDR_LEN + 1]; -@@ -1365,6 +1368,7 @@ struct interface_info { +@@ -1380,6 +1383,7 @@ struct interface_info { struct shared_network *shared_network; /* Networks connected to this interface. */ struct hardware hw_address; /* Its physical address. */ @@ -587,7 +611,7 @@ index faa9251..0c1a0aa 100644 struct in_addr *addresses; /* Addresses associated with this * interface. */ -@@ -2633,7 +2637,7 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t); +@@ -2649,7 +2653,7 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t); #endif const char *print_time(TIME); @@ -597,5 +621,5 @@ index faa9251..0c1a0aa 100644 const char *file, int line); char *format_lease_id(const unsigned char *s, unsigned len, int format, -- -2.14.5 +2.35.1 diff --git a/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch b/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch index 1f88d7d..d5596b8 100644 --- a/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch +++ b/0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch @@ -1,19 +1,18 @@ -From 3d3e442ed1316930a5360e4d5a56b46a42a29419 Mon Sep 17 00:00:00 2001 +From 3baf35269555e2223dbd1733cb1c475cb7f2ed7a Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:35:47 +0100 -Subject: [PATCH 15/26] Add GUID/DUID to dhcpd logs (#1064416) -Cc: pzhukov@redhat.com +Subject: [PATCH 15/28] Add GUID/DUID to dhcpd logs (#1064416) --- - client/dhclient.c | 75 ++++++++++++++++++++++++++++++++++++++++++---------- - server/dhcp.c | 78 +++++++++++++++++++++++++++++++++---------------------- - 2 files changed, 108 insertions(+), 45 deletions(-) + client/dhclient.c | 70 ++++++++++++++++++++++++++++++++++-------- + server/dhcp.c | 78 ++++++++++++++++++++++++++++------------------- + 2 files changed, 105 insertions(+), 43 deletions(-) diff --git a/client/dhclient.c b/client/dhclient.c -index dc9080e..8e57da9 100644 +index 48edddf..181f6e1 100644 --- a/client/dhclient.c +++ b/client/dhclient.c -@@ -1170,6 +1170,26 @@ main(int argc, char **argv) { +@@ -1176,6 +1176,26 @@ main(int argc, char **argv) { } } @@ -40,60 +39,56 @@ index dc9080e..8e57da9 100644 /* At this point, all the interfaces that the script thinks are relevant should be running, so now we once again call discover_interfaces(), and this time ask it to actually set -@@ -1184,14 +1204,36 @@ main(int argc, char **argv) { - Not much entropy, but we're booting, so we're not likely to - find anything better. */ - seed = 0; -+ int seed_flag = 0; - for (ip = interfaces; ip; ip = ip->next) { - int junk; -+ if ( ip -> hw_address.hlen <= sizeof seed ) -+ continue; - memcpy(&junk, - &ip->hw_address.hbuf[ip->hw_address.hlen - - sizeof seed], sizeof seed); - seed += junk; -+ seed_flag = 1; - } -- srandom(seed + cur_time + (unsigned)getpid()); -+ if ( seed_flag == 0 ) { -+ if ( backup_seed != 0 ) { -+ seed = backup_seed; -+ log_info ("xid: rand init seed (0x%x) built using all" -+ " available interfaces",seed); -+ } -+ else { -+ seed = cur_time^((unsigned) gethostid()) ; -+ log_info ("xid: warning: no netdev with useable HWADDR found" -+ " for seed's uniqueness enforcement"); -+ log_info ("xid: rand init seed (0x%x) built using gethostid", -+ seed); -+ } -+ /* we only use seed and no current time as a broadcast reply */ -+ /* will certainly be used by the hwaddrless interface */ -+ srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid()); -+ } -+ else -+ srandom(seed + ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid()); +@@ -1204,14 +1224,34 @@ main(int argc, char **argv) { + Not much entropy, but we're booting, so we're not likely to + find anything better. */ - /* Setup specific Infiniband options */ - for (ip = interfaces; ip; ip = ip->next) { -@@ -1746,10 +1788,10 @@ void dhcpack (packet) - #endif ++ int seed_flag = 0; + for (ip = interfaces; ip; ip = ip->next) { + int junk; ++ if ( ip -> hw_address.hlen <= sizeof seed ) ++ continue; + memcpy(&junk, + &ip->hw_address.hbuf[ip->hw_address.hlen - + sizeof seed], sizeof seed); + seed += junk; ++ seed_flag = 1; + } +- seed += cur_time + (unsigned)getpid(); ++ if ( seed_flag == 0 ) { ++ if ( backup_seed != 0 ) { ++ seed = backup_seed; ++ log_info ("xid: rand init seed (0x%x) built using all" ++ " available interfaces",seed); ++ } ++ else { ++ seed = cur_time^((unsigned) gethostid()) ; ++ log_info ("xid: warning: no netdev with useable HWADDR found" ++ " for seed's uniqueness enforcement"); ++ log_info ("xid: rand init seed (0x%x) built using gethostid", ++ seed); ++ } ++ /* we only use seed and no current time as a broadcast reply */ ++ /* will certainly be used by the hwaddrless interface */ ++ } ++ seed += ((unsigned)(cur_tv.tv_usec * 1000000)) + (unsigned)getpid(); + } + srandom(seed); + +@@ -1869,9 +1909,10 @@ void dhcpack (packet) return; } -- -- log_info ("DHCPACK of %s from %s", -- inet_ntoa(packet->raw->yiaddr), -- piaddr (packet->client_addr)); -+ log_info ("DHCPACK of %s from %s (xid=0x%x)", -+ inet_ntoa(packet->raw->yiaddr), -+ piaddr (packet -> client_addr), -+ ntohl(client -> xid)); - lease = packet_to_lease (packet, client); - if (!lease) { -@@ -2669,7 +2711,7 @@ void dhcpnak (packet) +- log_info ("DHCPACK of %s from %s", ++ log_info ("DHCPACK of %s from %s (xid=0x%x)", + inet_ntoa(packet->raw->yiaddr), +- piaddr (packet->client_addr)); ++ piaddr (packet -> client_addr), ++ ntohl(client -> xid)); + + /* Check v6only first. */ + v6only_wait = check_v6only(packet, client); +@@ -2825,7 +2866,7 @@ void dhcpnak (packet) return; } @@ -102,7 +97,7 @@ index dc9080e..8e57da9 100644 if (!client -> active) { #if defined (DEBUG) -@@ -2802,10 +2844,10 @@ void send_discover (cpp) +@@ -2958,10 +2999,10 @@ void send_discover (cpp) (long)(client -> interval)); } else #endif @@ -115,7 +110,7 @@ index dc9080e..8e57da9 100644 /* Send out a packet. */ #if defined(DHCPv6) && defined(DHCP4o6) -@@ -3108,10 +3150,12 @@ void send_request (cpp) +@@ -3355,10 +3396,12 @@ void send_request (cpp) } strncpy(rip_buf, rip_str, sizeof(rip_buf)-1); @@ -130,7 +125,7 @@ index dc9080e..8e57da9 100644 #if defined(DHCPv6) && defined(DHCP4o6) if (dhcpv4_over_dhcpv6) { -@@ -3168,11 +3212,13 @@ void send_decline (cpp) +@@ -3415,11 +3458,13 @@ void send_decline (cpp) log_info ("DHCPDECLINE"); } else #endif @@ -146,7 +141,7 @@ index dc9080e..8e57da9 100644 /* Send out a packet. */ #if defined(DHCPv6) && defined(DHCP4o6) -@@ -3231,11 +3277,12 @@ void send_release (cpp) +@@ -3478,11 +3523,12 @@ void send_release (cpp) log_info ("DHCPRELEASE"); } else #endif @@ -162,10 +157,10 @@ index dc9080e..8e57da9 100644 #if defined(DHCPv6) && defined(DHCP4o6) if (dhcpv4_over_dhcpv6) { diff --git a/server/dhcp.c b/server/dhcp.c -index 20f2a62..0582c4c 100644 +index ae805a6..8363840 100644 --- a/server/dhcp.c +++ b/server/dhcp.c -@@ -87,6 +87,42 @@ const int dhcp_type_name_max = ((sizeof dhcp_type_names) / sizeof (char *)); +@@ -93,6 +93,42 @@ const int dhcp_type_name_max = ((sizeof dhcp_type_names) / sizeof (char *)); static TIME leaseTimeCheck(TIME calculated, TIME alternate); @@ -208,7 +203,7 @@ index 20f2a62..0582c4c 100644 void dhcp (struct packet *packet) { int ms_nulltp = 0; -@@ -129,9 +165,7 @@ dhcp (struct packet *packet) { +@@ -135,9 +171,7 @@ dhcp (struct packet *packet) { log_info("%s from %s via %s: %s", s, (packet->raw->htype @@ -219,7 +214,7 @@ index 20f2a62..0582c4c 100644 : ""), packet->raw->giaddr.s_addr ? inet_ntoa(packet->raw->giaddr) -@@ -328,9 +362,7 @@ void dhcpdiscover (packet, ms_nulltp) +@@ -334,9 +368,7 @@ void dhcpdiscover (packet, ms_nulltp) #endif snprintf (msgbuf, sizeof msgbuf, "DHCPDISCOVER from %s %s%s%svia %s", (packet -> raw -> htype @@ -230,7 +225,7 @@ index 20f2a62..0582c4c 100644 : (lease ? print_hex_1(lease->uid_len, lease->uid, 60) : "")), -@@ -542,9 +574,7 @@ void dhcprequest (packet, ms_nulltp, ip_lease) +@@ -548,9 +580,7 @@ void dhcprequest (packet, ms_nulltp, ip_lease) "DHCPREQUEST for %s%s from %s %s%s%svia %s", piaddr (cip), smbuf, (packet -> raw -> htype @@ -241,7 +236,7 @@ index 20f2a62..0582c4c 100644 : (lease ? print_hex_1(lease->uid_len, lease->uid, 60) : "")), -@@ -785,9 +815,7 @@ void dhcprelease (packet, ms_nulltp) +@@ -791,9 +821,7 @@ void dhcprelease (packet, ms_nulltp) if ((oc = lookup_option (&dhcp_universe, packet -> options, DHO_DHCP_REQUESTED_ADDRESS))) { log_info ("DHCPRELEASE from %s specified requested-address.", @@ -252,7 +247,7 @@ index 20f2a62..0582c4c 100644 } oc = lookup_option (&dhcp_universe, packet -> options, -@@ -879,9 +907,7 @@ void dhcprelease (packet, ms_nulltp) +@@ -885,9 +913,7 @@ void dhcprelease (packet, ms_nulltp) "DHCPRELEASE of %s from %s %s%s%svia %s (%sfound)", cstr, (packet -> raw -> htype @@ -263,7 +258,7 @@ index 20f2a62..0582c4c 100644 : (lease ? print_hex_1(lease->uid_len, lease->uid, 60) : "")), -@@ -986,9 +1012,7 @@ void dhcpdecline (packet, ms_nulltp) +@@ -992,9 +1018,7 @@ void dhcpdecline (packet, ms_nulltp) "DHCPDECLINE of %s from %s %s%s%svia %s", piaddr (cip), (packet -> raw -> htype @@ -274,7 +269,7 @@ index 20f2a62..0582c4c 100644 : (lease ? print_hex_1(lease->uid_len, lease->uid, 60) : "")), -@@ -1732,8 +1756,7 @@ void dhcpinform (packet, ms_nulltp) +@@ -1740,8 +1764,7 @@ void dhcpinform (packet, ms_nulltp) /* Report what we're sending. */ snprintf(msgbuf, sizeof msgbuf, "DHCPACK to %s (%s) via", piaddr(cip), (packet->raw->htype && packet->raw->hlen) ? @@ -284,7 +279,7 @@ index 20f2a62..0582c4c 100644 ""); log_info("%s %s", msgbuf, gip.len ? piaddr(gip) : packet->interface->name); -@@ -1918,9 +1941,7 @@ void nak_lease (packet, cip, network_group) +@@ -1926,9 +1949,7 @@ void nak_lease (packet, cip, network_group) #endif log_info ("DHCPNAK on %s to %s via %s", piaddr (*cip), @@ -295,7 +290,7 @@ index 20f2a62..0582c4c 100644 packet -> raw -> giaddr.s_addr ? inet_ntoa (packet -> raw -> giaddr) : packet -> interface -> name); -@@ -3936,7 +3957,7 @@ void dhcp_reply (lease) +@@ -4044,7 +4065,7 @@ void dhcp_reply (lease) ? (state -> offer == DHCPACK ? "DHCPACK" : "DHCPOFFER") : "BOOTREPLY"), piaddr (lease -> ip_addr), @@ -304,7 +299,7 @@ index 20f2a62..0582c4c 100644 ? print_hw_addr (lease -> hardware_addr.hbuf [0], lease -> hardware_addr.hlen - 1, &lease -> hardware_addr.hbuf [1]) -@@ -4497,10 +4518,7 @@ int find_lease (struct lease **lp, +@@ -4605,10 +4626,7 @@ int find_lease (struct lease **lp, if (uid_lease) { if (uid_lease->binding_state == FTS_ACTIVE) { log_error ("client %s has duplicate%s on %s", @@ -316,7 +311,7 @@ index 20f2a62..0582c4c 100644 " leases", (ip_lease -> subnet -> shared_network -> name)); -@@ -4667,9 +4685,7 @@ int find_lease (struct lease **lp, +@@ -4775,9 +4793,7 @@ int find_lease (struct lease **lp, log_error("uid lease %s for client %s is duplicate " "on %s", piaddr(uid_lease->ip_addr), @@ -328,5 +323,5 @@ index 20f2a62..0582c4c 100644 if (!packet -> raw -> ciaddr.s_addr && -- -2.14.5 +2.35.1 diff --git a/0016-Turn-on-creating-sending-of-DUID.patch b/0016-Turn-on-creating-sending-of-DUID.patch index bafffb5..e7f4e7e 100644 --- a/0016-Turn-on-creating-sending-of-DUID.patch +++ b/0016-Turn-on-creating-sending-of-DUID.patch @@ -1,19 +1,18 @@ -From 2f6b827e89305adcff45288c632785ac054adb8e Mon Sep 17 00:00:00 2001 +From 0a0a7e1afa171289b9e9d855c519101bbd71b5fe Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:36:30 +0100 -Subject: [PATCH 16/26] Turn on creating/sending of DUID -Cc: pzhukov@redhat.com +Subject: [PATCH 16/28] Turn on creating/sending of DUID as client identifier with DHCPv4 clients (#560361c#40, rfc4361) --- - client/dhclient.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- + client/dhclient.c | 74 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 4 deletions(-) diff --git a/client/dhclient.c b/client/dhclient.c -index 8e57da9..ccc98e4 100644 +index 181f6e1..444d251 100644 --- a/client/dhclient.c +++ b/client/dhclient.c -@@ -4021,6 +4021,59 @@ write_options(struct client_state *client, struct option_state *options, +@@ -4267,6 +4267,59 @@ write_options(struct client_state *client, struct option_state *options, } } @@ -73,7 +72,7 @@ index 8e57da9..ccc98e4 100644 /* * The "best" default DUID, since we cannot predict any information * about the system (such as whether or not the hardware addresses are -@@ -4041,6 +4094,7 @@ form_duid(struct data_string *duid, const char *file, int line) +@@ -4287,6 +4340,7 @@ form_duid(struct data_string *duid, const char *file, int line) struct interface_info *ip; int len; char *str; @@ -81,7 +80,7 @@ index 8e57da9..ccc98e4 100644 /* For now, just use the first interface on the list. */ ip = interfaces; -@@ -4061,9 +4115,16 @@ form_duid(struct data_string *duid, const char *file, int line) +@@ -4307,9 +4361,16 @@ form_duid(struct data_string *duid, const char *file, int line) (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf))) log_fatal("Impossible hardware address length at %s:%d.", MDL); @@ -101,7 +100,7 @@ index 8e57da9..ccc98e4 100644 /* * 2 bytes for the 'duid type' field. * 2 bytes for the 'htype' field. -@@ -4074,13 +4135,18 @@ form_duid(struct data_string *duid, const char *file, int line) +@@ -4320,13 +4381,18 @@ form_duid(struct data_string *duid, const char *file, int line) len = 4 + (ip->hw_address.hlen - 1); if (duid_type == DUID_LLT) len += 4; @@ -122,5 +121,5 @@ index 8e57da9..ccc98e4 100644 putUShort(duid->buffer->data + 2, ip->hw_address.hbuf[0]); putULong(duid->buffer->data + 4, cur_time - DUID_TIME_EPOCH); -- -2.14.5 +2.35.1 diff --git a/0017-Send-unicast-request-release-via-correct-interface.patch b/0017-Send-unicast-request-release-via-correct-interface.patch index 26c8b96..37482a0 100644 --- a/0017-Send-unicast-request-release-via-correct-interface.patch +++ b/0017-Send-unicast-request-release-via-correct-interface.patch @@ -1,8 +1,7 @@ -From 193c4d7631fd623efa601f52fdab6018bf8be771 Mon Sep 17 00:00:00 2001 +From d45463c2007a78623f2c90c250bb8e2f3e34a852 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:39:36 +0100 -Subject: [PATCH 17/26] Send unicast request/release via correct interface -Cc: pzhukov@redhat.com +Subject: [PATCH 17/28] Send unicast request/release via correct interface (#800561, #1177351) (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #30544]) @@ -11,10 +10,10 @@ Cc: pzhukov@redhat.com 1 file changed, 30 insertions(+) diff --git a/client/dhclient.c b/client/dhclient.c -index ccc98e4..27fde69 100644 +index 444d251..d607975 100644 --- a/client/dhclient.c +++ b/client/dhclient.c -@@ -3171,6 +3171,14 @@ void send_request (cpp) +@@ -3417,6 +3417,14 @@ void send_request (cpp) #endif if (destination.sin_addr.s_addr != INADDR_BROADCAST && fallback_interface) { @@ -29,7 +28,7 @@ index ccc98e4..27fde69 100644 result = send_packet(fallback_interface, NULL, &client->packet, client->packet_length, from, &destination, NULL); -@@ -3180,6 +3188,13 @@ void send_request (cpp) +@@ -3426,6 +3434,13 @@ void send_request (cpp) client->packet_length, fallback_interface->name); } @@ -43,7 +42,7 @@ index ccc98e4..27fde69 100644 } else { /* Send out a packet. */ -@@ -3297,6 +3312,14 @@ void send_release (cpp) +@@ -3543,6 +3558,14 @@ void send_release (cpp) } else #endif if (fallback_interface) { @@ -58,7 +57,7 @@ index ccc98e4..27fde69 100644 result = send_packet(fallback_interface, NULL, &client->packet, client->packet_length, from, &destination, NULL); -@@ -3306,6 +3329,13 @@ void send_release (cpp) +@@ -3552,6 +3575,13 @@ void send_release (cpp) client->packet_length, fallback_interface->name); } @@ -73,5 +72,5 @@ index ccc98e4..27fde69 100644 /* Send out a packet. */ result = send_packet(client->interface, NULL, &client->packet, -- -2.14.5 +2.35.1 diff --git a/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch b/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch index 2ff4030..ec608cd 100644 --- a/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch +++ b/0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch @@ -1,19 +1,18 @@ -From 2277d041692b8ebdf6b86d41e3a0bc0381cd1e47 Mon Sep 17 00:00:00 2001 +From 840c4f2175d14fa485f2a5e50a005847940b7e1f Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:40:51 +0100 -Subject: [PATCH 18/26] No subnet declaration for ' should be info, not +Subject: [PATCH 18/28] No subnet declaration for ' should be info, not error. -Cc: pzhukov@redhat.com --- common/discover.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/common/discover.c b/common/discover.c -index 65881fc..056342c 100644 +index e562225..b4b1959 100644 --- a/common/discover.c +++ b/common/discover.c -@@ -801,9 +801,9 @@ discover_interfaces(int state) { +@@ -806,9 +806,9 @@ discover_interfaces(int state) { /* We must have a subnet declaration for each interface. */ if (!tmp->shared_network && (state == DISCOVER_SERVER)) { @@ -22,10 +21,10 @@ index 65881fc..056342c 100644 if (local_family == AF_INET) { - log_error("No subnet declaration for %s (%s).", + log_info("No subnet declaration for %s (%s).", - tmp->name, + tmp->name, (tmp->addresses == NULL) ? "no IPv4 addresses" : -@@ -818,26 +818,26 @@ discover_interfaces(int state) { +@@ -823,26 +823,26 @@ discover_interfaces(int state) { } else { strcpy(abuf, "no IPv6 addresses"); } @@ -59,5 +58,5 @@ index 65881fc..056342c 100644 } else { log_error ("You must write a %s", -- -2.14.5 +2.35.1 diff --git a/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch b/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch index 3405ea1..95a311c 100644 --- a/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch +++ b/0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch @@ -1,9 +1,8 @@ -From 6ea56e988df1da51f7d0bdd8984b38e40102c17b Mon Sep 17 00:00:00 2001 +From eeb2e5bcedd62f21472da165b80741f8072420cf Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:41:14 +0100 -Subject: [PATCH 19/26] dhclient: write DUID_LLT even in stateless mode +Subject: [PATCH 19/28] dhclient: write DUID_LLT even in stateless mode (#1156356) -Cc: pzhukov@redhat.com (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #38144]) --- @@ -11,10 +10,10 @@ Cc: pzhukov@redhat.com 1 file changed, 3 insertions(+) diff --git a/client/dhclient.c b/client/dhclient.c -index 27fde69..4e5546a 100644 +index d607975..6bbefc7 100644 --- a/client/dhclient.c +++ b/client/dhclient.c -@@ -1442,6 +1442,9 @@ void run_stateless(int exit_mode, u_int16_t port) +@@ -1462,6 +1462,9 @@ void run_stateless(int exit_mode, u_int16_t port) data_string_forget(&default_duid, MDL); form_duid(&default_duid, MDL); @@ -25,5 +24,5 @@ index 27fde69..4e5546a 100644 #ifdef DHCP4o6 -- -2.14.5 +2.35.1 diff --git a/0020-Discover-all-hwaddress-for-xid-uniqueness.patch b/0020-Discover-all-hwaddress-for-xid-uniqueness.patch index c838d7a..8148980 100644 --- a/0020-Discover-all-hwaddress-for-xid-uniqueness.patch +++ b/0020-Discover-all-hwaddress-for-xid-uniqueness.patch @@ -1,8 +1,7 @@ -From 01ce61b8a0331a2f068ca2191bfb897b505c1b9d Mon Sep 17 00:00:00 2001 +From 908ea5f3a45a050a878de16d5acde6eda1b77d9f Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 21 Feb 2019 10:42:50 +0100 -Subject: [PATCH 20/26] Discover all hwaddress for xid uniqueness -Cc: pzhukov@redhat.com +Subject: [PATCH 20/28] Discover all hwaddress for xid uniqueness --- common/discover.c | 2 ++ @@ -11,10 +10,10 @@ Cc: pzhukov@redhat.com 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/common/discover.c b/common/discover.c -index 056342c..e66e1c5 100644 +index b4b1959..96dcdcf 100644 --- a/common/discover.c +++ b/common/discover.c -@@ -648,6 +648,8 @@ discover_interfaces(int state) { +@@ -653,6 +653,8 @@ discover_interfaces(int state) { interface_dereference(&tmp, MDL); tmp = interfaces; /* XXX */ } @@ -24,10 +23,10 @@ index 056342c..e66e1c5 100644 if (dhcp_interface_discovery_hook) { (*dhcp_interface_discovery_hook)(tmp); diff --git a/common/lpf.c b/common/lpf.c -index b732a86..a708a5d 100644 +index fcaa13d..77a5668 100644 --- a/common/lpf.c +++ b/common/lpf.c -@@ -699,8 +699,22 @@ ioctl_get_ll(char *name) +@@ -713,8 +713,22 @@ ioctl_get_ll(char *name) return sll; } @@ -50,7 +49,7 @@ index b732a86..a708a5d 100644 { struct hardware *hw = &info->hw_address; char *name = info->name; -@@ -710,7 +724,8 @@ get_hw_addr(struct interface_info *info) +@@ -724,7 +738,8 @@ get_hw_addr(struct interface_info *info) int sll_allocated = 0; char *dup = NULL; char *colon = NULL; @@ -60,7 +59,7 @@ index b732a86..a708a5d 100644 if (getifaddrs(&ifaddrs) == -1) log_fatal("Failed to get interfaces"); -@@ -794,14 +809,16 @@ get_hw_addr(struct interface_info *info) +@@ -808,14 +823,16 @@ get_hw_addr(struct interface_info *info) hw->hbuf[4] = 0xef; break; #endif @@ -82,10 +81,10 @@ index b732a86..a708a5d 100644 } #endif diff --git a/includes/dhcpd.h b/includes/dhcpd.h -index 0c1a0aa..635c510 100644 +index e9e52e7..fabad01 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h -@@ -2637,7 +2637,10 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t); +@@ -2653,7 +2653,10 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t); #endif const char *print_time(TIME); @@ -97,5 +96,5 @@ index 0c1a0aa..635c510 100644 const char *file, int line); char *format_lease_id(const unsigned char *s, unsigned len, int format, -- -2.14.5 +2.35.1 diff --git a/0021-Load-leases-DB-in-non-replay-mode-only.patch b/0021-Load-leases-DB-in-non-replay-mode-only.patch index d398918..25824fd 100644 --- a/0021-Load-leases-DB-in-non-replay-mode-only.patch +++ b/0021-Load-leases-DB-in-non-replay-mode-only.patch @@ -1,11 +1,14 @@ -commit 50c2b3ba8ce030a47b55dd707bb8a6ab20444a05 -Author: Pavel Zhukov -Date: Thu Feb 21 10:44:06 2019 +0100 +From bdbbb4be07bb33fe083baef2bd0ef38b91c11120 Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov +Date: Thu, 21 Feb 2019 10:44:06 +0100 +Subject: [PATCH 21/28] Load leases DB in non-replay mode only - Load leases DB in non-replay mode only +--- + server/confpars.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/server/confpars.c b/server/confpars.c -index 2743979..6b61964 100644 +index 5a6396b..6e08ad7 100644 --- a/server/confpars.c +++ b/server/confpars.c @@ -134,6 +134,11 @@ isc_result_t read_conf_file (const char *filename, struct group *group, @@ -48,3 +51,6 @@ index 2743979..6b61964 100644 #endif return status; } +-- +2.35.1 + diff --git a/0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch b/0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch index 85ea650..4011c9a 100644 --- a/0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch +++ b/0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch @@ -1,9 +1,8 @@ -From 9975d198a2c02e32c31c3e0f43d2aa79dfa7f508 Mon Sep 17 00:00:00 2001 +From 1f8681acba9ab70fbe17c85e5a1f4ce6a648b55d Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 28 Feb 2019 15:30:21 +0100 -Subject: [PATCH 22/26] dhclient: make sure link-local address is ready in +Subject: [PATCH 22/28] dhclient: make sure link-local address is ready in stateless mode -Cc: pzhukov@redhat.com Bug-url: https://bugzilla.redhat.com/1263466 --- @@ -11,10 +10,10 @@ Bug-url: https://bugzilla.redhat.com/1263466 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/client/dhclient.c b/client/dhclient.c -index 4e5546a..9b65438 100644 +index 6bbefc7..60836b4 100644 --- a/client/dhclient.c +++ b/client/dhclient.c -@@ -937,6 +937,12 @@ main(int argc, char **argv) { +@@ -943,6 +943,12 @@ main(int argc, char **argv) { inaddr_any.s_addr = INADDR_ANY; @@ -27,7 +26,7 @@ index 4e5546a..9b65438 100644 /* Stateless special case. */ if (stateless) { if (release_mode || (wanted_ia_na > 0) || -@@ -953,12 +959,6 @@ main(int argc, char **argv) { +@@ -959,12 +965,6 @@ main(int argc, char **argv) { finish(0); } @@ -40,7 +39,7 @@ index 4e5546a..9b65438 100644 /* Parse any extra command line configuration arguments: */ if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) { arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg); -@@ -1413,20 +1413,30 @@ void run_stateless(int exit_mode, u_int16_t port) +@@ -1433,20 +1433,30 @@ void run_stateless(int exit_mode, u_int16_t port) IGNORE_UNUSED(port); #endif @@ -76,5 +75,5 @@ index 4e5546a..9b65438 100644 /* Parse the lease database. */ read_client_leases(); -- -2.14.5 +2.35.1 diff --git a/0023-option-97-pxe-client-id.patch b/0023-option-97-pxe-client-id.patch index 6cc4328..f254eb6 100644 --- a/0023-option-97-pxe-client-id.patch +++ b/0023-option-97-pxe-client-id.patch @@ -1,8 +1,7 @@ -From 6fd7894ea57791c8eee16c21d19da34b909e016e Mon Sep 17 00:00:00 2001 +From f01a29a90269c98a86accb0923d65aecf5f59b44 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 28 Feb 2019 16:40:38 +0100 -Subject: [PATCH 23/26] option 97 - pxe-client-id -Cc: pzhukov@redhat.com +Subject: [PATCH 23/28] option 97 - pxe-client-id Bug-url: https://bugzilla.redhat.com/1058674 ISC-Bugs #38110 @@ -18,10 +17,10 @@ ISC-Bugs #38110 8 files changed, 69 insertions(+), 16 deletions(-) diff --git a/common/options.c b/common/options.c -index 3034cf0..686dd12 100644 +index 66433c4..4e26094 100644 --- a/common/options.c +++ b/common/options.c -@@ -4465,13 +4465,26 @@ int validate_packet(struct packet *packet) +@@ -4551,13 +4551,26 @@ int validate_packet(struct packet *packet) "a future version of ISC DHCP will reject this"); } } else { @@ -56,10 +55,10 @@ index 3034cf0..686dd12 100644 } diff --git a/common/tables.c b/common/tables.c -index f1be07d..4419220 100644 +index 96521a6..8034d94 100644 --- a/common/tables.c +++ b/common/tables.c -@@ -196,8 +196,9 @@ static struct option dhcp_options[] = { +@@ -200,8 +200,9 @@ static struct option dhcp_options[] = { /* Defined by RFC 4578 */ { "pxe-system-type", "Sa", &dhcp_universe, 93, 1 }, { "pxe-interface-id", "BBB", &dhcp_universe, 94, 1 }, @@ -71,7 +70,7 @@ index f1be07d..4419220 100644 #if defined(RFC4776_OPTIONS) { "geoconf-civic", "X", &dhcp_universe, 99, 1 }, diff --git a/includes/dhcp.h b/includes/dhcp.h -index 4cc547a..4eb9791 100644 +index 7202f1d..4ad3874 100644 --- a/includes/dhcp.h +++ b/includes/dhcp.h @@ -158,6 +158,7 @@ struct dhcp_packet { @@ -79,14 +78,14 @@ index 4cc547a..4eb9791 100644 #define DHO_CLIENT_LAST_TRANSACTION_TIME 91 #define DHO_ASSOCIATED_IP 92 +#define DHO_PXE_CLIENT_ID 97 /* RFC4578 */ + #define DHO_V6_ONLY_PREFERRED 108 /* RFC8925 */ #define DHO_SUBNET_SELECTION 118 /* RFC3011! */ #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */ - #define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */ diff --git a/server/dhcp.c b/server/dhcp.c -index 0582c4c..4e86262 100644 +index 8363840..29d9c69 100644 --- a/server/dhcp.c +++ b/server/dhcp.c -@@ -222,6 +222,10 @@ dhcp (struct packet *packet) { +@@ -228,6 +228,10 @@ dhcp (struct packet *packet) { if (lease -> uid_len) { oc = lookup_option (&dhcp_universe, packet -> options, DHO_DHCP_CLIENT_IDENTIFIER); @@ -97,7 +96,7 @@ index 0582c4c..4e86262 100644 if (!oc) goto nolease; -@@ -820,6 +824,9 @@ void dhcprelease (packet, ms_nulltp) +@@ -826,6 +830,9 @@ void dhcprelease (packet, ms_nulltp) oc = lookup_option (&dhcp_universe, packet -> options, DHO_DHCP_CLIENT_IDENTIFIER); @@ -107,7 +106,7 @@ index 0582c4c..4e86262 100644 memset (&data, 0, sizeof data); if (oc && evaluate_option_cache (&data, packet, (struct lease *)0, -@@ -1331,6 +1338,9 @@ void dhcpinform (packet, ms_nulltp) +@@ -1338,6 +1345,9 @@ void dhcpinform (packet, ms_nulltp) */ oc = lookup_option(&dhcp_universe, packet->options, DHO_DHCP_CLIENT_IDENTIFIER); @@ -117,7 +116,7 @@ index 0582c4c..4e86262 100644 memset(&d1, 0, sizeof(d1)); if (oc && evaluate_option_cache(&d1, packet, NULL, NULL, -@@ -2441,6 +2451,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp) +@@ -2448,6 +2458,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp) can be used. */ oc = lookup_option (&dhcp_universe, packet -> options, DHO_DHCP_CLIENT_IDENTIFIER); @@ -127,7 +126,7 @@ index 0582c4c..4e86262 100644 if (oc && evaluate_option_cache (&d1, packet, lease, (struct client_state *)0, -@@ -3033,6 +3046,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp) +@@ -3040,6 +3053,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp) /* Record the uid, if given... */ oc = lookup_option (&dhcp_universe, packet -> options, DHO_DHCP_CLIENT_IDENTIFIER); @@ -137,7 +136,7 @@ index 0582c4c..4e86262 100644 if (oc && evaluate_option_cache(&d1, packet, lease, NULL, packet->options, state->options, -@@ -4150,6 +4166,9 @@ int find_lease (struct lease **lp, +@@ -4258,6 +4274,9 @@ int find_lease (struct lease **lp, specified unique client identifier. */ oc = lookup_option (&dhcp_universe, packet -> options, DHO_DHCP_CLIENT_IDENTIFIER); @@ -148,7 +147,7 @@ index 0582c4c..4e86262 100644 if (oc && evaluate_option_cache (&client_identifier, diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5 -index 89b5540..4751a8b 100644 +index b7e79ea..2354b1d 100644 --- a/server/dhcpd.conf.5 +++ b/server/dhcpd.conf.5 @@ -1664,10 +1664,12 @@ should be a name identifying the host. If a \fIhostname\fR option is @@ -177,7 +176,7 @@ index 89b5540..4751a8b 100644 parameter for DHCPv6 servers. For example, it is not possible to match a host declaration to a \fIhost-name\fR option. This is diff --git a/server/dhcpleasequery.c b/server/dhcpleasequery.c -index 7be0788..2fee698 100644 +index 0f1d4f7..dae4ae7 100644 --- a/server/dhcpleasequery.c +++ b/server/dhcpleasequery.c @@ -276,7 +276,7 @@ dhcpleasequery(struct packet *packet, int ms_nulltp) { @@ -213,7 +212,7 @@ index 7be0788..2fee698 100644 sizeof(dbg_info), "client-id %s", diff --git a/server/failover.c b/server/failover.c -index 72f7b00..40fa691 100644 +index 5b36d3a..a641e86 100644 --- a/server/failover.c +++ b/server/failover.c @@ -5988,6 +5988,9 @@ int load_balance_mine (struct packet *packet, dhcp_failover_state_t *state) @@ -227,7 +226,7 @@ index 72f7b00..40fa691 100644 if (oc && evaluate_option_cache(&ds, packet, NULL, NULL, diff --git a/server/mdb.c b/server/mdb.c -index 052df67..8851366 100644 +index 60a40e1..2cd5605 100644 --- a/server/mdb.c +++ b/server/mdb.c @@ -129,8 +129,9 @@ static int find_uid_statement (struct executable_statement *esp, @@ -243,5 +242,5 @@ index 052df67..8851366 100644 log_error ("dhcp client identifier may not be %s", "specified conditionally."); -- -2.14.5 +2.35.1 diff --git a/0024-Detect-system-time-changes.patch b/0024-Detect-system-time-changes.patch index cf38d0d..77df3fd 100644 --- a/0024-Detect-system-time-changes.patch +++ b/0024-Detect-system-time-changes.patch @@ -1,8 +1,7 @@ -From 41c6032ace65119e6a400365f7e90283c930afd4 Mon Sep 17 00:00:00 2001 +From a2fb8759ab48c88e3f8df94ae6e156c357d932a2 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 22 Oct 2019 16:23:01 +0200 -Subject: [PATCH 24/26] Detect system time changes -Cc: pzhukov@redhat.com +Subject: [PATCH 24/28] Detect system time changes --- client/dhclient.c | 6 ++++++ @@ -12,10 +11,10 @@ Cc: pzhukov@redhat.com 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/client/dhclient.c b/client/dhclient.c -index 9b65438..44d508a 100644 +index 60836b4..fd18813 100644 --- a/client/dhclient.c +++ b/client/dhclient.c -@@ -5408,6 +5408,12 @@ isc_result_t dhcp_set_control_state (control_object_state_t oldstate, +@@ -5665,6 +5665,12 @@ isc_result_t dhcp_set_control_state (control_object_state_t oldstate, case server_awaken: state_reboot (client); break; @@ -29,7 +28,7 @@ index 9b65438..44d508a 100644 } } diff --git a/common/dispatch.c b/common/dispatch.c -index d7fe200..8a24499 100644 +index 9741ff5..11c1787 100644 --- a/common/dispatch.c +++ b/common/dispatch.c @@ -118,7 +118,6 @@ dispatch(void) @@ -58,7 +57,7 @@ index d7fe200..8a24499 100644 log_fatal ("Dispatch routine failed: %s -- exiting", diff --git a/includes/dhcpd.h b/includes/dhcpd.h -index 635c510..ec6c227 100644 +index fabad01..9663508 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -524,7 +524,8 @@ typedef enum { @@ -72,7 +71,7 @@ index 635c510..ec6c227 100644 typedef struct { diff --git a/server/dhcpd.c b/server/dhcpd.c -index 530a923..4aef16b 100644 +index 845d0cc..3b3bd3b 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -1767,6 +1767,12 @@ isc_result_t dhcp_set_control_state (control_object_state_t oldstate, @@ -89,5 +88,5 @@ index 530a923..4aef16b 100644 return DHCP_R_INVALIDARG; /* Re-entry. */ -- -2.14.5 +2.35.1 diff --git a/0025-bind-Detect-system-time-changes.patch b/0025-bind-Detect-system-time-changes.patch index 80191b2..5a26a6f 100644 --- a/0025-bind-Detect-system-time-changes.patch +++ b/0025-bind-Detect-system-time-changes.patch @@ -1,22 +1,21 @@ -From ef4f5e80d8a1ea1507829ea6f5214f276478f475 Mon Sep 17 00:00:00 2001 +From 8e49f4b460ad20890c63a385c17d3e5decd45a82 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 22 Oct 2019 16:23:24 +0200 -Subject: [PATCH 25/27] bind: Detect system time changes -Cc: pzhukov@redhat.com +Subject: [PATCH 25/28] bind: Detect system time changes --- - bind/bind/lib/isc/include/isc/result.h | 4 ++- - bind/bind/lib/isc/include/isc/util.h | 4 +++ - bind/bind/lib/isc/result.c | 2 ++ - bind/bind/lib/isc/unix/app.c | 41 ++++++++++++++++++++++++++++--- - bind/bind/lib/isc/unix/include/isc/time.h | 20 +++++++++++++++ - bind/bind/lib/isc/unix/time.c | 22 +++++++++++++++++ + .../bind-9.11.36/lib/isc/include/isc/result.h | 4 +- + bind/bind-9.11.36/lib/isc/include/isc/util.h | 4 ++ + bind/bind-9.11.36/lib/isc/result.c | 2 + + bind/bind-9.11.36/lib/isc/unix/app.c | 41 +++++++++++++++++-- + .../lib/isc/unix/include/isc/time.h | 20 +++++++++ + bind/bind-9.11.36/lib/isc/unix/time.c | 22 ++++++++++ 6 files changed, 89 insertions(+), 4 deletions(-) -diff --git a/bind/bind/lib/isc/include/isc/result.h b/bind/bind/lib/isc/include/isc/result.h -index 0389efa..0e35f98 100644 ---- a/bind/bind/lib/isc/include/isc/result.h -+++ b/bind/bind/lib/isc/include/isc/result.h +diff --git a/bind/bind-9.11.36/lib/isc/include/isc/result.h b/bind/bind-9.11.36/lib/isc/include/isc/result.h +index 916641f..51c2468 100644 +--- a/bind/bind-9.11.36/lib/isc/include/isc/result.h ++++ b/bind/bind-9.11.36/lib/isc/include/isc/result.h @@ -89,7 +89,9 @@ #define ISC_R_DISCFULL 67 /*%< disc full */ #define ISC_R_DEFAULT 68 /*%< default */ @@ -28,11 +27,11 @@ index 0389efa..0e35f98 100644 ISC_LANG_BEGINDECLS -diff --git a/bind/bind/lib/isc/include/isc/util.h b/bind/bind/lib/isc/include/isc/util.h -index 973c348..cceeb5e 100644 ---- a/bind/bind/lib/isc/include/isc/util.h -+++ b/bind/bind/lib/isc/include/isc/util.h -@@ -289,6 +289,10 @@ extern void mock_assert(const int result, const char* const expression, +diff --git a/bind/bind-9.11.36/lib/isc/include/isc/util.h b/bind/bind-9.11.36/lib/isc/include/isc/util.h +index 9111c2a..20a05b4 100644 +--- a/bind/bind-9.11.36/lib/isc/include/isc/util.h ++++ b/bind/bind-9.11.36/lib/isc/include/isc/util.h +@@ -325,6 +325,10 @@ extern void mock_assert(const int result, const char* const expression, * Time */ #define TIME_NOW(tp) RUNTIME_CHECK(isc_time_now((tp)) == ISC_R_SUCCESS) @@ -43,10 +42,10 @@ index 973c348..cceeb5e 100644 /*% * Alignment -diff --git a/bind/bind/lib/isc/result.c b/bind/bind/lib/isc/result.c -index a9db132..7c04831 100644 ---- a/bind/bind/lib/isc/result.c -+++ b/bind/bind/lib/isc/result.c +diff --git a/bind/bind-9.11.36/lib/isc/result.c b/bind/bind-9.11.36/lib/isc/result.c +index 887b08c..2106a3a 100644 +--- a/bind/bind-9.11.36/lib/isc/result.c ++++ b/bind/bind-9.11.36/lib/isc/result.c @@ -105,6 +105,7 @@ static const char *description[ISC_R_NRESULTS] = { "disc full", /*%< 67 */ "default", /*%< 68 */ @@ -63,10 +62,10 @@ index a9db132..7c04831 100644 }; #define ISC_RESULT_RESULTSET 2 -diff --git a/bind/bind/lib/isc/unix/app.c b/bind/bind/lib/isc/unix/app.c -index a6e9882..dbd23f7 100644 ---- a/bind/bind/lib/isc/unix/app.c -+++ b/bind/bind/lib/isc/unix/app.c +diff --git a/bind/bind-9.11.36/lib/isc/unix/app.c b/bind/bind-9.11.36/lib/isc/unix/app.c +index 8189c63..4aabaa4 100644 +--- a/bind/bind-9.11.36/lib/isc/unix/app.c ++++ b/bind/bind-9.11.36/lib/isc/unix/app.c @@ -442,15 +442,51 @@ isc__app_ctxonrun(isc_appctx_t *ctx0, isc_mem_t *mctx, isc_task_t *task, static isc_result_t evloop(isc__appctx_t *ctx) { @@ -131,10 +130,10 @@ index a6e9882..dbd23f7 100644 us = isc_time_microdiff(&when, &now); if (us == 0) call_timer_dispatch = true; -diff --git a/bind/bind/lib/isc/unix/include/isc/time.h b/bind/bind/lib/isc/unix/include/isc/time.h -index b864c29..5dd43c9 100644 ---- a/bind/bind/lib/isc/unix/include/isc/time.h -+++ b/bind/bind/lib/isc/unix/include/isc/time.h +diff --git a/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h b/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h +index 03512c1..99e0dfa 100644 +--- a/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h ++++ b/bind/bind-9.11.36/lib/isc/unix/include/isc/time.h @@ -132,6 +132,26 @@ isc_time_isepoch(const isc_time_t *t); *\li 't' is a valid pointer. */ @@ -162,10 +161,10 @@ index b864c29..5dd43c9 100644 isc_result_t isc_time_now(isc_time_t *t); /*%< -diff --git a/bind/bind/lib/isc/unix/time.c b/bind/bind/lib/isc/unix/time.c -index 8edc9df..fe0bb91 100644 ---- a/bind/bind/lib/isc/unix/time.c -+++ b/bind/bind/lib/isc/unix/time.c +diff --git a/bind/bind-9.11.36/lib/isc/unix/time.c b/bind/bind-9.11.36/lib/isc/unix/time.c +index bcca41b..af6ea7f 100644 +--- a/bind/bind-9.11.36/lib/isc/unix/time.c ++++ b/bind/bind-9.11.36/lib/isc/unix/time.c @@ -498,3 +498,25 @@ isc_time_formatISO8601ms(const isc_time_t *t, char *buf, unsigned int len) { t->nanoseconds / NS_PER_MS); } @@ -193,5 +192,5 @@ index 8edc9df..fe0bb91 100644 +}; +#endif -- -2.14.5 +2.35.1 diff --git a/0026-Add-dhclient-5-B-option-description.patch b/0026-Add-dhclient-5-B-option-description.patch index 7ddfacf..b9f5db5 100644 --- a/0026-Add-dhclient-5-B-option-description.patch +++ b/0026-Add-dhclient-5-B-option-description.patch @@ -1,16 +1,18 @@ -commit 6acfd3125546a0e5db8fae8a9964cd2f88bf68c0 -Author: Pavel Zhukov -Date: Tue Oct 22 16:28:04 2019 +0200 +From aa328eef58ff93110f2a52cb3a80002ab8cee36e Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov +Date: Tue, 22 Oct 2019 16:28:04 +0200 +Subject: [PATCH 26/28] Add dhclient(5) -B option description - Add dhclient(5) -B option description - - Bug-Url: https://bugzilla.redhat.com/1764088 +Bug-Url: https://bugzilla.redhat.com/1764088 +--- + client/dhclient.8 | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/client/dhclient.8 b/client/dhclient.8 -index 0145b9f..5226de5 100644 +index bacf3bc..76f0cc0 100644 --- a/client/dhclient.8 +++ b/client/dhclient.8 -@@ -552,6 +552,11 @@ Path to the network configuration script invoked by +@@ -553,6 +553,11 @@ Path to the network configuration script invoked by when it gets a lease. If unspecified, the default .B CLIENTBINDIR/dhclient-script is used. See \fBdhclient-script(8)\fR for a description of this file. @@ -22,3 +24,6 @@ index 0145b9f..5226de5 100644 .PP .SH PORTS During operations the client may use multiple UDP ports +-- +2.35.1 + diff --git a/0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch b/0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch index cde51de..437f916 100644 --- a/0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch +++ b/0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch @@ -1,8 +1,7 @@ -From 8d974fd1f667e1b957ad4092fe66a8bb94f5f8fd Mon Sep 17 00:00:00 2001 +From d1b1f91a7982be28acdfb580996c93aafcc76cc2 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 7 Nov 2019 14:47:45 +0100 -Subject: [PATCH 1/1] Add missed sd notify patch to manage dhcpd with systemd -Cc: pzhukov@redhat.com +Subject: [PATCH 27/28] Add missed sd notify patch to manage dhcpd with systemd --- configure.ac | 11 +++++++++++ @@ -11,10 +10,10 @@ Cc: pzhukov@redhat.com 3 files changed, 35 insertions(+) diff --git a/configure.ac b/configure.ac -index 15fc0d7..0c08000 100644 +index 300117f..f644e71 100644 --- a/configure.ac +++ b/configure.ac -@@ -1014,6 +1014,17 @@ if test x$ldap = xyes || test x$ldapcrypto = xyes || test x$ldap_gssapi = xyes; +@@ -1005,6 +1005,17 @@ if test x$ldap = xyes || test x$ldapcrypto = xyes || test x$ldap_gssapi = xyes; AC_SUBST(LDAP_CFLAGS, [$LDAP_CFLAGS]) fi @@ -33,7 +32,7 @@ index 15fc0d7..0c08000 100644 # AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) & etc). CFLAGS="$CFLAGS $STD_CWARNINGS" diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c -index 7b4f4f1..9eb5bfd 100644 +index 0dc17d6..d3ad31e 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -37,6 +37,10 @@ @@ -47,7 +46,7 @@ index 7b4f4f1..9eb5bfd 100644 TIME default_lease_time = 43200; /* 12 hours... */ TIME max_lease_time = 86400; /* 24 hours... */ struct tree_cache *global_options[256]; -@@ -845,6 +849,14 @@ main(int argc, char **argv) { +@@ -869,6 +873,14 @@ main(int argc, char **argv) { } #endif @@ -63,7 +62,7 @@ index 7b4f4f1..9eb5bfd 100644 dispatch(); diff --git a/server/dhcpd.c b/server/dhcpd.c -index 4aef16b..778ef8d 100644 +index 3b3bd3b..9223d5b 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -60,6 +60,10 @@ gid_t set_gid = 0; @@ -93,5 +92,5 @@ index 4aef16b..778ef8d 100644 * Receive packets and dispatch them... * dispatch() will never return. -- -2.14.5 +2.35.1 diff --git a/0028-Use-system-getaddrinfo-for-dhcp.patch b/0028-Use-system-getaddrinfo-for-dhcp.patch new file mode 100644 index 0000000..b86936e --- /dev/null +++ b/0028-Use-system-getaddrinfo-for-dhcp.patch @@ -0,0 +1,117 @@ +From 9970114f558927564d9c19be969c3c35db3b0edf Mon Sep 17 00:00:00 2001 +From: Pavel Zhukov +Date: Tue, 22 Jun 2021 06:58:40 +0200 +Subject: [PATCH 28/28] Use system getaddrinfo for dhcp + +--- + .../lib/irs/include/irs/netdb.h.in | 94 +++++++++++++++++++ + 1 file changed, 94 insertions(+) + +diff --git a/bind/bind-9.11.36/lib/irs/include/irs/netdb.h.in b/bind/bind-9.11.36/lib/irs/include/irs/netdb.h.in +index 427fef8..74069b5 100644 +--- a/bind/bind-9.11.36/lib/irs/include/irs/netdb.h.in ++++ b/bind/bind-9.11.36/lib/irs/include/irs/netdb.h.in +@@ -150,6 +150,100 @@ struct addrinfo { + #define NI_NUMERICSERV 0x00000008 + #define NI_DGRAM 0x00000010 + ++/* ++ * Define to map into irs_ namespace. ++ */ ++ ++#define IRS_NAMESPACE ++ ++#ifdef IRS_NAMESPACE ++ ++/* ++ * Use our versions not the ones from the C library. ++ */ ++ ++#ifdef getnameinfo ++#undef getnameinfo ++#endif ++#define getnameinfo irs_getnameinfo ++ ++#ifdef getaddrinfo ++#undef getaddrinfo ++#endif ++#define getaddrinfo irs_getaddrinfo ++ ++#ifdef freeaddrinfo ++#undef freeaddrinfo ++#endif ++#define freeaddrinfo irs_freeaddrinfo ++ ++#ifdef gai_strerror ++#undef gai_strerror ++#endif ++#define gai_strerror irs_gai_strerror ++ ++#endif ++ ++extern int getaddrinfo (const char *name, ++ const char *service, ++ const struct addrinfo *req, ++ struct addrinfo **pai); ++extern int getnameinfo (const struct sockaddr *sa, ++ socklen_t salen, char *host, ++ socklen_t hostlen, char *serv, ++ socklen_t servlen, int flags); ++extern void freeaddrinfo (struct addrinfo *ai); ++extern const char *gai_strerror (int ecode); ++ ++/* ++ * Define to map into irs_ namespace. ++ */ ++ ++#define IRS_NAMESPACE ++ ++#ifdef IRS_NAMESPACE ++ ++/* ++ * Use our versions not the ones from the C library. ++ */ ++ ++#ifdef getnameinfo ++#undef getnameinfo ++#endif ++#define getnameinfo irs_getnameinfo ++ ++#ifdef getaddrinfo ++#undef getaddrinfo ++#endif ++#define getaddrinfo irs_getaddrinfo ++ ++#ifdef freeaddrinfo ++#undef freeaddrinfo ++#endif ++#define freeaddrinfo irs_freeaddrinfo ++ ++#ifdef gai_strerror ++#undef gai_strerror ++#endif ++#define gai_strerror irs_gai_strerror ++ ++int ++getaddrinfo(const char *hostname, const char *servname, ++ const struct addrinfo *hints, struct addrinfo **res); ++ ++int ++getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen, ++ char *host, IRS_GETNAMEINFO_BUFLEN_T hostlen, ++ char *serv, IRS_GETNAMEINFO_BUFLEN_T servlen, ++ IRS_GETNAMEINFO_FLAGS_T flags); ++ ++void freeaddrinfo (struct addrinfo *ai); ++ ++IRS_GAISTRERROR_RETURN_T ++gai_strerror(int ecode); ++ ++#endif ++ + /* + * Tell Emacs to use C mode on this file. + * Local variables: +-- +2.35.1 + diff --git a/0030-bind-configure-c99.patch b/0030-bind-configure-c99.patch new file mode 100644 index 0000000..32e16ea --- /dev/null +++ b/0030-bind-configure-c99.patch @@ -0,0 +1,151 @@ +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 +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 + #include + #include +-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 + #include + #include +-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 + #include + #include +-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 + #include + #include +-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 + #include + #include +-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 + #include + #include +-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 + #include + #include +-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 + #include + #include +-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 + #include + #include +-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 + #include + #include +-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 + diff --git 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 new file mode 100644 index 0000000..b809b16 --- /dev/null +++ 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 +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 + diff --git a/CVE-2021-25220.patch b/CVE-2021-25220.patch new file mode 100644 index 0000000..acaef04 --- /dev/null +++ b/CVE-2021-25220.patch @@ -0,0 +1,200 @@ +diff --git a/bind/bind-9.11.36/lib/dns/resolver.c b/bind/bind-9.11.36/lib/dns/resolver.c +index b34cb12..8ae9a99 100644 +--- a/bind/bind-9.11.36/lib/dns/resolver.c ++++ b/bind/bind-9.11.36/lib/dns/resolver.c +@@ -63,6 +63,7 @@ + #include + #include + #include ++#include + + #ifdef WANT_QUERYTRACE + #define RTRACE(m) isc_log_write(dns_lctx, \ +@@ -311,6 +312,8 @@ struct fetchctx { + bool ns_ttl_ok; + uint32_t ns_ttl; + isc_counter_t * qc; ++ dns_fixedname_t fwdfname; ++ dns_name_t *fwdname; + + /*% + * The number of events we're waiting for. +@@ -3389,6 +3392,7 @@ fctx_getaddresses(fetchctx_t *fctx, bool badcache) { + if (result == ISC_R_SUCCESS) { + fwd = ISC_LIST_HEAD(forwarders->fwdrs); + fctx->fwdpolicy = forwarders->fwdpolicy; ++ dns_name_copy(domain, fctx->fwdname, NULL); + if (fctx->fwdpolicy == dns_fwdpolicy_only && + isstrictsubdomain(domain, &fctx->domain)) { + fcount_decr(fctx); +@@ -4418,6 +4422,9 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, + fctx->restarts = 0; + fctx->querysent = 0; + fctx->referrals = 0; ++ ++ fctx->fwdname = dns_fixedname_initname(&fctx->fwdfname); ++ + TIME_NOW(&fctx->start); + fctx->timeouts = 0; + fctx->lamecount = 0; +@@ -4476,8 +4483,10 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type, + domain = dns_fixedname_initname(&fixed); + result = dns_fwdtable_find2(fctx->res->view->fwdtable, fwdname, + domain, &forwarders); +- if (result == ISC_R_SUCCESS) ++ if (result == ISC_R_SUCCESS) { + fctx->fwdpolicy = forwarders->fwdpolicy; ++ dns_name_copy(domain, fctx->fwdname, NULL); ++ } + + if (fctx->fwdpolicy != dns_fwdpolicy_only) { + /* +@@ -6226,6 +6235,112 @@ mark_related(dns_name_t *name, dns_rdataset_t *rdataset, + rdataset->attributes |= DNS_RDATASETATTR_EXTERNAL; + } + ++/* ++ * Returns true if 'name' is external to the namespace for which ++ * the server being queried can answer, either because it's not a ++ * subdomain or because it's below a forward declaration or a ++ * locally served zone. ++ */ ++static inline bool ++name_external(dns_name_t *name, dns_rdatatype_t type, fetchctx_t *fctx) { ++ isc_result_t result; ++ dns_forwarders_t *forwarders = NULL; ++ dns_fixedname_t fixed, zfixed; ++ dns_name_t *fname = dns_fixedname_initname(&fixed); ++ dns_name_t *zfname = dns_fixedname_initname(&zfixed); ++ dns_name_t *apex = NULL; ++ dns_name_t suffix; ++ dns_zone_t *zone = NULL; ++ unsigned int labels; ++ dns_namereln_t rel; ++ /* ++ * The following two variables do not influence code flow; they are ++ * only necessary for calling dns_name_fullcompare(). ++ */ ++ int _orderp = 0; ++ unsigned int _nlabelsp = 0; ++ ++ apex = ISFORWARDER(fctx->addrinfo) ? fctx->fwdname : &fctx->domain; ++ ++ /* ++ * The name is outside the queried namespace. ++ */ ++ rel = dns_name_fullcompare(name, apex, &_orderp, &_nlabelsp); ++ if (rel != dns_namereln_subdomain && rel != dns_namereln_equal) { ++ return (true); ++ } ++ ++ /* ++ * If the record lives in the parent zone, adjust the name so we ++ * look for the correct zone or forward clause. ++ */ ++ labels = dns_name_countlabels(name); ++ if (dns_rdatatype_atparent(type) && labels > 1U) { ++ dns_name_init(&suffix, NULL); ++ dns_name_getlabelsequence(name, 1, labels - 1, &suffix); ++ name = &suffix; ++ } else if (rel == dns_namereln_equal) { ++ /* If 'name' is 'apex', no further checking is needed. */ ++ return (false); ++ } ++ ++ /* ++ * If there is a locally served zone between 'apex' and 'name' ++ * then don't cache. ++ */ ++ LOCK(&fctx->res->view->lock); ++ if (fctx->res->view->zonetable != NULL) { ++ unsigned int options = DNS_ZTFIND_NOEXACT; ++ result = dns_zt_find(fctx->res->view->zonetable, name, options, ++ zfname, &zone); ++ if (zone != NULL) { ++ dns_zone_detach(&zone); ++ } ++ if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) { ++ if (dns_name_fullcompare(zfname, apex, &_orderp, ++ &_nlabelsp) == ++ dns_namereln_subdomain) ++ { ++ UNLOCK(&fctx->res->view->lock); ++ return (true); ++ } ++ } ++ } ++ UNLOCK(&fctx->res->view->lock); ++ ++ /* ++ * Look for a forward declaration below 'name'. ++ */ ++ result = dns_fwdtable_find2(fctx->res->view->fwdtable, name, fname, ++ &forwarders); ++ ++ if (ISFORWARDER(fctx->addrinfo)) { ++ /* ++ * See if the forwarder declaration is better. ++ */ ++ if (result == ISC_R_SUCCESS) { ++ return (!dns_name_equal(fname, fctx->fwdname)); ++ } ++ ++ /* ++ * If the lookup failed, the configuration must have ++ * changed: play it safe and don't cache. ++ */ ++ return (true); ++ } else if (result == ISC_R_SUCCESS && ++ forwarders->fwdpolicy == dns_fwdpolicy_only && ++ !ISC_LIST_EMPTY(forwarders->fwdrs)) ++ { ++ /* ++ * If 'name' is covered by a 'forward only' clause then we ++ * can't cache this repsonse. ++ */ ++ return (true); ++ } ++ ++ return (false); ++} ++ + static isc_result_t + check_section(void *arg, dns_name_t *addname, dns_rdatatype_t type, + dns_section_t section) +@@ -6254,7 +6369,7 @@ check_section(void *arg, dns_name_t *addname, dns_rdatatype_t type, + result = dns_message_findname(rmessage, section, addname, + dns_rdatatype_any, 0, &name, NULL); + if (result == ISC_R_SUCCESS) { +- external = !dns_name_issubdomain(name, &fctx->domain); ++ external = name_external(name, type, fctx); + if (type == dns_rdatatype_a) { + for (rdataset = ISC_LIST_HEAD(name->list); + rdataset != NULL; +@@ -7136,6 +7251,13 @@ answer_response(fetchctx_t *fctx, dns_message_t *message) { + break; + + case dns_namereln_subdomain: ++ /* ++ * Don't accept DNAME from parent namespace. ++ */ ++ if (name_external(name, dns_rdatatype_dname, fctx)) { ++ continue; ++ } ++ + /* + * In-scope DNAME records must have at least + * as many labels as the domain being queried. +@@ -7371,11 +7493,9 @@ answer_response(fetchctx_t *fctx, dns_message_t *message) { + */ + result = dns_message_firstname(message, DNS_SECTION_AUTHORITY); + while (!done && result == ISC_R_SUCCESS) { +- bool external; + name = NULL; + dns_message_currentname(message, DNS_SECTION_AUTHORITY, &name); +- external = !dns_name_issubdomain(name, &fctx->domain); +- if (!external) { ++ if (!name_external(name, dns_rdatatype_ns, fctx)) { + /* + * We expect to find NS or SIG NS rdatasets, and + * nothing else. diff --git a/changelog b/changelog new file mode 100644 index 0000000..f0b60ff --- /dev/null +++ b/changelog @@ -0,0 +1,1432 @@ +* Fri Jan 24 2025 Stepan Broz - 12:4.4.3-16.P1 +- Correct function declarations in server/dhcpv6.c + +* Thu Jan 16 2025 Fedora Release Engineering - 12:4.4.3-15.P1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 17 2024 Fedora Release Engineering - 12:4.4.3-14.P1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 12:4.4.3-13.P1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 12:4.4.3-12.P1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Nov 15 2023 Martin Osvald - 12:4.4.3-11.P1 +- Mark dhcp (sub)packages as deprecated + +* Mon Oct 02 2023 Martin Osvald - 12:4.4.3-10.P1 +- SPDX migration + +* Wed Jul 19 2023 Fedora Release Engineering - 12:4.4.3-9.P1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Apr 24 2023 Arjun Shankar - 12:4.4.3-8.P1 +- Port bind9 configure script to C99 + +* Thu Jan 19 2023 Fedora Release Engineering - 12:4.4.3-7.P1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Nov 03 2022 Martin Osvald - 12:4.4.3-6.P1 +- Fix order of user and group in sysusers file + +* Mon Oct 31 2022 Martin Osvald - 12:4.4.3-5.P1 +- Use systemd-sysusers for dhcp user and group (rhbz#2138822) + +* Wed Oct 05 2022 Martin Osvald - 12:4.4.3-4.P1 +- New version 4.4.3-P1 (rhbz#2132240) +- Fix for CVE-2022-2928 (rhbz#2132429) +- Fix for CVE-2022-2929 (rhbz#2132430) + +* Thu Jul 21 2022 Fedora Release Engineering - 12:4.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Apr 11 2022 Martin Osvald - 12:4.4.3-2 +- Fix for CVE-2021-25220 + +* Thu Mar 10 2022 Martin Osvald - 12:4.4.3-1 +- New version 4.4.3 +- Add keama migration utility + +* Thu Jan 20 2022 Fedora Release Engineering - 12:4.4.2-18.P1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Sep 08 2021 Petr Menšík - 12:4.4.2-17.P1 +- Update to 4.4.2-P1 (#1970903) +- Add source code signature verification +- Updated license tag + +* Wed Sep 08 2021 Petr Menšík - 12:4.4.2-16.b1 +- Allow uninstallation of dhcp-compat package (#2002163) + +* Wed Jul 21 2021 Fedora Release Engineering - 12:4.4.2-15.b1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 22 2021 Pavel Zhukov - 12:4.4.2-14.b1 +- Reformat patches + +* Mon Jun 14 2021 Pavel Zhukov - 12:4.4.2-13.b1 +- Do not use getaddrinfo from rst lib (#1823749) + +* Fri Jun 11 2021 Pavel Zhukov - 12:4.4.2-12.b1 +- Drop compat package finally + +* Thu May 27 2021 Pavel Zhukov - 12:4.4.2-11.b1 +- Fix for CVE-2021-25217 + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 12:4.4.2-10.b1 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Tue Jan 26 2021 Fedora Release Engineering - 12:4.4.2-9.b1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Pavel Zhukov - 12:4.4.2-8.b1 +- Fix IB patch (#1860689) + +* Mon Jul 27 2020 Fedora Release Engineering - 12:4.4.2-7.b1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Apr 22 2020 Pavel Zhukov - 12:4.4.2-6.b1 +- Change upstream URL + +* Fri Feb 21 2020 Pavel Zhukov - 12:4.4.2-5.b1 +- Workarounnd for gcc10 + +* Tue Jan 28 2020 Fedora Release Engineering - 12:4.4.2-4.b1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 6 2020 Pavel Zhukov - 12:4.4.2-3.b1 +- Drop NetworkManager 12-dhcpd script. It's deprecated by wait-online (#1780861) + +* Mon Jan 6 2020 Pavel Zhukov - 12:4.4.2-1.b1 +- Dropped all (pre 4.0.0) changelog +- New version (4.4.2b1) + +* Wed Nov 27 2019 Pavel Zhukov - 12:4.4.1-20 +- Fix leak of file descriptors + +* Mon Nov 11 2019 Pavel Zhukov - 12:4.4.1-19 +- Reword -B option description + +* Thu Nov 7 2019 Pavel Zhukov - 12:4.4.1-18 +- Readd sd-notify patch + +* Thu Aug 22 2019 Lubomir Rintel - 12:4.4.1-17 +- Move the NetworkManager dispatcher script out of /etc + +* Thu Jul 25 2019 Pavel Zhukov - 12:4.4.1-16 +- Split timers patch to bind and dhcp parts + +* Wed Jul 24 2019 Fedora Release Engineering - 12:4.4.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 11 2019 Pavel Zhukov - 12:4.4.1-14 +- Detect time change and request lease renewal + +* Mon May 20 2019 Pavel Zhukov - 12:4.4.1-13 +- Unpack bind prior to patching +- Provide noarch libs + +* Sat May 04 2019 Björn Esser - 12:4.4.1-12 +- rebuilt (bind) + +* Tue Apr 2 2019 Pavel Zhukov - 12:4.4.1-11 +- Specify epoch for obsolete + +* Tue Apr 2 2019 Pavel Zhukov - 12:4.4.1-10 +- Cherry-pick 00b7f9a Specify architecture for provides - + +* Tue Apr 2 2019 Pavel Zhukov - 12:4.4.1-9 +- Move obsolete to common section + +* Wed Mar 27 2019 Pavel Zhukov - 12:4.4.1-8 +- Add sd_notify patch to support systemd notify (1687040) + +* Mon Mar 18 2019 Pavel Zhukov - 12:4.4.1-7 +- Provides specific version of libs + +* Mon Mar 18 2019 Pavel Zhukov - 12:4.4.1-6 +- Obsolete dhcp-libs + +* Wed Mar 13 2019 Pavel Zhukov - 12:4.4.1-5 +- Do not require static libs for non devel installations + +* Thu Feb 28 2019 Pavel Zhukov - 12:4.4.1-3 +- New version 4.4.1 + +* Mon Sep 24 2018 Pavel Zhukov - 12:4.3.6-29 +- Resolves: 1632246 - Do not fail if iface has no hwaddr + +* Thu Aug 30 2018 Pavel Zhukov - 12:4.3.6-28 +- Do not try to map leases file in memory if not in replay mode + +* Fri Jul 13 2018 Petr Menšík - 12:4.3.6-27 +- Update to bind 9.11.4 + +* Thu Jul 12 2018 Fedora Release Engineering - 12:4.3.6-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Pavel Zhukov - 12:4.3.6-25 +- Resolves: 1592239 - Handle dhcp4-change event properly + +* Mon May 21 2018 Pavel Zhukov - 12:4.3.6-24 +- Fix few more shellcheck warnings + +* Fri May 18 2018 Pavel Zhukov - 12:4.3.6-23 +- Get rid of eval in 11-dhclient +- Credits to legolegs user of linux.org.ru + +* Tue May 15 2018 Pavel Zhukov - 12:4.3.6-21 +- Fix for CVE-2018-1111 + +* Fri Apr 6 2018 Pavel Zhukov - 12:4.3.6-20 +- Discover hwaddr for all interfaces for xid uniqueness + +* Wed Mar 21 2018 Pavel Zhukov - 12:4.3.6-19 +- Don't use run-parts for hooks discovery (#1558612) + +* Fri Mar 09 2018 Pavel Zhukov - 12:4.3.6-18 +- Own ldap schema directory (#1553432) + +* Thu Mar 1 2018 Pavel Zhukov - 12:4.3.6-17 +- Fix CVE-2018-5732 CVE-2018-5733 (#1550246) + +* Thu Feb 22 2018 Petr Menšík - 12:4.3.6-16 +- Compile with recent bind includes, that does not include isc/util.h + +* Thu Feb 22 2018 Petr Menšík - 12:4.3.6-15 +- Do not rely on ignoring case sensitivity of VERSION variable + +* Thu Feb 22 2018 Petr Menšík - 12:4.3.6-14 +- Use bind-export-libs package instead of bind99 +- Use isc-config.sh to configure bind libs +- Change requirement to bind-export-devel + +* Thu Feb 22 2018 Pavel Zhukov - 12:4.3.6-13 +- Do not parse sysconfig/network-scripts if initscripts not installed (#1098172) + +* Wed Feb 07 2018 Fedora Release Engineering - 12:4.3.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Feb 03 2018 Igor Gnatenko - 12:4.3.6-11 +- Switch to %%ldconfig_scriptlets + +* Wed Jan 10 2018 Pavel Zhukov - 12:4.3.6-10 +- Use released version + +* Wed Dec 20 2017 Pavel Zhukov - 12:4.3.5-9 +- Change duid_uuid patch to not use std99 feature + +* Fri Dec 8 2017 Pavel Zhukov - 12:4.3.6-8 +- Fix omapi SD leak (#1523547) + +* Thu Nov 9 2017 Pavel Zhukov - 12:4.3.6-7 +- Add patch for proper signal handling with shared context (#1457871) + +* Wed Sep 20 2017 Pavel Zhukov - 12:4.3.6-6 +- Do now override hostname variable in script + +* Sun Sep 10 2017 Peter Robinson 12:4.3.6-5 +- Rebuild for bind 9.9.11 + +* Tue Aug 1 2017 Pavel Zhukov - 12:4.3.6-4 +- Fix typos in dhclient-script + +* Thu Jul 27 2017 Pavel Zhukov - 12:4.3.6-3 +- Recreate /etc/resolv.conf if NetworkManager screwed it up (#1475279) + +* Wed Jul 26 2017 Fedora Release Engineering - 12:4.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + + +* Fri Jul 14 2017 Pavel Zhukov - 12:4.3.6-1 +- New version 4.3.6 + +* Fri Jul 07 2017 Igor Gnatenko - 12:4.3.5-10 +- Rebuild due to bug in RPM (RHBZ #1468476) + +* Mon Jul 03 2017 Petr Menšík - 12:4.3.5-9 +- Rebuild for bind 9.9.10 + +* Wed May 31 2017 Pavel Zhukov - 12:4.3.5-8 +- Drop chown from the post section + +* Tue May 23 2017 Pavel Zhukov - 12:4.3.5-7 +- Don't open ddns port until it's needed. Credits to Petr Menšík for the original idea + +* Wed Apr 19 2017 Dominika Hodovska - 12:4.3.5-5 +- don't build doxygen documentation during modular build + +* Tue Apr 04 2017 Pavel Zhukov - 12:4.3.5-4 +- Add EnvironmentFile parameter for backward compatibility + +* Fri Feb 10 2017 Fedora Release Engineering - 12:4.3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Nov 30 2016 Jiri Popelka - 12:4.3.5-2 +- get BUG_REPORT_URL from /etc/os-release (#1399351) + +* Wed Oct 05 2016 Jiri Popelka - 12:4.3.5-1 +- 4.3.5 + +* Mon Sep 12 2016 Jiri Popelka - 12:4.3.5-0.1b1 +- 4.3.5b1 + +* Wed Aug 03 2016 Jiri Popelka - 12:4.3.4-3 +- [dhclient] rename -R option to --request-options (#1357947) +- [dhclient] rename -timeout option to --timeout + +* Thu May 26 2016 Tomas Hozza - 12:4.3.4-2 +- Rebuild against bind99-9.9.9-P1 + +* Fri Apr 29 2016 Jiri Popelka - 12:4.3.4-1 +- 4.3.4 +- disable systemtap (I don't think anybody ever used it) + +* Wed Mar 23 2016 Zdenek Dohnal zdohnal@redhat.com - 12:4.3.3-13.P1 +- Mentioning the bash script is needed in README.dhclient.d + +* Wed Feb 03 2016 Fedora Release Engineering - 12:4.3.3-12.P1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jan 13 2016 Jiri Popelka - 12:4.3.3-11.P1 +- 4.3.3-P1 - fix for CVE-2015-8605 (#1298077) + +* Wed Dec 16 2015 Tomas Hozza - 12:4.3.3-10 +- Rebuild against bind-9.9.8-P2 + +* Mon Dec 14 2015 Jiri Popelka - 12:4.3.3-9 +- implement DUID-UUID (RFC 6355) and make it default DUID type (#560361#60) + +* Tue Nov 24 2015 Jiri Popelka - 12:4.3.3-8 +- dispatcher.d/12-dhcpd: use reset-failed command + +* Mon Nov 23 2015 Jiri Popelka - 12:4.3.3-7 +- dhclient-script: hostname -> hostnamectl --transient + +* Tue Nov 03 2015 Jiri Popelka - 12:4.3.3-6 +- dhclient-script: source ifcfg-* because of PEERDNS (#1277253) + +* Tue Oct 13 2015 Jiri Popelka - 12:4.3.3-5 +- dhclient-script: fix for gateway not in the end of rfc3442 routes list (#1251644) + +* Tue Oct 13 2015 Jiri Popelka - 12:4.3.3-4 +- dhclient-script: make_resolv_conf(): keep old nameservers + if server sends domain-name/search, but no nameservers (#1269595) + +* Tue Sep 22 2015 Jiri Popelka - 12:4.3.3-3 +- dhclient: make sure link-local address is ready in stateless mode (#1263466) + +* Mon Sep 07 2015 Jiri Popelka - 12:4.3.3-2 +- VLAN ID is only bottom 12-bits of TCI (#1259552) + +* Fri Sep 04 2015 Jiri Popelka - 12:4.3.3-1 +- 4.3.3 + +* Tue Aug 11 2015 Jiri Popelka - 12:4.3.3-0.2b1 +- dhclient-script: respect DEFROUTE/GATEWAYDEV if Classless Static Routes are offered (#1251644) + +* Mon Aug 10 2015 Jiri Popelka - 12:4.3.3-0.1b1 +- 4.3.3b1 +- enable krb5/gssapi authentication for OpenLDAP +- enable support for binary insertion of leases + +* Wed Jul 15 2015 Jiri Popelka - 12:4.3.2-12 +- fix ipcalc requires + +* Tue Jul 14 2015 Jiri Popelka - 12:4.3.2-11 +- remove dependency on initscripts (#1098172) +- make path to resolv.conf configurable (#1086425) + +* Thu Jul 09 2015 Jiri Popelka - 12:4.3.2-10 +- spec cleanup + +* Thu Jul 02 2015 Jiri Popelka - 12:4.3.2-9 +- test upstream fix for #866714 (paranoia.patch) + +* Wed Jun 24 2015 Jiri Popelka - 12:4.3.2-8 +- add more randomness into xid generation (#1195693) + +* Wed Jun 17 2015 Fedora Release Engineering - 12:4.3.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue May 26 2015 Jiri Popelka - 12:4.3.2-6 +- dhclient-script: run also scripts in dhclient-[enter/exit]-hooks.d dir + +* Tue Apr 21 2015 Jiri Popelka - 12:4.3.2-5 +- dhclient-script: add a minute to address lifetimes (#1188423) + +* Mon Apr 13 2015 Jiri Popelka - 12:4.3.2-4 +- dhclient-script: amend previous change (#1210984) + +* Wed Mar 25 2015 Jiri Popelka - 12:4.3.2-3 +- dhclient-script: fix shellcheck.net suggestions + +* Fri Mar 13 2015 Tomas Hozza - 12:4.3.2-2 +- rebuild against bind99 9.9.7 package + +* Thu Mar 05 2015 Jiri Popelka - 12:4.3.2-1 +- 4.3.2 + +* Wed Feb 25 2015 Jiri Popelka - 12:4.3.2-0.6b1 +- correctly set IB's hw->hlen (#1185075) + +* Wed Feb 25 2015 Tomas Hozza - 12:4.3.2-0.5b1 +- Rebuild against bind-9.10.2rc2 + +* Tue Feb 17 2015 Jiri Popelka - 12:4.3.2-0.4b1 +- dhclient-script: use 'ip addr replace' for both BOUND & RENEW + +* Tue Feb 17 2015 Jiri Popelka - 12:4.3.2-0.3b1 +- doc/dhclient/dhclient-enter-hooks for dhclient-script debugging + +* Fri Feb 13 2015 Jiri Popelka - 12:4.3.2-0.2b1 +- dhclient-script: s/addr add/addr replace/ + +* Sun Feb 08 2015 Jiri Popelka - 12:4.3.2-0.1b1 +- 4.3.2b1 + +* Tue Feb 03 2015 Jiri Popelka - 12:4.3.1-21 +- send unicast request/release via correct interface (#800561, #1177351) + +* Mon Feb 02 2015 Tomas Hozza - 12:4.3.1-20 +- rebuild against bind-9.10.2rc1 + +* Wed Jan 14 2015 Tomas Hozza - 12:4.3.1-19 +- rebuild against bind 9.10.1-P1 + +* Thu Dec 18 2014 Jiri Popelka - 12:4.3.1-18 +- dhclient: write DUID_LLT even in stateless mode (#1156356) + +* Wed Dec 17 2014 Jiri Popelka - 12:4.3.1-17 +- option 97 - pxe-client-id (#1058674) + +* Wed Nov 19 2014 Jiri Popelka - 12:4.3.1-16 +- amend post scriptlets for #1120656 + +* Mon Nov 10 2014 Jiri Popelka - 12:4.3.1-15 +- dhclient-script: restorecon calls shouldn't be needed + as we have SELinux transition rules (#1161500) + +* Tue Nov 04 2014 Jiri Popelka - 12:4.3.1-14 +- GSSAPI support for ldap authentication (#1150542) + +* Fri Oct 31 2014 Jiri Popelka - 12:4.3.1-13 +- redefine DHCLIENT_DEFAULT_PREFIX_LEN 64 -> 128 + +* Fri Oct 10 2014 Jiri Popelka - 12:4.3.1-12 +- Relay-forward Message's Hop Limit should be 32 (#1147240) + +* Wed Oct 08 2014 Jiri Popelka - 12:4.3.1-11 +- dhcpd generates spurious responses when seeing requests + from vlans on plain interface (#1150587) + +* Fri Oct 03 2014 Tomas Hozza - 12:4.3.1-10 +- rebuild against bind-9.9.6 + +* Thu Sep 04 2014 Jiri Popelka - 12:4.3.1-9 +- [dhclient -6] infinite preferred/valid lifetime represented as -1 (#1133839) + +* Mon Sep 01 2014 Jiri Popelka - 12:4.3.1-8 +- better obsoletes for server & client + +* Sat Aug 30 2014 Kalev Lember - 12:4.3.1-7 +- Fix dhclient obsoletes version + +* Tue Aug 26 2014 Jiri Popelka - 12:4.3.1-6 +- dhclient-script: another improvement of add_ipv6_addr_with_DAD() + +* Mon Aug 25 2014 Jiri Popelka - 12:4.3.1-5 +- spec: use -D with 'install' +- dhclient-script: IPv6 address which fails DAD is auto-removed when it was + added with valid_lft/preferred_lft other then 'forever' (#1133465) + +* Sat Aug 16 2014 Fedora Release Engineering - 12:4.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Aug 14 2014 Jiri Popelka - 12:4.3.1-3 +- dhclient-script: one more fix for #1129500 + +* Thu Aug 14 2014 Jiri Popelka - 12:4.3.1-2 +- dhclient-script: PREINIT6: make sure link-local address is available (#1129500) + +* Tue Aug 12 2014 Jiri Popelka - 12:4.3.1-1 +- 4.3.1 + +* Tue Aug 05 2014 Jiri Popelka - 12:4.3.1-0.4.b1 +- dhclient-script: it's OK if the arping reply comes from our system (#1116004) + +* Tue Jul 22 2014 Jiri Popelka - 12:4.3.1-0.3.b1 +- Use network-online.target instead of network.target (#1120656) + +* Fri Jul 11 2014 Tom Callaway 12:4.3.1-0.2.b1 +- fix license handling + +* Thu Jul 10 2014 Jiri Popelka - 12:4.3.1-0.1.b1 +- 4.3.1b1 + +* Thu Jun 12 2014 Filipe Brandenburger - 12:4.3.0-15 +- dhclient-script: fix issue with classless static routes that breaks Fedora 20 on GCE cloud (#1102830) + +* Sat Jun 07 2014 Fedora Release Engineering - 12:4.3.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 30 2014 Jiri Popelka - 12:4.3.0-13 +- systemtap: fixed dtrace input file (#1102797) + +* Thu May 29 2014 Jiri Popelka - 12:4.3.0-12 +- dhcp-sd_notify.patch BuildRequires: pkgconfig(libsystemd) + +* Wed May 28 2014 Jiri Popelka - 12:4.3.0-11 +- dhclient-script: fix stateless DHCPv6 mode (#1101149) + +* Wed May 07 2014 Jiri Popelka - 12:4.3.0-10 +- use StandardError=null instead of log_perror.patch + +* Tue Mar 18 2014 Jiri Popelka - 12:4.3.0-9 +- support for sending startup notifications to systemd (#1077666) + +* Fri Mar 07 2014 Jiri Popelka - 12:4.3.0-8 +- rename doc subpackage do devel-doc + +* Mon Mar 03 2014 Jaromír Končický - 12:4.3.0-7 +- added 'doc' package containing doxygen-generated documentation + +* Wed Feb 19 2014 Jiri Popelka - 12:4.3.0-6 +- dhclient: rename our -I option to -C as upstream now uses -I + +* Wed Feb 19 2014 Jiri Popelka - 12:4.3.0-5 +- dhclient-script: don't flush all addresses, just the used one + +* Tue Feb 18 2014 Jiri Popelka - 12:4.3.0-4 +- IPoIB: add GUID/DUID to dhcpd logs (#1064416) + +* Mon Feb 17 2014 Jiri Popelka - 12:4.3.0-3 +- don't try to run tests because there's no atf package since F21 + +* Mon Feb 17 2014 Jiri Popelka - 12:4.3.0-2 +- turn on using of DUID with DHCPv4 clients (#560361,c#40) +- remove default /etc/dhcp/dhclient.conf + +* Tue Feb 04 2014 Jiri Popelka - 12:4.3.0-1 +- 4.3.0 + +* Wed Jan 29 2014 Jiri Popelka - 12:4.3.0-0.7.rc1 +- 4.3.0rc1 + +* Tue Jan 28 2014 Jiri Popelka - 12:4.3.0-0.6.b1 +- don't apply retransmission.patch for now (RHBZ#1026565) + +* Sun Jan 26 2014 Kevin Fenzi 12:4.3.0-0.5.b1 +- Rebuild for new bind + +* Tue Jan 21 2014 Jiri Popelka - 12:4.3.0-0.4.b1 +- 4.3.0b1 +- ship dhcp-lease-list.pl +- dhclient-script: don't ping router (#1055181) + +* Mon Jan 13 2014 Jiri Popelka - 12:4.3.0-0.3.a1 +- update address lifetimes on RENEW/RENEW6 (#1032809) + +* Tue Jan 07 2014 Jiri Popelka - 12:4.3.0-0.2.a1 +- make it actually build + +* Thu Dec 19 2013 Jiri Popelka - 12:4.3.0-0.1.a1 +- 4.3.0a1: requires bind-9.9.5 + +* Thu Nov 21 2013 Jiri Popelka - 12:4.2.5-28 +- dhclient-script: set address lifetimes (#1032809) + +* Thu Nov 14 2013 Jiri Popelka - 12:4.2.5-27 +- dhclient-script(RENEW6|REBIND6): delete old ip6_address if it changed (#1015729) + +* Thu Oct 31 2013 Jiri Popelka - 12:4.2.5-26 +- Provide default /etc/dhcp/dhclient.conf +- Client always sends dhcp-client-identifier (#560361) + +* Thu Oct 24 2013 Jiri Popelka - 12:4.2.5-25 +- use upstream patch for #1001742 ([ISC-Bugs #34784]) + +* Mon Oct 07 2013 Jiri Popelka - 12:4.2.5-24 +- dhcpd rejects the udp packet with checksum=0xffff (#1015997) + +* Fri Sep 27 2013 Jiri Popelka - 12:4.2.5-23 +- 'No subnet declaration for ' should be info, not error +- decrease the sleep in 12-dhcpd due to timeout (#1003695#8) + +* Wed Sep 18 2013 Jiri Popelka - 12:4.2.5-22 +- fix segfault introduced with previous commit + +* Tue Sep 17 2013 Jiri Popelka - 12:4.2.5-21 +- 12-dhcpd: wait a few seconds before restarting services (#1003695) +- another solution for #1001742 (#1005814#c10) + +* Thu Sep 12 2013 Jiri Popelka - 12:4.2.5-20 +- bind DHCPv6 client to link-local address instead of 0 address (#1001742) + +* Mon Aug 26 2013 Jiri Popelka - 12:4.2.5-19 +- don't crash on aliased infiniband interface (#996518) + +* Sun Aug 04 2013 Jiri Popelka - 12:4.2.5-18 +- BuildRequires: systemd due to %%{_unitdir} + +* Mon Jul 29 2013 Jiri Popelka - 12:4.2.5-17 +- 12-dhcpd previously exited with error status 1 (#989207) + +* Mon Jul 15 2013 Tomas Hozza - 12:4.2.5-16 +- rebuild against new bind + +* Tue Jul 02 2013 Jiri Popelka - 12:4.2.5-15 +- fix several memory leaks in omapi (#978420) +- remove send_release.patch (#979510) + +* Tue Jun 18 2013 Jiri Popelka - 12:4.2.5-14 +- rebuilt against bind once more + +* Fri Jun 14 2013 Jiri Popelka - 12:4.2.5-13 +- return /etc/sysconfig/dhcpd back, but do NOT use it (#909733) + +* Tue May 14 2013 Adam Williamson - 12:4.2.5-12 +- rebuild against new bind + +* Tue Apr 30 2013 Jiri Popelka - 12:4.2.5-11 +- add missing conversion specifier in log_fatal() call (#957371) + +* Tue Apr 16 2013 Adam Tkac - 12:4.2.5-10 +- rebuild against new bind + +* Wed Apr 03 2013 Tomas Hozza - 12:4.2.5-9 +- Expose next-server DHCPv4 option to dhclient script + +* Tue Mar 26 2013 Jiri Popelka - 12:4.2.5-8 +- describe -user/-group/-chroot in dhcpd.8 + +* Fri Feb 22 2013 Jiri Popelka - 12:4.2.5-7 +- remove triggerun condition (#895475) + +* Wed Feb 13 2013 Fedora Release Engineering - 12:4.2.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jan 24 2013 Jiri Popelka - 12:4.2.5-5 +- remove missing-ipv6-not-fatal.patch because the concerning code is later + removed with getifaddrs.patch + +* Wed Jan 23 2013 Jiri Popelka - 12:4.2.5-4 +- Make sure range6 is correct for subnet6 where it's declared (#902966) + +* Fri Jan 18 2013 Jiri Popelka - 12:4.2.5-3 +- simplify the previously added triggerun scriptlet + +* Thu Jan 17 2013 Jiri Popelka - 12:4.2.5-2 +- during update convert DHC*ARGS from /etc/sysconfig/dhc* + to /etc/systemd/system/dhc*.service (#895475) +- 12-dhcpd NM dispatcher script now restarts also dhcpd6 service + +* Thu Jan 10 2013 Jiri Popelka - 12:4.2.5-1 +- 4.2.5 + +* Wed Jan 02 2013 Jiri Popelka - 12:4.2.5-0.3.rc1 +- run %%check in Fedora only, there's no atf package in RHEL + +* Thu Dec 20 2012 Jiri Popelka - 12:4.2.5-0.2.rc1 +- don't package ancient contrib/* files + +* Thu Dec 20 2012 Jiri Popelka - 12:4.2.5-0.1.rc1 +- 4.2.5rc1 + - added %%check - upstream unit tests (Automated Test Framework - ATF) + +* Fri Nov 30 2012 Jiri Popelka - 12:4.2.4-23.P2 +- fix two resource leaks in lpf-ib.patch + +* Mon Nov 26 2012 Jiri Popelka - 12:4.2.4-22.P2 +- add After=time-sync.target to dhcpd[6].service (#878293) +- remove groff from BuildRequires (no idea why it's been there) + +* Fri Nov 16 2012 Jiri Popelka - 12:4.2.4-21.P2 +- multiple key statements in zone definition causes inappropriate error (#873794) + +* Fri Oct 26 2012 Jiri Popelka - 12:4.2.4-20.P2 +- fix path to dhcpd6.leases in dhcpd6.conf.sample (#870458) + +* Wed Oct 17 2012 Jiri Popelka - 12:4.2.4-19.P2 +- dhcpd needs to chown leases file created before de-rooting itself (#866714) + +* Thu Oct 11 2012 Adam Tkac - 12:4.2.4-18.P2 +- rebuild against new bind-libs-lite + +* Tue Oct 09 2012 Jiri Popelka - 12:4.2.4-17.P2 +- do-forward-updates statement wasn't recognized (#863646) + +* Wed Sep 26 2012 Jiri Popelka - 12:4.2.4-16.P2 +- dhclient-usage.patch+part of manpages.patch merged with dhclient-options.patch + +* Thu Sep 13 2012 Tomas Hozza - 12:4.2.4-15.P2 +- 4.2.4-P2: fix for CVE-2012-3955 (#856770) + +* Fri Aug 24 2012 Tomas Hozza - 12:4.2.4-14.P1 +- SystemD unit files don't use Environment files any more (#850558) +- NetworkManager dispatcher script doesn't use DHCPDARGS any more + +* Wed Aug 22 2012 Tomas Hozza - 12:4.2.4-13.P1 +- fixed SPEC file so it comply with new systemd-rpm macros guidelines (#850089) + +* Mon Aug 20 2012 Tomas Hozza - 12:4.2.4-12.P1 +- dhclient-script: fixed CONFIG variable value passed to need_config (#848858) +- dhclient-script: calling dhclient-up-hooks after setting up route, gateways + & interface alias (#848869) + +* Fri Aug 17 2012 Jiri Popelka - 12:4.2.4-11.P1 +- don't build libdst, it hasn't been used since 4.2.0 (#849166) + +* Fri Jul 27 2012 Jiri Popelka - 12:4.2.4-10.P1 +- isc_time_nowplusinterval() is not safe with 64-bit time_t (#662254, #789601) + +* Fri Jul 27 2012 Fedora Release Engineering - 12:4.2.4-9.P1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 25 2012 Tomas Hozza - 12:4.2.4-8.P1 +- Dhclient does not correctly parse zero-length options in + dhclient6.leases (#633318) + +* Wed Jul 25 2012 Tomas Hozza - 12:4.2.4-7.P1 +- 4.2.4-P1: fix for CVE-2012-3570 CVE-2012-3571 and CVE-2012-3954 (#842892) + +* Mon Jul 23 2012 Jiri Popelka - 12:4.2.4-6 +- ib.patch: added fall-back method (using ioctl(SIOCGIFHWADDR)) when getting + of HW address with getifaddrs() fails (#626514-c#63, #840601). + +* Mon Jul 23 2012 Tomas Hozza - 12:4.2.4-5 +- Dhcpd does not correctly follow DhcpFailOverPeerDN (#838400) + +* Wed Jul 18 2012 Jiri Popelka - 12:4.2.4-4 +- allow dhcpd to listen on alias interfaces (#840601) + +* Mon Jul 09 2012 Tomas Hozza - 12:4.2.4-3 +- changed list of %%verify on the leases files (#837474) + +* Mon Jun 18 2012 Jiri Popelka - 12:4.2.4-2 +- define $SAVEDIR in dhclient-script (#833054) + +* Wed Jun 06 2012 Jiri Popelka - 12:4.2.4-1 +- 4.2.4 + +* Tue Jun 05 2012 Jiri Popelka - 12:4.2.4-0.8.rc2 +- return prematurely removed 12-dhcpd (NM dispatcher script) (#828522) + +* Fri May 25 2012 Jiri Popelka - 12:4.2.4-0.7.rc2 +- getifaddrs.patch: use HAVE_SA_LEN macro + +* Wed May 23 2012 Jiri Popelka - 12:4.2.4-0.6.rc2 +- 4.2.4rc2 + +* Mon May 07 2012 Jiri Popelka - 12:4.2.4-0.5.rc1 +- dhcpd.service: explicitly add -cf to indicate what conf file we use (#819325) +- no need to copy /etc/*.conf to /etc/dhcp/*.conf in %%prep anymore + +* Tue May 01 2012 Jiri Popelka - 12:4.2.4-0.4.rc1 +- 4.2.4rc1 + +* Thu Apr 26 2012 Jiri Popelka - 12:4.2.4-0.3.b1 +- remove inherit-leases.patch - it's probably not needed anymore (#815355) + +* Wed Apr 18 2012 Jiri Popelka - 12:4.2.4-0.2.b1 +- update paths.patch and source URL + +* Mon Apr 16 2012 Jiri Popelka - 12:4.2.4-0.1.b1 +- 4.2.4b1: noprefixavail.patch merged upstream + +* Fri Mar 30 2012 Jiri Popelka - 12:4.2.3-25.P2 +- move dhclient & dhclient-script from /sbin to /usr/sbin + +* Fri Mar 23 2012 Jiri Popelka - 12:4.2.3-24.P2 +- one more fix (#806342) + +* Fri Mar 23 2012 Jiri Popelka - 12:4.2.3-23.P2 +- improve #449946 fix (#806342) + +* Wed Mar 21 2012 Jiri Popelka - 12:4.2.3-22.P2 +- RFC5970 - DHCPv6 Options for Network Boot (#798735) + +* Wed Mar 21 2012 Jiri Popelka - 12:4.2.3-21.P2 +- don't use fallback_interface when releasing lease (#800561) + +* Wed Mar 21 2012 Jiri Popelka - 12:4.2.3-20.P2 +- use getifaddrs() to scan for interfaces on Linux (#449946) + +* Wed Feb 22 2012 Jiri Popelka - 12:4.2.3-19.P2 +- don't send log messages to the standard error descriptor by default (#790387) + +* Mon Feb 13 2012 Jiri Popelka - 12:4.2.3-18.P2 +- -timeout option (command line) with value 3 or less was driving dhclient mad (#789719) + +* Tue Feb 07 2012 Jiri Popelka - 12:4.2.3-17.P2 +- dhclient-script: install link-local static routes with correct scope (#787318) + +* Wed Feb 1 2012 Adam Williamson - 12:4.2.3-16.P2 +- rebuild for new bind-libs-lite + +* Tue Jan 31 2012 Jiri Popelka - 12:4.2.3-15.P2 +- revert previous change (#782499) +- remove the rest of the sysvinit scriptlets + +* Tue Jan 17 2012 Jiri Popelka - 12:4.2.3-14.P2 +- use PrivateTmp=true in service files (#782499) + +* Fri Jan 13 2012 Jiri Popelka - 12:4.2.3-13.P2 +- 4.2.3-P2: fix for CVE-2011-4868 (#781246) +- clean up old Provides and Obsoletes + +* Fri Jan 13 2012 Fedora Release Engineering - 12:4.2.3-12.P1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Dec 21 2011 Jiri Popelka - 12:4.2.3-11.P1 +- revert change made in 4.2.3-3 because of failing failover inicialization (#765967) + the procedure is now: + init lease file, init failover, init PID file, change effective user/group ID +- don't need to fix lease files ownership before starting service +- dhclient-script: allow static route with a 0.0.0.0 next-hop address (#769463) + +* Tue Dec 20 2011 Jiri Popelka - 12:4.2.3-10.P1 +- hopefully we don't need 12-dhcpd anymore as 'After=network.target' + in dhcpd[6].service should take care of the original problem (#565921) + +* Mon Dec 19 2011 Jiri Popelka - 12:4.2.3-9.P1 +- don't ship legacy SysV initscripts +- dhcpd6: move '-cf /etc/dhcp/dhcpd6.conf' from sysconfig/dhcpd6 to dhcpd6.service +- run 'chown -R dhcpd:dhcpd /var/lib/dhcpd/' before starting dhcpd/dhcpd6 service + for the case where leases file is owned by root:root as a + consequence of running dhcpd without '-user dhcpd -group dhcpd' (#744292) + +* Fri Dec 09 2011 Jiri Popelka - 12:4.2.3-8.P1 +- 4.2.3-P1: fix for CVE-2011-4539 (#765681) + +* Thu Nov 24 2011 Jiri Popelka - 12:4.2.3-7 +- Send DHCPDECLINE and exit(2) when duplicate address was detected and + dhclient had been started with '-1' (#756759). +- Don't build with -D_GNU_SOURCE, configure.ac uses AC_USE_SYSTEM_EXTENSIONS + +* Mon Nov 14 2011 Adam Tkac - 12:4.2.3-6 +- rebuild against new bind + +* Fri Nov 11 2011 Jiri Popelka - 12:4.2.3-5 +- dhclient-script: arping address in BOUND|RENEW|REBIND|REBOOT (#752116) + +* Wed Oct 26 2011 Fedora Release Engineering - 12:4.2.3-4 +- Rebuilt for glibc bug#747377 + +* Wed Oct 26 2011 Jiri Popelka - 12:4.2.3-3 +- Write lease file AFTER changing of the effective user/group ID. +- Move omshell from dhcp-common to main package (where it originally was). + +* Thu Oct 20 2011 Jiri Popelka - 12:4.2.3-2 +- Write PID file BEFORE changing of the effective user/group ID. +- Really define _hardened_build this time + +* Thu Oct 20 2011 Jiri Popelka - 12:4.2.3-1 +- 4.2.3 + +* Tue Oct 18 2011 Jiri Popelka - 12:4.2.3-0.1.rc1 +- 4.2.3rc1 + +* Sun Oct 09 2011 Jiri Popelka - 12:4.2.2-12 +- change ownership of /var/lib/dhcpd/ to dhcpd:dhcpd (#744292) +- no need to drop capabilies in dhcpd since it's been running as regular user + +* Fri Sep 30 2011 Jiri Popelka - 12:4.2.2-11 +- 56dhclient: ifcfg file was not sourced (#742482) + +* Thu Sep 29 2011 Jiri Popelka - 12:4.2.2-10 +- dhclient-script: address alias handling fixes from Scott Shambarger (#741786) + +* Thu Sep 22 2011 Jiri Popelka - 12:4.2.2-9 +- dhclient-script: do not backup&restore /etc/resolv.conf and /etc/localtime. + +* Wed Sep 21 2011 Jiri Popelka - 12:4.2.2-8 +- SystemTap support: spec file change, some dummy probes, tapset, simple script + +* Mon Sep 19 2011 Jiri Popelka - 12:4.2.2-7 +- Support for IPoIB (IP over InfiniBand) interfaces (#660681) +- Hopefully last tweak of adding of user and group (#699713) + +* Fri Sep 09 2011 Jiri Popelka - 12:4.2.2-6 +- PIE-RELRO.patch is not needed anymore, defining _hardened_build does the same +- One more tweak of adding of user and group (#699713) + +* Fri Sep 09 2011 Adam Tkac - 12:4.2.2-5 +- rebuild against new bind + +* Fri Aug 26 2011 Jiri Popelka - 12:4.2.2-4 +- Fix adding of user and group (#699713) + +* Fri Aug 19 2011 Jiri Popelka - 12:4.2.2-3 +- Tighten explicit libs sub-package requirement so that it includes + the correct architecture as well. + +* Fri Aug 12 2011 Jiri Popelka - 12:4.2.2-2 +- #699713: + - Use '--enable-paranoia --enable-early-chroot' configure flags + - Create/delete dhcpd user in %%post/%%postun + - Run dhcpd/dhcpd6 services with '-user dhcpd -group dhcpd' + +* Thu Aug 11 2011 Jiri Popelka - 12:4.2.2-1 +- 4.2.2: fix for CVE-2011-2748, CVE-2011-2749 (#729850) + +* Wed Aug 10 2011 Jiri Popelka - 12:4.2.2-0.4.rc1 +- Do not ship default /etc/dhcp/dhclient.conf (#560361,c#9) + +* Mon Jul 25 2011 Jiri Popelka - 12:4.2.2-0.3.rc1 +- Improve capabilities patch to be able to run with PARANOIA & EARLY_CHROOT (#699713) + +* Mon Jul 18 2011 Jiri Popelka - 12:4.2.2-0.2.rc1 +- 4.2.2rc1 + +* Fri Jul 01 2011 Jiri Popelka - 12:4.2.2-0.1.b1 +- 4.2.2b1: upstream merged initialization-delay.patch +- Drop all capabilities in dhcpd/dhcrelay (#699713) + +* Fri Jun 17 2011 Jiri Popelka - 12:4.2.1-12.P1 +- Removed upstream-merged IFNAMSIZ.patch +- Polished patches according to results from static analysis of code. + +* Thu Jun 16 2011 Jiri Popelka - 12:4.2.1-11.P1 +- Add triggerpostun scriptlet tied to dhcp-sysvinit +- Make it possible to build without downstream patches (Kamil Dudka) + +* Tue May 17 2011 Jiri Popelka - 12:4.2.1-10.P1 +- Fix typo in triggerun scriptlet (#705417) + +* Mon May 16 2011 Jiri Popelka - 12:4.2.1-9.P1 +- Packages dhcp/dhclient/dhcp-common explicitly require the libs sub-package + with the same version and release (bug #705037). +- Fix triggerun scriptlet + +* Mon May 09 2011 Jiri Popelka - 12:4.2.1-8.P1 +- Fix 11-dhclient to export variables (#702735) + +* Fri Apr 29 2011 Jiri Popelka - 12:4.2.1-7.P1 +- Comply with guidelines for systemd services + +* Wed Apr 27 2011 Jiri Popelka - 12:4.2.1-6.P1 +- Fix NetworkManager dispatcher script for dhcpd to support arbitrary interface names + +* Wed Apr 06 2011 Jiri Popelka - 12:4.2.1-5.P1 +- Better fix for CVE-2011-0997: making domain-name check more lenient (#694005) + +* Wed Apr 06 2011 Jiri Popelka - 12:4.2.1-4.P1 +- 4.2.1-P1: fix for CVE-2011-0997 (#694005) + +* Fri Mar 25 2011 Jiri Popelka - 12:4.2.1-3 +- Polished patches according to results from static analysis of code. + +* Mon Mar 07 2011 Rex Dieter - 12:4.2.1-2 +- rebuild (bind) + +* Wed Mar 02 2011 Jiri Popelka - 12:4.2.1-1 +- 4.2.1 + +* Wed Feb 23 2011 Jiri Popelka - 12:4.2.1-0.6.rc1 +- 4.2.1rc1 +- Fixed typo in dhclient.leases(5) (#676284) + +* Mon Feb 21 2011 Adam Tkac - 12:4.2.1-0.5.b1 +- rebuild against new bind-libs-lite + +* Tue Feb 08 2011 Fedora Release Engineering - 12:4.2.1-0.4.b1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 31 2011 Jiri Popelka - 12:4.2.1-0.3.b1 +- Prevent anything under _docdir from being scanned. (#674058) + +* Fri Jan 28 2011 Jiri Popelka - 12:4.2.1-0.2.b1 +- dhclient-script improvements, thanks to Ville Skyttä (#672279) + +* Thu Jan 27 2011 Jiri Popelka - 12:4.2.1-0.1.b1 +- 4.2.1b1: fix for CVE-2011-0413 (#672996) +- No longer need invalid-dhclient-conf, parse_date and release6-elapsed patches + +* Thu Jan 13 2011 Jiri Popelka - 12:4.2.0-26.P2 +- Fix loading of configuration when LDAP is used (#668276) + +* Mon Jan 03 2011 Jiri Popelka - 12:4.2.0-25.P2 +- Fix OMAPI (#666441) + +* Tue Dec 21 2010 Jiri Popelka - 12:4.2.0-24.P2 +- Provide default /etc/dhcp/dhclient.conf +- Client always sends dhcp-client-identifier (#560361) + +* Wed Dec 15 2010 Jiri Popelka - 12:4.2.0-23.P2 +- Add dhcp-common subpackage (#634673) + +* Mon Dec 13 2010 Jiri Popelka - 12:4.2.0-22.P2 +- 4.2.0-P2: fix for CVE-2010-3616 (#662326) +- Use upstream fix for #628258 +- Provide versioned symbols for rpmlint + +* Tue Dec 07 2010 Jiri Popelka - 12:4.2.0-21.P1 +- Porting dhcpd/dhcpd6/dhcrelay services from SysV to Systemd + +* Tue Nov 23 2010 Jiri Popelka - 12:4.2.0-20.P1 +- Remove explicit Obsoletes (#656310) + +* Fri Nov 19 2010 Dan Horák - 12:4.2.0-19.P1 +- fix build on sparc and s390 + +* Tue Nov 09 2010 Jiri Popelka - 12:4.2.0-18.P1 +- Applied Patrik Lahti's patch for DHCPv6 over PPP support (#626514) + +* Fri Nov 05 2010 Jiri Popelka - 12:4.2.0-17.P1 +- fix broken dependencies + +* Thu Nov 04 2010 Jiri Popelka - 12:4.2.0-16.P1 +- 4.2.0-P1: fix for CVE-2010-3611 (#649880) +- dhclient-script: when updating 'search' statement in resolv.conf, + add domain part of hostname if it's not already there (#637763) + +* Wed Oct 20 2010 Adam Tkac - 12:4.2.0-15 +- build dhcp's libraries as shared libs instead of static libs + +* Wed Oct 20 2010 Adam Tkac - 12:4.2.0-14 +- fire away bundled BIND source + +* Wed Oct 20 2010 Adam Tkac - 12:4.2.0-13 +- improve PIE patch (build libraries with -fpic, not with -fpie) + +* Wed Oct 13 2010 Jiri Popelka - 12:4.2.0-12 +- Server was ignoring client's + Solicit (where client included address/prefix as a preference) (#634842) + +* Thu Oct 07 2010 Jiri Popelka - 12:4.2.0-11 +- Use ping instead of arping in dhclient-script to handle + not-on-local-net gateway in ARP-less device (#524298) + +* Thu Oct 07 2010 Jiri Popelka - 12:4.2.0-10 +- Check whether there is any unexpired address in previous lease + prior to confirming (INIT-REBOOT) the lease (#585418) + +* Mon Oct 04 2010 Jiri Popelka - 12:4.2.0-9 +- RFC 3442 - ignore Router option only if + Classless Static Routes option contains default router + +* Thu Sep 30 2010 Jiri Popelka - 12:4.2.0-8 +- Explicitly clear the ARP cache and flush all addresses & routes + instead of bringing the interface down (#574568) + +* Tue Sep 07 2010 Jiri Popelka - 12:4.2.0-7 +- Hardening dhcpd/dhcrelay/dhclient by making them PIE & RELRO + +* Thu Sep 02 2010 Jiri Popelka - 12:4.2.0-6 +- Another fix for handling time values on 64-bit platforms (#628258) + +* Wed Sep 01 2010 Jiri Popelka - 12:4.2.0-5 +- Fix parsing of lease file dates & times on 64-bit platforms (#628258) + +* Tue Aug 31 2010 Jiri Popelka - 12:4.2.0-4 +- RFC 3442 - Classless Static Route Option for DHCPv4 (#516325) + +* Fri Aug 20 2010 Jiri Popelka - 12:4.2.0-3 +- Add DHCRELAYARGS variable to /etc/sysconfig/dhcrelay + +* Fri Jul 30 2010 Jiri Popelka - 12:4.2.0-2 +- Add 12-dhcpd NM dispatcher script (#565921) +- Rename 10-dhclient to 11-dhclient (10-sendmail already exists) + +* Wed Jul 21 2010 Jiri Popelka - 12:4.2.0-1 +- 4.2.0: includes ldap-for-dhcp + +* Mon Jul 12 2010 Jiri Popelka - 12:4.1.1-26.P1 +- Add LICENSE file to dhclient subpackage. + +* Thu Jul 01 2010 Jiri Popelka - 12:4.1.1-25.P1 +- Adhere to Static Library Packaging Guidelines (#609605) + +* Tue Jun 29 2010 Jiri Popelka - 12:4.1.1-24.P1 +- Fix parsing of date (#514828) + +* Thu Jun 03 2010 Jiri Popelka - 12:4.1.1-23.P1 +- 4.1.1-P1: pair of bug fixes including one for CVE-2010-2156 (#601405) +- Compile with -fno-strict-aliasing + +* Mon May 03 2010 Jiri Popelka - 12:4.1.1-22 +- Fix the initialization-delay.patch (#587070) + +* Thu Apr 29 2010 Jiri Popelka - 12:4.1.1-21 +- Cut down the 0-4 second delay before sending first DHCPDISCOVER (#587070) + +* Wed Apr 28 2010 Jiri Popelka - 12:4.1.1-20 +- Move /etc/NetworkManager/dispatcher.d/10-dhclient script + from dhcp to dhclient subpackage (#586999) + +* Wed Apr 28 2010 Jiri Popelka - 12:4.1.1-19 +- Add domain-search to the list of default requested DHCP options (#586906) + +* Wed Apr 21 2010 Jiri Popelka - 12:4.1.1-18 +- If the Reply was received in response to Renew or Rebind message, + client adds any new addresses in the IA option to the IA (#578097) + +* Mon Apr 19 2010 Jiri Popelka - 12:4.1.1-17 +- Fill in Elapsed Time Option in Release/Decline messages (#582939) + +* Thu Mar 25 2010 Jiri Popelka - 12:4.1.1-16 +- In client initiated message exchanges stop retransmission + upon reaching the MRD rather than at some point after it (#559153) + +* Wed Mar 24 2010 Jiri Popelka - 12:4.1.1-15 +- In dhclient-script check whether bound address + passed duplicate address detection (DAD) (#559147) +- If the bound address failed DAD (is found to be in use on the link), + the dhcpv6 client sends a Decline message to the server + as described in section 18.1.7 of RFC-3315 (#559147) + +* Fri Mar 19 2010 Jiri Popelka - 12:4.1.1-14 +- Fix UseMulticast.patch to not repeatedly parse dhcpd.conf for unicast option +- Fix dhclient-script to set interface MTU only when it's greater than 576 (#574629) + +* Fri Mar 12 2010 Jiri Popelka - 12:4.1.1-13 +- Discard unicast Request/Renew/Release/Decline message + (unless we set unicast option) and respond with Reply + with UseMulticast Status Code option (#573090) +- Remove DHCPV6 OPERATION section from dhclient.conf.5 + describing deprecated 'send dhcp6.oro' syntax + +* Thu Feb 25 2010 Jiri Popelka - 12:4.1.1-12 +- Fix paths in man pages (#568031) +- Remove odd tests in %%preun + +* Mon Feb 22 2010 Jiri Popelka - 12:4.1.1-11 +- Add interface-mtu to the list of default requested DHCP options (#566873) + +* Fri Feb 19 2010 Jiri Popelka - 12:4.1.1-10 +- Fix pm-utils/sleep.d/ directory ownership conflict + +* Fri Feb 19 2010 Jiri Popelka - 12:4.1.1-9 +- In dhclient-script: + - use ip command options '-4' or '-6' as shortcuts for '-f[amily] inet' resp. '-f[amily] inet6' + - do not use IP protocol family identifier with 'ip link' + +* Thu Feb 18 2010 Jiri Popelka - 12:4.1.1-8 +- Fix installation of pm-utils script (#479639, c#16) + +* Tue Feb 16 2010 Jiri Popelka - 12:4.1.1-7 +- ldap-for-dhcp-4.1.1-2 (#564810) + +* Tue Feb 16 2010 Jiri Popelka - 12:4.1.1-6 +- Fix ldap patch to explicitly link with liblber (#564810) + +* Mon Feb 08 2010 Jiri Popelka - 12:4.1.1-5 +- Fix dhclient-decline-backoff.patch (#562854) + +* Fri Feb 05 2010 Jiri Popelka - 12:4.1.1-4 +- Fix dhclient-script to delete address which the client is going to release + as soon as it begins the Release message exchange process (#559142) + +* Wed Feb 03 2010 Jiri Popelka - 12:4.1.1-3 +- move /etc/dhcp.conf to /etc/dhcp.conf.rpmsave in %%post (#561094) +- document -nc option in dhclient(8) man page + +* Tue Feb 02 2010 Jiri Popelka - 12:4.1.1-2 +- Fix capability patch (#546765) + +* Wed Jan 20 2010 Jiri Popelka - 12:4.1.1-1 +- Upgraded to ISC dhcp-4.1.1 + +* Mon Jan 18 2010 Jiri Popelka - 12:4.1.0p1-18 +- Hide startup info when starting dhcpd6 service. +- Remove -TERM from calling killproc when stopping dhcrelay (#555672) + +* Fri Jan 15 2010 Jiri Popelka - 12:4.1.0p1-17 +- Added init script to also start dhcpd for IPv6 (#552453) +- Added dhcpd6.conf.sample + +* Thu Jan 07 2010 Jiri Popelka - 12:4.1.0p1-16 +- Use %%global instead of %%define. + +* Mon Dec 14 2009 Jiri Popelka - 12:4.1.0p1-15 +- dhclient logs its pid to make troubleshooting NM managed systems + with multiple dhclients running easier (#546792) + +* Mon Nov 23 2009 Jiri Popelka - 12:4.1.0p1-14 +- Honor DEFROUTE=yes|no for all connection types (#530209) + +* Fri Oct 30 2009 Jiri Popelka - 12:4.1.0p1-13 +- Make dhclient-script add IPv6 address to interface (#531997) + +* Tue Oct 13 2009 Jiri Popelka - 12:4.1.0p1-12 +- Fix 56dhclient so network comes back after suspend/hibernate (#527641) + +* Thu Sep 24 2009 Jiri Popelka - 12:4.1.0p1-11 +- Make dhcpd and dhcrelay init scripts LSB compliant (#522134, #522146) + +* Mon Sep 21 2009 David Cantrell - 12:4.1.0p1-10 +- Obsolete the dhcpv6 and dhcpv6-client packages + +* Fri Sep 18 2009 David Cantrell - 12:4.1.0p1-9 +- Update dhclient-script with handlers for DHCPv6 states + +* Wed Aug 26 2009 David Cantrell - 12:4.1.0p1-8 +- Conditionalize restorecon calls in post scriptlets (#519479) + +* Wed Aug 26 2009 David Cantrell - 12:4.1.0p1-7 +- Do not require policycoreutils for post scriptlet (#519479) + +* Fri Aug 21 2009 David Cantrell - 12:4.1.0p1-6 +- BR libcap-ng-devel (#517649) + +* Tue Aug 18 2009 David Cantrell - 12:4.1.0p1-5 +- Drop unnecessary capabilities in dhclient (#517649) + +* Fri Aug 14 2009 David Cantrell - 12:4.1.0p1-4 +- Upgrade to latest ldap-for-dhcp patch which makes sure that only + dhcpd links with OpenLDAP (#517474) + +* Wed Aug 12 2009 David Cantrell - 12:4.1.0p1-3 +- Update NetworkManager dispatcher script to remove case conversion + and source /etc/sysconfig/network + +* Thu Aug 06 2009 David Cantrell - 12:4.1.0p1-2 +- Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and + resume with active dhclient leases (#479639) + +* Wed Aug 05 2009 David Cantrell - 12:4.1.0p1-1 +- Upgrade to dhcp-4.1.0p1, which is the official upstream release to fix + CVE-2009-0692 + +* Wed Aug 05 2009 David Cantrell - 12:4.1.0-27 +- Fix for CVE-2009-0692 +- Fix for CVE-2009-1892 (#511834) + +* Fri Jul 24 2009 Fedora Release Engineering - 12:4.1.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jul 23 2009 David Cantrell - 12:4.1.0-25 +- Include NetworkManager dispatcher script to run dhclient.d scripts (#459276) + +* Thu Jul 09 2009 David Cantrell - 12:4.1.0-24 +- Ensure 64-bit platforms parse lease file dates & times correctly (#448615) + +* Thu Jul 09 2009 David Cantrell - 12:4.1.0-23 +- Upgrade to ldap-for-dhcp-4.1.0-4 + +* Wed Jul 01 2009 David Cantrell - 12:4.1.0-22 +- Set permissions on /etc/dhcp to 0750 (#508247) +- Update to new ldap-for-dhcp patch set +- Correct problems when upgrading from a previous release and your + dhcpd.conf file not being placed in /etc/dhcp (#506600) + +* Fri Jun 26 2009 David Cantrell - 12:4.1.0-21 +- Handle cases in add_timeout() where the function is called with a NULL + value for the 'when' parameter (#506626) +- Fix SELinux denials in dhclient-script when the script makes backup + configuration files and restores them later (#483747) + +* Wed May 06 2009 David Cantrell - 12:4.1.0-20 +- Obsolete libdhcp4client <= 12:4.0.0-34.fc10 (#499290) + +* Mon Apr 20 2009 David Cantrell - 12:4.1.0-19 +- Restrict interface names given on the dhcpd command line to length + IFNAMSIZ or shorter (#441524) +- Change to /etc/sysconfig/network-scripts in dhclient-script before + calling need_config or source_config (#496233) + +* Mon Apr 20 2009 David Cantrell - 12:4.1.0-18 +- Make dhclient-script work with pre-configured wireless interfaces (#491157) + +* Thu Apr 16 2009 David Cantrell - 12:4.1.0-17 +- Fix setting default route when client IP address changes (#486512, #473658) +- 'reload' and 'try-restart' on dhcpd and dhcrelay init scripts + will display usage information and return code 3 + +* Mon Apr 13 2009 David Cantrell - 12:4.1.0-16 +- Correct %%post problems in dhclient package (#495361) +- Read hooks scripts from /etc/dhcp (#495361) +- Update to latest ldap-for-dhcp + +* Fri Apr 03 2009 David Cantrell - 12:4.1.0-15 +- Obsolete libdhcp and libdhcp-devel (#493547) + +* Thu Apr 02 2009 David Cantrell - 12:4.1.0-14 +- Obsolete libdhcp and libdhcp-devel (#493547) + +* Tue Mar 31 2009 David Cantrell - 12:4.1.0-13 +- dhclient obsoletes libdhcp4client (#493213) +- dhcp-devel obsolets libdhcp4client-devel (#493213) + +* Wed Mar 11 2009 David Cantrell - 12:4.1.0-12 +- Fix problems with dhclient.d script execution (#488864) + +* Mon Mar 09 2009 David Cantrell - 12:4.1.0-11 +- Use LDAP configuration patch from upstream tarball + +* Thu Mar 05 2009 David Cantrell - 12:4.1.0-10 +- restorecon fixes for /etc/localtime and /etc/resolv.conf (#488470) + +* Tue Feb 24 2009 Fedora Release Engineering - 12:4.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 18 2009 David Cantrell - 12:4.1.0-8 +- Correct subsystem execution in dhclient-script (#486251) + +* Wed Feb 18 2009 David Cantrell - 12:4.1.0-7 +- Do not segfault if the ipv6 kernel module is not loaded (#486097) + +* Mon Feb 16 2009 David Cantrell - 12:4.1.0-6 +- Enable dhcpv6 support (#480798) +- Fix config file migration in scriptlets (#480543) +- Allow dhclient-script expansion with /etc/dhcp/dhclient.d/*.sh scripts + +* Thu Jan 15 2009 Tomas Mraz - 12:4.1.0-5 +- rebuild with new openssl + +* Tue Jan 13 2009 David Cantrell - 12:4.1.0-4 +- Updated LSB init script header to reference /etc/dhcp/dhcpd.conf (#479012) + +* Sun Jan 11 2009 David Cantrell - 12:4.1.0-3 +- Correct syntax errors in %%post script (#479012) + +* Sat Jan 10 2009 David Cantrell - 12:4.1.0-2 +- Make sure all /etc/dhcp config files are marked in the manifest +- Include new config file directies in the dhcp and dhclient packages +- Do not overwrite new config files if they already exist + +* Tue Jan 06 2009 David Cantrell - 12:4.1.0-1 +- Upgraded to ISC dhcp-4.1.0 +- Had to rename the -T option to -timeout as ISC is now using -T +- Allow package rebuilders to easily enable DHCPv6 support with: + rpmbuild --with DHCPv6 dhcp.spec + Note that Fedora is still using the 'dhcpv6' package, but some + users may want to experiment with the ISC DHCPv6 implementation + locally. + +* Thu Dec 18 2008 David Cantrell - 12:4.0.0-34 +- Move /etc/dhclient.conf to /etc/dhcp/dhclient.conf +- Move /etc/dhcpd.conf to /etc/dhcp/dhcpd.conf + +* Thu Dec 18 2008 David Cantrell - 12:4.0.0-33 +- Remove unnecessary success/failure lines in init scripts (#476846) + +* Wed Dec 03 2008 David Cantrell - 12:4.0.0-32 +- Enable LDAP/SSL support in dhcpd (#467740) +- Do not calculate a prefix for an address we did not receive (#473885) +- Removed libdhcp4client because libdhcp has been removed from Fedora + +* Wed Oct 29 2008 David Cantrell - 12:4.0.0-31 +- Use O_CLOEXEC in open(2) calls and "e" mode in fopen(3) calls, build + with -D_GNU_SOURCE so we pick up O_CLOEXEC (#468984) +- Add missing prototype for validate_port() in common/inet.c + +* Thu Oct 23 2008 David Cantrell - 12:4.0.0-30 +- Fix dhclient.conf man page and sample config file to say 'supersede + domain-search', which is what was actually demonstrated (#467955) + +* Wed Oct 01 2008 David Cantrell - 12:4.0.0-29 +- Make sure /etc/resolv.conf has restorecon run on it (#451560) + +* Tue Sep 30 2008 David Cantrell - 12:4.0.0-28 +- Forgot to actually include (#438149) + +* Tue Sep 30 2008 David Cantrell - 12:4.0.0-27 +- Fix patch fuzziness and include errno.h in includes/dhcpd.h (#438149) + +* Tue Sep 30 2008 David Cantrell - 12:4.0.0-26 +- Validate port numbers for dhclient, dhcpd, and dhcrelay to ensure + that are within the correct range (#438149) + +* Mon Sep 29 2008 David Cantrell - 12:4.0.0-25 +- Fix dhcpd so it can find configuration data via LDAP (#452985) + +* Tue Sep 16 2008 David Cantrell - 12:4.0.0-24 +- 'server' -> 'service' in dhclient-script (#462343) + +* Fri Aug 29 2008 David Cantrell - 12:4.0.0-23 +- Prevent $metric from being set to '' (#460640) +- Remove unnecessary warning messages +- Do not source config file (ifcfg-DEVICE) unless it exists + +* Sun Aug 24 2008 David Cantrell - 12:4.0.0-22 +- Add missing '[' to dhclient-script (#459860) +- Correct test statement in add_default_gateway() in dhclient-script (#459860) + +* Sat Aug 23 2008 David Cantrell - 12:4.0.0-21 +- Fix syntax error in dhclient-script (#459860) + +* Fri Aug 22 2008 David Cantrell - 12:4.0.0-20 +- Rewrite of /sbin/dhclient-script (make the script a little more readable, + discontinue use of ifconfig in favor of ip, store backup copies of orig + files in /var rather than in /etc) + +* Wed Aug 06 2008 David Cantrell - 12:4.0.0-19 +- Remove 'c' from the domain-search format string in common/tables.c +- Prevent \032 from appearing in resolv.conf search line (#450042) +- Restore SELinux context on saved /etc files (#451560) + +* Sun Aug 03 2008 Tom "spot" Callaway - 12:4.0.0-18 +- filter out false positive perl requires + +* Fri Aug 01 2008 David Cantrell - 12:4.0.0-17 +- Carry over RES_OPTIONS from ifcfg-ethX files to /etc/resolv.conf (#202923) +- Clean up Requires tags for devel packages +- Allow SEARCH variable in ifcfg files to override search path (#454152) +- Do not down interface if there is an active lease (#453982) +- Clean up how dhclient-script restarts ypbind +- Set close-on-exec on dhclient.leases for SELinux (#446632) + +* Sat Jun 21 2008 David Cantrell - 12:4.0.0-16 +- Remove instaces of \032 in domain search option (#450042) +- Make 'service dhcpd configtest' display text indicating the status + +* Fri May 16 2008 David Cantrell - 12:4.0.0-15 +- Set close-on-exec on dhclient.leases for SELinux (#446632) + +* Tue Apr 01 2008 David Cantrell - 12:4.0.0-14 +- Avoid dhclient crash when run via NetworkManager (#439796) + +* Tue Mar 25 2008 David Cantrell - 12:4.0.0-13 +- Update dhclient-script to handle domain-search correctly (#437840) + +* Tue Mar 25 2008 David Cantrell - 12:4.0.0-12 +- Remove Requires on openldap-server (#432180) +- Replace CLIENTBINDIR, ETCDIR, DBDIR, and RUNDIR in the man pages with the + correct paths + +* Wed Feb 13 2008 David Cantrell - 12:4.0.0-11 +- Add missing newline to usage() screen in dhclient + +* Thu Feb 07 2008 David Cantrell - 12:4.0.0-10 +- Save conf files adding '.predhclient.$interface' to the name (#306381) +- Only restore conf files on EXPIRE/FAIL/RELEASE/STOP if there are no other + dhclient processes running (#306381) + +* Wed Feb 06 2008 David Cantrell - 12:4.0.0-9 +- Match LDAP server option values in stables.c and dhcpd.h (#431003) +- Fix invalid sprintf() statement in server/ldap.c (#431003) + +* Wed Feb 06 2008 David Cantrell - 12:4.0.0-8 +- Remove invalid fclose() patch + +* Tue Feb 05 2008 David Cantrell - 12:4.0.0-7 +- Don't leak /var/lib/dhclient/dhclient.leases file descriptors (#429890) + +* Tue Jan 22 2008 David Cantrell - 12:4.0.0-6 +- read_function() comes from the LDAP patch, so fix it there +- Init new struct universe structs in libdhcp4client so we don't crash on + multiple DHCP attempts (#428203) + +* Thu Jan 17 2008 David Cantrell - 12:4.0.0-5 +- Patch read_function() to handle size_t from read() correctly (#429207) + +* Wed Jan 16 2008 David Cantrell - 12:4.0.0-4 +- Fix dhclient.lease file parsing problems (#428785) +- Disable IPv6 support for now as we already ship dhcpv6 (#428987) + +* Tue Jan 15 2008 David Cantrell - 12:4.0.0-3 +- Fix segfault in next_iface4() and next_iface6() (#428870) + +* Mon Jan 14 2008 David Cantrell - 12:4.0.0-2 +- -fvisibility fails me again + +* Mon Jan 14 2008 David Cantrell - 12:4.0.0-1 +- Upgrade to ISC dhcp-4.0.0 (#426634) + - first ISC release to incorporate DHCPv6 protocol support + - source tree now uses GNU autoconf/automake +- Removed the libdhcp4client-static package diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/codesign2021.txt b/codesign2021.txt new file mode 100644 index 0000000..d021b56 --- /dev/null +++ b/codesign2021.txt @@ -0,0 +1,534 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=fX+D +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +4xcYgqlVpv15O7VrD+I= +=Uugw +-----END PGP PUBLIC KEY BLOCK----- diff --git a/dhcp.spec b/dhcp.spec index 8afebc5..f35b98b 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -1,30 +1,49 @@ # SystemTap support is disabled by default %{!?sdt:%global sdt 0} -#http://lists.fedoraproject.org/pipermail/devel/2011-August/155358.html -%global _hardened_build 1 +%if 0%{?rhel} >= 10 +%bcond_with dhclient +%bcond_with dhcpd +%else +%bcond_without dhclient +%bcond_without dhcpd +%endif # Where dhcp configuration files are stored %global dhcpconfdir %{_sysconfdir}/dhcp - -%global prever b1 -#global patchver P1 +#global prever b1 +%global patchver P1 %global DHCPVERSION %{version}%{?prever}%{?patchver:-%{patchver}} +# Bundled bind version +%global BINDVERSION 9.11.36 + +%global dhcp_EOL_text DHCP is no longer maintained by ISC. This package is provided on\ +best effort basis to cover functionality that is not provided by Kea\ +and should not be used on production systems. Summary: Dynamic host configuration protocol software Name: dhcp -Version: 4.4.2 -Release: 5.b1%{?dist} +Version: 4.4.3 +Release: %autorelease + +# We want to get rid of DHCP in favour of Kea package, because ISC has announced +# the end of maintenance for ISC DHCP as of the end of 2022. No package depends +# on dhcp-server, but dhcp-client is still being used, so we keep it around as +# deprecated package. There is ongoing effort to replace it with other options: +# https://fedoraproject.org/wiki/Changes/dhclient_deprecation +Provides: deprecated() # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # dcantrell maintaining the package) made incorrect use of the epoch and # that's why it is at 12 now. It should have never been used, but it was. # So we are stuck with it. Epoch: 12 -License: ISC -Url: http://isc.org/products/DHCP/ -Source0: ftp://ftp.isc.org/isc/dhcp/%{DHCPVERSION}/dhcp-%{DHCPVERSION}.tar.gz +License: ISC AND MPL-2.0 +Url: https://www.isc.org/dhcp/ +Source0: https://downloads.isc.org/isc/dhcp/%{DHCPVERSION}/dhcp-%{DHCPVERSION}.tar.gz +Source9: https://downloads.isc.org/isc/dhcp/%{DHCPVERSION}/dhcp-%{DHCPVERSION}.tar.gz.asc +Source10: codesign2021.txt Source1: dhclient-script Source2: README.dhclient.d Source3: 11-dhclient @@ -32,40 +51,44 @@ Source5: 56dhclient Source6: dhcpd.service Source7: dhcpd6.service Source8: dhcrelay.service +Source11: systemd-sysusers.conf +Source12: systemd-tmpfiles.conf -Patch1 : 0001-change-bug-url.patch -Patch2 : 0002-additional-dhclient-options.patch -Patch3 : 0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch -Patch4 : 0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch -Patch5 : 0005-Change-default-requested-options.patch -Patch6 : 0006-Various-man-page-only-fixes.patch -Patch7 : 0007-Change-paths-to-conform-to-our-standards.patch -Patch8 : 0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch -Patch9 : 0009-Fix-garbage-in-format-string-error.patch -Patch10 : 0010-Handle-null-timeout.patch -Patch11 : 0011-Drop-unnecessary-capabilities.patch -Patch12 : 0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch -Patch13 : 0013-DHCPv6-over-PPP-support-626514.patch -Patch14 : 0014-IPoIB-support-660681.patch -Patch15 : 0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch -Patch16 : 0016-Turn-on-creating-sending-of-DUID.patch -Patch17 : 0017-Send-unicast-request-release-via-correct-interface.patch -Patch18 : 0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch -Patch19 : 0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch -Patch20 : 0020-Discover-all-hwaddress-for-xid-uniqueness.patch -Patch21 : 0021-Load-leases-DB-in-non-replay-mode-only.patch -Patch22 : 0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch -Patch23 : 0023-option-97-pxe-client-id.patch -Patch24 : 0024-Detect-system-time-changes.patch -Patch25 : 0025-bind-Detect-system-time-changes.patch -Patch26 : 0026-Add-dhclient-5-B-option-description.patch -Patch27: 0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch - - - +Patch1: 0001-change-bug-url.patch +Patch2: 0002-additional-dhclient-options.patch +Patch3: 0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch +Patch4: 0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch +Patch5: 0005-Change-default-requested-options.patch +Patch6: 0006-Various-man-page-only-fixes.patch +Patch7: 0007-Change-paths-to-conform-to-our-standards.patch +Patch8: 0008-Make-sure-all-open-file-descriptors-are-closed-on-ex.patch +Patch9: 0009-Fix-garbage-in-format-string-error.patch +Patch10: 0010-Handle-null-timeout.patch +Patch11: 0011-Drop-unnecessary-capabilities.patch +Patch12: 0012-RFC-3442-Classless-Static-Route-Option-for-DHCPv4-51.patch +Patch13: 0013-DHCPv6-over-PPP-support-626514.patch +Patch14: 0014-IPoIB-support-660681.patch +Patch15: 0015-Add-GUID-DUID-to-dhcpd-logs-1064416.patch +Patch16: 0016-Turn-on-creating-sending-of-DUID.patch +Patch17: 0017-Send-unicast-request-release-via-correct-interface.patch +Patch18: 0018-No-subnet-declaration-for-iface-should-be-info-not-e.patch +Patch19: 0019-dhclient-write-DUID_LLT-even-in-stateless-mode-11563.patch +Patch20: 0020-Discover-all-hwaddress-for-xid-uniqueness.patch +Patch21: 0021-Load-leases-DB-in-non-replay-mode-only.patch +Patch22: 0022-dhclient-make-sure-link-local-address-is-ready-in-st.patch +Patch23: 0023-option-97-pxe-client-id.patch +Patch24: 0024-Detect-system-time-changes.patch +Patch25: 0025-bind-Detect-system-time-changes.patch +Patch26: 0026-Add-dhclient-5-B-option-description.patch +Patch27: 0027-Add-missed-sd-notify-patch-to-manage-dhcpd-with-syst.patch +Patch28: 0028-Use-system-getaddrinfo-for-dhcp.patch +Patch29: CVE-2021-25220.patch +Patch30: 0030-bind-configure-c99.patch +Patch31: 0031-Correct-declarations-of-ia_na_-no-match-and-ia_pd_-n.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: make BuildRequires: libtool BuildRequires: openldap-devel # --with-ldap-gssapi @@ -75,6 +98,7 @@ BuildRequires: libcap-ng-devel BuildRequires: systemd systemd-devel # dhcp-sd_notify.patch BuildRequires: pkgconfig(libsystemd) +BuildRequires: gnupg2 %if ! 0%{?_module_build} BuildRequires: doxygen %endif @@ -82,24 +106,27 @@ BuildRequires: doxygen BuildRequires: systemtap-sdt-devel %global tapsetdir /usr/share/systemtap/tapset %endif +BuildRequires: systemd-rpm-macros # In _docdir we ship some perl scripts and module from contrib subdirectory. # Because nothing under _docdir is allowed to "require" anything, # prevent _docdir from being scanned. (#674058) -%filter_requires_in %{_docdir} -%{filter_setup} +%global __requires_exclude_from ^%{_docdir}/.*$ %description DHCP (Dynamic Host Configuration Protocol) +%{dhcp_EOL_text} + +%if %{with dhcpd} %package server Summary: Provides the ISC DHCP server Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires(pre): shadow-utils +Obsoletes: %{name}-compat < 12:4.4.2-12.b1 Requires(post): coreutils grep sed -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{?sysusers_requires_compat} +%{?systemd_requires} +Provides: deprecated() %description server DHCP (Dynamic Host Configuration Protocol) is a protocol which allows @@ -110,13 +137,16 @@ easier to administer a large network. This package provides the ISC DHCP server. +%{dhcp_EOL_text} +%endif + %package relay Summary: Provides the ISC DHCP relay agent Requires: %{name}-common = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-compat < 12:4.4.2-12.b1 Requires(post): grep sed -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%{?systemd_requires} +Provides: deprecated() %description relay DHCP (Dynamic Host Configuration Protocol) is a protocol which allows @@ -127,19 +157,9 @@ easier to administer a large network. This package provides the ISC DHCP relay agent. -%package compat -Summary: Utility package to help transition -Provides: dhcp = %{epoch}:%{version}-%{release} -Obsoletes: dhcp < %{epoch}:%{version}-%{release} -Requires: %{name}-server = %{epoch}:%{version}-%{release} -Requires: %{name}-relay = %{epoch}:%{version}-%{release} - -%description compat -This package only exists to help transition dhcp users to the new -package split (dhcp -> dhcp & dhcrelay). -It will be removed after one distribution release cycle, please -do not reference it or depend on it in any way. +%{dhcp_EOL_text} +%if %{with dhclient} %package client Summary: Provides the ISC DHCP client daemon and dhclient-script Provides: dhclient = %{epoch}:%{version}-%{release} @@ -149,6 +169,7 @@ Requires: coreutils gawk grep ipcalc iproute iputils sed systemd Requires: %{name}-common = %{epoch}:%{version}-%{release} # Old NetworkManager expects the dispatcher scripts in a different place Conflicts: NetworkManager < 1.20 +Provides: deprecated() %description client DHCP (Dynamic Host Configuration Protocol) is a protocol which allows @@ -159,12 +180,14 @@ easier to administer a large network. This package provides the ISC DHCP client. +%{dhcp_EOL_text} +%endif + %package common Summary: Common files used by ISC dhcp client, server and relay agent BuildArch: noarch Obsoletes: dhcp-libs < %{epoch}:%{version} - - +Provides: deprecated() %description common DHCP (Dynamic Host Configuration Protocol) is a protocol which allows @@ -175,30 +198,38 @@ easier to administer a large network. This package provides common files used by dhcp and dhclient package. +%{dhcp_EOL_text} + %package libs-static Summary: Shared libraries used by ISC dhcp client and server Provides: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Provides: %{name}-libs = %{epoch}:%{version}-%{release} -Provides: bundled(bind-export-libs) -Provides: bundled(bind) +Provides: bundled(bind-export-libs) = %{BINDVERSION} +Provides: bundled(bind) = %{BINDVERSION} +Provides: deprecated() %description libs-static This package contains shared libraries used by ISC dhcp client and server +%{dhcp_EOL_text} %package devel Summary: Development headers and libraries for interfacing to the DHCP server Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Provides: deprecated() %description devel Header files and API documentation for using the ISC DHCP libraries. The libdhcpctl and libomapi static libraries are also included in this package. +%{dhcp_EOL_text} + %if ! 0%{?_module_build} %package devel-doc Summary: Developer's Guide for ISC DHCP Requires: %{name}-libs = %{epoch}:%{version}-%{release} BuildArch: noarch +Provides: deprecated() %description devel-doc This documentation is intended for developers, contributors and other @@ -206,11 +237,18 @@ programmers that are interested in internal operation of the code. This package contains doxygen-generated documentation. %endif +%{dhcp_EOL_text} + %prep +%if 0%{?fedora} +%{gpgverify} --keyring='%{SOURCE10}' --signature='%{SOURCE9}' --data='%{SOURCE0}' +%endif %setup -n dhcp-%{DHCPVERSION} pushd bind -tar -xvf bind.tar.gz -ln -s bind-9* bind +tar -xf bind.tar.gz +# Ensure we have correct bundled bind version specified. +ls -1 bind-%{BINDVERSION} +ln -s bind-%{BINDVERSION} bind popd %autopatch -p1 @@ -260,7 +298,7 @@ CFLAGS="%{optflags} -fno-strict-aliasing -fcommon" \ --enable-paranoia --enable-early-chroot \ --enable-binary-leases \ --with-systemd -make -j1 +%make_build %if ! 0%{?_module_build} pushd doc @@ -269,12 +307,13 @@ popd %endif %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install # We don't want example conf files in /etc rm -f %{buildroot}%{_sysconfdir}/dhclient.conf.example rm -f %{buildroot}%{_sysconfdir}/dhcpd.conf.example +%if %{with dhclient} # dhclient-script install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_sbindir}/dhclient-script @@ -290,19 +329,31 @@ install -p -m 0755 %{SOURCE3} %{buildroot}%{_prefix}/lib/NetworkManager/dispatch # pm-utils script to handle suspend/resume and dhclient leases install -D -p -m 0755 %{SOURCE5} %{buildroot}%{_libdir}/pm-utils/sleep.d/56dhclient +%endif # systemd unit files mkdir -p %{buildroot}%{_unitdir} +%if %{with dhcpd} install -m 644 %{SOURCE6} %{buildroot}%{_unitdir} install -m 644 %{SOURCE7} %{buildroot}%{_unitdir} +%endif install -m 644 %{SOURCE8} %{buildroot}%{_unitdir} +# Install systemd sysusers and tmpfiles configs +install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/dhcp.conf +install -p -D -m 0644 %{SOURCE12} %{buildroot}%{_tmpfilesdir}/dhcp.conf + +%if %{with dhcpd} # Start empty lease databases mkdir -p %{buildroot}%{_localstatedir}/lib/dhcpd/ touch %{buildroot}%{_localstatedir}/lib/dhcpd/dhcpd.leases touch %{buildroot}%{_localstatedir}/lib/dhcpd/dhcpd6.leases +%endif +%if %{with dhclient} mkdir -p %{buildroot}%{_localstatedir}/lib/dhclient/ +%endif +%if %{with dhcpd} # default sysconfig file for dhcpd mkdir -p %{buildroot}%{_sysconfdir}/sysconfig cat < %{buildroot}%{_sysconfdir}/sysconfig/dhcpd @@ -325,11 +376,15 @@ cat < %{buildroot}%{_sysconfdir}/sysconfig/dhcpd # $ systemctl --system daemon-reload # $ systemctl restart dhcpd.service EOF +%endif +%if %{with dhcpd} # Copy sample conf files into position (called by doc macro) cp -p doc/examples/dhclient-dhcpv6.conf client/dhclient6.conf.example cp -p doc/examples/dhcpd-dhcpv6.conf server/dhcpd6.conf.example +%endif +%if %{with dhclient} cat << EOF > client/dhclient-enter-hooks #!/bin/bash @@ -346,7 +401,9 @@ echo "reason: ${reason}" ( set -o posix ; set ) | grep "alias_" ( set -o posix ; set ) | grep "requested_" EOF +%endif +%if %{with dhcpd} # Install default (empty) dhcpd.conf: mkdir -p %{buildroot}%{dhcpconfdir} cat << EOF > %{buildroot}%{dhcpconfdir}/dhcpd.conf @@ -368,22 +425,44 @@ EOF # Install dhcp.schema for LDAP configuration install -D -p -m 0644 contrib/ldap/dhcp.schema %{buildroot}%{_sysconfdir}/openldap/schema/dhcp.schema +%endif # Don't package libtool *.la files find %{buildroot} -type f -name "*.la" -delete -print +%if %{without dhcpd} +rm -frv \ + %{buildroot}%{_sysusersdir}/dhcp.conf \ + %{buildroot}%{_tmpfilesdir}/dhcp.conf \ + %{buildroot}%{_sbindir}/dhcpd \ + %{buildroot}%{_bindir}/omshell \ + %{buildroot}%{_mandir}/man1/omshell.1 \ + %{buildroot}%{_mandir}/man3/dhcpctl.3 \ + %{buildroot}%{_mandir}/man3/omapi.3 \ + %{buildroot}%{_mandir}/man5/dhcpd.conf.5 \ + %{buildroot}%{_mandir}/man5/dhcpd.leases.5 \ + %{buildroot}%{_mandir}/man8/dhcpd.8 \ + %{buildroot}%{_includedir} \ + %{buildroot}/usr/lib64/libdhcp.a \ + %{buildroot}/usr/lib64/libdhcpctl.a \ + %{buildroot}/usr/lib64/libomapi.a \ + %{buildroot}/usr/lib/debug/usr/bin/omshell-*.debug \ + %{buildroot}/usr/lib/debug/usr/sbin/dhcpd-*.debug +%endif + +%if %{without dhclient} +rm -fv \ + %{buildroot}%{_sbindir}/dhclient \ + %{buildroot}%{_mandir}/man5/dhclient.conf.5 \ + %{buildroot}%{_mandir}/man5/dhclient.leases.5 \ + %{buildroot}%{_mandir}/man8/dhclient-script.8 \ + %{buildroot}%{_mandir}/man8/dhclient.8 \ + %{buildroot}/usr/lib/debug/usr/sbin/dhclient-*.debug +%endif + +%if %{with dhcpd} %pre server -# /usr/share/doc/setup/uidgid -%global gid_uid 177 -getent group dhcpd >/dev/null || groupadd --force --gid %{gid_uid} --system dhcpd -if ! getent passwd dhcpd >/dev/null ; then - if ! getent passwd %{gid_uid} >/dev/null ; then - useradd --system --uid %{gid_uid} --gid dhcpd --home / --shell /sbin/nologin --comment "DHCP server" dhcpd - else - useradd --system --gid dhcpd --home / --shell /sbin/nologin --comment "DHCP server" dhcpd - fi -fi -exit 0 +%sysusers_create_compat %{SOURCE11} %post server # Initial installation @@ -398,6 +477,7 @@ for servicename in dhcpd dhcpd6; do fi done exit 0 +%endif %post relay # Initial installation @@ -412,18 +492,22 @@ for servicename in dhcrelay; do done exit 0 +%if %{with dhcpd} %preun server # Package removal, not upgrade %systemd_preun dhcpd.service dhcpd6.service +%endif %preun relay # Package removal, not upgrade %systemd_preun dhcrelay.service +%if %{with dhcpd} %postun server # Package upgrade, not uninstall %systemd_postun_with_restart dhcpd.service dhcpd6.service +%endif %postun relay # Package upgrade, not uninstall @@ -432,7 +516,12 @@ exit 0 %triggerun -- dhcp # convert DHC*ARGS from /etc/sysconfig/dhc* to /etc/systemd/system/dhc*.service -for servicename in dhcpd dhcpd6 dhcrelay; do +%if %{with dhcpd} +SERVICE_NAMES="dhcpd dhcpd6 dhcrelay" +%else +SERVICE_NAMES="dhcrelay" +%endif +for servicename in ${SERVICE_NAMES}; do if [ -f %{_sysconfdir}/sysconfig/${servicename} ]; then # get DHCPDARGS/DHCRELAYARGS value from /etc/sysconfig/${servicename} source %{_sysconfdir}/sysconfig/${servicename} @@ -453,6 +542,7 @@ for servicename in dhcpd dhcpd6 dhcrelay; do fi done +%if %{with dhcpd} %files server %doc server/dhcpd.conf.example server/dhcpd6.conf.example %doc contrib/ldap/ contrib/dhcp-lease-list.pl @@ -467,6 +557,8 @@ done %config(noreplace) %{_sysconfdir}/openldap/schema/dhcp.schema %attr(0644,root,root) %{_unitdir}/dhcpd.service %attr(0644,root,root) %{_unitdir}/dhcpd6.service +%{_sysusersdir}/dhcp.conf +%{_tmpfilesdir}/dhcp.conf %{_sbindir}/dhcpd %{_bindir}/omshell %attr(0644,root,root) %{_mandir}/man1/omshell.1.gz @@ -476,14 +568,14 @@ done %if %{sdt} %{tapsetdir}/*.stp %endif +%endif %files relay %{_sbindir}/dhcrelay %attr(0644,root,root) %{_unitdir}/dhcrelay.service %attr(0644,root,root) %{_mandir}/man8/dhcrelay.8.gz -%files compat - +%if %{with dhclient} %files client %doc README.dhclient.d %doc client/dhclient.conf.example client/dhclient6.conf.example client/dhclient-enter-hooks @@ -500,6 +592,7 @@ done %attr(0644,root,root) %{_mandir}/man5/dhclient.leases.5.gz %attr(0644,root,root) %{_mandir}/man8/dhclient.8.gz %attr(0644,root,root) %{_mandir}/man8/dhclient-script.8.gz +%endif %files common %{!?_licensedir:%global license %%doc} @@ -508,6 +601,7 @@ done %attr(0644,root,root) %{_mandir}/man5/dhcp-options.5.gz %attr(0644,root,root) %{_mandir}/man5/dhcp-eval.5.gz +%if %{with dhcpd} %files libs-static %{_libdir}/libdhcp*.a %{_libdir}/libomapi.a @@ -523,1345 +617,7 @@ done %files devel-doc %doc doc/html/ %endif +%endif %changelog -* Fri Feb 21 2020 Pavel Zhukov - 12:4.4.2-5.b1 -- Workarounnd for gcc10 - -* Tue Jan 28 2020 Fedora Release Engineering - 12:4.4.2-4.b1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Jan 6 2020 Pavel Zhukov - 12:4.4.2-3.b1 -- Drop NetworkManager 12-dhcpd script. It's deprecated by wait-online (#1780861) - -* Mon Jan 6 2020 Pavel Zhukov - 12:4.4.2-1.b1 -- Dropped all (pre 4.0.0) changelog -- New version (4.4.2b1) - -* Wed Nov 27 2019 Pavel Zhukov - 12:4.4.1-20 -- Fix leak of file descriptors - -* Mon Nov 11 2019 Pavel Zhukov - 12:4.4.1-19 -- Reword -B option description - -* Thu Nov 7 2019 Pavel Zhukov - 12:4.4.1-18 -- Readd sd-notify patch - -* Thu Aug 22 2019 Lubomir Rintel - 12:4.4.1-17 -- Move the NetworkManager dispatcher script out of /etc - -* Thu Jul 25 2019 Pavel Zhukov - 12:4.4.1-16 -- Split timers patch to bind and dhcp parts - -* Wed Jul 24 2019 Fedora Release Engineering - 12:4.4.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jul 11 2019 Pavel Zhukov - 12:4.4.1-14 -- Detect time change and request lease renewal - -* Mon May 20 2019 Pavel Zhukov - 12:4.4.1-13 -- Unpack bind prior to patching -- Provide noarch libs - -* Sat May 04 2019 Björn Esser - 12:4.4.1-12 -- rebuilt (bind) - -* Tue Apr 2 2019 Pavel Zhukov - 12:4.4.1-11 -- Specify epoch for obsolete - -* Tue Apr 2 2019 Pavel Zhukov - 12:4.4.1-10 -- Cherry-pick 00b7f9a Specify architecture for provides - - -* Tue Apr 2 2019 Pavel Zhukov - 12:4.4.1-9 -- Move obsolete to common section - -* Wed Mar 27 2019 Pavel Zhukov - 12:4.4.1-8 -- Add sd_notify patch to support systemd notify (1687040) - -* Mon Mar 18 2019 Pavel Zhukov - 12:4.4.1-7 -- Provides specific version of libs - -* Mon Mar 18 2019 Pavel Zhukov - 12:4.4.1-6 -- Obsolete dhcp-libs - -* Wed Mar 13 2019 Pavel Zhukov - 12:4.4.1-5 -- Do not require static libs for non devel installations - -* Thu Feb 28 2019 Pavel Zhukov - 12:4.4.1-3 -- New version 4.4.1 - -* Mon Sep 24 2018 Pavel Zhukov - 12:4.3.6-29 -- Resolves: 1632246 - Do not fail if iface has no hwaddr - -* Thu Aug 30 2018 Pavel Zhukov - 12:4.3.6-28 -- Do not try to map leases file in memory if not in replay mode - -* Fri Jul 13 2018 Petr Menšík - 12:4.3.6-27 -- Update to bind 9.11.4 - -* Thu Jul 12 2018 Fedora Release Engineering - 12:4.3.6-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jun 18 2018 Pavel Zhukov - 12:4.3.6-25 -- Resolves: 1592239 - Handle dhcp4-change event properly - -* Mon May 21 2018 Pavel Zhukov - 12:4.3.6-24 -- Fix few more shellcheck warnings - -* Fri May 18 2018 Pavel Zhukov - 12:4.3.6-23 -- Get rid of eval in 11-dhclient -- Credits to legolegs user of linux.org.ru - -* Tue May 15 2018 Pavel Zhukov - 12:4.3.6-21 -- Fix for CVE-2018-1111 - -* Fri Apr 6 2018 Pavel Zhukov - 12:4.3.6-20 -- Discover hwaddr for all interfaces for xid uniqueness - -* Wed Mar 21 2018 Pavel Zhukov - 12:4.3.6-19 -- Don't use run-parts for hooks discovery (#1558612) - -* Fri Mar 09 2018 Pavel Zhukov - 12:4.3.6-18 -- Own ldap schema directory (#1553432) - -* Thu Mar 1 2018 Pavel Zhukov - 12:4.3.6-17 -- Fix CVE-2018-5732 CVE-2018-5733 (#1550246) - -* Thu Feb 22 2018 Petr Menšík - 12:4.3.6-16 -- Compile with recent bind includes, that does not include isc/util.h - -* Thu Feb 22 2018 Petr Menšík - 12:4.3.6-15 -- Do not rely on ignoring case sensitivity of VERSION variable - -* Thu Feb 22 2018 Petr Menšík - 12:4.3.6-14 -- Use bind-export-libs package instead of bind99 -- Use isc-config.sh to configure bind libs -- Change requirement to bind-export-devel - -* Thu Feb 22 2018 Pavel Zhukov - 12:4.3.6-13 -- Do not parse sysconfig/network-scripts if initscripts not installed (#1098172) - -* Wed Feb 07 2018 Fedora Release Engineering - 12:4.3.6-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Feb 03 2018 Igor Gnatenko - 12:4.3.6-11 -- Switch to %%ldconfig_scriptlets - -* Wed Jan 10 2018 Pavel Zhukov - 12:4.3.6-10 -- Use released version - -* Wed Dec 20 2017 Pavel Zhukov - 12:4.3.5-9 -- Change duid_uuid patch to not use std99 feature - -* Fri Dec 8 2017 Pavel Zhukov - 12:4.3.6-8 -- Fix omapi SD leak (#1523547) - -* Thu Nov 9 2017 Pavel Zhukov - 12:4.3.6-7 -- Add patch for proper signal handling with shared context (#1457871) - -* Wed Sep 20 2017 Pavel Zhukov - 12:4.3.6-6 -- Do now override hostname variable in script - -* Sun Sep 10 2017 Peter Robinson 12:4.3.6-5 -- Rebuild for bind 9.9.11 - -* Tue Aug 1 2017 Pavel Zhukov - 12:4.3.6-4 -- Fix typos in dhclient-script - -* Thu Jul 27 2017 Pavel Zhukov - 12:4.3.6-3 -- Recreate /etc/resolv.conf if NetworkManager screwed it up (#1475279) - -* Wed Jul 26 2017 Fedora Release Engineering - 12:4.3.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - - -* Fri Jul 14 2017 Pavel Zhukov - 12:4.3.6-1 -- New version 4.3.6 - -* Fri Jul 07 2017 Igor Gnatenko - 12:4.3.5-10 -- Rebuild due to bug in RPM (RHBZ #1468476) - -* Mon Jul 03 2017 Petr Menšík - 12:4.3.5-9 -- Rebuild for bind 9.9.10 - -* Wed May 31 2017 Pavel Zhukov - 12:4.3.5-8 -- Drop chown from the post section - -* Tue May 23 2017 Pavel Zhukov - 12:4.3.5-7 -- Don't open ddns port until it's needed. Credits to Petr Menšík for the original idea - -* Wed Apr 19 2017 Dominika Hodovska - 12:4.3.5-5 -- don't build doxygen documentation during modular build - -* Tue Apr 04 2017 Pavel Zhukov - 12:4.3.5-4 -- Add EnvironmentFile parameter for backward compatibility - -* Fri Feb 10 2017 Fedora Release Engineering - 12:4.3.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Nov 30 2016 Jiri Popelka - 12:4.3.5-2 -- get BUG_REPORT_URL from /etc/os-release (#1399351) - -* Wed Oct 05 2016 Jiri Popelka - 12:4.3.5-1 -- 4.3.5 - -* Mon Sep 12 2016 Jiri Popelka - 12:4.3.5-0.1b1 -- 4.3.5b1 - -* Wed Aug 03 2016 Jiri Popelka - 12:4.3.4-3 -- [dhclient] rename -R option to --request-options (#1357947) -- [dhclient] rename -timeout option to --timeout - -* Thu May 26 2016 Tomas Hozza - 12:4.3.4-2 -- Rebuild against bind99-9.9.9-P1 - -* Fri Apr 29 2016 Jiri Popelka - 12:4.3.4-1 -- 4.3.4 -- disable systemtap (I don't think anybody ever used it) - -* Wed Mar 23 2016 Zdenek Dohnal zdohnal@redhat.com - 12:4.3.3-13.P1 -- Mentioning the bash script is needed in README.dhclient.d - -* Wed Feb 03 2016 Fedora Release Engineering - 12:4.3.3-12.P1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jan 13 2016 Jiri Popelka - 12:4.3.3-11.P1 -- 4.3.3-P1 - fix for CVE-2015-8605 (#1298077) - -* Wed Dec 16 2015 Tomas Hozza - 12:4.3.3-10 -- Rebuild against bind-9.9.8-P2 - -* Mon Dec 14 2015 Jiri Popelka - 12:4.3.3-9 -- implement DUID-UUID (RFC 6355) and make it default DUID type (#560361#60) - -* Tue Nov 24 2015 Jiri Popelka - 12:4.3.3-8 -- dispatcher.d/12-dhcpd: use reset-failed command - -* Mon Nov 23 2015 Jiri Popelka - 12:4.3.3-7 -- dhclient-script: hostname -> hostnamectl --transient - -* Tue Nov 03 2015 Jiri Popelka - 12:4.3.3-6 -- dhclient-script: source ifcfg-* because of PEERDNS (#1277253) - -* Tue Oct 13 2015 Jiri Popelka - 12:4.3.3-5 -- dhclient-script: fix for gateway not in the end of rfc3442 routes list (#1251644) - -* Tue Oct 13 2015 Jiri Popelka - 12:4.3.3-4 -- dhclient-script: make_resolv_conf(): keep old nameservers - if server sends domain-name/search, but no nameservers (#1269595) - -* Tue Sep 22 2015 Jiri Popelka - 12:4.3.3-3 -- dhclient: make sure link-local address is ready in stateless mode (#1263466) - -* Mon Sep 07 2015 Jiri Popelka - 12:4.3.3-2 -- VLAN ID is only bottom 12-bits of TCI (#1259552) - -* Fri Sep 04 2015 Jiri Popelka - 12:4.3.3-1 -- 4.3.3 - -* Tue Aug 11 2015 Jiri Popelka - 12:4.3.3-0.2b1 -- dhclient-script: respect DEFROUTE/GATEWAYDEV if Classless Static Routes are offered (#1251644) - -* Mon Aug 10 2015 Jiri Popelka - 12:4.3.3-0.1b1 -- 4.3.3b1 -- enable krb5/gssapi authentication for OpenLDAP -- enable support for binary insertion of leases - -* Wed Jul 15 2015 Jiri Popelka - 12:4.3.2-12 -- fix ipcalc requires - -* Tue Jul 14 2015 Jiri Popelka - 12:4.3.2-11 -- remove dependency on initscripts (#1098172) -- make path to resolv.conf configurable (#1086425) - -* Thu Jul 09 2015 Jiri Popelka - 12:4.3.2-10 -- spec cleanup - -* Thu Jul 02 2015 Jiri Popelka - 12:4.3.2-9 -- test upstream fix for #866714 (paranoia.patch) - -* Wed Jun 24 2015 Jiri Popelka - 12:4.3.2-8 -- add more randomness into xid generation (#1195693) - -* Wed Jun 17 2015 Fedora Release Engineering - 12:4.3.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue May 26 2015 Jiri Popelka - 12:4.3.2-6 -- dhclient-script: run also scripts in dhclient-[enter/exit]-hooks.d dir - -* Tue Apr 21 2015 Jiri Popelka - 12:4.3.2-5 -- dhclient-script: add a minute to address lifetimes (#1188423) - -* Mon Apr 13 2015 Jiri Popelka - 12:4.3.2-4 -- dhclient-script: amend previous change (#1210984) - -* Wed Mar 25 2015 Jiri Popelka - 12:4.3.2-3 -- dhclient-script: fix shellcheck.net suggestions - -* Fri Mar 13 2015 Tomas Hozza - 12:4.3.2-2 -- rebuild against bind99 9.9.7 package - -* Thu Mar 05 2015 Jiri Popelka - 12:4.3.2-1 -- 4.3.2 - -* Wed Feb 25 2015 Jiri Popelka - 12:4.3.2-0.6b1 -- correctly set IB's hw->hlen (#1185075) - -* Wed Feb 25 2015 Tomas Hozza - 12:4.3.2-0.5b1 -- Rebuild against bind-9.10.2rc2 - -* Tue Feb 17 2015 Jiri Popelka - 12:4.3.2-0.4b1 -- dhclient-script: use 'ip addr replace' for both BOUND & RENEW - -* Tue Feb 17 2015 Jiri Popelka - 12:4.3.2-0.3b1 -- doc/dhclient/dhclient-enter-hooks for dhclient-script debugging - -* Fri Feb 13 2015 Jiri Popelka - 12:4.3.2-0.2b1 -- dhclient-script: s/addr add/addr replace/ - -* Sun Feb 08 2015 Jiri Popelka - 12:4.3.2-0.1b1 -- 4.3.2b1 - -* Tue Feb 03 2015 Jiri Popelka - 12:4.3.1-21 -- send unicast request/release via correct interface (#800561, #1177351) - -* Mon Feb 02 2015 Tomas Hozza - 12:4.3.1-20 -- rebuild against bind-9.10.2rc1 - -* Wed Jan 14 2015 Tomas Hozza - 12:4.3.1-19 -- rebuild against bind 9.10.1-P1 - -* Thu Dec 18 2014 Jiri Popelka - 12:4.3.1-18 -- dhclient: write DUID_LLT even in stateless mode (#1156356) - -* Wed Dec 17 2014 Jiri Popelka - 12:4.3.1-17 -- option 97 - pxe-client-id (#1058674) - -* Wed Nov 19 2014 Jiri Popelka - 12:4.3.1-16 -- amend post scriptlets for #1120656 - -* Mon Nov 10 2014 Jiri Popelka - 12:4.3.1-15 -- dhclient-script: restorecon calls shouldn't be needed - as we have SELinux transition rules (#1161500) - -* Tue Nov 04 2014 Jiri Popelka - 12:4.3.1-14 -- GSSAPI support for ldap authentication (#1150542) - -* Fri Oct 31 2014 Jiri Popelka - 12:4.3.1-13 -- redefine DHCLIENT_DEFAULT_PREFIX_LEN 64 -> 128 - -* Fri Oct 10 2014 Jiri Popelka - 12:4.3.1-12 -- Relay-forward Message's Hop Limit should be 32 (#1147240) - -* Wed Oct 08 2014 Jiri Popelka - 12:4.3.1-11 -- dhcpd generates spurious responses when seeing requests - from vlans on plain interface (#1150587) - -* Fri Oct 03 2014 Tomas Hozza - 12:4.3.1-10 -- rebuild against bind-9.9.6 - -* Thu Sep 04 2014 Jiri Popelka - 12:4.3.1-9 -- [dhclient -6] infinite preferred/valid lifetime represented as -1 (#1133839) - -* Mon Sep 01 2014 Jiri Popelka - 12:4.3.1-8 -- better obsoletes for server & client - -* Sat Aug 30 2014 Kalev Lember - 12:4.3.1-7 -- Fix dhclient obsoletes version - -* Tue Aug 26 2014 Jiri Popelka - 12:4.3.1-6 -- dhclient-script: another improvement of add_ipv6_addr_with_DAD() - -* Mon Aug 25 2014 Jiri Popelka - 12:4.3.1-5 -- spec: use -D with 'install' -- dhclient-script: IPv6 address which fails DAD is auto-removed when it was - added with valid_lft/preferred_lft other then 'forever' (#1133465) - -* Sat Aug 16 2014 Fedora Release Engineering - 12:4.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Aug 14 2014 Jiri Popelka - 12:4.3.1-3 -- dhclient-script: one more fix for #1129500 - -* Thu Aug 14 2014 Jiri Popelka - 12:4.3.1-2 -- dhclient-script: PREINIT6: make sure link-local address is available (#1129500) - -* Tue Aug 12 2014 Jiri Popelka - 12:4.3.1-1 -- 4.3.1 - -* Tue Aug 05 2014 Jiri Popelka - 12:4.3.1-0.4.b1 -- dhclient-script: it's OK if the arping reply comes from our system (#1116004) - -* Tue Jul 22 2014 Jiri Popelka - 12:4.3.1-0.3.b1 -- Use network-online.target instead of network.target (#1120656) - -* Fri Jul 11 2014 Tom Callaway 12:4.3.1-0.2.b1 -- fix license handling - -* Thu Jul 10 2014 Jiri Popelka - 12:4.3.1-0.1.b1 -- 4.3.1b1 - -* Thu Jun 12 2014 Filipe Brandenburger - 12:4.3.0-15 -- dhclient-script: fix issue with classless static routes that breaks Fedora 20 on GCE cloud (#1102830) - -* Sat Jun 07 2014 Fedora Release Engineering - 12:4.3.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 30 2014 Jiri Popelka - 12:4.3.0-13 -- systemtap: fixed dtrace input file (#1102797) - -* Thu May 29 2014 Jiri Popelka - 12:4.3.0-12 -- dhcp-sd_notify.patch BuildRequires: pkgconfig(libsystemd) - -* Wed May 28 2014 Jiri Popelka - 12:4.3.0-11 -- dhclient-script: fix stateless DHCPv6 mode (#1101149) - -* Wed May 07 2014 Jiri Popelka - 12:4.3.0-10 -- use StandardError=null instead of log_perror.patch - -* Tue Mar 18 2014 Jiri Popelka - 12:4.3.0-9 -- support for sending startup notifications to systemd (#1077666) - -* Fri Mar 07 2014 Jiri Popelka - 12:4.3.0-8 -- rename doc subpackage do devel-doc - -* Mon Mar 03 2014 Jaromír Končický - 12:4.3.0-7 -- added 'doc' package containing doxygen-generated documentation - -* Wed Feb 19 2014 Jiri Popelka - 12:4.3.0-6 -- dhclient: rename our -I option to -C as upstream now uses -I - -* Wed Feb 19 2014 Jiri Popelka - 12:4.3.0-5 -- dhclient-script: don't flush all addresses, just the used one - -* Tue Feb 18 2014 Jiri Popelka - 12:4.3.0-4 -- IPoIB: add GUID/DUID to dhcpd logs (#1064416) - -* Mon Feb 17 2014 Jiri Popelka - 12:4.3.0-3 -- don't try to run tests because there's no atf package since F21 - -* Mon Feb 17 2014 Jiri Popelka - 12:4.3.0-2 -- turn on using of DUID with DHCPv4 clients (#560361,c#40) -- remove default /etc/dhcp/dhclient.conf - -* Tue Feb 04 2014 Jiri Popelka - 12:4.3.0-1 -- 4.3.0 - -* Wed Jan 29 2014 Jiri Popelka - 12:4.3.0-0.7.rc1 -- 4.3.0rc1 - -* Tue Jan 28 2014 Jiri Popelka - 12:4.3.0-0.6.b1 -- don't apply retransmission.patch for now (RHBZ#1026565) - -* Sun Jan 26 2014 Kevin Fenzi 12:4.3.0-0.5.b1 -- Rebuild for new bind - -* Tue Jan 21 2014 Jiri Popelka - 12:4.3.0-0.4.b1 -- 4.3.0b1 -- ship dhcp-lease-list.pl -- dhclient-script: don't ping router (#1055181) - -* Mon Jan 13 2014 Jiri Popelka - 12:4.3.0-0.3.a1 -- update address lifetimes on RENEW/RENEW6 (#1032809) - -* Tue Jan 07 2014 Jiri Popelka - 12:4.3.0-0.2.a1 -- make it actually build - -* Thu Dec 19 2013 Jiri Popelka - 12:4.3.0-0.1.a1 -- 4.3.0a1: requires bind-9.9.5 - -* Thu Nov 21 2013 Jiri Popelka - 12:4.2.5-28 -- dhclient-script: set address lifetimes (#1032809) - -* Thu Nov 14 2013 Jiri Popelka - 12:4.2.5-27 -- dhclient-script(RENEW6|REBIND6): delete old ip6_address if it changed (#1015729) - -* Thu Oct 31 2013 Jiri Popelka - 12:4.2.5-26 -- Provide default /etc/dhcp/dhclient.conf -- Client always sends dhcp-client-identifier (#560361) - -* Thu Oct 24 2013 Jiri Popelka - 12:4.2.5-25 -- use upstream patch for #1001742 ([ISC-Bugs #34784]) - -* Mon Oct 07 2013 Jiri Popelka - 12:4.2.5-24 -- dhcpd rejects the udp packet with checksum=0xffff (#1015997) - -* Fri Sep 27 2013 Jiri Popelka - 12:4.2.5-23 -- 'No subnet declaration for ' should be info, not error -- decrease the sleep in 12-dhcpd due to timeout (#1003695#8) - -* Wed Sep 18 2013 Jiri Popelka - 12:4.2.5-22 -- fix segfault introduced with previous commit - -* Tue Sep 17 2013 Jiri Popelka - 12:4.2.5-21 -- 12-dhcpd: wait a few seconds before restarting services (#1003695) -- another solution for #1001742 (#1005814#c10) - -* Thu Sep 12 2013 Jiri Popelka - 12:4.2.5-20 -- bind DHCPv6 client to link-local address instead of 0 address (#1001742) - -* Mon Aug 26 2013 Jiri Popelka - 12:4.2.5-19 -- don't crash on aliased infiniband interface (#996518) - -* Sun Aug 04 2013 Jiri Popelka - 12:4.2.5-18 -- BuildRequires: systemd due to %%{_unitdir} - -* Mon Jul 29 2013 Jiri Popelka - 12:4.2.5-17 -- 12-dhcpd previously exited with error status 1 (#989207) - -* Mon Jul 15 2013 Tomas Hozza - 12:4.2.5-16 -- rebuild against new bind - -* Tue Jul 02 2013 Jiri Popelka - 12:4.2.5-15 -- fix several memory leaks in omapi (#978420) -- remove send_release.patch (#979510) - -* Tue Jun 18 2013 Jiri Popelka - 12:4.2.5-14 -- rebuilt against bind once more - -* Fri Jun 14 2013 Jiri Popelka - 12:4.2.5-13 -- return /etc/sysconfig/dhcpd back, but do NOT use it (#909733) - -* Tue May 14 2013 Adam Williamson - 12:4.2.5-12 -- rebuild against new bind - -* Tue Apr 30 2013 Jiri Popelka - 12:4.2.5-11 -- add missing conversion specifier in log_fatal() call (#957371) - -* Tue Apr 16 2013 Adam Tkac - 12:4.2.5-10 -- rebuild against new bind - -* Wed Apr 03 2013 Tomas Hozza - 12:4.2.5-9 -- Expose next-server DHCPv4 option to dhclient script - -* Tue Mar 26 2013 Jiri Popelka - 12:4.2.5-8 -- describe -user/-group/-chroot in dhcpd.8 - -* Fri Feb 22 2013 Jiri Popelka - 12:4.2.5-7 -- remove triggerun condition (#895475) - -* Wed Feb 13 2013 Fedora Release Engineering - 12:4.2.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jan 24 2013 Jiri Popelka - 12:4.2.5-5 -- remove missing-ipv6-not-fatal.patch because the concerning code is later - removed with getifaddrs.patch - -* Wed Jan 23 2013 Jiri Popelka - 12:4.2.5-4 -- Make sure range6 is correct for subnet6 where it's declared (#902966) - -* Fri Jan 18 2013 Jiri Popelka - 12:4.2.5-3 -- simplify the previously added triggerun scriptlet - -* Thu Jan 17 2013 Jiri Popelka - 12:4.2.5-2 -- during update convert DHC*ARGS from /etc/sysconfig/dhc* - to /etc/systemd/system/dhc*.service (#895475) -- 12-dhcpd NM dispatcher script now restarts also dhcpd6 service - -* Thu Jan 10 2013 Jiri Popelka - 12:4.2.5-1 -- 4.2.5 - -* Wed Jan 02 2013 Jiri Popelka - 12:4.2.5-0.3.rc1 -- run %%check in Fedora only, there's no atf package in RHEL - -* Thu Dec 20 2012 Jiri Popelka - 12:4.2.5-0.2.rc1 -- don't package ancient contrib/* files - -* Thu Dec 20 2012 Jiri Popelka - 12:4.2.5-0.1.rc1 -- 4.2.5rc1 - - added %%check - upstream unit tests (Automated Test Framework - ATF) - -* Fri Nov 30 2012 Jiri Popelka - 12:4.2.4-23.P2 -- fix two resource leaks in lpf-ib.patch - -* Mon Nov 26 2012 Jiri Popelka - 12:4.2.4-22.P2 -- add After=time-sync.target to dhcpd[6].service (#878293) -- remove groff from BuildRequires (no idea why it's been there) - -* Fri Nov 16 2012 Jiri Popelka - 12:4.2.4-21.P2 -- multiple key statements in zone definition causes inappropriate error (#873794) - -* Fri Oct 26 2012 Jiri Popelka - 12:4.2.4-20.P2 -- fix path to dhcpd6.leases in dhcpd6.conf.sample (#870458) - -* Wed Oct 17 2012 Jiri Popelka - 12:4.2.4-19.P2 -- dhcpd needs to chown leases file created before de-rooting itself (#866714) - -* Thu Oct 11 2012 Adam Tkac - 12:4.2.4-18.P2 -- rebuild against new bind-libs-lite - -* Tue Oct 09 2012 Jiri Popelka - 12:4.2.4-17.P2 -- do-forward-updates statement wasn't recognized (#863646) - -* Wed Sep 26 2012 Jiri Popelka - 12:4.2.4-16.P2 -- dhclient-usage.patch+part of manpages.patch merged with dhclient-options.patch - -* Thu Sep 13 2012 Tomas Hozza - 12:4.2.4-15.P2 -- 4.2.4-P2: fix for CVE-2012-3955 (#856770) - -* Fri Aug 24 2012 Tomas Hozza - 12:4.2.4-14.P1 -- SystemD unit files don't use Environment files any more (#850558) -- NetworkManager dispatcher script doesn't use DHCPDARGS any more - -* Wed Aug 22 2012 Tomas Hozza - 12:4.2.4-13.P1 -- fixed SPEC file so it comply with new systemd-rpm macros guidelines (#850089) - -* Mon Aug 20 2012 Tomas Hozza - 12:4.2.4-12.P1 -- dhclient-script: fixed CONFIG variable value passed to need_config (#848858) -- dhclient-script: calling dhclient-up-hooks after setting up route, gateways - & interface alias (#848869) - -* Fri Aug 17 2012 Jiri Popelka - 12:4.2.4-11.P1 -- don't build libdst, it hasn't been used since 4.2.0 (#849166) - -* Fri Jul 27 2012 Jiri Popelka - 12:4.2.4-10.P1 -- isc_time_nowplusinterval() is not safe with 64-bit time_t (#662254, #789601) - -* Fri Jul 27 2012 Fedora Release Engineering - 12:4.2.4-9.P1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jul 25 2012 Tomas Hozza - 12:4.2.4-8.P1 -- Dhclient does not correctly parse zero-length options in - dhclient6.leases (#633318) - -* Wed Jul 25 2012 Tomas Hozza - 12:4.2.4-7.P1 -- 4.2.4-P1: fix for CVE-2012-3570 CVE-2012-3571 and CVE-2012-3954 (#842892) - -* Mon Jul 23 2012 Jiri Popelka - 12:4.2.4-6 -- ib.patch: added fall-back method (using ioctl(SIOCGIFHWADDR)) when getting - of HW address with getifaddrs() fails (#626514-c#63, #840601). - -* Mon Jul 23 2012 Tomas Hozza - 12:4.2.4-5 -- Dhcpd does not correctly follow DhcpFailOverPeerDN (#838400) - -* Wed Jul 18 2012 Jiri Popelka - 12:4.2.4-4 -- allow dhcpd to listen on alias interfaces (#840601) - -* Mon Jul 09 2012 Tomas Hozza - 12:4.2.4-3 -- changed list of %%verify on the leases files (#837474) - -* Mon Jun 18 2012 Jiri Popelka - 12:4.2.4-2 -- define $SAVEDIR in dhclient-script (#833054) - -* Wed Jun 06 2012 Jiri Popelka - 12:4.2.4-1 -- 4.2.4 - -* Tue Jun 05 2012 Jiri Popelka - 12:4.2.4-0.8.rc2 -- return prematurely removed 12-dhcpd (NM dispatcher script) (#828522) - -* Fri May 25 2012 Jiri Popelka - 12:4.2.4-0.7.rc2 -- getifaddrs.patch: use HAVE_SA_LEN macro - -* Wed May 23 2012 Jiri Popelka - 12:4.2.4-0.6.rc2 -- 4.2.4rc2 - -* Mon May 07 2012 Jiri Popelka - 12:4.2.4-0.5.rc1 -- dhcpd.service: explicitly add -cf to indicate what conf file we use (#819325) -- no need to copy /etc/*.conf to /etc/dhcp/*.conf in %%prep anymore - -* Tue May 01 2012 Jiri Popelka - 12:4.2.4-0.4.rc1 -- 4.2.4rc1 - -* Thu Apr 26 2012 Jiri Popelka - 12:4.2.4-0.3.b1 -- remove inherit-leases.patch - it's probably not needed anymore (#815355) - -* Wed Apr 18 2012 Jiri Popelka - 12:4.2.4-0.2.b1 -- update paths.patch and source URL - -* Mon Apr 16 2012 Jiri Popelka - 12:4.2.4-0.1.b1 -- 4.2.4b1: noprefixavail.patch merged upstream - -* Fri Mar 30 2012 Jiri Popelka - 12:4.2.3-25.P2 -- move dhclient & dhclient-script from /sbin to /usr/sbin - -* Fri Mar 23 2012 Jiri Popelka - 12:4.2.3-24.P2 -- one more fix (#806342) - -* Fri Mar 23 2012 Jiri Popelka - 12:4.2.3-23.P2 -- improve #449946 fix (#806342) - -* Wed Mar 21 2012 Jiri Popelka - 12:4.2.3-22.P2 -- RFC5970 - DHCPv6 Options for Network Boot (#798735) - -* Wed Mar 21 2012 Jiri Popelka - 12:4.2.3-21.P2 -- don't use fallback_interface when releasing lease (#800561) - -* Wed Mar 21 2012 Jiri Popelka - 12:4.2.3-20.P2 -- use getifaddrs() to scan for interfaces on Linux (#449946) - -* Wed Feb 22 2012 Jiri Popelka - 12:4.2.3-19.P2 -- don't send log messages to the standard error descriptor by default (#790387) - -* Mon Feb 13 2012 Jiri Popelka - 12:4.2.3-18.P2 -- -timeout option (command line) with value 3 or less was driving dhclient mad (#789719) - -* Tue Feb 07 2012 Jiri Popelka - 12:4.2.3-17.P2 -- dhclient-script: install link-local static routes with correct scope (#787318) - -* Wed Feb 1 2012 Adam Williamson - 12:4.2.3-16.P2 -- rebuild for new bind-libs-lite - -* Tue Jan 31 2012 Jiri Popelka - 12:4.2.3-15.P2 -- revert previous change (#782499) -- remove the rest of the sysvinit scriptlets - -* Tue Jan 17 2012 Jiri Popelka - 12:4.2.3-14.P2 -- use PrivateTmp=true in service files (#782499) - -* Fri Jan 13 2012 Jiri Popelka - 12:4.2.3-13.P2 -- 4.2.3-P2: fix for CVE-2011-4868 (#781246) -- clean up old Provides and Obsoletes - -* Fri Jan 13 2012 Fedora Release Engineering - 12:4.2.3-12.P1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Dec 21 2011 Jiri Popelka - 12:4.2.3-11.P1 -- revert change made in 4.2.3-3 because of failing failover inicialization (#765967) - the procedure is now: - init lease file, init failover, init PID file, change effective user/group ID -- don't need to fix lease files ownership before starting service -- dhclient-script: allow static route with a 0.0.0.0 next-hop address (#769463) - -* Tue Dec 20 2011 Jiri Popelka - 12:4.2.3-10.P1 -- hopefully we don't need 12-dhcpd anymore as 'After=network.target' - in dhcpd[6].service should take care of the original problem (#565921) - -* Mon Dec 19 2011 Jiri Popelka - 12:4.2.3-9.P1 -- don't ship legacy SysV initscripts -- dhcpd6: move '-cf /etc/dhcp/dhcpd6.conf' from sysconfig/dhcpd6 to dhcpd6.service -- run 'chown -R dhcpd:dhcpd /var/lib/dhcpd/' before starting dhcpd/dhcpd6 service - for the case where leases file is owned by root:root as a - consequence of running dhcpd without '-user dhcpd -group dhcpd' (#744292) - -* Fri Dec 09 2011 Jiri Popelka - 12:4.2.3-8.P1 -- 4.2.3-P1: fix for CVE-2011-4539 (#765681) - -* Thu Nov 24 2011 Jiri Popelka - 12:4.2.3-7 -- Send DHCPDECLINE and exit(2) when duplicate address was detected and - dhclient had been started with '-1' (#756759). -- Don't build with -D_GNU_SOURCE, configure.ac uses AC_USE_SYSTEM_EXTENSIONS - -* Mon Nov 14 2011 Adam Tkac - 12:4.2.3-6 -- rebuild against new bind - -* Fri Nov 11 2011 Jiri Popelka - 12:4.2.3-5 -- dhclient-script: arping address in BOUND|RENEW|REBIND|REBOOT (#752116) - -* Wed Oct 26 2011 Fedora Release Engineering - 12:4.2.3-4 -- Rebuilt for glibc bug#747377 - -* Wed Oct 26 2011 Jiri Popelka - 12:4.2.3-3 -- Write lease file AFTER changing of the effective user/group ID. -- Move omshell from dhcp-common to main package (where it originally was). - -* Thu Oct 20 2011 Jiri Popelka - 12:4.2.3-2 -- Write PID file BEFORE changing of the effective user/group ID. -- Really define _hardened_build this time - -* Thu Oct 20 2011 Jiri Popelka - 12:4.2.3-1 -- 4.2.3 - -* Tue Oct 18 2011 Jiri Popelka - 12:4.2.3-0.1.rc1 -- 4.2.3rc1 - -* Sun Oct 09 2011 Jiri Popelka - 12:4.2.2-12 -- change ownership of /var/lib/dhcpd/ to dhcpd:dhcpd (#744292) -- no need to drop capabilies in dhcpd since it's been running as regular user - -* Fri Sep 30 2011 Jiri Popelka - 12:4.2.2-11 -- 56dhclient: ifcfg file was not sourced (#742482) - -* Thu Sep 29 2011 Jiri Popelka - 12:4.2.2-10 -- dhclient-script: address alias handling fixes from Scott Shambarger (#741786) - -* Thu Sep 22 2011 Jiri Popelka - 12:4.2.2-9 -- dhclient-script: do not backup&restore /etc/resolv.conf and /etc/localtime. - -* Wed Sep 21 2011 Jiri Popelka - 12:4.2.2-8 -- SystemTap support: spec file change, some dummy probes, tapset, simple script - -* Mon Sep 19 2011 Jiri Popelka - 12:4.2.2-7 -- Support for IPoIB (IP over InfiniBand) interfaces (#660681) -- Hopefully last tweak of adding of user and group (#699713) - -* Fri Sep 09 2011 Jiri Popelka - 12:4.2.2-6 -- PIE-RELRO.patch is not needed anymore, defining _hardened_build does the same -- One more tweak of adding of user and group (#699713) - -* Fri Sep 09 2011 Adam Tkac - 12:4.2.2-5 -- rebuild against new bind - -* Fri Aug 26 2011 Jiri Popelka - 12:4.2.2-4 -- Fix adding of user and group (#699713) - -* Fri Aug 19 2011 Jiri Popelka - 12:4.2.2-3 -- Tighten explicit libs sub-package requirement so that it includes - the correct architecture as well. - -* Fri Aug 12 2011 Jiri Popelka - 12:4.2.2-2 -- #699713: - - Use '--enable-paranoia --enable-early-chroot' configure flags - - Create/delete dhcpd user in %%post/%%postun - - Run dhcpd/dhcpd6 services with '-user dhcpd -group dhcpd' - -* Thu Aug 11 2011 Jiri Popelka - 12:4.2.2-1 -- 4.2.2: fix for CVE-2011-2748, CVE-2011-2749 (#729850) - -* Wed Aug 10 2011 Jiri Popelka - 12:4.2.2-0.4.rc1 -- Do not ship default /etc/dhcp/dhclient.conf (#560361,c#9) - -* Mon Jul 25 2011 Jiri Popelka - 12:4.2.2-0.3.rc1 -- Improve capabilities patch to be able to run with PARANOIA & EARLY_CHROOT (#699713) - -* Mon Jul 18 2011 Jiri Popelka - 12:4.2.2-0.2.rc1 -- 4.2.2rc1 - -* Fri Jul 01 2011 Jiri Popelka - 12:4.2.2-0.1.b1 -- 4.2.2b1: upstream merged initialization-delay.patch -- Drop all capabilities in dhcpd/dhcrelay (#699713) - -* Fri Jun 17 2011 Jiri Popelka - 12:4.2.1-12.P1 -- Removed upstream-merged IFNAMSIZ.patch -- Polished patches according to results from static analysis of code. - -* Thu Jun 16 2011 Jiri Popelka - 12:4.2.1-11.P1 -- Add triggerpostun scriptlet tied to dhcp-sysvinit -- Make it possible to build without downstream patches (Kamil Dudka) - -* Tue May 17 2011 Jiri Popelka - 12:4.2.1-10.P1 -- Fix typo in triggerun scriptlet (#705417) - -* Mon May 16 2011 Jiri Popelka - 12:4.2.1-9.P1 -- Packages dhcp/dhclient/dhcp-common explicitly require the libs sub-package - with the same version and release (bug #705037). -- Fix triggerun scriptlet - -* Mon May 09 2011 Jiri Popelka - 12:4.2.1-8.P1 -- Fix 11-dhclient to export variables (#702735) - -* Fri Apr 29 2011 Jiri Popelka - 12:4.2.1-7.P1 -- Comply with guidelines for systemd services - -* Wed Apr 27 2011 Jiri Popelka - 12:4.2.1-6.P1 -- Fix NetworkManager dispatcher script for dhcpd to support arbitrary interface names - -* Wed Apr 06 2011 Jiri Popelka - 12:4.2.1-5.P1 -- Better fix for CVE-2011-0997: making domain-name check more lenient (#694005) - -* Wed Apr 06 2011 Jiri Popelka - 12:4.2.1-4.P1 -- 4.2.1-P1: fix for CVE-2011-0997 (#694005) - -* Fri Mar 25 2011 Jiri Popelka - 12:4.2.1-3 -- Polished patches according to results from static analysis of code. - -* Mon Mar 07 2011 Rex Dieter - 12:4.2.1-2 -- rebuild (bind) - -* Wed Mar 02 2011 Jiri Popelka - 12:4.2.1-1 -- 4.2.1 - -* Wed Feb 23 2011 Jiri Popelka - 12:4.2.1-0.6.rc1 -- 4.2.1rc1 -- Fixed typo in dhclient.leases(5) (#676284) - -* Mon Feb 21 2011 Adam Tkac - 12:4.2.1-0.5.b1 -- rebuild against new bind-libs-lite - -* Tue Feb 08 2011 Fedora Release Engineering - 12:4.2.1-0.4.b1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 31 2011 Jiri Popelka - 12:4.2.1-0.3.b1 -- Prevent anything under _docdir from being scanned. (#674058) - -* Fri Jan 28 2011 Jiri Popelka - 12:4.2.1-0.2.b1 -- dhclient-script improvements, thanks to Ville Skyttä (#672279) - -* Thu Jan 27 2011 Jiri Popelka - 12:4.2.1-0.1.b1 -- 4.2.1b1: fix for CVE-2011-0413 (#672996) -- No longer need invalid-dhclient-conf, parse_date and release6-elapsed patches - -* Thu Jan 13 2011 Jiri Popelka - 12:4.2.0-26.P2 -- Fix loading of configuration when LDAP is used (#668276) - -* Mon Jan 03 2011 Jiri Popelka - 12:4.2.0-25.P2 -- Fix OMAPI (#666441) - -* Tue Dec 21 2010 Jiri Popelka - 12:4.2.0-24.P2 -- Provide default /etc/dhcp/dhclient.conf -- Client always sends dhcp-client-identifier (#560361) - -* Wed Dec 15 2010 Jiri Popelka - 12:4.2.0-23.P2 -- Add dhcp-common subpackage (#634673) - -* Mon Dec 13 2010 Jiri Popelka - 12:4.2.0-22.P2 -- 4.2.0-P2: fix for CVE-2010-3616 (#662326) -- Use upstream fix for #628258 -- Provide versioned symbols for rpmlint - -* Tue Dec 07 2010 Jiri Popelka - 12:4.2.0-21.P1 -- Porting dhcpd/dhcpd6/dhcrelay services from SysV to Systemd - -* Tue Nov 23 2010 Jiri Popelka - 12:4.2.0-20.P1 -- Remove explicit Obsoletes (#656310) - -* Fri Nov 19 2010 Dan Horák - 12:4.2.0-19.P1 -- fix build on sparc and s390 - -* Tue Nov 09 2010 Jiri Popelka - 12:4.2.0-18.P1 -- Applied Patrik Lahti's patch for DHCPv6 over PPP support (#626514) - -* Fri Nov 05 2010 Jiri Popelka - 12:4.2.0-17.P1 -- fix broken dependencies - -* Thu Nov 04 2010 Jiri Popelka - 12:4.2.0-16.P1 -- 4.2.0-P1: fix for CVE-2010-3611 (#649880) -- dhclient-script: when updating 'search' statement in resolv.conf, - add domain part of hostname if it's not already there (#637763) - -* Wed Oct 20 2010 Adam Tkac - 12:4.2.0-15 -- build dhcp's libraries as shared libs instead of static libs - -* Wed Oct 20 2010 Adam Tkac - 12:4.2.0-14 -- fire away bundled BIND source - -* Wed Oct 20 2010 Adam Tkac - 12:4.2.0-13 -- improve PIE patch (build libraries with -fpic, not with -fpie) - -* Wed Oct 13 2010 Jiri Popelka - 12:4.2.0-12 -- Server was ignoring client's - Solicit (where client included address/prefix as a preference) (#634842) - -* Thu Oct 07 2010 Jiri Popelka - 12:4.2.0-11 -- Use ping instead of arping in dhclient-script to handle - not-on-local-net gateway in ARP-less device (#524298) - -* Thu Oct 07 2010 Jiri Popelka - 12:4.2.0-10 -- Check whether there is any unexpired address in previous lease - prior to confirming (INIT-REBOOT) the lease (#585418) - -* Mon Oct 04 2010 Jiri Popelka - 12:4.2.0-9 -- RFC 3442 - ignore Router option only if - Classless Static Routes option contains default router - -* Thu Sep 30 2010 Jiri Popelka - 12:4.2.0-8 -- Explicitly clear the ARP cache and flush all addresses & routes - instead of bringing the interface down (#574568) - -* Tue Sep 07 2010 Jiri Popelka - 12:4.2.0-7 -- Hardening dhcpd/dhcrelay/dhclient by making them PIE & RELRO - -* Thu Sep 02 2010 Jiri Popelka - 12:4.2.0-6 -- Another fix for handling time values on 64-bit platforms (#628258) - -* Wed Sep 01 2010 Jiri Popelka - 12:4.2.0-5 -- Fix parsing of lease file dates & times on 64-bit platforms (#628258) - -* Tue Aug 31 2010 Jiri Popelka - 12:4.2.0-4 -- RFC 3442 - Classless Static Route Option for DHCPv4 (#516325) - -* Fri Aug 20 2010 Jiri Popelka - 12:4.2.0-3 -- Add DHCRELAYARGS variable to /etc/sysconfig/dhcrelay - -* Fri Jul 30 2010 Jiri Popelka - 12:4.2.0-2 -- Add 12-dhcpd NM dispatcher script (#565921) -- Rename 10-dhclient to 11-dhclient (10-sendmail already exists) - -* Wed Jul 21 2010 Jiri Popelka - 12:4.2.0-1 -- 4.2.0: includes ldap-for-dhcp - -* Mon Jul 12 2010 Jiri Popelka - 12:4.1.1-26.P1 -- Add LICENSE file to dhclient subpackage. - -* Thu Jul 01 2010 Jiri Popelka - 12:4.1.1-25.P1 -- Adhere to Static Library Packaging Guidelines (#609605) - -* Tue Jun 29 2010 Jiri Popelka - 12:4.1.1-24.P1 -- Fix parsing of date (#514828) - -* Thu Jun 03 2010 Jiri Popelka - 12:4.1.1-23.P1 -- 4.1.1-P1: pair of bug fixes including one for CVE-2010-2156 (#601405) -- Compile with -fno-strict-aliasing - -* Mon May 03 2010 Jiri Popelka - 12:4.1.1-22 -- Fix the initialization-delay.patch (#587070) - -* Thu Apr 29 2010 Jiri Popelka - 12:4.1.1-21 -- Cut down the 0-4 second delay before sending first DHCPDISCOVER (#587070) - -* Wed Apr 28 2010 Jiri Popelka - 12:4.1.1-20 -- Move /etc/NetworkManager/dispatcher.d/10-dhclient script - from dhcp to dhclient subpackage (#586999) - -* Wed Apr 28 2010 Jiri Popelka - 12:4.1.1-19 -- Add domain-search to the list of default requested DHCP options (#586906) - -* Wed Apr 21 2010 Jiri Popelka - 12:4.1.1-18 -- If the Reply was received in response to Renew or Rebind message, - client adds any new addresses in the IA option to the IA (#578097) - -* Mon Apr 19 2010 Jiri Popelka - 12:4.1.1-17 -- Fill in Elapsed Time Option in Release/Decline messages (#582939) - -* Thu Mar 25 2010 Jiri Popelka - 12:4.1.1-16 -- In client initiated message exchanges stop retransmission - upon reaching the MRD rather than at some point after it (#559153) - -* Wed Mar 24 2010 Jiri Popelka - 12:4.1.1-15 -- In dhclient-script check whether bound address - passed duplicate address detection (DAD) (#559147) -- If the bound address failed DAD (is found to be in use on the link), - the dhcpv6 client sends a Decline message to the server - as described in section 18.1.7 of RFC-3315 (#559147) - -* Fri Mar 19 2010 Jiri Popelka - 12:4.1.1-14 -- Fix UseMulticast.patch to not repeatedly parse dhcpd.conf for unicast option -- Fix dhclient-script to set interface MTU only when it's greater than 576 (#574629) - -* Fri Mar 12 2010 Jiri Popelka - 12:4.1.1-13 -- Discard unicast Request/Renew/Release/Decline message - (unless we set unicast option) and respond with Reply - with UseMulticast Status Code option (#573090) -- Remove DHCPV6 OPERATION section from dhclient.conf.5 - describing deprecated 'send dhcp6.oro' syntax - -* Thu Feb 25 2010 Jiri Popelka - 12:4.1.1-12 -- Fix paths in man pages (#568031) -- Remove odd tests in %%preun - -* Mon Feb 22 2010 Jiri Popelka - 12:4.1.1-11 -- Add interface-mtu to the list of default requested DHCP options (#566873) - -* Fri Feb 19 2010 Jiri Popelka - 12:4.1.1-10 -- Fix pm-utils/sleep.d/ directory ownership conflict - -* Fri Feb 19 2010 Jiri Popelka - 12:4.1.1-9 -- In dhclient-script: - - use ip command options '-4' or '-6' as shortcuts for '-f[amily] inet' resp. '-f[amily] inet6' - - do not use IP protocol family identifier with 'ip link' - -* Thu Feb 18 2010 Jiri Popelka - 12:4.1.1-8 -- Fix installation of pm-utils script (#479639, c#16) - -* Tue Feb 16 2010 Jiri Popelka - 12:4.1.1-7 -- ldap-for-dhcp-4.1.1-2 (#564810) - -* Tue Feb 16 2010 Jiri Popelka - 12:4.1.1-6 -- Fix ldap patch to explicitly link with liblber (#564810) - -* Mon Feb 08 2010 Jiri Popelka - 12:4.1.1-5 -- Fix dhclient-decline-backoff.patch (#562854) - -* Fri Feb 05 2010 Jiri Popelka - 12:4.1.1-4 -- Fix dhclient-script to delete address which the client is going to release - as soon as it begins the Release message exchange process (#559142) - -* Wed Feb 03 2010 Jiri Popelka - 12:4.1.1-3 -- move /etc/dhcp.conf to /etc/dhcp.conf.rpmsave in %%post (#561094) -- document -nc option in dhclient(8) man page - -* Tue Feb 02 2010 Jiri Popelka - 12:4.1.1-2 -- Fix capability patch (#546765) - -* Wed Jan 20 2010 Jiri Popelka - 12:4.1.1-1 -- Upgraded to ISC dhcp-4.1.1 - -* Mon Jan 18 2010 Jiri Popelka - 12:4.1.0p1-18 -- Hide startup info when starting dhcpd6 service. -- Remove -TERM from calling killproc when stopping dhcrelay (#555672) - -* Fri Jan 15 2010 Jiri Popelka - 12:4.1.0p1-17 -- Added init script to also start dhcpd for IPv6 (#552453) -- Added dhcpd6.conf.sample - -* Thu Jan 07 2010 Jiri Popelka - 12:4.1.0p1-16 -- Use %%global instead of %%define. - -* Mon Dec 14 2009 Jiri Popelka - 12:4.1.0p1-15 -- dhclient logs its pid to make troubleshooting NM managed systems - with multiple dhclients running easier (#546792) - -* Mon Nov 23 2009 Jiri Popelka - 12:4.1.0p1-14 -- Honor DEFROUTE=yes|no for all connection types (#530209) - -* Fri Oct 30 2009 Jiri Popelka - 12:4.1.0p1-13 -- Make dhclient-script add IPv6 address to interface (#531997) - -* Tue Oct 13 2009 Jiri Popelka - 12:4.1.0p1-12 -- Fix 56dhclient so network comes back after suspend/hibernate (#527641) - -* Thu Sep 24 2009 Jiri Popelka - 12:4.1.0p1-11 -- Make dhcpd and dhcrelay init scripts LSB compliant (#522134, #522146) - -* Mon Sep 21 2009 David Cantrell - 12:4.1.0p1-10 -- Obsolete the dhcpv6 and dhcpv6-client packages - -* Fri Sep 18 2009 David Cantrell - 12:4.1.0p1-9 -- Update dhclient-script with handlers for DHCPv6 states - -* Wed Aug 26 2009 David Cantrell - 12:4.1.0p1-8 -- Conditionalize restorecon calls in post scriptlets (#519479) - -* Wed Aug 26 2009 David Cantrell - 12:4.1.0p1-7 -- Do not require policycoreutils for post scriptlet (#519479) - -* Fri Aug 21 2009 David Cantrell - 12:4.1.0p1-6 -- BR libcap-ng-devel (#517649) - -* Tue Aug 18 2009 David Cantrell - 12:4.1.0p1-5 -- Drop unnecessary capabilities in dhclient (#517649) - -* Fri Aug 14 2009 David Cantrell - 12:4.1.0p1-4 -- Upgrade to latest ldap-for-dhcp patch which makes sure that only - dhcpd links with OpenLDAP (#517474) - -* Wed Aug 12 2009 David Cantrell - 12:4.1.0p1-3 -- Update NetworkManager dispatcher script to remove case conversion - and source /etc/sysconfig/network - -* Thu Aug 06 2009 David Cantrell - 12:4.1.0p1-2 -- Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and - resume with active dhclient leases (#479639) - -* Wed Aug 05 2009 David Cantrell - 12:4.1.0p1-1 -- Upgrade to dhcp-4.1.0p1, which is the official upstream release to fix - CVE-2009-0692 - -* Wed Aug 05 2009 David Cantrell - 12:4.1.0-27 -- Fix for CVE-2009-0692 -- Fix for CVE-2009-1892 (#511834) - -* Fri Jul 24 2009 Fedora Release Engineering - 12:4.1.0-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jul 23 2009 David Cantrell - 12:4.1.0-25 -- Include NetworkManager dispatcher script to run dhclient.d scripts (#459276) - -* Thu Jul 09 2009 David Cantrell - 12:4.1.0-24 -- Ensure 64-bit platforms parse lease file dates & times correctly (#448615) - -* Thu Jul 09 2009 David Cantrell - 12:4.1.0-23 -- Upgrade to ldap-for-dhcp-4.1.0-4 - -* Wed Jul 01 2009 David Cantrell - 12:4.1.0-22 -- Set permissions on /etc/dhcp to 0750 (#508247) -- Update to new ldap-for-dhcp patch set -- Correct problems when upgrading from a previous release and your - dhcpd.conf file not being placed in /etc/dhcp (#506600) - -* Fri Jun 26 2009 David Cantrell - 12:4.1.0-21 -- Handle cases in add_timeout() where the function is called with a NULL - value for the 'when' parameter (#506626) -- Fix SELinux denials in dhclient-script when the script makes backup - configuration files and restores them later (#483747) - -* Wed May 06 2009 David Cantrell - 12:4.1.0-20 -- Obsolete libdhcp4client <= 12:4.0.0-34.fc10 (#499290) - -* Mon Apr 20 2009 David Cantrell - 12:4.1.0-19 -- Restrict interface names given on the dhcpd command line to length - IFNAMSIZ or shorter (#441524) -- Change to /etc/sysconfig/network-scripts in dhclient-script before - calling need_config or source_config (#496233) - -* Mon Apr 20 2009 David Cantrell - 12:4.1.0-18 -- Make dhclient-script work with pre-configured wireless interfaces (#491157) - -* Thu Apr 16 2009 David Cantrell - 12:4.1.0-17 -- Fix setting default route when client IP address changes (#486512, #473658) -- 'reload' and 'try-restart' on dhcpd and dhcrelay init scripts - will display usage information and return code 3 - -* Mon Apr 13 2009 David Cantrell - 12:4.1.0-16 -- Correct %%post problems in dhclient package (#495361) -- Read hooks scripts from /etc/dhcp (#495361) -- Update to latest ldap-for-dhcp - -* Fri Apr 03 2009 David Cantrell - 12:4.1.0-15 -- Obsolete libdhcp and libdhcp-devel (#493547) - -* Thu Apr 02 2009 David Cantrell - 12:4.1.0-14 -- Obsolete libdhcp and libdhcp-devel (#493547) - -* Tue Mar 31 2009 David Cantrell - 12:4.1.0-13 -- dhclient obsoletes libdhcp4client (#493213) -- dhcp-devel obsolets libdhcp4client-devel (#493213) - -* Wed Mar 11 2009 David Cantrell - 12:4.1.0-12 -- Fix problems with dhclient.d script execution (#488864) - -* Mon Mar 09 2009 David Cantrell - 12:4.1.0-11 -- Use LDAP configuration patch from upstream tarball - -* Thu Mar 05 2009 David Cantrell - 12:4.1.0-10 -- restorecon fixes for /etc/localtime and /etc/resolv.conf (#488470) - -* Tue Feb 24 2009 Fedora Release Engineering - 12:4.1.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 18 2009 David Cantrell - 12:4.1.0-8 -- Correct subsystem execution in dhclient-script (#486251) - -* Wed Feb 18 2009 David Cantrell - 12:4.1.0-7 -- Do not segfault if the ipv6 kernel module is not loaded (#486097) - -* Mon Feb 16 2009 David Cantrell - 12:4.1.0-6 -- Enable dhcpv6 support (#480798) -- Fix config file migration in scriptlets (#480543) -- Allow dhclient-script expansion with /etc/dhcp/dhclient.d/*.sh scripts - -* Thu Jan 15 2009 Tomas Mraz - 12:4.1.0-5 -- rebuild with new openssl - -* Tue Jan 13 2009 David Cantrell - 12:4.1.0-4 -- Updated LSB init script header to reference /etc/dhcp/dhcpd.conf (#479012) - -* Sun Jan 11 2009 David Cantrell - 12:4.1.0-3 -- Correct syntax errors in %%post script (#479012) - -* Sat Jan 10 2009 David Cantrell - 12:4.1.0-2 -- Make sure all /etc/dhcp config files are marked in the manifest -- Include new config file directies in the dhcp and dhclient packages -- Do not overwrite new config files if they already exist - -* Tue Jan 06 2009 David Cantrell - 12:4.1.0-1 -- Upgraded to ISC dhcp-4.1.0 -- Had to rename the -T option to -timeout as ISC is now using -T -- Allow package rebuilders to easily enable DHCPv6 support with: - rpmbuild --with DHCPv6 dhcp.spec - Note that Fedora is still using the 'dhcpv6' package, but some - users may want to experiment with the ISC DHCPv6 implementation - locally. - -* Thu Dec 18 2008 David Cantrell - 12:4.0.0-34 -- Move /etc/dhclient.conf to /etc/dhcp/dhclient.conf -- Move /etc/dhcpd.conf to /etc/dhcp/dhcpd.conf - -* Thu Dec 18 2008 David Cantrell - 12:4.0.0-33 -- Remove unnecessary success/failure lines in init scripts (#476846) - -* Wed Dec 03 2008 David Cantrell - 12:4.0.0-32 -- Enable LDAP/SSL support in dhcpd (#467740) -- Do not calculate a prefix for an address we did not receive (#473885) -- Removed libdhcp4client because libdhcp has been removed from Fedora - -* Wed Oct 29 2008 David Cantrell - 12:4.0.0-31 -- Use O_CLOEXEC in open(2) calls and "e" mode in fopen(3) calls, build - with -D_GNU_SOURCE so we pick up O_CLOEXEC (#468984) -- Add missing prototype for validate_port() in common/inet.c - -* Thu Oct 23 2008 David Cantrell - 12:4.0.0-30 -- Fix dhclient.conf man page and sample config file to say 'supersede - domain-search', which is what was actually demonstrated (#467955) - -* Wed Oct 01 2008 David Cantrell - 12:4.0.0-29 -- Make sure /etc/resolv.conf has restorecon run on it (#451560) - -* Tue Sep 30 2008 David Cantrell - 12:4.0.0-28 -- Forgot to actually include (#438149) - -* Tue Sep 30 2008 David Cantrell - 12:4.0.0-27 -- Fix patch fuzziness and include errno.h in includes/dhcpd.h (#438149) - -* Tue Sep 30 2008 David Cantrell - 12:4.0.0-26 -- Validate port numbers for dhclient, dhcpd, and dhcrelay to ensure - that are within the correct range (#438149) - -* Mon Sep 29 2008 David Cantrell - 12:4.0.0-25 -- Fix dhcpd so it can find configuration data via LDAP (#452985) - -* Tue Sep 16 2008 David Cantrell - 12:4.0.0-24 -- 'server' -> 'service' in dhclient-script (#462343) - -* Fri Aug 29 2008 David Cantrell - 12:4.0.0-23 -- Prevent $metric from being set to '' (#460640) -- Remove unnecessary warning messages -- Do not source config file (ifcfg-DEVICE) unless it exists - -* Sun Aug 24 2008 David Cantrell - 12:4.0.0-22 -- Add missing '[' to dhclient-script (#459860) -- Correct test statement in add_default_gateway() in dhclient-script (#459860) - -* Sat Aug 23 2008 David Cantrell - 12:4.0.0-21 -- Fix syntax error in dhclient-script (#459860) - -* Fri Aug 22 2008 David Cantrell - 12:4.0.0-20 -- Rewrite of /sbin/dhclient-script (make the script a little more readable, - discontinue use of ifconfig in favor of ip, store backup copies of orig - files in /var rather than in /etc) - -* Wed Aug 06 2008 David Cantrell - 12:4.0.0-19 -- Remove 'c' from the domain-search format string in common/tables.c -- Prevent \032 from appearing in resolv.conf search line (#450042) -- Restore SELinux context on saved /etc files (#451560) - -* Sun Aug 03 2008 Tom "spot" Callaway - 12:4.0.0-18 -- filter out false positive perl requires - -* Fri Aug 01 2008 David Cantrell - 12:4.0.0-17 -- Carry over RES_OPTIONS from ifcfg-ethX files to /etc/resolv.conf (#202923) -- Clean up Requires tags for devel packages -- Allow SEARCH variable in ifcfg files to override search path (#454152) -- Do not down interface if there is an active lease (#453982) -- Clean up how dhclient-script restarts ypbind -- Set close-on-exec on dhclient.leases for SELinux (#446632) - -* Sat Jun 21 2008 David Cantrell - 12:4.0.0-16 -- Remove instaces of \032 in domain search option (#450042) -- Make 'service dhcpd configtest' display text indicating the status - -* Fri May 16 2008 David Cantrell - 12:4.0.0-15 -- Set close-on-exec on dhclient.leases for SELinux (#446632) - -* Tue Apr 01 2008 David Cantrell - 12:4.0.0-14 -- Avoid dhclient crash when run via NetworkManager (#439796) - -* Tue Mar 25 2008 David Cantrell - 12:4.0.0-13 -- Update dhclient-script to handle domain-search correctly (#437840) - -* Tue Mar 25 2008 David Cantrell - 12:4.0.0-12 -- Remove Requires on openldap-server (#432180) -- Replace CLIENTBINDIR, ETCDIR, DBDIR, and RUNDIR in the man pages with the - correct paths - -* Wed Feb 13 2008 David Cantrell - 12:4.0.0-11 -- Add missing newline to usage() screen in dhclient - -* Thu Feb 07 2008 David Cantrell - 12:4.0.0-10 -- Save conf files adding '.predhclient.$interface' to the name (#306381) -- Only restore conf files on EXPIRE/FAIL/RELEASE/STOP if there are no other - dhclient processes running (#306381) - -* Wed Feb 06 2008 David Cantrell - 12:4.0.0-9 -- Match LDAP server option values in stables.c and dhcpd.h (#431003) -- Fix invalid sprintf() statement in server/ldap.c (#431003) - -* Wed Feb 06 2008 David Cantrell - 12:4.0.0-8 -- Remove invalid fclose() patch - -* Tue Feb 05 2008 David Cantrell - 12:4.0.0-7 -- Don't leak /var/lib/dhclient/dhclient.leases file descriptors (#429890) - -* Tue Jan 22 2008 David Cantrell - 12:4.0.0-6 -- read_function() comes from the LDAP patch, so fix it there -- Init new struct universe structs in libdhcp4client so we don't crash on - multiple DHCP attempts (#428203) - -* Thu Jan 17 2008 David Cantrell - 12:4.0.0-5 -- Patch read_function() to handle size_t from read() correctly (#429207) - -* Wed Jan 16 2008 David Cantrell - 12:4.0.0-4 -- Fix dhclient.lease file parsing problems (#428785) -- Disable IPv6 support for now as we already ship dhcpv6 (#428987) - -* Tue Jan 15 2008 David Cantrell - 12:4.0.0-3 -- Fix segfault in next_iface4() and next_iface6() (#428870) - -* Mon Jan 14 2008 David Cantrell - 12:4.0.0-2 -- -fvisibility fails me again - -* Mon Jan 14 2008 David Cantrell - 12:4.0.0-1 -- Upgrade to ISC dhcp-4.0.0 (#426634) - - first ISC release to incorporate DHCPv6 protocol support - - source tree now uses GNU autoconf/automake -- Removed the libdhcp4client-static package - +%autochangelog diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..71d105b --- /dev/null +++ b/gating.yaml @@ -0,0 +1,25 @@ +--- !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} diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..d08e98a --- /dev/null +++ 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 diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..08f1098 --- /dev/null +++ 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 + diff --git a/sources b/sources index a05ae07..1e95ffe 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (dhcp-4.4.2b1.tar.gz) = 37f65ba12f578465e55132867f22c1bb082cd631724b7d0ce2e658fbace9b6969708cc4af843688e669f75d94241eaa40e07c384ee6527ec5297c03da3e45d97 +SHA512 (dhcp-4.4.3-P1.tar.gz) = d14dc44d1c015780ae19769816cb01015959927a1ad7a3e84b89e0463253aaf46451af88e3260347196373906d5b438c7c616fee45ec3f128aa82af6702b7154 +SHA512 (dhcp-4.4.3-P1.tar.gz.asc) = b24a81eda6fea2727e520d83c52ef25717db3a7c05b55f6e61f03cbf484e8b17b46ef11f2c46b223f30014866f32ed4170f223ce1d2233c63d7a6cfd7f9fa444 diff --git a/systemd-sysusers.conf b/systemd-sysusers.conf new file mode 100644 index 0000000..4841cdd --- /dev/null +++ b/systemd-sysusers.conf @@ -0,0 +1,3 @@ +#Type Name ID GECOS Home directory Shell +g dhcpd 177 +u dhcpd 177 "DHCP server" / /sbin/nologin diff --git a/systemd-tmpfiles.conf b/systemd-tmpfiles.conf new file mode 100644 index 0000000..14fae32 --- /dev/null +++ b/systemd-tmpfiles.conf @@ -0,0 +1 @@ +d /var/lib/dhcpd 0755 dhcpd dhcpd -