1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-12 03:00:28 +00:00

security/libressl: Fix AES-NI assembly detection

- While here, fix broken man3 option

Reported by:	Franco Fichtner <franco opnsense org>
This commit is contained in:
Bernard Spil 2018-04-24 19:50:42 +00:00
parent b3316bb802
commit a9ccd9465b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=468237
2 changed files with 21 additions and 3 deletions

View File

@ -3,7 +3,6 @@
PORTNAME= libressl
PORTVERSION= 2.6.4
#DISTNAME= libressl-2.6.3
CATEGORIES= security devel
MASTER_SITES= OPENBSD/LibreSSL
@ -27,7 +26,7 @@ CONFLICTS_INSTALL= libressl-devel-[0-9]* \
NC_CONFIGURE_ENABLE= nc
GNU_CONFIGURE= yes
USES= cpe libtool pathfix pkgconfig
USES= autoreconf cpe libtool pathfix pkgconfig
USE_LDCONFIG= yes
OPTIONS_SUB= yes
CFLAGS+= -fpic -DPIC -Wl,-rpath,${PREFIX}/lib -Wl,--as-needed
@ -36,7 +35,7 @@ INSTALL_TARGET= install-strip
TEST_TARGET= check
post-patch-MAN3-off:
${REINPLACE_CMD} -e 's/^install-man: install-man3/install-man:/' \
${REINPLACE_CMD} -e '/^install-man:/s/install-man3//' \
-e '/$$(MAKE) $$(AM_MAKEFLAGS) install-data-hook/d' \
${WRKSRC}/man/Makefile.in

View File

@ -0,0 +1,19 @@
--- configure.ac.orig 2017-11-04 20:04:56 UTC
+++ configure.ac
@@ -102,13 +102,13 @@ int main() {return 0;}
AC_ARG_ENABLE([asm],
AS_HELP_STRING([--disable-asm], [Disable assembly]))
-AM_CONDITIONAL([OPENSSL_NO_ASM], [test "x$enable_asm" = "xno"])
+AM_CONDITIONAL([OPENSSL_NO_ASM],[test x$enableval = xno])
# Conditionally enable assembly by default
AM_CONDITIONAL([HOST_ASM_ELF_X86_64],
- [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
+ [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64," -a x$enableval != xno])
AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64],
- [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
+ [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64," -a x$enableval != xno])
# Check if time_t is sized correctly
AC_CHECK_SIZEOF([time_t], [time.h])