Index: head/emulators/qemu/Makefile =================================================================== --- head/emulators/qemu/Makefile (revision 152840) +++ head/emulators/qemu/Makefile (revision 152841) @@ -1,92 +1,92 @@ # New ports collection makefile for: qemu # Date created: 2004/05/31 # Whom: Juergen Lock # # $FreeBSD$ # PORTNAME= qemu PORTVERSION= 0.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://www.qemu.org/:release \ http://people.fruitsalad.org/nox/qemu/:snapshot \ http://www.volny.cz/xnavara/qemu/:snapshot \ http://qemu.dad-answers.com/download/qemu/:snapshot \ http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release .if defined (WITH_HACKS) DISTFILES+= qemu_dma_patch.tar.gz:idedma .endif DIST_SUBDIR= qemu EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= nox@jelal.kn-bremen.de COMMENT= QEMU CPU Emulator BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html .if defined(WITH_SAMBA) RUN_DEPENDS+= ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba .endif .if defined(WITH_KQEMU) BUILD_DEPENDS+= ${LOCALBASE}/include/kqemu/kqemu.h:${PORTSDIR}/emulators/kqemu-kmod .endif HAS_CONFIGURE= yes USE_GMAKE= yes USE_GETOPT_LONG= yes USE_SDL= sdl USE_PERL5= yes PATCH_STRIP= -p1 CONFIGURE_ARGS+= --prefix=${PREFIX} --cc=${CC} MAKE_ENV+= BSD_MAKE=${MAKE} MAN1= qemu.1 qemu-img.1 ONLY_FOR_ARCHS= amd64 i386 .if defined(WITH_KQEMU) CONFIGURE_ARGS+= --enable-kqemu .else CONFIGURE_ARGS+= --disable-kqemu .endif .include .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif USE_GCC= 3.4 pre-everything:: .if !defined(WITH_KQEMU) @${ECHO_MSG} "Notice: you can build qemu with the (alpha!) kqemu accelerator kernel module" @${ECHO_MSG} "by defining WITH_KQEMU." .endif .if !defined(WITH_HACKS) @${ECHO_MSG} "You can build qemu with some hacks (esp. for speedup)" @${ECHO_MSG} "by defining WITH_HACKS." @${ECHO_MSG} "1. IDE Bus-master DMA Support by John Coiner" .endif .if !defined(WITH_SAMBA) && !exists(${LOCALBASE}/sbin/smbd) @${ECHO_MSG} "Notice: if you need qemu's -smb option (smb-export local dir to guest)" @${ECHO_MSG} "then you also need samba, you can have this port install it by defining" @${ECHO_MSG} "WITH_SAMBA." .endif post-extract: @${MKDIR} ${WRKSRC}/kqemu @${TOUCH} ${WRKSRC}/kqemu/Makefile @${ECHO} all: > ${WRKSRC}/kqemu/Makefile.freebsd pre-patch: @for A in ${ONLY_FOR_ARCHS}; do \ ${MKDIR} ${WRKSRC}/bsd/$$A; \ done post-patch: .if defined(WITH_HACKS) - @cd ${WRKDIR} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/qemu_dma_patch.tar.gz ; ${CP} new_qemu_dma_patch/bios.bin ${WRKSRC}/pc-bios; cd ${WRKSRC}; ${PATCH} -p1 < ../new_qemu_dma_patch/qemu-piix4-udma.patch + @cd ${WRKDIR} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/qemu_dma_patch.tar.gz ; ${CP} new_qemu_dma_patch/bios.bin ${WRKSRC}/pc-bios; cd ${WRKSRC}; ${PATCH} --quiet -p1 < ../new_qemu_dma_patch/qemu-piix4-udma.patch .endif post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/emulators/qemu/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.42 \ No newline at end of property +1.43 \ No newline at end of property Index: head/emulators/qemu/files/patch-slirp-mbuf.c =================================================================== --- head/emulators/qemu/files/patch-slirp-mbuf.c (nonexistent) +++ head/emulators/qemu/files/patch-slirp-mbuf.c (revision 152841) @@ -0,0 +1,26 @@ +# http://lists.gnu.org/archive/html/qemu-devel/2005-05/msg00228.html + +Index: qemu/slirp/mbuf.c +@@ -146,18 +146,19 @@ + struct mbuf *m; + int size; + { ++ int datasize; ++ + /* some compiles throw up on gotos. This one we can fake. */ + if(m->m_size>size) return; + + if (m->m_flags & M_EXT) { +- /* datasize = m->m_data - m->m_ext; */ ++ datasize = m->m_data - m->m_ext; + m->m_ext = (char *)realloc(m->m_ext,size); + /* if (m->m_ext == NULL) + * return (struct mbuf *)NULL; + */ +- /* m->m_data = m->m_ext + datasize; */ ++ m->m_data = m->m_ext + datasize; + } else { +- int datasize; + char *dat; + datasize = m->m_data - m->m_dat; + dat = (char *)malloc(size); Property changes on: head/emulators/qemu/files/patch-slirp-mbuf.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/emulators/qemu/files/patch-slirp-nat =================================================================== --- head/emulators/qemu/files/patch-slirp-nat (nonexistent) +++ head/emulators/qemu/files/patch-slirp-nat (revision 152841) @@ -0,0 +1,56 @@ +# http://lists.gnu.org/archive/html/qemu-devel/2005-12/msg00277.html + +diff -wurb qemu/slirp/misc.c qemu-patched/slirp/misc.c +--- qemu/slirp/misc.c Sun Dec 12 12:45:10 2004 ++++ qemu-patched/slirp/misc.c Mon Mar 21 13:22:05 2005 +@@ -90,13 +90,12 @@ + char buff[256]; + struct hostent *he; + +- if (gethostname(buff,256) < 0) +- return; +- +- if ((he = gethostbyname(buff)) == NULL) +- return; +- ++ if (gethostname(buff,256) == 0) ++ if ((he = gethostbyname(buff)) != NULL) + our_addr = *(struct in_addr *)he->h_addr; ++ ++ if (our_addr.s_addr == 0 || our_addr.s_addr == loopback_addr.s_addr) ++ our_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS); + } + + #if SIZEOF_CHAR_P == 8 +diff -wurb qemu/slirp/slirp.c qemu-patched/slirp/slirp.c +--- qemu/slirp/slirp.c Fri Oct 8 01:27:35 2004 ++++ qemu-patched/slirp/slirp.c Mon Mar 21 13:22:05 2005 +@@ -144,7 +144,6 @@ + m_init(); + + /* set default addresses */ +- getouraddr(); + inet_aton("127.0.0.1", &loopback_addr); + + if (get_dns_addr(&dns_addr) < 0) { +@@ -153,6 +152,7 @@ + } + + inet_aton(CTL_SPECIAL, &special_addr); ++ getouraddr(); + } + + #define CONN_CANFSEND(so) (((so)->so_state & (SS_FCANTSENDMORE|SS_ISFCONNECTED)) == SS_ISFCONNECTED) +diff -wurb qemu/slirp/udp.c qemu-patched/slirp/udp.c +--- qemu/slirp/udp.c Fri Oct 8 01:27:35 2004 ++++ qemu-patched/slirp/udp.c Mon Mar 21 13:22:05 2005 +@@ -314,6 +314,8 @@ + saddr = *addr; + if ((so->so_faddr.s_addr & htonl(0xffffff00)) == special_addr.s_addr) + saddr.sin_addr.s_addr = so->so_faddr.s_addr; ++ if ((so->so_faddr.s_addr & htonl(0x000000ff)) == htonl(0xff)) ++ saddr.sin_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS); + daddr.sin_addr = so->so_laddr; + daddr.sin_port = so->so_lport; + + Property changes on: head/emulators/qemu/files/patch-slirp-nat ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/emulators/qemu-devel/Makefile =================================================================== --- head/emulators/qemu-devel/Makefile (revision 152840) +++ head/emulators/qemu-devel/Makefile (revision 152841) @@ -1,92 +1,92 @@ # New ports collection makefile for: qemu # Date created: 2004/05/31 # Whom: Juergen Lock # # $FreeBSD$ # PORTNAME= qemu PORTVERSION= 0.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://www.qemu.org/:release \ http://people.fruitsalad.org/nox/qemu/:snapshot \ http://www.volny.cz/xnavara/qemu/:snapshot \ http://qemu.dad-answers.com/download/qemu/:snapshot \ http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release .if defined (WITH_HACKS) DISTFILES+= qemu_dma_patch.tar.gz:idedma .endif DIST_SUBDIR= qemu EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= nox@jelal.kn-bremen.de COMMENT= QEMU CPU Emulator BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html .if defined(WITH_SAMBA) RUN_DEPENDS+= ${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba .endif .if defined(WITH_KQEMU) BUILD_DEPENDS+= ${LOCALBASE}/include/kqemu/kqemu.h:${PORTSDIR}/emulators/kqemu-kmod .endif HAS_CONFIGURE= yes USE_GMAKE= yes USE_GETOPT_LONG= yes USE_SDL= sdl USE_PERL5= yes PATCH_STRIP= -p1 CONFIGURE_ARGS+= --prefix=${PREFIX} --cc=${CC} MAKE_ENV+= BSD_MAKE=${MAKE} MAN1= qemu.1 qemu-img.1 ONLY_FOR_ARCHS= amd64 i386 .if defined(WITH_KQEMU) CONFIGURE_ARGS+= --enable-kqemu .else CONFIGURE_ARGS+= --disable-kqemu .endif .include .if ${ARCH} == "amd64" MAKE_ARGS+= ARCH=x86_64 .endif USE_GCC= 3.4 pre-everything:: .if !defined(WITH_KQEMU) @${ECHO_MSG} "Notice: you can build qemu with the (alpha!) kqemu accelerator kernel module" @${ECHO_MSG} "by defining WITH_KQEMU." .endif .if !defined(WITH_HACKS) @${ECHO_MSG} "You can build qemu with some hacks (esp. for speedup)" @${ECHO_MSG} "by defining WITH_HACKS." @${ECHO_MSG} "1. IDE Bus-master DMA Support by John Coiner" .endif .if !defined(WITH_SAMBA) && !exists(${LOCALBASE}/sbin/smbd) @${ECHO_MSG} "Notice: if you need qemu's -smb option (smb-export local dir to guest)" @${ECHO_MSG} "then you also need samba, you can have this port install it by defining" @${ECHO_MSG} "WITH_SAMBA." .endif post-extract: @${MKDIR} ${WRKSRC}/kqemu @${TOUCH} ${WRKSRC}/kqemu/Makefile @${ECHO} all: > ${WRKSRC}/kqemu/Makefile.freebsd pre-patch: @for A in ${ONLY_FOR_ARCHS}; do \ ${MKDIR} ${WRKSRC}/bsd/$$A; \ done post-patch: .if defined(WITH_HACKS) - @cd ${WRKDIR} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/qemu_dma_patch.tar.gz ; ${CP} new_qemu_dma_patch/bios.bin ${WRKSRC}/pc-bios; cd ${WRKSRC}; ${PATCH} -p1 < ../new_qemu_dma_patch/qemu-piix4-udma.patch + @cd ${WRKDIR} ; ${TAR} xvfz ${DISTDIR}/${DIST_SUBDIR}/qemu_dma_patch.tar.gz ; ${CP} new_qemu_dma_patch/bios.bin ${WRKSRC}/pc-bios; cd ${WRKSRC}; ${PATCH} --quiet -p1 < ../new_qemu_dma_patch/qemu-piix4-udma.patch .endif post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/emulators/qemu-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.42 \ No newline at end of property +1.43 \ No newline at end of property Index: head/emulators/qemu-devel/files/patch-slirp-mbuf.c =================================================================== --- head/emulators/qemu-devel/files/patch-slirp-mbuf.c (nonexistent) +++ head/emulators/qemu-devel/files/patch-slirp-mbuf.c (revision 152841) @@ -0,0 +1,26 @@ +# http://lists.gnu.org/archive/html/qemu-devel/2005-05/msg00228.html + +Index: qemu/slirp/mbuf.c +@@ -146,18 +146,19 @@ + struct mbuf *m; + int size; + { ++ int datasize; ++ + /* some compiles throw up on gotos. This one we can fake. */ + if(m->m_size>size) return; + + if (m->m_flags & M_EXT) { +- /* datasize = m->m_data - m->m_ext; */ ++ datasize = m->m_data - m->m_ext; + m->m_ext = (char *)realloc(m->m_ext,size); + /* if (m->m_ext == NULL) + * return (struct mbuf *)NULL; + */ +- /* m->m_data = m->m_ext + datasize; */ ++ m->m_data = m->m_ext + datasize; + } else { +- int datasize; + char *dat; + datasize = m->m_data - m->m_dat; + dat = (char *)malloc(size); Property changes on: head/emulators/qemu-devel/files/patch-slirp-mbuf.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/emulators/qemu-devel/files/patch-slirp-nat =================================================================== --- head/emulators/qemu-devel/files/patch-slirp-nat (nonexistent) +++ head/emulators/qemu-devel/files/patch-slirp-nat (revision 152841) @@ -0,0 +1,56 @@ +# http://lists.gnu.org/archive/html/qemu-devel/2005-12/msg00277.html + +diff -wurb qemu/slirp/misc.c qemu-patched/slirp/misc.c +--- qemu/slirp/misc.c Sun Dec 12 12:45:10 2004 ++++ qemu-patched/slirp/misc.c Mon Mar 21 13:22:05 2005 +@@ -90,13 +90,12 @@ + char buff[256]; + struct hostent *he; + +- if (gethostname(buff,256) < 0) +- return; +- +- if ((he = gethostbyname(buff)) == NULL) +- return; +- ++ if (gethostname(buff,256) == 0) ++ if ((he = gethostbyname(buff)) != NULL) + our_addr = *(struct in_addr *)he->h_addr; ++ ++ if (our_addr.s_addr == 0 || our_addr.s_addr == loopback_addr.s_addr) ++ our_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS); + } + + #if SIZEOF_CHAR_P == 8 +diff -wurb qemu/slirp/slirp.c qemu-patched/slirp/slirp.c +--- qemu/slirp/slirp.c Fri Oct 8 01:27:35 2004 ++++ qemu-patched/slirp/slirp.c Mon Mar 21 13:22:05 2005 +@@ -144,7 +144,6 @@ + m_init(); + + /* set default addresses */ +- getouraddr(); + inet_aton("127.0.0.1", &loopback_addr); + + if (get_dns_addr(&dns_addr) < 0) { +@@ -153,6 +152,7 @@ + } + + inet_aton(CTL_SPECIAL, &special_addr); ++ getouraddr(); + } + + #define CONN_CANFSEND(so) (((so)->so_state & (SS_FCANTSENDMORE|SS_ISFCONNECTED)) == SS_ISFCONNECTED) +diff -wurb qemu/slirp/udp.c qemu-patched/slirp/udp.c +--- qemu/slirp/udp.c Fri Oct 8 01:27:35 2004 ++++ qemu-patched/slirp/udp.c Mon Mar 21 13:22:05 2005 +@@ -314,6 +314,8 @@ + saddr = *addr; + if ((so->so_faddr.s_addr & htonl(0xffffff00)) == special_addr.s_addr) + saddr.sin_addr.s_addr = so->so_faddr.s_addr; ++ if ((so->so_faddr.s_addr & htonl(0x000000ff)) == htonl(0xff)) ++ saddr.sin_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS); + daddr.sin_addr = so->so_laddr; + daddr.sin_port = so->so_lport; + + Property changes on: head/emulators/qemu-devel/files/patch-slirp-nat ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property