slackware-current/source/l/fuse/fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch
Patrick J Volkerding 32fa88b60c Mon Feb 21 20:21:38 UTC 2022
a/aaa_glibc-solibs-2.35-x86_64-1.txz:  Upgraded.
a/kernel-firmware-20220218_c53073d-noarch-1.txz:  Upgraded.
ap/flac-1.3.4-x86_64-1.txz:  Upgraded.
  This update fixes overflow issues with encoding and decoding.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0499
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-0561
  (* Security fix *)
ap/ksh93-1.0_20220219_bc6c5dbd-x86_64-1.txz:  Upgraded.
ap/mariadb-10.6.7-x86_64-2.txz:  Rebuilt.
  Removed dangling symlink.
ap/vim-8.2.4428-x86_64-1.txz:  Upgraded.
  Patched ctags for glibc-2.35. Thanks to nobodino.
d/autoconf-2.71-noarch-1.txz:  Upgraded.
d/automake-1.16.5-noarch-1.txz:  Upgraded.
d/binutils-2.38-x86_64-2.txz:  Rebuilt.
  Fixed the SlackBuild to not run autoconf in the libiberty and intl
  subdirectories. It doesn't work with the latest autoconf, and there
  doesn't seem to be any need for it anyway.
d/cmake-3.22.2-x86_64-1.txz:  Upgraded.
d/meson-0.61.2-x86_64-1.txz:  Upgraded.
d/rcs-5.10.0-x86_64-4.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
d/scons-4.3.0-x86_64-1.txz:  Upgraded.
e/emacs-27.2-x86_64-2.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
kde/digikam-7.5.0-x86_64-2.txz:  Rebuilt.
  Recompiled against jasper-3.0.2.
kde/wacomtablet-20220124_dd28b27-x86_64-1.txz:  Upgraded.
l/LibRaw-0.20.2-x86_64-4.txz:  Rebuilt.
  Recompiled against jasper-3.0.2.
l/accountsservice-22.07.5-x86_64-1.txz:  Upgraded.
l/dconf-editor-3.38.3-x86_64-2.txz:  Rebuilt.
  Fixed build errors with meson.
l/expat-2.4.6-x86_64-1.txz:  Upgraded.
l/fuse-2.9.9-x86_64-4.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
l/gcr-3.40.0-x86_64-2.txz:  Rebuilt.
  Fixed build errors with meson.
l/gdk-pixbuf2-2.42.6-x86_64-2.txz:  Rebuilt.
  Fixed meson options.
l/gdk-pixbuf2-xlib-2.40.2-x86_64-4.txz:  Rebuilt.
  Fixed meson options.
l/gegl-0.4.34-x86_64-3.txz:  Rebuilt.
  Recompiled against jasper-3.0.2.
l/glade-3.38.2-x86_64-6.txz:  Rebuilt.
  Fixed build errors with meson.
  Removed duplicated 'da' from help/LINGUAS.
l/glibc-2.35-x86_64-1.txz:  Upgraded.
l/glibc-i18n-2.35-x86_64-1.txz:  Upgraded.
l/glibc-profile-2.35-x86_64-1.txz:  Upgraded.
l/gobject-introspection-1.71.0-x86_64-1.txz:  Upgraded.
  This update was needed to solve failing tests with the new meson.
l/gtk+2-2.24.33-x86_64-3.txz:  Rebuilt.
  Changed build/host to $ARCH-slackware-linux-gnu.
l/gtk4-4.4.1-x86_64-2.txz:  Rebuilt.
  Fixed meson options.
l/gvfs-1.48.1-x86_64-2.txz:  Rebuilt.
  Fixed build errors with meson.
l/imagemagick-7.1.0_26-x86_64-1.txz:  Upgraded.
l/jasper-3.0.2-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
l/json-glib-1.6.6-x86_64-2.txz:  Rebuilt.
  Fixed meson options.
l/libsecret-0.20.5-x86_64-1.txz:  Upgraded.
l/netpbm-10.97.04-x86_64-1.txz:  Upgraded.
l/qt5-5.15.3_20211130_014c375b-x86_64-3.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
  Recompiled against jasper-3.0.2.
l/shared-mime-info-2.1-x86_64-4.txz:  Rebuilt.
  Fixed build errors with meson.
n/gpgme-1.17.0-x86_64-1.txz:  Upgraded.
n/ntp-4.2.8p15-x86_64-9.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
x/libinput-1.19.3-x86_64-2.txz:  Rebuilt.
  Recompiled against libwacom-2.1.0.
x/libva-2.14.0-x86_64-1.txz:  Upgraded.
x/libva-utils-2.14.0-x86_64-1.txz:  Upgraded.
x/libwacom-2.1.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
x/motif-2.3.8-x86_64-6.txz:  Rebuilt.
  Fixed build with LEXLIB="-lfl".
x/vulkan-sdk-1.2.176.1-x86_64-3.txz:  Rebuilt.
  Patched for glibc-2.35. Thanks to nobodino.
x/xf86-input-wacom-1.0.0-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.24.0-x86_64-3.txz:  Rebuilt.
  Fixed build errors with meson.
xap/vim-gvim-8.2.4428-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
2022-02-22 06:59:43 +01:00

55 lines
1.4 KiB
Diff

From: Sam James <sam@gentoo.org>
Date: Sat, 24 Jul 2021 22:02:45 +0100
Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix
glibc-2.34+)
closefrom(3) has joined us in glibc-land from *BSD and Solaris. Since
it's available in glibc 2.34+, we want to detect it and only define our
fallback if the libc doesn't provide it.
Bug: https://bugs.gentoo.org/803923
Signed-off-by: Sam James <sam@gentoo.org>
diff --git a/configure.ac b/configure.ac
index 9946a0e..a2d481a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,7 @@ fi
AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat])
AC_CHECK_FUNCS([posix_fallocate])
+AC_CHECK_FUNCS([closefrom])
AC_CHECK_MEMBERS([struct stat.st_atim])
AC_CHECK_MEMBERS([struct stat.st_atimespec])
diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c
index 273c7d9..a04dac5 100644
--- a/util/ulockmgr_server.c
+++ b/util/ulockmgr_server.c
@@ -22,6 +22,10 @@
#include <sys/socket.h>
#include <sys/wait.h>
+#ifdef HAVE_CONFIG_H
+ #include "config.h"
+#endif
+
struct message {
unsigned intr : 1;
unsigned nofd : 1;
@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp,
return res;
}
+#if !defined(HAVE_CLOSEFROM)
static int closefrom(int minfd)
{
DIR *dir = opendir("/proc/self/fd");
@@ -141,6 +146,7 @@ static int closefrom(int minfd)
}
return 0;
}
+#endif
static void send_reply(int cfd, struct message *msg)
{