Fix bug #67928

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index b68cc4f438b0fbedace9aa32197ba1afd296062c..dc019230fd12bea8091abb1511b1221d58178858 100644 (file)
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/ipw2100
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.36 2004/10/19 07:11:42 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.37 2004/10/21 08:13:25 brix Exp $
+
+  21 Oct 2004; Henrik Brix Andersen <brix@gentoo.org> ipw2100-0.56-r1.ebuild,
+  ipw2100-0.56.ebuild:
+  Fixed AES detection logic to work with kernels prior to 2.6.8. Fixes bug
+  #67928.
 
 *ipw2100-0.56-r1 (19 Oct 2004)
 

diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index fccc4d6daa3df8d8b13d764ad2b7a1f8938ad4b2..48d9cc53e172b2a5a732f5cef794c03aeaca92bf 100644 (file)
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,9 +1,9 @@
 MD5 64df9f7be17c96b466f939076dcbeb98 ipw2100-0.55.ebuild 2949
 MD5 c4a97eb25e8d493065e9168268ddb856 ipw2100-0.54.ebuild 2772
 MD5 c25026014f8d853d84d6cdbb05d848ff ipw2100-0.55-r2.ebuild 3725
-MD5 ed4973d07fe7dbb59f0c08be55cd7981 ipw2100-0.56.ebuild 3868
-MD5 8874883a0b84d2c0dc51a6524038a0be ipw2100-0.56-r1.ebuild 3978
-MD5 d5175459b4b3521480596550c877d91c ChangeLog 7753
+MD5 750e2e1318bb6ccf995199399d7a1e9f ipw2100-0.56.ebuild 3999
+MD5 d64d58577172ebe9757d5eff3b06ddc0 ipw2100-0.56-r1.ebuild 4109
+MD5 9052487b63466c4c748921304fbb5c12 ChangeLog 7940
 MD5 8a68b74057e911e6804f77dc21959e80 metadata.xml 282
 MD5 78f6d8f071cd7615df4ad78abf3e55d0 ipw2100-0.44.ebuild 2305
 MD5 1396122738f1bdc3902e7dc6dde31776 ipw2100-0.55-r1.ebuild 3069

diff --git a/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild b/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild
index ffa5d5b633016ac73bb6af6d470c2ff80712ec34..af5b5c3724bd6b7c1a52abef80869d835e9399df 100644 (file)
--- a/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild
+++ b/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild,v 1.1 2004/10/19 07:11:42 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild,v 1.2 2004/10/21 08:13:25 brix Exp $
 
 inherit kernel-mod eutils
 
@@ -51,12 +51,14 @@ src_unpack() {
                die "CONFIG_CRYPTO_MICHAEL_MIC support not detected."
        fi
 
-       if ! kernel-mod_configoption_present CRYPTO_AES_586
+       if ! kernel-mod_configoption_present CRYPTO_AES_586 && ! kernel-mod_configoption_present CRYPTO_AES
        then
                eerror ""
                eerror "${P} requires support for AES cipher algorithms (i586)"
                eerror "(CONFIG_CRYPTO_AES_586) in the kernel."
                eerror ""
+               eerror "This is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
+               eerror ""
                die "CONFIG_CRYPTO_AES_586 support not detected."
        fi
 

diff --git a/net-wireless/ipw2100/ipw2100-0.56.ebuild b/net-wireless/ipw2100/ipw2100-0.56.ebuild
index 11808e782828e834aae0db0d9a9b930c584a0d23..79233551da0ffad37ba483a38edfa4fc07fd0ff0 100644 (file)
--- a/net-wireless/ipw2100/ipw2100-0.56.ebuild
+++ b/net-wireless/ipw2100/ipw2100-0.56.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56.ebuild,v 1.3 2004/10/19 07:11:42 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56.ebuild,v 1.4 2004/10/21 08:13:25 brix Exp $
 
 inherit kernel-mod eutils
 
@@ -51,12 +51,14 @@ src_unpack() {
                die "CONFIG_CRYPTO_MICHAEL_MIC support not detected."
        fi
 
-       if ! kernel-mod_configoption_present CRYPTO_AES_586
+       if ! kernel-mod_configoption_present CRYPTO_AES_586 && ! kernel-mod_configoption_present CRYPTO_AES
        then
                eerror ""
                eerror "${P} requires support for AES cipher algorithms (i586)"
                eerror "(CONFIG_CRYPTO_AES_586) in the kernel."
                eerror ""
+               eerror "This is called CONFIG_CRYPTO_AES in kernels prior to 2.6.8."
+               eerror ""
                die "CONFIG_CRYPTO_AES_586 support not detected."
        fi