From nobody Mon Jun 26 23:30:43 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 4Qqkc50LDmz4kNM9; Mon, 26 Jun 2023 23:30:45 +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 4Qqkc44qjkz3wRB; Mon, 26 Jun 2023 23:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687822244; 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=0r5/ltOrzDsrw+AIEHqG/jKwiMiznFMSK+yX4b8URuQ=; b=NZZvl7uQd0FvW9FA5+Xa+p1AGwItv+lTL95kq3NzD8BH6dBl/nmhpWhiNHibRiBle9BgOv rRyF8megPb0dV7qy0+p2s6ubRK15NB+OvAgQlH0s2MPrOC9WNMo6ZpzwBFUQg6SQS9iRx/ qw3aaoGkz1Jgj6wnsH+6H91yDcUbAy12i1j6jx0ay8W1dulT+zzUv5p8AlYPoKlUnXSzKI sptCEvycQEijPEF18MAac95D+qtItSZ1nJn+dcjwKmQgFhxWf0YNgD59nla+Otz0IWSUAk A8lJAWrBTDwCrW7kFcADkUUTDzIeB/4kSPSgV0Y6Q0BHuBn3YrJ7njhSvi8EPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687822244; 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=0r5/ltOrzDsrw+AIEHqG/jKwiMiznFMSK+yX4b8URuQ=; b=cZbdb6RWTMN4p6sNNNOGf910YMrBToBPSpiO2mANye42/SCkoGCfG/qQd3JrzTFVMxBwEd dMPuYP+HbN2eijbDopBKVRxOx1/cOmH3J5dpo2nJHk93f3lMOSdpsXtjAI389Cs/uFnn4E 8zCiNCzGHlp2KhRwawoTXpb8RA5YT/WQUsnTrXgiV/OoXjO2S7nLvDrMVWiDXCBy1M3xnG k5h/5oI/FNfoFB8AT2ZdJWL+Sh+XTm/bl999x84g2TOgGKJitO2JEs9L6y9YpopImNcYsG L8vpEKWNNLNS2LhWt661Kfzzvj5NhQFmXiSF95ehrV4fFtkhWLV+xfWKlJxhMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687822244; a=rsa-sha256; cv=none; b=UATqqG5pLugxtI69Qo/EZzGqp7Khh5vnW9x0ntlxT2eBtbDvbevfyfQI28U6UKsF6GwkJP wt9P9TzU4uI50yzuzA7/zzvovmIl9U+l0blEKNMZFNp0zqTQTFFRWaQWGwsNfXc1kM19lh tgVcJrxTQ6is/6VgjFFUKrTtDUwJrTfe4ByUm6gU0IFJx9CGL5oR9uDHsfu78VLV6VPXXZ 4peaFAgH8zHP05Q3xWqMjKqPEvNB0F2nqZeVay1PKTUB+WVlJeJtGNJqH2rDfMiS5OMW+a 3EsPadYDvAeYu1Q276kA1mG13zQjuwA8nQyokQz4JiCMZ7tug9PQsZp+wGkrkQ== 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 4Qqkc431jSzV2m; Mon, 26 Jun 2023 23:30:44 +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 35QNUhkL025708; Mon, 26 Jun 2023 23:30:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QNUhGm025707; Mon, 26 Jun 2023 23:30:43 GMT (envelope-from git) Date: Mon, 26 Jun 2023 23:30:43 GMT Message-Id: <202306262330.35QNUhGm025707@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: dcb400297a3b - main - net/miniupnpd: remove ipfw port option 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcb400297a3bd5a5880c2abf0cead0dc53004ca3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=dcb400297a3bd5a5880c2abf0cead0dc53004ca3 commit dcb400297a3bd5a5880c2abf0cead0dc53004ca3 Author: R. Christian McDonald AuthorDate: 2023-05-30 19:03:18 +0000 Commit: Robert Clausecker CommitDate: 2023-06-26 23:30:28 +0000 net/miniupnpd: remove ipfw port option It is well-known that net/miniupnpd does not work with IPFW. However, the port options still allow building with IPFW support. In order to prevent unnecessary foot-shooting, let us eliminate this option outright and unconditionally use pf instead. PR: 271732 Approved by: squat@squat.no (maintainer timeout, two weeks) Sponsored by: Rubicon Communications, LLC ("Netgate") --- net/miniupnpd/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile index 3c5e4e28f813..1c9e6e87aebd 100644 --- a/net/miniupnpd/Makefile +++ b/net/miniupnpd/Makefile @@ -1,10 +1,11 @@ PORTNAME= miniupnpd -PORTVERSION= 2.3.3 +DISTVERSION= 2.3.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MAINTAINER= squat@squat.no -COMMENT= UPnP IGD implementation which uses pf/ipf +COMMENT= UPnP IGD implementation which uses pf WWW= http://miniupnp.free.fr/ LICENSE= BSD3CLAUSE @@ -31,23 +32,19 @@ PLIST_FILES= etc/miniupnpd.conf.sample \ man/man8/miniupnpd.8.gz \ sbin/miniupnpd +# unconditionally use pf, ipfw does not work on FreeBSD +CONFIGURE_ARGS= --firewall=pf + OPTIONS_DEFINE= CHECK_PORTINUSE IPV6 LEASEFILE UPNP_IGDV2 \ UPNP_STRICT -OPTIONS_DEFAULT= AUTODETECT_FW -OPTIONS_SINGLE= FIREWALL -OPTIONS_SINGLE_FIREWALL= AUTODETECT_FW IPFW PF -AUTODETECT_FW_DESC= Try to autodetect firewall type CHECK_PORTINUSE_DESC= Check if ports are in use -IPFW_DESC= Use IPFW as firewall type LEASEFILE_DESC= Enable lease file -PF_DESC= Use PF as firewall type UPNP_IGDV2_DESC= Build an IGDv2 instead of an IGDv1 UPNP_STRICT_DESC= More strict UPnP specification compliance CHECK_PORTINUSE_CONFIGURE_ON= --portinuse IPV6_CONFIGURE_ON= --ipv6 LEASEFILE_CONFIGURE_ON= --leasefile -PF_CONFIGURE_ON= --firewall=pf UPNP_IGDV2_CONFIGURE_ON= --igd2 UPNP_STRICT_CONFIGURE_ON= --strict