net-misc/dhcp: rebase patches

Signed-off-by: David Seifert <soap@gentoo.org>

11 files changed, 40 insertions, 41 deletions

diff --git a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
index 9db36ddb42da..e425d52ea36c 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1.ebuild
@@ -50,26 +50,26 @@ src_unpack() {
 PATCHES=(
 	# Gentoo patches - these will probably never be accepted upstream
 	# Fix some permission issues
-	"${FILESDIR}/${PN}-3.0-fix-perms.patch"
+	"${FILESDIR}/${PN}-4.4.3-fix-perms.patch"
 
 	# Enable dhclient to equery NTP servers
-	"${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
-	"${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
+	"${FILESDIR}/${PN}-4.4.3-dhclient-ntp.patch"
+	"${FILESDIR}/${PN}-4.4.3-dhclient-resolvconf.patch"
 
 	# Enable dhclient to get extra configuration from stdin
-	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
+	"${FILESDIR}/${PN}-4.4.3-dhclient-stdin-conf.patch"
 	# bug #265531
-	"${FILESDIR}/${PN}-4.3.6-nogateway.patch"
+	"${FILESDIR}/${PN}-4.4.3-nogateway.patch"
 	# bug #296921
-	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch"
+	"${FILESDIR}/${PN}-4.4.3-quieter-ping.patch"
 	# bug #437108
-	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch"
+	"${FILESDIR}/${PN}-4.4.3-always-accept-4.patch"
 	# bug #480636
-	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch"
+	"${FILESDIR}/${PN}-4.4.3-iproute2-path.patch"
 	# bug #471142
-	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch"
+	"${FILESDIR}/${PN}-4.4.3-bindtodevice-inet6.patch"
 	# bug #559832
-	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch"
+	"${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
 
 	# Possible upstream candidates
 )
diff --git a/net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch
index bbb25eb194bd..bbb25eb194bd 100644
--- a/net-misc/dhcp/files/dhcp-4.4.0-always-accept-4.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-always-accept-4.patch
diff --git a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch
index 77254c32e2b0..f6ea0f858c6d 100644
--- a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-bindtodevice-inet6.patch
@@ -5,15 +5,14 @@ snipped from fedora
 # dhclient -6: bind socket to interface (#1001742)
 # (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #34784])
 
-diff -up dhcp-4.2.5/common/socket.c.bindtodevice_inet6 dhcp-4.2.5/common/socket.c
---- dhcp-4.2.5/common/socket.c.bindtodevice_inet6	2013-09-17 16:47:05.000000000 +0200
-+++ dhcp-4.2.5/common/socket.c	2013-09-17 16:48:18.975997842 +0200
-@@ -245,7 +245,7 @@ if_register_socket(struct interface_info
+--- a/common/socket.c
++++ b/common/socket.c
+@@ -266,7 +266,7 @@
  
  #if defined(SO_BINDTODEVICE)
  	/* Bind this socket to this interface. */
 -	if ((local_family != AF_INET6) && (info->ifp != NULL) &&
 +	if (((do_multicast == 0)||(*do_multicast == 0)) && (info->ifp != NULL) &&
  	    setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE,
- 			(char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
- 		log_fatal("setsockopt: SO_BINDTODEVICE: %m");
+ 		       (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
+ 		log_fatal("Can't set SO_BINDTODEVICE on dhcp socket for"
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch
index a504840dd5ab..a504840dd5ab 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-ntp.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-ntp.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch
index ccfdbcf4a206..63a67b7b1151 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-dhclient-resolvconf.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-resolvconf.patch
@@ -1,5 +1,5 @@
---- dhcp-4.3.6/client/scripts/bsdos
-+++ dhcp-4.3.6/client/scripts/bsdos
+--- a/client/scripts/bsdos
++++ b/client/scripts/bsdos
 @@ -1,27 +1,25 @@
  #!/bin/sh
  
@@ -55,10 +55,10 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
---- dhcp-4.3.6/client/scripts/freebsd
-+++ dhcp-4.3.6/client/scripts/freebsd
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+--- a/client/scripts/freebsd
++++ b/client/scripts/freebsd
 @@ -11,54 +11,23 @@
  fi
  
@@ -160,9 +160,9 @@
 +      chmod 644 /etc/resolv.conf
      fi
    fi
- }
---- dhcp-4.3.6/client/scripts/linux
-+++ dhcp-4.3.6/client/scripts/linux
+   # If we're making confs, may as well make an ntp.conf too
+--- a/client/scripts/linux
++++ b/client/scripts/linux
 @@ -35,16 +35,16 @@
  # update /etc/resolv.conf based on received values
  # This updated version mostly follows Debian script by Andrew Pollock et al.
@@ -248,10 +248,10 @@
  	fi
 -        mv -f $new_resolv_conf /etc/resolv.conf
      fi
- }
  
---- dhcp-4.3.6/client/scripts/netbsd
-+++ dhcp-4.3.6/client/scripts/netbsd
+     # If we're making confs, may as well make an ntp.conf too
+--- a/client/scripts/netbsd
++++ b/client/scripts/netbsd
 @@ -1,27 +1,25 @@
  #!/bin/sh
  
@@ -308,10 +308,10 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
---- dhcp-4.3.6/client/scripts/openbsd
-+++ dhcp-4.3.6/client/scripts/openbsd
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+--- a/client/scripts/openbsd
++++ b/client/scripts/openbsd
 @@ -1,27 +1,25 @@
  #!/bin/sh
  
@@ -369,10 +369,10 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
---- dhcp-4.3.6/client/scripts/solaris
-+++ dhcp-4.3.6/client/scripts/solaris
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
+--- a/client/scripts/solaris
++++ b/client/scripts/solaris
 @@ -1,21 +1,39 @@
  #!/bin/sh  
  
@@ -418,5 +418,5 @@
 +      chmod 644 /etc/resolv.conf
 +    fi
    fi
- }
- 
+   # If we're making confs, may as well make an ntp.conf too
+   make_ntp_conf
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-stdin-conf.patch
index bf5a54c32153..bf5a54c32153 100644
--- a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-dhclient-stdin-conf.patch
diff --git a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch b/net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch
index f4b3fd18e167..5b3a8ab2c20a 100644
--- a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-fix-perms.patch
@@ -1,6 +1,6 @@
 --- a/server/dhcpd.c
 +++ b/server/dhcpd.c
-@@ -602,6 +602,12 @@
+@@ -892,6 +892,12 @@
  	if (lftest)
  		exit (0);
  
@@ -11,5 +11,5 @@
 +#endif /* PARANOIA */
 +
  	/* Discover all the network interfaces and initialize them. */
- 	discover_interfaces (DISCOVER_SERVER);
- 
+ #if defined(DHCPv6) && defined(DHCP4o6)
+ 	if (dhcpv4_over_dhcpv6) {
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch b/net-misc/dhcp/files/dhcp-4.4.3-iproute2-path.patch
index 18b04e620c14..18b04e620c14 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-iproute2-path.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-iproute2-path.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch b/net-misc/dhcp/files/dhcp-4.4.3-ldap-ipv6-client-id.patch
index 2a7f8183d4e0..2a7f8183d4e0 100644
--- a/net-misc/dhcp/files/dhcp-4.3.3-ldap-ipv6-client-id.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-ldap-ipv6-client-id.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch b/net-misc/dhcp/files/dhcp-4.4.3-nogateway.patch
index d299cc503f60..d299cc503f60 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-nogateway.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-nogateway.patch
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch b/net-misc/dhcp/files/dhcp-4.4.3-quieter-ping.patch
index 3efb6459ebf9..3efb6459ebf9 100644
--- a/net-misc/dhcp/files/dhcp-4.3.6-quieter-ping.patch
+++ b/net-misc/dhcp/files/dhcp-4.4.3-quieter-ping.patch