[arch-commits] Commit in glibc/trunk (PKGBUILD disable-clone3.diff)

[Frederik Schwan]

    Date: Saturday, August 20, 2022 @ 17:51:12
  Author: freswa
Revision: 454091

re-enable clone3 syscall

After electron 9-12 are not supported anymore
or patched and discord has been updated to
electron > 13 according to the console output,
we can safely enable the clone3 syscall again.

Modified:
  glibc/trunk/PKGBUILD
Deleted:
  glibc/trunk/disable-clone3.diff

---------------------+
 PKGBUILD            |    8 --------
 disable-clone3.diff |   22 ----------------------
 2 files changed, 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-20 17:42:33 UTC (rev 454090)
+++ PKGBUILD	2022-08-20 17:51:12 UTC (rev 454091)
@@ -21,7 +21,6 @@
         locale-gen
         lib32-glibc.conf
         sdt.h sdt-config.h
-        disable-clone3.diff
         reenable_DT_HASH.patch
 )
 validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
@@ -32,7 +31,6 @@
         '7c265e6d36a5c0dff127093580827d15519b6c7205c2e1300e82f0fb5b9dd00b6accb40c56581f18179c4fbbc95bd2bf1b900ace867a83accde0969f7b609f8a'
         'a6a5e2f2a627cc0d13d11a82458cfd0aa75ec1c5a3c7647e5d5a3bb1d4c0770887a3909bfda1236803d5bc9801bfd6251e13483e9adf797e4725332cd0d91a0e'
         '214e995e84b342fe7b2a7704ce011b7c7fc74c2971f98eeb3b4e677b99c860addc0a7d91b8dc0f0b8be7537782ee331999e02ba48f4ccc1c331b60f27d715678'
-        'edef5f724f68ea95c6b0127bd13a10245f548afc381b2d0a6d1d06ee9f87b7dd89c6becd35d5ae722bf838594eb870a747f67f07f46e7d63f8c8d1a43cce4a52'
         '5fdd133c367af2f5454ea1eea7907de12166fb95eb59dbe33eae16aa9e26209b6585972bc1c80e36a0af4bfb04296acaf940ee78cd624cdcbab9669dff46c051')
 
 prepare() {
@@ -41,12 +39,6 @@
   [[ -d glibc-$pkgver ]] && ln -s glibc-$pkgver glibc
   cd glibc
 
-  # Disable clone3 syscall for now
-  # Can be removed when eletron{9,11,12} and discord are removed or patched:
-  # https://github.com/electron/electron/commit/993ecb5bdd5c57024c8718ca6203a8f924d6d574
-  # Patch src: https://patchwork.ozlabs.org/project/glibc/patch/87eebkf8ph.fsf@oldenburg.str.redhat.com/
-  patch -Np1 -i "${srcdir}"/disable-clone3.diff
-
   # re-enable `--hash-style=both` for building shared objects due to issues with EPIC's EAC
   # which relies on DT_HASH to be present in these libs.
   # reconsider 2023-01

Deleted: disable-clone3.diff
===================================================================
--- disable-clone3.diff	2022-08-20 17:42:33 UTC (rev 454090)
+++ disable-clone3.diff	2022-08-20 17:51:12 UTC (rev 454091)
@@ -1,22 +0,0 @@
-diff --git a/sysdeps/unix/sysv/linux/clone-internal.c b/sysdeps/unix/sysv/linux/clone-internal.c
-index 1e7a8f6b35..4046c81180 100644
---- a/sysdeps/unix/sysv/linux/clone-internal.c
-+++ b/sysdeps/unix/sysv/linux/clone-internal.c
-@@ -48,17 +48,6 @@ __clone_internal (struct clone_args *cl_args,
- 		  int (*func) (void *arg), void *arg)
- {
-   int ret;
--#ifdef HAVE_CLONE3_WRAPPER
--  /* Try clone3 first.  */
--  int saved_errno = errno;
--  ret = __clone3 (cl_args, sizeof (*cl_args), func, arg);
--  if (ret != -1 || errno != ENOSYS)
--    return ret;
--
--  /* NB: Restore errno since errno may be checked against non-zero
--     return value.  */
--  __set_errno (saved_errno);
--#endif
- 
-   /* Map clone3 arguments to clone arguments.  NB: No need to check
-      invalid clone3 specific bits in flags nor exit_signal since this