Fixup ssl support.

Package-Manager: portage-2.1

4 files changed, 53 insertions, 15 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 04bbaf73a4f8..5545e70e3756 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/mdadm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.28 2006/06/08 10:22:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.29 2006/06/10 21:20:18 vapier Exp $
+
+  10 Jun 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/mdadm-2.5-ssl-cleanup.patch, mdadm-2.5.ebuild:
+  Fixup ssl support.
 
 *mdadm-2.5 (08 Jun 2006)
 
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 4ba759d6200c..57dde1ef34df 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -17,6 +17,10 @@ AUX mdadm-2.4.1-syslog-updates.patch 1317 RMD160 f757dc62be08b1efb8f3883f4fd0fa5
 MD5 d1232df233ac842e9679a4abf7348c81 files/mdadm-2.4.1-syslog-updates.patch 1317
 RMD160 f757dc62be08b1efb8f3883f4fd0fa5d8ec4f0bf files/mdadm-2.4.1-syslog-updates.patch 1317
 SHA256 435c56d360a766ea20a38f9c74162f75b0453d8fe6ae17dcd19c515a4007a9fd files/mdadm-2.4.1-syslog-updates.patch 1317
+AUX mdadm-2.5-ssl-cleanup.patch 779 RMD160 2ac109246c992a71a5d257dc97d28a14b348f2a3 SHA1 c9993b1af40171d37d0bf6cb46e0dbd82371f9be SHA256 ef5e74dc64c29f82d671ffb5f8202499af4b3dce9af6b2a83879186842e729b8
+MD5 94b185be7fa70a3458cdfabaf941a7c9 files/mdadm-2.5-ssl-cleanup.patch 779
+RMD160 2ac109246c992a71a5d257dc97d28a14b348f2a3 files/mdadm-2.5-ssl-cleanup.patch 779
+SHA256 ef5e74dc64c29f82d671ffb5f8202499af4b3dce9af6b2a83879186842e729b8 files/mdadm-2.5-ssl-cleanup.patch 779
 AUX mdadm.confd 205 RMD160 9b4af661ef05e6dbab9ead55506a1ef0670a9076 SHA1 46d75372ecfcfcb34b1576bd994c22cae24f2a79 SHA256 ec55674955af7a31da51b8b72b599e8519809287dad796a9b16155bcba471b79
 MD5 6682657bc391e56742065e9aecc2306f files/mdadm.confd 205
 RMD160 9b4af661ef05e6dbab9ead55506a1ef0670a9076 files/mdadm.confd 205
@@ -48,14 +52,14 @@ EBUILD mdadm-2.4.1.ebuild 1230 RMD160 f0307f4f51cb0c63bf4735b74fa0b0961f7e6462 S
 MD5 c7f60353a408466abd3891e1e6543be0 mdadm-2.4.1.ebuild 1230
 RMD160 f0307f4f51cb0c63bf4735b74fa0b0961f7e6462 mdadm-2.4.1.ebuild 1230
 SHA256 540323ce865dbe90d5b16c0b12061eae78fe02fb2cf25cd3dce8dced4cd9ee04 mdadm-2.4.1.ebuild 1230
