diff --git a/libbsd-glibc-2.34-closefrom.patch b/libbsd-glibc-2.34-closefrom.patch new file mode 100644 index 0000000..e684f88 --- /dev/null +++ b/libbsd-glibc-2.34-closefrom.patch @@ -0,0 +1,31 @@ +From 7b4ebd6521a693f236cad4170fce1bb5237ecae5 Mon Sep 17 00:00:00 2001 +From: Callum Farmer +Date: Thu, 16 Feb 2023 21:26:05 +0000 +Subject: [PATCH] include: Adjust closefrom() per glibc adoption + +Added in glibc 2.34 +https://sourceware.org/git/?p=glibc.git;a=commit;h=607449506f197cc9514408908f41f22537a47a8c + +Signed-off-by: Guillem Jover +--- + include/bsd/unistd.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/bsd/unistd.h b/include/bsd/unistd.h +index 167241b..20b0993 100644 +--- a/include/bsd/unistd.h ++++ b/include/bsd/unistd.h +@@ -59,7 +59,11 @@ int bsd_getopt(int argc, char * const argv[], const char *shortopts); + mode_t getmode(const void *set, mode_t mode); + void *setmode(const char *mode_str); + ++#if !defined(__GLIBC__) || \ ++ !__GLIBC_PREREQ(2, 34) || \ ++ !defined(_DEFAULT_SOURCE) + void closefrom(int lowfd); ++#endif + + /* Compatibility with sendmail implementations. */ + #define initsetproctitle(c, a, e) setproctitle_init((c), (a), (e)) +-- +GitLab diff --git a/libbsd.changes b/libbsd.changes index 3b9d517..ee1061d 100644 --- a/libbsd.changes +++ b/libbsd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 15 20:08:08 UTC 2023 - Callum Farmer + +- Add libbsd-glibc-2.34-closefrom.patch to avoid conflicting + with function provided by glibc 2.34 + ------------------------------------------------------------------- Fri Oct 7 12:04:07 UTC 2022 - Dirk Müller diff --git a/libbsd.spec b/libbsd.spec index 7c2683c..0bb281c 100644 --- a/libbsd.spec +++ b/libbsd.spec @@ -27,6 +27,7 @@ URL: https://libbsd.freedesktop.org/ Source0: https://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz Source1: https://libbsd.freedesktop.org/releases/libbsd-%{version}.tar.xz.asc Source2: %{name}.keyring +Patch0: libbsd-glibc-2.34-closefrom.patch BuildRequires: fdupes BuildRequires: libmd-devel BuildRequires: openssl-devel @@ -73,7 +74,7 @@ when libbsd is loaded via dlopen() from a threaded program. This can be configured using "pkg-config --libs libbsd-ctor". %prep -%autosetup +%autosetup -p1 %build export CFLAGS="%{optflags} -ffat-lto-objects"