gentoo auto-resync : 10:09:2022 - 04:41:30

4 files changed, 125 insertions, 0 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index aeb4d96d1112..8f164cf92dff 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 714dfd30eb9f..bd682193d852 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1,4 +1,5 @@
 AUX zip-3.0-build.patch 923 BLAKE2B 0a8b7d8fb98f9bc8750c3bb6ff9a672db86481ca88349e5e08d2e96ae0cabac4ef75651a91e9b0fb8e70e1c075ea721060a3851bdd6e103b1f4c020a8b4f4979 SHA512 c9cf162505938a0200eed0333849c2c4a3b59088a6549377a3af9ac89cd7a26fd388d09df55a6cd117e607c1a2f2960bc5e85f7384ff30565c2be01ce4ff442d
+AUX zip-3.0-clang-15-configure-tests.patch 1615 BLAKE2B d1e244d4bd31f63d60c4f6d0b38aacb53a1eb4b71c644dabf3f2d13d7fe9328be546968f96c868dcfec8c7644d7285249f8d75a53b462fad9aabb89b17993a51 SHA512 35fbfcec3f5735af85bae276df2416055d2633c2507eb672cb46b18411749e60c13062fd3cc57ba3a9a9c208dc120c6095f5503d95c429ef903cdb2778ce28df
 AUX zip-3.0-exec-stack.patch 548 BLAKE2B 3ded2568eea78c89422ea043bb68917d4a508d6ee6d8d65e9db6c22f6d5dbcac15836a94ad5d1209112cb73c1da4f266346e722cafcf3a6a91080261c4d5df93 SHA512 575516abe5ed633bdda22c3ee41109400360eef437671f9b658d7591bb8fa3b3854c1cd92d6396e47d91545b23ecbbc1218190192e39a60b00d6b7b5bb793eab
 AUX zip-3.0-format-security.patch 511 BLAKE2B ca5bfe9f839b1fb0ab8a4785b4448fa346ba9ccfb0cde40a61e7a3442a70f06a4481c57d6aa995654d7ef4482d2f1f7022b7a568b5e47b1149f0430de8110fbf SHA512 6d3514b9df21b6f8a40b037f7d584a4b4a0a5364676bd2cf40d31e32545bc7edd2e5cfeccdc72302c4f19b607852d81ad568c4420750a8c78bbd325c5cf78b8f
 AUX zip-3.0-natspec.patch 6464 BLAKE2B 4c032896c5b331e235a9ea55c91e696aa37b192c46be5ff4c85f4809473a299ba06e34b3cc30b1e47dfbb091da5058c5babdbea41b74677788e6ef5b7b0f0650 SHA512 91472cf73c943a2fbcae7640ca6862f4ef9c2212cf31bd2128fd6e157d46db76b6882b08db2aea9d6d2e3631c56d1393e16f8e76628ea7812d062e6471a085e6
@@ -7,4 +8,5 @@ AUX zip-3.0-pic.patch 502 BLAKE2B 6ac03408e40986fbbc7219fa1f96f8e2fdc448071dcc13
 AUX zip-3.0-zipnote-freeze.patch 1926 BLAKE2B 5976c4ad62d25f4ace8e17a85b77c99fb5ea75151d6ddd8fe27ee22cb7669d98281e26952c623b6e367fa880fce693d393a79fc619e13d8ba530b2aa38b8b70f SHA512 edd90964bc4f1bd3cc45f719905f3688ebd779aea5f10439b2331d668774ed55e645e025d9f408cedb8313848d4e26ba39726d019543e3533f79f1ef83620932
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
 EBUILD zip-3.0-r4.ebuild 1706 BLAKE2B 53c14e019adc5917f3e5931aa0cbec5c13b61f01571171c398ab506ee2814940cf3600218f4426b8cc61b2e4c192a21278df84764a5d74575750fb97bbed6065 SHA512 7c0acaa20be859eb00940b4cf784b58dce26c66f35fe275267004f4191fdb3b5cff718633673f6af796f7a4f38b3ef0432d19a64bcf65cb607419c98ac31ae6a
