Sun May 26 20:27:43 2013 UTC ()
Build and install HVM-related files. Good enough to boot the NetBSD 6.1
i386 CD and do a network install.
Bump PKGREVISION


(bouyer)
diff -r1.3 -r1.4 pkgsrc/sysutils/xentools42/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/xentools42/PLIST
diff -r1.2 -r1.3 pkgsrc/sysutils/xentools42/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/xentools42/patches/patch-.._.._ipxe_src_Makefile.housekeeping
diff -r0 -r1.1 pkgsrc/sysutils/xentools42/patches/patch-.._.._ipxe_src_arch_i386_scripts_i386.lds
diff -r0 -r1.1 pkgsrc/sysutils/xentools42/patches/patch-qemu-xen_audio_audio.c
diff -r0 -r1.1 pkgsrc/sysutils/xentools42/patches/patch-qemu-xen_fpu_softfloat-specialize.h
diff -r0 -r1.1 pkgsrc/sysutils/xentools42/patches/patch-qemu-xen_ioport.c
diff -r0 -r1.1 pkgsrc/sysutils/xentools42/patches/patch-qemu-xen_memory.c
diff -r1.1 -r1.2 pkgsrc/sysutils/xentools42/patches/patch-.._.._ipxe_src_net_tls.c
diff -r1.1 -r1.2 pkgsrc/sysutils/xentools42/patches/patch-Makefile

