4 files changed, 62 insertions, 63 deletions
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index ebedfb81c7d6..d077e648b488 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/foremost/Manifest b/app-forensics/foremost/Manifest
index eacd17645e69..1454f9eaa931 100644
--- a/app-forensics/foremost/Manifest
+++ b/app-forensics/foremost/Manifest
@@ -1,8 +1,9 @@
 AUX foremost-1.4-config-location.patch 462 BLAKE2B 7dadc7fd049b09992e9e3019aaaa27d53268a6b6cea03146d965bdd3f0ec3165fbde33c2ecd41a949758ff4b8d36259d048869d17b828e2f600ea9418e3d0bce SHA512 7b6dcc18cba4676ef4d54b87c9c31747754ecbebd9424340b2dd059495c9c6cec11513307fff802a336a99bc07c4bcd2ffcfad1c77ccdc49277ef7e40e30029e
 AUX foremost-1.5.7-fno-common.patch 3330 BLAKE2B 0e99b6cd29cb6ef558d2d44ce62b38abcf03f0dffb0dbf302264cfe21255647c09e885ed0dd4726ce0708fae8c03c0bd2e3678906fe6aab0fb24b211442cfd6c SHA512 4a129e0bb97f2c8aa09d6861077e732886e1d26573cc8698abfb03b55ebcf73c7ba1fbd6de25c5a4d2ce8cd271ebf07aa277d823d54640e6922ebc72a6aaba46
 AUX foremost-1.5.7-format-security.patch 680 BLAKE2B 5565dc9d255ccbb4b721cdb0b41fef4f86369c4965000e35678e6ece00acec5ead0b15d90bd71a2456b812ab74fa9283bdf70c2fc36003a3d659105bb04a139d SHA512 1c28ed1fceedec728a5060b195214fd3ec3b0fa529e87f7421ee72d73f71ecc0d48a69a5b5ff4c6179dd65781552fbd272437134498ec865bd5c620375b6f85b
-AUX foremost-1.5.7-musl.patch 2427 BLAKE2B 403aa6c8c6605a823f96948bf0c4667e8cd9563827f56924efb44d307667dd7c0f981489577ba86b9b79d327ea9eeb80315612c51ffdee38855c5780365f84de SHA512 bdec206ebdd7fbbdbed6b0bc1a7d0513bc3e1cbb673cb6cb31a217ded9dba142ca40e92cc20cbe8b47d6031d456fd86e0285bb9114f22115405019ae7ab70fca
+AUX foremost-1.5.7-musl.patch 1032 BLAKE2B e0b3f62d7ce47413186ea05a3e94d392b5f33064edd21215984e568112cdb53d2ffa1f975084dfb280882e23ee3679ba7d09a500984e7c3d4ddbbffc40962e15 SHA512 ac2d9c0f417b6cbf889378be1bc3bd83498fae2029ed0118b09292839cb3e7bb56168d040e990bd5dc261e89d645506769db9faaa2777f85f9877afa2fc46b4a
 AUX foremost-1.5.7-set-but-unused.patch 7720 BLAKE2B 047c4a31d26750706a9dad36078e848e68e89f0013a6572369dc42fa014234d37120bdb3c51ec7e83b7c99d4c497c541039e334af1d3bd144cf8250a1212f920 SHA512 1be57b3a63e38556b3a6758c1f24e5424076f11608dba148703c9cef16bac9954366a2540720912e8720d0e291f6d5933f2830b0f1b497a5f6feabc570231a52
 DIST foremost-1.5.7.tar.gz 52352 BLAKE2B 5642c1afd86aab0a2f90986c3b030d37b37700c5d0e4b04e4f4a2004d69745280fabd4086a72c33b9eab05b57d125d6b11105c9e11b0112e30077f101eeab7ac SHA512 8827c29d52496783be26374f3943eb26a154d842f34e50fb489f87b3a5045bf85f1e44d7d8d8b12b2355ba3fe4b06a0db979cc22c0f431593c5976001eb931ab
 EBUILD foremost-1.5.7-r3.ebuild 1031 BLAKE2B 38c23a88978eaf19735eec148d554f8f21a6a68b88a0466f8ba96b0e307cc7a07d21cbcca75c08415eb8ce2652901f9ef6e8b021442e3d8fa2ecd79c7be03896 SHA512 54257e554d9cf0d0c10a31bfaf2bb80a2909dd109394fd80cc3ddd8a6c4010b5551ccdbaf287e94e0eb9af38b82dbfaf4e20a40007480c3b3652ebeafb6fb14f
+EBUILD foremost-1.5.7-r4.ebuild 1121 BLAKE2B c7123f0cbbbd590b0c0e1fb4a4822f867b73cb59ecabb7d1370f5fa6836fa8a5ef1f37338aa92449991a2ec60f4f6d17bba1479d8af6541073b5d8063ef5d8ff SHA512 ad7146c16a57376405102013a283d22a7408748610461ea425870909a3e25b0ed497d2cade87778444ddb7efaeb3e5a05d78245a28bba441dd891398cb316651
 MISC metadata.xml 251 BLAKE2B 7ab029eb94dc8bc097d9d94165cf016e292bad9dccfa23c8e6119bf3fcd4737432e924000cfa12d5c77f62fb0e6265876cd6a0161a973f554b88ba7222ea9a0b SHA512 0ae1ad6cf7ab9fb8668d30f730a55cb6ee01ff27bc170058f15594d952441a7e8782d969cba56bd5e6d1228ce25d0d076ce8aa845a48b8deca1a497dc18c1bad
