From nobody Tue Jan 7 19:49:52 2025 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 4YSM8J4QKtz5jrCZ; Tue, 07 Jan 2025 19:49:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YSM8J2k2jz3xsP; Tue, 7 Jan 2025 19:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736279392; 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=0qw14lMDeBWG8m8tGC0dE7aRtnwkaWwpShjIiQS7HuE=; b=NkFQW5DyfG25PZuzTcFYPHAI0raXgVOmjMG0DbtYoMI1AT25aIYXkjA48AxYBaZXygo/U+ wk036xgi8UkJT8bPIvGDhffUzEjMiW8MvZEJ6SAA7pTgr0Bfre/cN/QaTt/lTSmU4rY55K hq5zOXYf+lo6hAupVGx61Dof+Yyy8EJUvalJSHlxS83X3p7sYkehHCRDOl+bawdzVPbzyg rXD8fxJIg4fFPHlSYkJZYKDwjqzlyaw5XRkhM3G54Nb3f10OB8g96oSqqTQPllIA7QS7U7 +MgYikr3Ti5aHhxAo5mR3E87u+HjD5dtMVEGY3fK/wJ0oBioT2BmIPphwpRLRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736279392; 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=0qw14lMDeBWG8m8tGC0dE7aRtnwkaWwpShjIiQS7HuE=; b=j9en5r5oO/Qzw/kfLJMez7cGsSQuDL+nxLC1q9mxcT3WvjNUX9d3md0thM+8EQkAZ7xX5c cZiGnVIO8e8cWYttivKnQ+/iiccK3RluO90QZTNaYN787aYxRv5yWmYQLulAMFNksPiNJi Yp6AVjZa/77V3VfS3sH55yh7AqNsKCm3ha7o2P8B3vdPEL5QP5nIMOXdoStay+TgzwvewR 58nc6ZjC/tWePwyvbtFB3ecT7gOKI0UkNd1TiNJHpjDUoIQ/Vj0nE13jR0xw/y8jUm84oX PCzMnEP/5BCjf8BomacBGeAmwnIQcCB25JcIESMDMqL50V4xzvsdxhvEMF0Fiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736279392; a=rsa-sha256; cv=none; b=i+w/NThWMKtcCHnFT2CaKwm1PP9D98f7ggX/h+tWULoVjeSOIOfOhGqmm1TBDxAsVQzj63 ajR0hjhQigA400ey+HLz0OT4gftEUS3o+11nz4Y8vVT4/9eAXTQpXB2Pnb1U+/PqaBOzS4 NUWc9V/1vqlLWMg7myL+YX4O7SR9rYOWe6+VH0BjVJPlPnUnclA9yVVJnwD8RnHOAkNpdO 7mAMNYaVeeDRMS+0mIdTxrvgBHgOYfuIDf+lduuQbHz4RKOkiEpO0pKYjvlaXoPvo6oUs0 4dJQSvshpwC0PoGDdbHdosPJHk0sXWOdftm41M3lLUKSTWSIM1MC0pJqZpKloQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YSM8J2G77z8GV; Tue, 07 Jan 2025 19:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 507Jnqrj000418; Tue, 7 Jan 2025 19:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 507Jnqxp000415; Tue, 7 Jan 2025 19:49:52 GMT (envelope-from git) Date: Tue, 7 Jan 2025 19:49:52 GMT Message-Id: <202501071949.507Jnqxp000415@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 521fcf156cbf - 2025Q1 - emulators/virtualbox-ose{,-additions}-legacy: Unification of patches with ports emulators/virtualbox-ose{,-additions} 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: 521fcf156cbf710e9e5d4710a12ed4c39db60bf6 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=521fcf156cbf710e9e5d4710a12ed4c39db60bf6 commit 521fcf156cbf710e9e5d4710a12ed4c39db60bf6 Author: Vladimir Druzenko AuthorDate: 2025-01-07 18:10:22 +0000 Commit: Vladimir Druzenko CommitDate: 2025-01-07 19:44:08 +0000 emulators/virtualbox-ose{,-additions}-legacy: Unification of patches with ports emulators/virtualbox-ose{,-additions} Replace REINPLACE_CMD in Makefiles with patches in files/*. PR: 272991 279257 MFH: 2025Q1 (cherry picked from commit c9b6fc0d29fba9262f6b6af6316e14703add2a10) --- emulators/virtualbox-ose-additions-legacy/Makefile | 4 ---- emulators/virtualbox-ose-legacy/Makefile | 4 ---- .../files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h | 10 ++++++++-- .../patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c | 2 +- .../patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/emulators/virtualbox-ose-additions-legacy/Makefile b/emulators/virtualbox-ose-additions-legacy/Makefile index 32c53d9680a1..54e77f8d41b3 100644 --- a/emulators/virtualbox-ose-additions-legacy/Makefile +++ b/emulators/virtualbox-ose-additions-legacy/Makefile @@ -134,10 +134,6 @@ post-patch: .if ${PORT_OPTIONS:MPAE} @${ECHO_CMD} 'VBOX_FREEBSD = -DPAE' >> ${WRKSRC}/LocalConfig.kmk .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400093 - @${REINPLACE_CMD} -e 's|enum vtype|enum enum_vtype_uint8|g' \ - ${WRKSRC}/src/VBox/Additions/freebsd/vboxvfs/vboxvfs*.[ch] -.endif post-patch-X11-on: @${ECHO_CMD} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \ diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 6c0563b2759c..2f18be4feb48 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -301,10 +301,6 @@ post-patch: @${REINPLACE_CMD} \ -e 's|^versions =.*|versions = ["${PYTHON_VER}${PYTHON_ABIVER}"]|' \ ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400093 - @${REINPLACE_CMD} -e 's|enum vtype|enum enum_vtype_uint8|g' \ - ${WRKSRC}/src/VBox/Additions/freebsd/vboxvfs/vboxvfs*.[ch] -.endif do-build: cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \ diff --git a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h index 09bb8575898e..1bf14e4782f3 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h +++ b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h @@ -9,7 +9,7 @@ /* * Copyright (C) 2010-2017 Oracle Corporation * -@@ -21,72 +16,413 @@ +@@ -21,72 +16,419 @@ #define VBOXVFS_VFSNAME "vboxvfs" #define VBOXVFS_VERSION 1 @@ -176,6 +176,12 @@ - int didrele; +#include + ++#if __FreeBSD_version >= 1400093 ++typedef __enum_uint8(vtype) enum_vtype_t; ++#else ++typedef enum vtype enum_vtype_t; ++#endif ++ +#define VBOXVFS_DEBUG(lvl, ...) do { \ + if (vboxvfs_debug >= (lvl)) { \ + printf("VBOXVFS[%u]: ", lvl); \ @@ -365,7 +371,7 @@ +void vboxfs_free_vp(struct vnode *); + +int vboxfs_alloc_node(struct mount *, struct vboxfs_mnt *, const char*, -+ enum vtype, uid_t, gid_t, mode_t, struct vboxfs_node *, ++ enum_vtype_t, uid_t, gid_t, mode_t, struct vboxfs_node *, + struct vboxfs_node **); +void vboxfs_free_node(struct vboxfs_mnt *, struct vboxfs_node *); + diff --git a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c index 6843bcd87c12..277cb4e7d4bb 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c +++ b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c @@ -131,7 +131,7 @@ + */ +int +vboxfs_alloc_node(struct mount *mp, struct vboxfs_mnt *vsfmp, const char *fullpath, -+ enum vtype type, uid_t uid, gid_t gid, mode_t mode, struct vboxfs_node *parent, ++ enum_vtype_t type, uid_t uid, gid_t gid, mode_t mode, struct vboxfs_node *parent, + struct vboxfs_node **node) { - struct vboxvfs_mount_info args; diff --git a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c index b6c04f48e3cd..b37af4edac49 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c +++ b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c @@ -420,7 +420,7 @@ + */ +static int +vboxfs_alloc_file(struct vboxfs_mnt *vboxfsmp, const char *fullpath, -+ enum vtype type, mode_t mode, struct vboxfs_node *parent, ++ enum_vtype_t type, mode_t mode, struct vboxfs_node *parent, + int lkflag, struct vnode **vpp) { - return 0;