Drop 8 support.

With hat:	portmgr
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3694

9 files changed, 3 insertions, 100 deletions

diff --git a/security/openssh-portable-devel/Makefile b/security/openssh-portable-devel/Makefile
index 988aea11e45e..e60d41d99aca 100644
--- a/security/openssh-portable-devel/Makefile
+++ b/security/openssh-portable-devel/Makefile
@@ -113,16 +113,9 @@ PATCHFILES+=	openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz:-p1:gsskex
 .endif
 
 
-.if ${OSVERSION} >= 900000
 CONFIGURE_LIBS+=	-lutil
-.endif
 
-# 900007 is when utmp(5) was removed and utmpx(3) added
-.if ${OSVERSION} >= 900007
 CONFIGURE_ARGS+=	--disable-utmp --disable-wtmp --disable-wtmpx --without-lastlog
-.else
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-sshd-utmp-size
-.endif
 
 # Keep this last
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-version-addendum
diff --git a/security/openssh-portable-devel/files/extra-patch-sshd-utmp-size b/security/openssh-portable-devel/files/extra-patch-sshd-utmp-size
deleted file mode 100644
index f6a48e84fb00..000000000000
--- a/security/openssh-portable-devel/files/extra-patch-sshd-utmp-size
+++ /dev/null
@@ -1,36 +0,0 @@
-r184122 | des | 2008-10-21 06:58:26 -0500 (Tue, 21 Oct 2008) | 11 lines
-Changed paths:
-   M /head/crypto/openssh/loginrec.c
-   M /head/crypto/openssh/sshd.c
-
-At some point, construct_utmp() was changed to use realhostname() to fill
-in the struct utmp due to concerns about the length of the hostname buffer.
-However, this breaks the UseDNS option.  There is a simpler and better
-solution: initialize utmp_len to the correct value (UT_HOSTSIZE instead of
-MAXHOSTNAMELEN) and let get_remote_name_or_ip() worry about the size of the
-buffer.
-
-PR:             bin/97499
-Submitted by:   Bruce Cran <bruce@cran.org.uk>
-
-Index: sshd.c
-===================================================================
---- sshd.c.orig	2015-04-04 11:40:24.175508000 -0500
-+++ sshd.c	2015-04-04 11:40:38.082324000 -0500
-@@ -72,6 +72,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <limits.h>
-+#include <utmp.h>
- 
- #ifdef WITH_OPENSSL
- #include <openssl/dh.h>
-@@ -229,7 +230,7 @@ u_char *session_id2 = NULL;
- u_int session_id2_len = 0;
- 
- /* record remote hostname or ip */
--u_int utmp_len = HOST_NAME_MAX+1;
-+u_int utmp_len = UT_HOSTSIZE;
- 
- /* options.max_startup sized array of fd ints */
- int *startup_pipes = NULL;
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 8053cc7b5099..64d782bfe258 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -109,17 +109,9 @@ EXTRA_PATCHES+=		${FILESDIR}/extra-patch-hpn:-p2
 PATCHFILES+=	openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz:-p1:gsskex
 .endif
 
-
-.if ${OSVERSION} >= 900000
 CONFIGURE_LIBS+=	-lutil
-.endif
 
-# 900007 is when utmp(5) was removed and utmpx(3) added
-.if ${OSVERSION} >= 900007
 CONFIGURE_ARGS+=	--disable-utmp --disable-wtmp --disable-wtmpx --without-lastlog
-.else
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-sshd-utmp-size
-.endif
 
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-hostkeyalg_plus:-p1
 
