From: Anthony G. Basile Date: Wed, 22 Apr 2015 12:12:02 +0000 (+0000) Subject: Remove old patches. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8f4b349d8dcfeae78da26975844c8dabb10f563b;p=gentoo.git Remove old patches. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xF52D4BBA --- diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog index bbfb073deb52..96e4201715a7 100644 --- a/net-misc/curl/ChangeLog +++ b/net-misc/curl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/curl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.394 2015/04/22 11:56:55 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.395 2015/04/22 12:11:48 blueness Exp $ + + 22 Apr 2015; Anthony G. Basile + -files/curl-7.30.0-configure.patch, -files/curl-7.35.0-tests.patch, + -files/curl-7.36.0-hostcheck.patch, -files/curl-7.37.0-host-krb5-config.patch: + Remove old patches. 22 Apr 2015; Anthony G. Basile ChangeLog: Fix gpg signature. diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 724b6bf06040..af8e9d60604d 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,33 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX curl-7.30.0-configure.patch 1793 SHA256 ba8c07fe3660420a0696e3f140b2975ba7469c8307109c9ab7707b3abd640d7c SHA512 95dff936de05b09b38d24814edddaa0f55437ddefd389747f533dd14151c2e12b13ac51284b02e3e39883b5fff80ea98ab1e6db5dcb29f0a635c2627749abe27 WHIRLPOOL dade8f479599df68f33a1f24b46c93939a395a09dae160f38a18952eec60c7a8755821a8f59925ceef4f778ab7428139903fec7796b5cc132b274b6ca491e34f AUX curl-7.30.0-prefix.patch 880 SHA256 12204b7a522edbb133a3143b40b25805654d937e27ae66ba5d566a99afaa809a SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f WHIRLPOOL 6b60261dee31643b5db41c449ae6db14666f696470180c543ea39c3a11d7d6323057409be18a0a48a3335226ed5f78cee9fc2948dce9644e52481423147b49e5 -AUX curl-7.35.0-tests.patch 1033 SHA256 ebe5ea281a4dd505cf079c0370b823e7203d513ba6246a6c3e09f9ea5b8768c2 SHA512 75190af254a93e2846c47d72ddd272d53092493c45b9a4c5a5cac96b5cb184922a10929b4b4c079b62394a7fae830d559ca1616f74817653517cbf2699afa34f WHIRLPOOL 9dc7ec46ff97ccdf2a81db09502e4ff6880038890b60c57f7316ed53e561fe3fbdded5420d84fcef114c842cced494fea88c0ce1458ad9edf0cd09d098ca413a -AUX curl-7.36.0-hostcheck.patch 652 SHA256 92f25ef025037a1bf7823b4d136f00c548baec4d392e2d7bb059a7551b5f65d7 SHA512 49810a5bc4554a694d4c684aaa400d791098d50a14b0d5146c762e83ea25f18408d1e3382e3d26d76b19785c1ac0314c346e74d6bb37a408489d22243fbae9dd WHIRLPOOL b98e37de05cfe75c7be84712f641a9968528cb7f060462381031d8187e3d47cf183d87481b29ac63df8f22afd18d7ed49c89079e842acdd7c199350aaf70e8fe -AUX curl-7.37.0-host-krb5-config.patch 1819 SHA256 19a84c8d9763856968cefd8af84c2fe7921d87654ee748bc699efae2b21ba754 SHA512 fe736374178734593d065986593922060cfa00a372b41504789e77fd6e21b0e5b7520a63270073ea94955ebc39229784bca06df531c973de0594d751fdbe86a3 WHIRLPOOL 12136ce91c03c6f06b2188015b73d3dd2690049a9dd77651e3341d9f856b60c209e2adec0574e6c20e52ec83c05f999843bfb2457459df102d50bcfbf1487c61 AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba648c8b7f9f067a8bf56f4136f3679 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa WHIRLPOOL 0206a8daf30f4c112c394555e455796cde7e71f632cc2b7f2612ef2cffb900d03001e5845d3683c34c6ae3aef1c1d8c4f5af30eac45d0ab621c9c0adb19397da AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd DIST curl-7.39.0.tar.bz2 3241619 SHA256 b222566e7087cd9701b301dd6634b360ae118cc1cbc7697e534dc451102ea4e0 SHA512 9d82e29c0b40530080c62bc3b81e729092b6de0dc3551e709ab1e65cb451259a5380f155fc911664ef523f57ea4be80bb27b330b720ad9a8bc3d9b967bdc3fd2 WHIRLPOOL 05fe3cd33a7716f88b63d3f3d8e9da49dec166cb42064d52ec2a182f68e792e83dd16d53edd1cd1b996a5f262faed1e1163197e1c3f717827859bd73e1570c36 DIST curl-7.42.0.tar.bz2 3330103 SHA256 32557d68542f5c6cc8437b5b8a945857b4c5c6b6276da909e35b783d1d66d08f SHA512 8a6bf3ad4462ee8b2370e85382275f1d646565bcedded070c4cd5c87a610bae200c5c2803515514796357b82cddcc4c0c82ad04793a3c5ea4f4230c51720aed6 WHIRLPOOL 9da3108732680c26d12dc8f55b6ec6294995cfca53d7fe7be5387c04466d51cd96439b9c0ca30335b1124bc5e287dc18a62c090c71e9f3b4eb084cdd821d5b77 EBUILD curl-7.39.0.ebuild 7315 SHA256 0a1c49652d6d65d672b0a6b5fcdcd1446e9665443460566d09d2e1e9426fb894 SHA512 48d6b89855d43359f166493dbcb08157bdc7dc63105190791dc8350567a9685071a5fe9761b124d6d43012c941ccf8f394e9ba9eecc1f20f673587650c4a2ae8 WHIRLPOOL e4f6f349a0ddc117bfe6c6d020482cfd9474b27312edcfb27c0af4783175f646cd0e2e3c29f306b266838f7f38511fec6dfd3cafcf973a4d4d4ae117a407bc16 EBUILD curl-7.42.0.ebuild 7343 SHA256 1917f5e3ff2f18aafca3c79766d59c88f311b09e0ba3ccf14610a96717172312 SHA512 5ac526d5829bf41dd89f41f9a1c2637fe9bbd30d3691f4ad67bc9623ae442cc6671f526d2282609b2cc5c089ef1aaa65b3e7ccc7d996c05da5a06528a3f3181c WHIRLPOOL ce92fbe8192a74ad91c31d4b3102e867b574c42f9ae0ee1885494870fbe011863ff9914f8001621a9d43393fcee0376716dc37b0663d768b113241044c29cc10 -MISC ChangeLog 58179 SHA256 45262e3c6f2008f5a28c2487c1115ccadee68b4fa9fb6a68657f4f271c7b786b SHA512 27451707b276d06a36fc90cf493611d7220840639efb9e6c799c85da9703e771af6f9cd891e6581e562c65e697f3b83a1f4383be6603d5ea4f03367f1ab98841 WHIRLPOOL f920d230f97a7d1205b0e61fb375129d8ce04abbc12bd8cafd547d0a9a85ac7109a65706da7d9c1afdec7f84d7ec83494fc1f36a4f814d1db91be08992ccfb30 +MISC ChangeLog 58408 SHA256 4218b556b8fb289f9da22fcb30df19e371e71b5f8f530c12eafedbac01edde50 SHA512 37487f484144602c5936200dc57097405c17cdbb03a3abac6c7d1f6ac2bbb8dd20a9a76b8831882bf0a6e34df92ffce811dfba675ec14384b25778e88cde609f WHIRLPOOL 10e7a64cae4becc2591fe68caac7e869b5de99561d39d168b597cb48024e5a69c4acbef05618095508b1e1e4267230ec69b0f5b3e1ab31ff4cb612246606e9fd MISC metadata.xml 868 SHA256 df66fe73acfdaff0fda0595656e112e6cfd4aebde2c52237c868c8031306e12e SHA512 a948ea9d372475d680c6f6fe4617ea5151d4378b1d5ea09e0566a88e403c9ed0a562c5426340bb1b03cf58a99c1f22411973bf215aa37ce8d30662a0e0101e4b WHIRLPOOL 0e058b6bb29d6c997a36a2563402b969b6dfa06912c3f8b854f8d89eb4113aa7fb376594ac0c756f1b59b3080aa508dab09426a9dfa982de56733f097baf9f37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVN40sAAoJEJOE+m71LUu63CIP/ixtOr3Cb7IZq7SQyd94aB/T -daXEOsDIn8+LWYdoT4bPP4F5chNZujLrSJu69QhRYSvWGexGCQuZ2lOZ5aYZn+dF -YsHkvn2hoZ8eEAO3KkRZ5FFCQFZR7jAYqH8FaqMVAH3zHwpJ5qEDDJ5ij6qBHZRg -zqSredfku7OvLefoIZRKFWI38TKljScwxFWzppZ0pOfa82FFrEbAsrrdJVqAoew9 -Ik2u1wM0dXFqZH576UWuW7kqTr70HeQ5YKUMDXvWvzDeWVwMfIfBDKy1+TnYSe3h -GjKxxzTUcUzodNHukLcZ+8mvBXNt5eszz21RX4k1hqEBE1QbWxUmRo39kolTqUQz -uQb/4zgbhDYckS58RgrGdcqnqMHjzq2DEK+CIuysODohOEXh2bPkSv2GssB9Ol3X -xdSIEhdO/Nb7holQoOE6sgptpaTwSXTGym6X8TEWhuEz8KYgkwYpGweT2BagQ+oV -Hy4JxcQ7ABbgMUtP/fbZxkpo3SyMx5PcKb7Su+t9lGztUa4wtm835Ckw3XZ3UmfV -uQf8v0s0qgju9PQ+S8hYxWJds2MHD03+YbQVu5cict9pJK6zX1XKTCE3bV9aThkI -mmEpyb5+6aUhidzAY0uvNP7wAVr6Jf8dZMTgHpeuiwNBQM+gxFJPCoYvJA3eHntn -0vb3fRt7+Nau6wVafl5x -=cErC +iQIcBAEBCAAGBQJVN5CoAAoJEJOE+m71LUu6tsAP/iESX4bhoGZM+OdO+6vcLb0r +6ishYRzf0YBxhJWu5XGur1CQ09hEsjWhChEjPoL1o9ys4TFtfoMLBFdJVwxE02pa +T9pd+3omzPSQb6Y4YtAp8wsyZSmL+VoqlH77BgcccLPSzI6l849ivfoGOATmsueW +zVqzq+bD/8oLYA88UnS4TPhvhdJ9sxMvZ0MXORt6KMuY8gYCIlXwF3WBm075u2IS +TlB4ovwvLNvYqddJpwg8rA/FhzBDLYj01NW6x1vrzrZfyCNiynbDhTtXGp0Excqw +Fe6BYNjwGc3OWZPw5AOMT0LHtDQ/RBMj+Sk10oLBusE32fgLJdep5dRfZK+4gC76 +hT7EyYtRCTYCh50WhNkLo1QcH1JB9YPPbFauTLUIGAXDhygFMu1VPop4cQfqmp4T +rEhdm0L++NeWJlsQ8w4UJl7F5qaJHhpJIL3aWg79YIs9XU1D1ZukIUpNKrFcOzvl +AiEdZvYXqrYOmD1GIcRGYC0Jl9oYMlz1G46uNUU3MTiLf8MvIaT6b258d5UZRur/ +3kxjLTnWowIWWCevlB1bQcSRAKT0Bem8wD7OZFFzXXbrWPMiWbX3+a08B2VdHose +CItN4o9Bx0Qm9PDrFxDbazwLfIv2p7sCkIV1u/8PJ5I9EnaX+35QJSOznglf9ARx +e3Qz4Ca3QUFgxTrGu/3z +=sXod -----END PGP SIGNATURE----- diff --git a/net-misc/curl/files/curl-7.30.0-configure.patch b/net-misc/curl/files/curl-7.30.0-configure.patch deleted file mode 100644 index 7ced39464433..000000000000 --- a/net-misc/curl/files/curl-7.30.0-configure.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 1436c8690383aaf91ea340df94d0b18ed4908820 Mon Sep 17 00:00:00 2001 -From: naota -Date: Sun, 23 Feb 2014 22:32:51 +0900 -Subject: [PATCH] configure: Tiny fix to honor POSIX - -Change "==" to "=" to honor POSIX test construction. ---- - configure.ac | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9dc6866..ee207f9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2469,19 +2469,19 @@ AC_HELP_STRING([--disable-versioned-symbols], [Disable versioned symbols in shar - AC_MSG_RESULT(yes) - if test "x$OPENSSL_ENABLED" = "x1"; then - versioned_symbols_flavour="OPENSSL_" -- elif test "x$GNUTLS_ENABLED" == "x1"; then -+ elif test "x$GNUTLS_ENABLED" = "x1"; then - versioned_symbols_flavour="GNUTLS_" -- elif test "x$NSS_ENABLED" == "x1"; then -+ elif test "x$NSS_ENABLED" = "x1"; then - versioned_symbols_flavour="NSS_" -- elif test "x$POLARSSL_ENABLED" == "x1"; then -+ elif test "x$POLARSSL_ENABLED" = "x1"; then - versioned_symbols_flavour="POLARSSL_" -- elif test "x$CYASSL_ENABLED" == "x1"; then -+ elif test "x$CYASSL_ENABLED" = "x1"; then - versioned_symbols_flavour="CYASSL_" -- elif test "x$AXTLS_ENABLED" == "x1"; then -+ elif test "x$AXTLS_ENABLED" = "x1"; then - versioned_symbols_flavour="AXTLS_" -- elif test "x$WINSSL_ENABLED" == "x1"; then -+ elif test "x$WINSSL_ENABLED" = "x1"; then - versioned_symbols_flavour="WINSSL_" -- elif test "x$DARWINSSL_ENABLED" == "x1"; then -+ elif test "x$DARWINSSL_ENABLED" = "x1"; then - versioned_symbols_flavour="DARWINSSL_" - else - versioned_symbols_flavour="" --- -1.8.5.5 - diff --git a/net-misc/curl/files/curl-7.35.0-tests.patch b/net-misc/curl/files/curl-7.35.0-tests.patch deleted file mode 100644 index d86a305cc4dd..000000000000 --- a/net-misc/curl/files/curl-7.35.0-tests.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ffb8a21d85bde8b626e5dc52ce25f0447ee49f89 Mon Sep 17 00:00:00 2001 -From: Steve Holme -Date: Sun, 2 Feb 2014 11:01:10 +0000 -Subject: [PATCH] tests: Fixed test172 cookie expiry - -The test contains a cookie jar file where one of the cookies has an -expiry date of 1391252187 -- Sat, 1 Feb 2014 10:56:27 GMT which has -now expired. Updated to Wed, 14 Oct 2037 16:36:33 GMT as per test -179. - -Reported-by: Adam Sampson -Bug: http://curl.haxx.se/bug/view.cgi?id=1330 ---- - tests/data/test172 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/data/test172 b/tests/data/test172 -index b3efae9..3d53418 100644 ---- a/tests/data/test172 -+++ b/tests/data/test172 -@@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool" - - .%HOSTIP TRUE /silly/ FALSE 0 ismatch this - .%HOSTIP TRUE / FALSE 0 partmatch present --%HOSTIP FALSE /we/want/ FALSE 1391252187 nodomain value -+%HOSTIP FALSE /we/want/ FALSE 2139150993 nodomain value - - - --- -1.8.5.5 diff --git a/net-misc/curl/files/curl-7.36.0-hostcheck.patch b/net-misc/curl/files/curl-7.36.0-hostcheck.patch deleted file mode 100644 index 243159d90d72..000000000000 --- a/net-misc/curl/files/curl-7.36.0-hostcheck.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a8c7cf62811d688efeff49f8f9ab942b525ebfd4 Mon Sep 17 00:00:00 2001 -From: Dan Fandrich -Date: Wed, 26 Mar 2014 22:27:34 +0100 -Subject: [PATCH] hostcheck: added a system include to define struct in_addr - ---- - lib/hostcheck.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/lib/hostcheck.c b/lib/hostcheck.c -index 162c522..42eb2ee 100644 ---- a/lib/hostcheck.c -+++ b/lib/hostcheck.c -@@ -26,6 +26,10 @@ - defined(USE_GSKIT) - /* these backends use functions from this file */ - -+#ifdef HAVE_NETINET_IN_H -+#include -+#endif -+ - #include "hostcheck.h" - #include "rawstr.h" - #include "inet_pton.h" --- -1.9.1 - diff --git a/net-misc/curl/files/curl-7.37.0-host-krb5-config.patch b/net-misc/curl/files/curl-7.37.0-host-krb5-config.patch deleted file mode 100644 index 7f0f57b1a0de..000000000000 --- a/net-misc/curl/files/curl-7.37.0-host-krb5-config.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6a733c43489cf6e6570e24b38a45fa47d18b9de1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 15 Jun 2014 12:42:30 +0200 -Subject: [PATCH] Respect host tool prefixes for krb5-config. - -That is, use ${host_alias}-krb5-config if available. This improves -cross-compilation support and fixes multilib on Gentoo. ---- - configure.ac | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d9b7a24..1c33b37 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1209,7 +1209,9 @@ if test x"$want_gss" = xyes; then - AC_MSG_RESULT(yes) - - if test -z "$GSSAPI_INCS"; then -- if test -f "$GSSAPI_ROOT/bin/krb5-config"; then -+ if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then -+ GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` -+ elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then - GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi` - elif test "$GSSAPI_ROOT" != "yes"; then - GSSAPI_INCS="-I$GSSAPI_ROOT/include" -@@ -1301,7 +1303,12 @@ if test x"$want_gss" = xyes; then - LIBS="-lgss $LIBS" - ;; - *) -- if test -f "$GSSAPI_ROOT/bin/krb5-config"; then -+ if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then -+ dnl krb5-config doesn't have --libs-only-L or similar, put everything -+ dnl into LIBS -+ gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi` -+ LIBS="$gss_libs $LIBS" -+ elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then - dnl krb5-config doesn't have --libs-only-L or similar, put everything - dnl into LIBS - gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi` --- -2.0.0 -