cvs diff -r1.3 -r1.4 pkgsrc/sysutils/xentools42/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools42/Attic/Makefile 2013/05/25 05:19:17 1.3
+++ pkgsrc/sysutils/xentools42/Attic/Makefile 2013/05/26 20:27:43 1.4
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.3 2013/05/25 05:19:17 jnemeth Exp $ 1# $NetBSD: Makefile,v 1.4 2013/05/26 20:27:43 bouyer Exp $
2# 2#
3# VERSION is set in version.mk as it is shared with other packages 3# VERSION is set in version.mk as it is shared with other packages
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= xen-${VERSION} 6DISTNAME= xen-${VERSION}
7PKGNAME= xentools42-${VERSION} 7PKGNAME= xentools42-${VERSION}
8PKGREVISION= 1 8PKGREVISION= 2
9CATEGORIES= sysutils 9CATEGORIES= sysutils
10MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ 10MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
11 11
12DISTFILES= ${DISTNAME}.tar.gz 12DISTFILES= ${DISTNAME}.tar.gz
13DISTFILES+= ipxe-git-v${VERSION_IPXE}.tar.gz 13DISTFILES+= ipxe-git-v${VERSION_IPXE}.tar.gz
14SITES.ipxe-git-v${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/ 14SITES.ipxe-git-v${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfiles/
15 15
16MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= http://xen.org/ 17HOMEPAGE= http://xen.org/
18COMMENT= Userland Tools for Xen 4.2.x 18COMMENT= Userland Tools for Xen 4.2.x
19 19
20LICENSE= gnu-gpl-v2 20LICENSE= gnu-gpl-v2
21 21
@@ -81,47 +81,76 @@ PY_PATCHPLIST= yes @@ -81,47 +81,76 @@ PY_PATCHPLIST= yes
81#PYTHON_PATCH_SCRIPTS+= xenmon/*.py 81#PYTHON_PATCH_SCRIPTS+= xenmon/*.py
82#PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format 82#PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format
83 83
84REPLACE_PYTHON+= misc/sbdf2devicepath misc/sxp-pretty misc/xen-bugtool 84REPLACE_PYTHON+= misc/sbdf2devicepath misc/sxp-pretty misc/xen-bugtool
85REPLACE_PYTHON+= misc/xen-python-path misc/xen-ringwatch misc/xencons 85REPLACE_PYTHON+= misc/xen-python-path misc/xen-ringwatch misc/xencons
86REPLACE_PYTHON+= misc/xend misc/xenpvnetboot misc/xensymoops misc/xm 86REPLACE_PYTHON+= misc/xend misc/xenpvnetboot misc/xensymoops misc/xm
87REPLACE_PYTHON+= misc/xsview 87REPLACE_PYTHON+= misc/xsview
88REPLACE_PYTHON+= python/xen/remus/*.py 88REPLACE_PYTHON+= python/xen/remus/*.py
89REPLACE_PYTHON+= python/xen/util/*.py 89REPLACE_PYTHON+= python/xen/util/*.py
90REPLACE_PYTHON+= python/xen/xend/*.py 90REPLACE_PYTHON+= python/xen/xend/*.py
91REPLACE_PYTHON+= python/xen/xm/*.py 91REPLACE_PYTHON+= python/xen/xm/*.py
92REPLACE_PYTHON+= xenmon/xenmon.py 92REPLACE_PYTHON+= xenmon/xenmon.py
93 93
 94SUBST_CLASSES+= perlpath
 95SUBST_STAGE.perlpath= pre-configure
 96SUBST_FILES.perlpath= tools/firmware/rombios/makesym.perl
 97SUBST_FILES.perlpath+= tools/qemu-xen-traditional/texi2pod.pl
 98SUBST_FILES.perlpath+= tools/examples/xeninfo.pl
 99SUBST_FILES.perlpath+= tools/include/xen-external/bsd-sys-queue-h-seddery
 100SUBST_FILES.perlpath+= tools/qemu-xen/scripts/texi2pod.pl
 101SUBST_FILES.perlpath+= tools/qemu-xen/scripts/get_maintainer.pl
 102SUBST_FILES.perlpath+= tools/qemu-xen/scripts/checkpatch.pl
 103SUBST_FILES.perlpath+= tools/xm-test/mkreport
 104SUBST_FILES.perlpath+= tools/libxl/libxl_save_msgs_gen.pl
 105SUBST_FILES.perlpath+= tools/libxl/check-libxl-api-rules
 106SUBST_FILES.perlpath+= ../../ipxe/src/Makefile
 107SUBST_FILES.perlpath+= ../../ipxe/src/drivers/infiniband/qib_genbits.pl
 108SUBST_FILES.perlpath+= ../../ipxe/src/include/gpxe/efi/import.pl
 109SUBST_FILES.perlpath+= ../../ipxe/src/util/catrom.pl
 110SUBST_FILES.perlpath+= ../../ipxe/src/util/diffsize.pl
 111SUBST_FILES.perlpath+= ../../ipxe/src/util/disrom.pl
 112SUBST_FILES.perlpath+= ../../ipxe/src/util/get-pci-ids
 113SUBST_FILES.perlpath+= ../../ipxe/src/util/licence.pl
 114SUBST_FILES.perlpath+= ../../ipxe/src/util/makerom.pl
 115SUBST_FILES.perlpath+= ../../ipxe/src/util/mergerom.pl
 116SUBST_FILES.perlpath+= ../../ipxe/src/util/modrom.pl
 117SUBST_FILES.perlpath+= ../../ipxe/src/util/padimg.pl
 118SUBST_FILES.perlpath+= ../../ipxe/src/util/parserom.pl
 119SUBST_FILES.perlpath+= ../../ipxe/src/util/sortobjdump.pl
 120SUBST_FILES.perlpath+= ../../ipxe/src/util/swapdevids.pl
 121SUBST_FILES.perlpath+= ../../ipxe/src/util/symcheck.pl
 122SUBST_SED.perlpath= -e "s|/usr/bin/perl|${PREFIX}/bin/perl|g"
 123
94SUBST_CLASSES+= pathsvar 124SUBST_CLASSES+= pathsvar
95SUBST_STAGE.pathsvar= pre-configure 125SUBST_STAGE.pathsvar= pre-configure
96SUBST_FILES.pathsvar= Makefile \ 126SUBST_FILES.pathsvar= Makefile \
97 examples/xend-config.sxp \ 127 examples/xend-config.sxp \
98 hotplug/Linux/init.d/sysconfig.xendomains \ 128 hotplug/Linux/init.d/sysconfig.xendomains \
99 python/xen/xend/XendOptions.py \ 129 python/xen/xend/XendOptions.py \
100 python/xen/xend/server/relocate.py \ 130 python/xen/xend/server/relocate.py \
101 python/xen/xend/tests/xend-config.sxp \ 131 python/xen/xend/tests/xend-config.sxp \
102 xenstore/xs_lib.c 132 xenstore/xs_lib.c
103SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g" 133SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g"
104 134
105SUBST_CLASSES+= conf 135SUBST_CLASSES+= conf
106SUBST_STAGE.conf= pre-configure 136SUBST_STAGE.conf= pre-configure
107SUBST_FILES.conf+= python/xen/xm/create.py 137SUBST_FILES.conf+= python/xen/xm/create.py
108SUBST_FILES.conf+= ocaml/xenstored/define.ml 138SUBST_FILES.conf+= ocaml/xenstored/define.ml
109SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" 139SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
110 140
111.include "../../mk/bsd.prefs.mk" 141.include "../../mk/bsd.prefs.mk"
112 142
113#XXX XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup hotplugpath.sh 143XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup hotplugpath.sh
114XEND_SCRIPTS= block vif-bridge vif-ip hotplugpath.sh 
115 144
116.if ${OPSYS} == "NetBSD" 145.if ${OPSYS} == "NetBSD"
117SUBST_CLASSES+= proc 146SUBST_CLASSES+= proc
118SUBST_STAGE.proc= pre-configure 147SUBST_STAGE.proc= pre-configure
119SUBST_FILES.proc= python/xen/xend/XendVnet.py 148SUBST_FILES.proc= python/xen/xend/XendVnet.py
120SUBST_FILES.proc+= ocaml/xenstored/define.ml 149SUBST_FILES.proc+= ocaml/xenstored/define.ml
121SUBST_SED.proc= -e "s|/proc|/kern|g" 150SUBST_SED.proc= -e "s|/proc|/kern|g"
122PROCPATH= /kern 151PROCPATH= /kern
123.else 152.else
124PROCPATH= /proc 153PROCPATH= /proc
125.endif 154.endif
126 155
127SUBST_CLASSES+= procdev 156SUBST_CLASSES+= procdev

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/xentools42/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools42/Attic/PLIST 2013/05/25 05:19:17 1.2
+++ pkgsrc/sysutils/xentools42/Attic/PLIST 2013/05/26 20:27:43 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1@comment $NetBSD: PLIST,v 1.2 2013/05/25 05:19:17 jnemeth Exp $ 1@comment $NetBSD: PLIST,v 1.3 2013/05/26 20:27:43 bouyer Exp $
2bin/libxl-save-helper 2bin/libxl-save-helper
3bin/lsevtchn 3bin/lsevtchn
4bin/pygrub 4bin/pygrub
5@comment bin/qemu-img-xen 5bin/qemu-img-xen
6bin/readnotes 6bin/readnotes
7bin/remus 7bin/remus
8bin/xc_restore 8bin/xc_restore
9bin/xc_save 9bin/xc_save
10bin/xen-detect 10bin/xen-detect
11bin/xencons 11bin/xencons
12bin/xenconsole 12bin/xenconsole
13bin/xenctx 13bin/xenctx
14bin/xenpvnetboot 14bin/xenpvnetboot
15bin/xenstore 15bin/xenstore
16bin/xenstore-chmod 16bin/xenstore-chmod
17bin/xenstore-control 17bin/xenstore-control
18bin/xenstore-exists 18bin/xenstore-exists
@@ -605,28 +605,33 @@ ${PYSITELIB}/xen/xm/shutdown.py @@ -605,28 +605,33 @@ ${PYSITELIB}/xen/xm/shutdown.py
605${PYSITELIB}/xen/xm/shutdown.pyc 605${PYSITELIB}/xen/xm/shutdown.pyc
606${PYSITELIB}/xen/xm/tests/__init__.py 606${PYSITELIB}/xen/xm/tests/__init__.py
607${PYSITELIB}/xen/xm/tests/__init__.pyc 607${PYSITELIB}/xen/xm/tests/__init__.pyc
608${PYSITELIB}/xen/xm/tests/test_create.py 608${PYSITELIB}/xen/xm/tests/test_create.py
609${PYSITELIB}/xen/xm/tests/test_create.pyc 609${PYSITELIB}/xen/xm/tests/test_create.pyc
610${PYSITELIB}/xen/xm/xenapi_create.py 610${PYSITELIB}/xen/xm/xenapi_create.py
611${PYSITELIB}/xen/xm/xenapi_create.pyc 611${PYSITELIB}/xen/xm/xenapi_create.pyc
612${PYSITELIB}/xen/xsview/__init__.py 612${PYSITELIB}/xen/xsview/__init__.py
613${PYSITELIB}/xen/xsview/__init__.pyc 613${PYSITELIB}/xen/xsview/__init__.pyc
614${PYSITELIB}/xen/xsview/main.py 614${PYSITELIB}/xen/xsview/main.py
615${PYSITELIB}/xen/xsview/main.pyc 615${PYSITELIB}/xen/xsview/main.pyc
616${PYSITELIB}/xen/xsview/xsviewer.py 616${PYSITELIB}/xen/xsview/xsviewer.py
617${PYSITELIB}/xen/xsview/xsviewer.pyc 617${PYSITELIB}/xen/xsview/xsviewer.pyc
618@comment lib/xen/boot/hvmloader 618lib/xen/boot/hvmloader
619@comment libexec/qemu-dm 619libexec/qemu-dm
 620libexec/qemu-ga
 621libexec/qemu-img
 622libexec/qemu-io
 623libexec/qemu-nbd
 624libexec/qemu-system-i386
620libexec/xenpaging 625libexec/xenpaging
621man/man1/xentop.1 626man/man1/xentop.1
622man/man1/xentrace_format.1 627man/man1/xentrace_format.1
623man/man1/xl.1 628man/man1/xl.1
624man/man1/xm.1 629man/man1/xm.1
625man/man5/xend-config.sxp.5 630man/man5/xend-config.sxp.5
626man/man5/xl.cfg.5 631man/man5/xl.cfg.5
627man/man5/xl.conf.5 632man/man5/xl.conf.5
628man/man5/xlcpupool.cfg.5 633man/man5/xlcpupool.cfg.5
629man/man5/xmdomain.cfg.5 634man/man5/xmdomain.cfg.5
630man/man8/xentrace.8 635man/man8/xentrace.8
631sbin/blktapctrl 636sbin/blktapctrl
632sbin/flask-get-bool 637sbin/flask-get-bool
@@ -671,82 +676,144 @@ sbin/xsview @@ -671,82 +676,144 @@ sbin/xsview
671share/doc/xen/README.blktap 676share/doc/xen/README.blktap
672share/doc/xen/README.xenmon 677share/doc/xen/README.xenmon
673share/examples/rc.d/xen-watchdog 678share/examples/rc.d/xen-watchdog
674share/examples/rc.d/xencommons 679share/examples/rc.d/xencommons
675share/examples/rc.d/xend 680share/examples/rc.d/xend
676share/examples/rc.d/xendomains 681share/examples/rc.d/xendomains
677share/examples/xen/README 682share/examples/xen/README
678share/examples/xen/README.incompatibilities 683share/examples/xen/README.incompatibilities
679share/examples/xen/cpupool 684share/examples/xen/cpupool
680share/examples/xen/formats 685share/examples/xen/formats
681share/examples/xen/oxenstored.conf 686share/examples/xen/oxenstored.conf
682share/examples/xen/scripts/block 687share/examples/xen/scripts/block
683share/examples/xen/scripts/hotplugpath.sh 688share/examples/xen/scripts/hotplugpath.sh
684@comment share/examples/xen/scripts/qemu-ifup 689share/examples/xen/scripts/qemu-ifup
685share/examples/xen/scripts/vif-bridge 690share/examples/xen/scripts/vif-bridge
686share/examples/xen/scripts/vif-ip 691share/examples/xen/scripts/vif-ip
687share/examples/xen/xend-config.sxp 692share/examples/xen/xend-config.sxp
688share/examples/xen/xend-pci-permissive.sxp 693share/examples/xen/xend-pci-permissive.sxp
689share/examples/xen/xend-pci-quirks.sxp 694share/examples/xen/xend-pci-quirks.sxp
690share/examples/xen/xl.conf 695share/examples/xen/xl.conf
691share/examples/xen/xl.sh 696share/examples/xen/xl.sh
692share/examples/xen/xlexample.hvm 697share/examples/xen/xlexample.hvm
693share/examples/xen/xlexample.pvlinux 698share/examples/xen/xlexample.pvlinux
694share/examples/xen/xm-config.xml 699share/examples/xen/xm-config.xml
695share/examples/xen/xmexample.hvm 700share/examples/xen/xmexample.hvm
696share/examples/xen/xmexample.hvm-stubdom 701share/examples/xen/xmexample.hvm-stubdom
697share/examples/xen/xmexample.nbd 702share/examples/xen/xmexample.nbd
698share/examples/xen/xmexample.pv-grub 703share/examples/xen/xmexample.pv-grub
699share/examples/xen/xmexample.vti 704share/examples/xen/xmexample.vti
700share/examples/xen/xmexample1 705share/examples/xen/xmexample1
701share/examples/xen/xmexample2 706share/examples/xen/xmexample2
702share/examples/xen/xmexample3 707share/examples/xen/xmexample3
 708share/qemu-xen/bamboo.dtb
 709share/qemu-xen/bios.bin
 710share/qemu-xen/keymaps/ar
 711share/qemu-xen/keymaps/common
 712share/qemu-xen/keymaps/da
 713share/qemu-xen/keymaps/de
 714share/qemu-xen/keymaps/de-ch
 715share/qemu-xen/keymaps/en-gb
 716share/qemu-xen/keymaps/en-us
 717share/qemu-xen/keymaps/es
 718share/qemu-xen/keymaps/et
 719share/qemu-xen/keymaps/fi
 720share/qemu-xen/keymaps/fo
 721share/qemu-xen/keymaps/fr
 722share/qemu-xen/keymaps/fr-be
 723share/qemu-xen/keymaps/fr-ca
 724share/qemu-xen/keymaps/fr-ch
 725share/qemu-xen/keymaps/hr
 726share/qemu-xen/keymaps/hu
 727share/qemu-xen/keymaps/is
 728share/qemu-xen/keymaps/it
 729share/qemu-xen/keymaps/ja
 730share/qemu-xen/keymaps/lt
 731share/qemu-xen/keymaps/lv
 732share/qemu-xen/keymaps/mk
 733share/qemu-xen/keymaps/modifiers
 734share/qemu-xen/keymaps/nl
 735share/qemu-xen/keymaps/nl-be
 736share/qemu-xen/keymaps/no
 737share/qemu-xen/keymaps/pl
 738share/qemu-xen/keymaps/pt
 739share/qemu-xen/keymaps/pt-br
 740share/qemu-xen/keymaps/ru
 741share/qemu-xen/keymaps/sl
 742share/qemu-xen/keymaps/sv
 743share/qemu-xen/keymaps/th
 744share/qemu-xen/keymaps/tr
 745share/qemu-xen/linuxboot.bin
 746share/qemu-xen/mpc8544ds.dtb
 747share/qemu-xen/multiboot.bin
 748share/qemu-xen/openbios-ppc
 749share/qemu-xen/openbios-sparc32
 750share/qemu-xen/openbios-sparc64
 751share/qemu-xen/palcode-clipper
 752share/qemu-xen/petalogix-ml605.dtb
 753share/qemu-xen/petalogix-s3adsp1800.dtb
 754share/qemu-xen/ppc_rom.bin
 755share/qemu-xen/pxe-e1000.rom
 756share/qemu-xen/pxe-eepro100.rom
 757share/qemu-xen/pxe-ne2k_pci.rom
 758share/qemu-xen/pxe-pcnet.rom
 759share/qemu-xen/pxe-rtl8139.rom
 760share/qemu-xen/pxe-virtio.rom
 761share/qemu-xen/s390-zipl.rom
 762share/qemu-xen/sgabios.bin
 763share/qemu-xen/slof.bin
 764share/qemu-xen/spapr-rtas.bin
 765share/qemu-xen/vgabios-cirrus.bin
 766share/qemu-xen/vgabios-qxl.bin
 767share/qemu-xen/vgabios-stdvga.bin
 768share/qemu-xen/vgabios-vmware.bin
 769share/qemu-xen/vgabios.bin
703share/xen/create.dtd 770share/xen/create.dtd
704@comment share/xen/qemu/bamboo.dtb 771share/xen/qemu/bamboo.dtb
705@comment share/xen/qemu/bios.bin 772share/xen/qemu/bios.bin
706@comment share/xen/qemu/keymaps/ar 773share/xen/qemu/keymaps/ar
707@comment share/xen/qemu/keymaps/common 774share/xen/qemu/keymaps/common
708@comment share/xen/qemu/keymaps/da 775share/xen/qemu/keymaps/da
709@comment share/xen/qemu/keymaps/de 776share/xen/qemu/keymaps/de
710@comment share/xen/qemu/keymaps/de-ch 777share/xen/qemu/keymaps/de-ch
711@comment share/xen/qemu/keymaps/en-gb 778share/xen/qemu/keymaps/en-gb
712@comment share/xen/qemu/keymaps/en-us 779share/xen/qemu/keymaps/en-us
713@comment share/xen/qemu/keymaps/es 780share/xen/qemu/keymaps/es
714@comment share/xen/qemu/keymaps/et 781share/xen/qemu/keymaps/et
715@comment share/xen/qemu/keymaps/fi 782share/xen/qemu/keymaps/fi
716@comment share/xen/qemu/keymaps/fo 783share/xen/qemu/keymaps/fo
717@comment share/xen/qemu/keymaps/fr 784share/xen/qemu/keymaps/fr
718@comment share/xen/qemu/keymaps/fr-be 785share/xen/qemu/keymaps/fr-be
719@comment share/xen/qemu/keymaps/fr-ca 786share/xen/qemu/keymaps/fr-ca
720@comment share/xen/qemu/keymaps/fr-ch 787share/xen/qemu/keymaps/fr-ch
721@comment share/xen/qemu/keymaps/hr 788share/xen/qemu/keymaps/hr
722@comment share/xen/qemu/keymaps/hu 789share/xen/qemu/keymaps/hu
723@comment share/xen/qemu/keymaps/is 790share/xen/qemu/keymaps/is
724@comment share/xen/qemu/keymaps/it 791share/xen/qemu/keymaps/it
725@comment share/xen/qemu/keymaps/ja 792share/xen/qemu/keymaps/ja
726@comment share/xen/qemu/keymaps/lt 793share/xen/qemu/keymaps/lt
727@comment share/xen/qemu/keymaps/lv 794share/xen/qemu/keymaps/lv
728@comment share/xen/qemu/keymaps/mk 795share/xen/qemu/keymaps/mk
729@comment share/xen/qemu/keymaps/modifiers 796share/xen/qemu/keymaps/modifiers
730@comment share/xen/qemu/keymaps/nl 797share/xen/qemu/keymaps/nl
731@comment share/xen/qemu/keymaps/nl-be 798share/xen/qemu/keymaps/nl-be
732@comment share/xen/qemu/keymaps/no 799share/xen/qemu/keymaps/no
733@comment share/xen/qemu/keymaps/pl 800share/xen/qemu/keymaps/pl
734@comment share/xen/qemu/keymaps/pt 801share/xen/qemu/keymaps/pt
735@comment share/xen/qemu/keymaps/pt-br 802share/xen/qemu/keymaps/pt-br
736@comment share/xen/qemu/keymaps/ru 803share/xen/qemu/keymaps/ru
737@comment share/xen/qemu/keymaps/sl 804share/xen/qemu/keymaps/sl
738@comment share/xen/qemu/keymaps/sv 805share/xen/qemu/keymaps/sv
739@comment share/xen/qemu/keymaps/th 806share/xen/qemu/keymaps/th
740@comment share/xen/qemu/keymaps/tr 807share/xen/qemu/keymaps/tr
741@comment share/xen/qemu/openbios-ppc 808share/xen/qemu/openbios-ppc
742@comment share/xen/qemu/openbios-sparc32 809share/xen/qemu/openbios-sparc32
743@comment share/xen/qemu/openbios-sparc64 810share/xen/qemu/openbios-sparc64
744@comment share/xen/qemu/ppc_rom.bin 811share/xen/qemu/ppc_rom.bin
745@comment share/xen/qemu/pxe-e1000.bin 812share/xen/qemu/pxe-e1000.bin
746@comment share/xen/qemu/pxe-ne2k_pci.bin 813share/xen/qemu/pxe-ne2k_pci.bin
747@comment share/xen/qemu/pxe-pcnet.bin 814share/xen/qemu/pxe-pcnet.bin
748@comment share/xen/qemu/pxe-rtl8139.bin 815share/xen/qemu/pxe-rtl8139.bin
749@comment share/xen/qemu/vgabios-cirrus.bin 816share/xen/qemu/vgabios-cirrus.bin
750@comment share/xen/qemu/vgabios.bin 817share/xen/qemu/vgabios.bin
751@comment share/xen/qemu/video.x 818share/xen/qemu/video.x
752@pkgdir share/examples/xen/auto 819@pkgdir share/examples/xen/auto

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/xentools42/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools42/Attic/distinfo 2013/05/25 05:19:17 1.2
+++ pkgsrc/sysutils/xentools42/Attic/distinfo 2013/05/26 20:27:43 1.3
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1$NetBSD: distinfo,v 1.2 2013/05/25 05:19:17 jnemeth Exp $ 1$NetBSD: distinfo,v 1.3 2013/05/26 20:27:43 bouyer Exp $
2 2
3SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 3SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
4RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 4RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
5Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes 5Size (ipxe-git-v1.0.0.tar.gz) = 1996881 bytes
6SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c 6SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c
7RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6 7RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6
8Size (xen-4.2.2.tar.gz) = 15602746 bytes 8Size (xen-4.2.2.tar.gz) = 15602746 bytes
 9SHA1 (patch-.._.._ipxe_src_Makefile.housekeeping) = 5ec8020a9705b2f64096c2942473a8de4db578bb
9SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808 10SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808
 11SHA1 (patch-.._.._ipxe_src_arch_i386_scripts_i386.lds) = 4c0cbb7f535be43e1b6f53c284340a8bafc37c0b
10SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba 12SHA1 (patch-.._.._ipxe_src_core_settings.c) = 240ff973757403b983f12b2cbed826584c4a8aba
11SHA1 (patch-.._.._ipxe_src_net_tls.c) = c0cfbc2ab2b92c659c146601c4f80d58c951ca62 13SHA1 (patch-.._.._ipxe_src_net_tls.c) = 893c70515bc4cb0d4d9319fd94eddc4945f6a0b3
12SHA1 (patch-.._Config.mk) = ec5ba76be10e43cb1b2d37686e35d5fb81d8de80 14SHA1 (patch-.._Config.mk) = ec5ba76be10e43cb1b2d37686e35d5fb81d8de80
13SHA1 (patch-.._config_NetBSD.mk) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8 15SHA1 (patch-.._config_NetBSD.mk) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8
14SHA1 (patch-.._config_StdGNU.mk) = 3f93999038bd9d25277803cd1d969dc5733b593f 16SHA1 (patch-.._config_StdGNU.mk) = 3f93999038bd9d25277803cd1d969dc5733b593f
15SHA1 (patch-.._docs_man_xend-config.sxp.pod.5) = 36afc7b063f83adfe5b927ed0be586b102684020 17SHA1 (patch-.._docs_man_xend-config.sxp.pod.5) = 36afc7b063f83adfe5b927ed0be586b102684020
16SHA1 (patch-.._docs_man_xl.cfg.pod.5) = b9d19131ffb8a917a92c9878b86ea3dbc16dc0c8 18SHA1 (patch-.._docs_man_xl.cfg.pod.5) = b9d19131ffb8a917a92c9878b86ea3dbc16dc0c8
17SHA1 (patch-.._docs_man_xl.conf.pod.5) = 4009ff6aefb0a770ed42d096117dc97f8f55997f 19SHA1 (patch-.._docs_man_xl.conf.pod.5) = 4009ff6aefb0a770ed42d096117dc97f8f55997f
18SHA1 (patch-.._docs_man_xl.pod.1) = bd6272abed11c60c7c5ae88ae54377a3bfb921ed 20SHA1 (patch-.._docs_man_xl.pod.1) = bd6272abed11c60c7c5ae88ae54377a3bfb921ed
19SHA1 (patch-.._docs_man_xlcpupool.cfg.pod.5) = a693a79a1f1c16548f62f7da1fa58fa28030990f 21SHA1 (patch-.._docs_man_xlcpupool.cfg.pod.5) = a693a79a1f1c16548f62f7da1fa58fa28030990f
20SHA1 (patch-.._docs_man_xm.pod.1) = 975b7570da4bf9fd9cb79539fbd36b8dfbcbd571 22SHA1 (patch-.._docs_man_xm.pod.1) = 975b7570da4bf9fd9cb79539fbd36b8dfbcbd571
21SHA1 (patch-.._docs_man_xmdomain.cfg.pod.5) = 5563a72e203e789a86f4166c71ddb3fcff5215c6 23SHA1 (patch-.._docs_man_xmdomain.cfg.pod.5) = 5563a72e203e789a86f4166c71ddb3fcff5215c6
22SHA1 (patch-Makefile) = 8476e65d5bdf257cdf09d98b90820c82cb0ff719 24SHA1 (patch-Makefile) = 37fbcd6d2f0279d4c04c91085b0e7f5611a5b92a
23SHA1 (patch-blktap_drivers_Makefile) = 0906a5ec3a7450fc987b01289e2560e60966d00d 25SHA1 (patch-blktap_drivers_Makefile) = 0906a5ec3a7450fc987b01289e2560e60966d00d
24SHA1 (patch-configure) = 7bf4183efb76bded94a9519bf2737fb1240ab0e7 26SHA1 (patch-configure) = 7bf4183efb76bded94a9519bf2737fb1240ab0e7
25SHA1 (patch-examples_Makefile) = 8e89fab7817785b32d79ec0cad3a2645c6981f01 27SHA1 (patch-examples_Makefile) = 8e89fab7817785b32d79ec0cad3a2645c6981f01
26SHA1 (patch-examples_xend-config.sxp) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175 28SHA1 (patch-examples_xend-config.sxp) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175
27SHA1 (patch-firmware_etherboot_Makefile) = 1cb31183853c6069dafe47db8430e0577b21408e 29SHA1 (patch-firmware_etherboot_Makefile) = 1cb31183853c6069dafe47db8430e0577b21408e
28SHA1 (patch-firmware_etherboot_patches_boot__prompt__option.patch) = 7d14b60557b1e81de370b21544cd49643fa15f08 30SHA1 (patch-firmware_etherboot_patches_boot__prompt__option.patch) = 7d14b60557b1e81de370b21544cd49643fa15f08
29SHA1 (patch-firmware_etherboot_patches_series) = cb653834fe14ff0b23fdfa525a20d3bcfe6e3819 31SHA1 (patch-firmware_etherboot_patches_series) = cb653834fe14ff0b23fdfa525a20d3bcfe6e3819
30SHA1 (patch-firmware_hvmloader_Makefile) = 7d907fa33fa1f121b3d54116d905855529a020fd 32SHA1 (patch-firmware_hvmloader_Makefile) = 7d907fa33fa1f121b3d54116d905855529a020fd
31SHA1 (patch-hotplug_NetBSD_Makefile) = ab91c41ef6bbdd7f7f3d992b9f81e43056a765e2 33SHA1 (patch-hotplug_NetBSD_Makefile) = ab91c41ef6bbdd7f7f3d992b9f81e43056a765e2
32SHA1 (patch-hotplug_NetBSD_vif-bridge) = 663d0117612730960fd610b863d863d3abeea460 34SHA1 (patch-hotplug_NetBSD_vif-bridge) = 663d0117612730960fd610b863d863d3abeea460
33SHA1 (patch-hotplug_NetBSD_vif-ip) = c8fa179f58f1e550ab64901afd4fca53c3d11ceb 35SHA1 (patch-hotplug_NetBSD_vif-ip) = c8fa179f58f1e550ab64901afd4fca53c3d11ceb
34SHA1 (patch-hotplug_common_Makefile) = 288b1fe2565c1d4ded551bf159c068504ecab470 36SHA1 (patch-hotplug_common_Makefile) = 288b1fe2565c1d4ded551bf159c068504ecab470
35SHA1 (patch-include_xen-sys_NetBSD_gntdev.h) = 25c99a428fda6dee709888ddbcfdcfef5f654564 37SHA1 (patch-include_xen-sys_NetBSD_gntdev.h) = 25c99a428fda6dee709888ddbcfdcfef5f654564
@@ -48,14 +50,18 @@ SHA1 (patch-python_xen_xm_create.py) = 7 @@ -48,14 +50,18 @@ SHA1 (patch-python_xen_xm_create.py) = 7
48SHA1 (patch-qemu-xen-traditional_Makefile) = 0fcd7d5342269e87f14ff76be05d8757151438bc 50SHA1 (patch-qemu-xen-traditional_Makefile) = 0fcd7d5342269e87f14ff76be05d8757151438bc
49SHA1 (patch-qemu-xen-traditional_block-raw-posix.c) = 6376edcc57313c2ffe9bb3d88043d160d1f644ec 51SHA1 (patch-qemu-xen-traditional_block-raw-posix.c) = 6376edcc57313c2ffe9bb3d88043d160d1f644ec
50SHA1 (patch-qemu-xen-traditional_configure) = 8b14e6932441d0666092ef4f63d0acd99db0df51 52SHA1 (patch-qemu-xen-traditional_configure) = 8b14e6932441d0666092ef4f63d0acd99db0df51
51SHA1 (patch-qemu-xen-traditional_hw_e1000.c) = a8faf95491867c19471690ae98df93ff1d73114a 53SHA1 (patch-qemu-xen-traditional_hw_e1000.c) = a8faf95491867c19471690ae98df93ff1d73114a
52SHA1 (patch-qemu-xen-traditional_hw_ide.c) = d562c36627e861658e7a1d52514e59368871cbdb 54SHA1 (patch-qemu-xen-traditional_hw_ide.c) = d562c36627e861658e7a1d52514e59368871cbdb
53SHA1 (patch-qemu-xen-traditional_hw_pass-through.c) = d1f3a1842c595e2d261b997bac02bb71de41eaac 55SHA1 (patch-qemu-xen-traditional_hw_pass-through.c) = d1f3a1842c595e2d261b997bac02bb71de41eaac
54SHA1 (patch-qemu-xen-traditional_hw_pass-through.h) = 765cfbb30bdcf9c212bd7f9aa00d19d723da496e 56SHA1 (patch-qemu-xen-traditional_hw_pass-through.h) = 765cfbb30bdcf9c212bd7f9aa00d19d723da496e
55SHA1 (patch-qemu-xen-traditional_hw_piix4acpi.c) = bd89d2da04e2b816a097d4eb6d18936e5fe6bceb 57SHA1 (patch-qemu-xen-traditional_hw_piix4acpi.c) = bd89d2da04e2b816a097d4eb6d18936e5fe6bceb
56SHA1 (patch-qemu-xen-traditional_hw_pt-graphics.c) = 5484b9ec7d673502d73b0e4802969940eacad218 58SHA1 (patch-qemu-xen-traditional_hw_pt-graphics.c) = 5484b9ec7d673502d73b0e4802969940eacad218
57SHA1 (patch-qemu-xen-traditional_hw_pt-msi.c) = 7281d62de494fbbb6508818c9f8c5cfc212c77d8 59SHA1 (patch-qemu-xen-traditional_hw_pt-msi.c) = 7281d62de494fbbb6508818c9f8c5cfc212c77d8
58SHA1 (patch-qemu-xen-traditional_hw_pt-msi.h) = a33b6ed927db0204c25a9f6ff1bb8870c765f8ad 60SHA1 (patch-qemu-xen-traditional_hw_pt-msi.h) = a33b6ed927db0204c25a9f6ff1bb8870c765f8ad
59SHA1 (patch-qemu-xen-traditional_i386-dm_hookstarget.mak) = 7d526e8a9a0b0daf7215c54a036f7a3306291589 61SHA1 (patch-qemu-xen-traditional_i386-dm_hookstarget.mak) = 7d526e8a9a0b0daf7215c54a036f7a3306291589
60SHA1 (patch-qemu-xen-traditional_xen-hooks.mak) = 7acec9c981d18e1b659efc1d8e7c5c3b90d45411 62SHA1 (patch-qemu-xen-traditional_xen-hooks.mak) = 7acec9c981d18e1b659efc1d8e7c5c3b90d45411
 63SHA1 (patch-qemu-xen_audio_audio.c) = 95f7417cec027239e9591b8def632d9344f42e05
 64SHA1 (patch-qemu-xen_fpu_softfloat-specialize.h) = 791aeac1642101cbe2b15bf7ec189765c370f1a2
 65SHA1 (patch-qemu-xen_ioport.c) = 3dde5877f35396015d28eb2bb318ad2f79e6b4f8
 66SHA1 (patch-qemu-xen_memory.c) = e4e39a0d02195e3b04d97af04d4aa31ff379b73e
61SHA1 (patch-xentrace_Makefile) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada 67SHA1 (patch-xentrace_Makefile) = 9b53ba4a809dad7a1de34c8fa0dbe493d7256ada

File Added: pkgsrc/sysutils/xentools42/patches/Attic/patch-.._.._ipxe_src_Makefile.housekeeping
$NetBSD: patch-.._.._ipxe_src_Makefile.housekeeping,v 1.1 2013/05/26 20:27:43 bouyer Exp $

--- ../../ipxe/src/Makefile.housekeeping.orig	2013-05-26 19:35:55.000000000 +0200
+++ ../../ipxe/src/Makefile.housekeeping	2013-05-26 19:38:52.000000000 +0200
@@ -160,8 +160,8 @@
 Q :=
 QM := @\#
 else
-Q := @
-QM := @
+Q :=
+QM := @\#
 endif
 
 ###############################################################################
@@ -575,7 +575,7 @@
 #		  --defsym pci_vendor=0x1186 --defsym pci_device=0x1300")
 #
 TGT_LD_FLAGS	= $(foreach SYM,$(TGT_LD_PREFIX) $(TGT_LD_DRIVERS) obj_config,\
-		    -u $(SYM) --defsym check_$(SYM)=$(SYM) ) \
+		    -u $(SYM) ) \
 		  $(patsubst %,--defsym %,$(TGT_LD_IDS))
 
 # Calculate makerom flags for the specific target

File Added: pkgsrc/sysutils/xentools42/patches/Attic/patch-.._.._ipxe_src_arch_i386_scripts_i386.lds
$NetBSD: patch-.._.._ipxe_src_arch_i386_scripts_i386.lds,v 1.1 2013/05/26 20:27:43 bouyer Exp $

--- ../../ipxe/src/arch/i386/scripts/i386.lds.orig	2013-05-26 18:59:26.000000000 +0200
+++ ../../ipxe/src/arch/i386/scripts/i386.lds	2013-05-26 18:59:31.000000000 +0200
@@ -161,7 +161,7 @@
      *
      */
 
-    PROVIDE ( _max_align = 16 );
+    _max_align		    = DEFINED ( _max_align ) ? _max_align : 16;
     .			= 0;
 
     .			= ALIGN ( _max_align );

File Added: pkgsrc/sysutils/xentools42/patches/Attic/patch-qemu-xen_audio_audio.c
$NetBSD: patch-qemu-xen_audio_audio.c,v 1.1 2013/05/26 20:27:43 bouyer Exp $

--- qemu-xen/audio/audio.c.orig	2013-05-26 20:24:36.000000000 +0200
+++ qemu-xen/audio/audio.c	2013-05-26 20:24:39.000000000 +0200
@@ -1162,6 +1162,7 @@
         return 0;
     }
 
+#undef read
     bytes = sw->hw->pcm_ops->read (sw, buf, size);
     return bytes;
 }

