From b52685db5e41e7b33ddf9ed91781faec65f45f3b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sun, 18 Jun 2006 00:31:40 +0000 Subject: [PATCH] Add patch to fix strict-aliasing. Package-Manager: portage-2.1.1_pre1 --- app-arch/bsdtar/ChangeLog | 8 ++- app-arch/bsdtar/Manifest | 29 ++++++-- app-arch/bsdtar/bsdtar-1.2.53-r1.ebuild | 70 +++++++++++++++++++ app-arch/bsdtar/files/digest-bsdtar-1.2.53-r1 | 3 + .../libarchive-1.2.53-strict-aliasing.patch | 65 +++++++++++++++++ 5 files changed, 170 insertions(+), 5 deletions(-) create mode 100644 app-arch/bsdtar/bsdtar-1.2.53-r1.ebuild create mode 100644 app-arch/bsdtar/files/digest-bsdtar-1.2.53-r1 create mode 100644 app-arch/bsdtar/files/libarchive-1.2.53-strict-aliasing.patch diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog index af649974d43c..56c4143c6690 100644 --- a/app-arch/bsdtar/ChangeLog +++ b/app-arch/bsdtar/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-arch/bsdtar # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.29 2006/06/09 20:15:28 exg Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.30 2006/06/18 00:31:40 flameeyes Exp $ + +*bsdtar-1.2.53-r1 (18 Jun 2006) + + 18 Jun 2006; Diego Pettenò + +files/libarchive-1.2.53-strict-aliasing.patch, +bsdtar-1.2.53-r1.ebuild: + Add patch to fix strict-aliasing. 09 Jun 2006; Emanuele Giaquinta bsdtar-1.2.53.ebuild: Simplify test for static, no need to special case darwin. diff --git a/app-arch/bsdtar/Manifest b/app-arch/bsdtar/Manifest index 3a413287c353..0738bd713b2f 100644 --- a/app-arch/bsdtar/Manifest +++ b/app-arch/bsdtar/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX libarchive-1.2.51-acl.patch 2740 RMD160 307439bd45948f57c68aaa581ee2728ba9582b2a SHA1 30476981d9c4861cfbef07d4288665861e135aeb SHA256 9953e4ecfd7c905920a48ae66d35bf901f8ba89765a8b51c51065c1c01a15ec2 MD5 1728ebab5ae7315f1ca463ab5448474c files/libarchive-1.2.51-acl.patch 2740 RMD160 307439bd45948f57c68aaa581ee2728ba9582b2a files/libarchive-1.2.51-acl.patch 2740 @@ -6,15 +9,23 @@ AUX libarchive-1.2.51-linking.patch 1234 RMD160 ace6aed10691c0cf240bc2f76f8182ff MD5 70231828a2a2269c2f912708d80226ed files/libarchive-1.2.51-linking.patch 1234 RMD160 ace6aed10691c0cf240bc2f76f8182ffcbb5a3be files/libarchive-1.2.51-linking.patch 1234 SHA256 88095bb5782102108f3048d900b23fe7746ae5fb881b268463bdbcf3512964a7 files/libarchive-1.2.51-linking.patch 1234 +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 DIST libarchive-1.2.53.tar.gz 522540 RMD160 651d5b93d36b2a2c3f3cb781669e368e83a73964 SHA1 24c960b57ac7502944c95daedf265a333ee347af SHA256 7ea32dcf542471d48464bad4e408fbb3b7dbea7d6594a01df73236ae3dc378e8 +EBUILD bsdtar-1.2.53-r1.ebuild 1626 RMD160 944fd0f2dc57af24636357b3938250f1227801da SHA1 b3392ef38a25592b112c0918a5886de961b56544 SHA256 653bde0607e7fe1db642612284ddeec997a17180b7ceaf80563e2f64259a624b +MD5 a0c7e894f0cbb968d72131deb4fa0c5c bsdtar-1.2.53-r1.ebuild 1626 +RMD160 944fd0f2dc57af24636357b3938250f1227801da bsdtar-1.2.53-r1.ebuild 1626 +SHA256 653bde0607e7fe1db642612284ddeec997a17180b7ceaf80563e2f64259a624b bsdtar-1.2.53-r1.ebuild 1626 EBUILD bsdtar-1.2.53.ebuild 1553 RMD160 c8e6c554266f156d673e8f2d0a1b4bdc43af6523 SHA1 1ac49f337bc60477d345c9345fc4dd943dae0d82 SHA256 d088f472d3f42a805ba5f7e42456478375d2251a0ebf14f63fa9a37a89ea4ed9 MD5 7681e71b67ad1a92b9f1fa5f42dfcf0f bsdtar-1.2.53.ebuild 1553 RMD160 c8e6c554266f156d673e8f2d0a1b4bdc43af6523 bsdtar-1.2.53.ebuild 1553 SHA256 d088f472d3f42a805ba5f7e42456478375d2251a0ebf14f63fa9a37a89ea4ed9 bsdtar-1.2.53.ebuild 1553 -MISC ChangeLog 5265 RMD160 0275a74c5f2a222707548e31467fba46ee08e17c SHA1 f5b518781f8bc86daa5e1403ff0b047b714c06c0 SHA256 6cd0755490e1aaa42604bf3d7cc3f470991ed41c2440652c5f4f0349e339a656 -MD5 154e44d9c4d75473d368d198cd6840a9 ChangeLog 5265 -RMD160 0275a74c5f2a222707548e31467fba46ee08e17c ChangeLog 5265 -SHA256 6cd0755490e1aaa42604bf3d7cc3f470991ed41c2440652c5f4f0349e339a656 ChangeLog 5265 +MISC ChangeLog 5470 RMD160 434177692a7c7b4a6f273955d736835feeda124c SHA1 fa5b9981ee43222be36d3a6e9a2bfea7c6d4ee01 SHA256 7002f6818adc1ed632547153be353a4e7a76318a878ec6e638c4518a3c89fa9d +MD5 ad2034b0e9bcf1b72fe8aca6892c56b1 ChangeLog 5470 +RMD160 434177692a7c7b4a6f273955d736835feeda124c ChangeLog 5470 +SHA256 7002f6818adc1ed632547153be353a4e7a76318a878ec6e638c4518a3c89fa9d ChangeLog 5470 MISC metadata.xml 428 RMD160 b1ff6b3d84ad489dc4f5ab5f1d9ee9b60266c2ff SHA1 a45d1c0b222b298767f08a2df8d4d84fdecc8434 SHA256 236fee13551e3785be53bd3f70c0784803827edf245c913851f239689e3278f4 MD5 afec809b169074e5d5b0803e4f8f5ec8 metadata.xml 428 RMD160 b1ff6b3d84ad489dc4f5ab5f1d9ee9b60266c2ff metadata.xml 428 @@ -22,3 +33,13 @@ SHA256 236fee13551e3785be53bd3f70c0784803827edf245c913851f239689e3278f4 metadata MD5 72610f8c99a21763a948e9a145bdbab9 files/digest-bsdtar-1.2.53 253 RMD160 07410a6b17c6336da8b8b3f56e6148046a660023 files/digest-bsdtar-1.2.53 253 SHA256 201b8a1f8f7573230fb2d6570235725889268096f6ef0643bfa794c055dd2d39 files/digest-bsdtar-1.2.53 253 +MD5 72610f8c99a21763a948e9a145bdbab9 files/digest-bsdtar-1.2.53-r1 253 +RMD160 07410a6b17c6336da8b8b3f56e6148046a660023 files/digest-bsdtar-1.2.53-r1 253 +SHA256 201b8a1f8f7573230fb2d6570235725889268096f6ef0643bfa794c055dd2d39 files/digest-bsdtar-1.2.53-r1 253 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFElJ70AiZjviIA2XgRAoL0AJ94zG58+EQj0vtkBokNTPqWGbIMZwCg4Q3j +3RrmvzElNzH+NOR0ahdI/Ss= +=b5ZV +-----END PGP SIGNATURE----- diff --git a/app-arch/bsdtar/bsdtar-1.2.53-r1.ebuild b/app-arch/bsdtar/bsdtar-1.2.53-r1.ebuild new file mode 100644 index 000000000000..ac5767cb1850 --- /dev/null +++ b/app-arch/bsdtar/bsdtar-1.2.53-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-1.2.53-r1.ebuild,v 1.1 2006/06/18 00:31:40 flameeyes Exp $ + +inherit eutils autotools + +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 ~ppc-macos ~x86 ~x86-fbsd" +IUSE="build static acl xattr" + +RDEPEND="!dev-libs/libarchive + kernel_linux? ( + acl? ( sys-apps/acl ) + xattr? ( sys-apps/attr ) + )" +DEPEND="kernel_linux? ( sys-fs/e2fsprogs + virtual/os-headers )" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + cd ${S} + + epatch "${FILESDIR}/libarchive-1.2.51-linking.patch" + epatch "${FILESDIR}/libarchive-1.2.51-acl.patch" + epatch "${FILESDIR}/libarchive-1.2.53-strict-aliasing.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 DESTDIR="${D}" install + + # Create tar symlink for FreeBSD + if [[ ${CHOST} == *-freebsd* ]]; then + dosym bsdtar /bin/tar + dosym bsdtar.1.gz /usr/share/man/man1/tar.1.gz + fi + + if [[ ${CHOST} != *-darwin* ]]; then + dodir /$(get_libdir) + mv ${D}/usr/$(get_libdir)/*.so* ${D}/$(get_libdir) + gen_usr_ldscript libarchive.so + fi +} diff --git a/app-arch/bsdtar/files/digest-bsdtar-1.2.53-r1 b/app-arch/bsdtar/files/digest-bsdtar-1.2.53-r1 new file mode 100644 index 000000000000..7b03a0a89983 --- /dev/null +++ b/app-arch/bsdtar/files/digest-bsdtar-1.2.53-r1 @@ -0,0 +1,3 @@ +MD5 2e2df461fef05049b3a92e5bedc2de2c libarchive-1.2.53.tar.gz 522540 +RMD160 651d5b93d36b2a2c3f3cb781669e368e83a73964 libarchive-1.2.53.tar.gz 522540 +SHA256 7ea32dcf542471d48464bad4e408fbb3b7dbea7d6594a01df73236ae3dc378e8 libarchive-1.2.53.tar.gz 522540 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 new file mode 100644 index 000000000000..7baca0d0ff1f --- /dev/null +++ b/app-arch/bsdtar/files/libarchive-1.2.53-strict-aliasing.patch @@ -0,0 +1,65 @@ +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; -- 2.26.2