gentoo resync : 25.08.2020

7 files changed, 102 insertions, 35 deletions

diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 0efa243a17c2..5b1f25ff2dfd 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1,10 +1,11 @@
 AUX zip-3.0-build.patch 923 BLAKE2B 0a8b7d8fb98f9bc8750c3bb6ff9a672db86481ca88349e5e08d2e96ae0cabac4ef75651a91e9b0fb8e70e1c075ea721060a3851bdd6e103b1f4c020a8b4f4979 SHA512 c9cf162505938a0200eed0333849c2c4a3b59088a6549377a3af9ac89cd7a26fd388d09df55a6cd117e607c1a2f2960bc5e85f7384ff30565c2be01ce4ff442d
 AUX zip-3.0-exec-stack.patch 548 BLAKE2B 3ded2568eea78c89422ea043bb68917d4a508d6ee6d8d65e9db6c22f6d5dbcac15836a94ad5d1209112cb73c1da4f266346e722cafcf3a6a91080261c4d5df93 SHA512 575516abe5ed633bdda22c3ee41109400360eef437671f9b658d7591bb8fa3b3854c1cd92d6396e47d91545b23ecbbc1218190192e39a60b00d6b7b5bb793eab
-AUX zip-3.0-format-security.patch 507 BLAKE2B f595179f8267fc2866e21b8a943323e2146e118e44ed4dd6b03a65a2c433940efd5ccc98f72f8d85dd7291f9b0bcb8eb5068ad22b9bd6fa040265253e54d4b63 SHA512 172e842e1cd43006713f570ceb8bd4998595282b973569d0e264bd9599375668a4045d691fc952a75088ad6f17e6ff90baf22606388f73ad2f2c0ac64d250fa2
-AUX zip-3.0-natspec.patch 6800 BLAKE2B 6363c941894d7de7611392ea3e883ad724093bf6fb090ce84a4c99d36ab8688ef5083d09a83431bcc1f399327e1071d4b2c4cc03cef2c1548b776699ddb4763b SHA512 67cf89ad016d51ec99e153cb05ee150318c18b3243b04daad0a9a0c0fce7e908bf7ed6fcd6361029bdd4da68759c22abf02dcbcca704b45a75367b1f42ebe964
-AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c14316992898c8f3451336a7f526d8283a57fff841c5b990374b0cea163723a25522f5ecd194b294e39bf137d4 SHA512 89a99e694fa2ad289ecc93a514e7b408e4b9e01778e622b2c2928d98181de3823446e91085f401e3478afce1ccbf8775fb227c1908144889dd0106c2d7029b83
-AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
-AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
+AUX zip-3.0-format-security.patch 511 BLAKE2B ca5bfe9f839b1fb0ab8a4785b4448fa346ba9ccfb0cde40a61e7a3442a70f06a4481c57d6aa995654d7ef4482d2f1f7022b7a568b5e47b1149f0430de8110fbf SHA512 6d3514b9df21b6f8a40b037f7d584a4b4a0a5364676bd2cf40d31e32545bc7edd2e5cfeccdc72302c4f19b607852d81ad568c4420750a8c78bbd325c5cf78b8f
+AUX zip-3.0-natspec.patch 6464 BLAKE2B 4c032896c5b331e235a9ea55c91e696aa37b192c46be5ff4c85f4809473a299ba06e34b3cc30b1e47dfbb091da5058c5babdbea41b74677788e6ef5b7b0f0650 SHA512 91472cf73c943a2fbcae7640ca6862f4ef9c2212cf31bd2128fd6e157d46db76b6882b08db2aea9d6d2e3631c56d1393e16f8e76628ea7812d062e6471a085e6
+AUX zip-3.0-no-crypt.patch 1116 BLAKE2B a4f12f492b3f844a0e822f27f1acb81d826484ddf6835941ba277eca8dc8a14c1051ae5362ebce3e9368fe3bd5b4f385712e6ff5ebb5d02acb28852d43b18ba5 SHA512 4146197dce4b536e116bdc1d5dade1486affaad379d28337338cf9663d6bc394422577c72b94dc87114c244ca73ca72c1c4bc60f2579f41637c1972f6088318a
+AUX zip-3.0-pic.patch 502 BLAKE2B 6ac03408e40986fbbc7219fa1f96f8e2fdc448071dcc1321e7f047068468ce2ba21b30bbea3f5cbd33cff528fd8f5493ce47b42e1c9a6f61c09a38a0fd12c3bd SHA512 055396cb0cfbf994d5be95533c4e7a8ad35120e2250dd2df1757f54b2b722c32d413dda61ac4bb96f0af93965d0a184794626ba6ca37a14ed04f984e544ae9c5
+AUX zip-3.0-zipnote-freeze.patch 1926 BLAKE2B 5976c4ad62d25f4ace8e17a85b77c99fb5ea75151d6ddd8fe27ee22cb7669d98281e26952c623b6e367fa880fce693d393a79fc619e13d8ba530b2aa38b8b70f SHA512 edd90964bc4f1bd3cc45f719905f3688ebd779aea5f10439b2331d668774ed55e645e025d9f408cedb8313848d4e26ba39726d019543e3533f79f1ef83620932
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
 EBUILD zip-3.0-r3.ebuild 1716 BLAKE2B baf91e89edf2f731c805627392d7a3eb1b8f8bff52ca73facc0dd861c8911e0bbae9036593c4a988fbd53b557e76c80276d51de93b742d14e88a65ccc0de6d0f SHA512 cb41bb9e9f782c35197156cde2a69d6997c35f5896bd7e8cbe402da7dff03313445cd14d33cfa1e51d6d2d1782d4774f51c29cc13510090a778fff85107e2e29
