Add patch to compile when Eliptic Curve support is compiled in openssl. Upstream bug http://redmine.lighttpd.net/issues/2335

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 42 insertions, 9 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index df37ab52ca44..6ece8764e89f 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.258 2011/09/25 14:43:51 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.259 2011/09/26 17:08:43 hwoarang Exp $
+
+  26 Sep 2011; Markos Chandras <hwoarang@gentoo.org> lighttpd-1.4.29-r2.ebuild,
+  +files/lighttpd-1.4.29-ssl-no-ecdh.patch:
+  Add patch to compile when Eliptic Curve support is compiled in openssl.
+  Upstream bug http://redmine.lighttpd.net/issues/2335
 
   25 Sep 2011; Andreas Schuerch <nativemad@gentoo.org>
   lighttpd-1.4.29-r2.ebuild:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 31fb74a7da18..78556f3b64ca 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 1.4.25-fix-CVE-2010-0295.patch 6237 RMD160 cd9ce4410ed805d28899b0207bbc670e04491315 SHA1 2ba33d94f5628d97cb606ad97ef9630eef5191c4 SHA256 d4d269d993396cfd9146de621e0a3d5e9203ac7f6b2b6f351f9013dbbe956a4e
 AUX 1.4.25-fix-unknown-AM_SILENT_RULES.patch 744 RMD160 5da8bdca1728f2de730e90de4fb7e93a274406e8 SHA1 8ae6849a88aaaca76c1b8c13a62cc266dbebc2a7 SHA256 a1cf7c77b7ee1cbe9bf3efbb7704b8582c480ae69fd70934597d24ff3fddf663
@@ -11,6 +11,7 @@ AUX conf/mod_fastcgi.conf 677 RMD160 4403ca232cfcfc51d1d71529be9903bf4123451e SH
 AUX conf/mod_fastcgi.conf-1.4.13-r2 687 RMD160 f165f27a08f35c4792bd332be3a04370b69152e3 SHA1 ebb469944098a91772424a825fdd5a0464cef158 SHA256 d1adc1358b5d9e85353caa2e706bfa231d145dd59c075cdcb3f818b3cb5d722e
 AUX lighttpd-1.4.28-detect-libev.patch 441 RMD160 e65051bd918d784d3333dd0f6cde2ce4c5fe6c2e SHA1 0e7e6de46a80564c800674d19dcc05da7d97fc9d SHA256 223756902928f0f5de0100115b1e1def9e312363d16bedbc998b5d983d04ecbe
 AUX lighttpd-1.4.29-mod_uploadprogress.patch 22472 RMD160 595f07b55bbfac3d9fc41888f3e057a9e54bc1eb SHA1 c55e5eb72ebec2f933bdf9e2061fbeb47a72ba11 SHA256 b7b13ae1de4bbe2cf2687686ae4921d4ae2f66fc524703b3c63924b6d888934f
+AUX lighttpd-1.4.29-ssl-no-ecdh.patch 352 RMD160 bc56bda005d2913189634e9712b525380ac56f10 SHA1 4d40845ffe65aaa070a79248cf11cfe1f893242d SHA256 2d01aa866d0c9843b51bf2c9b1f01d495f5febe9a0a7fd39fabf4cb695336d60
 AUX lighttpd.confd 383 RMD160 e7b5d446dcbb55c7855706aa566bf87ab0bad911 SHA1 c300230745dd060dc2b16000270dd33def6df6a7 SHA256 bb6e6721f33e6582a91025f3500e159a599fb856d699e9394093e1018c7925e0
 AUX lighttpd.initd 1613 RMD160 36487d7720533fc67b8d7a0758a8cf2c4d9dd6c7 SHA1 34f007511bdcf71ff52f7bdf80f30faff21265d3 SHA256 1ba2e9008b2788ab39aa1cc84e42d87fad3df493ec4406a7ee16af621415d609
 AUX lighttpd.initd-1.4.13-r3 1454 RMD160 287b7b5626559f61b17e113ca00ef0cee6c63962 SHA1 e9a0f6880e03db27082177634d9974bb7f4b3406 SHA256 9dfda47a18f3e7beada18cfec37b39c66d3029b6bde42c538d82cd1292c7616a
@@ -31,13 +32,23 @@ EBUILD lighttpd-1.4.28-r1.ebuild 5739 RMD160 39f13a4f941e4f54f2ce1e15972c7df3327
 EBUILD lighttpd-1.4.28-r2.ebuild 5724 RMD160 010553db292467d43cfbbd06549f0e13004cc6c6 SHA1 537d4b521740bcface141649dbce3df0048af7cb SHA256 0e19a6c294ea24f88a99a8f1f5425eda89596d60176c7920a3ab0d90efc3c73f
 EBUILD lighttpd-1.4.28.ebuild 5676 RMD160 551c7b19158096b60f350f8db80ac6e61312af42 SHA1 005e0a5ed111b6cda8eb22c9cff9280e4542d3eb SHA256 8fb37b0afc97e260ffda15acc288f8e75418b84cfab9de0a9d62fc1a91f83bac
 EBUILD lighttpd-1.4.29-r1.ebuild 5929 RMD160 26b52584e2efdaf44f570ec15eb1b169bd1935b5 SHA1 b97d318ecdf9e6408c59a5f86383a9dcf7fea2ca SHA256 bc84cd09962cfe20fcc692fa3cca22caf5b163d8165f39fba4867a08999924ae
-EBUILD lighttpd-1.4.29-r2.ebuild 6489 RMD160 ced6c19e6c87e390185b6482d8f37dfe4d35657a SHA1 29378be4d10a38450a0c661b567a9280f553df48 SHA256 9316659ff45ea22d78717985623dc9e44b62a1543503cbb756bb2d586a3290db
-MISC ChangeLog 55153 RMD160 7175668383c35e2fdf70fd454be2262da2d235d6 SHA1 7a2a735a6bb22e06491d60bc0e9f74ce6d15f90c SHA256 558e6b5ccb52a08c5daa4bb1dd78fed9221a3ab7652a9beba8ac644035ef0c9e
+EBUILD lighttpd-1.4.29-r2.ebuild 6533 RMD160 480c5d5ec8963cfb4c127a2f54ae7f725f7c1c6b SHA1 0e79a3966088167c30de2057b6c172f5789441a8 SHA256 467646a1f58d92f204d5f8ce4a54cdc8649731dae441415fa65c3773c26fec0c
+MISC ChangeLog 55406 RMD160 9670329d4479c3c2725abd93ca9224810dae38e7 SHA1 98270ad8e66a7894f8688d0984547034120fe96d SHA256 a90c6eaa6db1d581f64f5abca73fc28512e681a93a727319d567e0c20c37ca38
 MISC metadata.xml 1193 RMD160 1fdffaaf6f865686842c2328277899a20c3ff4f1 SHA1 4c92866074579331b95b656e3eed56a5fd698c37 SHA256 bd3dbe66a93023547bd9cc688b51c050a1184d4a18d40f82171c5ca76757424e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5/PjcACgkQB6aLYPQCwOCzNQCgjbd8ZLUnBYG1LxAaxDx9JRQa
-5q0AoOI8u0H2ztWIsN/ppE0o6gHWo7Gc
-=kye1
+iQIcBAEBCgAGBQJOgLFwAAoJEPqDWhW0r/LCWMEQAMKbIzOZNscZfNFp18mDPmit
+qR2EuTYx/PQPzTmsGioXAZXrkc29FQ4tfe6JBabFtmj85owVgAwqqC8dvicfhbsA
+mupU4vA9d+d7QP9gHeVM+Jwk7xW/T+BkaKOgi+/mx/e87jF517bXe3pv6Si+Ux8c
+MyszEmk5eeHQhaW+oXvY0hk6N3kUDqWI6g0Ln1Ws5tDBROM9y5SWQ5VAvgqsST3j
+Lq4cPx7C8CM9nVWdn+ve4ZvjW6gteAbMzD0LFBPd8XFIMCCIFlJY0aSOQ73kxm+H
+M9n3r5LRXjttQrotQfn34+EMKLGgZLk0eM48rQz99d/7k0h42JTfr/JKEzagTUzv
+dGV59piHI1FdVKHA8fIiQ+dFOsMkWYKYELHC0199n4hfZOh8tVTJiAasZNNZMISE
+hzuWfRzXZ/h2+h9gy3krt9XFICgDfe1NwoOqMUSxQriYDWUIRQ0E0ueaevXwwiRO
+/8sPBloqjWBjUacOez7ndDep2/GcEI1TugELGrGJrW0nxZZrhAohGOblEbvYR7Ec
+6f7CBluPgmWbrW3EVd4/UKOTdlkuLtyz5HvVufxQ6YCQznvflwzWu0sNVFRR147o
+/vpCfpBSyq/KPw29qxirZutoH09T3AvjOLFbs3gE4AgAjCU9PvFN1O7QlLgj05Cx
+awxwpzrFTLz7NrhGXl67
+=k0HI
 -----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/lighttpd-1.4.29-ssl-no-ecdh.patch b/www-servers/lighttpd/files/lighttpd-1.4.29-ssl-no-ecdh.patch
new file mode 100644
index 000000000000..cff9e61895ab
--- /dev/null
+++ b/www-servers/lighttpd/files/lighttpd-1.4.29-ssl-no-ecdh.patch
@@ -0,0 +1,16 @@
+Index: src/network.c
+===================================================================
+--- src/network.c	(revision 2801)
++++ src/network.c	(revision 2802)
+@@ -480,9 +480,11 @@
+ 	network_backend_t backend;
+ 
+ #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
++#ifndef OPENSSL_NO_ECDH
+ 	EC_KEY *ecdh;
+ 	int nid;
+ #endif
++#endif
+ 
+ #ifdef USE_OPENSSL
+ 	DH *dh;
diff --git a/www-servers/lighttpd/lighttpd-1.4.29-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.29-r2.ebuild
index 0b2d3f6bf9b5..5b51771cb09d 100644
--- a/www-servers/lighttpd/lighttpd-1.4.29-r2.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.29-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29-r2.ebuild,v 1.3 2011/09/25 14:43:51 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29-r2.ebuild,v 1.4 2011/09/26 17:08:43 hwoarang Exp $
 
 EAPI="4"
 
@@ -102,6 +102,7 @@ src_prepare() {
 	if use uploadprogress; then
 	    epatch "${FILESDIR}"/${P}-mod_uploadprogress.patch
 	fi
+	epatch "${FILESDIR}"/${P}-ssl-no-ecdh.patch
 	eautoreconf
 }
 src_configure() {