gentoo auto-resync : 22:12:2022 - 01:55:45

10 files changed, 43 insertions, 594 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 32417ae4befe..92b0141508b2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index afcaa005e666..08cd16c5d410 100644
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -3,6 +3,5 @@ AUX apmd.confd 56 BLAKE2B 59236d42a8b27ba98ce06c61e19da23f0f131f82892e1a9907712f
 AUX apmd.rc6 568 BLAKE2B 10519550d5ed67ecdb2ae192517ecd9c4a8943309b31371be847aef4894b5171b50eca0b7a74655cbfd6fa4aa1a7a08c3fc2700b28b3945bb75962f93e5a60f0 SHA512 ac4578dd1b49207b8d1c50f3481a3652d8cfb83ea3c1984a553aa5acefd17fee5fa71a903fa9dca4d1991c47c6b14d6901352fc03df741cae0aed337ee55cf14
 DIST apmd_3.2.2-14.diff.gz 19195 BLAKE2B 554c84005fe443d3587169847b14cac186af0295e9b0dc4b9f564f014d2e717eb9c2d0ef0d6a4d701b81be26c2b0b8781f0bede008ac3bfcd2a20802a1e55ffa SHA512 a3578d0c43950f832fb437a744f8a4c3058c731649decb90f7b42c901b06f4df5f9a75599b4278e15af1c8a30d8043b0d76eb7d2cb67b05bf6bb210d5912a16d
 DIST apmd_3.2.2.orig.tar.gz 72757 BLAKE2B 1b93d831c1d24cbf8c061969dd915ce219bbf62374e4e82b8fd61b7154f3a1a8bd7da740c2b6a557a335f4aeed41feea13fb85bdedad80ab9197e1355d1b20e9 SHA512 fdc74703e75a700397bb2c907986f0cf0792ee4128d7a7ae08adf090bff0ea595044ba7a935d34929745bb702eb8bfe232e0ee9156efd23a995dc087f1b20bf4
