diff --git a/dhcp-4.2.4-send_release.patch b/dhcp-4.2.4-send_release.patch deleted file mode 100644 index 3e0a618..0000000 --- a/dhcp-4.2.4-send_release.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up dhcp-4.2.4b1/client/dhclient.c.send_release dhcp-4.2.4b1/client/dhclient.c ---- dhcp-4.2.4b1/client/dhclient.c.send_release 2012-04-16 17:48:52.000000000 +0200 -+++ dhcp-4.2.4b1/client/dhclient.c 2012-04-16 17:50:44.357396720 +0200 -@@ -2764,8 +2764,8 @@ void send_release (cpp) - inet_ntoa (destination.sin_addr), - ntohs (destination.sin_port), client -> xid); - -- if (fallback_interface) { -- result = send_packet(fallback_interface, NULL, &client->packet, -+ if (client -> interface) { -+ result = send_packet(client -> interface, NULL, &client->packet, - client->packet_length, from, &destination, - NULL); - if (result < 0) { -@@ -2776,7 +2776,7 @@ void send_release (cpp) - } - } else { - /* Send out a packet. */ -- result = send_packet(client->interface, NULL, &client->packet, -+ result = send_packet(fallback_interface, NULL, &client->packet, - client->packet_length, from, &destination, - NULL); - if (result < 0) { diff --git a/dhcp.spec b/dhcp.spec index 6d06d5e..42067b5 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -18,7 +18,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.2.5 -Release: 2%{?dist} +Release: 3%{?dist} # 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. @@ -70,7 +70,6 @@ Patch36: dhcp-4.2.5-systemtap.patch Patch37: dhcp-4.2.3-dhclient-decline-onetry.patch Patch38: dhcp-4.2.3-P2-log_perror.patch Patch39: dhcp-4.2.4-getifaddrs.patch -Patch40: dhcp-4.2.4-send_release.patch Patch41: dhcp-4.2.5-rfc5970-dhcpv6-options-for-network-boot.patch Patch42: dhcp-4.2.4-failOverPeer.patch Patch44: dhcp-4.2.4-P1-interval.patch @@ -299,10 +298,6 @@ rm -rf includes/isc-dhcp # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #28761]) %patch39 -p1 -b .getifaddrs -# Don't use fallback_interface when releasing lease (#800561) -# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #30544]) -%patch40 -p1 -b .send_release - # RFC5970 - DHCPv6 Options for Network Boot (#798735) %patch41 -p1 -b .rfc5970 @@ -580,6 +575,9 @@ fi %changelog +* Wed Jul 10 2013 Jiri Popelka - 12:4.2.5-3 +- remove send_release.patch (#979510) + * Mon Jun 03 2013 Tomas Hozza - 12:4.2.5-2 - rebuild against new bind