Fix USE=-ecc unit test, bug #505174

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 65 insertions, 17 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 399c229d4996..1d18c5f04756 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.407 2014/03/20 19:02:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.408 2014/03/24 13:22:00 blueness Exp $
+
+  24 Mar 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/tor-0.2.4.21-fix-unittest-disable-curve25519.patch,
+  tor-0.2.4.21.ebuild:
+  Fix USE=-ecc unit test, bug #505174
 
   20 Mar 2014; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
   Fix metadata descriptions, thanks nickm
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 1965e99476d6..168481f0a266 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX README.gentoo 316 SHA256 bd1a5d6a0973d89d3c89e52d1046c202f52d59aa45ca60d2ee33551ac77de1b9 SHA512 6ca305c710562c0f9a3f0cba07760adf300ea166c8baa47e8872719190d779fb63d4dd6c9193fb60ddb51015138790aaa93935668423e0f861f05496d22ce660 WHIRLPOOL da7f4eaaccab8172dba2f8d264dc6d010b98fdb70ed60eff71175a24b423df3101c8a93d162b309b0a51441ca9b01dcf7257bbecc8fa83f1903a0577d28a47d6
 AUX tor-0.2.3.14_alpha-torrc.sample.patch 1365 SHA256 7f8d64e84590a62c4b5b1ef55ffbac32b770eaeb4252ef550e6130af918cf63b SHA512 8691db8957ab22e8619b4909faef0534a82faee78c685fef005372e0bc423f1b8d83e930a32a2b2dee239796a47b2147d2dd7fd53938161024fd1dfda0be8eec WHIRLPOOL 0531fb6393311ee88915f47862665606f96e94b27064701d35e9828a9f3547bf0db8710cdb4e539f515496607cffbd70a32098cd4f2e7ea90ac595e1c80ccb5f
+AUX tor-0.2.4.21-fix-unittest-disable-curve25519.patch 1210 SHA256 d0d58684ba33c0169380c2786e9a313148a6ca0d9333473e48f997329573649f SHA512 571aa3d13f770d9368f2f7553aecff129430dce4a12786c5ea1e7219b96854fe8d1259210d0e52ecb26d04aee042c93396eac51f5bfc5a0d7c85227b3bfe3bf0 WHIRLPOOL 5a05925e9b601525406be2d21434abc723e14c83370102e200a2d6db5fe3262aa06e3845acde3272e9f08f28c0295eb4193417359ec85277ecde876efbe8b289
 AUX tor.confd 44 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660 WHIRLPOOL d3060208cf59c2de5839e7358fae37db883899f715a7411c7ba4c9e09926b6098aca7bfcaa269ea51b47b9f197ccd509f0c1e19909a87b1e087a88b30915a1cf
 AUX tor.initd-r6 1627 SHA256 49da1b5f267927023bc092adcf89d406ec294584039d6bca6b7aea0a9e7c4c4f SHA512 09aea50280fe0efee605e9235ce43d171efdf4cf6c2ccef272e797bac7277940e08155c5f294d9901507112a25a9be3aec5e40466caba4a54dfdb1e48683ab12 WHIRLPOOL 8c7fe6e6f53daa47676e040afceb716308bd836df6db35ddafd9a35d9c7ea2ef2d9c4e10ab971b882ae8b84ad4106a7b3f6a68791f9eefd3977c178b745f96b0
 AUX tor.service 316 SHA256 22293c36ae4043cb351ff7e5b18ab392de5ac431683dd03de658bf3627fe5c3d SHA512 cee692525037ff1ed466863058bfa06e6cf17917f0d5546ab9a53e27f89228feecb20eb13be616e901584e73851022be68aa03c67aa8c12824998ed2533d2571 WHIRLPOOL d4ab37f1e8c4de6e38613c6d2e53500e2bab73e31f13bdf594ae5c8ff13e40bbf9eccc3b56e776e64d847cce0d36f61b0a1de3f72f1858cf1d2e0f1e68c2e7e7
@@ -11,24 +12,24 @@ DIST tor-0.2.4.20.tar.gz 2867180 SHA256 ccc51747cbcbf98f658c34d5c693ff8a868698da
 DIST tor-0.2.4.21.tar.gz 2909462 SHA256 a19df488c0c776c9f1e4c78bf93af115f67eefcffe6152a826fed07a1596f1ce SHA512 be055afa95c8e80b88ca46eaeb22da19a9b7e66af39697267597f6141ad4d6b6197fec55d9f1fb0caf349073740489331a3197cb97c737ae829d488e9cda73e7 WHIRLPOOL 6c26832e289cec219d474f11abf9ec03c48cc64d45fba75fbdd77d28654e185db3d177e13061bcb78887eca632ca2e82ffe754985dd9b28bb910a6198a574713
 DIST tor-0.2.5.2-alpha.tar.gz 2961889 SHA256 32a1d6dbfa4527fdaebfcb093f1d35cf464877b83b717a2ee0031e4f1f85b805 SHA512 d3af1bf5d0b0a4ad6ed79392b4d6f53aadb4aa1880165784b3a342b3827002d40bc0ba9123985829bb9a17c20b8e257ae123e43f6891a869378eebdcbb5ccf27 WHIRLPOOL 99f08c7a9cd298ea32ebaa9f31aba3aff115ae19a2ac4d4bdc091d574175247cca0b29c0c23a760696e7aca3f91d4d84030a44e22507ce4ab94fd3a1742ca202
 EBUILD tor-0.2.4.20.ebuild 2596 SHA256 feb9d082e10b347b9046810bcfb5596a240075df492a93aa60917e63815799d4 SHA512 aa57ddff39e8daceb7555eba0e4d7ab81a08bd73f3558d6a161ed782941fbdf282e564bd08ce1e5ea68d2e725b847475326ad95c1281fd3272539c674ae609bf WHIRLPOOL a5f118a2309853939cd246c3a5327da5ff6fa5f6c4071c5838fc69ca38ea329672816693885a7a6ae18d3ea7aab60bb1216cb2819df71627a0f5f1e573a747e5
-EBUILD tor-0.2.4.21.ebuild 2607 SHA256 0638c102d766b008cf3d1b3bde5ccfaf35c293d2401e3f568c587f2caa149aad SHA512 ba67c189bfccc3b965311b94127eb7b5050dd3c23e29e3819bd6b86f840250942bd5ccd1e85e722936b011e54c682757da100da3547b71445c33703a30f98a60 WHIRLPOOL eabfe5279ea6bef40b8afef9a7fb647d539cd85cf12373da6820ae0b545c99e7a6f422bfc726219911c6a951e6be106128208156272e85c423cceaf499208c92
+EBUILD tor-0.2.4.21.ebuild 2672 SHA256 1628cba0af4c269c85405058caab1701f551cda4060048f183041802f6881206 SHA512 71167c29860e336460525d8bc817ccc0de5801b616cf348d6b73e7ba5a797b4288351496d6a854c20569f363f93bf22d65a43b9597d9e4e339174a5d8951ae75 WHIRLPOOL f085b4d0011be7df9f91f80340ab19aa36ba97287cafd99fe4082939d4e2140d779fb5c4743ba05009d55cf5928ea73d65dc721887743158e57a956f92181bd2
 EBUILD tor-0.2.5.2_alpha.ebuild 2763 SHA256 b2df9481ee18219ed6aa41de82b1cf6b2916d62517681e7554c15b98ecccae17 SHA512 160476f7b2eebe77e14b39680357b1c0fd760d8d1568d92eb7cb3a45ce3931ff3185b453794073ff3f606d6e6f50214aaa82a31670592747d12871de83e74900 WHIRLPOOL cd222126a8933140ca05078d2371588f8d1944d958771f53c3418222e299d8553ed582bc91a3074ea46c9781ef6941d8da6022a5d2875f177e303235c853fd7c
-MISC ChangeLog 61038 SHA256 f44d202d3a6708737240f73a876ff54d1e9be46d8a8ff25a07fae24071aded68 SHA512 711cacf2e3b611718808329e94ab6d9136cd8c851ae4c0cc5b50eb853efd1e725a4755a773570a70289d5d5a02cda25bcef5a452a01b1e50325b590ffbb4c150 WHIRLPOOL d23a4657692da3f953d8213dad84dfde429ebb85d65d7ce79cf7156e68bc2e15eba6d0bff173e9f372267108b1d3090a9bdb843307755284533a5ae5c0468156
+MISC ChangeLog 61216 SHA256 95015490a6ae6439e317444191a1471126a2a11469fb4ab8f1cfcf4c95608106 SHA512 35e096b0afa1cedb1d790344c67285e8fba4ccc5f7b5491f031be0cca1b87aa526689bd8f51eb6b705b3206262b83f7a33fca38fc405a276b0224716283a6610 WHIRLPOOL 18b2f2d4feffb5c5504ada4037a1845b21b70eaac1d1c86a7be3f4b9613c14b45eb614f3a841d27f2fc7ee999a4ab76116fe067ebcd089c42656d57c9d7b4d8e
 MISC metadata.xml 805 SHA256 b65e1d9314d9a0406c93a7bdf168cee5555a8b5af3c889768c555ecf9c518564 SHA512 b68a4b5c9ef9ec0cbb61f795a574c3111d0f7be6232868e698828db3a68273f109c2ddd559b4c9dec7a9200f5ea7b99cc5faff1ed23fe9247c6c120e856f7875 WHIRLPOOL b42a9dfb6a840451ec1fec757636055ba71a99dc1f1f1a348e7735058125688a62b2433307706fa8f75310a1ba887a75e3a3535b69c413b0a9621c633f52a8c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTKzt9AAoJEJOE+m71LUu6r+8P/iMNR1+k8toy/+rETp71Cpqi
-p/+d3Aj1oEpf8Q1RXWOeBTZuSTY+PMPwet6PUZQQJ31sdiaFQSuBjF/i4OJY2fL5
-A1Rlj+vPbk3v+XPcitz+bP3xDFD4q0g2z3UWbn1TWMhIeM7iLfzBk78SxVbTl8TZ
-DOej5b8B8h6CMf2bE4W2A1lQauMUXdr8dhKewev/sx94BF/pNj3W1GLIgY0pZzH0
-Os8mBRGaOJUHhSlBo6k5SiY9a6SMl5Ts6yWD80mAjB3LhhQLHGnWaF9hUl85SRJG
-F6/qFZPt2WaXkhqqaHFWaEKYYbleOMz3LLhrlHdUJouCLJsRGOLXQ0QEm3du0alG
-AUxwFM24SUFAdkcrG3Vse3PF8xYmYvzjm70WaRLjB+5D9jWxYCIQBX7WilFuy7yE
-K24E8RWlgezaqh5dUmk1Seaz5fbreCQq49SDYcL6LHG9pzs03LceO3Dwsk3wYCkI
-k/TqiL72aTgrNfrX/qcRNMHH1TZGi3uVquL3BMQj0VLhLAWOTCZN/CSNomD1Hvqk
-SYHGnuW5bwc06L3fokHKem2Apiryy1BSrJW8LAqkuo6GRrDwKOA0ty2fqWxLoxIX
-fZOeAj75RxwCBsLiMQqPxyQ6l1RFYY5X8lzKB+PIHXCbNiDXlLkWnIO8EiCGsnWv
-ZxEchRLa4pyPMyvbbf1b
-=BJdx
+iQIcBAEBCAAGBQJTMDGcAAoJEJOE+m71LUu6qS4P+wf7anWpyUrHaSUOmvX++KFh
+JYELu7KR2nET9HOtygIgeWAMlfWvzUEc7LGuKkV/xoIMOwTlPhBVvbi85aJ9xQxs
+6mvCpZiu/cOS/ja2Wemuhe7bnlXGiYTdurPBt86mXNVhYauxsrgkMW5T6YP9Yh8w
+Bg9UdUrtVMCEExV2ToUl25p6VAo1IlN3ve35C0AUZePkPqR+BoW3hlSdOt5eWY7D
+Lannk+dxumwC6jM8CfeJsIgIuAmiNaJ9Jo8O6jHlgSvlFr4Y+1FtA+knLN10QZR3
+wsTDYojcCGI6gdFLXT3u2kWpnskikipFjaTqxLfK4Q7MLnwIqiYNj9xpKpLwfExT
+kp/Xvrp5C/ew2qtIOR5KdKj/jOn2wAgP0wHwgn5vPaUnKnckcSoHu81Jezqk43FN
+e4sb2PXmR515VI++KjMHbGdRsDInsrb7Hh1/Zuw6SQZxBW5LHm3BB/Sg8h+G6OYj
+bIDSA4iNfxK2VrPg4jm6L09z6QN3pbUnOOdnaJNXCTfb4bdCFBgunwJ28CqkLgWC
+rRc+7NBrZiUxoMdgbPKKMKNch6Rhbn9LE9Ys4jmF3D+Z1cJPDryFyy5IzFphxtJA
+dylv6iARbMNhIOPLko4eoZZSM1Nlo+Z9aJvC+NpdXRPxuB7qSJrlfGI+k9DJvf+B
+TDheBjAXnTIvhbsJN5Xk
+=8PzG
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor-0.2.4.21-fix-unittest-disable-curve25519.patch b/net-misc/tor/files/tor-0.2.4.21-fix-unittest-disable-curve25519.patch
new file mode 100644
index 000000000000..5c8f34bfa491
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.4.21-fix-unittest-disable-curve25519.patch
@@ -0,0 +1,41 @@
+From: Nick Mathewson <nickm@torproject.org>
+Date: Thu, 20 Mar 2014 17:52:50 +0000 (-0400)
+Subject: Fix unittest compilation with --disable-curve25519
+X-Git-Tag: tor-0.2.5.3-alpha~3^2
+X-Git-Url: https://gitweb.torproject.org?hp=9077118ee27e275d495b89a810ee28882c74cf62
+
+Fix unittest compilation with --disable-curve25519
+
+This is a fix for 9700, which we already fixed in 0.2.5.x, but which
+got left in 0.2.4.x.
+
+This is a partial backport of a0a855d586d99540277014ccd3
+---
+
+diff --git a/changes/bug9700 b/changes/bug9700
+new file mode 100644
+index 0000000..f59f54c
+--- /dev/null
++++ b/changes/bug9700
+@@ -0,0 +1,3 @@
++  o Minor bugfixes (compilation):
++    - Fix a compilation error when compiling with --disable-cuve25519.
++      Fixes bug 9700; bugfix on 0.2.4.17-rc.
+diff --git a/src/test/test.c b/src/test/test.c
+index 4ec8792..c2911d8 100644
+--- a/src/test/test.c
++++ b/src/test/test.c
+@@ -56,12 +56,12 @@ double fabs(double x);
+ #include "memarea.h"
+ #include "onion.h"
+ #include "onion_tap.h"
++#include "onion_ntor.h"
+ #include "policies.h"
+ #include "rephist.h"
+ #include "routerparse.h"
+ #ifdef CURVE25519_ENABLED
+ #include "crypto_curve25519.h"
+-#include "onion_ntor.h"
+ #endif
+ 
+ #ifdef USE_DMALLOC
diff --git a/net-misc/tor/tor-0.2.4.21.ebuild b/net-misc/tor/tor-0.2.4.21.ebuild
index 431a77408ddc..20913b9cd46c 100644
--- a/net-misc/tor/tor-0.2.4.21.ebuild
+++ b/net-misc/tor/tor-0.2.4.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.21.ebuild,v 1.1 2014/03/02 15:50:46 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.4.21.ebuild,v 1.2 2014/03/24 13:22:00 blueness Exp $
 
 EAPI="5"
 
@@ -35,6 +35,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
+	epatch "${FILESDIR}"/${P}-fix-unittest-disable-curve25519.patch
 }
 
 src_configure() {