-EBUILD apmd-3.2.2_p14-r2.ebuild 1903 BLAKE2B d5d0354d6de880bccf872753ebc8073d0fafd80f71612bfb3281cfc41c5c5c38b5838e96f61ff24561af5ac7d983fbfd2d9a95fba20d1da30c58b0efdaa81114 SHA512 bbbfbcdd36588bfb2971d9621b0321cfbdd2eeac009dd62e748cc639a6db120825ade0d9fb28a5ca0c3dd8a7d2b7002f26163d3ad63e1ab237a74c992465d4cf
 EBUILD apmd-3.2.2_p14-r3.ebuild 1805 BLAKE2B a0ba03480337ed14f2f9373c86a49906f5ad2c73578542b8be3fa9eb47c79a3ac21b044f7d5df7c1220bac1f7c4e58fee628c204d0a2c3303677b5bde4af79aa SHA512 d7f9c1b2598fe43bcf8523dde80ed8c6825741f5a89825dec1ef29cd676835a9eaf7e68d59649e6f8321517d4fa50ce36a47f47cf48a46ec1666ccd7e0352e1e
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-apps/apmd/apmd-3.2.2_p14-r2.ebuild b/sys-apps/apmd/apmd-3.2.2_p14-r2.ebuild
deleted file mode 100644
index 669ba2f6a4f4..000000000000
--- a/sys-apps/apmd/apmd-3.2.2_p14-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}_${MY_PV}"
-PATCHV="${PV#*_p}"
-
-DESCRIPTION="Advanced Power Management Daemon"
-HOMEPAGE="https://packages.qa.debian.org/a/apmd.html"
-SRC_URI="mirror://debian/pool/main/a/apmd/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/a/apmd/${MY_P}-${PATCHV}.diff.gz"
-S="${WORKDIR}/${PN}-${MY_PV}.orig"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="nls X"
-
-RDEPEND="
-	>=sys-apps/debianutils-1.16
-	>=sys-power/powermgmt-base-1.31
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXmu
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXt
-		x11-libs/libXext
-	)"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-BDEPEND="sys-devel/libtool"
-
-PATCHES=(
-	"${WORKDIR}"/${MY_P}-${PATCHV}.diff
-)
-
-src_prepare() {
-	default
-
-	if ! use X; then
-		sed -i \
-			-e 's:\(EXES=.*\)xapm:\1:' \
-			-e 's:\(.*\)\$(LT_INSTALL).*xapm.*$:\1echo:' \
-			Makefile || die
-	fi
-
-	# use system headers and skip on_ac_power
-	rm on_ac_power* || die
-
-	sed -i \
-		-e '/on_ac_power/d' \
-		-e 's:-I/usr/src/linux/include -I/usr/X11R6/include::' \
-		-e 's:-L/usr/X11R6/lib::' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dodir /usr/sbin
-	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) install
-
-	keepdir /etc/apm/{event.d,suspend.d,resume.d,other.d,scripts.d}
-	exeinto /etc/apm
-	doexe debian/apmd_proxy
-	dodoc AUTHORS {,apmsleep.}README debian/{changelog,README.Debian}
-
-	doman *.{1,8}
-
-	# note: apmd_proxy.conf is currently disabled and not used, thus
-	# not installed - liquidx (01 Mar 2004)
-
-	newconfd "${FILESDIR}"/apmd.confd apmd
-	newinitd "${FILESDIR}"/apmd.rc6 apmd
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/share/man/fr || die
-	fi
-
-	find "${ED}" -name '*.a' -delete || die
-}
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index 39f6f671666c..9baab735688b 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,7 +1,4 @@
-AUX fakechroot-2.20.1-glibc-2.33.patch 13065 BLAKE2B 3ed7c151bd07c323c3bf0e6eb925d6964dcf18fbb92c17cee3537ec0c707ce727e624a17335ad60fa74f06c86a41abd011f3c0f1f1fa50a2f58b4c35cd1bfdd7 SHA512 8cddb31f70d819ffe1058f5f764d12634b5bf290379f709e6d3a08796b7c8ba2a97157a19b7fe9c886f65f495a7e42ca84fa3f9651d3692df11b0f69e9588be0
-DIST fakechroot-2.20.1.tar.gz 504343 BLAKE2B 73459895319c1fd6297ab455e0d15f4b9985f433d958598d8581a35268e4df0f631b39d026061fe5c00ec6b805f3bf4f5f261039b93176db460b6f936c0de1b8 SHA512 9ddc715ff5c550b700c2384284c9f0cf6c2a99353a06d8e4c3b8363f4affdf9a11757ed5d1c9b85c83499b3bec054544290508a20f2ee16d46e66dc824a924ed
 DIST fakechroot_2.20.1+ds-2.debian.tar.xz 16120 BLAKE2B f4fe6943ca8e0f2bc68cc9d97af1195c34b8700b37838ced773e1452352d46806ebd31dbd6439121fa625ce74148d749e5064fe347ea5b1fa2e41c4e1b1a9867 SHA512 060448526eb7ac89b53984c582bcfffb641abdf4e7696e0033610343039012e6d459fb6682b4c1caa12bfcb91d515dfc4123ff3f1be3468d9db1a58ab9a8b415
 DIST fakechroot_2.20.1+ds.orig.tar.xz 88680 BLAKE2B 5e119eb6d7acee1f45bfc267e15b228624bbc5e29ebb19bcb61c4684719df4ce751c315423c27bceb0e2f97bcd491daa16d76f6b964842dcaddb90761dca092e SHA512 c61960b4fb03e65d7678511ae01a6f977d7f5584e81ee15a283f98da102dfc85d923265936443c7e9e208b62bb2147e8ae21a0ac62acf5bd8432775a4f6e723e
