summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-09-18 13:27:56 +0000
committerJustin Lecher <jlec@gentoo.org>2013-09-18 13:27:56 +0000
commit8d81a335661384c5273d6f9f757f85637633b034 (patch)
treeea16442277f37d7c2431f5bbc17ae52e45cd989d /app-arch
parentSecurity bump (bug #485258). Removed old (diff)
downloadhistorical-8d81a335661384c5273d6f9f757f85637633b034.tar.gz
historical-8d81a335661384c5273d6f9f757f85637633b034.tar.bz2
historical-8d81a335661384c5273d6f9f757f85637633b034.zip
app-arch/p7zip: Patch for long filenames in rar archives, #484970; thanks M.B. preparing the patch
Package-Manager: portage-2.2.6/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/p7zip/ChangeLog9
-rw-r--r--app-arch/p7zip/Manifest32
-rw-r--r--app-arch/p7zip/files/p7zip-9.20.1-long_rar_pwd.patch17
-rw-r--r--app-arch/p7zip/p7zip-9.20.1-r5.ebuild159
4 files changed, 201 insertions, 16 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index d61c08612114..b22be93eee66 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-arch/p7zip
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.157 2013/08/11 12:51:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.158 2013/09/18 13:27:55 jlec Exp $
+
+*p7zip-9.20.1-r5 (18 Sep 2013)
+
+ 18 Sep 2013; Justin Lecher <jlec@gentoo.org> +p7zip-9.20.1-r5.ebuild,
+ +files/p7zip-9.20.1-long_rar_pwd.patch:
+ Patch for long filenames in rar archives, #484970; thanks M.B. preparing the
+ patch
11 Aug 2013; Justin Lecher <jlec@gentoo.org> -p7zip-9.13.ebuild,
-p7zip-9.13-r3.ebuild:
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index c1f2d68282b4..a031f2eec8c1 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -7,24 +7,26 @@ AUX p7zip 1210 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799
AUX p7zip-9.13-QA.patch 650 SHA256 d44e500a5d15b8c25826fd8a60c61e9c524724c40f22683967212f9843d6db17 SHA512 c8b260d30a39ce66990aaa429d60c3b4a472f03f03c407badbe235106245f4ab0f9422ec1ddd98e5fbe97e9296d69908687625f141e3aa91ff5f32588b332543 WHIRLPOOL 6d01c5f28efe6e528a1a5f7e0fdef7701b4ba92e9a21646832094dbbc3ae7e0e3671ee925c2f8009afca85cb9bdca83fce225063a3c47af7d05625019c47fada
AUX p7zip-9.20.1-QA.patch 650 SHA256 695b6836b13699e3db3e019dbd54275e48a01b59210fd353a2d9e46224c60785 SHA512 b07f8608b973be7c547b226bc23dd064d6cc18f6b1ea70ce72aff72fa098852914eb8d331fe7230b7fdfbb1f0fce59eb3404fd3a5b44d151ea847e87fd2d8f39 WHIRLPOOL 077a4bdf44dcbd66a525e795e082aef41321dc7770415a1cd78716d78aa5b5b2e780afcb4194ea7c2ae2947a596292be18ab8dd3f9bce302e47f8d9cdcc6a046
AUX p7zip-9.20.1-execstack.patch 785 SHA256 0725ca42b5ac8d4024a18e2759a12c3ba04b8ea504376c14d8890f7bebba3fb1 SHA512 2b3404554295596dd1113700f72f7149baded7b381e70edea78a2cf66ad69ac6fb03653c490843ecab13e348638a0efaaeb3f5e71a0670255d09a91c70c7977f WHIRLPOOL 4aa1a9632d706c4f9f8b906a9a84929605a56e92c4289a296b767d107e11f85848d40bd58ad4df21c2d87f385318b8e740b71bc7c0467ea3af2bd6c58502d25a
+AUX p7zip-9.20.1-long_rar_pwd.patch 805 SHA256 5c2fdd7132e5fdceac91d783b1056420537f14a1e3fc7715b75dac698704ebf8 SHA512 0895fec9ec2a0eae960e44f181d2dcac618916d4bf7a5576e234ad7d2fc9417da4eb589c115b0b4040f7c9142cd43637355d8d62e8f43201117c0ee2a6da02cb WHIRLPOOL bd2d339a7356f1b3201005fe6f05ad881b2292e5fadf46a32a28c1667d32fe8b5b555105975e7c69dfa90cc157b415b86a4e153e13dfe0b8bfc4ef095c24fb57
DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
EBUILD p7zip-9.20.1-r4.ebuild 4382 SHA256 1607930cc7dea3816b08bbde8f5f8b25adad6496b532891bd3ed2e16589fdb33 SHA512 fa2491e02971f183f7571169084d4d9addcc0b501f8a2d88ddbbe09f9ee406e4cc674068639062e27d2596421c920eda6d93ac1c43801e0bbb6bb48cdd42d915 WHIRLPOOL 943485638e533ace60e0ce036c64c635611f5efa8821a690288937660fb947fc475e80771c28a70b45694b45f23d664b20a0432080ed2443ad8f02123afeebd4
-MISC ChangeLog 20612 SHA256 a0b404102ee6af4994ec1bfe5e1c4bacde3a9f41398cc99d4b398950fd356feb SHA512 e4ec648fdbc75aaee435f0bd6ab90a297ab961d2dd2654f2b9d807238d270c0dd063f09daabcb07ba40c36b8d8df88542f3576ccd194205fd6e96f56a9a85835 WHIRLPOOL c6cc70ce4e77f482e67f199ac4a44b22beb3137ab74166371915bb8219fb865e7ac0293b648c2f692579d66226333a1077d0ddad2c8c2820e8d3356fdc33563f
+EBUILD p7zip-9.20.1-r5.ebuild 4433 SHA256 b1a90eddfedbfb81a069569a39357f6a5bb529634ddfb11420c542db89bd5e73 SHA512 bd8e68f5c4729828bb14fe5b9fcb92ecf147933fd5229a525bb38187bf3ce4a81058c972ac0b621ff5e871078d974da995b3ed524e3002af65ed368b060a8a67 WHIRLPOOL 4621aad5103d6c207bcc91ef3ad3ac705e6f99a09dfd8d8adb6fc27262d3e36fe57ddf6769ecf32180f8f154985443bdeedfd3ec1d34cfff105205f0ce140f02
+MISC ChangeLog 20846 SHA256 0c7c1ffa2fcd314452578e2593acf46d78012cb0ef85d2e0e04d59372347acbc SHA512 b3beb1b89c93f0bb1a97386da68570021101501094fda993977152c94e4abd710f622f87e3d5889c479a8ee777dec3b716708d6dbfb2242bdc40a4cea44b74c0 WHIRLPOOL c107059d60ded776822cc56423ebc7d311e63daa561a5933b2d97d8ab34cd8d37f124e45977d61a381bbee3e98500011aab1af8c75ac588ed11b636524da7761
MISC metadata.xml 332 SHA256 4f1520cfbd8b72e61635d58783a77d08189616c031d0288eb6c47ae20b182353 SHA512 9aee4332f10ec1b28c6f40c580adfb5d7d6220f00ed3cea73c11a5063ca3ca737761b206c1b6f926b9e2418f5db0439df108d9a99747eff1277190f0f6258d86 WHIRLPOOL 1610d8c1a4038ffe903cc16e153745ca611732813a1a0c03601aabff96d42106994a84962dda28783ea8943e3c8c8b11d45b25cd96ebe0926194df96e0e25a99
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
-iQIcBAEBCgAGBQJSB4jFAAoJELnU8jG9FVir1KUP/3v+Ds/NPn03NGJ6cifNcsHi
-lp/r/fLf6JUTSL+nI637EKUSpKn1NMuYVO3XKTJ+fr8f3kGhn2UT+cpABj6pmWKS
-PtcM2Xp90GORL6Vm7nQiz2g3cOht8PMdo/vqqG64VbqmjHI9kOliq8UTbBztLgdU
-rGWMw8ezjtqy/azfZ919+YQ4bl0YPmNJleoKa6PA3dhl1pv9EY0vJMADGGvMtrNc
-RDMEHtVIF4KFZkkYJSPYrZIviwXYxn6e+wHWXeDCWSVvyaIRlj/x9mEbFsBCkh7m
-7gpnbpnVLo8e05s8WYmTieDH/RhKliACDCU2yDnBsCMY7I8JnmsWtlWYP3oHoGya
-p4p+3eOqB6PIZi0XjggHuPFwkZxGxZfrDoJ6xJWCltgouJWxdx3H3wlp0QI+qMQc
-pMzmrGgiBRnMslsgDwKRlDXImjmhlRbXxvpzB1Bs7fpT9Mmeaw3rJ+tgoCrpWRQV
-Z98z5TR3UyoizYm+4E3XO3LBbZ07wIoGYD9/hI7xO+I23oa9vaIuv+HQHpaqE7dn
-aEN+9u4+yvfMYm5iaFONS0CuxgVp6Knf8afWG3DBlEQTQtr+kWYXgp8AAMa/ASp4
-VveHcFkhmTVOvnSjevchQXjfjtEm5t8Ac9ssI8/JBYksmzKQfDbfBBkXR1/izpFq
-sX8rPMYDu13RRCNgKOf9
-=oE5I
+iQIcBAEBCgAGBQJSOapcAAoJELnU8jG9FVirfS0P/0Q8xlUVV7Z/PKgyOvnmAW8j
+6VNfK+PcLmUUHY80nmJAcKUBA7gCUpNnBMrwkjUVxb7KgnPtMtm/ViF0OtIvhPOz
+xt36T/pVd4dClq+D2ayb3lwLr4IEJgjSf8SIV4CR2xE8/cSyvkBJW2dPuesWS9VR
+RRd9qyJNIYyTk04vYcePYHGMXMKDIBbbOqvwuQHqowBtYu4ZDCPDjx61ZwgsH8gS
+QqGslV0c6XPcavU/fM/pGzQOa6U6nldqep6nG9Gyv9lFbnP86wUkTL8AZ0aBb99f
+zV8UEeh0q00qDzA3cN0h9H7N2TeYnpUhHLZoUTeiGesfMdbg4k45qw1oijUVkzli
+wDHxZLQk/okA+I2NM9BJOaS3mYR85xk4LlZ6INQXv941oE8EFpgDuvIfXMeAIvmz
+2nw2mXm4jritiHqS+iY89+tsBA9Rcljm2pFWjWdv2miId1j5HtsktJH7OO1Epu7B
+3puQZlDE5XO9PbniKJFKBANwJ/e7iQsdTZLhUxcH5gxkNvrEU0u7tt3+SiFAcf3e
+S12Y22lIlCoyyELWRh1NfhxHUc6Z5XwDXqIPmBbRvE0nkpITKqu3ZYDTkxM8xj6i
+pbmZFc2yeTIYUtjCQO0+6lNeL5L3ExhK0gJMpd8NcG5rMCBFnaGe1sRuG/WdWLXZ
+H8L0j19xr01K9XqykUns
+=GGhc
-----END PGP SIGNATURE-----
diff --git a/app-arch/p7zip/files/p7zip-9.20.1-long_rar_pwd.patch b/app-arch/p7zip/files/p7zip-9.20.1-long_rar_pwd.patch
new file mode 100644
index 000000000000..ea7a90b71d44
--- /dev/null
+++ b/app-arch/p7zip/files/p7zip-9.20.1-long_rar_pwd.patch
@@ -0,0 +1,17 @@
+--- ./CPP/7zip/Crypto/Sha1.cpp 2010-10-20 06:56:08.000000000 +0200
++++ CPP/7zip/Crypto/Sha1.cpp.new 2013-09-15 09:19:51.000000000 +0200
+@@ -148,10 +148,10 @@
+ for (int i = 0; i < kBlockSizeInWords; i++)
+ {
+ UInt32 d = _buffer[i];
+- data[i * 4 + 0 - kBlockSize] = (Byte)(d);
+- data[i * 4 + 1 - kBlockSize] = (Byte)(d >> 8);
+- data[i * 4 + 2 - kBlockSize] = (Byte)(d >> 16);
+- data[i * 4 + 3 - kBlockSize] = (Byte)(d >> 24);
++ data[(int)i * 4 + 0 - (int)kBlockSize] = (Byte)(d);
++ data[(int)i * 4 + 1 - (int)kBlockSize] = (Byte)(d >> 8);
++ data[(int)i * 4 + 2 - (int)kBlockSize] = (Byte)(d >> 16);
++ data[(int)i * 4 + 3 - (int)kBlockSize] = (Byte)(d >> 24);
+ }
+ returnRes = rar350Mode;
+ }
diff --git a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
new file mode 100644
index 000000000000..61b462de776d
--- /dev/null
+++ b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r5.ebuild,v 1.1 2013/09/18 13:27:55 jlec Exp $
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+
+inherit eutils multilib toolchain-funcs wxwidgets
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="http://p7zip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc kde rar +pch static wxwidgets"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="
+ kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
+ wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
+DEPEND="${RDEPEND}
+ amd64? ( dev-lang/yasm )
+ x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+pkg_setup() {
+ use wxwidgets && wxwidgets_pkg_setup
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-execstack.patch \
+ "${FILESDIR}"/${P}-QA.patch \
+ "${FILESDIR}"/${P}-long_rar_pwd.patch
+
+ if ! use pch; then
+ sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+ fi
+
+ sed \
+ -e 's:-m32 ::g' \
+ -e 's:-m64 ::g' \
+ -e 's:-O::g' \
+ -e 's:-pipe::g' \
+ -e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \
+ -e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \
+ -i makefile* || die
+
+ # remove non-free RAR codec
+ if use rar; then
+ ewarn "Enabling nonfree RAR decompressor"
+ else
+ sed -e '/Rar/d' -i makefile* || die
+ rm -rf CPP/7zip/Compress/Rar || die
+ epatch "${FILESDIR}"/9.04-makefile.patch
+ fi
+
+ sed -i \
+ -e "/^CXX=/s:g++:$(tc-getCXX):" \
+ -e "/^CC=/s:gcc:$(tc-getCC):" \
+ -e '/ALLFLAGS/s:-s ::' \
+ makefile* || die "changing makefiles"
+
+ if use amd64; then
+ cp -f makefile.linux_amd64_asm makefile.machine || die
+ elif use x86; then
+ cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+ elif [[ ${CHOST} == *-darwin* ]] ; then
+ # Mac OS X needs this special makefile, because it has a non-GNU linker
+ [[ ${CHOST} == *64-* ]] \
+ && cp -f makefile.macosx_64bits makefile.machine \
+ || cp -f makefile.macosx_32bits makefile.machine
+ # bundles have extension .bundle but don't die because USE=-rar
+ # removes the Rar directory
+ sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+ CPP/Windows/DLL.cpp || die
+ sed -i -e '/^PROG=/s/\.so/.bundle/' \
+ CPP/7zip/Bundles/Format7zFree/makefile \
+ $(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
+ elif use x86-fbsd; then
+ # FreeBSD needs this special makefile, because it hasn't -ldl
+ sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+ fi
+
+ use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine
+
+ if use kde || use wxwidgets; then
+ einfo "Preparing dependency list"
+ emake depend
+ fi
+}
+
+src_compile() {
+ emake all3
+ if use kde || use wxwidgets; then
+ emake -- 7zG
+ emake -- 7zFM
+ fi
+}
+
+src_test() {
+ emake test test_7z test_7zr
+}
+
+src_install() {
+ # this wrappers can not be symlinks, p7zip should be called with full path
+ make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
+ make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
+ make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+
+ if use kde || use wxwidgets; then
+ make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
+ make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
+
+ make_desktop_entry 7zFM "${PN} FM" ${PN}.png "GTK;Utility;Archiving;Compression"
+ make_desktop_entry 7zG "${PN} GUI" ${PN}.png "GTK;Utility;Archiving;Compression"
+
+ dobin GUI/p7zipForFilemanager
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe bin/7z{G,FM}
+
+ insinto /usr/$(get_libdir)/${PN}
+ doins -r GUI/{Lang,help}
+
+ insinto /usr/share/icons/hicolor/16x16/apps/
+ newins GUI/p7zip_16_ok.png p7zip.png
+
+ if use kde; then
+
+ rm GUI/kde4/p7zip_compress.desktop
+ insinto /usr/share/kde4/services/ServiceMenus
+ doins GUI/kde4/*.desktop
+ fi
+ fi
+
+ dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+ doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+ doexe bin/*$(get_modname)
+ if use rar; then
+ exeinto /usr/$(get_libdir)/${PN}/Codecs/
+ doexe bin/Codecs/*$(get_modname)
+ fi
+
+ doman man1/7z.1 man1/7za.1 man1/7zr.1
+ dodoc ChangeLog README TODO
+
+ if use doc; then
+ dodoc DOCS/*.txt
+ dohtml -r DOCS/MANUAL/*
+ fi
+}