Fixed bug 79428.

Package-Manager: portage-2.0.51-r15

5 files changed, 106 insertions, 12 deletions

diff --git a/app-emulation/mol/ChangeLog b/app-emulation/mol/ChangeLog
index bec19a8bc1d5..04cfe3fe51b1 100644
--- a/app-emulation/mol/ChangeLog
+++ b/app-emulation/mol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/mol
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.43 2005/01/27 23:19:54 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/ChangeLog,v 1.44 2005/01/28 20:06:05 hansmi Exp $
+
+  28 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +files/mol-0.9.71_pre1-linux-2.6.9.patch, mol-0.9.70.ebuild,
+  mol-0.9.71_pre1.ebuild:
+  Fixed bug 79428, where the sheep driver failed to compile with linux >= 2.6.9.
 
 *mol-0.9.70-r1 (28 Jan 2005)
 
diff --git a/app-emulation/mol/Manifest b/app-emulation/mol/Manifest
index b227d0566d0b..20a72cc5664a 100644
--- a/app-emulation/mol/Manifest
+++ b/app-emulation/mol/Manifest
@@ -1,12 +1,13 @@
-MD5 145dd9a806ad2fa0d92d9ced6d6110a6 ChangeLog 8606
-MD5 153f3ce14e24bdb2161ee7310739f8f4 mol-0.9.70.ebuild 3896
-MD5 3263d375abba2d098c636efc2b135ea5 metadata.xml 333
+MD5 accaa65f5e1f71c28f640d7c267d8de8 mol-0.9.71_pre1.ebuild 4114
+MD5 37e2c58edef99f3f2be0803169d89bcd mol-0.9.70.ebuild 4048
 MD5 7b1c05be512e22dbfb69b67e87d6d2f7 mol-0.9.70-r1.ebuild 3940
-MD5 bed6f1ce7cb68d6a2f960221656931c9 mol-0.9.71_pre1.ebuild 4051
-MD5 934e9ecf483ff3c4e34bb6307212d776 files/mol-0.9.70-nopriority.patch 1853
-MD5 3944510308e77b92ac85c07708947ad0 files/digest-mol-0.9.70-r1 64
-MD5 2f8f758938db9b3cb5a13c0b33d989e3 files/mol-module-fix.patch 327
-MD5 453e05b555f037270dd6da665e100aa8 files/digest-mol-0.9.71_pre1 69
+MD5 3263d375abba2d098c636efc2b135ea5 metadata.xml 333
+MD5 0fe63ccbdc1610905e5bb53ab7833767 ChangeLog 8831
 MD5 0ea7bd65a5ff4666665a71fb9652aae8 files/mol-0.9.70-makefile-fix.patch 924
-MD5 3944510308e77b92ac85c07708947ad0 files/digest-mol-0.9.70 64
+MD5 2f8f758938db9b3cb5a13c0b33d989e3 files/mol-module-fix.patch 327
+MD5 f0299c003ac50a8f73bd8264889116d7 files/mol-0.9.71_pre1-linux-2.6.9.patch 2571
 MD5 3bf68312e4299f777065f55eea5297fa files/mol-0.9.71_pre1-nopriority.patch 1861
