From nobody Wed Mar 8 20:53:07 2023 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 4PX4Jz6zBRz3wrvy; Wed, 8 Mar 2023 20:53:07 +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 4PX4Jz6Rxpz4BsQ; Wed, 8 Mar 2023 20:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678308787; 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=x1SnzT51i7DHf5JauGR4SXn4vsNf5kJFTF6Y+UN6mEs=; b=NvhlqiI9OxfPTG+0wi/jvXoGHU88J8dEWxDQnmmaaQhRU+k3QOJgXmCinnmHShyAE39/lS GLEgeObtHPXTpVif/OHWu1+iKw4AkADS8pyrH5xtjdPgVGxr8Sw0l8CivpI5L4G8qMd5kg 52jw1e6lhFxS6GvqepVGifVElZkqk6Lei5J74BLypJ0r0A4/hOk3uCwymR0E0hRFpnIsDT TQVRLZkDqc731w22uFyA18KFrGgz7q2X/SEDIJ38TMu+ZqfKndztFy+9hEBE8mbbAiy6jV LspJR7G0WMSia1JlnDS3l41b8jDpxqDiT0CQ/CK5EI0R33yn+TOfK2WUsSpnYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678308787; 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=x1SnzT51i7DHf5JauGR4SXn4vsNf5kJFTF6Y+UN6mEs=; b=h2GVz69V+lEfT2VlWHgIZqVEpZMiANzPgVE9cAUjKJjAvtI+hg1B6eYD4E2lBIfLm+ABbt DX4d99eShW1HPPzR3psn9hRKe8SjtfUGRXwJXAA079Ol+8JfD7EU6LtgHVEqHTft1AfQtn 4OFdCparjEi0mLdQU77lQx+OzB8nDGw0lQIN+m6agFQunC3nsFCOulNUv7f/RLjERzHKN2 d3yc/w9FdvPEsl6Nk2d/NYARWL86gVyDmODW6S2ebP6hiu/CdwvzjkkcC3TFIepuUvsJaI hEUbzWjc0XeBduSzzMYqqPKh1RWIh6fMYaR0AMV07c6PzgkWqvJQBof22m8vKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678308787; a=rsa-sha256; cv=none; b=u1VadSdGHS5iWZNQX2nQQo5tzRdb5ROqqI8wVvFPTTBUaGI2g+fxxTxYIGvASY20S+Zbsb 5N/38IVJFpved320NKNv3igt4ghm5TJdGQagDZ3qC75KswWvCfI1bwGqGDwHF3Z0iswbFg O6xPUPxg09M70ZHlv/q0lUp4kwus2bZ1sdQgQOB9cFg3DKDQzA3EoPqHa4nWRqS91fkZ3U hF1Gqc0cxH+6JU4FKGq2+qyJfiYRwWVqAlGxOORZPX5FmaSnxwEnrr8d4ZbeBuiNuGPDOz qczr0u90yRzGDE9A8LCokQCpFDmM7RAzJyhGdsWn5YuV1TFMgSMancUzRq2ALw== 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 4PX4Jz5VCKzg8n; Wed, 8 Mar 2023 20:53:07 +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 328Kr7kd088090; Wed, 8 Mar 2023 20:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328Kr77F088089; Wed, 8 Mar 2023 20:53:07 GMT (envelope-from git) Date: Wed, 8 Mar 2023 20:53:07 GMT Message-Id: <202303082053.328Kr77F088089@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 50d615894fb6 - main - security/openvpn: remove header file that now ships with 2.6.1 tarball 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50d615894fb6551a1265c9dec9e5e407c4ea8ce0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=50d615894fb6551a1265c9dec9e5e407c4ea8ce0 commit 50d615894fb6551a1265c9dec9e5e407c4ea8ce0 Author: Matthias Andree AuthorDate: 2023-03-08 20:52:24 +0000 Commit: Matthias Andree CommitDate: 2023-03-08 20:52:24 +0000 security/openvpn: remove header file that now ships with 2.6.1 tarball Since this is identical to what's in the tarball, no PORTREVISION bump is required. --- security/openvpn/Makefile | 3 +- security/openvpn/files/ovpn_dco_freebsd.h | 71 ------------------------------- 2 files changed, 1 insertion(+), 73 deletions(-) diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 417abba7f421..3956e7db6b84 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -46,7 +46,7 @@ OPTIONS_EXCLUDE_FreeBSD_12= DCO # FreeBSD 14 only OPTIONS_EXCLUDE_FreeBSD_13= DCO # FreeBSD 14 only ASYNC_PUSH_DESC= Enable async-push support -DCO_DESC= Build with Data Channel Offload (ovpn(4)) support +DCO_DESC= Build with Data Channel Offload (ovpn(4)) support EASYRSA_DESC= Install security/easy-rsa RSA helper package LZO_DESC= LZO compression (incompatible with LibreSSL) PKCS11_DESC= Use security/pkcs11-helper, needs same SSL lib! @@ -110,7 +110,6 @@ post-patch: ${WRKSRC}/sample/sample-config-files/*.conf \ ${WRKSRC}/doc/man-sections/generic-options.rst # this header file was missed from the 2.6.0 tarball - ${CP} ${FILESDIR}/ovpn_dco_freebsd.h ${WRKSRC}/src/openvpn/ # FIXME remove for 2.6.1 pre-configure: # just too many of sign-compare; bitwise-instead-of-logical was audited and is intentional, diff --git a/security/openvpn/files/ovpn_dco_freebsd.h b/security/openvpn/files/ovpn_dco_freebsd.h deleted file mode 100644 index fec33835f007..000000000000 --- a/security/openvpn/files/ovpn_dco_freebsd.h +++ /dev/null @@ -1,71 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2021 Rubicon Communications, LLC (Netgate) - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _NET_IF_OVPN_H_ -#define _NET_IF_OVPN_H_ - -#include -#include - -/* Maximum size of an ioctl request. */ -#define OVPN_MAX_REQUEST_SIZE 4096 - -enum ovpn_notif_type { - OVPN_NOTIF_DEL_PEER, -}; - -enum ovpn_del_reason { - OVPN_DEL_REASON_REQUESTED = 0, - OVPN_DEL_REASON_TIMEOUT = 1 -}; - -enum ovpn_key_slot { - OVPN_KEY_SLOT_PRIMARY = 0, - OVPN_KEY_SLOT_SECONDARY = 1 -}; - -enum ovpn_key_cipher { - OVPN_CIPHER_ALG_NONE = 0, - OVPN_CIPHER_ALG_AES_GCM = 1, - OVPN_CIPHER_ALG_CHACHA20_POLY1305 = 2 -}; - -#define OVPN_NEW_PEER _IO('D', 1) -#define OVPN_DEL_PEER _IO('D', 2) -#define OVPN_GET_STATS _IO('D', 3) -#define OVPN_NEW_KEY _IO('D', 4) -#define OVPN_SWAP_KEYS _IO('D', 5) -#define OVPN_DEL_KEY _IO('D', 6) -#define OVPN_SET_PEER _IO('D', 7) -#define OVPN_START_VPN _IO('D', 8) -#define OVPN_SEND_PKT _IO('D', 9) -#define OVPN_POLL_PKT _IO('D', 10) -#define OVPN_GET_PKT _IO('D', 11) -#define OVPN_SET_IFMODE _IO('D', 12) -#define OVPN_GET_PEER_STATS _IO('D', 13) - -#endif /* ifndef _NET_IF_OVPN_H_ */