-EBUILD fakechroot-2.20.1.ebuild 592 BLAKE2B 3e2f4b9323b3ed118c5449cbc16fbe894e03f92640ea4a548d45d65a387ba16f509275a925d326ae219c8a446159f80c92e64a9daa4e8bca3f8bd83b566bcf83 SHA512 fc41327b742410adb4baafc2d45399b3ed36f17660ea6c6b15fd0c50c5dedf32a670eb65ca12fa1184344c53f0924a20f9f6dfbd9f7ecfbc4a6ac4f43cfb2a96
 EBUILD fakechroot-2.20.1_p2.ebuild 1082 BLAKE2B 3b554369f6da72c86f034eece546b3f002c3a08ee9b75eed05fbb8899e1c27890ebf4f042b726b37325526d61055707d806633e7df661920eeaca9637d8ca3f2 SHA512 17bf483f2059c2b2e3a0e7710fb0aca0897f9b96573b993f509668eb096af590e9222dd79b3b1a1fbc1b27ea57bca8a2820d63b2ba8e246be6000b81704363ef
 MISC metadata.xml 250 BLAKE2B 439cdb685dbeb4302786aefff7c6285f3fe97a6b1dd5dc66d2ff8b8e640c67b7db0ad3935428e819422598f3baf2a6795435bf0ba157ee49f427424c4346ebf7 SHA512 77c38fd1709e879ba98cf21c705aa95a31e7a9068a64105e7c9bec80efda5ee0ca7ee486346ace48849deda2e54a693f248b7eaa0d97f78da31797b8a7fc6b6c
