diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-06-23 22:39:22 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-06-23 22:39:22 +0000 |
commit | 068b110f6fb4a395bf6be225d62ea6ff94a680e0 (patch) | |
tree | 1309b62fcf4b83b8dfffe2c334d22b550d231865 /app-arch | |
parent | Fix RDEPEND on elementtre for python-2.5 (diff) | |
download | historical-068b110f6fb4a395bf6be225d62ea6ff94a680e0.tar.gz historical-068b110f6fb4a395bf6be225d62ea6ff94a680e0.tar.bz2 historical-068b110f6fb4a395bf6be225d62ea6ff94a680e0.zip |
Remove some old files.
Package-Manager: portage-2.1.3_rc5
Diffstat (limited to 'app-arch')
-rw-r--r-- | app-arch/bsdtar/ChangeLog | 9 | ||||
-rw-r--r-- | app-arch/bsdtar/Manifest | 42 | ||||
-rw-r--r-- | app-arch/bsdtar/bsdtar-1.3.1-r2.ebuild | 83 | ||||
-rw-r--r-- | app-arch/bsdtar/bsdtar-2.2.2.ebuild | 82 | ||||
-rw-r--r-- | app-arch/bsdtar/files/digest-bsdtar-1.3.1-r2 | 3 | ||||
-rw-r--r-- | app-arch/bsdtar/files/digest-bsdtar-2.2.2 | 3 | ||||
-rw-r--r-- | app-arch/bsdtar/files/libarchive-1.2.53-strict-aliasing.patch | 65 | ||||
-rw-r--r-- | app-arch/bsdtar/files/libarchive-1.2.57-acl.patch | 68 | ||||
-rw-r--r-- | app-arch/bsdtar/files/libarchive-1.3.1-infiniteloop.patch | 55 |
9 files changed, 15 insertions, 395 deletions
diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog index 3904e1deb97b..1524fef3dd59 100644 --- a/app-arch/bsdtar/ChangeLog +++ b/app-arch/bsdtar/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/bsdtar # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.69 2007/05/31 01:39:33 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.70 2007/06/23 22:39:22 flameeyes Exp $ + + 23 Jun 2007; Diego Pettenò <flameeyes@gentoo.org> + -files/libarchive-1.2.53-strict-aliasing.patch, + -files/libarchive-1.2.57-acl.patch, + -files/libarchive-1.3.1-infiniteloop.patch, -bsdtar-1.3.1-r2.ebuild, + -bsdtar-2.2.2.ebuild: + Remove some old files. 31 May 2007; Daniel Gryniewicz <dang@gentoo.org> bsdtar-2.0.31.ebuild: Marked stable on amd64 for bug #180017 diff --git a/app-arch/bsdtar/Manifest b/app-arch/bsdtar/Manifest index 0929db64a457..843bdc2f4c79 100644 --- a/app-arch/bsdtar/Manifest +++ b/app-arch/bsdtar/Manifest @@ -1,18 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX libarchive-1.2.53-strict-aliasing.patch 3035 RMD160 e2f5a29eb6b20c8e40b59e682eeaf71494660b27 SHA1 aa37628f94159f885ff426a98c531671e33e6b09 SHA256 3720b81598e6fff554b1d4a1b84e32a926880583dabe8c47aa01d4b55111ff15 -MD5 6a4d65adad4b81af8804449e92ea5764 files/libarchive-1.2.53-strict-aliasing.patch 3035 -RMD160 e2f5a29eb6b20c8e40b59e682eeaf71494660b27 files/libarchive-1.2.53-strict-aliasing.patch 3035 -SHA256 3720b81598e6fff554b1d4a1b84e32a926880583dabe8c47aa01d4b55111ff15 files/libarchive-1.2.53-strict-aliasing.patch 3035 -AUX libarchive-1.2.57-acl.patch 2526 RMD160 c6101f157aa719d8e0075a13bfd7efb73c1ee70a SHA1 4fe0705d50c68554b913afbe3b396053c486ce6b SHA256 b444555096ebd1e1591414cc84f85b65b1f50e753045a5f63ae313de58715125 -MD5 1ec027876e064e268a47ef73d2033991 files/libarchive-1.2.57-acl.patch 2526 -RMD160 c6101f157aa719d8e0075a13bfd7efb73c1ee70a files/libarchive-1.2.57-acl.patch 2526 -SHA256 b444555096ebd1e1591414cc84f85b65b1f50e753045a5f63ae313de58715125 files/libarchive-1.2.57-acl.patch 2526 -AUX libarchive-1.3.1-infiniteloop.patch 2221 RMD160 fbabf3eb252936a634ba6b87d6e25d4074df4ca2 SHA1 324ecb963224875909e3d407574e311d39d919f4 SHA256 cb23ac1a6377718214d8cdab9ca3d5565e644f39ef6189b59cc3a5d4839966c0 -MD5 e17a167d7dac6ea9914d42b039debfb9 files/libarchive-1.3.1-infiniteloop.patch 2221 -RMD160 fbabf3eb252936a634ba6b87d6e25d4074df4ca2 files/libarchive-1.3.1-infiniteloop.patch 2221 -SHA256 cb23ac1a6377718214d8cdab9ca3d5565e644f39ef6189b59cc3a5d4839966c0 files/libarchive-1.3.1-infiniteloop.patch 2221 AUX libarchive-1.3.1-static.patch 1333 RMD160 21488116b37c75506061f6f5873f91670a3fe45a SHA1 2668779f2bc99a4b7f3b2a73b168cb1f81674304 SHA256 40be241edf721d5601824286e9221955add582d9136f3fc7e29f9abcb192a78c MD5 6590bb296f0bb64ecfcd6b779cae3890 files/libarchive-1.3.1-static.patch 1333 RMD160 21488116b37c75506061f6f5873f91670a3fe45a files/libarchive-1.3.1-static.patch 1333 @@ -29,50 +17,34 @@ AUX libarchive-2.1.9-static.patch 1323 RMD160 e69e1b894c9ce6d1a4098731d10ebedcd2 MD5 1dd8a4adb1851e0a84fa752b970ff445 files/libarchive-2.1.9-static.patch 1323 RMD160 e69e1b894c9ce6d1a4098731d10ebedcd2a812c8 files/libarchive-2.1.9-static.patch 1323 SHA256 6ab2eee004a6ec228acea4ceda9515c84edd9ca1187b8a918bef541d3dd9492d files/libarchive-2.1.9-static.patch 1323 -DIST libarchive-1.3.1.tar.gz 901173 RMD160 e518f802d9a50afcfede6dd7cbb4f42b2cbe12a1 SHA1 aed6eda15b012adbb88af0f0d76887920ffe7bbf SHA256 ad9eaf5779df75b9a0618a732eb227792e65db17c6713fe81ef5bff2bbc616a8 DIST libarchive-2.0.31.tar.gz 602844 RMD160 11a67ff388a02cf2d570df1a0576ead91570e6b6 SHA1 07a455ad4a9fb4ba37a33675693bc5a56fb67393 SHA256 ee661b2c5ef7e19930834e047acd247f83d019af46ded1c7016bf747b0eeb9df -DIST libarchive-2.2.2.tar.gz 624581 RMD160 ca031ddad28553c6a36117ff479d6f08c8208ac5 SHA1 4c20a70f4c53daafa80a1268225d261f45e731f8 SHA256 f4c72f147fd1cc4d34670af5c8c947b36d16044c4a9e8f97439dc0a11b84852b DIST libarchive-2.2.3.tar.gz 625399 RMD160 bcc3a1abcae6ad48111359c518426004c0a3cf3b SHA1 05f1b6096315c5cabc9cda833285dd5d430e721a SHA256 1043e43d77d8b1fda6666938d5eb10c411ae9b2beead9e73f7654520f5288257 -EBUILD bsdtar-1.3.1-r2.ebuild 1900 RMD160 2ab4303a9250f0bb958c838fee4b78b0d40d6079 SHA1 dc695fd9ff572f84b45b32e723d59a83444db1d6 SHA256 f4975dbc3ea0ce23cee1c0a21b1f0017f58e65b946fe5959752908e3939ab2f3 -MD5 91eb945235769a64c6f88e79561ff150 bsdtar-1.3.1-r2.ebuild 1900 -RMD160 2ab4303a9250f0bb958c838fee4b78b0d40d6079 bsdtar-1.3.1-r2.ebuild 1900 -SHA256 f4975dbc3ea0ce23cee1c0a21b1f0017f58e65b946fe5959752908e3939ab2f3 bsdtar-1.3.1-r2.ebuild 1900 EBUILD bsdtar-2.0.31.ebuild 1878 RMD160 e45c10380e8fd4467b812b0596ed5b490bdd106b SHA1 340bcc949cd9b4683fc10ae5473ccf4b7e44a6a4 SHA256 acd7eb70aa4e769c9fa2097a03f4a2c0616b4722adbf3604bce70763fcccfeb0 MD5 3892747d52e1046330bef34e151b93b0 bsdtar-2.0.31.ebuild 1878 RMD160 e45c10380e8fd4467b812b0596ed5b490bdd106b bsdtar-2.0.31.ebuild 1878 SHA256 acd7eb70aa4e769c9fa2097a03f4a2c0616b4722adbf3604bce70763fcccfeb0 bsdtar-2.0.31.ebuild 1878 -EBUILD bsdtar-2.2.2.ebuild 1882 RMD160 2ddf0f9bf0e3f068e8dca9b6532a0c6227b5fe52 SHA1 fec28ec9d71090e886363f74b667adff97225c19 SHA256 8851e8062ef6a5edd0967c050d6ed8e40dcaae20e81858764ee003929c1e808e -MD5 e25623da5f1d6c8a8a52054aae3f9da1 bsdtar-2.2.2.ebuild 1882 -RMD160 2ddf0f9bf0e3f068e8dca9b6532a0c6227b5fe52 bsdtar-2.2.2.ebuild 1882 -SHA256 8851e8062ef6a5edd0967c050d6ed8e40dcaae20e81858764ee003929c1e808e bsdtar-2.2.2.ebuild 1882 EBUILD bsdtar-2.2.3.ebuild 1883 RMD160 b0a1f5ff0161f12723fb8879b5d3ae2e3f9e2a43 SHA1 01e9b9cf6f994359879faa45ff1adf003978284e SHA256 34569820db4c061a5132556225e7ad9190380c7376f79db64eceda4410e6df2b MD5 a44c8cabb444d88ec7825a5eed32cf24 bsdtar-2.2.3.ebuild 1883 RMD160 b0a1f5ff0161f12723fb8879b5d3ae2e3f9e2a43 bsdtar-2.2.3.ebuild 1883 SHA256 34569820db4c061a5132556225e7ad9190380c7376f79db64eceda4410e6df2b bsdtar-2.2.3.ebuild 1883 -MISC ChangeLog 12027 RMD160 3f1687873386bf4ab316b4c93e72b1172d342085 SHA1 1553a71695846f943c87b5e06935fc6f00b26f65 SHA256 f60a7d7b9cc81ae346d99dc9bbaddfc62398f91322227d6458f52df0268a13b3 -MD5 f94240ef8df155bd18d64bc64687f589 ChangeLog 12027 -RMD160 3f1687873386bf4ab316b4c93e72b1172d342085 ChangeLog 12027 -SHA256 f60a7d7b9cc81ae346d99dc9bbaddfc62398f91322227d6458f52df0268a13b3 ChangeLog 12027 +MISC ChangeLog 12294 RMD160 6159f17cd3b8c001c515e33bfff11f609e20ffb9 SHA1 650fa56da10bb79f1d8fc647a6494197eb724fe3 SHA256 9621f667b3ee6e50a990b91dfbe9afb351d76bc1b2df2702b93e363a5b956aeb +MD5 bcbb88ebe1ae498d8ce49997d4b7b0b1 ChangeLog 12294 +RMD160 6159f17cd3b8c001c515e33bfff11f609e20ffb9 ChangeLog 12294 +SHA256 9621f667b3ee6e50a990b91dfbe9afb351d76bc1b2df2702b93e363a5b956aeb ChangeLog 12294 MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b MD5 abbe0170afef9b0f317830b41e537afa metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 metadata.xml 337 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b metadata.xml 337 -MD5 46c18ca117e44e7e3f070e41f466f72e files/digest-bsdtar-1.3.1-r2 250 -RMD160 5bacf3a8252a2b227bfe4e6edf52d55c4240f6a4 files/digest-bsdtar-1.3.1-r2 250 -SHA256 bbe48267a685e9836d773f76142f7f7a0bcc3f1a05262ed7fb3fb847a9fefd1e files/digest-bsdtar-1.3.1-r2 250 MD5 0549b39d91908dfc781f229eee6eced9 files/digest-bsdtar-2.0.31 253 RMD160 5f2fa7fb92b36187fada6ca5a132402950660948 files/digest-bsdtar-2.0.31 253 SHA256 557ebd11dce3faa8f6014ab3d4fc8b1caac52ccfa698f6bcff1bc1c126e50f9a files/digest-bsdtar-2.0.31 253 -MD5 9a9867e20e8935bf2fcae2527196c56d files/digest-bsdtar-2.2.2 250 -RMD160 cb02147d82974d28751f110913a09d8b86f77fb8 files/digest-bsdtar-2.2.2 250 -SHA256 a459aebdd0515fe31ae8a8f67ec7eb7b1c1f3bbaea64d85c5048c9995b497556 files/digest-bsdtar-2.2.2 250 MD5 e2a318af09bf198021db04b55582e88d files/digest-bsdtar-2.2.3 250 RMD160 9c8b1c29b29c410e59443df3f07c36669f491607 files/digest-bsdtar-2.2.3 250 SHA256 9a90dd75844ae134a9b4fb41b87feaa10ff325705ac53752f939e440250a1573 files/digest-bsdtar-2.2.3 250 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (GNU/Linux) -iD8DBQFGXidromPajV0RnrERAoVZAJsGk8GcpJkxfuRlGHOaHI96YOAFWgCghMRO -NNkY6Yy8fItVQ20cdcVfhc4= -=MNSQ +iD8DBQFGfaEvAiZjviIA2XgRAguWAKC4pM0bGGx1HgtmoB4bRS7Ef87JGwCfQyYc +5xSt5v3BF8Oewie29Knxz/8= +=vv2l -----END PGP SIGNATURE----- diff --git a/app-arch/bsdtar/bsdtar-1.3.1-r2.ebuild b/app-arch/bsdtar/bsdtar-1.3.1-r2.ebuild deleted file mode 100644 index 9e35bb7f826f..000000000000 --- a/app-arch/bsdtar/bsdtar-1.3.1-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-1.3.1-r2.ebuild,v 1.3 2007/02/01 13:01:58 flameeyes Exp $ - -WANT_AUTOCONF=latest -WANT_AUTOMAKE=latest - -inherit eutils autotools toolchain-funcs flag-o-matic - -MY_P="libarchive-${PV}" - -DESCRIPTION="BSD tar command" -HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive/" -SRC_URI="http://people.freebsd.org/~kientzle/libarchive/src/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="build static acl xattr" - -RDEPEND="!dev-libs/libarchive - kernel_linux? ( - acl? ( sys-apps/acl ) - xattr? ( sys-apps/attr ) - ) - !static? ( !build? ( - app-arch/bzip2 - sys-libs/zlib ) )" -DEPEND="${RDEPEND} - kernel_linux? ( sys-fs/e2fsprogs - virtual/os-headers )" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/libarchive-1.3.1-static.patch - epatch "${FILESDIR}"/libarchive-1.2.57-acl.patch - epatch "${FILESDIR}"/libarchive-1.2.53-strict-aliasing.patch - epatch "${FILESDIR}"/libarchive-1.3.1-infiniteloop.patch - - eautoreconf - epunt_cxx -} - -src_compile() { - local myconf - - if use static || use build ; then - myconf="${myconf} --enable-static-bsdtar" - else - myconf="${myconf} --disable-static-bsdtar" - fi - - econf \ - --bindir=/bin \ - $(use_enable acl) \ - $(use_enable xattr) \ - ${myconf} || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake -j1 DESTDIR="${D}" install || die "emake install failed" - - # Create tar symlink for FreeBSD - if [[ ${CHOST} == *-freebsd* ]]; then - dosym bsdtar /bin/tar - dosym bsdtar.1 /usr/share/man/man1/tar.1 - fi - - if use build; then - rm -rf "${D}"/usr - rm -rf "${D}"/lib/*.so* - return 0 - fi - - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir) - gen_usr_ldscript libarchive.so -} diff --git a/app-arch/bsdtar/bsdtar-2.2.2.ebuild b/app-arch/bsdtar/bsdtar-2.2.2.ebuild deleted file mode 100644 index 3692a09b2141..000000000000 --- a/app-arch/bsdtar/bsdtar-2.2.2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-2.2.2.ebuild,v 1.1 2007/05/17 13:56:32 uberlord Exp $ - -inherit eutils autotools toolchain-funcs flag-o-matic - -MY_P="libarchive-${PV/_beta/b}" - -DESCRIPTION="BSD tar command" -HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive/" -SRC_URI="http://people.freebsd.org/~kientzle/libarchive/src/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="build static acl xattr" - -RDEPEND="!dev-libs/libarchive - kernel_linux? ( - acl? ( sys-apps/acl ) - xattr? ( sys-apps/attr ) - ) - !static? ( !build? ( - app-arch/bzip2 - sys-libs/zlib ) )" -DEPEND="${RDEPEND} - kernel_linux? ( sys-fs/e2fsprogs - virtual/os-headers )" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/libarchive-2.1.9-static.patch - epatch "${FILESDIR}"/libarchive-2.1.5-acl.patch - - eautoreconf - epunt_cxx -} - -src_compile() { - local myconf - - if use static || use build ; then - myconf="${myconf} --enable-static-bsdtar" - else - myconf="${myconf} --disable-static-bsdtar" - fi - - # Upstream doesn't seem to care to fix the problems - # and I don't want to continue running after them. - append-flags -fno-strict-aliasing - - econf \ - --bindir=/bin \ - $(use_enable acl) \ - $(use_enable xattr) \ - ${myconf} || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake -j1 DESTDIR="${D}" install || die "emake install failed" - - # Create tar symlink for FreeBSD - if [[ ${CHOST} == *-freebsd* ]]; then - dosym bsdtar /bin/tar - dosym bsdtar.1 /usr/share/man/man1/tar.1 - fi - - if use build; then - rm -rf "${D}"/usr - rm -rf "${D}"/lib/*.so* - return 0 - fi - - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir) - gen_usr_ldscript libarchive.so -} diff --git a/app-arch/bsdtar/files/digest-bsdtar-1.3.1-r2 b/app-arch/bsdtar/files/digest-bsdtar-1.3.1-r2 deleted file mode 100644 index 853d5013146e..000000000000 --- a/app-arch/bsdtar/files/digest-bsdtar-1.3.1-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c618d26d680ace57fcd5f59cea3151c6 libarchive-1.3.1.tar.gz 901173 -RMD160 e518f802d9a50afcfede6dd7cbb4f42b2cbe12a1 libarchive-1.3.1.tar.gz 901173 -SHA256 ad9eaf5779df75b9a0618a732eb227792e65db17c6713fe81ef5bff2bbc616a8 libarchive-1.3.1.tar.gz 901173 diff --git a/app-arch/bsdtar/files/digest-bsdtar-2.2.2 b/app-arch/bsdtar/files/digest-bsdtar-2.2.2 deleted file mode 100644 index ab9a7726834e..000000000000 --- a/app-arch/bsdtar/files/digest-bsdtar-2.2.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 0162127d7e71a07eba39c9c3e906c78e libarchive-2.2.2.tar.gz 624581 -RMD160 ca031ddad28553c6a36117ff479d6f08c8208ac5 libarchive-2.2.2.tar.gz 624581 -SHA256 f4c72f147fd1cc4d34670af5c8c947b36d16044c4a9e8f97439dc0a11b84852b libarchive-2.2.2.tar.gz 624581 diff --git a/app-arch/bsdtar/files/libarchive-1.2.53-strict-aliasing.patch b/app-arch/bsdtar/files/libarchive-1.2.53-strict-aliasing.patch deleted file mode 100644 index 7baca0d0ff1f..000000000000 --- a/app-arch/bsdtar/files/libarchive-1.2.53-strict-aliasing.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: libarchive-1.2.53/libarchive/archive_read.c -=================================================================== ---- libarchive-1.2.53.orig/libarchive/archive_read.c -+++ libarchive-1.2.53/libarchive/archive_read.c -@@ -392,7 +392,7 @@ archive_read_data(struct archive *a, voi - while (s > 0) { - if (a->read_data_remaining <= 0) { - r = archive_read_data_block(a, -- (const void **)&a->read_data_block, -+ &a->read_data_block, - &a->read_data_remaining, - &a->read_data_offset); - if (r == ARCHIVE_EOF) -Index: libarchive-1.2.53/libarchive/archive_read_support_compression_bzip2.c -=================================================================== ---- libarchive-1.2.53.orig/libarchive/archive_read_support_compression_bzip2.c -+++ libarchive-1.2.53/libarchive/archive_read_support_compression_bzip2.c -@@ -339,7 +339,7 @@ drive_decompressor(struct archive *a, st - for (;;) { - if (state->stream.avail_in == 0) { - ret = (a->client_reader)(a, a->client_data, -- (const void **)&state->stream.next_in); -+ &state->stream.next_in); - if (ret < 0) { - /* - * TODO: Find a better way to handle -Index: libarchive-1.2.53/libarchive/archive_read_support_compression_compress.c -=================================================================== ---- libarchive-1.2.53.orig/libarchive/archive_read_support_compression_compress.c -+++ libarchive-1.2.53/libarchive/archive_read_support_compression_compress.c -@@ -460,7 +460,7 @@ getbits(struct archive *a, struct privat - while (state->bits_avail < n) { - if (state->avail_in <= 0) { - ret = (a->client_reader)(a, a->client_data, -- (const void **)&state->next_in); -+ &state->next_in); - if (ret < 0) - return (ARCHIVE_FATAL); - if (ret == 0) -Index: libarchive-1.2.53/libarchive/archive_read_support_compression_gzip.c -=================================================================== ---- libarchive-1.2.53.orig/libarchive/archive_read_support_compression_gzip.c -+++ libarchive-1.2.53/libarchive/archive_read_support_compression_gzip.c -@@ -349,7 +349,7 @@ drive_decompressor(struct archive *a, st - for (;;) { - if (state->stream.avail_in == 0) { - ret = (a->client_reader)(a, a->client_data, -- (const void **)&state->stream.next_in); -+ &state->stream.next_in); - if (ret < 0) { - /* - * TODO: Find a better way to handle -Index: libarchive-1.2.53/libarchive/archive_read_support_compression_none.c -=================================================================== ---- libarchive-1.2.53.orig/libarchive/archive_read_support_compression_none.c -+++ libarchive-1.2.53/libarchive/archive_read_support_compression_none.c -@@ -203,7 +203,7 @@ archive_decompressor_none_read_ahead(str - * aren't, hence the cast. - */ - bytes_read = (a->client_reader)(a, a->client_data, -- (const void **)&state->client_buff); -+ &state->client_buff); - if (bytes_read < 0) { /* Read error. */ - state->client_total = state->client_avail = 0; - state->client_next = state->client_buff = NULL; diff --git a/app-arch/bsdtar/files/libarchive-1.2.57-acl.patch b/app-arch/bsdtar/files/libarchive-1.2.57-acl.patch deleted file mode 100644 index 6df561418ba4..000000000000 --- a/app-arch/bsdtar/files/libarchive-1.2.57-acl.patch +++ /dev/null @@ -1,68 +0,0 @@ -Index: libarchive-1.2.57/configure.ac -=================================================================== ---- libarchive-1.2.57.orig/configure.ac -+++ libarchive-1.2.57/configure.ac -@@ -55,7 +55,6 @@ AC_CHECK_TOOL([STRIP],[strip]) - AC_HEADER_STDC - AC_HEADER_DIRENT - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS([attr/xattr.h]) - AC_CHECK_HEADERS([bzlib.h errno.h ext2fs/ext2_fs.h fcntl.h]) - AC_CHECK_HEADERS([inttypes.h langinfo.h limits.h linux/ext2_fs.h]) - # Include inttypes.h into archive.h only if appropriate. -@@ -77,8 +76,6 @@ AC_ARG_ENABLE([static-bsdtar], - AM_CONDITIONAL([STATIC_BSDTAR], [test "x$enable_static_bsdtar" != "xno"]) - - # Checks for libraries. --AC_CHECK_LIB(acl,acl_set_file) --AC_CHECK_LIB(attr,setxattr) - AC_CHECK_LIB(bz2,BZ2_bzDecompressInit) - AC_CHECK_LIB(z,inflate) - -@@ -142,9 +139,8 @@ AC_FUNC_STRERROR_R - AC_FUNC_STRFTIME - AC_FUNC_VPRINTF - AC_CHECK_FUNCS([chflags fchdir fchflags fchmod fchown futimes]) --AC_CHECK_FUNCS([ftruncate getopt_long getxattr]) -+AC_CHECK_FUNCS([ftruncate getopt_long]) - AC_CHECK_FUNCS([lchflags lchmod lchown]) --AC_CHECK_FUNCS([lgetxattr listxattr llistxattr fsetxattr lsetxattr]) - AC_CHECK_FUNCS([lutimes memmove]) - AC_CHECK_FUNCS([memset mkdir mkfifo nl_langinfo reallocf setlocale]) - AC_CHECK_FUNCS([strchr strdup strerror strrchr timegm]) -@@ -182,6 +178,16 @@ AC_CHECK_MEMBER(struct dirent.d_namlen,, - #endif - ]) - -+# Check for Extended Attributes support -+AC_ARG_ENABLE([xattr], -+ AS_HELP_STRING([--disable-xattr], [Enable Extended Attributes support (default: check)])) -+ -+if test "x$enable_xattr" != "xno"; then -+ AC_CHECK_HEADERS([attr/xattr.h]) -+ AC_CHECK_LIB(attr,setxattr) -+ AC_CHECK_FUNCS([getxattr lgetxattr listxattr llistxattr fsetxattr lsetxattr]) -+fi -+ - # Check for ACL support - # - # The ACL support in libarchive is written against the POSIX1e draft, -@@ -189,6 +195,10 @@ AC_CHECK_MEMBER(struct dirent.d_namlen,, - # platforms. Worse, some systems have completely non-POSIX acl functions, - # which makes the following checks rather more complex than I would like. - # -+AC_ARG_ENABLE([acl], -+ AS_HELP_STRING([--disable-acl], [Enable ACL support (default: check)])) -+ -+if test "x$enable_acl" != "xno"; then - AC_CHECK_HEADERS([sys/acl.h]) - AC_CHECK_LIB([acl],[acl_get_file]) - AC_CHECK_FUNCS([acl_create_entry acl_init acl_set_fd acl_set_fd_np acl_set_file]) -@@ -222,6 +232,7 @@ AC_CHECK_DECL([ACL_USER], - [AC_DEFINE(HAVE_ACL_USER, 1, [True for systems with POSIX ACL support])], - [], - [#include <sys/acl.h>]) -+fi - - # Additional requirements - AC_SYS_LARGEFILE diff --git a/app-arch/bsdtar/files/libarchive-1.3.1-infiniteloop.patch b/app-arch/bsdtar/files/libarchive-1.3.1-infiniteloop.patch deleted file mode 100644 index 20c4c8f2688a..000000000000 --- a/app-arch/bsdtar/files/libarchive-1.3.1-infiniteloop.patch +++ /dev/null @@ -1,55 +0,0 @@ -Index: lib/libarchive/archive_read_support_compression_none.c -=================================================================== -RCS file: /home/ncvs/src/lib/libarchive/archive_read_support_compression_none.c,v -retrieving revision 1.8 -diff -u -I__FBSDID -r1.8 archive_read_support_compression_none.c ---- lib/libarchive/archive_read_support_compression_none.c 29 Aug 2006 04:59:25 -0000 1.8 -+++ lib/libarchive/archive_read_support_compression_none.c 2 Nov 2006 05:17:28 -0000 -@@ -257,7 +257,9 @@ - } - - /* -- * Skip at most request bytes. Skipped data is marked as consumed. -+ * Skip forward by exactly the requested bytes or else return -+ * ARCHIVE_FATAL. Note that this differs from the contract for -+ * read_ahead, which does not gaurantee a minimum count. - */ - static ssize_t - archive_decompressor_none_skip(struct archive *a, size_t request) -@@ -287,9 +289,7 @@ - if (request == 0) - return (total_bytes_skipped); - /* -- * If no client_skipper is provided, just read the old way. It is very -- * likely that after skipping, the request has not yet been fully -- * satisfied (and is still > 0). In that case, read as well. -+ * If a client_skipper was provided, try that first. - */ - if (a->client_skipper != NULL) { - bytes_skipped = (a->client_skipper)(a, a->client_data, -@@ -307,6 +307,12 @@ - a->raw_position += bytes_skipped; - state->client_avail = state->client_total = 0; - } -+ /* -+ * Note that client_skipper will usually not satisfy the -+ * full request (due to low-level blocking concerns), -+ * so even if client_skipper is provided, we may still -+ * have to use ordinary reads to finish out the request. -+ */ - while (request > 0) { - const void* dummy_buffer; - ssize_t bytes_read; -@@ -314,6 +320,12 @@ - &dummy_buffer, request); - if (bytes_read < 0) - return (bytes_read); -+ if (bytes_read == 0) { -+ /* We hit EOF before we satisfied the skip request. */ -+ archive_set_error(a, ARCHIVE_ERRNO_MISC, -+ "Truncated input file (need to skip %d bytes)", (int)request); -+ return (ARCHIVE_FATAL); -+ } - assert(bytes_read >= 0); /* precondition for cast below */ - min = minimum((size_t)bytes_read, request); - bytes_read = archive_decompressor_none_read_consume(a, min); |