diff --git a/include/mk/versions.mk b/include/mk/versions.mk index 02f4f23..90afdf7 100644 --- a/include/mk/versions.mk +++ b/include/mk/versions.mk @@ -29,11 +29,11 @@ file_version = 5.40 findutils_version = 4.8.0 flex_version = 2.6.4 gawk_version = 5.1.1 -gcc_version = 11.2.0 +gcc_version = 11.3.0 gdbm_version = 1.19 gettext_version = 0.21 gettext-tiny_version = 0.3.2 -glibc_version = 2.33 +glibc_version = 2.35 gmp_version = 6.2.1 gperf_version = 3.1 grep_version = 3.6 @@ -56,7 +56,7 @@ libnl_version = 3.5.0 libressl_version = 3.0.2 libtool_version = 2.4.6 libz_version = 1.2.8.2015.12.26 -linux_version = 5.17.1 +linux_version = 5.17.5 linux_rpi_version = 5.4.45 m4_version = 1.4.19 make_version = 4.3 diff --git a/include/openbsd/unistd.h b/include/openbsd/unistd.h index 64034a2..439f003 100644 --- a/include/openbsd/unistd.h +++ b/include/openbsd/unistd.h @@ -43,7 +43,6 @@ #define STDERR_FILENO 2 /* standard error file descriptor */ int execvpe(const char *, char *const *, char *const *); -int closefrom(int); int crypt_newhash(const char *, const char *, char *, size_t); int getdtablecount(void); int getentropy(void *, size_t); diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 9727f54..d9345ef 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -5,7 +5,6 @@ distname = glibc patches += glibc-2.31-fhs-1.patch patches += glibc-no-test-installation.patch -patches += ldd-rewrite-nobash.patch include world.mk -include locales.mk diff --git a/world/glibc/Makefile b/world/glibc/Makefile index f2ded6c..157e9df 100644 --- a/world/glibc/Makefile +++ b/world/glibc/Makefile @@ -5,7 +5,6 @@ distname = glibc patches += glibc-2.31-fhs-1.patch patches += glibc-no-test-installation.patch -patches += ldd-rewrite-nobash.patch include world.mk -include locales.mk diff --git a/world/glibc/ldd-rewrite-nobash.patch b/world/glibc/ldd-rewrite-nobash.patch deleted file mode 100644 index c6d53e8..0000000 --- a/world/glibc/ldd-rewrite-nobash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur glibc-2.31.orig/elf/Makefile glibc-2.31/elf/Makefile ---- glibc-2.31.orig/elf/Makefile 2020-02-01 06:52:50.000000000 -0500 -+++ glibc-2.31/elf/Makefile 2020-07-13 10:21:19.374415161 -0400 -@@ -594,7 +594,7 @@ - -e 's%@VERSION@%$(version)%g' \ - -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ - -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \ -- -e 's%@BASH@%$(BASH)%g' \ -+ -e 's%@BASH@%/bin/sh%g' \ - -e 's%@TEXTDOMAINDIR@%$(localedir)%g' - - ifeq ($(ldd-rewrite-script),no) diff --git a/world/lib/libopenbsd/compat/Makefile.inc b/world/lib/libopenbsd/compat/Makefile.inc index ce99d24..f7d62de 100644 --- a/world/lib/libopenbsd/compat/Makefile.inc +++ b/world/lib/libopenbsd/compat/Makefile.inc @@ -3,7 +3,7 @@ # compat sources VPATH+= ${LIBCSRCDIR}/compat -SRCS+= fgetwln.c open.c setproctitle.c pledge-noop.c closefrom.c +SRCS+= fgetwln.c open.c setproctitle.c pledge-noop.c include ${.TOPDIR}/config.mk diff --git a/world/lib/libopenbsd/compat/closefrom.c b/world/lib/libopenbsd/compat/closefrom.c deleted file mode 100644 index 07fa03c..0000000 --- a/world/lib/libopenbsd/compat/closefrom.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2004-2005 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef HAVE_CLOSEFROM - -#include -#include -#include -#include -#ifdef HAVE_FCNTL_H -# include -#endif -#include -#include -#include -#include -#include -#ifdef HAVE_DIRENT_H -# include -# define NAMLEN(dirent) strlen((dirent)->d_name) -#else -# define dirent direct -# define NAMLEN(dirent) (dirent)->d_namlen -# ifdef HAVE_SYS_NDIR_H -# include -# endif -# ifdef HAVE_SYS_DIR_H -# include -# endif -# ifdef HAVE_NDIR_H -# include -# endif -#endif - -#ifndef OPEN_MAX -# define OPEN_MAX 256 -#endif - -#if 0 -__unused static const char rcsid[] = "$Sudo: closefrom.c,v 1.11 2006/08/17 15:26:54 millert Exp $"; -#endif /* lint */ - -/* - * Close all file descriptors greater than or equal to lowfd. - */ -#ifdef HAVE_FCNTL_CLOSEM -int -closefrom(int lowfd) -{ - (void) fcntl(lowfd, F_CLOSEM, 0); - return 0; -} -#else -int -closefrom(int lowfd) -{ - long fd, maxfd; -#if defined(HAVE_DIRFD) && defined(HAVE_PROC_PID) - char fdpath[PATH_MAX], *endp; - struct dirent *dent; - DIR *dirp; - int len; - - /* Check for a /proc/$$/fd directory. */ - len = snprintf(fdpath, sizeof(fdpath), "/proc/%ld/fd", (long)getpid()); - if (len > 0 && (size_t)len <= sizeof(fdpath) && (dirp = opendir(fdpath))) { - while ((dent = readdir(dirp)) != NULL) { - fd = strtol(dent->d_name, &endp, 10); - if (dent->d_name != endp && *endp == '\0' && - fd >= 0 && fd < INT_MAX && fd >= lowfd && fd != dirfd(dirp)) - (void) close((int) fd); - } - (void) closedir(dirp); - } else -#endif - { - /* - * Fall back on sysconf() or getdtablesize(). We avoid checking - * resource limits since it is possible to open a file descriptor - * and then drop the rlimit such that it is below the open fd. - */ -#ifdef HAVE_SYSCONF - maxfd = sysconf(_SC_OPEN_MAX); -#else - maxfd = getdtablesize(); -#endif /* HAVE_SYSCONF */ - if (maxfd < 0) - maxfd = OPEN_MAX; - - for (fd = lowfd; fd < maxfd; fd++) - (void) close((int) fd); - } - return 0; -} -#endif /* !HAVE_FCNTL_CLOSEM */ -#endif /* HAVE_CLOSEFROM */ diff --git a/world/lib/libopenbsd/srcs.mk b/world/lib/libopenbsd/srcs.mk index 451e74e..fbc7d3a 100644 --- a/world/lib/libopenbsd/srcs.mk +++ b/world/lib/libopenbsd/srcs.mk @@ -121,7 +121,6 @@ objs += $(objdir)/fgetwln.o objs += $(objdir)/open.o objs += $(objdir)/setproctitle.o objs += $(objdir)/pledge-noop.o -objs += $(objdir)/closefrom.o objs += $(objdir)/fgetln.o objs += $(objdir)/freezero.o objs += $(objdir)/getdtablecount.o diff --git a/world/lib/liboutil/include/unistd.h b/world/lib/liboutil/include/unistd.h index 64034a2..439f003 100644 --- a/world/lib/liboutil/include/unistd.h +++ b/world/lib/liboutil/include/unistd.h @@ -43,7 +43,6 @@ #define STDERR_FILENO 2 /* standard error file descriptor */ int execvpe(const char *, char *const *, char *const *); -int closefrom(int); int crypt_newhash(const char *, const char *, char *, size_t); int getdtablecount(void); int getentropy(void *, size_t);