diff --git a/app-forensics/foremost/files/foremost-1.5.7-musl.patch b/app-forensics/foremost/files/foremost-1.5.7-musl.patch
index 0f8994b2328f..18bca055c584 100644
--- a/app-forensics/foremost/files/foremost-1.5.7-musl.patch
+++ b/app-forensics/foremost/files/foremost-1.5.7-musl.patch
@@ -1,78 +1,30 @@
---- a/cli.c
-+++ b/cli.c
-@@ -4,7 +4,7 @@
- 
- void fatal_error (f_state * s, char *msg)
- 	{
--	fprintf(stderr, "%s: %s%s", __progname, msg, NEWLINE);
-+	fprintf(stderr, "%s: %s%s", program_invocation_short_name, msg, NEWLINE);
- 	if (get_audit_file_open(s))
- 		{
- 		audit_msg(s, msg);
-@@ -16,7 +16,7 @@
- void print_error(f_state *s, char *fn, char *msg)
- {
- 	if (!(get_mode(s, mode_quiet)))
--		fprintf(stderr, "%s: %s: %s%s", __progname, fn, msg, NEWLINE);
-+		fprintf(stderr, "%s: %s: %s%s", program_invocation_short_name, fn, msg, NEWLINE);
- }
- 
- void print_message(f_state *s, char *format, va_list argp)
---- a/helpers.c
-+++ b/helpers.c
-@@ -133,7 +133,7 @@
- 		if (ioctl(fd, BLKGETSIZE, &num_sectors))
- 		{
- 		#if defined(__DEBUG)
--			fprintf(stderr, "%s: ioctl call to BLKGETSIZE failed.%s", __progname, NEWLINE);
-+			fprintf(stderr, "%s: ioctl call to BLKGETSIZE failed.%s", program_invocation_short_name, NEWLINE);
- 		#endif
- 		}
- 		else
---- a/main.c
-+++ b/main.c
-@@ -55,18 +55,18 @@
- 
- void try_msg(void)
- {
--	fprintf(stderr, "Try `%s -h` for more information.%s", __progname, NEWLINE);
-+	fprintf(stderr, "Try `%s -h` for more information.%s", program_invocation_short_name, NEWLINE);
- }
- 
- /* The usage function should, at most, display 22 lines of text to fit
-    on a single screen */
- void usage(void)
- {
--	fprintf(stderr, "%s version %s by %s.%s", __progname, VERSION, AUTHOR, NEWLINE);
-+	fprintf(stderr, "%s version %s by %s.%s", program_invocation_short_name, VERSION, AUTHOR, NEWLINE);
- 	fprintf(stderr,
- 			"%s %s [-v|-V|-h|-T|-Q|-q|-a|-w-d] [-t <type>] [-s <blocks>] [-k <size>] \n\t[-b <size>] [-c <file>] [-o <dir>] [-i <file] %s%s",
- 		CMD_PROMPT,
--			__progname,
-+			program_invocation_short_name,
- 			NEWLINE,
- 			NEWLINE);
- 	fprintf(stderr, "-V  - display copyright information and exit%s", NEWLINE);
-@@ -233,10 +233,6 @@
+Index: foremost-1.5.7/main.c
+===================================================================
+--- foremost-1.5.7.orig/main.c
++++ foremost-1.5.7/main.c
+@@ -232,9 +232,7 @@ int main(int argc, char **argv)
  	char	**temp = argv;
  	DIR* 	dir;
  
 -#ifndef __GLIBC__
 -	__progname = basename(argv[0]);
 -#endif
--
++	char * __progname = basename(argv[0]);
+ 
  	/*Initialize the global state struct*/
  	if (initialize_state(s, argc, argv))
- 		fatal_error(s, "Unable to initialize state");
---- a/main.h
-+++ b/main.h
-@@ -187,12 +187,6 @@
+Index: foremost-1.5.7/main.h
+===================================================================
+--- foremost-1.5.7.orig/main.h
++++ foremost-1.5.7/main.h
+@@ -187,12 +187,8 @@ int getopt(int argc, char *const argv[],
  #endif   /* ifdef _WIN32 */
  
  
 -/* On non-glibc systems we have to manually set the __progname variable */
 -#ifdef __GLIBC__
--extern char *__progname;
++/* On non-GNU systems we have to manually set the __progname variable */
+ extern char *__progname;
 -#else
 -char *__progname;
 -#endif /* ifdef __GLIBC__ */
diff --git a/app-forensics/foremost/foremost-1.5.7-r4.ebuild b/app-forensics/foremost/foremost-1.5.7-r4.ebuild
new file mode 100644
index 000000000000..7efec700c421
--- /dev/null
+++ b/app-forensics/foremost/foremost-1.5.7-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs prefix
+
+DESCRIPTION="Console program to recover files based on their headers and footers"
+HOMEPAGE="http://foremost.sourceforge.net/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+# starting to hate sf.net ...
+SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~arm64-macos ~x64-macos"
+IUSE=""
+
+src_prepare() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-1.4-config-location.patch"
+		"${FILESDIR}/${PN}-1.5.7-format-security.patch" # bug 521038
+		"${FILESDIR}/${PN}-1.5.7-set-but-unused.patch" # bug 706886
+		"${FILESDIR}/${PN}-1.5.7-fno-common.patch" # bug 722196
+		"${FILESDIR}/${PN}-1.5.7-musl.patch" # bug 830473
+	)
+
+	default
+	hprefixify config.c
+}
+
+src_compile() {
+	emake \
+		RAW_FLAGS="${CFLAGS} -Wall ${LDFLAGS}" \
+		RAW_CC="$(tc-getCC) -DVERSION=\\\"${PV}\\\"" \
+		CONF=/etc
+}
+
+src_install() {
+	dobin foremost
+	gunzip foremost.8.gz || die
+	doman foremost.8
+	insinto /etc
+	doins foremost.conf
+	dodoc README CHANGES
+}