From 7a83ecc083df678e228035f07b1e5d0d90c4adf8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 00:55:53 +0200 Subject: Merging debian version 7.0.16-dfsg-1. Signed-off-by: Daniel Baumann --- debian/patches/102989.patch | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 debian/patches/102989.patch (limited to 'debian/patches/102989.patch') diff --git a/debian/patches/102989.patch b/debian/patches/102989.patch deleted file mode 100644 index f228c0d2..00000000 --- a/debian/patches/102989.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: include/iprt/string.h -=================================================================== ---- a/include/iprt/string.h (revision 102988) -+++ b/include/iprt/string.h (revision 102989) -@@ -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 - - /** -- cgit v1.2.3