diff --git a/security/openssh-portable/files/extra-patch-sshd-utmp-size b/security/openssh-portable/files/extra-patch-sshd-utmp-size
deleted file mode 100644
index f6a48e84fb00..000000000000
--- a/security/openssh-portable/files/extra-patch-sshd-utmp-size
+++ /dev/null
@@ -1,36 +0,0 @@
-r184122 | des | 2008-10-21 06:58:26 -0500 (Tue, 21 Oct 2008) | 11 lines
-Changed paths:
-   M /head/crypto/openssh/loginrec.c
-   M /head/crypto/openssh/sshd.c
-
-At some point, construct_utmp() was changed to use realhostname() to fill
-in the struct utmp due to concerns about the length of the hostname buffer.
-However, this breaks the UseDNS option.  There is a simpler and better
-solution: initialize utmp_len to the correct value (UT_HOSTSIZE instead of
-MAXHOSTNAMELEN) and let get_remote_name_or_ip() worry about the size of the
-buffer.
-
-PR:             bin/97499
-Submitted by:   Bruce Cran <bruce@cran.org.uk>
-
-Index: sshd.c
-===================================================================
---- sshd.c.orig	2015-04-04 11:40:24.175508000 -0500
-+++ sshd.c	2015-04-04 11:40:38.082324000 -0500
-@@ -72,6 +72,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <limits.h>
-+#include <utmp.h>
- 
- #ifdef WITH_OPENSSL
- #include <openssl/dh.h>
-@@ -229,7 +230,7 @@ u_char *session_id2 = NULL;
- u_int session_id2_len = 0;
- 
- /* record remote hostname or ip */
--u_int utmp_len = HOST_NAME_MAX+1;
-+u_int utmp_len = UT_HOSTSIZE;
- 
- /* options.max_startup sized array of fd ints */
- int *startup_pipes = NULL;
diff --git a/security/putty/Makefile b/security/putty/Makefile
index 17e05a9a40ff..1ac915075bee 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -45,9 +45,7 @@ MAKE_ARGS+=	GTK_CONFIG=:
 
 .if ${PORT_OPTIONS:MGSSAPI}
 _COMPAT=		-DSTATIC_GSSAPI
-.if ${OSVERSION} >= 900000
 LIB_DEPENDS+=		libkrb5support.so:${PORTSDIR}/security/krb5
-.endif
 .else
 _COMPAT=		-DNO_GSSAPI
 .endif
diff --git a/security/pwauth/Makefile b/security/pwauth/Makefile
index 0d5e737c3c3d..1775da6f119f 100644
--- a/security/pwauth/Makefile
+++ b/security/pwauth/Makefile
@@ -17,12 +17,6 @@ PLIST_FILES=	bin/pwauth bin/checkfaillog
 ALL_TARGET=	pwauth checkfaillog
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIB="-lcrypt -lpam"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 900007
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx
-.endif
-
 WWWUID=		`${ID} -u ${WWWOWN}`
 MINUID?=	1000
 
@@ -35,4 +29,4 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/checkfaillog ${STAGEDIR}${PREFIX}/bin
 	@${CHMOD} u=rxs ${STAGEDIR}${PREFIX}/bin/pwauth
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pwauth/files/extra-patch-utmpx b/security/pwauth/files/patch-utmpx
index eef7e8e9b3a5..eef7e8e9b3a5 100644
--- a/security/pwauth/files/extra-patch-utmpx
+++ b/security/pwauth/files/patch-utmpx
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index b025c1897721..2348f87f9b5f 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -47,8 +47,7 @@ CONFLICTS=	tor-[0-9]*
 
 .include <bsd.port.options.mk>
 
-.if ( (${OSVERSION} < 900000) || \
-(${OSVERSION} >= 900003) ) && !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
+.if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
 empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64)
 CONFIGURE_ARGS+=	--enable-gcc-hardening
 .else
diff --git a/security/tor/Makefile b/security/tor/Makefile
index bd9b248aa31b..45fe7f310e57 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -44,8 +44,7 @@ CONFLICTS=	tor-devel-[0-9]*
 
 .include <bsd.port.options.mk>
 
-.if ( (${OSVERSION} < 900000) || \
-(${OSVERSION} >= 900003) ) && !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
+.if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \
 empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64)
 CONFIGURE_ARGS+=	--enable-gcc-hardening
 .else