Version bump.

5 files changed, 182 insertions, 1 deletions

diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index d145341318dd..fa0753984989 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,12 @@
 # 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.53 2004/11/20 17:41:24 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.54 2004/12/14 18:46:01 brix Exp $
+
+*ipw2100-1.0.2 (14 Dec 2004)
+
+  14 Dec 2004; Henrik Brix Andersen <brix@gentoo.org>
+  +files/ipw2100-1.0.2-set_security.patch, +ipw2100-1.0.2.ebuild:
+  Version bump.
 
   20 Nov 2004; Henrik Brix Andersen <brix@gentoo.org> ipw2100-1.0.1.ebuild:
   Added Giuseppe Della Ricca's kernel 2.4 backport patch.
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index 04555eb3afa8..506b1eda46a8 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,3 +1,4 @@
+MD5 26a66b69de85f3be8764ad4ffb85bbaf ipw2100-1.0.2.ebuild 3243
 MD5 e4fb9f9e2184d215b9238a04495accba ipw2100-1.0.1.ebuild 3905
 MD5 a5620b55402273b14f29c39e0f294299 ipw2100-0.56-r1.ebuild 3996
 MD5 1c052a77ae214ac05b9f248be0948b5e ChangeLog 10425
@@ -5,7 +6,9 @@ MD5 172db10566470c8f64b5911609a8e5f9 metadata.xml 318
 MD5 5d4b6432364194f1da3e03d63c98de75 ipw2100-1.0.0.ebuild 3818
 MD5 b80746d07b956e30d091d5b070694b15 files/ipw2100-0.56-2.6.10-susp.patch 1484
 MD5 65f9c3d1b61f2e64d1e47a5d876946e4 files/ipw2100-0.56-wpa_eapol_fix.patch 624
+MD5 b43aa27d23c37eae087e1fbc203e91ac files/ipw2100-1.0.2-set_security.patch 940
 MD5 20fe178fabb9591d81a6cbf182fd520a files/digest-ipw2100-1.0.0 125
 MD5 e268f53cf63bf9a02d4c67252d0ca889 files/digest-ipw2100-1.0.1 197
+MD5 8138262ab3ce30a4a7462096daab8139 files/digest-ipw2100-1.0.2 125
 MD5 3281ce7f4f675298655322854f41fdd6 files/digest-ipw2100-0.56-r1 195
 MD5 aca6bf1c2d71e72adfc952d903c77f6b files/ipw2100-0.56-ieee80211_scan_age.2.patch 1718