-EBUILD mdadm-2.5.ebuild 1332 RMD160 104aa8c17229b7f57e86e7bd8c08a7d5ab190f69 SHA1 9aac0425c570b1a556c05bf650a62479b13fe2a7 SHA256 aacceac1d9d165e7fc13543cdc225dc16cde23bbf880c37fe693d1af1750158d
-MD5 bcb4b6610887c08d65de064e6a765253 mdadm-2.5.ebuild 1332
-RMD160 104aa8c17229b7f57e86e7bd8c08a7d5ab190f69 mdadm-2.5.ebuild 1332
-SHA256 aacceac1d9d165e7fc13543cdc225dc16cde23bbf880c37fe693d1af1750158d mdadm-2.5.ebuild 1332
-MISC ChangeLog 6518 RMD160 19b4f350c506d2fe3bbab695852e88ab4f1d4f9b SHA1 5fd43e57110d4bc11022052955235d4cb84e1ffe SHA256 7cf72ef7ad2d093f3dd4edf46db75d9033ff6c6b5f90ac7b4d5e723400a284a9
-MD5 1bba8c3404606a865b12fa1c1d1e0404 ChangeLog 6518
-RMD160 19b4f350c506d2fe3bbab695852e88ab4f1d4f9b ChangeLog 6518
-SHA256 7cf72ef7ad2d093f3dd4edf46db75d9033ff6c6b5f90ac7b4d5e723400a284a9 ChangeLog 6518
+EBUILD mdadm-2.5.ebuild 1455 RMD160 7d9e0e7cd6776b8c46bed060af4bcb8196668b35 SHA1 5a950948d02a7c2d1227f88ec902b09920e7b96e SHA256 9ac69e38319e8b8903ee5ac14a9b3cdf30ee22e7663de40ae442c6cd31924302
+MD5 7a0202f4cd50f4cc860021740996f9e9 mdadm-2.5.ebuild 1455
+RMD160 7d9e0e7cd6776b8c46bed060af4bcb8196668b35 mdadm-2.5.ebuild 1455
+SHA256 9ac69e38319e8b8903ee5ac14a9b3cdf30ee22e7663de40ae442c6cd31924302 mdadm-2.5.ebuild 1455
+MISC ChangeLog 6646 RMD160 c9a7bdf4b5d47200d30402e89ec5be142d1be60a SHA1 a0a67a24dd0c4f1ce5319986c85023d5beedf082 SHA256 3e03a37523de5561d326468b00fdb46df1c898fd083060a97c55e8e27ada6012
+MD5 7cc0935d91bf9e69eaccc3c378ddf6be ChangeLog 6646
+RMD160 c9a7bdf4b5d47200d30402e89ec5be142d1be60a ChangeLog 6646
+SHA256 3e03a37523de5561d326468b00fdb46df1c898fd083060a97c55e8e27ada6012 ChangeLog 6646
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -75,7 +79,7 @@ SHA256 db0272a9239da2c4081cbe5b25d8f9dbd8a300681840c7166417d63bfa2caddb files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEh/tk2+ySkm8kpY0RAkwQAJ4hP9dxqDxWgpY1CoRM7vgFn/atIgCdGJgK
-Tk5zVQT02fe7zkhjb602IDQ=
-=Veh2
+iD8DBQFEiziS2+ySkm8kpY0RAhRfAJ9tAknT8BFvt8Io5KdT0FbUUeycCACeLnkU
+6IZPatb0dbqN+AEy8i5aIYk=
+=i83H
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch b/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch
new file mode 100644
index 000000000000..4c519f3158a9
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-2.5-ssl-cleanup.patch
@@ -0,0 +1,28 @@
+ - the SHA1 func is in libcrypto, not libssl
+ - control ssl support a bit better
+
+--- Makefile
++++ Makefile
+@@ -32,7 +32,9 @@
+ TCC = tcc
+ UCLIBC_GCC = $(shell for nm in i386-uclibc-linux-gcc i386-uclibc-gcc; do which $$nm > /dev/null && { echo $$nm ; exit; } ; done; echo false No uclibc found )
+ DIET_GCC = diet gcc
+-LDLIBS=-lssl
++ifeq ($(USE_SSL),1)
++LDLIBS=-lcrypto
++endif
+ 
+ KLIBC=/home/src/klibc/klibc-0.77
+ 
+@@ -72,6 +76,11 @@
+ 	Create.c Detail.c Examine.c Grow.c Monitor.c dlink.c Kill.c Query.c \
+ 	mdopen.c super0.c super1.c bitmap.c restripe.c sysfs.c
+ 
++ifneq ($(USE_SSL),1)
++OBJS += SHA1.o sha1.o
++SRCS += SHA1.c sha1.c
++endif
++
+ ASSEMBLE_SRCS := mdassemble.c Assemble.c config.c dlink.c util.c super0.c super1.c
+ ASSEMBLE_FLAGS:= -DMDASSEMBLE
+ ifdef MDASSEMBLE_AUTO
diff --git a/sys-fs/mdadm/mdadm-2.5.ebuild b/sys-fs/mdadm/mdadm-2.5.ebuild
index 0a14ce47f5bd..5bff8efd9b8f 100644
--- a/sys-fs/mdadm/mdadm-2.5.ebuild
+++ b/sys-fs/mdadm/mdadm-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.5.ebuild,v 1.1 2006/06/08 10:22:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-2.5.ebuild,v 1.2 2006/06/10 21:20:18 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,15 +11,16 @@ SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static"
+IUSE="static ssl"
 
-RDEPEND=""
+RDEPEND="ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	>=sys-apps/portage-2.0.51"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-ssl-cleanup.patch
 	epatch "${FILESDIR}"/${PN}-2.3.1-endian.patch #122269
 	epatch "${FILESDIR}"/${PN}-1.9.0-dont-make-man.patch
 	epatch "${FILESDIR}"/${PN}-2.4.1-syslog-updates.patch
@@ -27,6 +28,7 @@ src_unpack() {
 }
 
 src_compile() {
+	use ssl && export USE_SSL=1 || export USE_SSL=0
 	emake \
 		CWFLAGS="-Wall" \
 		CXFLAGS="${CFLAGS}" \