From owner-svn-ports-all@freebsd.org Sun Jul 7 15:17:19 2019 Return-Path: Delivered-To: svn-ports-all@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 4E76B15E67B0; Sun, 7 Jul 2019 15:17:19 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B152F8A662; Sun, 7 Jul 2019 15:17:18 +0000 (UTC) (envelope-from fluffy@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 8AFB22AB3; Sun, 7 Jul 2019 15:17:18 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x67FHIvg065483; Sun, 7 Jul 2019 15:17:18 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x67FHISU065482; Sun, 7 Jul 2019 15:17:18 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <201907071517.x67FHISU065482@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Sun, 7 Jul 2019 15:17:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r506141 - head/net-mgmt/net-snmp X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: head/net-mgmt/net-snmp X-SVN-Commit-Revision: 506141 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B152F8A662 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:12874, ipnet:2000::/3, country:IT] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Jul 2019 15:17:19 -0000 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 -.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