File Added: pkgsrc/sysutils/xentools42/patches/Attic/patch-qemu-xen_fpu_softfloat-specialize.h
$NetBSD: patch-qemu-xen_fpu_softfloat-specialize.h,v 1.1 2013/05/26 20:27:43 bouyer Exp $

--- qemu-xen/fpu/softfloat-specialize.h.orig	2013-05-26 21:19:30.000000000 +0200
+++ qemu-xen/fpu/softfloat-specialize.h	2013-05-26 21:20:25.000000000 +0200
@@ -89,8 +89,8 @@
 #define floatx80_default_nan_low  LIT64( 0xC000000000000000 )
 #endif
 
-const floatx80 floatx80_default_nan = make_floatx80(floatx80_default_nan_high,
-                                                    floatx80_default_nan_low);
+const floatx80 floatx80_default_nan = { .high = floatx80_default_nan_high,
+                                        .low =  floatx80_default_nan_low};
 
 /*----------------------------------------------------------------------------
 | The pattern for a default generated quadruple-precision NaN.  The `high' and
@@ -104,8 +104,8 @@
 #define float128_default_nan_low  LIT64( 0x0000000000000000 )
 #endif
 
-const float128 float128_default_nan = make_float128(float128_default_nan_high,
-                                                    float128_default_nan_low);
+const float128 float128_default_nan = {.high = float128_default_nan_high,
+                                       .low = float128_default_nan_low};
 
 /*----------------------------------------------------------------------------
 | Raises the exceptions specified by `flags'.  Floating-point traps can be

File Added: pkgsrc/sysutils/xentools42/patches/Attic/patch-qemu-xen_ioport.c
$NetBSD: patch-qemu-xen_ioport.c,v 1.1 2013/05/26 20:27:43 bouyer Exp $

--- qemu-xen/ioport.c.orig	2013-05-26 20:28:24.000000000 +0200
+++ qemu-xen/ioport.c	2013-05-26 20:28:28.000000000 +0200
@@ -177,6 +177,7 @@
     return 0;
 }
 
+#undef read
 static uint32_t ioport_readb_thunk(void *opaque, uint32_t addr)
 {
     IORange *ioport = opaque;

File Added: pkgsrc/sysutils/xentools42/patches/Attic/patch-qemu-xen_memory.c
$NetBSD: patch-qemu-xen_memory.c,v 1.1 2013/05/26 20:27:43 bouyer Exp $

--- qemu-xen/memory.c.orig	2013-05-26 20:31:37.000000000 +0200
+++ qemu-xen/memory.c	2013-05-26 20:31:22.000000000 +0200
@@ -237,6 +237,7 @@
     }
 }
 
+#undef read
 static void memory_region_read_accessor(void *opaque,
                                         target_phys_addr_t addr,
                                         uint64_t *value,

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/xentools42/patches/Attic/patch-.._.._ipxe_src_net_tls.c (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools42/patches/Attic/patch-.._.._ipxe_src_net_tls.c 2013/05/15 06:58:50 1.1
+++ pkgsrc/sysutils/xentools42/patches/Attic/patch-.._.._ipxe_src_net_tls.c 2013/05/26 20:27:43 1.2
@@ -1,18 +1,26 @@ @@ -1,18 +1,26 @@
1$NetBSD: patch-.._.._ipxe_src_net_tls.c,v 1.1 2013/05/15 06:58:50 jnemeth Exp $ 1$NetBSD: patch-.._.._ipxe_src_net_tls.c,v 1.2 2013/05/26 20:27:43 bouyer Exp $
2 2
3--- ../../ipxe/src/net/tls.c.orig 2013-03-25 18:53:57.000000000 +0000 3--- ../../ipxe/src/net/tls.c.orig 2010-02-02 17:12:44.000000000 +0100
4+++ ../../ipxe/src/net/tls.c 4+++ ../../ipxe/src/net/tls.c 2013-05-26 20:05:24.000000000 +0200
5@@ -650,18 +650,22 @@ static int tls_send_client_key_exchange  5@@ -29,6 +29,7 @@
 6 #include <stdarg.h>
 7 #include <string.h>
 8 #include <errno.h>
 9+#include <alloca.h>
 10 #include <byteswap.h>
 11 #include <gpxe/hmac.h>
 12 #include <gpxe/md5.h>
 13@@ -650,18 +651,22 @@
6 RSA_CTX *rsa_ctx; 14 RSA_CTX *rsa_ctx;
7 RSA_pub_key_new ( &rsa_ctx, tls->rsa.modulus, tls->rsa.modulus_len, 15 RSA_pub_key_new ( &rsa_ctx, tls->rsa.modulus, tls->rsa.modulus_len,
8 tls->rsa.exponent, tls->rsa.exponent_len ); 16 tls->rsa.exponent, tls->rsa.exponent_len );
9+ size_t elen = rsa_ctx->num_octets; 17+ size_t elen = rsa_ctx->num_octets;
10 struct { 18 struct {
11 uint32_t type_length; 19 uint32_t type_length;
12 uint16_t encrypted_pre_master_secret_len; 20 uint16_t encrypted_pre_master_secret_len;
13- uint8_t encrypted_pre_master_secret[rsa_ctx->num_octets]; 21- uint8_t encrypted_pre_master_secret[rsa_ctx->num_octets];
14- } __attribute__ (( packed )) key_xchg; 22- } __attribute__ (( packed )) key_xchg;
15- 23-
16- memset ( &key_xchg, 0, sizeof ( key_xchg ) ); 24- memset ( &key_xchg, 0, sizeof ( key_xchg ) );
17- key_xchg.type_length = ( cpu_to_le32 ( TLS_CLIENT_KEY_EXCHANGE ) | 25- key_xchg.type_length = ( cpu_to_le32 ( TLS_CLIENT_KEY_EXCHANGE ) |
18- htonl ( sizeof ( key_xchg ) - 26- htonl ( sizeof ( key_xchg ) -
@@ -24,45 +32,45 @@ $NetBSD: patch-.._.._ipxe_src_net_tls.c, @@ -24,45 +32,45 @@ $NetBSD: patch-.._.._ipxe_src_net_tls.c,
24+ size_t klen = sizeof(*key_xchg) + elen; 32+ size_t klen = sizeof(*key_xchg) + elen;
25+ 33+
26+ key_xchg = alloca(klen); 34+ key_xchg = alloca(klen);
27+ 35+
28+ memset ( key_xchg, 0, klen ); 36+ memset ( key_xchg, 0, klen );
29+ key_xchg->type_length = ( cpu_to_le32 ( TLS_CLIENT_KEY_EXCHANGE ) | 37+ key_xchg->type_length = ( cpu_to_le32 ( TLS_CLIENT_KEY_EXCHANGE ) |
30+ htonl ( klen - 38+ htonl ( klen -
31+ sizeof ( key_xchg->type_length ) ) ); 39+ sizeof ( key_xchg->type_length ) ) );
32+ key_xchg->encrypted_pre_master_secret_len 40+ key_xchg->encrypted_pre_master_secret_len
33+ = htons ( elen ); 41+ = htons ( elen );
34  42
35 /* FIXME: Hack alert */ 43 /* FIXME: Hack alert */
36 DBGC ( tls, "RSA encrypting plaintext, modulus, exponent:\n" ); 44 DBGC ( tls, "RSA encrypting plaintext, modulus, exponent:\n" );
37@@ -671,14 +675,13 @@ static int tls_send_client_key_exchange  45@@ -671,14 +676,13 @@
38 DBGC_HD ( tls, tls->rsa.exponent, tls->rsa.exponent_len ); 46 DBGC_HD ( tls, tls->rsa.exponent, tls->rsa.exponent_len );
39 RSA_encrypt ( rsa_ctx, ( const uint8_t * ) &tls->pre_master_secret, 47 RSA_encrypt ( rsa_ctx, ( const uint8_t * ) &tls->pre_master_secret,
40 sizeof ( tls->pre_master_secret ), 48 sizeof ( tls->pre_master_secret ),
41- key_xchg.encrypted_pre_master_secret, 0 ); 49- key_xchg.encrypted_pre_master_secret, 0 );
42+ key_xchg->encrypted_pre_master_secret, 0 ); 50+ key_xchg->encrypted_pre_master_secret, 0 );
43 DBGC ( tls, "RSA encrypt done. Ciphertext:\n" ); 51 DBGC ( tls, "RSA encrypt done. Ciphertext:\n" );
44- DBGC_HD ( tls, &key_xchg.encrypted_pre_master_secret, 52- DBGC_HD ( tls, &key_xchg.encrypted_pre_master_secret,
45- sizeof ( key_xchg.encrypted_pre_master_secret ) ); 53- sizeof ( key_xchg.encrypted_pre_master_secret ) );
46+ DBGC_HD ( tls, &key_xchg->encrypted_pre_master_secret, elen ); 54+ DBGC_HD ( tls, &key_xchg->encrypted_pre_master_secret, elen );
47 RSA_free ( rsa_ctx ); 55 RSA_free ( rsa_ctx );
48  56
49  57
50- return tls_send_handshake ( tls, &key_xchg, sizeof ( key_xchg ) ); 58- return tls_send_handshake ( tls, &key_xchg, sizeof ( key_xchg ) );
51+ return tls_send_handshake ( tls, key_xchg, klen ); 59+ return tls_send_handshake ( tls, key_xchg, klen );
52 } 60 }
53  61
54 /** 62 /**
55@@ -802,12 +805,12 @@ static int tls_new_server_hello ( struct 63@@ -802,12 +806,12 @@
56 uint8_t session_id_len; 64 uint8_t session_id_len;
57 char next[0]; 65 char next[0];
58 } __attribute__ (( packed )) *hello_a = data; 66 } __attribute__ (( packed )) *hello_a = data;
59+ size_t slen = hello_a->session_id_len; 67+ size_t slen = hello_a->session_id_len;
60 struct { 68 struct {
61- uint8_t session_id[hello_a->session_id_len]; 69- uint8_t session_id[hello_a->session_id_len];
62 uint16_t cipher_suite; 70 uint16_t cipher_suite;
63 uint8_t compression_method; 71 uint8_t compression_method;
64 char next[0]; 72 char next[0];
65- } __attribute__ (( packed )) *hello_b = ( void * ) &hello_a->next; 73- } __attribute__ (( packed )) *hello_b = ( void * ) &hello_a->next;
66+ } __attribute__ (( packed )) *hello_b = ( void * ) ((uint8_t *)&hello_a->next + slen); 74+ } __attribute__ (( packed )) *hello_b = ( void * ) ((uint8_t *)&hello_a->next + slen);
67 void *end = hello_b->next; 75 void *end = hello_b->next;
68 int rc; 76 int rc;

cvs diff -r1.1 -r1.2 pkgsrc/sysutils/xentools42/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools42/patches/Attic/patch-Makefile 2013/05/15 06:58:50 1.1
+++ pkgsrc/sysutils/xentools42/patches/Attic/patch-Makefile 2013/05/26 20:27:43 1.2
@@ -1,52 +1,33 @@ @@ -1,52 +1,33 @@
1$NetBSD: patch-Makefile,v 1.1 2013/05/15 06:58:50 jnemeth Exp $ 1$NetBSD: patch-Makefile,v 1.2 2013/05/26 20:27:43 bouyer Exp $
2 2
3--- Makefile.orig 2012-12-17 15:00:09.000000000 +0000 3--- Makefile.orig 2013-04-23 18:42:55.000000000 +0200
4+++ Makefile 4+++ Makefile 2013-05-26 18:33:32.000000000 +0200
5@@ -15,28 +15,29 @@ SUBDIRS-y += examples 5@@ -18,15 +18,16 @@
6 SUBDIRS-y += hotplug 6 SUBDIRS-$(CONFIG_X86) += firmware
7 SUBDIRS-y += xentrace 
8 SUBDIRS-$(CONFIG_XCUTILS) += xcutils 
9-SUBDIRS-$(CONFIG_X86) += firmware 
10+#XXX SUBDIRS-$(CONFIG_X86) += firmware 
11 SUBDIRS-y += console 7 SUBDIRS-y += console
12 SUBDIRS-y += xenmon 8 SUBDIRS-y += xenmon
13-SUBDIRS-$(VTPM_TOOLS) += vtpm_manager 9-SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
14-SUBDIRS-$(VTPM_TOOLS) += vtpm 10-SUBDIRS-$(VTPM_TOOLS) += vtpm
15+#XXX SUBDIRS-$(VTPM_TOOLS) += vtpm_manager 11+#XXX SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
16+#XXX SUBDIRS-$(VTPM_TOOLS) += vtpm 12+#XXX SUBDIRS-$(VTPM_TOOLS) += vtpm
17 SUBDIRS-y += xenstat 13 SUBDIRS-y += xenstat
18 SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio) 14 SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio)
19 SUBDIRS-$(CONFIG_Linux) += memshr  15 SUBDIRS-$(CONFIG_Linux) += memshr
20 SUBDIRS-$(CONFIG_Linux) += blktap 16 SUBDIRS-$(CONFIG_Linux) += blktap
21 SUBDIRS-$(CONFIG_Linux) += blktap2 17 SUBDIRS-$(CONFIG_Linux) += blktap2
22 SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio) 18 SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio)
23-SUBDIRS-$(CONFIG_NetBSD) += blktap2 19-SUBDIRS-$(CONFIG_NetBSD) += blktap2
24+SUBDIRS-$(CONFIG_NetBSD) += blktap 20+SUBDIRS-$(CONFIG_NetBSD) += blktap
25+#SUBDIRS-$(CONFIG_NetBSD) += blktap2 21+#SUBDIRS-$(CONFIG_NetBSD) += blktap2
26 SUBDIRS-$(CONFIG_NetBSD) += xenbackendd 22 SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
27 SUBDIRS-y += libfsimage 23 SUBDIRS-y += libfsimage
28 SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen 24 SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
29 SUBDIRS-$(CONFIG_Linux) += libvchan 25@@ -44,7 +45,7 @@
30  
31-# do not recurse in to a dir we are about to delete 
32-ifneq "$(MAKECMDGOALS)" "distclean" 
33-SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir 
34-SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir 
35-endif 
36+#XXX # do not recurse in to a dir we are about to delete 
37+#XXX ifneq "$(MAKECMDGOALS)" "distclean" 
38+#XXX SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir 
39+#XXX SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir 
40+#XXX endif 
41  
42 SUBDIRS-y += xenpmd 
43 SUBDIRS-y += libxl 
44@@ -44,7 +45,7 @@ SUBDIRS-y += remus 
45 SUBDIRS-$(CONFIG_X86) += xenpaging 26 SUBDIRS-$(CONFIG_X86) += xenpaging
46 SUBDIRS-$(CONFIG_X86) += debugger/gdbsx 27 SUBDIRS-$(CONFIG_X86) += debugger/gdbsx
47 SUBDIRS-$(CONFIG_X86) += debugger/kdd 28 SUBDIRS-$(CONFIG_X86) += debugger/kdd
48-SUBDIRS-$(CONFIG_TESTS) += tests 29-SUBDIRS-$(CONFIG_TESTS) += tests
49+#XXX SUBDIRS-$(CONFIG_TESTS) += tests 30+#XXX SUBDIRS-$(CONFIG_TESTS) += tests
50  31
51 # These don't cross-compile 32 # These don't cross-compile
52 ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH)) 33 ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))