+EBUILD zip-3.0-r4.ebuild 1701 BLAKE2B c7ca9ef5630066dc7f0a60265fb500349bf41b0c621c39a4f792badc66a284a69aada7c4aef03d2316d97b6624a2cfdad1d9a30daff6f09cbfb333cebb8a4d4a SHA512 1c1667572a9dd23be8ecbf8f274ba36f3db7d9c459a79dfb3ac4c55074e24c006bfa2ef59eeb055626af7b2ba6a1a8835eaf6d9c63d2a4cbf7e11513f8c68f9d
 MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
diff --git a/app-arch/zip/files/zip-3.0-format-security.patch b/app-arch/zip/files/zip-3.0-format-security.patch
index 1edc2d6a1b88..63188b5063cb 100644
--- a/app-arch/zip/files/zip-3.0-format-security.patch
+++ b/app-arch/zip/files/zip-3.0-format-security.patch
@@ -1,5 +1,5 @@
---- zip.c
-+++ zip.c
+--- a/zip.c
++++ b/zip.c
 @@ -1028,7 +1028,7 @@
  
    for (i = 0; i < sizeof(text)/sizeof(char *); i++)
diff --git a/app-arch/zip/files/zip-3.0-natspec.patch b/app-arch/zip/files/zip-3.0-natspec.patch
index 1dfce09d1331..29ed4827e3ce 100644
--- a/app-arch/zip/files/zip-3.0-natspec.patch
+++ b/app-arch/zip/files/zip-3.0-natspec.patch
@@ -14,8 +14,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=275244
 pva@gentoo.org
 
 === modified file 'fileio.c'
---- fileio.c	2010-12-22 13:02:43 +0000
-+++ fileio.c	2010-12-22 13:03:00 +0000
+--- a/fileio.c
++++ b/fileio.c
 @@ -929,7 +929,7 @@
    }
    if ((zname = in2ex(iname)) == NULL)
@@ -27,8 +27,8 @@ pva@gentoo.org
  #else
 
 === modified file 'globals.c'
---- globals.c	2010-12-22 13:02:43 +0000
-+++ globals.c	2010-12-22 13:03:00 +0000
+--- a/globals.c
++++ b/globals.c
 @@ -32,7 +32,7 @@
  int scanimage = 1;      /* 1=scan through image files */
  #endif
@@ -40,8 +40,8 @@ pva@gentoo.org
  int filesync = 0;       /* 1=file sync, delete entries not on file system */
 
 === modified file 'unix/Makefile'
