From nobody Mon Nov 06 11:21:54 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 4SP87k2RhGz50NgG; Mon, 6 Nov 2023 11:21:54 +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 4SP87k20CYz4bkL; Mon, 6 Nov 2023 11:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699269714; 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=K1NqrjqKfFDOuwsXXVxhVhpb2fC09n3d/iSk2VTJodo=; b=ILFeH5g0yc26gukFRFqY0hyiydO+qt+kHDV1w8TK9Y80GdJAPlv+Ifar1X8gtbqXYnivnw +y0LrQdLL68JrJaxAEJvKWAqqg7u8Pb2SA0OBoJYg7ji6FW2rEEiSUGhMVYcA9KLJ8PlAR SsCkG3oeik5171MrNQ1pohi6CeupVWn7BHfRcX41dVl8Dvn143FNGrvlI59eW1viJ3EC8f r6V1HAdEZ55b2x/7wRw98i7Jaj9L7vRvuWCF1coipMR4ISrdAkVxEbUNI22R6oS5Oe2zVT +as9+weab9N1xfDf/PpgXkTn4+CnOPeNq1RrikhifYDdAdNE5hpXwLK1beyWJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699269714; 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=K1NqrjqKfFDOuwsXXVxhVhpb2fC09n3d/iSk2VTJodo=; b=Q+qKWz104uHDZ92N/fj78Aa9dQcz+PCk3XYhP4363N5/lqeUku6Aw1Gij0fdGKlii1m23D caQ9MDrSckIoTW28LYI/DsSL/dCjhg91GiX1OR+aBXe7IaK/DFy5V5bBLzRPCd7aZ8Owjt 36THWC9z65XPTN1AWQnIjxH626G3tY4nYnZfoaYHZ1+TCHK4pbLkODbkHwCPs8OPdRIVHz fqXj9ZHctjnhvV2W8VpkKvqiAtHzHtwGit/WW2KNXEMyIFIih2vnyziE3KBcCRpF5bXvfI S5VV4Z6rJHKHEsZ0hsidWi0nkT0I6ohA9CXzol4t2ZoqxofWNHr5v/B7mZnlEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699269714; a=rsa-sha256; cv=none; b=TvQe5C4DV+URKzZjs9FQr3VSIjQe1qy2DISiWNL/goaDi7hNPq+QjAFyXRlkJ4Nrq9N/Jg UALwaoXmmv5UR2kqwy+atuygQzpxgQJ2+E17zuHjJcXW9/+6q7np+3e22bZiyFCq0Exft2 V1uNvSi4XwRfa3OBnpJxWQl3FAVRTsmpCJ1XxLbxBYvacFPITLlnMibFQ+AJ15UIKnj+MQ EmreHejd1Ckg2eXrYT4TIsk5V+XhVOATwHnIaWPdb7tF8W/1/ocVKv7q2TfLTykxXkcByw rWu/wBTn80IfLLL3YyIp79VNsIG+wp/sLDS8Nq5Ti0w6VaZtZNFo+uEOfTHdbg== 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 4SP87k12lBz158J; Mon, 6 Nov 2023 11:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6BLsrt016844; Mon, 6 Nov 2023 11:21:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6BLsdp016841; Mon, 6 Nov 2023 11:21:54 GMT (envelope-from git) Date: Mon, 6 Nov 2023 11:21:54 GMT Message-Id: <202311061121.3A6BLsdp016841@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernhard Froehlich Subject: git: c83f22d493f0 - main - net/wireguard-tools: Revert kldunload from rc.d scripts 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: decke X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c83f22d493f0736384be0b389122208955dcfbee Auto-Submitted: auto-generated The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=c83f22d493f0736384be0b389122208955dcfbee commit c83f22d493f0736384be0b389122208955dcfbee Author: Bernhard Froehlich AuthorDate: 2023-11-06 11:09:20 +0000 Commit: Bernhard Froehlich CommitDate: 2023-11-06 11:09:20 +0000 net/wireguard-tools: Revert kldunload from rc.d scripts Unloading if_wg(4) kmod was added to rc.d scripts to make sure that a service restart also reload the kernel module. Now we don't have frequent updates anymore and the wireguard-kmod port will soon be gone but people using this script face issues in VNET jails. This commit reverts 562d171b9dacad8f63e6e4a45035824b10b59341 PR: 274428 Reported by: vedad@kajtaz.net --- net/wireguard-tools/Makefile | 2 +- net/wireguard-tools/files/wireguard_lite.in | 7 ------- net/wireguard-tools/files/wireguard_wgquick.in | 7 ------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/net/wireguard-tools/Makefile b/net/wireguard-tools/Makefile index 1634e5936ff4..6bd8cba74a05 100644 --- a/net/wireguard-tools/Makefile +++ b/net/wireguard-tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= wireguard-tools PORTVERSION= 1.0.20210914 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-tools/snapshot/ diff --git a/net/wireguard-tools/files/wireguard_lite.in b/net/wireguard-tools/files/wireguard_lite.in index 9d33d1966fa0..86ffc41018e4 100644 --- a/net/wireguard-tools/files/wireguard_lite.in +++ b/net/wireguard-tools/files/wireguard_lite.in @@ -82,13 +82,6 @@ wireguard_stop() ifconfig ${interface} destroy done - - if kldstat -q -n if_wg; then - if ! kldunload if_wg > /dev/null 2>&1; then - warn "Can't unload if_wg module." - return 1 - fi - fi } wireguard_reload() diff --git a/net/wireguard-tools/files/wireguard_wgquick.in b/net/wireguard-tools/files/wireguard_wgquick.in index c6680e08c5ed..7877c004e2ad 100644 --- a/net/wireguard-tools/files/wireguard_wgquick.in +++ b/net/wireguard-tools/files/wireguard_wgquick.in @@ -38,13 +38,6 @@ wireguard_stop() for interface in ${wireguard_interfaces}; do %%PREFIX%%/bin/wg-quick down ${interface} done - - if kldstat -q -n if_wg; then - if ! kldunload if_wg > /dev/null 2>&1; then - warn "Can't unload if_wg module." - return 1 - fi - fi } wireguard_reload()