From a0d10e7e408ddc5d5ed7d25e274d5f81731a6353 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Mon, 15 Mar 2010 14:04:00 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- app-arch/libarchive/ChangeLog | 9 ++- app-arch/libarchive/Manifest | 13 ++-- .../files/libarchive-2.8.1+openssl.patch | 66 ------------------- ...e-2.8.1.ebuild => libarchive-2.8.3.ebuild} | 6 +- 4 files changed, 16 insertions(+), 78 deletions(-) delete mode 100644 app-arch/libarchive/files/libarchive-2.8.1+openssl.patch rename app-arch/libarchive/{libarchive-2.8.1.ebuild => libarchive-2.8.3.ebuild} (93%) diff --git a/app-arch/libarchive/ChangeLog b/app-arch/libarchive/ChangeLog index 478048b9d8a9..50758820b62a 100644 --- a/app-arch/libarchive/ChangeLog +++ b/app-arch/libarchive/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/libarchive # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.78 2010/03/07 18:18:32 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/ChangeLog,v 1.79 2010/03/15 14:03:59 flameeyes Exp $ + +*libarchive-2.8.3 (15 Mar 2010) + + 15 Mar 2010; Diego E. Pettenò + -libarchive-2.8.1.ebuild, -files/libarchive-2.8.1+openssl.patch, + +libarchive-2.8.3.ebuild: + Version bump. *libarchive-2.8.1 (07 Mar 2010) diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest index 082b2af4626b..b6ba8ba3beb3 100644 --- a/app-arch/libarchive/Manifest +++ b/app-arch/libarchive/Manifest @@ -1,19 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX libarchive-2.8.1+openssl.patch 2776 RMD160 5667ddf9555ed9d6e375b31a0aa4d6874e7b4a86 SHA1 0ed4d556553b4f560da583c545bedb5b2bfd258d SHA256 2e8c57fa8ee1ff39b0ce54e9eabd426ca9fe9c1140223609d21673049ae20ec2 DIST libarchive-2.7.1.tar.gz 1248222 RMD160 7a0b5747569452f015e94e54afa90ca85dfd7cca SHA1 3810ded09b2d248eab9754d008f0cf144f27848d SHA256 a7e066ef857d3db0211e2d916ca14aafc48a4776c4fa108fd67092ce862a7ba8 DIST libarchive-2.8.0.tar.gz 1437217 RMD160 e49abd391e58ccbdc441670bb1a59752ecba406b SHA1 b29d47aac4efd66d89e581585e17644a3c77c5cf SHA256 e5be324c94e885e449b8ffb30a843372d557966547efff3f1d5f69eb5a119769 -DIST libarchive-2.8.1.tar.gz 1438009 RMD160 3028dfe7fd306d3246f61894587f4e26fd5cee73 SHA1 7054dacbc37af865e665065d92f7093bedc311f4 SHA256 bb15c5694c2d7909b235a88c8c4fc5f5beb01931db77981e815da2dfa564a1ca +DIST libarchive-2.8.3.tar.gz 1438099 RMD160 7c77a87cdfc096417f67182bfc74141eab61aea4 SHA1 e0634a326cce2b46c8dc637de84d7556257e59e0 SHA256 16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a EBUILD libarchive-2.7.1-r1.ebuild 2508 RMD160 b6e61573852707f1470cda8f27d63f7102289783 SHA1 a375be3e1219f039503bea7ed736666112992022 SHA256 abab36a53e696f47ae9f1f95396193de08bbec5c82a0d8783ea5c0d5b6753a4a EBUILD libarchive-2.8.0.ebuild 2636 RMD160 20641297a6f34caa8f99dfa98e815a099a553b18 SHA1 007cd076d6cd8a55bf941f11c160d3f1ba0d0d83 SHA256 a2909394cf5ad522cc2d51f40affb237d2fcec0212d5abe6c6df3f514920c9c3 -EBUILD libarchive-2.8.1.ebuild 2700 RMD160 56d682dabeb06727dc9377b5d0d2518e66ba5ded SHA1 48a38116694ac1083468af593cfde584ba6e28d4 SHA256 1f0a01aeb1424cf5c4acc0fe1962d73a9487e332b0eb6b3aa37765a414aea22a -MISC ChangeLog 25481 RMD160 83cb7d9715b46177b51991654b064ee99a33b23a SHA1 4c6238c922d9ccbe5458284edeae96bdf285566a SHA256 754f558996e7b7f9c4887b16d13d48e7f6599939a2b8487cfa5fd350f0df6f32 +EBUILD libarchive-2.8.3.ebuild 2636 RMD160 6e2e830bed0674ef88ea130f9fcb264978836d90 SHA1 f96420956575de3bfb6a378b6650aeee7f1acd86 SHA256 2ad1c045fd9572055a702b08d748eaf3f0a68503865f7ad382d707b1c11df128 +MISC ChangeLog 25682 RMD160 670691905981c6fb7e9eb9896ab78ce57f587981 SHA1 cf660f23f87c64cecb82f61479db997558aac1a8 SHA256 e80f71ec11ffcdb6d6bcb199aef97f4454f5f46d79e301a84470a5922c775ea3 MISC metadata.xml 1845 RMD160 ebaeeeb4cb7f3c67ef467f51325eee01e736abbe SHA1 ac5a67d2b4aeda593a482c68b5e91bd280e03d81 SHA256 a7d0423f9f20913e7eb763301312de583551f75db9597df2724a22684d800843 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuT7gAACgkQAiZjviIA2Xg3kACgpD17D94wcnat8TW7WF5jzUNF -arcAoOPzzETCJwO853mcO5EnJKDLQGRe -=dkke +iEYEARECAAYFAkuePlAACgkQAiZjviIA2XihjACgykc3cRhkCmTNyjqJgHmfkBix +1v0AnjfcVewupVq3n9hf0ctNGcM0TFRH +=APPy -----END PGP SIGNATURE----- diff --git a/app-arch/libarchive/files/libarchive-2.8.1+openssl.patch b/app-arch/libarchive/files/libarchive-2.8.1+openssl.patch deleted file mode 100644 index 895fcbcd564a..000000000000 --- a/app-arch/libarchive/files/libarchive-2.8.1+openssl.patch +++ /dev/null @@ -1,66 +0,0 @@ -commit 18311d1be81d93350a406b641d501e3ced5a2662 -Author: joerg.sonnenberger -Date: Sun Feb 21 14:23:09 2010 +0000 - - Improve detection of SHA2 functions in OpenSSL to deal with ancient - versions like in Mac OS X and FreeBSD 6.x. Fixes #65 and should fix #55. - - - git-svn-id: http://libarchive.googlecode.com/svn/trunk@1940 2e22974a-a639-11dd-bc7a-dd6b2ed99ab5 - -diff --git a/configure.ac b/configure.ac -index 45960ad..921ed87 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -281,30 +281,34 @@ if test "x$with_openssl" != "xno"; then - AC_CHECK_HEADERS([openssl/sha.h]) - AC_SEARCH_LIBS([SHA1_Init], [crypto]) - fi -- if test "$ac_cv_func_SHA256Init" != "yes" || -- test "$ac_cv_func_SHA384Init" != "yes" || -- test "$ac_cv_func_SHA512Init" != "yes"; then -- if test "$ac_cv_func_SHA256_Init" != "yes" || -- test "$ac_cv_func_SHA384_Init" != "yes" || -- test "$ac_cv_func_SHA512_Init" != "yes"; then -- AC_CHECK_HEADERS([openssl/sha.h]) -- # TODO: Does AC_SEARCH_LIBS support more than one function at once? -- # This appears to always fail. -- AC_SEARCH_LIBS([SHA256_Init SHA384_Init SHA512_Init], [crypto]) -- -- # TODO: Actually test for these. Previously our C code did not -- # test for these at all and just assumed availability. Now that -- # the C code tests these macros we preserve previous behavior -- # for the autotools build by hard-coding availability. -- if test "$ac_cv_header_openssl_sha_h" = "yes"; then -+ -+ AC_CHECK_HEADERS([openssl/sha.h]) -+ if test "$ac_cv_func_SHA256Init" != "yes" && -+ test "$ac_cv_func_SHA256_Init" != "yes"; then -+ AC_SEARCH_LIBS([SHA256_Init], [crypto]) -+ if test "$ac_cv_func_SHA256_Init" = "yes" && -+ test "$ac_cv_header_openssl_sha_h" = "yes"; then - AC_DEFINE(HAVE_OPENSSL_SHA256_INIT, 1, - [Define to 1 if your openssl has the `SHA256_Init' function.]) -+ fi -+ fi -+ if test "$ac_cv_func_SHA384Init" != "yes" && -+ test "$ac_cv_func_SHA384_Init" != "yes"; then -+ AC_SEARCH_LIBS([SHA384_Init], [crypto]) -+ if test "$ac_cv_func_SHA384_Init" = "yes" && -+ test "$ac_cv_header_openssl_sha_h" = "yes"; then - AC_DEFINE(HAVE_OPENSSL_SHA384_INIT, 1, - [Define to 1 if your openssl has the `SHA384_Init' function.]) -+ fi -+ fi -+ if test "$ac_cv_func_SHA512Init" != "yes" && -+ test "$ac_cv_func_SHA512_Init" != "yes"; then -+ AC_SEARCH_LIBS([SHA512_Init], [crypto]) -+ if test "$ac_cv_func_SHA512_Init" = "yes" && -+ test "$ac_cv_header_openssl_sha_h" = "yes"; then - AC_DEFINE(HAVE_OPENSSL_SHA512_INIT, 1, - [Define to 1 if your openssl has the `SHA512_Init' function.]) - fi -- fi - fi - fi - diff --git a/app-arch/libarchive/libarchive-2.8.1.ebuild b/app-arch/libarchive/libarchive-2.8.3.ebuild similarity index 93% rename from app-arch/libarchive/libarchive-2.8.1.ebuild rename to app-arch/libarchive/libarchive-2.8.3.ebuild index 15550e007302..4512ad6b723c 100644 --- a/app-arch/libarchive/libarchive-2.8.1.ebuild +++ b/app-arch/libarchive/libarchive-2.8.3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.1.ebuild,v 1.1 2010/03/07 18:18:32 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/libarchive/libarchive-2.8.3.ebuild,v 1.1 2010/03/15 14:03:59 flameeyes Exp $ EAPI="2" -inherit eutils libtool toolchain-funcs flag-o-matic autotools +inherit eutils libtool toolchain-funcs flag-o-matic DESCRIPTION="BSD tar command" HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive" @@ -31,8 +31,6 @@ DEPEND="${RDEPEND} virtual/os-headers )" src_prepare() { - epatch "${FILESDIR}/${P}+openssl.patch" - eautoreconf elibtoolize epunt_cxx } -- 2.26.2