---- unix/Makefile	2010-12-22 13:02:43 +0000
-+++ unix/Makefile	2010-12-22 15:43:40 +0000
+--- a/unix/Makefile
++++ b/unix/Makefile
 @@ -38,7 +38,7 @@
  MANFLAGS = 644
  
@@ -73,8 +73,8 @@ pva@gentoo.org
  zipsplit$E: $(OBJS)
 
 === modified file 'unix/osdep.h'
---- unix/osdep.h	2010-12-22 13:02:43 +0000
-+++ unix/osdep.h	2010-12-22 15:45:29 +0000
+--- a/unix/osdep.h
++++ b/unix/osdep.h
 @@ -78,3 +78,6 @@
  #if !defined(NO_EF_UT_TIME) && !defined(USE_EF_UT_TIME)
  #  define USE_EF_UT_TIME
@@ -84,8 +84,8 @@ pva@gentoo.org
 +#  define OS_CODE  0xb00
 
 === modified file 'unix/unix.c'
---- unix/unix.c	2010-12-22 13:02:43 +0000
-+++ unix/unix.c	2010-12-22 13:03:00 +0000
+--- a/unix/unix.c
++++ b/unix/unix.c
 @@ -14,6 +14,11 @@
  
  #include <time.h>
@@ -153,8 +153,8 @@ pva@gentoo.org
  #else
 
 === modified file 'zip.c'
---- zip.c	2010-12-22 13:02:43 +0000
-+++ zip.c	2010-12-22 13:03:00 +0000
+--- a/zip.c
++++ b/zip.c
 @@ -2025,6 +2025,7 @@
  #endif /* ?MACOS */
      {"J",  "junk-sfx",    o_NO_VALUE,       o_NOT_NEGATABLE, 'J',  "strip self extractor from archive"},
@@ -183,8 +183,8 @@ pva@gentoo.org
          case o_ll:
 
 === modified file 'zipnote.c'
---- zipnote.c	2010-12-22 13:02:43 +0000
-+++ zipnote.c	2010-12-22 15:42:45 +0000
+--- a/zipnote.c
++++ b/zipnote.c
 @@ -21,6 +21,11 @@
  #include "revision.h"
  #include <signal.h>
diff --git a/app-arch/zip/files/zip-3.0-no-crypt.patch b/app-arch/zip/files/zip-3.0-no-crypt.patch
index 2858b51ec2c9..9a1302c1be02 100644
--- a/app-arch/zip/files/zip-3.0-no-crypt.patch
+++ b/app-arch/zip/files/zip-3.0-no-crypt.patch
@@ -4,8 +4,8 @@ forward ported from zip-2.32
 
 http://bugs.gentoo.org/238398
 
---- zip.c
-+++ zip.c
+--- a/zip.c
++++ b/zip.c
 @@ -3452,6 +3452,9 @@ char **argv;            /* command line tokens */
  
    /* Key not yet specified.  If needed, get/verify it now. */
