From: Timothy Redaelli Date: Tue, 17 Apr 2007 20:32:15 +0000 (+0000) Subject: Version bump, updated acl patch X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d9fc2f56dadc2b7e9453381f761b5f000eb9e83;p=gentoo.git Version bump, updated acl patch Package-Manager: portage-2.1.2.3 --- diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog index 1c7164269785..058a20cd6971 100644 --- a/app-arch/bsdtar/ChangeLog +++ b/app-arch/bsdtar/ChangeLog @@ -1,6 +1,12 @@ # 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.62 2007/04/15 15:17:50 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.63 2007/04/17 20:32:15 drizzt Exp $ + +*bsdtar-2.1.5 (17 Apr 2007) + + 17 Apr 2007; Timothy Redaelli + +files/libarchive-2.1.5-acl.patch, +bsdtar-2.1.5.ebuild: + Version bump, updated acl patch *bsdtar-2.0.31 (15 Apr 2007) diff --git a/app-arch/bsdtar/Manifest b/app-arch/bsdtar/Manifest index 4603fa640d98..60f1f5b4e2d6 100644 --- a/app-arch/bsdtar/Manifest +++ b/app-arch/bsdtar/Manifest @@ -21,12 +21,17 @@ AUX libarchive-2.0b6-acl.patch 2533 RMD160 5f9aaab92f184379cf3255432db97347125cf MD5 f4cc3b69187c53fc80574147f90b3134 files/libarchive-2.0b6-acl.patch 2533 RMD160 5f9aaab92f184379cf3255432db97347125cfef0 files/libarchive-2.0b6-acl.patch 2533 SHA256 05baba3fbda9a89db562ae18fc1c88f570093988ab374391f50944fe52481319 files/libarchive-2.0b6-acl.patch 2533 +AUX libarchive-2.1.5-acl.patch 2310 RMD160 829e44e2375f35a2f721bc66c98d01bf74d701c8 SHA1 bda71f9e3b0f027d7f7edcab37dd704cb6fc61b7 SHA256 0dfbfef839f20be89cfb402d94a59d3e669bebea35e4b8c706e3b57a2b9e6c9f +MD5 80edcf63f106b0c2cf976ac28ba184b1 files/libarchive-2.1.5-acl.patch 2310 +RMD160 829e44e2375f35a2f721bc66c98d01bf74d701c8 files/libarchive-2.1.5-acl.patch 2310 +SHA256 0dfbfef839f20be89cfb402d94a59d3e669bebea35e4b8c706e3b57a2b9e6c9f files/libarchive-2.1.5-acl.patch 2310 DIST libarchive-1.3.1.tar.gz 901173 RMD160 e518f802d9a50afcfede6dd7cbb4f42b2cbe12a1 SHA1 aed6eda15b012adbb88af0f0d76887920ffe7bbf SHA256 ad9eaf5779df75b9a0618a732eb227792e65db17c6713fe81ef5bff2bbc616a8 DIST libarchive-2.0.20.tar.gz 566980 RMD160 cdd7368982f96524dd2315106e7c74a2a18920ac SHA1 d33e399547cebf075057091c16d51834eed01571 SHA256 ff846d4f8be27c7f2efcf3e26f56f91347c88b289bab31f65fada7093f879c1f DIST libarchive-2.0.24.tar.gz 574114 RMD160 81f6fc4074c017e6139d7330b9c92594a8c59a0e SHA1 569776e5516c8fb99dca247ff57eb37ac26a44e7 SHA256 2d233e4191fde110a4dadcdff33016f027d2942658f273f6f10ee59f5112db94 DIST libarchive-2.0.25.tar.gz 574428 RMD160 d699cb9612bba7a71616ce95d39986d34d93dd0b SHA1 d1f28baf34f73e6ada73cd85c4577e6cedfac905 SHA256 76068ac0f426e1bf565086f57e13ef2c705c2a06dd4a6044053a26dc95d51e44 DIST libarchive-2.0.28.tar.gz 587038 RMD160 800d43826bfcc9f1caf05a564ac0dedcb1e04ff8 SHA1 b321a930bf3ccf22cc3bfb944ddfaefa10374280 SHA256 8c543ee180aa0b3d2c045e0f5301cece5346f374ab972f1ca6502e18550798d6 DIST libarchive-2.0.31.tar.gz 602844 RMD160 11a67ff388a02cf2d570df1a0576ead91570e6b6 SHA1 07a455ad4a9fb4ba37a33675693bc5a56fb67393 SHA256 ee661b2c5ef7e19930834e047acd247f83d019af46ded1c7016bf747b0eeb9df +DIST libarchive-2.1.5.tar.gz 613462 RMD160 79db55906c34db90b765e80aa8ea9a7fabdc1d2b SHA1 5a4997032a15c4f621989122b9052a56489bc182 SHA256 e6bb256d3400be1cfff62ca70420e45706b47b546e4dbf682c101cfa1d42152f 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 @@ -51,10 +56,14 @@ EBUILD bsdtar-2.0.31.ebuild 1881 RMD160 d32d938e4bef21fa217be1e8f34cc57499afac29 MD5 70b95fa05d0d7d5ed27b2ea1a469e267 bsdtar-2.0.31.ebuild 1881 RMD160 d32d938e4bef21fa217be1e8f34cc57499afac29 bsdtar-2.0.31.ebuild 1881 SHA256 4a9dc83cf80a38215e4bb9bafa6e40793f5c34a4d742e257860e227c99912ebd bsdtar-2.0.31.ebuild 1881 -MISC ChangeLog 10912 RMD160 617a673de2bde208b95ff66f867b810dac9fc5d4 SHA1 d9b8fd2d4f04a84d2d374a40c65d1af96286c896 SHA256 5b8bafb8743673e8418c82b1245f9de6cc7e7a23be0c64d046befb100f65a55d -MD5 21ff3b91f1e8966994406a0c7052e4a5 ChangeLog 10912 -RMD160 617a673de2bde208b95ff66f867b810dac9fc5d4 ChangeLog 10912 -SHA256 5b8bafb8743673e8418c82b1245f9de6cc7e7a23be0c64d046befb100f65a55d ChangeLog 10912 +EBUILD bsdtar-2.1.5.ebuild 1880 RMD160 28c2689cfba47530f1fc1701588c8a87e81570ed SHA1 1679f8686a02fb2dfbb6f9cdadf1ccad373e8c28 SHA256 3454da62fc01d168d0e9a1a673303522905044793300aedf83de2728857002c5 +MD5 b5c061aa4a196cbd402540f929349712 bsdtar-2.1.5.ebuild 1880 +RMD160 28c2689cfba47530f1fc1701588c8a87e81570ed bsdtar-2.1.5.ebuild 1880 +SHA256 3454da62fc01d168d0e9a1a673303522905044793300aedf83de2728857002c5 bsdtar-2.1.5.ebuild 1880 +MISC ChangeLog 11087 RMD160 7f157f8f09e557604fffa54547ce0d7449ffeb08 SHA1 701cd6eb91fcd74e54f1c708f589ad143693ce55 SHA256 203376627ae18202f045d563af8a4d39f66aae0fde0009e1713b7a697a8d3997 +MD5 d071fd4fcc8bcc8001b663170b16e4c0 ChangeLog 11087 +RMD160 7f157f8f09e557604fffa54547ce0d7449ffeb08 ChangeLog 11087 +SHA256 203376627ae18202f045d563af8a4d39f66aae0fde0009e1713b7a697a8d3997 ChangeLog 11087 MISC metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 SHA1 c32d51164489ed68a27016c26aafae04b70ee447 SHA256 c82266892e94c9792cadf25c0ba9c4cf42d5279903e791b80e8f735ec91d923b MD5 abbe0170afef9b0f317830b41e537afa metadata.xml 337 RMD160 31dad5aaff39f6017382ea7c4f77ac229793c487 metadata.xml 337 @@ -77,10 +86,13 @@ SHA256 2a011173a31e3e27b36388a70063caa0bd85eb71956420efa5d88475b604db8d files/di 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 7a3c444e5a6ecc4e15dd7f20b426cfc2 files/digest-bsdtar-2.1.5 250 +RMD160 a03e67e8f36cbe18bdb683bf202bc010b197772c files/digest-bsdtar-2.1.5 250 +SHA256 1d2ad41ffe36ba0586564214e4b70b6565e15e5005d6ed5bcd3638104f7083ae files/digest-bsdtar-2.1.5 250 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGIkIkjJyKLBkBVroRAkz4AJ40uPiyPd7KgJJDblrSyzwmMgF0vQCgpP9A -crZu2TkhqbO7JD2xCitmCto= -=mGHv +iD8DBQFGJS7VjJyKLBkBVroRAv1NAJ0d9bd918OdI4KkMGIOEdWDhpaCMQCfcAUe +tGP6/WZIhh4FHeNDN7LYtxw= +=VWmD -----END PGP SIGNATURE----- diff --git a/app-arch/bsdtar/bsdtar-2.1.5.ebuild b/app-arch/bsdtar/bsdtar-2.1.5.ebuild new file mode 100644 index 000000000000..046b384cd16e --- /dev/null +++ b/app-arch/bsdtar/bsdtar-2.1.5.ebuild @@ -0,0 +1,82 @@ +# 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.1.5.ebuild,v 1.1 2007/04/17 20:32:15 drizzt 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-1.3.1-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-2.1.5 b/app-arch/bsdtar/files/digest-bsdtar-2.1.5 new file mode 100644 index 000000000000..bd76db209904 --- /dev/null +++ b/app-arch/bsdtar/files/digest-bsdtar-2.1.5 @@ -0,0 +1,3 @@ +MD5 3b80172ae0169babaae5e20822cf3d25 libarchive-2.1.5.tar.gz 613462 +RMD160 79db55906c34db90b765e80aa8ea9a7fabdc1d2b libarchive-2.1.5.tar.gz 613462 +SHA256 e6bb256d3400be1cfff62ca70420e45706b47b546e4dbf682c101cfa1d42152f libarchive-2.1.5.tar.gz 613462 diff --git a/app-arch/bsdtar/files/libarchive-2.1.5-acl.patch b/app-arch/bsdtar/files/libarchive-2.1.5-acl.patch new file mode 100644 index 000000000000..40cac5b35166 --- /dev/null +++ b/app-arch/bsdtar/files/libarchive-2.1.5-acl.patch @@ -0,0 +1,66 @@ +--- configure.ac.orig 2007-04-17 22:18:39.000000000 +0200 ++++ configure.ac 2007-04-17 22:22:17.000000000 +0200 +@@ -56,7 +56,6 @@ + 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 grp.h]) + AC_CHECK_HEADERS([inttypes.h langinfo.h limits.h linux/ext2_fs.h linux/fs.h]) + # Include inttypes.h into archive.h only if appropriate. +@@ -79,8 +78,6 @@ + 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) + +@@ -148,9 +145,8 @@ + 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 memset mkdir mkfifo]) + AC_CHECK_FUNCS([nl_langinfo poll reallocf select setlocale]) + AC_CHECK_FUNCS([strchr strdup strerror strrchr timegm utime utimes]) +@@ -189,6 +185,16 @@ + #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, +@@ -196,6 +202,10 @@ + # 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]) +@@ -229,6 +239,7 @@ + [AC_DEFINE(HAVE_ACL_USER, 1, [True for systems with POSIX ACL support])], + [], + [#include ]) ++fi + + # Additional requirements + AC_SYS_LARGEFILE