Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
Date: Sat, 10 Aug 2019 14:52:25
Message-Id: 1565448702.5d1627f8ef6acd6dab6b419acf80247e035c57bf.bman@gentoo
1 commit: 5d1627f8ef6acd6dab6b419acf80247e035c57bf
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 10 14:51:42 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 10 14:51:42 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1627f8
7
8 app-arch/unzip: remove vulnerable wrt bug #602048
9
10 * maintainer/project timeout
11
12 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
13
14 app-arch/unzip/Manifest | 1 -
15 app-arch/unzip/unzip-6.0_p20.ebuild | 88 -------------------------------------
16 2 files changed, 89 deletions(-)
17
18 diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
19 index 23675a263bc..c338085389a 100644
20 --- a/app-arch/unzip/Manifest
21 +++ b/app-arch/unzip/Manifest
22 @@ -1,3 +1,2 @@
23 DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
24 -DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
25 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
26
27 diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild
28 deleted file mode 100644
29 index 65112b3cb15..00000000000
30 --- a/app-arch/unzip/unzip-6.0_p20.ebuild
31 +++ /dev/null
32 @@ -1,88 +0,0 @@
33 -# Copyright 1999-2016 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI="5"
37 -
38 -inherit eutils toolchain-funcs flag-o-matic
39 -
40 -MY_PV="${PV//.}"
41 -MY_PV="${MY_PV%_p*}"
42 -MY_P="${PN}${MY_PV}"
43 -
44 -DESCRIPTION="unzipper for pkzip-compressed files"
45 -HOMEPAGE="http://www.info-zip.org/"
46 -SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
47 - mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
48 -
49 -LICENSE="Info-ZIP"
50 -SLOT="0"
51 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
52 -IUSE="bzip2 natspec unicode"
53 -
54 -DEPEND="bzip2? ( app-arch/bzip2 )
55 - natspec? ( dev-libs/libnatspec )"
56 -RDEPEND="${DEPEND}"
57 -
58 -S="${WORKDIR}/${MY_P}"
59 -
60 -src_prepare() {
61 - local deb="${WORKDIR}"/debian/patches
62 - rm \
63 - "${deb}"/series \
64 - "${deb}"/02-branding-patch-this-is-debian-unzip \
65 - || die
66 - epatch "${deb}"/*
67 -
68 - epatch "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
69 - use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
70 - sed -i -r \
71 - -e '/^CFLAGS/d' \
72 - -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
73 - -e '/^STRIP/s:=.*:=true:' \
74 - -e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
75 - -e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
76 - -e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
77 - -e 's:LF2 = -s:LF2 = :' \
78 - -e 's:LF = :LF = $(LDFLAGS) :' \
79 - -e 's:SL = :SL = $(LDFLAGS) :' \
80 - -e 's:FL = :FL = $(LDFLAGS) :' \
81 - -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
82 - -e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
83 - unix/Makefile \
84 - || die "sed unix/Makefile failed"
85 -
86 - # Delete bundled code to make sure we don't use it.
87 - rm -r bzip2 || die
88 -
89 - epatch_user
90 -}
91 -
92 -src_configure() {
93 - case ${CHOST} in
94 - i?86*-*linux*) TARGET="linux_asm" ;;
95 - *linux*) TARGET="linux_noasm" ;;
96 - i?86*-*bsd* | \
97 - i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm
98 - *bsd* | *dragonfly*) TARGET="bsd" ;;
99 - *-darwin*) TARGET="macosx" ;;
100 - *-cygwin*) TARGET="cygwin" ;;
101 - *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;;
102 - esac
103 -
104 - [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
105 - use bzip2 && append-cppflags -DUSE_BZIP2
106 - use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
107 - append-cppflags -DLARGE_FILE_SUPPORT #281473
108 -}
109 -
110 -src_compile() {
111 - ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \
112 - emake -f unix/Makefile ${TARGET}
113 -}
114 -
115 -src_install() {
116 - dobin unzip funzip unzipsfx unix/zipgrep
117 - dosym unzip /usr/bin/zipinfo
118 - doman man/*.1
119 - dodoc BUGS History* README ToDo WHERE
120 -}