net/isc-dhcp41-server: Update to 4.1-ESV-R12-P1

This fixes CVE-2015-8605.

Mark DEPRECATED and provide EXPIRES to coincide with 2016Q2 branch
creation.

The PORTVERSION scheme of this port is strange, but I am continuing the
current version scheme as this is probably the last release of the 4.1
branch. The ISC Software Support Policy states that 4.1 ESV is support
ends December 2015. [1]

[1] http://www.isc.org/downloads/software-support-policy/

MFH:		2016Q1
Security:	CVE-2015-8605

7 files changed, 15 insertions, 71 deletions

diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile
index ee4cc584e6d1..0c753b8cb130 100644
--- a/net/isc-dhcp41-server/Makefile
+++ b/net/isc-dhcp41-server/Makefile
@@ -15,10 +15,13 @@ COMMENT?=	The ISC Dynamic Host Configuration Protocol server
 
 LICENSE=	ISCL
 
-PATCHLEVEL=	R7
-PORTREVISION_SERVER=	9
-PORTREVISION_CLIENT=	2
-PORTREVISION_RELAY=	5
+PATCHLEVEL=	R12-P1
+PORTREVISION_SERVER=	10
+PORTREVISION_CLIENT=	3
+PORTREVISION_RELAY=	6
+
+DEPRECATED=	isc-dhcp 4.1 is now End of Life
+EXPIRES=	2016-03-01
 
 SUBSYS?=	server
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL}
@@ -138,7 +141,7 @@ post-patch:
 	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${MSG_FILE} > ${PKGMESSAGE}
 	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${WRKSRC}/client/dhclient.conf
+		${WRKSRC}/client/dhclient.conf.example
 
 do-install:
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/${SUBSYS} install
@@ -168,7 +171,9 @@ do-install:
 post-install:
 .if ${SUBSYS} == client
 	${INSTALL_SCRIPT} ${WRKSRC}/client/scripts/freebsd ${STAGEDIR}${PREFIX}/sbin/dhclient-script
+	${MV} ${STAGEDIR}${PREFIX}/etc/dhclient.conf.example ${STAGEDIR}${PREFIX}/etc/dhclient.conf.sample
 .elif ${SUBSYS} == server
+	${MV} ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.example ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.sample
 .if ${PORT_OPTIONS:MIPV6}
 	@${LN} -sf isc-dhcpd ${STAGEDIR}${PREFIX}/etc/rc.d/isc-dhcpd6
 .endif
diff --git a/net/isc-dhcp41-server/distinfo b/net/isc-dhcp41-server/distinfo
index 814bdcf0e02c..42d29c7084fa 100644
--- a/net/isc-dhcp41-server/distinfo
+++ b/net/isc-dhcp41-server/distinfo
@@ -1,4 +1,2 @@
-SHA256 (dhcp-4.1-ESV-R7.tar.gz) = 25d579291a13ccce39c5dbb0e2f2ce8e974c82015bc4e3ee653cf95a4ed15ca4
-SIZE (dhcp-4.1-ESV-R7.tar.gz) = 1162002
-SHA256 (ldap-for-dhcp-4.1.1-2.tar.gz) = 566b7be2ebefdc583d0bf0095c804ba69807b67e5cc29a2b64b1b39202b37d0d
-SIZE (ldap-for-dhcp-4.1.1-2.tar.gz) = 39004
+SHA256 (dhcp-4.1-ESV-R12-P1.tar.gz) = d46af9ce8fb19b797d7bd3d8542a05353522bae8d77231eb07736af0007feb62
+SIZE (dhcp-4.1-ESV-R12-P1.tar.gz) = 1252652
diff --git a/net/isc-dhcp41-server/files/patch-client__Makefile.in b/net/isc-dhcp41-server/files/patch-client__Makefile.in
deleted file mode 100644
index 77d7639365d1..000000000000
--- a/net/isc-dhcp41-server/files/patch-client__Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- client/Makefile.in.orig	2010-11-24 13:58:02.077206326 -0500
-+++ client/Makefile.in	2010-11-24 13:59:01.452202855 -0500
-@@ -354,8 +354,8 @@
- 	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f.sample'"; \
-+	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f.sample"; \
- 	done
- 
- uninstall-dist_sysconfDATA:
diff --git a/net/isc-dhcp41-server/files/patch-client__dhclient.conf b/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example
index 163beaee6394..5caeb53b8e0c 100644
--- a/net/isc-dhcp41-server/files/patch-client__dhclient.conf
+++ b/net/isc-dhcp41-server/files/patch-client_dhclient.conf.example
@@ -1,6 +1,6 @@
---- ./client/dhclient.conf.orig	2010-05-02 20:39:06.000000000 -0400
-+++ ./client/dhclient.conf	2010-05-02 20:39:16.000000000 -0400
-@@ -11,7 +11,7 @@
+--- client/dhclient.conf.example.orig	2016-01-17 18:48:11 UTC
++++ client/dhclient.conf.example
+@@ -11,7 +11,7 @@ retry 60;
  reboot 10;
  select-timeout 5;
  initial-interval 2;
diff --git a/net/isc-dhcp41-server/files/patch-server__Makefile.am b/net/isc-dhcp41-server/files/patch-server__Makefile.am
deleted file mode 100644
index d92124b72909..000000000000
--- a/net/isc-dhcp41-server/files/patch-server__Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
---- server/Makefile.am.orig	2010-10-24 11:42:38.419499721 -0400
-+++ server/Makefile.am	2010-10-24 11:44:01.489499357 -0400
-@@ -1,6 +1,7 @@
- AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
- 
- dist_sysconf_DATA = dhcpd.conf
-+dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
- sbin_PROGRAMS = dhcpd
- dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
- 		omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
-@@ -13,3 +14,12 @@
- man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
- EXTRA_DIST = $(man_MANS)
- 
-+install-dist_sysconfDATA: $(dist_sysconf_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-+	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
-+	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+		$(am__strip_dir) \
-+		echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f.sample'"; \
-+		$(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f.sample"; \
-+	done
diff --git a/net/isc-dhcp41-server/files/patch-server__Makefile.in b/net/isc-dhcp41-server/files/patch-server__Makefile.in
deleted file mode 100644
index 6ae828933da5..000000000000
--- a/net/isc-dhcp41-server/files/patch-server__Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./server/Makefile.in.orig	2010-01-07 19:47:06.000000000 -0500
-+++ ./server/Makefile.in	2010-05-02 20:38:26.000000000 -0400
-@@ -370,8 +370,8 @@
- 	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f.sample'"; \
-+	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f.sample"; \
- 	done
- 
- uninstall-dist_sysconfDATA:
diff --git a/net/isc-dhcp41-server/files/patch-server__bpf.c b/net/isc-dhcp41-server/files/patch-server__bpf.c
deleted file mode 100644
index 8bf85e902537..000000000000
--- a/net/isc-dhcp41-server/files/patch-server__bpf.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/bpf.c.orig	2010-10-22 10:38:06.623559939 +0400
-+++ common/bpf.c	2010-10-22 10:38:26.436563986 +0400
-@@ -577,6 +577,7 @@
- 	 */
-         switch (sa->sdl_type) {
-                 case IFT_ETHER:
-+                case IFT_L2VLAN:
-                         hw->hlen = sa->sdl_alen + 1;
-                         hw->hbuf[0] = HTYPE_ETHER;
-                         memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);