summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2020-12-26 19:51:18 +0000
committerSam James <sam@gentoo.org>2020-12-26 19:52:19 +0000
commit69f575e8ebb80ae7409299fd7245d2fe770d5f0a (patch)
tree157679f66032aed9b1fce41579671be0a8ea104d /app-arch
parentdev-util/pkgconfig: drop ~m68k-mint (diff)
downloadprefix-69f575e8ebb80ae7409299fd7245d2fe770d5f0a.tar.gz
prefix-69f575e8ebb80ae7409299fd7245d2fe770d5f0a.tar.bz2
prefix-69f575e8ebb80ae7409299fd7245d2fe770d5f0a.zip
app-arch/unzip: moved to ::gentoo
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/unzip/Manifest2
-rw-r--r--app-arch/unzip/files/unzip-5.52-CVE-2008-0888.patch35
-rw-r--r--app-arch/unzip/files/unzip-5.52-no-exec-stack.patch13
-rw-r--r--app-arch/unzip/files/unzip-6.0-format-security.patch91
-rw-r--r--app-arch/unzip/files/unzip-6.0-irix.patch28
-rw-r--r--app-arch/unzip/files/unzip-6.0-natspec.patch382
-rw-r--r--app-arch/unzip/files/unzip-6.0-no-exec-stack.patch13
-rw-r--r--app-arch/unzip/metadata.xml14
-rw-r--r--app-arch/unzip/unzip-6.0_p21-r2.ebuild87
9 files changed, 0 insertions, 665 deletions
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
deleted file mode 100644
index c338085389..0000000000
--- a/app-arch/unzip/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
-DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
diff --git a/app-arch/unzip/files/unzip-5.52-CVE-2008-0888.patch b/app-arch/unzip/files/unzip-5.52-CVE-2008-0888.patch
deleted file mode 100644
index 368b3eeb12..0000000000
--- a/app-arch/unzip/files/unzip-5.52-CVE-2008-0888.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://bugs.gentoo.org/213761
-
-fix for CVE-2008-0888
-
---- inflate.c
-+++ inflate.c
-@@ -983,6 +983,7 @@
- unsigned l; /* last length */
- unsigned m; /* mask for bit lengths table */
- unsigned n; /* number of lengths to get */
-+ struct huft *tlp;
- struct huft *tl; /* literal/length code table */
- struct huft *td; /* distance code table */
- unsigned bl; /* lookup bits for tl */
-@@ -996,6 +997,8 @@
- int retval = 0; /* error code returned: initialized to "no error" */
-
-
-+ td = tlp = tl = (struct huft *)NULL;
-+
- /* make local bit buffer */
- Trace((stderr, "\ndynamic block"));
- b = G.bb;
-@@ -1047,9 +1050,9 @@
- while (i < n)
- {
- NEEDBITS(bl)
-- j = (td = tl + ((unsigned)b & m))->b;
-+ j = (tlp = tl + ((unsigned)b & m))->b;
- DUMPBITS(j)
-- j = td->v.n;
-+ j = tlp->v.n;
- if (j < 16) /* length of code in bits (0..15) */
- ll[i++] = l = j; /* save last length in l */
- else if (j == 16) /* repeat last length 3 to 6 times */
diff --git a/app-arch/unzip/files/unzip-5.52-no-exec-stack.patch b/app-arch/unzip/files/unzip-5.52-no-exec-stack.patch
deleted file mode 100644
index e2869bfe80..0000000000
--- a/app-arch/unzip/files/unzip-5.52-no-exec-stack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Make sure that the asm files don't incorrectly trigger an executable
-stack marking in the final shared library. That's bad, mmmkay.
-
---- unzip/crc_i386.S
-+++ unzip/crc_i386.S
-@@ -238,3 +238,7 @@
- #endif /* i386 || _i386 || _I386 || __i386 */
-
- #endif /* !USE_ZLIB */
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/app-arch/unzip/files/unzip-6.0-format-security.patch b/app-arch/unzip/files/unzip-6.0-format-security.patch
deleted file mode 100644
index c61c135963..0000000000
--- a/app-arch/unzip/files/unzip-6.0-format-security.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Fix build with -Werror=format-security
-
-Origin: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=master-next&id=f7d80257afcfefdc85b6745328f2d12b957a848b
-Author: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
-
-diff --git a/extract.c b/extract.c
-index 7cd9123..25c5a62 100644
---- a/extract.c
-+++ b/extract.c
-@@ -475,7 +475,7 @@ int extract_or_test_files(__G) /* return PK-type error code */
- Info(slide, 0x401, ((char *)slide,
- LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));
- Info(slide, 0x401, ((char *)slide,
-- LoadFarString(ReportMsg)));
-+ "%s",LoadFarString(ReportMsg)));
- error_in_archive = PK_BADERR;
- }
- reached_end = TRUE; /* ...so no more left to do */
-@@ -754,8 +754,8 @@ int extract_or_test_files(__G) /* return PK-type error code */
-
- #ifndef SFX
- if (no_endsig_found) { /* just to make sure */
-- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
-- Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg)));
-+ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
-+ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(ReportMsg)));
- if (!error_in_archive) /* don't overwrite stronger error */
- error_in_archive = PK_WARN;
- }
-diff --git a/list.c b/list.c
-index 15e0011..0b484f6 100644
---- a/list.c
-+++ b/list.c
-@@ -181,7 +181,7 @@ int list_files(__G) /* return PK-type error code */
- Info(slide, 0x401,
- ((char *)slide, LoadFarString(CentSigMsg), j));
- Info(slide, 0x401,
-- ((char *)slide, LoadFarString(ReportMsg)));
-+ ((char *)slide, "%s", LoadFarString(ReportMsg)));
- return PK_BADERR; /* sig not found */
- }
- }
-@@ -507,7 +507,7 @@ int list_files(__G) /* return PK-type error code */
- && (!G.ecrec.is_zip64_archive)
- && (memcmp(G.sig, end_central_sig, 4) != 0)
- ) { /* just to make sure again */
-- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
-+ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
- error_in_archive = PK_WARN; /* didn't find sig */
- }
-
-@@ -591,7 +591,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */
- Info(slide, 0x401,
- ((char *)slide, LoadFarString(CentSigMsg), j));
- Info(slide, 0x401,
-- ((char *)slide, LoadFarString(ReportMsg)));
-+ ((char *)slide, "%s", LoadFarString(ReportMsg)));
- return PK_BADERR; /* sig not found */
- }
- }
-@@ -674,7 +674,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */
- ---------------------------------------------------------------------------*/
-
- if (memcmp(G.sig, end_central_sig, 4)) { /* just to make sure again */
-- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
-+ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
- error_in_archive = PK_WARN;
- }
- if (*nmember == 0L && error_in_archive <= PK_WARN)
-diff --git a/zipinfo.c b/zipinfo.c
-index 0ac75b3..1e7fa82 100644
---- a/zipinfo.c
-+++ b/zipinfo.c
-@@ -833,7 +833,7 @@ int zipinfo(__G) /* return PK-type error code */
- Info(slide, 0x401,
- ((char *)slide, LoadFarString(CentSigMsg), j));
- Info(slide, 0x401,
-- ((char *)slide, LoadFarString(ReportMsg)));
-+ ((char *)slide, "%s", LoadFarString(ReportMsg)));
- error_in_archive = PK_BADERR; /* sig not found */
- break;
- }
-@@ -1022,7 +1022,7 @@ int zipinfo(__G) /* return PK-type error code */
- && (!G.ecrec.is_zip64_archive)
- && (memcmp(G.sig, end_central_sig, 4) != 0)
- ) { /* just to make sure again */
-- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
-+ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
- error_in_archive = PK_WARN; /* didn't find sig */
- }
-
diff --git a/app-arch/unzip/files/unzip-6.0-irix.patch b/app-arch/unzip/files/unzip-6.0-irix.patch
deleted file mode 100644
index 1aadee82c2..0000000000
--- a/app-arch/unzip/files/unzip-6.0-irix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=282086
-
---- unzpriv.h.dist 2009-08-20 11:24:17.386734120 +0100
-+++ unzpriv.h 2009-08-20 11:29:37.592325480 +0100
-@@ -1904,7 +1904,7 @@
-
- #ifdef ZIP64_SUPPORT
- # ifndef Z_UINT8_DEFINED
--# if (defined(__GNUC__) || defined(__hpux) || defined(__SUNPRO_C))
-+# if (defined(__GNUC__) || defined(__hpux) || defined(__SUNPRO_C) || defined(__sgi))
- typedef unsigned long long z_uint8;
- # else
- typedef unsigned __int64 z_uint8;
---- unix/unxcfg.h.dist 2009-08-20 11:36:17.658689640 +0100
-+++ unix/unxcfg.h 2009-08-20 11:38:31.458220280 +0100
-@@ -42,8 +42,10 @@
- /* These have to be before any include that sets types so the large file
- versions of the types are set in the includes */
-
--# define _LARGEFILE_SOURCE /* some OSes need this for fseeko */
--# define _LARGEFILE64_SOURCE
-+# ifndef __sgi
-+# define _LARGEFILE_SOURCE /* some OSes need this for fseeko */
-+# define _LARGEFILE64_SOURCE
-+# endif
- # define _FILE_OFFSET_BITS 64 /* select default interface as 64 bit */
- # define _LARGE_FILES /* some OSes need this for 64-bit off_t */
- # define __USE_LARGEFILE64
diff --git a/app-arch/unzip/files/unzip-6.0-natspec.patch b/app-arch/unzip/files/unzip-6.0-natspec.patch
deleted file mode 100644
index a1aa83f797..0000000000
--- a/app-arch/unzip/files/unzip-6.0-natspec.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-This patch makes zip use libnatspec to recode file names is national charset.
-Initially this patch was written for altlinux:
-http://sisyphus.ru/ru/srpm/Sisyphus/zip/patches
-
-Later it was a bit improved and improved version was posted here (in Russian):
-http://www.opennet.ru/tips/info/2494.shtml
-
-Gentoo reference:
-https://bugs.gentoo.org/show_bug.cgi?id=275244
-
-diff -pur unzip60orig/unix/configure unzip60/unix/configure
---- unzip60orig/unix/configure 2009-04-16 23:25:12.000000000 +0400
-+++ unzip60/unix/configure 2010-11-26 19:07:43.000000000 +0300
-@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS}
- IZ_BZIP2=${3}
- CFLAGS="${CFLAGS} -I. -DUNIX"
- LFLAGS1=""
--LFLAGS2="-s"
-+LFLAGS2="-l natspec"
- LN="ln -s"
-
- CFLAGS_OPT=''
-diff -pur unzip60orig/unix/Makefile unzip60/unix/Makefile
---- unzip60orig/unix/Makefile 2009-01-19 01:41:18.000000000 +0300
-+++ unzip60/unix/Makefile 2010-11-29 14:25:58.461000001 +0300
-@@ -45,14 +45,14 @@
- CC = cc# try using "gcc" target rather than changing this (CC and LD
- LD = $(CC)# must match, else "unresolved symbol: ___main" is possible)
- AS = as
--LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)
-+LOC = $(D_USE_BZ2) -DNO_SETLOCALE $(LOCAL_UNZIP)
- AF = $(LOC)
- CFLAGS = -O
- CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(LOC)
- CF = $(CFLAGS) $(CF_NOOPT)
- LFLAGS1 =
- LF = -o unzip$E $(LFLAGS1)
--LF2 = -s
-+LF2 = -l natspec
-
- # UnZipSFX flags
- SL = -o unzipsfx$E $(LFLAGS1)
-@@ -121,7 +121,7 @@ INSTALL_PROGRAM = $(INSTALL)
- INSTALL_D = mkdir -p
- # on some systems, manext=l and MANDIR=/usr/man/man$(manext) may be appropriate
- manext = 1
--prefix = /usr/local
-+prefix = /usr
- BINDIR = $(prefix)/bin# where to install executables
- MANDIR = $(prefix)/man/man$(manext)# where to install man pages
- INSTALLEDBIN = $(BINDIR)/funzip$E $(BINDIR)/unzip$E $(BINDIR)/unzipsfx$E \
-diff -pur unzip60orig/unix/unix.c unzip60/unix/unix.c
---- unzip60orig/unix/unix.c 2009-01-24 02:31:26.000000000 +0300
-+++ unzip60/unix/unix.c 2010-11-26 16:58:35.000000000 +0300
-@@ -30,6 +30,9 @@
- #define UNZIP_INTERNAL
- #include "unzip.h"
-
-+#include <iconv.h>
-+#include <natspec.h>
-+
- #ifdef SCO_XENIX
- # define SYSNDIR
- #else /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
-@@ -1874,3 +1877,44 @@ static void qlfix(__G__ ef_ptr, ef_len)
- }
- }
- #endif /* QLZIP */
-+
-+
-+char OEM_CP[MAX_CP_NAME] = "";
-+char ISO_CP[MAX_CP_NAME] = "";
-+
-+/* Getr the default value of OEM_CP based on the current locale.
-+ * ISO_CP is left alone for now. */
-+void init_conversion_charsets()
-+{
-+ /* Make a guess only if OEM_CP not already set. */
-+ if(*OEM_CP == '\0') {
-+ const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, "");
-+ strncpy(OEM_CP, archive_charset, sizeof(OEM_CP));
-+ }
-+
-+ if(*ISO_CP == '\0') {
-+ const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_WINCS, "");
-+ strncpy(ISO_CP, archive_charset, sizeof(ISO_CP));
-+ }
-+
-+}
-+
-+/* Convert a string from OEM_CP to the current locale charset. */
-+inline void oem_intern(char *string)
-+{
-+ char *buf = natspec_convert(string, 0, OEM_CP, 0);
-+ /* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE],
-+ use FILNAMSIZ as string size */
-+ strncpy(string, buf, FILNAMSIZ);
-+ free (buf);
-+}
-+
-+/* Convert a string from ISO_CP to the current locale charset. */
-+inline void iso_intern(char *string)
-+{
-+ char *buf = natspec_convert(string, 0, ISO_CP, 0);
-+ /* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE],
-+ use FILNAMSIZ as string size */
-+ strncpy(string, buf, FILNAMSIZ);
-+ free (buf);
-+}
-diff -pur unzip60orig/unix/unxcfg.h unzip60/unix/unxcfg.h
---- unzip60orig/unix/unxcfg.h 2009-04-16 22:36:12.000000000 +0400
-+++ unzip60/unix/unxcfg.h 2010-11-26 16:58:35.000000000 +0300
-@@ -227,4 +227,30 @@ typedef struct stat z_stat;
- /* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */
- /* and notfirstcall are used by do_wild(). */
-
-+
-+#define MAX_CP_NAME 25
-+
-+#ifdef SETLOCALE
-+# undef SETLOCALE
-+#endif
-+#define SETLOCALE(category, locale) setlocale(category, locale)
-+#include <locale.h>
-+
-+#ifdef _ISO_INTERN
-+# undef _ISO_INTERN
-+#endif
-+#define _ISO_INTERN(str1) iso_intern(str1)
-+
-+#ifdef _OEM_INTERN
-+# undef _OEM_INTERN
-+#endif
-+#ifndef IZ_OEM2ISO_ARRAY
-+# define IZ_OEM2ISO_ARRAY
-+#endif
-+#define _OEM_INTERN(str1) oem_intern(str1)
-+
-+void iso_intern(char *);
-+void oem_intern(char *);
-+void init_conversion_charsets(void);
-+
- #endif /* !__unxcfg_h */
-diff -pur unzip60orig/unzip.c unzip60/unzip.c
---- unzip60orig/unzip.c 2009-04-16 22:26:52.000000000 +0400
-+++ unzip60/unzip.c 2010-11-26 16:58:35.000000000 +0300
-@@ -331,7 +331,9 @@ static ZCONST char Far ZipInfoUsageLine3
- -h print header line -t print totals for listed files or for all\n\
- -z print zipfile comment -T print file times in sortable decimal format\
- \n -C be case-insensitive %s\
-- -x exclude filenames that follow from listing\n";
-+ -x exclude filenames that follow from listing\n\
-+ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
-+ -I CHARSET specify a character encoding for UNIX and other archives\n";
- #ifdef MORE
- static ZCONST char Far ZipInfoUsageLine4[] =
- " -M page output through built-in \"more\"\n";
-@@ -570,8 +572,7 @@ Send bug reports using //www.info-zip.or
- #else /* !VMS */
- # ifdef COPYRIGHT_CLEAN
- static ZCONST char Far UnzipUsageLine1[] = "\
--UnZip %d.%d%d%s of %s, by Info-ZIP. Maintained by C. Spieler. Send\n\
--bug reports using http://www.info-zip.org/zip-bug.html; see README for details.\
-+UnZip %d.%d%d%s of %s, by ALT Linux Team. Original by Info-ZIP.\
- \n\n";
- # else
- static ZCONST char Far UnzipUsageLine1[] = "\
-@@ -673,7 +674,9 @@ modifiers:\n\
- -j junk paths (do not make directories) -aa treat ALL files as text\n\
- -U use escapes for all non-ASCII Unicode -UU ignore any Unicode fields\n\
- -C match filenames case-insensitively -L make (some) names \
--lowercase\n %-42s -V retain VMS version numbers\n%s";
-+lowercase\n %-42s -V retain VMS version numbers\n%s\
-+ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
-+ -I CHARSET specify a character encoding for UNIX and other archives\n";
- #endif /* ?VMS */
- #else /* !UNICODE_SUPPORT */
- #ifdef VMS
-@@ -692,7 +695,9 @@ modifiers:\n\
- -o overwrite files WITHOUT prompting -a auto-convert any text files\n\
- -j junk paths (do not make directories) -aa treat ALL files as text\n\
- -C match filenames case-insensitively -L make (some) names \
--lowercase\n %-42s -V retain VMS version numbers\n%s";
-+lowercase\n %-42s -V retain VMS version numbers\n%s\
-+ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
-+ -I CHARSET specify a character encoding for UNIX and other archives\n";
- #endif /* ?VMS */
- #endif /* ?UNICODE_SUPPORT */
-
-@@ -803,6 +808,10 @@ int unzip(__G__ argc, argv)
- #endif /* UNICODE_SUPPORT */
-
-
-+#ifdef UNIX
-+ init_conversion_charsets();
-+#endif
-+
- #if (defined(__IBMC__) && defined(__DEBUG_ALLOC__))
- extern void DebugMalloc(void);
-
-@@ -1336,6 +1345,11 @@ int uz_opts(__G__ pargc, pargv)
- argc = *pargc;
- argv = *pargv;
-
-+#ifdef UNIX
-+ extern char OEM_CP[MAX_CP_NAME];
-+ extern char ISO_CP[MAX_CP_NAME];
-+#endif
-+
- while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) {
- s = *argv + 1;
- while ((c = *s++) != 0) { /* "!= 0": prevent Turbo C warning */
-@@ -1517,6 +1531,35 @@ int uz_opts(__G__ pargc, pargv)
- }
- break;
- #endif /* MACOS */
-+#ifdef UNIX
-+ case ('I'):
-+ if (negative) {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: encodings can't be negated"));
-+ return(PK_PARAM);
-+ } else {
-+ if(*s) { /* Handle the -Icharset case */
-+ /* Assume that charsets can't start with a dash to spot arguments misuse */
-+ if(*s == '-') {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: a valid character encoding should follow the -I argument"));
-+ return(PK_PARAM);
-+ }
-+ strncpy(ISO_CP, s, sizeof(ISO_CP));
-+ } else { /* -I charset */
-+ ++argv;
-+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: a valid character encoding should follow the -I argument"));
-+ return(PK_PARAM);
-+ }
-+ s = *argv;
-+ strncpy(ISO_CP, s, sizeof(ISO_CP));
-+ }
-+ while(*(++s)); /* No params straight after charset name */
-+ }
-+ break;
-+#endif /* ?UNIX */
- case ('j'): /* junk pathnames/directory structure */
- if (negative)
- uO.jflag = FALSE, negative = 0;
-@@ -1592,6 +1635,35 @@ int uz_opts(__G__ pargc, pargv)
- } else
- ++uO.overwrite_all;
- break;
-+#ifdef UNIX
-+ case ('O'):
-+ if (negative) {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: encodings can't be negated"));
-+ return(PK_PARAM);
-+ } else {
-+ if(*s) { /* Handle the -Ocharset case */
-+ /* Assume that charsets can't start with a dash to spot arguments misuse */
-+ if(*s == '-') {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: a valid character encoding should follow the -I argument"));
-+ return(PK_PARAM);
-+ }
-+ strncpy(OEM_CP, s, sizeof(OEM_CP));
-+ } else { /* -O charset */
-+ ++argv;
-+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: a valid character encoding should follow the -O argument"));
-+ return(PK_PARAM);
-+ }
-+ s = *argv;
-+ strncpy(OEM_CP, s, sizeof(OEM_CP));
-+ }
-+ while(*(++s)); /* No params straight after charset name */
-+ }
-+ break;
-+#endif /* ?UNIX */
- case ('p'): /* pipes: extract to stdout, no messages */
- if (negative) {
- uO.cflag = FALSE;
-diff -pur unzip60orig/unzpriv.h unzip60/unzpriv.h
---- unzip60orig/unzpriv.h 2009-04-20 03:59:26.000000000 +0400
-+++ unzip60/unzpriv.h 2010-11-26 16:58:35.000000000 +0300
-@@ -3008,7 +3008,7 @@ char *GetLoadPath OF((__GPRO));
- !(((islochdr) || (isuxatt)) && \
- ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \
- (hostnum) == FS_HPFS_ || \
-- ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \
-+ ((hostnum) == FS_NTFS_/* && (hostver) == 50*/)) { \
- _OEM_INTERN((string)); \
- } else { \
- _ISO_INTERN((string)); \
-diff -pur unzip60orig/zipinfo.c unzip60/zipinfo.c
---- unzip60orig/zipinfo.c 2009-02-08 20:04:30.000000000 +0300
-+++ unzip60/zipinfo.c 2010-11-26 16:58:35.000000000 +0300
-@@ -457,6 +457,10 @@ int zi_opts(__G__ pargc, pargv)
- int tflag_slm=TRUE, tflag_2v=FALSE;
- int explicit_h=FALSE, explicit_t=FALSE;
-
-+#ifdef UNIX
-+ extern char OEM_CP[MAX_CP_NAME];
-+ extern char ISO_CP[MAX_CP_NAME];
-+#endif
-
- #ifdef MACOS
- uO.lflag = LFLAG; /* reset default on each call */
-@@ -501,6 +505,35 @@ int zi_opts(__G__ pargc, pargv)
- uO.lflag = 0;
- }
- break;
-+#ifdef UNIX
-+ case ('I'):
-+ if (negative) {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: encodings can't be negated"));
-+ return(PK_PARAM);
-+ } else {
-+ if(*s) { /* Handle the -Icharset case */
-+ /* Assume that charsets can't start with a dash to spot arguments misuse */
-+ if(*s == '-') {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: a valid character encoding should follow the -I argument"));
-+ return(PK_PARAM);
-+ }
-+ strncpy(ISO_CP, s, sizeof(ISO_CP));
-+ } else { /* -I charset */
-+ ++argv;
-+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: a valid character encoding should follow the -I argument"));
-+ return(PK_PARAM);
-+ }
-+ s = *argv;
-+ strncpy(ISO_CP, s, sizeof(ISO_CP));
-+ }
-+ while(*(++s)); /* No params straight after charset name */
-+ }
-+ break;
-+#endif /* ?UNIX */
- case 'l': /* longer form of "ls -l" type listing */
- if (negative)
- uO.lflag = -2, negative = 0;
-@@ -521,6 +554,35 @@ int zi_opts(__G__ pargc, pargv)
- G.M_flag = TRUE;
- break;
- #endif
-+#ifdef UNIX
-+ case ('O'):
-+ if (negative) {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: encodings can't be negated"));
-+ return(PK_PARAM);
-+ } else {
-+ if(*s) { /* Handle the -Ocharset case */
-+ /* Assume that charsets can't start with a dash to spot arguments misuse */
-+ if(*s == '-') {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: a valid character encoding should follow the -I argument"));
-+ return(PK_PARAM);
-+ }
-+ strncpy(OEM_CP, s, sizeof(OEM_CP));
-+ } else { /* -O charset */
-+ ++argv;
-+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+ Info(slide, 0x401, ((char *)slide,
-+ "error: a valid character encoding should follow the -O argument"));
-+ return(PK_PARAM);
-+ }
-+ s = *argv;
-+ strncpy(OEM_CP, s, sizeof(OEM_CP));
-+ }
-+ while(*(++s)); /* No params straight after charset name */
-+ }
-+ break;
-+#endif /* ?UNIX */
- case 's': /* default: shorter "ls -l" type listing */
- if (negative)
- uO.lflag = -2, negative = 0;
diff --git a/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch b/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch
deleted file mode 100644
index 7973378704..0000000000
--- a/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Make sure that the asm files don't incorrectly trigger an executable
-stack marking in the final shared library. That's bad, mmmkay.
-
---- unzip/crc_i386.S
-+++ unzip/crc_i386.S
-@@ -302,3 +302,7 @@
- #endif /* i386 || _i386 || _I386 || __i386 */
-
- #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
deleted file mode 100644
index 564fd76677..0000000000
--- a/app-arch/unzip/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <use>
- <flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">infozip</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
deleted file mode 100644
index 09846ee072..0000000000
--- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV//.}"
-MY_PV="${MY_PV%_p*}"
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="unzipper for pkzip-compressed files"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
- mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 natspec unicode"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
- natspec? ( dev-libs/libnatspec )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- local deb="${WORKDIR}"/debian/patches
- rm "${deb}"/02-this-is-debian-unzip.patch || die
- eapply "${deb}"/*.patch
-
- eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
- eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
- use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
- sed -i -r \
- -e '/^CFLAGS/d' \
- -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
- -e '/^STRIP/s:=.*:=true:' \
- -e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
- -e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
- -e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
- -e 's:LF2 = -s:LF2 = :' \
- -e 's:LF = :LF = $(LDFLAGS) :' \
- -e 's:SL = :SL = $(LDFLAGS) :' \
- -e 's:FL = :FL = $(LDFLAGS) :' \
- -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
- -e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
- unix/Makefile \
- || die "sed unix/Makefile failed"
-
- # Delete bundled code to make sure we don't use it.
- rm -r bzip2 || die
-
- eapply_user
-}
-
-src_configure() {
- case ${CHOST} in
- i?86*-*linux*) TARGET="linux_asm" ;;
- *linux*) TARGET="linux_noasm" ;;
- i?86*-*bsd* | \
- i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm
- *bsd* | *dragonfly*) TARGET="bsd" ;;
- *-darwin*) TARGET="macosx" ;;
- *-solaris*) TARGET="generic" ;;
- *-cygwin*) TARGET="generic" ;;
- *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;;
- esac
-
- [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
- use bzip2 && append-cppflags -DUSE_BZIP2
- use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
- append-cppflags -DLARGE_FILE_SUPPORT #281473
-}
-
-src_compile() {
- ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
- emake -f unix/Makefile ${TARGET}
-}
-
-src_install() {
- dobin unzip funzip unzipsfx unix/zipgrep
- dosym unzip /usr/bin/zipinfo
- doman man/*.1
- dodoc BUGS History* README ToDo WHERE
-}