From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Sep 2020 14:09:07 +0100 Subject: gentoo resync : 02.09.2020 --- app-forensics/foremost/Manifest | 3 +- .../foremost/files/foremost-1.5.7-fno-common.patch | 99 ++++++++++++++++++++++ app-forensics/foremost/foremost-1.5.7-r3.ebuild | 26 +++--- 3 files changed, 117 insertions(+), 11 deletions(-) create mode 100644 app-forensics/foremost/files/foremost-1.5.7-fno-common.patch (limited to 'app-forensics/foremost') diff --git a/app-forensics/foremost/Manifest b/app-forensics/foremost/Manifest index b4f23fef7fa6..a6dfbb19144b 100644 --- a/app-forensics/foremost/Manifest +++ b/app-forensics/foremost/Manifest @@ -1,6 +1,7 @@ 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-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 889 BLAKE2B 4c6efebcd368b06250afef4a665ce84e7538eeb82a83988b148f1e2ef3fa94e769d7172b05d78156488e1e066aa2fa927a5fd0b8f3073cc7a754f0793d2e08fd SHA512 b1156aeeeef8718e631fc9e24a030a2191951238a76da2754e52ed62f35084294517f40c2809d2466953cfd5a723d71bf5497ed44726a0723df8b30d4b6d17ef +EBUILD foremost-1.5.7-r3.ebuild 980 BLAKE2B b77306199fc17969bb6f3d144518b0aa40706b6cbdabb7a734d62c9b875955be17cd6aba2d828517bd156a2372be06bfee614e35d5a9b8e57b28c7e74501d118 SHA512 5f6dd75a8b111562018e7b1c4885b54aacce99bad1a38563fd7d778386c750baa38a351d7d725f5bc916677d5bcbdce1589c32b81a32b601f3dd5e448b82344e MISC metadata.xml 303 BLAKE2B 14bc09979926d326ccb75438d8e32f9a60b1df8078e6344f4dc2e32a33c0994bf2740a4b29d7c1a479bb514815f037d2d9a9ac9c8387fbc01b7795e2a37fea86 SHA512 165c108232c3a65d3fbeb0fb2f612c7c4c4c16a57e4b3e280c4ef40d6a586b56df437454283ff5b52fa3a0880d9643682493b3d75cac01170edab53bb5f1ce52 diff --git a/app-forensics/foremost/files/foremost-1.5.7-fno-common.patch b/app-forensics/foremost/files/foremost-1.5.7-fno-common.patch new file mode 100644 index 000000000000..8506f59cf95a --- /dev/null +++ b/app-forensics/foremost/files/foremost-1.5.7-fno-common.patch @@ -0,0 +1,99 @@ +diff -up foremost-1.5.7/api.c.me foremost-1.5.7/api.c +--- foremost-1.5.7/api.c.me 2020-02-06 14:15:48.218200745 +0100 ++++ foremost-1.5.7/api.c 2020-02-06 14:16:42.624853860 +0100 +@@ -20,6 +20,7 @@ int currFATblk; + int highblk = 0; + int block_list[OUR_BLK_SIZE / sizeof(int)]; + extern int errno; ++struct DIRECTORY *dirlist, *dl; + + /*Inititialize those globals used by extract_ole*/ + void init_ole() +diff -up foremost-1.5.7/extract.c.me foremost-1.5.7/extract.c +--- foremost-1.5.7/extract.c.me 2020-02-06 14:10:30.446386101 +0100 ++++ foremost-1.5.7/extract.c 2020-02-06 14:15:14.736798823 +0100 +@@ -25,6 +25,7 @@ extern char *extract_name; + extern int extract; + extern int FATblk; + extern int highblk; ++extern struct DIRECTORY *dirlist, *dl; + + /******************************************************************************** + *Function: extract_zip +diff -up foremost-1.5.7/main.h.me foremost-1.5.7/main.h +--- foremost-1.5.7/main.h.me 2020-02-06 13:48:46.923922983 +0100 ++++ foremost-1.5.7/main.h 2020-02-06 13:50:08.001849830 +0100 +@@ -292,7 +292,7 @@ char *__progname; + /* ----------------------------------------------------------------- + State Variable and Global Variables + ----------------------------------------------------------------- */ +-char wildcard; ++extern char wildcard; + typedef struct f_state + { + off_t mode; +@@ -344,7 +344,7 @@ typedef struct s_spec + int written; /*used for -a mode*/ + }s_spec; + +-s_spec search_spec[50]; /*ARRAY OF BUILTIN SEARCH TYPES*/ ++extern s_spec search_spec[50]; /*ARRAY OF BUILTIN SEARCH TYPES*/ + + typedef struct f_info { + char *file_name; +@@ -367,7 +367,7 @@ typedef struct f_info { + } f_info; + + /* Set if the user hits ctrl-c */ +-int signal_caught; ++extern int signal_caught; + + /* ----------------------------------------------------------------- + Function definitions +@@ -433,7 +433,7 @@ off_t find_file_size(FILE *f); + char *human_readable(off_t size, char *buffer); + char *units(unsigned int c); + unsigned int chop(char *buf); +-void print_search_specs(f_state *s); ++extern void print_search_specs(f_state *s); + int memwildcardcmp(const void *s1, const void *s2,size_t n,int caseSensitive); + int charactersMatch(char a, char b, int caseSensitive); + void printx(unsigned char* buf,int start, int end); +diff -up foremost-1.5.7/ole.h.me foremost-1.5.7/ole.h +--- foremost-1.5.7/ole.h.me 2020-02-06 14:08:16.524783353 +0100 ++++ foremost-1.5.7/ole.h 2020-02-06 14:10:02.954056080 +0100 +@@ -84,8 +84,8 @@ struct DIRECTORY + int s2; + int d1; + int d2; +-} +-*dirlist, *dl; ++}; ++ + + int get_dir_block(unsigned char *fd, int blknum, int buffersize); + int get_dir_info(unsigned char *src); +diff -up foremost-1.5.7/state.c.me foremost-1.5.7/state.c +--- foremost-1.5.7/state.c.me 2020-02-06 14:06:44.514684887 +0100 ++++ foremost-1.5.7/state.c 2020-02-06 14:08:03.329625827 +0100 +@@ -2,6 +2,9 @@ + + #include "main.h" + ++s_spec search_spec[50]; ++char wildcard; ++ + int initialize_state (f_state * s, int argc, char **argv) + { + char **argv_copy = argv; +diff -up foremost-1.5.7/main.c.me foremost-1.5.7/main.c +--- foremost-1.5.7/main.c.me 2020-02-06 14:20:09.918342282 +0100 ++++ foremost-1.5.7/main.c 2020-02-06 14:20:42.531733786 +0100 +@@ -15,6 +15,7 @@ + * + */ + #include "main.h" ++int signal_caught; + + #ifdef __WIN32 + diff --git a/app-forensics/foremost/foremost-1.5.7-r3.ebuild b/app-forensics/foremost/foremost-1.5.7-r3.ebuild index 56cdeee6ed5d..c3742c315533 100644 --- a/app-forensics/foremost/foremost-1.5.7-r3.ebuild +++ b/app-forensics/foremost/foremost-1.5.7-r3.ebuild @@ -1,32 +1,38 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -DESCRIPTION="A console program to recover files based on their headers and footers" +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" -KEYWORDS="amd64 ppc x86" -IUSE="" LICENSE="public-domain" SLOT="0" -PATCHES=("${FILESDIR}/${PN}-1.4-config-location.patch" - "${FILESDIR}/${PN}-1.5.7-format-security.patch" - "${FILESDIR}/${PN}-1.5.7-set-but-unused.patch") +KEYWORDS="amd64 ppc x86" +IUSE="" + +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 +) src_compile() { - emake RAW_FLAGS="${CFLAGS} -Wall ${LDFLAGS}" RAW_CC="$(tc-getCC) -DVERSION=\\\"${PV}\\\"" \ + emake \ + RAW_FLAGS="${CFLAGS} -Wall ${LDFLAGS}" \ + RAW_CC="$(tc-getCC) -DVERSION=\\\"${PV}\\\"" \ CONF=/etc } src_install() { dobin foremost - gunzip foremost.8.gz + gunzip foremost.8.gz || die doman foremost.8 insinto /etc doins foremost.conf -- cgit v1.2.3