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