From nobody Tue Nov 08 01:44:23 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N5rVv6TBwz4h0P8; Tue, 8 Nov 2022 01:44:23 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N5rVv5yxgz3VLd; Tue, 8 Nov 2022 01:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667871863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ERDUeIDFD7oQo+uO594r0dfIoAld25GnieRtu4Hn1ho=; b=cQScrWsw6aEi9iPye+iukd+Qj4QeZYdkCvjiY7XHObSfsS+sBOEqADJfc6LmPS20B3g8Hb gx7kIgEDXnY5si7nsZGY5rGeEw5cGqEZMhh21O5hKwMlYQfB+I4A7k+N/Xq37eFuwJfmVd GHHEyBQGEE6DOW+7prmt/yjrmggpqprq+CDUySy+GZ4jp6GfwB8ojQO3oX/Qk5zyflmvym yu3SbryUUwPtvDjP/+EAUHEc4vWIg0n5jlVXUJhb/3SZWU9HAsTG5uSSGtIukfRSnR/Fud bn6jl02wQpo6D7sAAQ97BvRR4hXGpZzl9b9mLeXIeGYab10x1VUJRsycHnDNdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N5rVv53bqzNrH; Tue, 8 Nov 2022 01:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A81iNdA022291; Tue, 8 Nov 2022 01:44:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A81iNrW022290; Tue, 8 Nov 2022 01:44:23 GMT (envelope-from git) Date: Tue, 8 Nov 2022 01:44:23 GMT Message-Id: <202211080144.2A81iNrW022290@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 22784d03f650 - main - security/libreswan: Unbundle unbound-event.h List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22784d03f650254ab0516030594719946b475db1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667871863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ERDUeIDFD7oQo+uO594r0dfIoAld25GnieRtu4Hn1ho=; b=nc4p8jRHOiNZ8IjNYh72njieCDDPWcDRaCSTPrxq3mRHK3ozvUnR1/36zCGwlN6dM6inCc 1SuDetPZucwaARc/gvofvn7SY4BuspFEPDkwqz//sKhx6pCIfrVNKr33YHH0DHt8dzAqFv GQ2ts22LY9GMhNsn0Ji0wSEcOgPSwyibdFQc97rBJ/O3lm+RXb32wubaZ+jbo9ME1OEyHy wCbOP08qvf3h9pDeEqe5bz+5+v32oHcmQlSPUg5sS4M0pnJyZej1S67eWdNajtRdZJ5jyl eeCqU+Akp//MxEqf7uaP6QWJWdwpFyDrAWk48cppAfk5G055uome+12Y8i1JDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667871863; a=rsa-sha256; cv=none; b=lZqkBWUMdr8aVCYI9Tdwgil/Ab29B/A8yLMcO4S7NPOG8xc40/xf7lFwkvcOxl0Ue1bn0K ArbWnN92wbkPqaP59nWqHG7rrUlraGCdH75maw67R9aB2dHBEKxdLM/e+AQsCYkrRwWj4F u5vcr3WK9xVkmyOhlHcpeOROlUhg+FRQxn68+fPYKPd19PUjOdvv0PKB7CLlExXJkod9+b YLLCYenSBHba7/FHrdUQeR0rkALGi24/wKeWjdUW0DyHGPwIs5KYs6CQfw2qb5QkeciaVn XScJuxCiLHyi5+5S+sxYXvsOyPkzvC5MvO35q30V+gd+Qqrpw5wRnBrTDvoMeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=22784d03f650254ab0516030594719946b475db1 commit 22784d03f650254ab0516030594719946b475db1 Author: Yuri Victorovich AuthorDate: 2022-11-08 01:37:04 +0000 Commit: Yuri Victorovich CommitDate: 2022-11-08 01:44:19 +0000 security/libreswan: Unbundle unbound-event.h Use the header from dns/unbound. PR: 263838 Reported by: Andrew Cagney --- security/libreswan/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/security/libreswan/Makefile b/security/libreswan/Makefile index abcbbf95589b..bd101cc16091 100644 --- a/security/libreswan/Makefile +++ b/security/libreswan/Makefile @@ -1,5 +1,6 @@ PORTNAME= libreswan DISTVERSION= 4.7 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://download.libreswan.org/ @@ -11,6 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gawk:lang/gawk \ + ${NONEXISTENT}:dns/unbound:patch \ xmlto:textproc/xmlto # build requires xmlto, but manpages aren't installed: https://github.com/libreswan/libreswan/issues/479 LIB_DEPENDS= libcurl.so:ftp/curl \ libevent.so:devel/libevent \ @@ -21,6 +23,8 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ USES= bison cpe gmake pkgconfig python +UNBOUND_WRKSRC= `${MAKE} -C ${PORTSDIR}/dns/unbound -V WRKSRC` + CFLAGS+= -I${WRKSRC}/include/unbound MAKE_ARGS= PKG_BASE=${LOCALBASE} \ @@ -35,6 +39,9 @@ BINARY_ALIAS= awk=gawk OPTIONS_DEFINE= DOCS +post-patch: + @${RM} ${WRKSRC}/include/unbound/unbound-event.h && ${LN} -s ${UNBOUND_WRKSRC}/libunbound/unbound-event.h ${WRKSRC}/include/unbound/unbound-event.h + post-configure: @cd ${WRKSRC}/mk/defaults && \ ${RLN} netbsd.mk freebsd.mk