svn commit: r468237 - in head/security/libressl: . files

[Adam Weinberger]

> On 25 Apr, 2018, at 6:00, Adam Weinberger <adamw at adamw.org> wrote:
>
>> On 24 Apr, 2018, at 13:50, Bernard Spil <brnrd at FreeBSD.org> wrote:
>>
>> 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 <franco opnsense org>
>
> Both these patches sound like they’ll affect the produced package.  
> Shouldn’t PORTREVISION be bumped here?
>
> # Adam

Bernard, can you respond to this please?

# Adam


--
Adam Weinberger
adamw at adamw.org
http://www.adamw.org

>> 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])