security/libressl: sync with upstream

Taken from: HardenedBSD
opnsense · Dec 21, 2017 · 2936f5e · 2936f5e
1 parent 719da42
commit 2936f5e
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 50 deletions.
diff --git a/security/libressl/Makefile b/security/libressl/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	libressl
-PORTVERSION=	2.5.5
+PORTVERSION=	2.6.4
+#DISTNAME=	libressl-2.6.3
 CATEGORIES=	security devel
 MASTER_SITES=	OPENBSD/LibreSSL
 
@@ -23,7 +24,6 @@ CONFLICTS_INSTALL=	libressl-devel-[0-9]* \
 			openssl-[0-9]* \
 			openssl-devel-[0-9]*
 
-MAN3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-MAN3
 NC_CONFIGURE_ENABLE=	nc
 
 GNU_CONFIGURE=	yes
@@ -35,6 +35,11 @@ CFLAGS+=	-fpic -DPIC -Wl,-rpath,${PREFIX}/lib -Wl,--as-needed
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
+post-patch-MAN3-off:
+	${REINPLACE_CMD} -e 's/^install-man: install-man3/install-man:/' \
+		-e '/$$(MAKE) $$(AM_MAKEFLAGS) install-data-hook/d' \
+		${WRKSRC}/man/Makefile.in
+
 post-install:
 	${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem
 

diff --git a/security/libressl/distinfo b/security/libressl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499938563
-SHA256 (libressl-2.5.5.tar.gz) = e57f5e3d5842a81fe9351b6e817fcaf0a749ca4ef35a91465edba9e071dce7c4
-SIZE (libressl-2.5.5.tar.gz) = 3283158
+TIMESTAMP = 1513839112
+SHA256 (libressl-2.6.4.tar.gz) = 638a20c2f9e99ee283a841cd787ab4d846d1880e180c4e96904fc327d419d11f
+SIZE (libressl-2.6.4.tar.gz) = 3227935
diff --git a/security/libressl/files/extra-patch-MAN3 b/security/libressl/files/extra-patch-MAN3
diff --git a/security/libressl/files/patch-include_openssl_opensslv.h b/security/libressl/files/patch-include_openssl_opensslv.h