Hello community, here is the log from the commit of package mol checked in at Mon Oct 30 11:52:27 CET 2006. -------- --- arch/ppc/mol/mol.changes 2006-10-09 20:32:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/mol/mol.changes 2006-10-30 01:55:27.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Oct 30 01:53:08 CET 2006 - schwab@suse.de + +- Update to mol 0.9.71.1. + * Added new molvconfig manpage from debian + * Compile fixes for 2.6.19 + +------------------------------------------------------------------- Old: ---- mol-0.9.71.tar.bz2 mol.tap.patch mol.uninitalized.patch mol_excludes.txt New: ---- mol-0.9.71.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mol.spec ++++++ --- /var/tmp/diff_new_pack.fvdL3f/_old 2006-10-30 11:52:16.000000000 +0100 +++ /var/tmp/diff_new_pack.fvdL3f/_new 2006-10-30 11:52:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mol (Version 0.9.71) +# spec file for package mol (Version 0.9.71.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,17 +13,15 @@ Name: mol BuildRequires: alsa-devel libpng-devel xorg-x11-devel Summary: Mac on Linux -Version: 0.9.71 +Version: 0.9.71.1 Release: 1 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/Emulators/Other -Source0: http://dev.gentoo.org/~josejx/mol-%{version}.tar.bz2 -Url: http://www.maconlinux.org/ +Source0: ftp://ftp.sourceforge.net/pub/sourceforge/m/ma/mac-on-linux/mol-%{version}.tar.bz2 +URL: http://mac-on-linux.sourceforge.net/ Patch0: mol.make-verbose.patch Patch1: mol.current_menu.patch Patch2: mol.insmod.patch -Patch3: mol.tap.patch -Patch4: mol.uninitalized.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,8 +42,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build CFLAGS="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE -Wall -D_FILE_OFFSET_BITS=64" \ @@ -70,6 +66,10 @@ %{_mandir}/man?/* %changelog -n mol +* Mon Oct 30 2006 - schwab@suse.de +- Update to mol 0.9.71.1. + * Added new molvconfig manpage from debian + * Compile fixes for 2.6.19 * Mon Oct 09 2006 - schwab@suse.de - Update to mol 0.9.71 (just cleanups). * Wed Jul 19 2006 - schwab@suse.de ++++++ mol-0.9.71.tar.bz2 -> mol-0.9.71.1.tar.bz2 ++++++ ++++ 10181 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/CHANGELOG new/mol-0.9.71.1/CHANGELOG --- old/mol-0.9.71/CHANGELOG 2006-10-03 04:25:09.000000000 +0200 +++ new/mol-0.9.71.1/CHANGELOG 2006-10-28 20:59:02.000000000 +0200 @@ -1,5 +1,7 @@ MOL Changelog - +mol-0.9.71.1 - 2006-10-28 Joseph Jezak <josejx@gentoo.org> + * Added new molvconfig manpage from debian + * Compile fixes for 2.6.19 mol-0.9.71 - 2006-10-02 Joseph Jezak <josejx@gentoo.org> * Fixed ablk bug introduced by gcc4 fixes mol-0.9.71_pre9 - 2006-09-05 Joseph Jezak <josejx@gentoo.org> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/Doc/man/molvconfig.1 new/mol-0.9.71.1/Doc/man/molvconfig.1 --- old/mol-0.9.71/Doc/man/molvconfig.1 2005-10-12 18:28:25.000000000 +0200 +++ new/mol-0.9.71.1/Doc/man/molvconfig.1 2006-10-28 20:59:02.000000000 +0200 @@ -1,35 +1,42 @@ -.\" Hey Emacs! This file is -*- nroff -*- source. -.\" -.de It -.TP 4.6cm -.B " \\$1 " -.. -.de It2 -.TP 3cm -.B " \\$1 " -.. -.TH MOLVCONFIG 8 "12 August 2001" "Mac-on-Linux" "System Reference Manual" -.SH NAME -.B molvconfig -\- configure full\-screen video modes for Mac\-on\-Linux -.SH SYNOPSIS -.B molvconfig -.SH DESCRIPTION -The \fImolvconfig\fR program configures is used to -configure full\-screen video modes for Mac\-on\-Linux. - -.fi -.SH FILES -.nf -\fI/etc/molrc\fR \- Mac\-on\-Linux configuration file -.fi -.SH BUGS -This man page is not complete... -.SH AUTHORS -This man page was written by Samuel Rydh <samuel@ibrium.se>. -.P -.SH REPORTING BUGS -Bugs in \fBmolvconfig\fR should be reported to Samuel Rydh <samuel@ibrium.se>. -.SH SEE ALSO -.BR startmol (1), -.BR molrc (5) +.TH "molvconfig" "1" +.SH "NAME" +molvconfig \(em Console video configuration for Mac-on-Linux +.SH "SYNOPSIS" +.PP +\fBmolvconfig\fR +.SH "Description" +.PP +\fBmolvconfig\fR find a free virtual terminal and +uses it to interactively probe the video modes specified in the +file \fB/etc/fb.modes\fP, and in the files found +in the directory \fB/usr/share/mol/vmodes/\fP. The +video modes that are found to work on a particular system are +written to the video mode database +\fB/var/lib/mol/fb_modes\fP, where they can be used +by the console video driver of \fBMac-on-Linux\fP. + +.SH "Files" +.PP +\fB/usr/share/mol/vmodes/\fP contains a set of +files with typical video modes for various Macs. + +.PP +\fB/etc/fb.modes\fP is usually created with +\fBfbset\fR and contains the current framebuffer +settings. + +.PP +\fB/var/lib/mol/fb_modes\fP contains the video mode +database generated for a particular system. + +.SH "See also" +.PP +mol(7), molrc(5), moldeb(1), molrcget(1), startmol(1), +strip_nwrom(1). + +.SH "Author" +.PP +This manual page was written by Jens Schmalzing +<jensen@debian.org> for \fBDebian GNU/Linux\fP. + +.\" created by instant / docbook-to-man, Fri 06 Oct 2006, 20:37 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/config/Makefile.top new/mol-0.9.71.1/config/Makefile.top --- old/mol-0.9.71/config/Makefile.top 2006-10-03 04:25:59.000000000 +0200 +++ new/mol-0.9.71.1/config/Makefile.top 2006-10-28 20:59:02.000000000 +0200 @@ -55,7 +55,7 @@ ################################################################# VERSION := 0.9.71 -EXTRA_VERSION := $(VENDOR) +EXTRA_VERSION := .1$(VENDOR) RELEASENAME := $(VERSION)$(EXTRA_VERSION)$(VENDOR) _prefix = $(DESTDIR)$(prefix) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/config/kconfig/zconf-l.c new/mol-0.9.71.1/config/kconfig/zconf-l.c --- old/mol-0.9.71/config/kconfig/zconf-l.c 2005-10-13 05:28:40.000000000 +0200 +++ new/mol-0.9.71.1/config/kconfig/zconf-l.c 2006-10-28 20:59:02.000000000 +0200 @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ + * $Header: /cvsroot/mac-on-linux/mol-stable/config/kconfig/zconf-l.c,v 1.1.1.1 2006/10/19 05:02:33 josejx Exp $ */ #define FLEX_SCANNER diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/libimport/VERSION new/mol-0.9.71.1/libimport/VERSION --- old/mol-0.9.71/libimport/VERSION 2003-02-23 18:14:15.000000000 +0100 +++ new/mol-0.9.71.1/libimport/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -5 Binary files old/mol-0.9.71/libimport/drivers/blk.nw and new/mol-0.9.71.1/libimport/drivers/blk.nw differ Binary files old/mol-0.9.71/libimport/drivers/blk.ow and new/mol-0.9.71.1/libimport/drivers/blk.ow differ Binary files old/mol-0.9.71/libimport/drivers/bootx and new/mol-0.9.71.1/libimport/drivers/bootx differ Binary files old/mol-0.9.71/libimport/drivers/enet.nw and new/mol-0.9.71.1/libimport/drivers/enet.nw differ Binary files old/mol-0.9.71/libimport/drivers/enet.ow and new/mol-0.9.71.1/libimport/drivers/enet.ow differ Binary files old/mol-0.9.71/libimport/drivers/irqtest.nw and new/mol-0.9.71.1/libimport/drivers/irqtest.nw differ Binary files old/mol-0.9.71/libimport/drivers/irqtest.ow and new/mol-0.9.71.1/libimport/drivers/irqtest.ow differ Binary files old/mol-0.9.71/libimport/drivers/misc.nw and new/mol-0.9.71.1/libimport/drivers/misc.nw differ Binary files old/mol-0.9.71/libimport/drivers/misc.ow and new/mol-0.9.71.1/libimport/drivers/misc.ow differ Binary files old/mol-0.9.71/libimport/drivers/mods1.mkext and new/mol-0.9.71.1/libimport/drivers/mods1.mkext differ Binary files old/mol-0.9.71/libimport/drivers/mods2.mkext and new/mol-0.9.71.1/libimport/drivers/mods2.mkext differ Binary files old/mol-0.9.71/libimport/drivers/of and new/mol-0.9.71.1/libimport/drivers/of differ Binary files old/mol-0.9.71/libimport/drivers/openbios and new/mol-0.9.71.1/libimport/drivers/openbios differ Binary files old/mol-0.9.71/libimport/drivers/scsi.nw and new/mol-0.9.71.1/libimport/drivers/scsi.nw differ Binary files old/mol-0.9.71/libimport/drivers/sound.ow and new/mol-0.9.71.1/libimport/drivers/sound.ow differ Binary files old/mol-0.9.71/libimport/drivers/tty.ow and new/mol-0.9.71.1/libimport/drivers/tty.ow differ Binary files old/mol-0.9.71/libimport/drivers/video.nw and new/mol-0.9.71.1/libimport/drivers/video.nw differ Binary files old/mol-0.9.71/libimport/drivers/video.ow and new/mol-0.9.71.1/libimport/drivers/video.ow differ Binary files old/mol-0.9.71/libimport/drivers/video.x and new/mol-0.9.71.1/libimport/drivers/video.x differ Binary files old/mol-0.9.71/libimport/graphics/bootlogo.raw and new/mol-0.9.71.1/libimport/graphics/bootlogo.raw differ Binary files old/mol-0.9.71/libimport/graphics/mdialog.png and new/mol-0.9.71.1/libimport/graphics/mdialog.png differ Binary files old/mol-0.9.71/libimport/images/moldisk.dmg and new/mol-0.9.71.1/libimport/images/moldisk.dmg differ Binary files old/mol-0.9.71/libimport/images/moldiskX.dmg and new/mol-0.9.71.1/libimport/images/moldiskX.dmg differ Binary files old/mol-0.9.71/libimport/nvram/nvram.dist and new/mol-0.9.71.1/libimport/nvram/nvram.dist differ Binary files old/mol-0.9.71/libimport/startboing and new/mol-0.9.71.1/libimport/startboing differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/scripts/kernelsrc new/mol-0.9.71.1/scripts/kernelsrc --- old/mol-0.9.71/scripts/kernelsrc 2005-11-26 19:57:40.000000000 +0100 +++ new/mol-0.9.71.1/scripts/kernelsrc 2006-10-28 20:59:02.000000000 +0200 @@ -17,22 +17,13 @@ exit 1 fi - if ! test -f $KERNEL_SOURCE/include/linux/config.h ; then + if ! test -f $KERNEL_SOURCE/include/linux/config.h && ! test -f $KERNEL_SOURCE/include/linux/autoconf.h ; then echo echo " --- Error: Unconfigured kernel source!" - echo " --- (missing file: $KERNEL_SOURCE/include/linux/config.h)" echo exit 1 fi - if ! test -f $KERNEL_SOURCE/include/linux/autoconf.h ; then - echo - echo " --- Error: Unconfigured kernel headers!" - echo " --- (missing file: $KERNEL_SOURCE/include/linux/autoconf.h)" - echo - exit 1 - fi - if ! test -f $KERNEL_SOURCE/Makefile ; then echo " --- The kernel source '$KERNEL_SOURCE' does not have a Makefile!" exit 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/drivers/disk/blk_qcow.c new/mol-0.9.71.1/src/drivers/disk/blk_qcow.c --- old/mol-0.9.71/src/drivers/disk/blk_qcow.c 2005-10-25 06:03:32.000000000 +0200 +++ new/mol-0.9.71.1/src/drivers/disk/blk_qcow.c 2006-10-28 20:59:02.000000000 +0200 @@ -35,7 +35,7 @@ int qcow_open(bdev_desc_t *bdev) { printm("Opening qcow device..."); - BDRVQcowState *s = bdev->cow_state; + s = bdev->cow_state; /* int len */ int i, shift; QCowHeader header; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/drivers/disk/cd-scsi.c new/mol-0.9.71.1/src/drivers/disk/cd-scsi.c --- old/mol-0.9.71/src/drivers/disk/cd-scsi.c 2006-09-05 06:18:59.000000000 +0200 +++ new/mol-0.9.71.1/src/drivers/disk/cd-scsi.c 2006-10-28 20:59:02.000000000 +0200 @@ -80,7 +80,7 @@ cgc.sense = (struct request_sense*)&u->sb; cgc.data_direction = u->is_write ? CGC_DATA_WRITE : u->size ? CGC_DATA_READ : CGC_DATA_NONE; - cgc.buffer = (unsigned char *) buffer; + cgc.buffer = (char *) buffer; cgc.buflen = u->size; cgc.quiet = 1; cgc.timeout = 30000; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/drivers/include/pcidefs.h new/mol-0.9.71.1/src/drivers/include/pcidefs.h --- old/mol-0.9.71/src/drivers/include/pcidefs.h 2005-01-18 00:07:06.000000000 +0100 +++ new/mol-0.9.71.1/src/drivers/include/pcidefs.h 2006-10-28 20:59:02.000000000 +0200 @@ -7,7 +7,7 @@ * PCI definitions (extracted from the linux kernel headers). */ /* - * $Id: pci.h,v 1.87 1998/10/11 15:13:12 mj Exp $ + * $Id: pcidefs.h,v 1.1.1.1 2006/10/19 05:01:25 josejx Exp $ * * PCI defines and function prototypes * Copyright 1994, Drew Eckhardt diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/kmod/Linux/archinclude.h new/mol-0.9.71.1/src/kmod/Linux/archinclude.h --- old/mol-0.9.71/src/kmod/Linux/archinclude.h 2005-01-18 00:07:06.000000000 +0100 +++ new/mol-0.9.71.1/src/kmod/Linux/archinclude.h 2006-10-28 20:59:02.000000000 +0200 @@ -24,9 +24,18 @@ #include "mol_config.h" #include "kconfig.h" -#include <linux/config.h> #include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) +#include <linux/utsrelease.h> +#endif + +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) +#include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #define LINUX_26 #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/kmod/Linux/dev.c new/mol-0.9.71.1/src/kmod/Linux/dev.c --- old/mol-0.9.71/src/kmod/Linux/dev.c 2005-10-10 03:22:50.000000000 +0200 +++ new/mol-0.9.71.1/src/kmod/Linux/dev.c 2006-10-28 20:59:02.000000000 +0200 @@ -15,7 +15,6 @@ */ #include "archinclude.h" -#include <linux/config.h> #include <linux/module.h> #include <linux/miscdevice.h> #include <linux/spinlock.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/kmod/Linux/hostirq.c new/mol-0.9.71.1/src/kmod/Linux/hostirq.c --- old/mol-0.9.71/src/kmod/Linux/hostirq.c 2005-11-26 20:25:55.000000000 +0100 +++ new/mol-0.9.71.1/src/kmod/Linux/hostirq.c 2006-10-28 20:59:02.000000000 +0200 @@ -27,7 +27,11 @@ #include "atomic.h" irqreturn_t +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) +hostirq_handler(int irq, void *pkv) +#else hostirq_handler(int irq, void *pkv, struct pt_regs *regs) +#endif { siginfo_t si; kernel_vars_t *kv = (kernel_vars_t *) pkv; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/kmod/Linux/kuname.c new/mol-0.9.71.1/src/kmod/Linux/kuname.c --- old/mol-0.9.71/src/kmod/Linux/kuname.c 2006-09-05 08:36:47.000000000 +0200 +++ new/mol-0.9.71.1/src/kmod/Linux/kuname.c 2006-10-28 20:59:02.000000000 +0200 @@ -14,12 +14,18 @@ * */ -#include <linux/config.h> #include <linux/version.h> + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) #include <linux/utsrelease.h> #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) +#include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #ifdef CONFIG_SMP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/netdriver/if_tun.h new/mol-0.9.71.1/src/netdriver/if_tun.h --- old/mol-0.9.71/src/netdriver/if_tun.h 2005-01-18 00:07:06.000000000 +0100 +++ new/mol-0.9.71.1/src/netdriver/if_tun.h 2006-10-28 20:59:02.000000000 +0200 @@ -12,7 +12,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * $Id: if_tun.h,v 1.2 2001/06/01 18:39:47 davem Exp $ + * $Id: if_tun.h,v 1.1.1.1 2006/10/19 05:01:38 josejx Exp $ */ #ifndef __IF_TUN_H diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/netdriver/kuname.c new/mol-0.9.71.1/src/netdriver/kuname.c --- old/mol-0.9.71/src/netdriver/kuname.c 2006-09-05 08:36:54.000000000 +0200 +++ new/mol-0.9.71.1/src/netdriver/kuname.c 2006-10-28 20:59:02.000000000 +0200 @@ -14,12 +14,18 @@ * */ -#include <linux/config.h> #include <linux/version.h> + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) #include <linux/utsrelease.h> #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) +#include <linux/config.h> +#else +#include <linux/autoconf.h> +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #ifdef CONFIG_SMP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/netdriver/sheep.c new/mol-0.9.71.1/src/netdriver/sheep.c --- old/mol-0.9.71/src/netdriver/sheep.c 2005-10-10 03:54:32.000000000 +0200 +++ new/mol-0.9.71.1/src/netdriver/sheep.c 2006-10-28 20:59:02.000000000 +0200 @@ -368,8 +368,14 @@ } static ssize_t +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +sheep_net_aio_read(struct kiocb *iocb, const struct iovec *iv, unsigned long count, loff_t pos) +{ + struct file *f = iocb->ki_filp; +#else /* Linux 2.6.18 or older */ sheep_net_readv( struct file *f, const struct iovec *iv, unsigned long count, loff_t *pos ) { +#endif struct SheepVars *v = (struct SheepVars *)f->private_data; struct sk_buff *skb; int size = get_iovsize( iv, count ); @@ -398,8 +404,14 @@ } static ssize_t +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +sheep_net_aio_write(struct kiocb *iocb, const struct iovec *iv, unsigned long count, loff_t off) +{ + struct file *f = iocb->ki_filp; +#else /* Linux 2.6.18 or older */ sheep_net_writev( struct file *f, const struct iovec *iv, unsigned long count, loff_t *off ) { +#endif struct SheepVars *v = (struct SheepVars *)f->private_data; struct sk_buff *skb; int size = get_iovsize( iv, count ); @@ -471,6 +483,8 @@ return size; } +/* We take care of this using do_sync_* instead in 2.6.19 and newer */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) static ssize_t sheep_net_read( struct file *f, char *buf, size_t count, loff_t *off ) { @@ -488,6 +502,7 @@ iv.iov_base = (char *)buf; return sheep_net_writev( f, &iv, 1, off ); } +#endif static unsigned int sheep_net_poll( struct file *f, struct poll_table_struct *wait ) @@ -623,6 +638,19 @@ /* init / cleanup */ /************************************************************************/ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) +static struct file_operations sheep_net_fops = { + .owner = THIS_MODULE, + .read = do_sync_read, + .aio_read = sheep_net_aio_read, + .write = do_sync_write, + .aio_write = sheep_net_aio_write, + .poll = sheep_net_poll, + .ioctl = sheep_net_ioctl, + .open = sheep_net_open, + .release = sheep_net_release, +}; +#else static struct file_operations sheep_net_fops = { .owner = THIS_MODULE, .read = sheep_net_read, @@ -634,6 +662,7 @@ .open = sheep_net_open, .release = sheep_net_release, }; +#endif static struct miscdevice sheep_net_device = { .minor = SHEEP_NET_MINOR, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/netdriver/tun.c new/mol-0.9.71.1/src/netdriver/tun.c --- old/mol-0.9.71/src/netdriver/tun.c 2005-10-10 03:22:50.000000000 +0200 +++ new/mol-0.9.71.1/src/netdriver/tun.c 2006-10-28 20:59:02.000000000 +0200 @@ -12,7 +12,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * $Id: tun.c,v 1.15 2002/03/01 02:44:24 maxk Exp $ + * $Id: tun.c,v 1.1.1.1 2006/10/19 05:01:38 josejx Exp $ */ /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mol-0.9.71/src/vconfig/modes-l.c new/mol-0.9.71.1/src/vconfig/modes-l.c --- old/mol-0.9.71/src/vconfig/modes-l.c 2005-10-13 17:59:01.000000000 +0200 +++ new/mol-0.9.71.1/src/vconfig/modes-l.c 2006-10-28 20:59:02.000000000 +0200 @@ -1,7 +1,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ + * $Header: /cvsroot/mac-on-linux/mol-stable/src/vconfig/modes-l.c,v 1.1.1.1 2006/10/19 05:01:41 josejx Exp $ */ #define FLEX_SCANNER ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠suse.de