Fix build with metalink + gnutls, bug 428592. Cleaned out unused patch files.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

8 files changed, 167 insertions, 88 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 09e2876e3142..48fa4a59ce46 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.239 2012/08/06 13:45:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.240 2012/08/07 12:38:58 blueness Exp $
+
+  07 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  -files/curl-respect-cflags-2.patch,
+  -files/curl-7.20.0-fix-nettle-include.patch, curl-7.27.0-r2.ebuild,
+  +files/curl-7.27.0-fix-metalink-gnutls.patch,
+  +files/curl-7.27.0-fix-nettle-include.patch, -files/config.h.ed,
+  -files/curlbuild.h.ed:
+  Fix build with metalink + gnutls, bug 428592. Cleaned out unused patch files.
 
   06 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
   +files/curl-7.20.0-fix-nettle-include.patch, curl-7.27.0-r2.ebuild:
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index e6599853591e..82fc0dc754f0 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX config.h.ed 501 SHA256 ab7941abb65756bc18dac7310e413ede974b1556fafdb5f8ba6990542b7d5558 SHA512 eccbe0320662b7171bcf1581be73be5915fe926e51fda101dbb7e8254114fe039ea0681ebc5107500288521dfb9731a76f388e8ba5586ce7520ff444f8b31017 WHIRLPOOL 6179c80ee521b9dfcda2d63bc0391a435779ef8c75b750d3abc8849a13524199c6ad5522b639b9d8837d0ed6d1b5279b085fd907199b005fcc20e493d62e7663
 AUX curl-7.18.2-prefix.patch 662 SHA256 ba5530d4ce9175eb54944716768ce33278e5de236cbeeb2a80caefff709ff0f8 SHA512 a7f53f47cb3bd13d01a226f11254c02f197b78d1a889af7840be621476f506324907f8a4aad491361021b98947931f1e5494f902b4bbce315e69a191ce2686c9 WHIRLPOOL ece9a7f1408f7bf49b6cc6f0ff5a988a77424e40f6406697e44ed1fb46b52c275cffe6561c1fe927269eeaf071ef5a97729fc2af0237dc334c7c9552cde7094d
 AUX curl-7.19.7-test241.patch 483 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450 SHA512 d76aeaff9fe033db215f791cb647190a4349bc4fcc6cac04e886acba776dbe06710bb07084ce32fcd9858d4b5535a9b96ba12318ab52820ee92e6a8b22fb90a1 WHIRLPOOL 777fb1efe3e54fa987dc168d26489f4a9a208af1c43387618e26b603b8b4a2cab5f3347b285d97a0a4c62117bddf602b768537742e04e29b7aa06304075cb420
-AUX curl-7.20.0-fix-nettle-include.patch 718 SHA256 7630b255984142caf26985a4272697cf72530d083574a9087663ba1f19db3f10 SHA512 a2adb6f02aa041ee4a0b1fe627a0e8b38cd89c75f2845f821bab612af8365dcd2ddb3238d5dd98f5e8a3faeba58c809cb31011fdc3cb103c6b7daf28bd871571 WHIRLPOOL 28fce1acbcdaecf8338186817d1586580d626fd18c5cde0d352e6a668fe5e51d44b834322d9cd1f5ee5a649342ea7d417aa47d667877ebde10273d1a0f02f07b
 AUX curl-7.20.0-strip-ldflags.patch 419 SHA256 eabd5d5ed0c154b834376a76334581c5ef0ef6a51ea7229c79e4cfc02bd446c6 SHA512 5246f307fc56169c3c34361052ce16aceb6fcb3647fe7c231b6c0d3396f8c55ea2b86eafc24395ae6e629a6ecc989e05c8b28d76263527438e43079dd3d77275 WHIRLPOOL 453a840568f63bcc67091f0e4d8e76b81607f20a6b02696f22c89eab8977925138fe3e96e75d100b9c085554299339016cfefa8a039c8609ef51684dffd4c16b
 AUX curl-7.27.0-curl-config.patch 579 SHA256 68c06920cf8d2ab4e0e3b539fde2eda9f2f402919a2e03a11f878d76f367b6b8 SHA512 828fb9b7c020a1ab407169907475e19093e35d32f9d5d98dd4b26c52c200758b15290fefde10b96d280570fe07febdbdc91137161b7e53aa53db282be972281a WHIRLPOOL 562b0f567cc627c3633c613186d2bb54bde26bee3ae945087257152199b0cfd8086054df5b4d0682028aee474a93a84e9b0c37fb6c9e40ad571dae2e9c80ff9a
+AUX curl-7.27.0-fix-metalink-gnutls.patch 3949 SHA256 1de86351216a0d6ac31fbf6b2e2b012d01e39437ee434d9113d241da972deee0 SHA512 bcc7a6f6fca0554d6d5b37a0a67e20fdce5acc520d41c82d564986f12d3a7e4ee188d90129ecf4fce88571cc5b33dd871ee3ff2ee2c789c86b5567a23fe6a825 WHIRLPOOL c23cff02e7985ecbff4e77c9aed1fa238c8d729ebda1771922430c0a9e18450fa1b69c415ff7d43df66f8c4fd74f5464f64eb816071d1113d89efb8c606fb406
+AUX curl-7.27.0-fix-nettle-include.patch 718 SHA256 7630b255984142caf26985a4272697cf72530d083574a9087663ba1f19db3f10 SHA512 a2adb6f02aa041ee4a0b1fe627a0e8b38cd89c75f2845f821bab612af8365dcd2ddb3238d5dd98f5e8a3faeba58c809cb31011fdc3cb103c6b7daf28bd871571 WHIRLPOOL 28fce1acbcdaecf8338186817d1586580d626fd18c5cde0d352e6a668fe5e51d44b834322d9cd1f5ee5a649342ea7d417aa47d667877ebde10273d1a0f02f07b
 AUX curl-7.27.0-prefix.patch 842 SHA256 c0ba42416ac1f75bd63c180494c0510dc4ab47d8501fcbd77e75ebe6b136bd19 SHA512 60fef029c8ae9a9458bfee6b19ae7d9dae6317f26e0f1df78e9be83a78e9a81175db77efd1c22f5c09fa5b7b581a76b74457b1e3176f9d42d111f7cd00146244 WHIRLPOOL 5de6922f59e6c16c0abc7d66f361b9c344261172a0388fc6a3090bbb7caa11b8cfdcfe23c83bf6b17d7836dd516c59401302caf504fb3fa4beaa72fb62eed373
 AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da
-AUX curl-respect-cflags-2.patch 1174 SHA256 a580b492e40bc01dcdf5527f7b69b06ef3a06a329314f48991de0ab9871e5cfe SHA512 f651f46462ff9662784ccb07063853c164171e76ff6e7dc917271c997bd392f51a97694704196af0df9adfde55640e91757eacc102a840ae288875dfe86dcf41 WHIRLPOOL 1c1b3a6755450396f5bb953fd6342f5597ddf6bb535373c561aeae0fa79a1646f31b03f0348443ca8ab21f7616dbf4344485ec0dd20abc4881c31c42616ba4a9
 AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
 AUX curl-respect-cflags.patch 8180 SHA256 fc9ac005a904efe408901cf2ee29359056bb1e49fe51a771377bedbae19bc665 SHA512 d7af93548e06b71af1295b44b0f32f510ab0833a38276f070da8a1a39f9aca6b8ef755faf62c90303a7680203f0cbc9b1796461b498202eeb2e2912110dc7b71 WHIRLPOOL c1d40e8252c6935ce5872981e987fd8953b71d631f2f6865748ab4a0a456014a9e4e9d29bad942753810d82211e886d1232f12f3e88b7478a602dfe5404eff41
-AUX curlbuild.h.ed 219 SHA256 eb97ca2aa14dfe905902a9a126f5fd2b01473087c642bc48a61fcdaa0f437833 SHA512 990ccc514e613dc42eefda7c3ad3b16727c030853ba412102a1abfc6fbe1a80d5e805bc57b4b8fd991183dd2a6163b0223e059985177d74c81cfd4e547788581 WHIRLPOOL fd9de183446d363e972e2b8f8511940bdec938a32182a7c755d0aeb8315fe0341c24b49d06b0dab773f512270c93967bdef9ca453052a6758b25607f82f5b8cb
 DIST curl-7.21.4.tar.bz2 2256354 SHA256 d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1 SHA512 2fb6437b31ed52ee80f183585c3539a470d934f9e9f6d08b24f2b870276411512688d7f34979a2e1852bbd97d7df935c6cb1fef756d7b966189aab267041ec6a WHIRLPOOL 12aafcf67db4d9adf2c258a136dad92a1dd47d6c2e581deae62c9c2f64728f67f1cd426d72cb8f13fc19d415688bc3314dce27e3d343dc1e62673fecd776751a
 DIST curl-7.24.0.tar.bz2 2406936 SHA256 ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16 SHA512 de40ecb08cdaeb64b99b9a70a59fc5e1d6ff18113df9586dd5199664bdbb10b2dcb2a134aa997fc05d12d7fdb016fddd9cbb8152a09caaee0d69866a0b08047a WHIRLPOOL e658358faddca5f7a19029614010e2c59930f5bdab86030bf3a51441ad64c34b746025f4cee06ae09b3a3b73516ea159976e2771507d96c98462652b6944d1be
 DIST curl-7.25.0.tar.bz2 2418060 SHA256 cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491 SHA512 8053d942f145933a5a293ddc4d3fd7651ccacb57138d9fa23ecb623fd73bbc4d31027a1d3c664be639859f37e54461ace36c29a5063aed1e1fcf7aa0442afecf WHIRLPOOL a4310af47ab46dba203f89ae211509d117fcbb86d64e9f304eac9818f283775452c6f8f30715943336644d84e8149ed8da551bc876626c9f0f63fda4c5be7c33
@@ -22,13 +20,13 @@ EBUILD curl-7.21.4.ebuild 3514 SHA256 90020645c61c93a010fc61c020179e42ebcea70ee1
 EBUILD curl-7.24.0.ebuild 3726 SHA256 ae2afb4021a571cfdbeffa2705b8a202d303b3101176908b6563324ff40969f1 SHA512 d6c2fbc54617a66f6739cfa9a9372358d4bd08002f8e7717444b795f6cbf6b75f4c1f8b64b11d7775e31cc42acc151951acf11cf8605c80feabfa1ea0f1116fa WHIRLPOOL 4cdc34e1ee6826da1de7db2d9e97e1529119ad077a4c6628c9cfed4894a609236c8d726873f361120c34022cdd097f92df23e325926a5120dbf58cd3d634080e
 EBUILD curl-7.25.0-r1.ebuild 5834 SHA256 c14d3185b39d5ef166215b13d4e353f24945d2c8888ce99da8845e5ddfaad48d SHA512 868b5b3dcc038d124aa6a1dca8ff8957d9c76c5ec37ea2ea647c6ed15272066de53d439db99208ee20d146a5c505eb3b1044660e9e75c285ebc9c8353a3a6b11 WHIRLPOOL a35bd0a5d79f149ff9046c6ffb47a526e8569d06b72601fcf627df5805173ca2a27f4223ea9a78e181588383d2789a1ded8e37b9c20cb34561d7927930f4946b
 EBUILD curl-7.26.0.ebuild 6091 SHA256 e7a9b6e2da2b86aa15f68c9d4ab74fa7db274740677afd42e56c797b54ce60c4 SHA512 d1a02aebc621d7f95cdc634caa5eb6bb50d50ec7fe3f6cc3fbf0ae0d0de90be399ba342862cf7cdf9b974b39aee0d530f0de0a15e434dff15567ca0cc349200e WHIRLPOOL 98a7a36cdbaadc631c1ad0a644d34d4c68f26b0ce72ceefda4c965c1ac7bed52b7fedb1cd1aadf99cb6e1182363d8d4bb8e7b0e4845d5078cb76d55d6f081098
-EBUILD curl-7.27.0-r2.ebuild 6523 SHA256 17775185bb12f6fd4e3c71e5d356825e5bfe2ea600ce25ca62275a1d5dce5b36 SHA512 1ef95fa071a1f89641d05f2cad4ce3ae9158567fc8434394b4375ead2c5b64473cec0e0278026a19d2d0dc49e4f1ca45700f00ed99afd42c7a31336ea837629c WHIRLPOOL 9aacdaca78a7c23b2604baa6a157478d8c540b9a5e67c24f17f83b881334580720e21ce98cd485d13dfa8fa0a151d9e2613a4a216d117e2d4993d119b0ca3a05
-MISC ChangeLog 38892 SHA256 1b87de807e1b54f1a92fa85fbe6bb48296b57168b2e2e049aeb81b1206d66898 SHA512 8f0d90d966e9b7bd5b8572290a66dfb0645348eb71ee9abe83293ef88981918e8bcd8086c081df33a9e8079bc15fdf3b32d06640c24000cd06f8ceaf69981447 WHIRLPOOL bd457af01a4adbc9ddcda8df5d1cf911e88f4b3e8bef9e0bc3c2de92b43e405b6577898c544cbcac19761e717c865581b561e304b653d5db932a38fb01bbe482
+EBUILD curl-7.27.0-r2.ebuild 6580 SHA256 a7daff2da16db83b31966bb93013b1fba58ab0d57a8de2d6803f753b7187fef8 SHA512 d3c1545d4bca7551020ee70a8a6efaa348fa0e8cd9784a9252730836c32d613969a4f41a2d2e7499cb4177f016db1b21f4eadc65923bad241686ab2511d19d6c WHIRLPOOL abc27f8a04f0a1a090d1f58dfe76ec3dc2657f16094024dcdb3d076b616667df7a117eedb06bb9a4a9b49614f32ba95ec66a60ecc50ee93479c6992571ac3c5c
+MISC ChangeLog 39276 SHA256 bd8236a3f960a84c6ccdc260a77e21cb53ac9e0965a2eafceee05d4e4ddc245f SHA512 50cddb5364fda9946c2ab44cccd93d64e18439e93696bef85a41ed12013ca451bc4e92a029f8d80beae2f205d6ae9c6dafbd89b88b8863a5c225df0cf9f15014 WHIRLPOOL f8548f406b007b41a5ffb79241a37277ef091bf5294e62c1e52e5c779926653d8eeb18f59be87be288b579c3983828a3aed79e39092a0e6c85290920d2944c9f
 MISC metadata.xml 847 SHA256 94b3fe2abeff0838aa4374c296d9a896563957a33ba84c1c194fac0455664f8b SHA512 52e3118cb86825cf0d7bb63c6aeec5a37eb9939c5def57f05e6b9d54187687bf60634da01b347e46de04da8ceeac084ce83c9b69ea7a2f2a45981371b3b68987 WHIRLPOOL 49f0c28c28e13b006238e4200acf2613c7ca6011b83ee6145c2ef6bf00ec496125c44d0cd714284e8e1e70b17b20fd675d2f933f7972bc4cf397cc17ff52745d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAfyncACgkQl5yvQNBFVTUVjgCdGpKpIO2JXgTZ05/U1vo5xSjd
-5KQAnRLy6JMvytiQgFV2fjRRb8bD2bvf
-=Pa0P
+iEYEAREIAAYFAlAhDGwACgkQl5yvQNBFVTXu6wCdGwp/mpSWmXOYtyL5enkCAuhe
+4XgAoJXTDScYniQI6GwA4GYpu1gmOnJ8
+=990e
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.27.0-r2.ebuild b/net-misc/curl/curl-7.27.0-r2.ebuild
index 74d28e5bfda6..ce1e09069816 100644
--- a/net-misc/curl/curl-7.27.0-r2.ebuild
+++ b/net-misc/curl/curl-7.27.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.27.0-r2.ebuild,v 1.5 2012/08/06 13:45:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.27.0-r2.ebuild,v 1.6 2012/08/07 12:38:58 blueness Exp $
 
 EAPI="4"
 
@@ -88,7 +88,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-7.27.0-prefix.patch \
 		"${FILESDIR}"/${PN}-respect-cflags-3.patch \
 		"${FILESDIR}"/${PN}-fix-gnutls-nettle.patch \
-		"${FILESDIR}"/${PN}-7.20.0-fix-nettle-include.patch
+		"${FILESDIR}"/${PN}-7.27.0-fix-nettle-include.patch \
+		"${FILESDIR}"/${PN}-7.27.0-fix-metalink-gnutls.patch
 	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
 
 	eprefixify curl-config.in
diff --git a/net-misc/curl/files/config.h.ed b/net-misc/curl/files/config.h.ed
deleted file mode 100644
index caf6d43cf247..000000000000
--- a/net-misc/curl/files/config.h.ed
+++ /dev/null
@@ -1,29 +0,0 @@
-/SIZEOF_LONG/c
-#ifdef __LP64__
-#define SIZEOF_LONG 8
-#else /* !__LP64__ */
-#define SIZEOF_LONG 4
-#endif /* __LP64__ */
-.
-/SIZEOF_SIZE_T/c
-#ifdef __LP64__
-#define SIZEOF_SIZE_T 8
-#else /* !__LP64__ */
-#define SIZEOF_SIZE_T 4
-#endif /* __LP64__ */
-.
-/SIZEOF_TIME_T/c
-#ifdef __LP64__
-#define SIZEOF_TIME_T 8
-#else /* !__LP64__ */
-#define SIZEOF_TIME_T 4
-#endif /* __LP64__ */
-.
-/SIZEOF_VOIDP/c
-#ifdef __LP64__
-#define SIZEOF_VOIDP 8
-#else /* !__LP64__ */
-#define SIZEOF_VOIDP 4
-#endif /* __LP64__ */
-.
-w
diff --git a/net-misc/curl/files/curl-7.27.0-fix-metalink-gnutls.patch b/net-misc/curl/files/curl-7.27.0-fix-metalink-gnutls.patch
new file mode 100644
index 000000000000..7cbd98b1a704
--- /dev/null
+++ b/net-misc/curl/files/curl-7.27.0-fix-metalink-gnutls.patch
@@ -0,0 +1,148 @@
+From 9f304291bd72aae66944cd7523707e1b88c6ad7b Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 6 Aug 2012 19:20:35 +0200
+Subject: [PATCH] metalink: change code order to build with gnutls-nettle
+
+Bug: http://curl.haxx.se/bug/view.cgi?id=3554668
+Reported by: Anthony G. Basile
+---
+ src/tool_metalink.c |  116 +++++++++++++++++++++++++--------------------------
+ 1 file changed, 58 insertions(+), 58 deletions(-)
+
+diff --git a/src/tool_metalink.c b/src/tool_metalink.c
+index 5491815..3a24a15 100644
+--- a/src/tool_metalink.c
++++ b/src/tool_metalink.c
+@@ -82,64 +82,6 @@
+     return PARAM_NO_MEM; \
+ } WHILE_FALSE
+ 
+-const digest_params MD5_DIGEST_PARAMS[] = {
+-  {
+-    (Curl_digest_init_func) MD5_Init,
+-    (Curl_digest_update_func) MD5_Update,
+-    (Curl_digest_final_func) MD5_Final,
+-    sizeof(MD5_CTX),
+-    16
+-  }
+-};
+-
+-const digest_params SHA1_DIGEST_PARAMS[] = {
+-  {
+-    (Curl_digest_init_func) SHA1_Init,
+-    (Curl_digest_update_func) SHA1_Update,
+-    (Curl_digest_final_func) SHA1_Final,
+-    sizeof(SHA_CTX),
+-    20
+-  }
+-};
+-
+-const digest_params SHA256_DIGEST_PARAMS[] = {
+-  {
+-    (Curl_digest_init_func) SHA256_Init,
+-    (Curl_digest_update_func) SHA256_Update,
+-    (Curl_digest_final_func) SHA256_Final,
+-    sizeof(SHA256_CTX),
+-    32
+-  }
+-};
+-
+-static const metalink_digest_def SHA256_DIGEST_DEF[] = {
+-  {"sha-256", SHA256_DIGEST_PARAMS}
+-};
+-
+-static const metalink_digest_def SHA1_DIGEST_DEF[] = {
+-  {"sha-1", SHA1_DIGEST_PARAMS}
+-};
+-
+-static const metalink_digest_def MD5_DIGEST_DEF[] = {
+-  {"md5", MD5_DIGEST_PARAMS}
+-};
+-
+-/*
+- * The alias of supported hash functions in the order by preference
+- * (basically stronger hash comes first). We included "sha-256" and
+- * "sha256". The former is the name defined in the IANA registry named
+- * "Hash Function Textual Names". The latter is widely (and
+- * historically) used in Metalink version 3.
+- */
+-static const metalink_digest_alias digest_aliases[] = {
+-  {"sha-256", SHA256_DIGEST_DEF},
+-  {"sha256", SHA256_DIGEST_DEF},
+-  {"sha-1", SHA1_DIGEST_DEF},
+-  {"sha1", SHA1_DIGEST_DEF},
+-  {"md5", MD5_DIGEST_DEF},
+-  {NULL, NULL}
+-};
+-
+ #ifdef USE_GNUTLS_NETTLE
+ 
+ static void MD5_Init(MD5_CTX *ctx)
+@@ -251,6 +193,64 @@ static void SHA256_Final(unsigned char digest[32], SHA256_CTX *ctx)
+ 
+ #endif /* CRYPTO LIBS */
+ 
++const digest_params MD5_DIGEST_PARAMS[] = {
++  {
++    (Curl_digest_init_func) MD5_Init,
++    (Curl_digest_update_func) MD5_Update,
++    (Curl_digest_final_func) MD5_Final,
++    sizeof(MD5_CTX),
++    16
++  }
++};
++
++const digest_params SHA1_DIGEST_PARAMS[] = {
++  {
++    (Curl_digest_init_func) SHA1_Init,
++    (Curl_digest_update_func) SHA1_Update,
++    (Curl_digest_final_func) SHA1_Final,
++    sizeof(SHA_CTX),
++    20
++  }
++};
++
++const digest_params SHA256_DIGEST_PARAMS[] = {
++  {
++    (Curl_digest_init_func) SHA256_Init,
++    (Curl_digest_update_func) SHA256_Update,
++    (Curl_digest_final_func) SHA256_Final,
++    sizeof(SHA256_CTX),
++    32
++  }
++};
++
++static const metalink_digest_def SHA256_DIGEST_DEF[] = {
++  {"sha-256", SHA256_DIGEST_PARAMS}
++};
++
++static const metalink_digest_def SHA1_DIGEST_DEF[] = {
++  {"sha-1", SHA1_DIGEST_PARAMS}
++};
++
++static const metalink_digest_def MD5_DIGEST_DEF[] = {
++  {"md5", MD5_DIGEST_PARAMS}
++};
++
++/*
++ * The alias of supported hash functions in the order by preference
++ * (basically stronger hash comes first). We included "sha-256" and
++ * "sha256". The former is the name defined in the IANA registry named
++ * "Hash Function Textual Names". The latter is widely (and
++ * historically) used in Metalink version 3.
++ */
++static const metalink_digest_alias digest_aliases[] = {
++  {"sha-256", SHA256_DIGEST_DEF},
++  {"sha256", SHA256_DIGEST_DEF},
++  {"sha-1", SHA1_DIGEST_DEF},
++  {"sha1", SHA1_DIGEST_DEF},
++  {"md5", MD5_DIGEST_DEF},
++  {NULL, NULL}
++};
++
+ digest_context *Curl_digest_init(const digest_params *dparams)
+ {
+   digest_context *ctxt;
+-- 
+1.7.10.4
+
diff --git a/net-misc/curl/files/curl-7.20.0-fix-nettle-include.patch b/net-misc/curl/files/curl-7.27.0-fix-nettle-include.patch
index b0a81657fd89..b0a81657fd89 100644
--- a/net-misc/curl/files/curl-7.20.0-fix-nettle-include.patch
+++ b/net-misc/curl/files/curl-7.27.0-fix-nettle-include.patch
diff --git a/net-misc/curl/files/curl-respect-cflags-2.patch b/net-misc/curl/files/curl-respect-cflags-2.patch
deleted file mode 100644
index a67ed4799d07..000000000000
--- a/net-misc/curl/files/curl-respect-cflags-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
-index adafaa6..b7517c1 100644
---- a/m4/curl-compilers.m4
-+++ b/m4/curl-compilers.m4
-@@ -199,19 +199,19 @@ AC_DEFUN([CURL_CHECK_COMPILER_IBM_C], [
-   if test "$curl_cv_have_def___IBMC__" = "yes"; then
-     AC_MSG_RESULT([yes])
-     compiler_id="IBM_C"
--    flags_dbg_all="-g -g0 -g1 -g2 -g3"
--    flags_dbg_yes="-g"
-+    flags_dbg_all=""
-+    flags_dbg_yes=""
-     flags_dbg_off=""
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -O4 -O5"
--    flags_opt_all="$flags_opt_all -qnooptimize"
--    flags_opt_all="$flags_opt_all -qoptimize=0"
--    flags_opt_all="$flags_opt_all -qoptimize=1"
--    flags_opt_all="$flags_opt_all -qoptimize=2"
--    flags_opt_all="$flags_opt_all -qoptimize=3"
--    flags_opt_all="$flags_opt_all -qoptimize=4"
--    flags_opt_all="$flags_opt_all -qoptimize=5"
--    flags_opt_yes="-O2"
--    flags_opt_off="-qnooptimize"
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_all=""
-+    flags_opt_yes=""
-+    flags_opt_off=""
-     flags_prefer_cppflags="yes"
-   else
-     AC_MSG_RESULT([no])
diff --git a/net-misc/curl/files/curlbuild.h.ed b/net-misc/curl/files/curlbuild.h.ed
deleted file mode 100644
index ed9e9c97437b..000000000000
--- a/net-misc/curl/files/curlbuild.h.ed
+++ /dev/null
@@ -1,11 +0,0 @@
-/define CURL_SIZEOF_LONG/c
-#ifdef __LP64__
-#define CURL_SIZEOF_LONG 8
-#else /* !__LP64__ */
-#define CURL_SIZEOF_LONG 4
-#endif /* __LP64__ */
-.
-/define CURL_TYPEOF_CURL_OFF_T/c
-#define CURL_TYPEOF_CURL_OFF_T int64_t
-.
-w