diff --git a/sys-apps/fakechroot/fakechroot-2.20.1.ebuild b/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
deleted file mode 100644
index 9b303ca2be1b..000000000000
--- a/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Provide a faked chroot environment without requiring root privileges"
-HOMEPAGE="https://github.com/dex4er/fakechroot"
-SRC_URI="https://github.com/dex4er/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/fakechroot-2.20.1-glibc-2.33.patch"
-)
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/sys-apps/fakechroot/files/fakechroot-2.20.1-glibc-2.33.patch b/sys-apps/fakechroot/files/fakechroot-2.20.1-glibc-2.33.patch
deleted file mode 100644
index 31c2dd784393..000000000000
--- a/sys-apps/fakechroot/files/fakechroot-2.20.1-glibc-2.33.patch
+++ /dev/null
@@ -1,469 +0,0 @@
-From 534e6d555736b97211523970d378dfb0db2608e9 Mon Sep 17 00:00:00 2001
-From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
-Date: Mon, 22 Feb 2021 21:44:07 -0800
-Subject: [PATCH 1/6] tmpnam.c: fix heap overflow
-
-Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
----
- src/tmpnam.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tmpnam.c b/src/tmpnam.c
-index ce60817..917ee6b 100644
---- a/src/tmpnam.c
-+++ b/src/tmpnam.c
-@@ -42,7 +42,7 @@ wrapper(tmpnam, char *, (char * s))
- 
-     expand_chroot_path(ptr);
- 
--    ptr2 = malloc(strlen(ptr));
-+    ptr2 = malloc(strlen(ptr) + 1);
-     if (ptr2 == NULL) return NULL;
- 
-     strcpy(ptr2, ptr);
-
-From 75d7e6fa191c11a791faff06a0de86eaa7801d05 Mon Sep 17 00:00:00 2001
-From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
-Date: Mon, 22 Feb 2021 21:46:36 -0800
-Subject: [PATCH 2/6] declare missing bufs, remove ver from lstat
-
-Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
----
- src/lstat.c  | 8 +++++---
- src/lstat.h  | 2 +-
- src/mknod.c  | 2 ++
- src/stat.c   | 2 ++
- src/stat64.c | 2 ++
- 5 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/src/lstat.c b/src/lstat.c
-index 3f6d819..54e3263 100644
---- a/src/lstat.c
-+++ b/src/lstat.c
-@@ -28,9 +28,11 @@
- #include "lstat.h"
- 
- 
--wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
-+wrapper(lstat, int, (const char * filename, struct stat * buf))
- {
--    debug("lstat(%d, \"%s\", &buf)", ver, filename);
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-+    debug("lstat(\"%s\", &buf)", filename);
- 
-     if (!fakechroot_localdir(filename)) {
-         if (filename != NULL) {
-@@ -40,7 +42,7 @@ wrapper(lstat, int, (int ver, const char * filename, struct stat * buf))
-         }
-     }
- 
--    return lstat_rel(ver, filename, buf);
-+    return lstat_rel(filename, buf);
- }
- 
- 
-diff --git a/src/lstat.h b/src/lstat.h
-index 751c1ea..ee48303 100644
---- a/src/lstat.h
-+++ b/src/lstat.h
-@@ -26,7 +26,7 @@
- 
- #ifndef HAVE___LXSTAT
- 
--wrapper_proto(lstat, int, (int, const char *, struct stat *));
-+wrapper_proto(lstat, int, (const char *, struct stat *));
- 
- int lstat_rel(const char *, struct stat *);
- 
-diff --git a/src/mknod.c b/src/mknod.c
-index 52fd33b..2771037 100644
---- a/src/mknod.c
-+++ b/src/mknod.c
-@@ -28,6 +28,8 @@
- 
- wrapper(mknod, int, (const char * pathname, mode_t mode, dev_t dev))
- {
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-     debug("mknod(\"%s\", 0%o, %ld)", pathname, mode, dev);
-     expand_chroot_path(pathname);
-     return nextcall(mknod)(pathname, mode, dev);
-diff --git a/src/stat.c b/src/stat.c
-index 7845662..7b37793 100644
---- a/src/stat.c
-+++ b/src/stat.c
-@@ -33,6 +33,8 @@
- 
- wrapper(stat, int, (const char * file_name, struct stat * buf))
- {
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-     debug("stat(\"%s\", &buf)", file_name);
-     expand_chroot_path(file_name);
-     return nextcall(stat)(file_name, buf);
-diff --git a/src/stat64.c b/src/stat64.c
-index aac9c75..a360f66 100644
---- a/src/stat64.c
-+++ b/src/stat64.c
-@@ -34,6 +34,8 @@
- 
- wrapper(stat64, int, (const char * file_name, struct stat64 * buf))
- {
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-     debug("stat64(\"%s\", &buf)", file_name);
-     expand_chroot_path(file_name);
-     return nextcall(stat64)(file_name, buf);
-
-From 693a3597ea7fccfb62f357503ff177bd3e3d5a89 Mon Sep 17 00:00:00 2001
-From: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
-Date: Mon, 22 Feb 2021 21:47:09 -0800
-Subject: [PATCH 3/6] fix glibc 2.33+ compatibility
-
-Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
----
- configure.ac        | 20 ++++++++++++++++++++
- src/ftw.c           |  2 +-
- src/ftw64.c         | 14 +++++++++++---
- src/libfakechroot.h | 15 +++++++++++++++
- src/lstat.c         |  2 +-
- src/lstat.h         |  2 +-
- src/lstat64.c       |  2 +-
- src/mknod.c         |  2 +-
- src/mknodat.c       |  2 +-
- src/stat.c          |  2 +-
- src/stat64.c        |  2 +-
- 11 files changed, 54 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f8cdb32..9cc2e77 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -75,6 +75,26 @@ ACX_CHECK_C_ATTRIBUTE_VISIBILITY
- # Checks for libraries.
- AC_CHECK_LIB([dl], [dlsym])
- 
-+AH_TEMPLATE([NEW_GLIBC], [glibc >= 2.33])
-+AC_MSG_CHECKING([for glibc 2.33+])
-+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+       #include <sys/stat.h>
-+  ]], [[
-+#ifdef __GLIBC__
-+#if !__GLIBC_PREREQ(2,33)
-+#error glibc<2.33
-+#endif
-+#else
-+#error not glibc
-+#endif
-+  ]])],[
-+   AC_DEFINE(NEW_GLIBC,1)
-+   AC_MSG_RESULT([yes])
-+  ],[
-+   AC_DEFINE(NEW_GLIBC,0)
-+   AC_MSG_RESULT([no])
-+  ])
-+
- # Checks for header files.
- AC_HEADER_DIRENT
- AC_HEADER_STDC
-diff --git a/src/ftw.c b/src/ftw.c
-index 92fc126..a9abc85 100644
---- a/src/ftw.c
-+++ b/src/ftw.c
-@@ -185,7 +185,7 @@ int rpl_lstat (const char *, struct stat *);
- # define NFTW_NEW_NAME __new_nftw
- # define INO_T ino_t
- # define STAT stat
--# ifdef _LIBC
-+# if defined(_LIBC) && !NEW_GLIBC
- #  define LXSTAT __lxstat
- #  define XSTAT __xstat
- #  define FXSTATAT __fxstatat
-diff --git a/src/ftw64.c b/src/ftw64.c
-index 7cc8cdf..cee1f2b 100644
---- a/src/ftw64.c
-+++ b/src/ftw64.c
-@@ -18,6 +18,8 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#include "config.h"
-+
- #define __FTW64_C
- #define FTW_NAME ftw64
- #define NFTW_NAME nftw64
-@@ -25,9 +27,15 @@
- #define NFTW_NEW_NAME __new_nftw64
- #define INO_T ino64_t
- #define STAT stat64
--#define LXSTAT __lxstat64
--#define XSTAT __xstat64
--#define FXSTATAT __fxstatat64
-+#if NEW_GLIBC
-+#  define LXSTAT(V,f,sb) lstat64 (f,sb)
-+#  define XSTAT(V,f,sb) stat64 (f,sb)
-+#  define FXSTATAT(V,d,f,sb,m) fstatat64 (d, f, sb, m)
-+#else
-+#  define LXSTAT __lxstat64
-+#  define XSTAT __xstat64
-+#  define FXSTATAT __fxstatat64
-+#endif
- #define FTW_FUNC_T __ftw64_func_t
- #define NFTW_FUNC_T __nftw64_func_t
- 
-diff --git a/src/libfakechroot.h b/src/libfakechroot.h
-index 4cf199f..64ff15f 100644
---- a/src/libfakechroot.h
-+++ b/src/libfakechroot.h
-@@ -200,6 +200,21 @@
- # endif
- #endif
- 
-+#ifndef _STAT_VER
-+ #if defined (__aarch64__)
-+  #define _STAT_VER 0
-+ #elif defined (__powerpc__) && __WORDSIZE == 64
-+  #define _STAT_VER 1
-+ #elif defined (__riscv) && __riscv_xlen==64
-+  #define _STAT_VER 0
-+ #elif defined (__s390x__)
-+  #define _STAT_VER 1
-+ #elif defined (__x86_64__)
-+  #define _STAT_VER 1
-+ #else
-+  #define _STAT_VER 3
-+ #endif
-+#endif
- 
- typedef void (*fakechroot_wrapperfn_t)(void);
- 
-diff --git a/src/lstat.c b/src/lstat.c
-index 54e3263..fa38323 100644
---- a/src/lstat.c
-+++ b/src/lstat.c
-@@ -20,7 +20,7 @@
- 
- #include <config.h>
- 
--#ifndef HAVE___LXSTAT
-+#if !defined(HAVE___LXSTAT) || NEW_GLIBC
- 
- #include <sys/stat.h>
- #include <unistd.h>
-diff --git a/src/lstat.h b/src/lstat.h
-index ee48303..c46a2b9 100644
---- a/src/lstat.h
-+++ b/src/lstat.h
-@@ -24,7 +24,7 @@
- #include <config.h>
- #include "libfakechroot.h"
- 
--#ifndef HAVE___LXSTAT
-+#if !defined(HAVE___LXSTAT) || NEW_GLIBC
- 
- wrapper_proto(lstat, int, (const char *, struct stat *));
- 
-diff --git a/src/lstat64.c b/src/lstat64.c
-index b6212fc..a332d7c 100644
---- a/src/lstat64.c
-+++ b/src/lstat64.c
-@@ -20,7 +20,7 @@
- 
- #include <config.h>
- 
--#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64)
-+#if defined(HAVE_LSTAT64) && (!defined(HAVE___LXSTAT64) || NEW_GLIBC)
- 
- #define _LARGEFILE64_SOURCE
- #define _BSD_SOURCE
-diff --git a/src/mknod.c b/src/mknod.c
-index 2771037..aeb750b 100644
---- a/src/mknod.c
-+++ b/src/mknod.c
-@@ -20,7 +20,7 @@
- 
- #include <config.h>
- 
--#ifndef HAVE___XMKNOD
-+#if !defined(HAVE___XMKNOD) || NEW_GLIBC
- 
- #include <sys/stat.h>
- #include "libfakechroot.h"
-diff --git a/src/mknodat.c b/src/mknodat.c
-index 732a22b..3239b35 100644
---- a/src/mknodat.c
-+++ b/src/mknodat.c
-@@ -20,7 +20,7 @@
- 
- #include <config.h>
- 
--#if defined(HAVE_MKNODAT) && !defined(HAVE___XMKNODAT)
-+#if defined(HAVE_MKNODAT) && (!defined(HAVE___XMKNODAT) || NEW_GLIBC)
- 
- #define _ATFILE_SOURCE
- #include <sys/stat.h>
-diff --git a/src/stat.c b/src/stat.c
-index 7b37793..5ef57ba 100644
---- a/src/stat.c
-+++ b/src/stat.c
-@@ -20,7 +20,7 @@
- 
- #include <config.h>
- 
--#ifndef HAVE___XSTAT
-+#if !defined(HAVE___XSTAT) || NEW_GLIBC
- 
- #define _BSD_SOURCE
- #define _DEFAULT_SOURCE
-diff --git a/src/stat64.c b/src/stat64.c
-index a360f66..993ce80 100644
---- a/src/stat64.c
-+++ b/src/stat64.c
-@@ -20,7 +20,7 @@
- 
- #include <config.h>
- 
--#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64)
-+#if defined(HAVE_STAT64) && (!defined(HAVE___XSTAT64) || NEW_GLIBC)
- 
- #define _BSD_SOURCE
- #define _LARGEFILE64_SOURCE
-
-From e7c1f3a446e594a4d0cce5f5d499c9439ce1d5c5 Mon Sep 17 00:00:00 2001
-From: neok-m4700 <neok-m4700@users.noreply.github.com>
-Date: Wed, 24 Feb 2021 17:36:57 +0100
-Subject: [PATCH 6/6] wrap fstatat and fstatat64
-
----
- configure.ac    |  2 ++
- src/Makefile.am |  2 ++
- src/fstatat.c   | 42 ++++++++++++++++++++++++++++++++++++++++++
- src/fstatat64.c | 43 +++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 89 insertions(+)
- create mode 100644 src/fstatat.c
- create mode 100644 src/fstatat64.c
-
-diff --git a/configure.ac b/configure.ac
-index 9cc2e77..5b3053e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -218,6 +218,8 @@ AC_CHECK_FUNCS(m4_normalize([
-     freopen64
-     fstat
-     fstat64
-+    fstatat
-+    fstatat64
-     fts_children
-     fts_open
-     fts_read
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6066345..eb311c0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -61,6 +61,8 @@ libfakechroot_la_SOURCES = \
-     fopen64.c \
-     freopen.c \
-     freopen64.c \
-+    fstatat.c \
-+    fstatat64.c \
-     fts.c \
-     fts64.c \
-     ftw.c \
-diff --git a/src/fstatat.c b/src/fstatat.c
-new file mode 100644
-index 0000000..ca7578b
---- /dev/null
-+++ b/src/fstatat.c
-@@ -0,0 +1,42 @@
-+/*
-+    libfakechroot -- fake chroot environment
-+    Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org>
-+
-+    This library is free software; you can redistribute it and/or
-+    modify it under the terms of the GNU Lesser General Public
-+    License as published by the Free Software Foundation; either
-+    version 2.1 of the License, or (at your option) any later version.
-+
-+    This library is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+    Lesser General Public License for more details.
-+
-+    You should have received a copy of the GNU Lesser General Public
-+    License along with this library; if not, write to the Free Software
-+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-+*/
-+
-+
-+#include <config.h>
-+
-+#ifdef HAVE_FSTATAT
-+
-+#define _ATFILE_SOURCE
-+#define _POSIX_C_SOURCE 200809L
-+#include <sys/stat.h>
-+#include <limits.h>
-+#include "libfakechroot.h"
-+
-+wrapper(fstatat, int, (int dirfd, const char *pathname, struct stat *buf, int flags))
-+{
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-+    debug("fstatat(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
-+    expand_chroot_path_at(dirfd, pathname);
-+    return nextcall(fstatat)(dirfd, pathname, buf, flags);
-+}
-+
-+#else
-+typedef int empty_translation_unit;
-+#endif
-diff --git a/src/fstatat64.c b/src/fstatat64.c
-new file mode 100644
-index 0000000..1863372
---- /dev/null
-+++ b/src/fstatat64.c
-@@ -0,0 +1,43 @@
-+/*
-+    libfakechroot -- fake chroot environment
-+    Copyright (c) 2010, 2021 Piotr Roszatycki <dexter@debian.org>
-+
-+    This library is free software; you can redistribute it and/or
-+    modify it under the terms of the GNU Lesser General Public
-+    License as published by the Free Software Foundation; either
-+    version 2.1 of the License, or (at your option) any later version.
-+
-+    This library is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+    Lesser General Public License for more details.
-+
-+    You should have received a copy of the GNU Lesser General Public
-+    License along with this library; if not, write to the Free Software
-+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-+*/
-+
-+
-+#include <config.h>
-+
-+#ifdef HAVE_FSTATAT64
-+
-+#define _ATFILE_SOURCE
-+#define _POSIX_C_SOURCE 200809L
-+#define _LARGEFILE64_SOURCE
-+#include <sys/stat.h>
-+#include <limits.h>
-+#include "libfakechroot.h"
-+
-+wrapper(fstatat64, int, (int dirfd, const char *pathname, struct stat64 *buf, int flags))
-+{
-+    char fakechroot_abspath[FAKECHROOT_PATH_MAX];
-+    char fakechroot_buf[FAKECHROOT_PATH_MAX];
-+    debug("fstatat64(%d, \"%s\", &buf, %d)", dirfd, pathname, flags);
-+    expand_chroot_path_at(dirfd, pathname);
-+    return nextcall(fstatat64)(dirfd, pathname, buf, flags);
-+}
-+
-+#else
-+typedef int empty_translation_unit;
-+#endif
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index 02b1a8c6c8d6..7d770e3929de 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -1,3 +1,5 @@
 DIST memtester-4.5.1.tar.gz 23655 BLAKE2B bb7214a41f7cfa39dff6ab4f1efcd1788f5e6bd4cc1defba8c77ae030321703c1da7b6c1c6f1a67ea59e2cb9fc960772b710050b7c6d14b0799db4d9d99e9c31 SHA512 cf5744f11a931338a94158aee3047ad2dab18b0cb27b8998184a98f33aaebc678beec74841a2bcbbd7154cc2e46a20f746d9cae01a9274714bcedb93f29f8c80
-EBUILD memtester-4.5.1.ebuild 742 BLAKE2B c885dfaf724bc280051a6a383c5d65cf27eb74ec9cd46cc10fc0d32474d2f8117f467f05daf21ab04775941f70340f2564728a4edd0d6b98c1cb8ec368d68d32 SHA512 4e55c3f765e142e52970c1d7f5ab79972de52258780323f74d883e98b5721f7c6949b175afad6ead75dd3703054be52e84bb3d135595175bc82b37d8212686ab
-MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
+DIST memtester-4.6.0.tar.gz 24229 BLAKE2B 521e8f189cd4105af3824d780a1bb91cc59bf33863ca92ea8d01c5cda3633beb8bc6a32dee8321c201164789e0d0c95eb68f5017739432a14c6165e44931f9d0 SHA512 d60dd46a5d4ecb2ab35a5acdb99b714584cdf601b81454e3f7fa9dd224555b7a48cef666538b43c5dd7b2870bb74284e0cae6fb2eed19cf706818c7a955ab161
+EBUILD memtester-4.5.1.ebuild 747 BLAKE2B a4ba1aad775682f0904eaf8810fb61f5dee50789bf7a48b5801f432aa3fd7fb6ec165b55d6b40a5ac4f9417ea479242803edecd2f464e1eea9d23d9477809ec7 SHA512 aeaf23789264bb8761ec6b5c05591c478605bfcdd30e1d58b11111034c28a4f9a427a70bc4811cd3ff53431f805363c911e6cd9cfe6b036950dd5928afb3be94
+EBUILD memtester-4.6.0.ebuild 752 BLAKE2B 16d790383491b77e0fac16064db6a82f6b2b84bbec16d1c7ee34bc873361c5f354e45fd3cb4e07b63abc527e3baaf02f1b5c56a57e439d54e87b28a67f059577 SHA512 3345f0d3b05a6392075d496d2d0b96d0fb4c371549ea8986e53ee4842353b503b855526dcce229e863c183170038f351337b75d355730954a106aa8eea46db70
+MISC metadata.xml 357 BLAKE2B c440367bd0803ea3b204b8db0cd647382fa91d1f4a4a0ede07c59cc549013fc72f45d99359ced5f96594f4fb4e9cb1464b3ab15b51fab6e3680aa3460d6136a7 SHA512 826c36db605279ddefa8c4733680fc5e2a4aff583348cbdd82e6ec80b9c2401c4b12ea26587e62cb576086429a5ab934fbf5a1fa609ec195016387b2e8ea598f
diff --git a/sys-apps/memtester/memtester-4.5.1.ebuild b/sys-apps/memtester/memtester-4.5.1.ebuild
index 45c81eb5f2d7..c03aad4deb95 100644
--- a/sys-apps/memtester/memtester-4.5.1.ebuild
+++ b/sys-apps/memtester/memtester-4.5.1.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="userspace utility for testing the memory subsystem for faults"
+DESCRIPTION="Userspace utility for testing the memory subsystem for faults"
 HOMEPAGE="http://pyropus.ca/software/memtester/"
 SRC_URI="
-	http://pyropus.ca/software/memtester/${P}.tar.gz
-	http://pyropus.ca/software/memtester/old-versions/${P}.tar.gz"
+	https://pyropus.ca./software/memtester/${P}.tar.gz
+	https://pyropus.ca./software/memtester/old-versions/${P}.tar.gz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/memtester/memtester-4.6.0.ebuild b/sys-apps/memtester/memtester-4.6.0.ebuild
new file mode 100644
index 000000000000..52c171c1b2ec
--- /dev/null
+++ b/sys-apps/memtester/memtester-4.6.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Userspace utility for testing the memory subsystem for faults"
+HOMEPAGE="http://pyropus.ca/software/memtester/"
+SRC_URI="
+	https://pyropus.ca./software/memtester/${P}.tar.gz
+	https://pyropus.ca./software/memtester/old-versions/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
+}
+
+src_install() {
+	dosbin memtester
+	doman memtester.8
+	dodoc BUGS CHANGELOG README README.tests
+}
diff --git a/sys-apps/memtester/metadata.xml b/sys-apps/memtester/metadata.xml
index 73dda144f9ac..9b816e268415 100644
--- a/sys-apps/memtester/metadata.xml
+++ b/sys-apps/memtester/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<changelog>https://pyropus.ca./software/memtester/CHANGELOG</changelog>
+	</upstream>
 </pkgmetadata>