@@ -24,8 +24,8 @@ http://bugs.gentoo.org/238398
    }
    if (key) {
      /* if -P "" could get here */
---- zipcloak.c
-+++ zipcloak.c
+--- a/zipcloak.c
++++ b/zipcloak.c
 @@ -744,6 +744,28 @@ struct option_struct far options[] = {
  
  int main OF((void));
diff --git a/app-arch/zip/files/zip-3.0-pic.patch b/app-arch/zip/files/zip-3.0-pic.patch
index b4c53de694f7..89a52e246f03 100644
--- a/app-arch/zip/files/zip-3.0-pic.patch
+++ b/app-arch/zip/files/zip-3.0-pic.patch
@@ -1,15 +1,15 @@
 if our toolchain generates PIC by default, then do not use the hand written
 assembly files as none of it is PIC friendly.
 
---- unix/configure
-+++ unix/configure
+--- a/unix/configure
++++ b/unix/configure
 @@ -29,6 +29,9 @@
  echo Check if we can use asm code
  OBJA=""
  OCRCU8=""
 +piclib="$(echo | $CPP -dM $CFLAGS - | grep -i __pic__)"
 +echo "Checking if compiler wants to create pic code"
-+[ "$piclib" == "" ] && \
++[ "$piclib" = "" ] && \
  if eval "$CPP match.S > _match.s 2>/dev/null"; then
    if test ! -s _match.s || grep error < _match.s > /dev/null; then
      :
diff --git a/app-arch/zip/files/zip-3.0-zipnote-freeze.patch b/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
index cfe78f0a100a..28f47d039b8e 100644
--- a/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
+++ b/app-arch/zip/files/zip-3.0-zipnote-freeze.patch
@@ -1,6 +1,6 @@
 diff -dupr zip30-old/fileio.c zip30/fileio.c
---- zip30-old/fileio.c	2008-05-28 20:13:24.000000000 +0200
-+++ zip30/fileio.c	2012-06-12 17:30:29.794547493 +0200
+--- a/fileio.c
++++ b/fileio.c
 @@ -3502,7 +3502,7 @@ zwchar *local_to_wide_string(local_strin
    if ((wc_string = (wchar_t *)malloc((wsize + 1) * sizeof(wchar_t))) == NULL) {
      ZIPERR(ZE_MEM, "local_to_wide_string");
@@ -11,9 +11,9 @@ diff -dupr zip30-old/fileio.c zip30/fileio.c
  
    /* in case wchar_t is not zwchar */
 diff -dupr zip30-old/zipfile.c zip30/zipfile.c
---- zip30/zipfile.c	2008-07-01 00:15:30.000000000 +0200
-+++ zip30/zipfile.c	2012-06-10 01:59:42.571706181 +0200
-@@ -5406,6 +5406,8 @@ int putlocal(z, rewrite)
+--- a/zipfile.c
++++ b/zipfile.c
+@@ -5406,7 +5406,9 @@ int putlocal(z, rewrite)
      if (z->flg & UTF8_BIT) {
        /* If this flag is set, then restore UTF-8 as path name */
        use_uname = 1;
@@ -34,8 +34,8 @@ diff -dupr zip30-old/zipfile.c zip30/zipfile.c
        add_Unicode_Path_cen_extra_field(z);
      }
 diff -dupr zip30/zipnote.c zip30/zipnote.c
---- zip30/zipnote.c	2008-05-08 04:17:08.000000000 +0200
-+++ zip30/zipnote.c	2012-06-10 02:33:36.372663528 +0200
+--- a/zipnote.c
++++ b/zipnote.c
 @@ -575,6 +575,13 @@ char **argv;            /* command line
        strcpy(z->iname, a+2);
  #endif
diff --git a/app-arch/zip/zip-3.0-r4.ebuild b/app-arch/zip/zip-3.0-r4.ebuild
new file mode 100644
index 000000000000..8d72eb604270
--- /dev/null
+++ b/app-arch/zip/zip-3.0-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs flag-o-matic
+
+MY_P="${PN}${PV//.}"
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+IUSE="bzip2 crypt natspec unicode"
+
+DEPEND="${RDEPEND}"
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-no-crypt.patch #238398
+	"${FILESDIR}/${P}"-pic.patch
+	"${FILESDIR}/${P}"-exec-stack.patch #122849
+	"${FILESDIR}/${P}"-build.patch #200995
+	"${FILESDIR}/${P}"-zipnote-freeze.patch #322047
+	"${FILESDIR}/${P}"-format-security.patch #512414
+)
+
+src_prepare() {
+	default
+	use natspec && eapply "${FILESDIR}/${PN}"-3.0-natspec.patch #275244
+}
+
+src_configure() {
+	append-cppflags \
+		-DLARGE_FILE_SUPPORT \
+		-DUIDGID_NOT_16BIT \
+		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
+		-D$(usex crypt '' NO)CRYPT \
+		-D$(usex unicode '' NO)UNICODE_SUPPORT
+	# Third arg disables bzip2 logic as we handle it ourselves above.
+	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
+	if use bzip2 ; then
+		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
+	fi
+}
+
+src_compile() {
+	emake \
+		CPP="$(tc-getCPP)" \
+		-f unix/Makefile generic
+}
+
+src_install() {
+	dobin zip zipnote zipsplit
+	doman man/zip{,note,split}.1
+	if use crypt ; then
+		dobin zipcloak
+		doman man/zipcloak.1
+	fi
+	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
+}