public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-guest-additions/files/
@ 2016-05-04  8:21 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2016-05-04  8:21 UTC (permalink / raw
  To: gentoo-commits

commit:     690ef31fa4719939250ed885d4235d72981f44a7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 08:20:25 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May  4 08:20:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=690ef31f

app-emulation/virtualbox-guest-additions: Fixed openrc init script

shebang.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/virtualbox-guest-additions-8.initd                        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd
index 6da4697..de143d0 100644
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd
@@ -1,12 +1,12 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 pidfile="/var/run/vboxguest-service.pid"
 command="/usr/sbin/vboxguest-service"
 command_args="--foreground"
-start_stop_daemon_args="--make-pidfile --pidfile ${pidfile} --background"
+command_background="true"
 
 depend() {
         need dbus localmount


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-guest-additions/files/
@ 2017-09-02 14:27 Michael Palimaka
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-09-02 14:27 UTC (permalink / raw
  To: gentoo-commits

commit:     909545794e86cf69594c04911a0dcd04d998eb01
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug 29 08:53:15 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 14:27:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90954579

app-emulation/virtualbox-guest-additions: remove unused file

 .../files/virtualbox-guest-additions-3-localconfig | 30 ----------------------
 1 file changed, 30 deletions(-)

diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3-localconfig b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3-localconfig
deleted file mode 100644
index aeea54d699e..00000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3-localconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Makefile -*-
-#
-# Overwrite some default kBuild settings
-#
-
-#
-# Copyright (C) 2006-2008 Sun Microsystems, Inc.
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License as published by the Free Software Foundation,
-# in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
-# distribution. VirtualBox OSE is distributed in the hope that it will
-# be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-# don't build testcases to save time, they are not needed for the package
-VBOX_WITH_TESTCASES     :=
-VBOX_WITH_TESTSUITE     :=
-
-KBUILD_MSG_STYLE        := brief
-
-## paths, origin, hardening
-VBOX_WITH_HARDENING        := 2
-VBOX_WITH_ORIGIN           :=
-VBOX_ONLY_ADDITIONS        := 1
-
-## don't build with -Werror
-VBOX_WITH_WARNINGS_AS_ERRORS :=


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-guest-additions/files/
@ 2020-05-05 15:04 Lars Wendler
  0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2020-05-05 15:04 UTC (permalink / raw
  To: gentoo-commits

commit:     340f01e5f32274c5f8974694f637f5718b2c148b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Feb  2 16:40:30 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May  5 15:04:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=340f01e5

app-emulation/virtualbox-guest-additions: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14532
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...additions-6.0.12-linux-5.3+-compatibility.patch | 75 ----------------------
 1 file changed, 75 deletions(-)

diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch
deleted file mode 100644
index ad4b460c814..00000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://bugs.gentoo.org/694614
-https://www.virtualbox.org/ticket/18911#comment:5
-
---- a/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++ b/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-@@ -2123,7 +2123,9 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign
- #endif
-     if (in_dev != NULL)
-     {
--        for_ifa(in_dev) {
-+        struct in_ifaddr *ifa;
-+
-+        for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
-             if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
-                 return NOTIFY_OK;
- 
-@@ -2137,7 +2139,7 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign
- 
-             pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
-                 /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address);
--        } endfor_ifa(in_dev);
-+        }
-     }
- 
-     /*
---- a/Runtime/r0drv/linux/mp-r0drv-linux.c
-+++ b/Runtime/r0drv/linux/mp-r0drv-linux.c
-@@ -283,12 +283,15 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
-     if (RTCpuSetCount(&OnlineSet) > 1)
-     {
-         /* Fire the function on all other CPUs without waiting for completion. */
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
-+        smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
-+        Assert(!rc); NOREF(rc);
- # else
-         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
--# endif
-         Assert(!rc); NOREF(rc);
-+# endif
-     }
- #endif
- 
-@@ -326,7 +329,6 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
- {
- #ifdef CONFIG_SMP
-     IPRT_LINUX_SAVE_EFL_AC();
--    int rc;
-     RTMPARGS Args;
- 
-     RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
-@@ -337,14 +339,17 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
-     Args.cHits = 0;
- 
-     RTThreadPreemptDisable(&PreemptState);
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
--    rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
-+    smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+    int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+    Assert(rc == 0); NOREF(rc);
- # else /* older kernels */
--    rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
-+    int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
-+    Assert(rc == 0); NOREF(rc);
- # endif /* older kernels */
-     RTThreadPreemptRestore(&PreemptState);
- 
--    Assert(rc == 0); NOREF(rc);
-     IPRT_LINUX_RESTORE_EFL_AC();
- #else
-     RT_NOREF(pfnWorker, pvUser1, pvUser2);


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-guest-additions/files/
@ 2023-08-15 12:50 Viorel Munteanu
  0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2023-08-15 12:50 UTC (permalink / raw
  To: gentoo-commits

commit:     b123159a8bdb57ddc2f78e479d506842c0680df8
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 12:28:58 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 12:45:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b123159a

app-emulation/virtualbox-guest-additions: remove unused files

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 .../files/virtualbox-guest-additions-8.initd       | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd
deleted file mode 100644
index 3af22dbfa49e..000000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/var/run/vboxguest-service.pid"
-command="/usr/sbin/vboxguest-service"
-command_args="--foreground"
-command_background="true"
-
-depend() {
-        need dbus localmount
-	before xdm
-}
-
-start_pre() {
-	einfo "Loading kernel modules"
-	/sbin/modprobe vboxguest 2>&1
-	/sbin/modprobe vboxsf 2>&1
-}
-
-stop_post() {
-	einfo "Removing kernel modules"
-	/sbin/modprobe -r vboxsf 2>&1
-	/sbin/modprobe -r vboxguest 2>&1
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-guest-additions/files/
@ 2024-06-22 18:54 Conrad Kostecki
  0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2024-06-22 18:54 UTC (permalink / raw
  To: gentoo-commits

commit:     f1ad990a6d928ca33a0bff1293665e33eef2d1d3
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 18 17:20:37 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 18:50:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1ad990a

app-emulation/virtualbox-guest-additions: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...tualbox-guest-additions-7.0.14-kernel-6.8.patch | 242 ---------------------
 1 file changed, 242 deletions(-)

diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.14-kernel-6.8.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.14-kernel-6.8.patch
deleted file mode 100644
index 459dbef713e9..000000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.14-kernel-6.8.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-Support for kernel 6.8.x.
-
-https://www.virtualbox.org/changeset/102989/vbox
-https://www.virtualbox.org/changeset/102990/vbox
-https://www.virtualbox.org/changeset/102992/vbox
-https://www.virtualbox.org/changeset/102993/vbox
-https://www.virtualbox.org/changeset/102994/vbox
-
-------------------------------------------------------------------------
-r102989 | vboxsync | 2024-01-22 19:12:25 +0200 (Lu, 22 ian 2024) | 2 lines
-
-iprt: Add wrapper for strlcpy/strscpy functions, bugref:10584.
-
-
---- a/include/iprt/string.h
-+++ b/include/iprt/string.h
-@@ -245,7 +245,29 @@
- # define RT_BCOPY_UNFORTIFIED(a_pDst, a_pSrc, a_cbToCopy)   memcpy((a_pDst), (a_pSrc), (a_cbToCopy))
- #endif /* !RT_OS_LINUX && !__KERNEL__ */
- 
-+/** @def RT_STRSCPY
-+ * Copy string and NULL-terminate output buffer.
-+ *
-+ * This macro should mostly be used in Linux kernel code. This is
-+ * the replacement for deprecated strlcpy. It was deprecated since 3.16.60
-+ * when strscpy was introduced as an alternative. Finally, strlcpy was
-+ * completely removed from kernel code in 6.8.0.
-+ *
-+ * @param   a_pDst          Pointer to the destination string buffer.
-+ * @param   a_pSrc          Pointer to the source NULL-terminated string buffer.
-+ * @param   a_cbToCopy      Size of destination buffer..
-+ */
-+#if defined(RT_OS_LINUX) && defined(__KERNEL__)
-+# if (RTLNX_VER_MIN(3,16,60))
-+#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy)    strscpy((a_pDst), (a_pSrc), (a_cbToCopy))
-+# else /* < 3.16.60 */
-+#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy)    strlcpy((a_pDst), (a_pSrc), (a_cbToCopy))
-+# endif
-+#else  /* !RT_OS_LINUX && !__KERNEL__ */
-+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy)    strscpy((a_pDst), (a_pSrc), (a_cbToCopy))
-+#endif /* !RT_OS_LINUX && !__KERNEL__ */
- 
-+
- #ifdef IN_RING3
- 
- /**
-
-------------------------------------------------------------------------
-------------------------------------------------------------------------
-r102990 | vboxsync | 2024-01-22 19:13:50 +0200 (Lu, 22 ian 2024) | 2 lines
-
-Additions: Linux: Introduce initial support for kernel 6.8, bugref:10584.
-
-
---- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
-+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
-@@ -1410,7 +1410,7 @@
-             RTLogGroupSettings(pLogger, pszValue);
-     }
-     else if (pParam->name[0] != 'd')
--        strlcpy(&g_szLogGrp[0], pszValue, sizeof(g_szLogGrp));
-+        RT_STRSCPY(&g_szLogGrp[0], pszValue, sizeof(g_szLogGrp));
- 
-     return 0;
- }
-@@ -1436,7 +1436,7 @@
-             RTLogFlags(pLogger, pszValue);
-     }
-     else if (pParam->name[0] != 'd')
--        strlcpy(&g_szLogFlags[0], pszValue, sizeof(g_szLogFlags));
-+        RT_STRSCPY(&g_szLogFlags[0], pszValue, sizeof(g_szLogFlags));
-     return 0;
- }
- 
-@@ -1461,7 +1461,7 @@
-             RTLogDestinations(pLogger, pszValue);
-     }
-     else if (pParam->name[0] != 'd')
--        strlcpy(&g_szLogDst[0], pszValue, sizeof(g_szLogDst));
-+        RT_STRSCPY(&g_szLogDst[0], pszValue, sizeof(g_szLogDst));
-     return 0;
- }
- 
---- a/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ b/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -538,9 +538,7 @@
- int vbox_irq_init(struct vbox_private *vbox);
- void vbox_irq_fini(struct vbox_private *vbox);
- void vbox_report_hotplug(struct vbox_private *vbox);
--#if RTLNX_VER_MAX(5,15,0) && !RTLNX_RHEL_MAJ_PREREQ(9,1) && !RTLNX_SUSE_MAJ_PREREQ(15,5)
- irqreturn_t vbox_irq_handler(int irq, void *arg);
--#endif
- 
- /* vbox_hgsmi.c */
- void *hgsmi_buffer_alloc(struct gen_pool *guest_pool, size_t size,
---- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c
-@@ -1408,7 +1408,7 @@
-     switch (opt) {
-     case Opt_iocharset:
-     case Opt_nls:
--        strlcpy(info->nls_name, param->string, sizeof(info->nls_name));
-+        RT_STRSCPY(info->nls_name, param->string, sizeof(info->nls_name));
-         break;
-     case Opt_uid:
-         info->uid = result.uint_32;
-@@ -1469,7 +1469,7 @@
-             printk(KERN_WARNING "vboxsf: cache mode (%u) is out of range, using default instead.\n", result.uint_32);
-         break;
-     case Opt_tag:
--        strlcpy(info->szTag, param->string, sizeof(info->szTag));
-+        RT_STRSCPY(info->szTag, param->string, sizeof(info->szTag));
-         break;
-     default:
-         return invalf(fc, "Invalid mount option: '%s'", param->key);
-@@ -1528,7 +1528,7 @@
-     }
- 
-     /* fc->source (the shared folder name) is set after vbsf_init_fs_ctx() */
--    strlcpy(info->name, fc->source, sizeof(info->name));
-+    RT_STRSCPY(info->name, fc->source, sizeof(info->name));
- 
- # if RTLNX_VER_MAX(5,3,0)
-     return vfs_get_super(fc, vfs_get_independent_super, vbsf_read_super_aux);
---- a/src/VBox/Additions/linux/sharedfolders/regops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
-@@ -3505,7 +3505,7 @@
- };
- 
- /** file_operations::mmap wrapper for logging purposes. */
--extern int vbsf_reg_mmap(struct file *file, struct vm_area_struct *vma)
-+static int vbsf_reg_mmap(struct file *file, struct vm_area_struct *vma)
- {
-     int rc;
-     SFLOGFLOW(("vbsf_reg_mmap: file=%p vma=%p\n", file, vma));
-@@ -3786,7 +3786,7 @@
- }
- 
- # if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_RANGE(9,3, 9,99)
--int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos,
-+static int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos,
-                      unsigned len, struct page **pagep, void **fsdata)
- {
-     vbsf_write_begin_warn(pos, len, 0);
-@@ -3793,7 +3793,7 @@
-     return simple_write_begin(file, mapping, pos, len, pagep, fsdata);
- }
- # else
--int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos,
-+static int vbsf_write_begin(struct file *file, struct address_space *mapping, loff_t pos,
-                      unsigned len, unsigned flags, struct page **pagep, void **fsdata)
- {
-     vbsf_write_begin_warn(pos, len, flags);
-
-------------------------------------------------------------------------
-------------------------------------------------------------------------
-r102992 | vboxsync | 2024-01-22 19:33:49 +0200 (Lu, 22 ian 2024) | 5 lines
-
-iprt: Add wrapper for strlcpy/strscpy functions, build fix, bugref:10584.
-
-Ignore return code of strscpy() in RT_STRSCPY macro sinse we have no caller
-who is using it. Also rename macro parameter, so it makes more sense.
-
-
---- a/include/iprt/string.h
-+++ b/include/iprt/string.h
-@@ -255,16 +255,16 @@
-  *
-  * @param   a_pDst          Pointer to the destination string buffer.
-  * @param   a_pSrc          Pointer to the source NULL-terminated string buffer.
-- * @param   a_cbToCopy      Size of destination buffer..
-+ * @param   a_cbDst         Size of destination buffer.
-  */
- #if defined(RT_OS_LINUX) && defined(__KERNEL__)
- # if (RTLNX_VER_MIN(3,16,60))
--#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy)    strscpy((a_pDst), (a_pSrc), (a_cbToCopy))
-+#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)   (void)strscpy((a_pDst), (a_pSrc), (a_cbDst))
- # else /* < 3.16.60 */
--#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy)    strlcpy((a_pDst), (a_pSrc), (a_cbToCopy))
-+#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)   strlcpy((a_pDst), (a_pSrc), (a_cbDst))
- # endif
- #else  /* !RT_OS_LINUX && !__KERNEL__ */
--# define RT_STRSCPY(a_pDst, a_pSrc, a_cbToCopy)    strscpy((a_pDst), (a_pSrc), (a_cbToCopy))
-+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)    (void)strscpy((a_pDst), (a_pSrc), (a_cbDst))
- #endif /* !RT_OS_LINUX && !__KERNEL__ */
- 
- 
-
-------------------------------------------------------------------------
-r102993 | vboxsync | 2024-01-22 19:41:44 +0200 (Lu, 22 ian 2024) | 5 lines
-
-Add wrapper for strlcpy/strscpy functions, build fix, bugref:10584.
-
-It seem, strscpy was added around 4.3.0. Older kernels probably
-have it as a backport. So, stick to 4.3.0.
-
-
---- a/include/iprt/string.h
-+++ b/include/iprt/string.h
-@@ -258,7 +258,7 @@
-  * @param   a_cbDst         Size of destination buffer.
-  */
- #if defined(RT_OS_LINUX) && defined(__KERNEL__)
--# if (RTLNX_VER_MIN(3,16,60))
-+# if (RTLNX_VER_MIN(4,3,0))
- #  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)   (void)strscpy((a_pDst), (a_pSrc), (a_cbDst))
- # else /* < 3.16.60 */
- #  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)   strlcpy((a_pDst), (a_pSrc), (a_cbDst))
-
-------------------------------------------------------------------------
-r102994 | vboxsync | 2024-01-22 20:06:29 +0200 (Lu, 22 ian 2024) | 6 lines
-
-iprt: Add wrapper for strlcpy/strscpy functions, build fix, bugref:10584.
-
-Another way around to suppress build error when strscpy return status
-is not used. Also, turn macro into strlcpy for non-Linux systems,
-so for them it will be no change.
-
-
---- a/include/iprt/string.h
-+++ b/include/iprt/string.h
-@@ -259,12 +259,16 @@
-  */
- #if defined(RT_OS_LINUX) && defined(__KERNEL__)
- # if (RTLNX_VER_MIN(4,3,0))
--#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)   (void)strscpy((a_pDst), (a_pSrc), (a_cbDst))
-+#  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst) \
-+    { \
-+      ssize_t _ret; \
-+      _ret = strscpy((a_pDst), (a_pSrc), (a_cbDst)); \
-+    }
- # else /* < 3.16.60 */
- #  define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)   strlcpy((a_pDst), (a_pSrc), (a_cbDst))
- # endif
- #else  /* !RT_OS_LINUX && !__KERNEL__ */
--# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)    (void)strscpy((a_pDst), (a_pSrc), (a_cbDst))
-+# define RT_STRSCPY(a_pDst, a_pSrc, a_cbDst)    strlcpy((a_pDst), (a_pSrc), (a_cbDst))
- #endif /* !RT_OS_LINUX && !__KERNEL__ */
- 
- 
-
-------------------------------------------------------------------------


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-06-22 18:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-15 12:50 [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox-guest-additions/files/ Viorel Munteanu
  -- strict thread matches above, loose matches on Subject: below --
2024-06-22 18:54 Conrad Kostecki
2020-05-05 15:04 Lars Wendler
2017-09-02 14:27 Michael Palimaka
2016-05-04  8:21 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox