From nobody Tue Apr 11 07:14:09 2023 X-Original-To: dev-commits-ports-main@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 4PwcXK2nHGz44Hmv; Tue, 11 Apr 2023 07:14:09 +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 4PwcXK1x5Dz4ZnL; Tue, 11 Apr 2023 07:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681197249; 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=fJ9+KY5tVTbP7in3ecU6FFErK5i8Tg+hbgxJRGvXJeA=; b=tW2HvhD9/HlnDL6RDFgvNcM8j+e2E1QBh+d8uCHL07PDoekNRi7my90hpteRMq9tQpYh67 ajcfnwmBGsxA6RHpPXkS+S39pKWHumPEmR3dqxZVOLM6kHIKDtWqBy3sS8xqTDD3MCbwg5 rNbHLw90AlhlOUKEYl/Gdu3VMyfZ4Vr5vGRUA4jIxYaENQ2qjgk5WRb+d03WNul3HKbPt0 ZuyRYdPA1AvLzQPk/6RCsmp+dmxtTmekKvZRnY6//3VrHZV1xqqUo7Qj9da35Z//QGtjNJ OBgbLTuBk2gKElZIjaS05RyISgC+0j6vGWJzNX8STd2sy8rtsbeIZ9TQKYT/kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681197249; 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=fJ9+KY5tVTbP7in3ecU6FFErK5i8Tg+hbgxJRGvXJeA=; b=rVDtqjqFqKRtf3MEjyYaZer0FKH6ThXvnKOpkSnx+blr5OPKpfCts/s65WqOsvrmhHjE++ 8/qF7FBreRIi2izbHEACXGqcGkbDIH0fPIAV6jiSFtXHinfhTT9bJoPXziLXDd6q3wch0I bHKt3qefGO25k8NfW11cllvKZab0ch1+6yikSpskVB1KfFq8rcUuepz+d3i9/H2c9FFp9d RvCfRh+6cZGsV5y/XUFRwlXFAuDdbOvktpvgIsQ90tVU+2SZETMEGG62XS4FoFIrvzjN1O +edjgGYwmN9BSboO4oNGHvEX4It3USlgsL3/jhUttSCARis++flm5DzsjPRr/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681197249; a=rsa-sha256; cv=none; b=eceA3TmQObRnQHEsSShtAw80jIqHXKomnV5HJLkH4nO/hLp+d3dG14LbM0cRX0A1in5urh +uTE/6NSal6iU96zlWD0UXMzHAiBr01aRHaFuQ4SZHVzsitpkAwpKxp/aARqajyVunlSHi rcUQNQl0s0Uy4lMQEK1WV2IqwlyMP22b7IIp3sv879FUiJxWfFGmONmLiGCJKW1RPeBFwH /Wa8NvMXJNRtXTTX6OaRoOdmo4QjCfazV9SLV6mwgyF4Gp2FCvNKvEG0+Ee5etL/o2VtYZ lQMHfknuIG86xfCZ2c3w8oeWQFCly/YTp+iLMLIcaIScMJOemGTsxbL6d3fqsA== 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 4PwcXK0ympz1NRw; Tue, 11 Apr 2023 07:14:09 +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 33B7E9PK007088; Tue, 11 Apr 2023 07:14:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33B7E92Y007087; Tue, 11 Apr 2023 07:14:09 GMT (envelope-from git) Date: Tue, 11 Apr 2023 07:14:09 GMT Message-Id: <202304110714.33B7E92Y007087@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kristof Provost Subject: git: 4bebb4a0bc1d - main - net/libpfctl: support FreeBSD 12 and 13 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4bebb4a0bc1d0355d022257abd6a944bc6f3245e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/ports/commit/?id=4bebb4a0bc1d0355d022257abd6a944bc6f3245e commit 4bebb4a0bc1d0355d022257abd6a944bc6f3245e Author: Kristof Provost AuthorDate: 2023-03-31 02:50:01 +0000 Commit: Kristof Provost CommitDate: 2023-04-11 07:13:59 +0000 net/libpfctl: support FreeBSD 12 and 13 Extend the port to also build for FreeBSD 12.4 and FreeBSD 13.1. While here also update the 14.0 hash to a more recent code snapshot. Reviewed by: garga Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39360 --- net/libpfctl/Makefile | 40 +++++++++++++++++++++++++++------------ net/libpfctl/distinfo | 10 +++++++--- net/libpfctl/files/patch-Makefile | 3 ++- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/net/libpfctl/Makefile b/net/libpfctl/Makefile index c2ad523c431b..470956b04d13 100644 --- a/net/libpfctl/Makefile +++ b/net/libpfctl/Makefile @@ -1,8 +1,9 @@ +.include + PORTNAME= libpfctl -PORTVERSION= 0.1 +PORTVERSION= 0.2 CATEGORIES= net MASTER_SITES= LOCAL/kp/ -DISTFILES= libpfctl-${_LIBPFCTL_HASH}.tar.gz MAINTAINER= kp@FreeBSD.org COMMENT= Library for interaction with pf(4) @@ -10,32 +11,47 @@ WWW= https://cgit.freebsd.org/src/tree/lib/libpfctl LICENSE= BSD2CLAUSE -BROKEN_FreeBSD_12= Will not work until nvlist-ified ioctls are available -BROKEN_FreeBSD_13= Will not work until nvlist-ified ioctls are available - USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/libpfctl -_LIBPFCTL_HASH= 4ae3a97e127c +_LIBPFCTL_HASH= 134ced89c4ca -PLIST_FILES= lib/libpfctl.so.0 \ +PLIST_FILES= \ + lib/libpfctl.so \ + lib/libpfctl.so.0 \ include/libpfctl.h +.include + +.if ${OSREL} == "14.0" +DISTFILES= libpfctl-${_LIBPFCTL_HASH}.tar.gz +.else +DISTFILES= libpfctl-${OSREL}.tar.gz +.endif + do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib @${MKDIR} ${STAGEDIR}${PREFIX}/include ${INSTALL_LIB} ${WRKSRC}/libpfctl.so.0 ${STAGEDIR}${PREFIX}/lib + ${LN} -s libpfctl.so.0 ${STAGEDIR}${PREFIX}/lib/libpfctl.so ${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include .if defined(MAINTAINER_MODE) upload: + for version in 12.3 12.4 13.1; \ + do \ + cd /usr/src/lib && \ + git archive --format=tar.gz \ + --output=libpfctl-$${version}.tar.gz \ + origin/releng/$${version} libpfctl ; \ + done cd /usr/src/lib && \ - HASH=$$(git rev-parse --short origin/main) && \ git archive --format=tar.gz \ - --output=libpfctl-$${HASH}.tar.gz \ - origin/main libpfctl && \ - scp libpfctl-$${HASH}.tar.gz kp@freefall.freebsd.org:public_distfiles/ + --output=libpfctl-${_LIBPFCTL_HASH}.tar.gz \ + ${_LIBPFCTL_HASH} libpfctl ; \ + scp libpfctl-*.tar.gz \ + kp@freefall.freebsd.org:public_distfiles/ .endif -.include +.include diff --git a/net/libpfctl/distinfo b/net/libpfctl/distinfo index c85746451541..fc3bf9dd8046 100644 --- a/net/libpfctl/distinfo +++ b/net/libpfctl/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1618833133 -SHA256 (libpfctl-4ae3a97e127c.tar.gz) = dcafd22c84f129e301ffe3b0f7f8cb53b841d420bc357af8afa2a5f186b958b3 -SIZE (libpfctl-4ae3a97e127c.tar.gz) = 5260 +TIMESTAMP = 1680240816 +SHA256 (libpfctl-134ced89c4ca.tar.gz) = 320ce04fc4cc4e07bdb7146437b46d258d6b2625958ab071a6a62f8146e375ea +SIZE (libpfctl-134ced89c4ca.tar.gz) = 11323 +SHA256 (libpfctl-12.4.tar.gz) = 1797dd44939bcb1b4eb5725049f83470f50d075a62482fd1242503f5940729d4 +SIZE (libpfctl-12.4.tar.gz) = 9871 +SHA256 (libpfctl-13.1.tar.gz) = 0897d7ee37fcc980f048c50e12c820a2ae4a61389f6017a080c8b61b1e820d61 +SIZE (libpfctl-13.1.tar.gz) = 8319 diff --git a/net/libpfctl/files/patch-Makefile b/net/libpfctl/files/patch-Makefile index becc613d8e6b..605352fe030e 100644 --- a/net/libpfctl/files/patch-Makefile +++ b/net/libpfctl/files/patch-Makefile @@ -1,11 +1,12 @@ --- Makefile.orig 2021-04-19 10:09:35 UTC +++ Makefile -@@ -2,7 +2,7 @@ +@@ -2,7 +2,8 @@ PACKAGE= lib${LIB} LIB= pfctl -INTERNALLIB= true +SHLIB_MAJOR= 0 ++LIBADD+= nv SRCS= libpfctl.c INCS= libpfctl.h