isc-dhcp: update to 4.3.3. Migrate from oldplackages

Signed-off-by: Antony Antony <antony@phenome.org>

3 files changed, 149 insertions, 0 deletions

diff --git a/net/isc-dhcp/patches/000-compile.patch b/net/isc-dhcp/patches/000-compile.patch
new file mode 100644
index 000000000..27ce1e930
--- /dev/null
+++ b/net/isc-dhcp/patches/000-compile.patch
@@ -0,0 +1,30 @@
+diff --git a/bind/Makefile.in b/bind/Makefile.in
+index bd784c6..5950d19 100644
+--- a/bind/Makefile.in
++++ b/bind/Makefile.in
+@@ -85,13 +85,13 @@ bind2:
+ 		echo Bind export libraries already installed ;               \
+ 	else                                                                 \
+ 		echo Building BIND Export libraries - this takes some time. ;\
+-		(cd ${bindsrcdir}/lib/export ;                               \
+-		  echo building in `pwd` ;                                   \
+-		  MAKE=${GMAKE} ${GMAKE} >> ${binddir}/build.log) ;          \
++		(cd ${bindsrcdir}/lib/export/dns ;			     \
++		  echo building gen using ${BUILD_CC} in `pwd` ;             \
++		  $(MAKE) CC=${BUILD_CC} CFLAGS="-O2" LIBS="" gen) ;         \
+                                                                              \
+ 		echo Installing BIND Export libraries to ${binddir}. ;       \
+ 		(cd ${bindsrcdir}/lib/export ;                               \
+-		  MAKE=${GMAKE} ${GMAKE} install > ${binddir}/install.log) ; \
++		  $(MAKE) DESTDIR="" install > ${binddir}/build.log) ;       \
+ 	fi
+ 
+ clean:
+@@ -100,6 +100,7 @@ clean:
+ 
+ # Include the following so that this Makefile is happy when the parent
+ # tries to use them.
++install-exec:
+ 
+ distdir:
+ 
diff --git a/net/isc-dhcp/patches/100-relay-rfc3527-link-selection.patch b/net/isc-dhcp/patches/100-relay-rfc3527-link-selection.patch
new file mode 100644
index 000000000..1c8659075
--- /dev/null
+++ b/net/isc-dhcp/patches/100-relay-rfc3527-link-selection.patch
@@ -0,0 +1,100 @@
+--- a/relay/dhcrelay.c
++++ b/relay/dhcrelay.c
+@@ -60,6 +60,7 @@
+ int client_packet_errors = 0;	/* Errors sending packets to clients. */
+ 
+ int add_agent_options = 0;	/* If nonzero, add relay agent options. */
++int add_rfc3527_suboption = 0;	/* If nonzero, add RFC3527 link selection sub-option. */
+ 
+ int agent_option_errors = 0;    /* Number of packets forwarded without
+ 				   agent options because there was no room. */
+@@ -99,6 +100,8 @@
+ 	struct sockaddr_in to;
+ } *servers;
+ 
++struct interface_info *uplink;
++
+ #ifdef DHCPv6
+ struct stream_list {
+ 	struct stream_list *next;
+@@ -147,6 +150,7 @@
+ "                     [-pf <pid-file>] [--no-pid]\n"\
+ "                     [-m append|replace|forward|discard]\n" \
+ "                     [-i interface0 [ ... -i interfaceN]\n" \
++"                     [-l interface]\n" \
+ "                     server0 [ ... serverN]\n\n" \
+ "       dhcrelay -6   [-d] [-q] [-I] [-c <hops>] [-p <port>]\n" \
+ "                     [-pf <pid-file>] [--no-pid]\n" \
+@@ -161,6 +165,7 @@
+ "                [-pf <pid-file>] [--no-pid]\n" \
+ "                [-m append|replace|forward|discard]\n" \
+ "                [-i interface0 [ ... -i interfaceN]\n" \
++"                [-l interface]\n" \
+ "                server0 [ ... serverN]\n\n"
+ #endif
+ 
+@@ -325,6 +330,20 @@
+ 				agent_relay_mode = discard;
+ 			} else
+ 				usage();
++		} else if (!strcmp (argv [i], "-l")) {
++			add_agent_options = 1;
++			add_rfc3527_suboption = 1;
++			if (++i == argc)
++				usage();
++
++			status = interface_allocate(&uplink, MDL);
++			if (status != ISC_R_SUCCESS)
++				log_fatal("%s: interface_allocate: %s",
++					  argv[i],
++					  isc_result_totext(status));
++			strcpy(uplink->name, argv[i]);
++			interface_snorf(uplink, INTERFACE_REQUESTED);
++			//interface_dereference(&uplink, MDL);
+ 		} else if (!strcmp(argv[i], "-D")) {
+ #ifdef DHCPv6
+ 			if (local_family_set && (local_family == AF_INET6)) {
+@@ -711,12 +730,17 @@
+ 					       ip->addresses[0])))
+ 		return;
+ 
++	/* RFC3527: Replace giaddr address by uplink address. The original
++	 * giaddr will be used in the link selection sub-option */
++	if (add_rfc3527_suboption)
++		packet->giaddr = uplink->addresses[0];
++
+ 	/* If giaddr is not already set, Set it so the server can
+ 	   figure out what net it's from and so that we can later
+ 	   forward the response to the correct net.    If it's already
+ 	   set, the response will be sent directly to the relay agent
+ 	   that set giaddr, so we won't see it. */
+-	if (!packet->giaddr.s_addr)
++	else if (!packet->giaddr.s_addr)
+ 		packet->giaddr = ip->addresses[0];
+ 	if (packet->hops < max_hop_count)
+ 		packet->hops = packet->hops + 1;
+@@ -1090,6 +1114,9 @@
+ 		optlen += ip->remote_id_len + 2;    /* RAI_REMOTE_ID + len */
+ 	}
+ 
++	if (add_rfc3527_suboption)
++		optlen += 6;
++
+ 	/* We do not support relay option fragmenting(multiple options to
+ 	 * support an option data exceeding 255 bytes).
+ 	 */
+@@ -1121,6 +1148,14 @@
+ 			memcpy(sp, ip->remote_id, ip->remote_id_len);
+ 			sp += ip->remote_id_len;
+ 		}
++
++		if (add_rfc3527_suboption) {
++			*sp++ = RAI_LINK_SELECT;
++			*sp++ = 4u;
++			memcpy(sp, &giaddr.s_addr, 4);
++			sp += 4;
++			log_debug ("RFC3527 link selection sub-option added: %s", inet_ntoa(giaddr));
++		}
+ 	} else {
+ 		++agent_option_errors;
+ 		log_error("No room in packet (used %d of %d) "
diff --git a/net/isc-dhcp/patches/510-bind-CC.patch b/net/isc-dhcp/patches/510-bind-CC.patch
new file mode 100644
index 000000000..ddef4f210
--- /dev/null
+++ b/net/isc-dhcp/patches/510-bind-CC.patch
@@ -0,0 +1,19 @@
+--- a/bind/Makefile.in
++++ b/bind/Makefile.in
+@@ -63,8 +63,14 @@
+ 	else                                                            \
+ 		echo Configuring BIND Export libraries for DHCP. ;      \
+ 		rm -rf ${cleandirs} ${cleanfiles} ;                     \
+-		(cd ${bindsrcdir} &&                                    \
+-                 ./configure ${bindconfig} > ${binddir}/configure.log); \
++               (cd ${bindsrcdir} && export CC=${CROSS_CC} &&           \
++                ./configure  --disable-atomic --disable-kqueue         \
++                --disable-epoll --disable-devpoll --without-openssl    \
++                --without-libxml2 --enable-exportlib                   \
++                --enable-threads=no                                    \
++                --with-export-includedir=${binddir}/include            \
++                --with-export-libdir=${binddir}/lib --with-gssapi=no   \
++               --without-randomdev > ${binddir}/configure.log);       \
+ 	fi
+ 
+ atf: