cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

permit vmware to compile since bpf changes

Browse Source 
from Frank Dennis
bump pkgname
This commit is contained in:
todd 2006-04-10 21:33:36 +00:00
parent b4a6cd584d
commit c661dd96ac
4 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emulators/vmware/3/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2006/01/08 02:20:30 brad Exp $
# $OpenBSD: Makefile,v 1.7 2006/04/10 21:33:36 todd Exp $
ONLY_FOR_ARCHS= i386
COMMENT= "VMware emulator"
DISTNAME= VMware-workstation-3.2.1-2242
PKGNAME= vmware-3.2.1_2242p2
PKGNAME= vmware-3.2.1_2242p3
CATEGORIES= emulators
MASTER_SITES= http://download3.vmware.com/software/wkst/
MASTER_SITES0= http://monkey.org/~marius/vmware-openbsd/

8
emulators/vmware/3/patches/patch-source_vmmon_openbsd_drv_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-source_vmmon_openbsd_drv_c,v 1.1 2006/01/08 01:44:38 aaron Exp $
--- source/vmmon/openbsd/drv.c.orig Sat Jan 7 08:02:50 2006
+++ source/vmmon/openbsd/drv.c Sat Jan 7 08:27:00 2006
@@ -414,6 +414,7 @@
$OpenBSD: patch-source_vmmon_openbsd_drv_c,v 1.2 2006/04/10 21:33:36 todd Exp $
--- source/vmmon/openbsd/drv.c.orig Sun Mar 14 15:58:50 2004
+++ source/vmmon/openbsd/drv.c Mon Apr 10 16:13:41 2006
@@ -414,6 +414,7 @@ vmmon_fake_clonedev(dev_t dev, int flag,
#endif
p->p_dupfd = fd;

28
emulators/vmware/3/patches/patch-source_vmmon_openbsd_rmem_h
View File

@ -1,14 +1,11 @@
$OpenBSD: patch-source_vmmon_openbsd_rmem_h,v 1.3 2005/03/07 18:15:09 todd Exp $
--- source/vmmon/openbsd/rmem.h.orig 2004-02-05 11:10:33.000000000 -0600
+++ source/vmmon/openbsd/rmem.h 2004-02-05 11:10:33.000000000 -0600
@@ -0,0 +1,21 @@
+/*
+ * rmem.h
+ *
+ * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
+ * All rights reserved.
+ *
+ * $Id: patch-source_vmmon_openbsd_rmem_h,v 1.3 2005/03/07 18:15:09 todd Exp $
$OpenBSD: patch-source_vmmon_openbsd_rmem_h,v 1.4 2006/04/10 21:33:36 todd Exp $
--- source/vmmon/openbsd/rmem.h.orig Fri Feb 13 00:40:21 2004
+++ source/vmmon/openbsd/rmem.h Mon Apr 10 16:13:41 2006
@@ -4,6 +4,27 @@
* Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
* All rights reserved.
*
+ * $Id: patch-source_vmmon_openbsd_rmem_h,v 1.4 2006/04/10 21:33:36 todd Exp $
+ */
+
+#ifndef _RMEM_H
@ -23,3 +20,12 @@ $OpenBSD: patch-source_vmmon_openbsd_rmem_h,v 1.3 2005/03/07 18:15:09 todd Exp $
+TAILQ_HEAD(rmem_pglist, rmem_pgrange);
+
+#endif /* _RMEM_H */
+/*
+ * rmem.h
+ *
+ * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
+ * All rights reserved.
+ *
* $Id: patch-source_vmmon_openbsd_rmem_h,v 1.4 2006/04/10 21:33:36 todd Exp $
*/

26
emulators/vmware/3/patches/patch-source_vmnet_if_hubmod_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-source_vmnet_if_hubmod_c,v 1.1 2006/01/08 01:44:38 aaron Exp $
--- source/vmnet/if_hubmod.c.orig Sat Jan 7 08:27:56 2006
+++ source/vmnet/if_hubmod.c Sat Jan 7 08:27:18 2006
@@ -604,6 +604,7 @@
$OpenBSD: patch-source_vmnet_if_hubmod_c,v 1.2 2006/04/10 21:33:36 todd Exp $
--- source/vmnet/if_hubmod.c.orig Sun Mar 14 15:58:51 2004
+++ source/vmnet/if_hubmod.c Mon Apr 10 16:17:15 2006
@@ -604,6 +604,7 @@ hub_fake_clonedev(dev_t dev, int flag, s
#endif
p->p_dupfd = fd;
@ -9,3 +9,21 @@ $OpenBSD: patch-source_vmnet_if_hubmod_c,v 1.1 2006/01/08 01:44:38 aaron Exp $
return ENXIO;
}
@@ -651,7 +652,7 @@ hub_sendchain(struct hubport_softc *port
*/
#if NBPFILTER > 0
if (ifp2->if_bpf)
- bpf_mtap(ifp2->if_bpf, m2);
+ bpf_mtap(ifp2->if_bpf, m2, BPF_DIRECTION_OUT);
#endif
s = splnet();
drops1 = ifp2->if_snd.ifq_drops;
@@ -732,7 +733,7 @@ hub_ifstart(struct ifnet *ifp)
hub_sendchain(portsc, m);
#if NBPFILTER > 0
if (ifp->if_bpf)
- bpf_mtap(ifp->if_bpf, m);
+ bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_OUT);
#endif
m_freem(m);