From: Henrik Brix Andersen Date: Fri, 29 Oct 2004 12:13:49 +0000 (+0000) Subject: Update patches. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b20399c0db1609f9105265e233d44392c7e265e;p=gentoo.git Update patches. --- diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog index ee6281da2476..48e38f3c8bd1 100644 --- 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.38 2004/10/24 14:08:22 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.39 2004/10/29 12:13:49 brix Exp $ + + 29 Oct 2004; Henrik Brix Andersen + +files/ipw2100-0.56-2.6.10-susp.patch, ipw2100-0.56-r1.ebuild: + Added patch for compiling against kernel 2.6.10-rc1, updated patch for kernel + 2.4. 24 Oct 2004; Henrik Brix Andersen ipw2100-0.56-r1.ebuild: Test all needed kernel options before bailing out. Thanks to Rudi Lippert diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest index e981ebc16819..bde3fb596a67 100644 --- a/net-wireless/ipw2100/Manifest +++ b/net-wireless/ipw2100/Manifest @@ -2,15 +2,16 @@ MD5 64df9f7be17c96b466f939076dcbeb98 ipw2100-0.55.ebuild 2949 MD5 c4a97eb25e8d493065e9168268ddb856 ipw2100-0.54.ebuild 2772 MD5 c25026014f8d853d84d6cdbb05d848ff ipw2100-0.55-r2.ebuild 3725 MD5 750e2e1318bb6ccf995199399d7a1e9f ipw2100-0.56.ebuild 3999 -MD5 2b72d170d9e034cf544459d56bcc5651 ipw2100-0.56-r1.ebuild 3938 -MD5 d8e4ae8b79ed5035959feee55f87d06c ChangeLog 8141 +MD5 fadd1dfb2b0750da30a9626ef3f4a521 ipw2100-0.56-r1.ebuild 3981 +MD5 e3d740aded45e34e7a4fb6b8e5fcd47e ChangeLog 8348 MD5 8a68b74057e911e6804f77dc21959e80 metadata.xml 282 MD5 78f6d8f071cd7615df4ad78abf3e55d0 ipw2100-0.44.ebuild 2305 MD5 1396122738f1bdc3902e7dc6dde31776 ipw2100-0.55-r1.ebuild 3069 +MD5 b80746d07b956e30d091d5b070694b15 files/ipw2100-0.56-2.6.10-susp.patch 1484 MD5 65f9c3d1b61f2e64d1e47a5d876946e4 files/ipw2100-0.56-wpa_eapol_fix.patch 624 MD5 b3a600a244bd8a64fd8ade3036a390e1 files/digest-ipw2100-0.55-r1 124 MD5 feb0687b42df7addb26274578808b9aa files/digest-ipw2100-0.55-r2 193 -MD5 5fa9f803ddce8467b15e0397a8155057 files/digest-ipw2100-0.56-r1 195 +MD5 e209b9e5956f0dc1902a5d2b308dde75 files/digest-ipw2100-0.56-r1 195 MD5 0a8c00c1860d7bb54686e647740f23d0 files/ipw2100-0.55-modparam-perm.patch 769 MD5 1ce1888cb1dcbc65bc76ba8f3f7875b9 files/ipw2100-0.55_manual-disable.patch 2898 MD5 5ccd21f930c68d8fd53afe3a87bcd56e files/digest-ipw2100-0.44 124 diff --git a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1 b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1 index c33cf5be1ca0..917be95cb3b8 100644 --- a/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1 +++ b/net-wireless/ipw2100/files/digest-ipw2100-0.56-r1 @@ -1,3 +1,3 @@ MD5 96473874bb682e2701c4e8e6dd662a64 ipw2100-0.56.tgz 132854 MD5 46aa75bcda1a00efa841f9707bbbd113 ipw2100-fw-1.3.tgz 248471 -MD5 8e0d061b2567361c76c3193aa342ec6f ipw2100-0.56-2.4-v1.patch.gz 8208 +MD5 34dc57c2a37acb3b613e907de16e0080 ipw2100-0.56-2.4-v7.patch.gz 8480 diff --git a/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.patch b/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.patch new file mode 100644 index 000000000000..ed62a695d751 --- /dev/null +++ b/net-wireless/ipw2100/files/ipw2100-0.56-2.6.10-susp.patch @@ -0,0 +1,47 @@ +diff -urp ipw2100-0.56/ipw2100.c ipw2100-0.56/ipw2100.c +--- ipw2100-0.56/ipw2100.c 2004-10-14 03:06:57.000000000 +0800 ++++ ipw2100-0.56/ipw2100.c 2004-10-28 15:57:10.000000000 +0800 +@@ -6475,7 +6475,6 @@ static int ipw2100_pci_init_one(struct p + pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); + + pci_set_power_state(pdev, 0); +- pci_restore_state(pdev, NULL); + + if (!ipw2100_hw_is_adapter_in_system(dev)) { + err = -ENODEV; +@@ -6666,8 +6665,9 @@ static int ipw2100_suspend(struct pci_de + /* Remove the PRESENT state of the device */ + netif_device_detach(dev); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) + pci_save_state(pdev, priv->pm_state); +- pci_disable_device(pdev); // needed? ++#endif + pci_set_power_state(pdev, state); + + return 0; +@@ -6686,7 +6686,11 @@ static int ipw2100_resume(struct pci_dev + dev->name); + + pci_set_power_state(pdev, 0); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) + pci_restore_state(pdev, priv->pm_state); ++#else ++ pci_restore_state(pdev); ++#endif + + /* + * Suspend/Resume resets the PCI configuration space, so we have to +diff -urp ipw2100-0.56/ipw2100.h ipw2100-0.56/ipw2100.h +--- ipw2100-0.56/ipw2100.h 2004-10-14 03:06:57.000000000 +0800 ++++ ipw2100-0.56/ipw2100.h 2004-10-27 11:16:36.000000000 +0800 +@@ -608,7 +608,9 @@ struct ipw2100_priv { + spinlock_t low_lock; + + wait_queue_head_t wait_command_queue; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) + u32 pm_state[PM_STATE_SIZE]; ++#endif + }; + + diff --git a/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild b/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild index 6fc790a4b7f9..8ca06d880505 100644 --- 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.3 2004/10/24 14:08:22 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-0.56-r1.ebuild,v 1.4 2004/10/29 12:13:49 brix Exp $ inherit kernel-mod eutils @@ -11,7 +11,7 @@ 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 - mirror://gentoo/${P}-2.4-v1.patch.gz" + mirror://gentoo/${P}-2.4-v7.patch.gz" LICENSE="GPL-2 ipw2100-fw" SLOT="0" @@ -90,12 +90,13 @@ src_unpack() { if kernel-mod_is_2_4_kernel then cd ${S} - epatch ${WORKDIR}/${P}-2.4-v1.patch + epatch ${WORKDIR}/${P}-2.4-v7.patch fi cd ${S} epatch ${FILESDIR}/${P}-wpa_eapol_fix.patch epatch ${FILESDIR}/${P}-ieee80211_scan_age.2.patch + epatch ${FILESDIR}/${P}-2.6.10-susp.patch einfo "Patching Makefile to enable WPA" sed -i "s:^# CONFIG_IEEE80211_WPA=:CONFIG_IEEE80211_WPA=:" \