diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-03-15 14:04:00 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-03-15 14:04:00 +0000 |
commit | 5f148ffc8a335fdaed11e2db0a87cb5f68f47f35 (patch) | |
tree | 9c688eec9fb8571712a249d3ed6a9913177a00a3 /app-arch/libarchive/files | |
parent | Version bump, some patches are now finally upstream. (diff) | |
download | gentoo-2-5f148ffc8a335fdaed11e2db0a87cb5f68f47f35.tar.gz gentoo-2-5f148ffc8a335fdaed11e2db0a87cb5f68f47f35.tar.bz2 gentoo-2-5f148ffc8a335fdaed11e2db0a87cb5f68f47f35.zip |
Version bump.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-arch/libarchive/files')
-rw-r--r-- | app-arch/libarchive/files/libarchive-2.8.1+openssl.patch | 66 |
1 files changed, 0 insertions, 66 deletions
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 <joerg.sonnenberger@2e22974a-a639-11dd-bc7a-dd6b2ed99ab5> -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 - |