gentoo resync : 25.11.2020

4 files changed, 2 insertions, 298 deletions

diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index 49a2fd01a092..b42a706c83c2 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,6 +1,3 @@
-AUX fatsort-1.6.2.605-gcc10.patch 7400 BLAKE2B 05d9f3bc9c0118c9505e96f2766d27b142a61252f5ad21e3c106ac7afda9a69bddc1ec1dbb9f3b170bbc10315f04db06e80000ef0eb9c601db4b5b88da82e08a SHA512 bac23d94900f48f8fd331962f617b92250ff9cfc801a688526177ef24e571e341e124a2859cbf1ff8db80d1bcbb32ee99d1c9878abcdaa78b9dd0606f5689e28
-DIST fatsort-1.6.2.605.tar.xz 122928 BLAKE2B 2690233828e47a4809aac14a8d64dc8d95a824bec52f787190186adbe066d5d4e6f9c6d1873fc6b809c6df6879d12154430f44d412944963bdff49e673079d12 SHA512 0d119c99c5efff4c10367152fc6efe95e2cb1c39405ca02dd25b66cc68c7420b5b28c0daca1346b7928633bac8ace2d05d731502f989d39ca5c783dcec69ccc7
 DIST fatsort-1.6.3.622.tar.xz 123644 BLAKE2B 1db530753bdaee4ebda9ab36a47f6794584bc590de4cbf8d144a5baa770c080c9d27a1ecadd5a22de72538887c4e10f161f3c4fb3afb3e63bd18834897ebe905 SHA512 309c7424e53fb74f57d0c4272a1a4b3df57fa1130d7e7adae0ac73ac1c8b1900504e49efd0cc4dafea3efa2fbc9191f343b10bb97b647dd6124197356cd01c53
-EBUILD fatsort-1.6.2.605.ebuild 754 BLAKE2B 11850d6ad2ca62de3f7c110773fa216a5d5cf1b7df81e2fc8eaa81fae2e9f029f4ee7b40ddcd5a66991a98d5bbb35e48b9328591aa6ce93e2f305da588d98d6a SHA512 cc94184f60f4ed2c17a476c4ed0718caae60db2769129233b82f39c5d0d9eb41eed803377c1b38bcb6db3b720937f85f5e659ed51fccb2e5bb72b0562d7c9202
-EBUILD fatsort-1.6.3.622.ebuild 715 BLAKE2B d41dd107dc97485ba7d7225703dc813d81acb112fab52551d4360015873c806bbdee4b909fe180228db695a0493bd0d3a7b49bdcec4cd85006727d63af98ffce SHA512 764a8bff79153356dcea1c8fb746f5cc43af397441e114b4d92806769ee22e2a3f6d65f8ccd4445f1e7ffbc011681fc5a7004163776da6ae7abb1d3096f2cd8d
+EBUILD fatsort-1.6.3.622.ebuild 713 BLAKE2B 2713553a05a7084d80ab4d1e4172fcd710cb929a74eb1ef535e7a32b447fffb6e48d27424725009b29abd51568a8faba5e2b79f15323870164c10c42d7a52270 SHA512 d86118e29d272cc39d857c74303ae0e65cf6f95f1d83147ef9f69533f238e2c89bc95113e35fc0b31fe2a1a3a419fc04ccbefedd0742a01e2c5126fe7f066a16
 MISC metadata.xml 738 BLAKE2B b4ae8042af9b7a74705b42322ffcfba47aa18e3cb1bee693ff2db3fecb6555d516ec9a3f4746643ef37007e9d1b44ea79d5fa0e4bc12b6ca4ba813129d208dcd SHA512 42cb5be41b29129b17ea55591d352872ccd6078705068c6899d4f1f5a5b99ab5f6809e75ee6b49bd6b536f6b66632ce9e1859f4bbad764b966d5520a8aa5a228
