- orphaned, outdated

Changed files:
    mol-configure.patch -> 1.2
    mol-curses.patch -> 1.2
    mol-gkh-compiler_h.patch -> 1.2
    mol-gkh-includes.patch -> 1.2
    mol-gkh.patch -> 1.2
    mol-kernel.patch -> 1.2
    mol-libimport.patch -> 1.2
    mol-netdriver.patch -> 1.2
    mol-sheepnet.patch -> 1.2
    mol-usbdev.patch -> 1.4
    mol.init -> 1.8

11 files changed, 0 insertions, 374 deletions

diff --git a/mol-configure.patch b/mol-configure.patch
deleted file mode 100644
index f0e6d9f..0000000
--- a/mol-configure.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -Naur mol-rsync.orig/configure.in mol-rsync/configure.in
---- mol-rsync.orig/configure.in	Sun Jan 26 21:13:05 2003
-+++ mol-rsync/configure.in	Wed Jan 29 23:29:00 2003
-@@ -257,15 +257,10 @@
- AC_ARG_ENABLE(debugger, [  --disable-debugger      do not build the MOL debugger], [] [] )
- 
- test "$enable_debugger" != "no" && { 
--    AC_CHECK_HEADER(ncurses.h,
--	[NCURSES_LDFLAGS=-lncurses],
--	if test -f /sw/include/ncurses.h ; then
--	    NCURSES_INCLUDE=-I/sw/include/
--	    NCURSES_LDFLAGS='-L/sw/lib/ -lncurses'
-- 	else
--	    enable_debugger=no
--	fi
--    )
-+    AC_CHECK_NCURSES
-+
-+    NCURSES_INCLUDE=$CURSES_INCLUDE
-+    NCURSES_LDFLAGS=$CURSES_LIBS
- }
- AM_CONDITIONAL(MOL_DEBUGGER, test "$enable_debugger" != no)
- 
-diff -Naur mol-rsync.orig/curses.m4 mol-rsync/curses.m4
---- mol-rsync.orig/curses.m4	Thu Jan  1 01:00:00 1970
-+++ mol-rsync/curses.m4	Sun Dec 22 14:05:55 2002
-@@ -0,0 +1,66 @@
-+dnl Rewritten from scratch. --wojtekka
-+dnl $Id$
-+
-+AC_DEFUN(AC_CHECK_NCURSES,[
-+  AC_SUBST(CURSES_LIBS)
-+  AC_SUBST(CURSES_INCLUDES)
-+
-+  AC_ARG_WITH(ncurses,
-+    [[  --with-ncurses[=dir]    Compile with ncurses/locate base dir]],
-+      if test "x$withval" = "xno" ; then
-+        without_ncurses=yes
-+      elif test "x$withval" != "xyes" ; then
-+        with_arg=$withval/include:-L$withval/lib
-+      fi)
-+
-+  if test "x$without_ncurses" != "xyes" ; then
-+    AC_MSG_CHECKING(for ncurses.h)
-+
-+    for i in $with_arg \
-+    		/usr/include: \
-+		/usr/local/include:"-L/usr/local/lib -L/usr/local/lib/ncurses" \
-+		/usr/pkg/include:-L/usr/pkg/lib \
-+		/usr/contrib/include:-L/usr/contrib/lib \
-+		/usr/freeware/include:-L/usr/freeware/lib32 \
-+    		/sw/include:-L/sw/lib \
-+    		/cw/include:-L/cw/lib; do
-+	
-+      incl=`echo "$i" | sed 's/:.*//'`
-+      lib=`echo "$i" | sed 's/.*://'`
-+		
-+      if test -f $incl/ncurses/ncurses.h; then
-+        include=$incl/ncurses
-+      elif test -f $incl/ncurses.h; then
-+        include=$incl
-+      fi
-+
-+      if test "x$include" != "x"; then
-+        AC_MSG_RESULT($include/ncurses.h)
-+	CURSES_LIBS="$lib"
-+	CURSES_INCLUDES=""
-+	if test "$include" != "/usr/include"; then
-+	  CURSES_INCLUDES="-I$include"
-+	fi
-+	if test "$incl" != "/usr/include"; then
-+	  CURSES_INCLUDES="$CURSES_INCLUDES -I$incl"
-+	fi
-+	have_ncurses=yes
-+	ldflags_old="$LDFLAGS"
-+	LDFLAGS="$CURSES_LIBS"
-+	AC_DEFINE(HAVE_NCURSES, 1, [define if You want ncurses])
-+	AC_CHECK_LIB(ncurses, initscr,
-+	  [CURSES_LIBS="$CURSES_LIBS -lncurses"],
-+	  [AC_CHECK_LIB(curses, initscr,
-+	    [CURSES_LIBS="$CURSES_LIBS -lcurses"])])
-+	LDFLAGS="$ldflags_old"
-+	break
-+      fi
-+    done
-+  fi
-+
-+  if test "x$have_ncurses" != "xyes"; then
-+    AC_MSG_RESULT(not found)
-+  fi
-+])
-+
-+
diff --git a/mol-curses.patch b/mol-curses.patch
deleted file mode 100644
index 36e23e0..0000000
--- a/mol-curses.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur mol-0.9.63.orig/src/debugger/deb/cmdline.c mol-0.9.63/src/debugger/deb/cmdline.c
---- mol-0.9.63.orig/src/debugger/deb/cmdline.c	Wed May  1 17:49:41 2002
-+++ mol-0.9.63/src/debugger/deb/cmdline.c	Sun Jun 23 23:23:56 2002
-@@ -16,7 +16,7 @@
- **************************************************************/
- 
- #include "mol_config.h"
--#include <curses.h>
-+#include <ncurses/curses.h>
- #include <stdarg.h>
- 
- #include "res_manager.h"
-diff -Naur mol-0.9.63.orig/src/debugger/deb/monitor.c mol-0.9.63/src/debugger/deb/monitor.c
---- mol-0.9.63.orig/src/debugger/deb/monitor.c	Wed May  1 17:49:40 2002
-+++ mol-0.9.63/src/debugger/deb/monitor.c	Sun Jun 23 23:24:05 2002
-@@ -17,7 +17,7 @@
- 
- #include "mol_config.h"
- 
--#include <curses.h>
-+#include <ncurses/curses.h>
- #include <signal.h>
- #include <termios.h>
- #include <stdarg.h>
diff --git a/mol-gkh-compiler_h.patch b/mol-gkh-compiler_h.patch
deleted file mode 100644
index ec62924..0000000
--- a/mol-gkh-compiler_h.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- mol/src/include/compiler.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ mol/src/include/compiler.h	2003-12-27 01:53:19.000000000 +0100
-@@ -0,0 +1,31 @@
-+#ifndef __LINUX_COMPILER_H
-+#define __LINUX_COMPILER_H
-+
-+#if __GNUC__ >= 3
-+#define inline		__inline__ __attribute__((always_inline))
-+#define inline__	__inline__ __attribute__((always_inline))
-+#define __inline	__inline__ __attribute__((always_inline))
-+#define __inline__	__inline__ __attribute__((always_inline))
-+#endif
-+
-+/* Somewhere in the middle of the GCC 2.96 development cycle, we implemented
-+   a mechanism by which the user can annotate likely branch directions and
-+   expect the blocks to be reordered appropriately.  Define __builtin_expect
-+   to nothing for earlier compilers.  */
-+
-+#if __GNUC__ == 2 && __GNUC_MINOR__ < 96
-+#define __builtin_expect(x, expected_value) (x)
-+#endif
-+
-+#define likely(x)	__builtin_expect((x),1)
-+#define unlikely(x)	__builtin_expect((x),0)
-+
-+/* GCC 3 (and probably earlier, I'm not sure) can be told to always inline
-+   a function. */
-+#if __GNUC__ < 3
-+#define force_inline inline
-+#else
-+#define force_inline inline __attribute__ ((always_inline))
-+#endif
-+
-+#endif /* __LINUX_COMPILER_H */
diff --git a/mol-gkh-includes.patch b/mol-gkh-includes.patch
deleted file mode 100644
index 4821716..0000000
--- a/mol-gkh-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mol/src/drivers/usbdev.c.orig	2004-01-10 12:49:40.000000000 +0100
-+++ mol/src/drivers/usbdev.c	2004-01-10 13:04:36.000000000 +0100
-@@ -23,7 +23,7 @@
- #include <signal.h>
- #include <sys/ioctl.h>
- #include <dirent.h>
--#include <linux/compiler.h>				/* linux/usbdevice_fs.h breaks otherwise */
-+#include "compiler.h"				/* linux/usbdevice_fs.h breaks otherwise */
- #include <linux/usbdevice_fs.h>
- #include "poll.h"
- #include "async.h"
diff --git a/mol-gkh.patch b/mol-gkh.patch
deleted file mode 100644
index e283cc0..0000000
--- a/mol-gkh.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mol-orig/src/lib/unicode.c mol/src/lib/unicode.c
---- mol-orig/src/lib/unicode.c	2003-09-04 13:09:42.000000000 +0200
-+++ mol/src/lib/unicode.c	2004-01-05 09:25:35.000000000 +0100
-@@ -21,7 +21,7 @@
- #include "mol_config.h"
- #include <endian.h>
- #include <byteswap.h>
--#include <linux/string.h>
-+#include <string.h>
- #ifndef __USE_GNU
- #define __USE_GNU
- #endif
diff --git a/mol-kernel.patch b/mol-kernel.patch
deleted file mode 100644
index 40be53c..0000000
--- a/mol-kernel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mol/src/kmod/Linux/Makefile.am.orig	Sun Sep 21 21:16:59 2003
-+++ mol/src/kmod/Linux/Makefile.am	Sun Sep 21 23:58:54 2003
-@@ -14,7 +14,7 @@
- MOD_TARGET		:= ../build/mol.$(MP)
- 
- BUILD			= SUBDIRS="$$PWD/../build" modules
--DEPS_24			= $(MAKE) --no-print-directory -C $(KERNEL_SOURCE) SUBDIRS="$$PWD/../build" depend 
-+DEPS_24			= true
- DEPS_26			= true
- 
- KILL_WARNING_26		= 2>&1 | sed -e '/\*\*\*.*SUBDIRS/ d' \
diff --git a/mol-libimport.patch b/mol-libimport.patch
deleted file mode 100644
index 2b92384..0000000
--- a/mol-libimport.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- mol/scripts/libimport.orig	2003-09-04 13:09:42.000000000 +0200
-+++ mol/scripts/libimport	2003-12-24 23:52:48.000000000 +0100
-@@ -144,7 +144,7 @@
- ###################################
- 
- [ $# == 0 ] && {
--    echo "Usage: libimport import|export|delete"
-+    echo "Usage: libimport import|export|delete|copy"
-     exit 1
- }
- 
-@@ -155,6 +155,7 @@
-     import_dist)
- 		RSYNC_MODULE=$RSYNC_MODULE_R
- 		do_import ;;
-+    copy)       copybinfiles libimport mollib ;;
-     *)		echo "bad command $1" ; exit 1 ;;
- esac
- 
diff --git a/mol-netdriver.patch b/mol-netdriver.patch
deleted file mode 100644
index 2694e88..0000000
--- a/mol-netdriver.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- mol-0.9.69+20031019.orig/src/netdriver/Makefile.24
-+++ mol-0.9.69+20031019/src/netdriver/Makefile.24
-@@ -1,6 +1,6 @@
- # -*- makefile -*-
- 
--obj-m		= tun.o sheep.o ethertap.o kuname.o
-+obj-m		= sheep.o kuname.o
- 
- sheep.o: .kuname
- .kuname: kuname.o
---- mol-0.9.69+20031019.orig/src/netdriver/Makefile.26
-+++ mol-0.9.69+20031019/src/netdriver/Makefile.26
-@@ -1,6 +1,6 @@
- # -*- makefile -*-
- 
--obj-m		= tun.o ethertap.o sheep.o kuname.o
-+obj-m		= sheep.o kuname.o
- 
- $(obj)/sheep.o: $(src)/.kuname
- $(src)/.kuname: $(obj)/kuname.o
---- mol-0.9.69+20031019.orig/src/netdriver/Makefile.am
-+++ mol-0.9.69+20031019/src/netdriver/Makefile.am
-@@ -1,5 +1,5 @@
- 
--EXTRA_DIST		= MAKEDEV kuname.c tun.c sheep.c ethertap.c if_tun.h \
-+EXTRA_DIST		= MAKEDEV kuname.c sheep.c \
- 			  Makefile.24 Makefile.26
- 
- LV			:= $(shell test -f $(KERNEL_SOURCE)/Rules.make && echo 24 || echo 26)
-@@ -16,19 +16,12 @@
- 	@ln -sf ../Makefile.$(LV) build/Makefile
- 
- setup-tree-26: setup-tree-common
--	@for x in tun.c ethertap.c ; do ln -sf $(KERNEL_SOURCE)/drivers/net/$$x build/ || exit 1 ; done
- 
- setup-tree-24: setup-tree-common
--	@for x in tun.c ethertap.c if_tun.h ; do ln -sf ../$$x build/ || exit 1 ; done
--
--# The ethertap and tun driver is 2.4 only. Unfortunately, it is difficult to 
--# do a conditional build based upon the kuname result since kuname
--# is dynamically generated. We hack around this by building empty
--# modules and by deleting them in the all-local target.
- 
- all-local: setup-tree-$(LV)
- 	@$(MAKE) --no-print-directory -C $(KERNEL_SOURCE) "SUBDIRS=$$PWD/build" modules $(KILL_WARNING_$(LV))
--	@for x in tun ethertap sheep ; do \
-+	@for x in sheep ; do \
- 		[ -f build/$$x.$(MP) ] || continue ; \
- 		$(NM) build/$$x.$(MP) | grep -q init_module || continue ; \
- 		ln -f build/$$x.$(MP) $(MOD_DEST)/ || exit 1 ; \
diff --git a/mol-sheepnet.patch b/mol-sheepnet.patch
deleted file mode 100644
index 03817e2..0000000
--- a/mol-sheepnet.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- mol-0.9.69+20031019.orig/src/netdriver/sheep.c
-+++ mol-0.9.69+20031019/src/netdriver/sheep.c
-@@ -25,6 +25,8 @@
- #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)
-@@ -149,7 +151,11 @@
- 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);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	struct SheepVars *v = (struct SheepVars *)pt->af_packet_priv;
-+#else
- 	struct SheepVars *v = (struct SheepVars *)pt->data;
-+#endif
- 	const char *laddr = dev->dev_addr;
- 	struct sk_buff *skb2;
- 	
-@@ -499,7 +505,11 @@
- 		v->pt.type = htons(ETH_P_ALL);
- 		v->pt.dev = v->ether;
- 		v->pt.func = sheep_net_receiver;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		v->pt.af_packet_priv = v;
-+#else
- 		v->pt.data = v;
-+#endif
- 		dev_add_pack( &v->pt );
- 		return 0;
- error:
-@@ -590,7 +600,7 @@
- };
- 
- static struct miscdevice sheep_net_device = {
--	SHEEP_NET_MINOR, "sheep_net", &sheep_net_fops, NULL, NULL
-+	SHEEP_NET_MINOR, "sheep_net", &sheep_net_fops
- };
- 
- int 
diff --git a/mol-usbdev.patch b/mol-usbdev.patch
deleted file mode 100644
index 11979d4..0000000
--- a/mol-usbdev.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mol-0.9.69+20031019.orig/src/drivers/usbdev.c
-+++ mol-0.9.69+20031019/src/drivers/usbdev.c
-@@ -14,6 +14,10 @@
-  *   
-  */
- 
-+#ifndef __user
-+#define __user
-+#endif
-+
- #include "mol_config.h"
- #include "usb-client.h"
- #include <signal.h>
diff --git a/mol.init b/mol.init
deleted file mode 100644
index 16b8cfb..0000000
--- a/mol.init
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# mol		This shell script loads mol kernel module
-#
-# chkconfig:	345 235 69
-#
-# description:	mol Mac-On-Linux
-#
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/mol ]; then
-		msg_starting mol
-		modprobe mol
-		RETVAL=$?
-		modprobe sheep
-		modprobe tun
-		modprobe ethertap
-		RET=$?
-		[ $RETVAL -eq 0 ] && RETVAL=$RET
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mol && ok || fail
-	else
-		msg_already_running mol
-	fi
-	;;
-  stop)
-	if [ -f /var/lock/subsys/mol ]; then
-		msg_stopping mol
-		rmmod sheep
-		rmmod tun
-		rmmod ethertap
-		rmmod mol
-		killproc mol
-		rm -f /var/lock/subsys/mol >/dev/null 2>&1
-	else
-		msg_not_running mol
-	fi
-	;;
-  status)
-	if [ `lsmod | grep '^mol \|^sheep \|^tun\|^ethertap' | wc -l` -eq 4 ]; then
-		nls "mol modules are loaded..."
-	else
-		if [ -f /var/lock/subsys/mol ]; then
-			nls "%s dead but subsys locked" "mol";
-			RETVAL=2;
-		else
-			nls "%s is stopped" "mol"
-			RETVAL=3
-		fi
-	fi
-	;;
-  *)
-	msg_usage "$0 {start|stop|status}"
-	exit 3
-esac
-
-exit $RETVAL