+MD5 3944510308e77b92ac85c07708947ad0 files/digest-mol-0.9.70 64
+MD5 453e05b555f037270dd6da665e100aa8 files/digest-mol-0.9.71_pre1 69
+MD5 3944510308e77b92ac85c07708947ad0 files/digest-mol-0.9.70-r1 64
+MD5 934e9ecf483ff3c4e34bb6307212d776 files/mol-0.9.70-nopriority.patch 1853
diff --git a/app-emulation/mol/files/mol-0.9.71_pre1-linux-2.6.9.patch b/app-emulation/mol/files/mol-0.9.71_pre1-linux-2.6.9.patch
new file mode 100644
index 000000000000..dbff915ed248
--- /dev/null
+++ b/app-emulation/mol/files/mol-0.9.71_pre1-linux-2.6.9.patch
@@ -0,0 +1,80 @@
+--- mol-0.9.70.orig/src/netdriver/sheep.c
++++ mol-0.9.70/src/netdriver/sheep.c
+@@ -25,12 +25,20 @@
+ #include <linux/in.h>
+ #include <linux/wait.h>
+ 
++MODULE_AUTHOR("Marc Hellwig and Christian Bauer");
++MODULE_DESCRIPTION("SheepShaver/Basilisk II networking");
+ MODULE_LICENSE("GPL");
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ #define LINUX_26
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
++#define ETH_HDR(skb) eth_hdr((skb))
++#else
++#define ETH_HDR(skb) (skb)->mac.ethernet
++#endif
++
+ #define DEBUG 0
+ 
+ #define bug printk
+@@ -151,7 +159,7 @@
+ static int 
+ sheep_net_receiver( struct sk_buff *skb, struct net_device *dev, struct packet_type *pt )
+ {
+-	int multicast = (skb->mac.ethernet->h_dest[0] & ETH_ADDR_MULTICAST);
++	int multicast = (ETH_HDR(skb)->h_dest[0] & ETH_ADDR_MULTICAST);
+ 	const char *laddr = dev->dev_addr;
+ 	struct sk_buff *skb2;
+ 	struct SheepVars *v = (struct SheepVars*)pt;
+@@ -165,7 +173,7 @@
+ 
+ 		if( !multicast ) {
+ 			// Drop, unless this is a localhost -> MOL transmission */
+-			if( addrcmp((char*)&skb->mac.ethernet->h_dest, v->fake_addr) )
++			if( addrcmp((char*)&ETH_HDR(skb)->h_dest, v->fake_addr) )
+ 				goto drop;
+ 
+ 			/* XXX: If it were possible, we would prevent the packet from beeing sent out
+@@ -176,16 +184,16 @@
+ 			 * the controller. This way, the packet ought to be discarded by
+ 			 * switches.
+ 			 */
+-			cpyaddr( &skb->mac.ethernet->h_dest[0], laddr );
++			cpyaddr( &ETH_HDR(skb)->h_dest[0], laddr );
+ 		}
+ 	} else {
+ 		// is this a packet to the local host from MOL?
+-		if( !addrcmp((char*)&skb->mac.ethernet->h_source, v->fake_addr) )
++		if( !addrcmp((char*)&ETH_HDR(skb)->h_source, v->fake_addr) )
+ 			goto drop;
+ 		
+ 		if( !multicast ) {
+ 			// if the packet is not meant for this host, discard it
+-			if( addrcmp((char*)&skb->mac.ethernet->h_dest, laddr) )
++			if( addrcmp((char*)&ETH_HDR(skb)->h_dest, laddr) )
+ 				goto drop;
+ 
+ 			// filter IP-traffic
+@@ -213,7 +221,7 @@
+ 	skb = skb2;
+ 
+ 	if( !multicast )
+-		cpyaddr( &skb->mac.ethernet->h_dest[0], v->fake_addr );
++		cpyaddr( &ETH_HDR(skb)->h_dest[0], v->fake_addr );
+ 
+ 	// We also want the Ethernet header
+ 	skb_push( skb, skb->data - skb->mac.raw );
+@@ -394,7 +402,7 @@
+ 	skb->mac.raw = skb->data;
+ 
+ 	// Base the IP-filter on the IP address of outgoing ARPs
+-	if( skb->mac.ethernet->h_proto == htons(ETH_P_ARP) ) {
++	if( ETH_HDR(skb)->h_proto == htons(ETH_P_ARP) ) {
+ 		char *s = &skb->data[14+14];	/* source IP-address */
+ 		int n[4];
+ 		if( *(long*)s != v->ipfilter ) {
+--- mol-0.9.70.orig/debian/debian.mol-modules-source/control.m4
diff --git a/app-emulation/mol/mol-0.9.70.ebuild b/app-emulation/mol/mol-0.9.70.ebuild
index e66a3cb3dd39..9967d0da9b6e 100644
--- a/app-emulation/mol/mol-0.9.70.ebuild
+++ b/app-emulation/mol/mol-0.9.70.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.70.ebuild,v 1.13 2005/01/27 23:19:54 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.70.ebuild,v 1.14 2005/01/28 20:06:05 hansmi Exp $
 
 inherit flag-o-matic eutils
 
@@ -45,6 +45,11 @@ src_unpack() {
 
 src_compile() {
 	filter-flags -fsigned-char
+echo -- "$LDFLAGS"
+	# See bug #70367, remove -Wl,-O? from LDFLAGS as it causes
+	# the compilation to fail.
+	filter-ldflags "-Wl,-O?"
+echo -- "$LDFLAGS"
 
 	export KERNEL_SOURCE="/usr/src/${FK}"
 	export LDFLAGS=""
diff --git a/app-emulation/mol/mol-0.9.71_pre1.ebuild b/app-emulation/mol/mol-0.9.71_pre1.ebuild
index 12f41565de91..9a5294998ca2 100644
--- a/app-emulation/mol/mol-0.9.71_pre1.ebuild
+++ b/app-emulation/mol/mol-0.9.71_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.71_pre1.ebuild,v 1.2 2005/01/27 18:18:12 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/mol/mol-0.9.71_pre1.ebuild,v 1.3 2005/01/28 20:06:05 hansmi Exp $
 
 inherit flag-o-matic eutils
 
@@ -36,6 +36,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-module-fix.patch
 	epatch ${FILESDIR}/${P}-nopriority.patch
 
+	# Fixes bug 79428
+	epatch ${FILESDIR}/${P}-linux-2.6.9.patch
+
 	# dhcp config fix and show dchpd messages on starting mol
 	sed -i "s:#ddns-update-style:ddns-update-style:g" Doc/config/dhcpd-mol.conf || die
 	sed -i "s:DHCPD\ -q\ -cf:DHCPD\ -cf:g" Doc/config/tunconfig || die