From owner-svn-ports-head@freebsd.org Tue Apr 24 19:50:43 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BC9A0FB1489; Tue, 24 Apr 2018 19:50:43 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6A516808FF; Tue, 24 Apr 2018 19:50:43 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B34A17914; Tue, 24 Apr 2018 19:50:43 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3OJohPQ009176; Tue, 24 Apr 2018 19:50:43 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3OJohxA009174; Tue, 24 Apr 2018 19:50:43 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201804241950.w3OJohxA009174@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Tue, 24 Apr 2018 19:50:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468237 - in head/security/libressl: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in head/security/libressl: . files X-SVN-Commit-Revision: 468237 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Apr 2018 19:50:44 -0000 Author: brnrd Date: Tue Apr 24 19:50:42 2018 New Revision: 468237 URL: https://svnweb.freebsd.org/changeset/ports/468237 Log: security/libressl: Fix AES-NI assembly detection - While here, fix broken man3 option Reported by: Franco Fichtner Added: head/security/libressl/files/ head/security/libressl/files/patch-configure.ac (contents, props changed) Modified: head/security/libressl/Makefile Modified: head/security/libressl/Makefile ============================================================================== --- head/security/libressl/Makefile Tue Apr 24 19:47:31 2018 (r468236) +++ head/security/libressl/Makefile Tue Apr 24 19:50:42 2018 (r468237) @@ -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 Added: head/security/libressl/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/libressl/files/patch-configure.ac Tue Apr 24 19:50:42 2018 (r468237) @@ -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])