Date: Sun, 7 Jul 2019 15:17:18 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506141 - head/net-mgmt/net-snmp Message-ID: <201907071517.x67FHISU065482@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Sun Jul 7 15:17:18 2019 New Revision: 506141 URL: https://svnweb.freebsd.org/changeset/ports/506141 Log: - Real unbreak with openssl111 from ports - Use ${OPENSSLBASE} instead of hardcode path - Add more conditions to check for extra patch - TLS option is fine now PR: 228898 Submitted by: myself (this patch) Approved by: maintainer timeout (>2 months after submission) MFH: 2019Q3 Modified: head/net-mgmt/net-snmp/Makefile Modified: head/net-mgmt/net-snmp/Makefile ============================================================================== --- head/net-mgmt/net-snmp/Makefile Sun Jul 7 15:11:19 2019 (r506140) +++ head/net-mgmt/net-snmp/Makefile Sun Jul 7 15:17:18 2019 (r506141) @@ -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 @@ COMMENT= Extendable SNMP implementation 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 @@ TLS_CONFIGURE_ON= --with-security-modules=tsm --with-t .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+= PYDISTUTILS_PKGVERSION=${PYDISTUTILS_PKGVE 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 @@ post-patch: ${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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907071517.x67FHISU065482>