+EBUILD zip-3.0-r5.ebuild 1891 BLAKE2B 4f4dde8c73ac905532a7abd011ebd8c0ef6477290b7fed3881ea8cd699e41309b247fd58d921b8b7da71279781f44b8cb58ebe03dc5106acc757859055a398ef SHA512 8d409e4275671e2677a5e2ac2ae1224d79e03510595036ff0a8dcccd5855e2106c151f094984c963b39c322894c86eb6eb310e677556baffa27d31ad88c7456b
 MISC metadata.xml 477 BLAKE2B 48b8860bc3795c891ee9591fcb5b10980240b4d6f166fa5d59292643ced0a07946a398c9fab04f15b347039f8f510a2918a0e47deb9e4552b1508fca3009ea5b SHA512 3a1e527d6be6d1afddeb57623406d31f7f26029ca4878a873b5aa6b319dc20c7a1ef772aec406debc095be66eee7245c46c384a7f2f2ad019ae473c1ea6e097d
diff --git a/app-arch/zip/files/zip-3.0-clang-15-configure-tests.patch b/app-arch/zip/files/zip-3.0-clang-15-configure-tests.patch
new file mode 100644
index 000000000000..89a059a053c3
--- /dev/null
+++ b/app-arch/zip/files/zip-3.0-clang-15-configure-tests.patch
@@ -0,0 +1,52 @@
+https://bugs.gentoo.org/869203
+
+--- a/unix/configure
++++ b/unix/configure
+@@ -507,18 +507,18 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/
+ # add NO_'function_name' to flags if missing
+ 
+ for func in rmdir strchr strrchr rename mktemp mktime mkstemp
+ do
+   echo Check for $func
+-  echo "int main(){ $func(); return 0; }" > conftest.c
++  echo "char $func(); int main(){ return $func(); }" > conftest.c
+   $CC $BFLAG -o conftest conftest.c >/dev/null 2>/dev/null
+   [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_`echo $func | tr '[a-z]' '[A-Z]'`"
+ done
+ 
+ 
+ echo Check for memset
+-echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c
++echo "int main(){ char memset(); return memset(); }" > conftest.c
+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+ [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"
+ 
+ 
+ echo Check for memmove
+@@ -551,11 +551,11 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/
+ [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_ERRNO"
+ 
+ 
+ echo Check for directory libraries
+ cat > conftest.c << _EOF_
+-int main() { return closedir(opendir(".")); }
++int main() { char closedir(); char opendir(); return closedir(opendir()); }
+ _EOF_
+ 
+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+ if [ $? -ne 0 ]; then
+   OPT=""
+@@ -573,11 +573,11 @@ fi
+ 
+ 
+ # Dynix/ptx 1.3 needed this
+ 
+ echo Check for readlink
+-echo "int main(){ return readlink(); }" > conftest.c
++echo "int main(){ char readlink(); return readlink(); }" > conftest.c
+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+ if [ $? -ne 0 ]; then
+   $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null
+   [ $? -eq 0 ] && LFLAGS2="${LFLAGS2} -lseq"
+ fi
+
diff --git a/app-arch/zip/zip-3.0-r5.ebuild b/app-arch/zip/zip-3.0-r5.ebuild
new file mode 100644
index 000000000000..09244c8b2bb6
--- /dev/null
+++ b/app-arch/zip/zip-3.0-r5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo 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"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-crypt.patch # bug #238398
+	"${FILESDIR}"/${P}-pic.patch
+	"${FILESDIR}"/${P}-exec-stack.patch # bug #122849
+	"${FILESDIR}"/${P}-build.patch # bug #200995
+	"${FILESDIR}"/${P}-zipnote-freeze.patch # bug #322047
+	"${FILESDIR}"/${P}-format-security.patch # bug #512414
+	"${FILESDIR}"/${P}-clang-15-configure-tests.patch
+)
+
+src_prepare() {
+	# bug #275244
+	use natspec && PATCHES+=( "${FILESDIR}"/${PN}-3.0-natspec.patch )
+	default
+}
+
+src_configure() {
+	append-cppflags \
+		-DLARGE_FILE_SUPPORT \
+		-DUIDGID_NOT_16BIT \
+		-D$(usev !bzip2 'NO')BZIP2_SUPPORT \
+		-D$(usev !crypt 'NO')CRYPT \
+		-D$(usev !unicode 'NO')UNICODE_SUPPORT
+
+	# - We use 'sh' because: 1. lacks +x bit, easier; 2. it tries to load bashdb
+	# - Third arg disables bzip2 logic as we handle it ourselves above.
+	edo sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}"
+
+	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
+}