Attachment 203784 Details for Bug 228898 – Unbreak with openssl111, rebased from comment #29

[patch] Unbreak with openssl111, rebased from comment #29

net-snmp.diff (text/plain), 1.38 KB, created by Dima Panov on 2019-04-19 04:32:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2019-04-19 04:32:22 UTC

Size: 1.38 KB

patch

obsolete

>Index: net-mgmt/net-snmp/Makefile
>===================================================================
>--- net-mgmt/net-snmp/Makefile	(revision 499321)
>+++ net-mgmt/net-snmp/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	snmp
> PORTVERSION=	5.7.3
>-PORTREVISION=	19
>+PORTREVISION=	20
> CATEGORIES=	net-mgmt ipv6
> MASTER_SITES=	SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} \
> 		ZI
>@@ -16,8 +16,6 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BROKEN_SSL=	openssl111
>-
> LIB_DEPENDS=	libpkg.so:ports-mgmt/pkg
> 
> NOT_FOR_ARCHS=		mips mips64
>@@ -77,7 +75,7 @@
> 
> .include <bsd.port.options.mk>
> 
>-.if ${OSVERSION} >= 1200085
>+.if (${OSVERSION} >= 1200085 || ${SSL_DEFAULT:Mopenssl111*})
> EXTRA_PATCHES=	${PATCHDIR}/extra-patch-openssl11
> .endif
> 
>@@ -96,7 +94,7 @@
> PLIST_SUB+=	WITH_PYTHON="@comment "
> .endif
> 
>-CONFIGURE_ARGS+=--with-openssl="/usr"
>+CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}"
> 
> .if ${PORT_OPTIONS:MDUMMY}
> CONFIGURE_ARGS+=--with-dummy-values
>@@ -252,6 +250,10 @@
> 	    ${WRKSRC}/agent/mibgroup/host/hr_system.c
> 	@${REINPLACE_CMD} -E -e 's|return pci_lookup_name|disabled broken|g' \
> 		${WRKSRC}/configure
>+.if (${OSVERSION} >= 1200085 || ${SSL_DEFAULT:Mopenssl111*})
>+	@${REINPLACE_CMD} -E -e 's|SSL_library_init|OPENSSL_init_ssl|g' \
>+		${WRKSRC}/configure
>+.endif
> 	@${CP} ${WRKSRC}/include/net-snmp/system/freebsd12.h \
> 		${WRKSRC}/include/net-snmp/system/freebsd13.h
>

Actions: View | Diff

Attachments on bug 228898: 198040 | 198050 | 198051 | 198690 | 198805 | 203784