mbox

dnsmasq 276test8: latest patches from upstream (001-002)

Message ID 1454613368-17813-1-git-send-email-matthias.fischer@ipfire.org
State Superseded
Headers

Message

Matthias Fischer Feb. 5, 2016, 6:16 a.m. UTC
  There were problems with patch 037 and the newcomer 057, so
I decided to start all over with '276test8'. All previous patches are
included!

Patch 057 (Final form of configuration for EDNS0 MAC-address code,
http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=1e5051228d543d0db4b32f24a2e6a97f2d061cf0
won't apply - it was always:

...
1 out of 3 hunks FAILED -- saving rejects to file src/dnsmasq.c.rej
...

This patch tries to remove this line:

-      daemon->relay6 || option_bool(OPT_TFTP) || option_bool(OPT_DNS_CLIENT))

which occurs exactly nowhere.

So I switched to '276test8' and started numbering again - building and test
runs are ok since then.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 lfs/dnsmasq                                        |   62 +-
 src/patches/dnsmasq/001-Fix_FTBFS_on_illumos.patch |   26 +
 ...01-include_0_0_0_0_8_in_DNS_rebind_checks.patch |   41 -
 ...ke_names_of_ARP_script_actions_consistent.patch |   88 +
 ...subnet_to_allow_arbitary_subnet_addresses.patch |  271 ---
 ...h_zones_locally_when_localise_queries_set.patch |   34 -
 .../004-fix_behaviour_of_empty_dhcp-option.patch   |   38 -
 ...ution_to_ENOMEM_error_with_IPv6_multicast.patch |   50 -
 ...page_on_RDNSS_set_in_router_advertisement.patch |   35 -
 ...gned_dangling_CNAME_replies_to_DS_queries.patch |   30 -
 ...6_option_56_does_not_hold_an_address_list.patch |   25 -
 ...pect_the_--no_resolv_flag_in_inotify_code.patch |   47 -
 ..._5e3e464ac4022ee0b3794513abe510817e2cf3ca.patch |   26 -
 ...11-Catch_errors_from_sendmsg_in_DHCP_code.patch |   32 -
 ...12-Update_list_of_subnet_for_--bogus-priv.patch |   48 -
 ...y_address_from_DNS_overlays_A_record_from.patch |   43 -
 ...14-Handle_unknown_DS_hash_algos_correctly.patch |   39 -
 .../015-Fix_crash_at_start_up_with_conf-dir.patch  |   38 -
 ...ajor_rationalisation_of_DNSSEC_validation.patch | 2209 --------------------
 ...hing_RRSIGs_and_returning_them_from_cache.patch |  612 ------
 ...caches_DS_records_to_a_more_logical_place.patch |  269 ---
 ...lise_RR-filtering_code_for_use_with_EDNS0.patch |  755 -------
 .../dnsmasq/020-DNSSEC_validation_tweak.patch      |  134 --
 ...1-Tweaks_to_EDNS0_handling_in_DNS_replies.patch |  133 --
 ..._code_Check_zone_status_is_NSEC_proof_bad.patch |  409 ----
 ...023-Fix_brace_botch_in_dnssec_validate_ds.patch |   98 -
 ...ning_which_DNSSEC_sig_algos_are_supported.patch |  145 --
 ...EDNS0_handling_and_computation_use_of_udp.patch |  643 ------
 ...aks_in_handling_unknown_DNSSEC_algorithms.patch |  262 ---
 ...obscure_off-by-one_in_DNSSEC_hostname_cmp.patch |   27 -
 .../028-Minor_tweak_to_previous_commit.patch       |   39 -
 .../dnsmasq/029-NSEC3_check_RFC5155_para_8_2.patch |   39 -
 ...plit_EDNS0_stuff_into_its_own_source_file.patch |  777 -------
 .../031-Handle_extending_EDNS0_OPT_RR.patch        |  295 ---
 ..._512_bytes_that_the_client_isnt_expecting.patch |   65 -
 ...ix_build_failure_when_DNSSEC_code_omitted.patch |   55 -
 ...go_with_DNSKEY_and_DS_also_digest_with_DS.patch |   81 -
 .../035-More_EDNS0_packet_size_tweaks.patch        |  138 --
 ...036-Cache_access_to_the_kernels_ARP_table.patch |  414 ----
 ...DNS-client-id_EDNS0_and_ARP_tracking_code.patch |  976 ---------
 ...38-Correct_logic_for_when_to_start_helper.patch |   25 -
 src/patches/dnsmasq/039-Trivial_code_tweak.patch   |   33 -
 ...SEC_sig_timestamps_when_far_in_the_future.patch |   50 -
 ...ist_code_resulting_in_100percent_CPU_spin.patch |   56 -
 ..._script_support_enabled_and_DHCP_disabled.patch |   48 -
 ...3-Update_copyright_notices_Happy_new_year.patch |  473 -----
 ...when_scripts_excluded_at_compilation_time.patch |   25 -
 ...orwarding_to_private_servers_for_a_domain.patch |   41 -
 ...ors_and_check_we_have_a_root-trust_anchor.patch |   70 -
 ...ze_calculation_when_hosts-file_read_fails.patch |   41 -
 ...main_servers_unless_trust-anchor_provided.patch |  217 --
 src/patches/dnsmasq/049-arp_c_tidy_up.patch        |   34 -
 ...NSSEC_validation_with_private_DNS_servers.patch |  139 --
 .../051-Fix_botch_in_forward_c_flags_code.patch    |   29 -
 .../052-Fix_sporadic_crash_in_find_mac.patch       |   27 -
 ..._code_and_set_conntrack_on_DNSSEC_queries.patch |  270 ---
 ...ms_in_last_commit_when_DNSSEC_not_enabled.patch |   58 -
 ...main-needed_set_and_no_servers_configured.patch |   91 -
 .../dnsmasq/056-Add_--max-port_config_option.patch |  166 --
 59 files changed, 118 insertions(+), 11323 deletions(-)
 create mode 100644 src/patches/dnsmasq/001-Fix_FTBFS_on_illumos.patch
 delete mode 100644 src/patches/dnsmasq/001-include_0_0_0_0_8_in_DNS_rebind_checks.patch
 create mode 100644 src/patches/dnsmasq/002-Make_names_of_ARP_script_actions_consistent.patch
 delete mode 100644 src/patches/dnsmasq/002-enhance_add_subnet_to_allow_arbitary_subnet_addresses.patch
 delete mode 100644 src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch
 delete mode 100644 src/patches/dnsmasq/004-fix_behaviour_of_empty_dhcp-option.patch
 delete mode 100644 src/patches/dnsmasq/005-suggest_solution_to_ENOMEM_error_with_IPv6_multicast.patch
 delete mode 100644 src/patches/dnsmasq/006-clarify_man_page_on_RDNSS_set_in_router_advertisement.patch
 delete mode 100644 src/patches/dnsmasq/007-handle_signed_dangling_CNAME_replies_to_DS_queries.patch
 delete mode 100644 src/patches/dnsmasq/008-DHCPv6_option_56_does_not_hold_an_address_list.patch
 delete mode 100644 src/patches/dnsmasq/009-Respect_the_--no_resolv_flag_in_inotify_code.patch
 delete mode 100644 src/patches/dnsmasq/010-Rationalise_5e3e464ac4022ee0b3794513abe510817e2cf3ca.patch
 delete mode 100644 src/patches/dnsmasq/011-Catch_errors_from_sendmsg_in_DHCP_code.patch
 delete mode 100644 src/patches/dnsmasq/012-Update_list_of_subnet_for_--bogus-priv.patch
 delete mode 100644 src/patches/dnsmasq/013-Fix_crash_when_empty_address_from_DNS_overlays_A_record_from.patch
 delete mode 100644 src/patches/dnsmasq/014-Handle_unknown_DS_hash_algos_correctly.patch
 delete mode 100644 src/patches/dnsmasq/015-Fix_crash_at_start_up_with_conf-dir.patch
 delete mode 100644 src/patches/dnsmasq/016-Major_rationalisation_of_DNSSEC_validation.patch
 delete mode 100644 src/patches/dnsmasq/017-Abandon_caching_RRSIGs_and_returning_them_from_cache.patch
 delete mode 100644 src/patches/dnsmasq/018-Move_code_which_caches_DS_records_to_a_more_logical_place.patch
 delete mode 100644 src/patches/dnsmasq/019-Generalise_RR-filtering_code_for_use_with_EDNS0.patch
 delete mode 100644 src/patches/dnsmasq/020-DNSSEC_validation_tweak.patch
 delete mode 100644 src/patches/dnsmasq/021-Tweaks_to_EDNS0_handling_in_DNS_replies.patch
 delete mode 100644 src/patches/dnsmasq/022-Tidy_up_DNSSEC_non-existence_code_Check_zone_status_is_NSEC_proof_bad.patch
 delete mode 100644 src/patches/dnsmasq/023-Fix_brace_botch_in_dnssec_validate_ds.patch
 delete mode 100644 src/patches/dnsmasq/024-Do_a_better_job_of_determining_which_DNSSEC_sig_algos_are_supported.patch
 delete mode 100644 src/patches/dnsmasq/025-Major_tidy_up_of_EDNS0_handling_and_computation_use_of_udp.patch
 delete mode 100644 src/patches/dnsmasq/026-More_tweaks_in_handling_unknown_DNSSEC_algorithms.patch
 delete mode 100644 src/patches/dnsmasq/027-Nasty_rare_and_obscure_off-by-one_in_DNSSEC_hostname_cmp.patch
 delete mode 100644 src/patches/dnsmasq/028-Minor_tweak_to_previous_commit.patch
 delete mode 100644 src/patches/dnsmasq/029-NSEC3_check_RFC5155_para_8_2.patch
 delete mode 100644 src/patches/dnsmasq/030-Split_EDNS0_stuff_into_its_own_source_file.patch
 delete mode 100644 src/patches/dnsmasq/031-Handle_extending_EDNS0_OPT_RR.patch
 delete mode 100644 src/patches/dnsmasq/032-Truncate_DNS_replies_bigger_512_bytes_that_the_client_isnt_expecting.patch
 delete mode 100644 src/patches/dnsmasq/033-Fix_build_failure_when_DNSSEC_code_omitted.patch
 delete mode 100644 src/patches/dnsmasq/034-Log_signature_algo_with_DNSKEY_and_DS_also_digest_with_DS.patch
 delete mode 100644 src/patches/dnsmasq/035-More_EDNS0_packet_size_tweaks.patch
 delete mode 100644 src/patches/dnsmasq/036-Cache_access_to_the_kernels_ARP_table.patch
 delete mode 100644 src/patches/dnsmasq/037-First_complete_version_of_DNS-client-id_EDNS0_and_ARP_tracking_code.patch
 delete mode 100644 src/patches/dnsmasq/038-Correct_logic_for_when_to_start_helper.patch
 delete mode 100644 src/patches/dnsmasq/039-Trivial_code_tweak.patch
 delete mode 100644 src/patches/dnsmasq/040-Fix_datatype-sixe_botch_which_broke_DNSSEC_sig_timestamps_when_far_in_the_future.patch
 delete mode 100644 src/patches/dnsmasq/041-Fix_botch_in_new_arp-cache_linked-list_code_resulting_in_100percent_CPU_spin.patch
 delete mode 100644 src/patches/dnsmasq/042-Handle_building_with_script_support_enabled_and_DHCP_disabled.patch
 delete mode 100644 src/patches/dnsmasq/043-Update_copyright_notices_Happy_new_year.patch
 delete mode 100644 src/patches/dnsmasq/044-Fix_FTBFS_when_scripts_excluded_at_compilation_time.patch
 delete mode 100644 src/patches/dnsmasq/045-Inhibit_DNSSEC_validation_when_forwarding_to_private_servers_for_a_domain.patch
 delete mode 100644 src/patches/dnsmasq/046-DNSSEC_Handle_non-root_trust_anchors_and_check_we_have_a_root-trust_anchor.patch
 delete mode 100644 src/patches/dnsmasq/047-Fix_bad_cache-size_calculation_when_hosts-file_read_fails.patch
 delete mode 100644 src/patches/dnsmasq/048-Disable_DNSSEC_for_server_domain_servers_unless_trust-anchor_provided.patch
 delete mode 100644 src/patches/dnsmasq/049-arp_c_tidy_up.patch
 delete mode 100644 src/patches/dnsmasq/050-Complete_work_to_allow_DNSSEC_validation_with_private_DNS_servers.patch
 delete mode 100644 src/patches/dnsmasq/051-Fix_botch_in_forward_c_flags_code.patch
 delete mode 100644 src/patches/dnsmasq/052-Fix_sporadic_crash_in_find_mac.patch
 delete mode 100644 src/patches/dnsmasq/053-Complete_DNSSEC_server-selection_code_and_set_conntrack_on_DNSSEC_queries.patch
 delete mode 100644 src/patches/dnsmasq/054-Fix_problems_in_last_commit_when_DNSSEC_not_enabled.patch
 delete mode 100644 src/patches/dnsmasq/055-Fix_wrong_reply_to_simple_name_when_--domain-needed_set_and_no_servers_configured.patch
 delete mode 100644 src/patches/dnsmasq/056-Add_--max-port_config_option.patch