diff --git a/net-wireless/ipw2100/files/digest-ipw2100-1.0.2 b/net-wireless/ipw2100/files/digest-ipw2100-1.0.2
new file mode 100644
index 000000000000..40317a282c47
--- /dev/null
+++ b/net-wireless/ipw2100/files/digest-ipw2100-1.0.2
@@ -0,0 +1,2 @@
+MD5 5ba45b7586ee61e319681d6c5f77616e ipw2100-1.0.2.tgz 138288
+MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471
diff --git a/net-wireless/ipw2100/files/ipw2100-1.0.2-set_security.patch b/net-wireless/ipw2100/files/ipw2100-1.0.2-set_security.patch
new file mode 100644
index 000000000000..bbd5134d0760
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.0.2-set_security.patch
@@ -0,0 +1,30 @@
+diff -urp ipw2100-1.0.2/ipw2100.c ipw2100-1.0.2-set_security/ipw2100.c
+--- ipw2100-1.0.2/ipw2100.c	2004-12-14 07:29:32.000000000 +0100
++++ ipw2100-1.0.2-set_security/ipw2100.c	2004-12-14 19:13:52.031176680 +0100
+@@ -5788,7 +5788,7 @@ static int ipw2100_wpa_enable(struct ipw
+ 	}
+ 
+ 	if (ieee->set_security)
+-		ieee->set_security(ieee, &sec);
++		ieee->set_security(ieee->dev, &sec);
+ 	else
+ 		ret = -EOPNOTSUPP;
+ 		
+@@ -5815,7 +5815,7 @@ static int ipw2100_wpa_set_auth_algs(str
+ 	}
+ 
+ 	if (ieee->set_security)
+-		ieee->set_security(ieee, &sec);
++		ieee->set_security(ieee->dev, &sec);
+ 	else
+ 		ret = -EOPNOTSUPP;
+ 		
+@@ -6067,7 +6067,7 @@ static int ipw2100_wpa_set_encryption(st
+ 	}
+  done:
+ 	if (ieee->set_security)
+-		ieee->set_security(ieee, &sec);
++		ieee->set_security(ieee->dev, &sec);
+ 
+ 	/* Do not reset port if card is in Managed mode since resetting will
+ 	 * generate new IEEE 802.11 authentication which may end up in looping
diff --git a/net-wireless/ipw2100/ipw2100-1.0.2.ebuild b/net-wireless/ipw2100/ipw2100-1.0.2.ebuild
new file mode 100644
index 000000000000..b90cde8128db
--- /dev/null
+++ b/net-wireless/ipw2100/ipw2100-1.0.2.ebuild
@@ -0,0 +1,140 @@
+# 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-1.0.2.ebuild,v 1.1 2004/12/14 18:46:01 brix Exp $
+
+inherit kernel-mod eutils
+
+FW_VERSION="1.3"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2100 3B miniPCI adapter"
+
+HOMEPAGE="http://ipw2100.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
+		mirror://gentoo/${PN}-fw-${FW_VERSION}.tgz"
+
+LICENSE="GPL-2 ipw2100-fw"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND="virtual/linux-sources
+		!net-wireless/ipw2200
+		sys-apps/sed"
+RDEPEND=">=sys-apps/hotplug-20040923
+		>=net-wireless/wireless-tools-27_pre23"
+
+pkg_setup() {
+	local DIE=0
+
+	if kernel-mod_is_2_4_kernel
+	then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	if ! kernel-mod_configoption_present NET_RADIO
+	then
+		eerror ""
+		eerror "${P} requires support for Wireless LAN drivers (non-hamradio) &"
+		eerror "Wireless Extensions (CONFIG_NET_RADIO) in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_ARC4
+	then
+		eerror ""
+		eerror "${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRYPTO_MICHAEL_MIC
+	then
+		eerror ""
+		eerror "${P} requires support for Michael MIC keyed digest algorithm"
+		eerror "(CONFIG_CRYPTO_MICHAEL_MIC) in the kernel."
+		DIE=1
+	fi
+
+	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."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present FW_LOADER
+	then
+		eerror ""
+		eerror "${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)"
+		eerror "in the kernel."
+		DIE=1
+	fi
+
+	if ! kernel-mod_configoption_present CRC32
+	then
+		eerror ""
+		eerror "${P} requires support for CRC32 functions (CONFIG_CRC32) in the"
+		eerror "kernel."
+		DIE=1
+	fi
+
+	kernel-mod_check_modules_supported
+
+	if [ $DIE -eq 1 ]
+	then
+		eerror ""
+		die "You kernel is missing the required option(s) listed above."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-set_security.patch
+
+	einfo "Patching Makefile to enable WPA"
+	sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \
+		${S}/Makefile
+
+	# let pkg_postinst() handle depmod
+	sed -i "s:/sbin/depmod -a::" ${S}/Makefile
+
+	kernel-mod_getversion
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i 's:SUBDIRS=:M=:g' ${S}/Makefile
+	fi
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux all || die
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	emake KSRC=${ROOT}/usr/src/linux KMISC=${D}/lib/modules/${KV}/net install || die
+
+	set_arch_to_portage
+
+	dodoc ISSUES README.ipw2100 CHANGES LICENSE
+
+	insinto /lib/firmware
+	doins ${WORKDIR}/${PN}-${FW_VERSION}.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-p.fw
+	doins ${WORKDIR}/${PN}-${FW_VERSION}-i.fw
+	newins ${WORKDIR}/LICENSE ${PN}-${FW_VERSION}-LICENSE
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}