diff --git a/sys-fs/fatsort/fatsort-1.6.2.605.ebuild b/sys-fs/fatsort/fatsort-1.6.2.605.ebuild
deleted file mode 100644
index 0f3cb645a3c3..000000000000
--- a/sys-fs/fatsort/fatsort-1.6.2.605.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players"
-HOMEPAGE="http://fatsort.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's|/usr/local|/usr|g' \
-		$(find ./ -name Makefile) || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		DESTDIR="${D}"
-}
-
-src_test() {
-	# Tests require root permissions and mounting filesystems which does
-	# not work inside the ebuild environment
-	true
-}
diff --git a/sys-fs/fatsort/fatsort-1.6.3.622.ebuild b/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
index 28d6fc9100bc..f04b31692aa8 100644
--- a/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
+++ b/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_prepare() {
 	default
diff --git a/sys-fs/fatsort/files/fatsort-1.6.2.605-gcc10.patch b/sys-fs/fatsort/files/fatsort-1.6.2.605-gcc10.patch
deleted file mode 100644
index 0446fe3e09dc..000000000000
--- a/sys-fs/fatsort/files/fatsort-1.6.2.605-gcc10.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-Index: tests/Makefile
-===================================================================
---- a/tests/Makefile	(revision 606)
-+++ b/tests/Makefile	(revision 613)
-@@ -19,7 +19,7 @@
- 		if [ ! -f $$i/passed ]; then \
- 			printf "%.70s" "Test case $$i...                                                                 "; \
- 			printf "[ \e[1;33mWAIT \e[0m]"; \
--			${MAKE} -C $$i &>> /dev/null; \
-+			${MAKE} -C $$i &> /dev/null; \
- 			ret=$$?; \
- 			printf "\r%.70s" "Test case $$i...                                                                 "; \
- 			if [ $$ret -eq 0 ]; then \
-Index: CHANGES.md
-===================================================================
---- a/CHANGES.md	(revision 606)
-+++ b/CHANGES.md	(revision 613)
-@@ -1,5 +1,11 @@
- # Changelog
- 
-+## v1.6.3 (xxx)
-+* fixed support for macOS (thanks to Max for the fix)
-+* declared OPT_LOCALE as extern
-+* fixed uninitialized variable
-+* avoided some string truncation compiler warnings
-+
- ## v1.6.2 (November 29, 2019)
- - FIX: multiple endianness issues with exFAT
- - now using /proc/self/mounts instead of /etc/mtab to check whether filesystem is mounted
-Index: src/FAT_fs.c
-===================================================================
---- a/src/FAT_fs.c	(revision 606)
-+++ b/src/FAT_fs.c	(revision 613)
-@@ -42,7 +42,7 @@
- // used to check if device is mounted
- #if defined(__LINUX__)
- #include <mntent.h>
--#elif defined (__BSD__)
-+#elif defined (__BSD__) || defined (__OSX__)
- #include <sys/ucred.h>
- #include <sys/mount.h>
- #endif
-@@ -85,7 +85,7 @@
- 
- 	return ret;
- 
--#elif defined(__BSD__)
-+#elif defined(__BSD__) || defined(__OSX__)
- 	struct statfs *mntbuf;
- 	int i, mntsize;
- 	int32_t ret = 0;
-Index: src/deviceio.c
-===================================================================
---- a/src/deviceio.c	(revision 606)
-+++ b/src/deviceio.c	(revision 613)
-@@ -24,7 +24,7 @@
- 
- #include "deviceio.h"
- 
--#if defined __LINUX__ || defined __BSD__
-+#if defined __LINUX__ || defined __BSD__ || defined __OSX__ 
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -59,7 +59,7 @@
- #include "mallocv.h"
- #include "errors.h"
- 
--#if defined __LINUX__ || defined __BSD__
-+#if defined __LINUX__ || defined __BSD__ || defined __OSX__ 
- 
- DEVICE *device_open(const char *path) {
- 
-@@ -88,7 +88,7 @@
-   assert(device != NULL);
-   assert(offset >= 0);
- 
--#if defined __BSD__
-+#if defined __BSD__ || defined __OSX__ 
-   return lseek(device->fd, (off_t) offset, SEEK_SET);
- #else
-   return lseek64(device->fd, (off64_t) offset, SEEK_SET);
-Index: src/deviceio.h
-===================================================================
---- a/src/deviceio.h	(revision 606)
-+++ b/src/deviceio.h	(revision 613)
-@@ -27,7 +27,7 @@
- 
- #include <stdint.h>
- 
--#if defined __LINUX__ || defined __BSD__
-+#if defined __LINUX__ || defined __BSD__ || defined __OSX__ 
- 
- #define DIRECTORY_SEPARATOR '/'
- 
-Index: src/fatsort.c
-===================================================================
---- a/src/fatsort.c	(revision 606)
-+++ b/src/fatsort.c	(revision 613)
-@@ -45,7 +45,7 @@
- 
- // program information
- #define INFO_PROGRAM		"fatsort"
--#define INFO_VERSION		"1.6.2"
-+#define INFO_VERSION		"1.6.3"
- #define INFO_AUTHOR		"Written by Boris Leidner.\n"
- #define INFO_COPYRIGHT		"Copyright (C) 2004-2019 Boris Leidner.\n"
- #define INFO_LICENSE		"License GPLv2: GNU GPL version 2 (see LICENSE.txt)\n" \
-Index: src/sort.c
-===================================================================
---- a/src/sort.c	(revision 606)
-+++ b/src/sort.c	(revision 613)
-@@ -261,14 +261,15 @@
- 
- 	struct sExFATDirEntry de;
- 	struct sExFATDirEntrySet *des;
--	struct sExFATDirEntryList *del;
-+	struct sExFATDirEntryList *del=NULL;
- 
- 	char name[MAX_PATH_LEN+1];
--	char str[32];
-+	char str[31];
- 	char *outptr, *inptr;
- 	uint8_t nameLength=0;
- 
--	size_t outcount, incount, iret;
-+	size_t outcount=30;
-+	size_t incount, iret;
- 
- 	*direntrysets=0;
- 
-@@ -376,7 +377,7 @@
- 				        }
- 					outptr[0]='\0';
- 
--					strncat(name, str, 30);
-+					strncat(name, str, 31);
- 
- 					// we are done here
- 					if (entries == expected_entries) {
-@@ -512,7 +513,7 @@
- 	union sDirEntry de;
- 	struct sDirEntryList *lnde;
- 	struct sLongDirEntryList *llist;
--	char tmp[MAX_PATH_LEN+1], dummy[MAX_PATH_LEN*2+1], sname[MAX_PATH_LEN+1], lname[MAX_PATH_LEN+1];
-+	char tmp[MAX_PATH_LEN+1], dummy[MAX_PATH_LEN+1], sname[MAX_PATH_LEN+1], lname[MAX_PATH_LEN+1];
- 
- 	*direntries=0;
- 
-@@ -589,8 +590,11 @@
- 					return -1;
- 				}
- 
--				snprintf(dummy, MAX_PATH_LEN*2+1, "%s%s", tmp, lname);
--				strncpy(lname, dummy, MAX_PATH_LEN);
-+				strncpy(dummy, tmp, MAX_PATH_LEN);
-+				dummy[MAX_PATH_LEN]='\0';
-+				strncat(dummy, lname, MAX_PATH_LEN - strlen(dummy));
-+				dummy[MAX_PATH_LEN]='\0';
-+				strncpy(lname, dummy, MAX_PATH_LEN+1);
- 
- 				break;
- 			default:
-@@ -708,8 +712,8 @@
- 			dummy[MAX_PATH_LEN]='\0';
- 			strncat(dummy, lname, MAX_PATH_LEN - strlen(dummy));
- 			dummy[MAX_PATH_LEN]='\0';
--			strncpy(lname, dummy, MAX_PATH_LEN);
--			dummy[MAX_PATH_LEN]='\0';
-+			strncpy(lname, dummy, MAX_PATH_LEN+1);
-+			//dummy[MAX_PATH_LEN]='\0';
- 			break;
- 		default:
- 			myerror("Unhandled return code!");
-Index: src/options.c
-===================================================================
---- a/src/options.c	(revision 606)
-+++ b/src/options.c	(revision 613)
-@@ -55,7 +55,6 @@
- 	assert(stringList != NULL);
- 	assert(stringList->str == NULL);
- 	assert(str != NULL);
--	assert(strlen((char *)str) <= MAX_PATH_LEN);
- 
- 	char *newStr;
- 
-@@ -77,14 +76,16 @@
- 	// copy string to new structure including missing slashes
- 	newStr[0] = '\0';
- 	if (prefix) newStr[0] = DIRECTORY_SEPARATOR;
--	strncat(newStr, (const char*) str, len);
-+	memcpy(newStr+prefix, (const char*) str, len);
- 	if (suffix) newStr[prefix+len] = DIRECTORY_SEPARATOR; 
- 
-+/*
- 	if (prefix+len+suffix > MAX_PATH_LEN) {
- 		newStr[MAX_PATH_LEN] = '\0';
- 	} else {
- 		newStr[prefix+len+suffix] = '\0';
- 	}
-+*/
- 
- 	ret = addStringToStringList(stringList, newStr);
- 
-@@ -137,7 +138,7 @@
- 	parses command line options
- */
- 
--	int8_t c;
-+	int8_t c,len;
- 
- 	static struct option longOpts[] = {
- 		// name, has_arg, flag, val
-@@ -315,12 +316,13 @@
- 			case 't' : OPT_MODIFICATION = 1; break;
- 			case 'v' : OPT_VERSION = 1; break;
- 			case 'L' :
--				OPT_LOCALE=realloc(OPT_LOCALE, strlen(optarg)+1);
-+				len=strlen(optarg);
-+				OPT_LOCALE=realloc(OPT_LOCALE, len+1);
- 				if (OPT_LOCALE == NULL) {
- 					stderror();
- 					return -1;
- 				}
--				strncpy(OPT_LOCALE, optarg, strlen(optarg)+1);
-+				memcpy(OPT_LOCALE, optarg, len+1);
- 			break;
- 			default :
- 				myerror("Unknown option '%c'.", optopt);
-Index: src/stringlist.c
-===================================================================
---- a/src/stringlist.c	(revision 606)
-+++ b/src/stringlist.c	(revision 613)
-@@ -78,8 +78,7 @@
- 		return -1;
- 	}
- 
--	strncpy(stringList->next->str, str, len);
--	stringList->next->str[len] = '\0';
-+	memcpy(stringList->next->str, str, len+1);
- 
- 	return 0;
- 
-Index: src/options.h
-===================================================================
---- a/src/options.h	(revision 606)
-+++ b/src/options.h	(revision 613)
-@@ -35,7 +35,7 @@
- extern struct sStringList *OPT_INCL_DIRS, *OPT_EXCL_DIRS, *OPT_INCL_DIRS_REC, *OPT_EXCL_DIRS_REC, *OPT_IGNORE_PREFIXES_LIST;
- extern struct sRegExList *OPT_REGEX_INCL, *OPT_REGEX_EXCL;
- 
--char *OPT_LOCALE;
-+extern char *OPT_LOCALE;
- 
- // parses command line options
- int32_t parse_options(int argc, char *argv[]);