Update to isc-dhcp 4.3.0.

ok sthen@
This commit is contained in:
brad 2014-03-16 11:45:15 +00:00
parent bdc8db410c
commit 8f29c1f1b1
5 changed files with 17 additions and 26 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.33 2013/10/23 13:44:11 jca Exp $
# $OpenBSD: Makefile,v 1.34 2014/03/16 11:45:15 brad Exp $
COMMENT-main= ISC DHCP Server
COMMENT-client= ISC DHCP Client
COMMENT-omapi= ISC DHCP OMAPI
VERSION= 4.2.5-P1
REVISION= 0
VERSION= 4.3.0
DISTNAME= isc-dhcp-${VERSION}
PKGNAME= isc-dhcp-${VERSION:S/-P/./}
PKGNAME-main= isc-dhcp-server-${VERSION:S/-P/./}

View File

@ -1,2 +1,2 @@
SHA256 (dhcp-4.2.5-P1.tar.gz) = WbBsn113XkaZm0IsRbkilALEYrEUzhaFYXv7K4sCglA=
SIZE (dhcp-4.2.5-P1.tar.gz) = 8255960
SHA256 (dhcp-4.3.0.tar.gz) = p7ZRfVzzLF5J0jI6Y94A7+U5HffLAEXfoOyPbuRuvoo=
SIZE (dhcp-4.3.0.tar.gz) = 8960567

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-client_Makefile_in,v 1.2 2013/03/07 18:59:35 brad Exp $
--- client/Makefile.in.orig Wed Jan 2 19:02:24 2013
+++ client/Makefile.in Sun Feb 24 23:40:23 2013
@@ -554,7 +554,8 @@ uninstall-man: uninstall-man5 uninstall-man8
$OpenBSD: patch-client_Makefile_in,v 1.3 2014/03/16 11:45:15 brad Exp $
--- client/Makefile.in.orig Fri Dec 13 15:49:44 2013
+++ client/Makefile.in Tue Dec 24 09:52:38 2013
@@ -724,7 +724,8 @@ uninstall-man: uninstall-man5 uninstall-man8
dhclient.o: dhclient.c
$(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \

View File

@ -1,18 +1,10 @@
$OpenBSD: patch-common_socket_c,v 1.2 2012/07/02 10:59:03 sthen Exp $
--- common/socket.c.orig Fri Mar 9 06:28:11 2012
+++ common/socket.c Sun Jun 10 00:12:59 2012
@@ -718,6 +718,7 @@ ssize_t send_packet6(struct interface_info *interface,
/*
* Set the target address we're sending to.
*/
+ to->sin6_scope_id = if_nametoindex(interface->name);
m.msg_name = to;
m.msg_namelen = sizeof(*to);
@@ -748,7 +749,6 @@ ssize_t send_packet6(struct interface_info *interface,
$OpenBSD: patch-common_socket_c,v 1.3 2014/03/16 11:45:15 brad Exp $
--- common/socket.c.orig Fri Jan 31 14:20:49 2014
+++ common/socket.c Sat Feb 8 14:53:55 2014
@@ -819,7 +819,6 @@ ssize_t send_packet6(struct interface_info *interface,
pktinfo = (struct in6_pktinfo *)CMSG_DATA(cmsg);
memset(pktinfo, 0, sizeof(*pktinfo));
pktinfo->ipi6_ifindex = if_nametoindex(interface->name);
pktinfo->ipi6_ifindex = ifindex;
- m.msg_controllen = cmsg->cmsg_len;
result = sendmsg(interface->wfdesc, &m, 0);

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-server_dhcpd_c,v 1.2 2013/03/07 18:59:35 brad Exp $
--- server/dhcpd.c.orig Wed Jan 2 19:05:16 2013
+++ server/dhcpd.c Sun Feb 24 23:40:23 2013
@@ -707,6 +707,12 @@ main(int argc, char **argv) {
$OpenBSD: patch-server_dhcpd_c,v 1.3 2014/03/16 11:45:15 brad Exp $
--- server/dhcpd.c.orig Fri Jan 31 14:20:49 2014
+++ server/dhcpd.c Fri Feb 7 10:48:46 2014
@@ -622,6 +622,12 @@ main(int argc, char **argv) {
if (lftest)
exit (0);