Index: extrasrc/pkg-xen/trunk/debian/changelog
===================================================================
--- extrasrc/pkg-xen/trunk/debian/changelog (revision 79)
+++ extrasrc/pkg-xen/trunk/debian/changelog (revision 125)
@@ -1,2 +1,8 @@
+xen-3.1 (3.1.0-0-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Peter Siering <ps@ctmagazin.de>  Tue, 22 May 2007 16:00:00 +0000
+
 xen-3.0 (3.0.4-1+hg13133-1) UNRELEASED; urgency=low
 
Index: extrasrc/pkg-xen/trunk/debian/patches/00list
===================================================================
--- extrasrc/pkg-xen/trunk/debian/patches/00list (revision 79)
+++ extrasrc/pkg-xen/trunk/debian/patches/00list (revision 179)
@@ -2,4 +2,5 @@
 prefix-ioemu
 prefix-python
+pygrub-fix
 version
 qemu-config
@@ -8,3 +9,3 @@
 blktap-disable
 path-relative
-not-reinvent-udev
+#not-reinvent-udev
Index: extrasrc/pkg-xen/trunk/debian/patches/libs.dpatch
===================================================================
--- extrasrc/pkg-xen/trunk/debian/patches/libs.dpatch (revision 79)
+++ extrasrc/pkg-xen/trunk/debian/patches/libs.dpatch (revision 82)
@@ -19,4 +19,22 @@
  CTRL_SRCS-y       += xc_core.c
  CTRL_SRCS-y       += xc_domain.c
+@@ -30,7 +30,7 @@
+ GUEST_SRCS-$(CONFIG_HVM) += xc_hvm_build.c
+ 
+ # symlink libelf from xen/common/libelf/
+-LIBELF_SRCS := libelf-tools.c libelf-loader.c
++LIBELF_SRCS := libelf-private.h libelf-tools.c libelf-loader.c
+ LIBELF_SRCS += libelf-dominfo.c libelf-relocate.c
+ 
+ libelf-tools.o: libelf-tools.c libelf-private.h
+@@ -39,7 +39,7 @@
+ libelf-relocate.o: libelf-relocate.c libelf-private.h
+ 
+ $(LIBELF_SRCS) libelf-private.h:
+-	ln -s ../../xen/common/libelf/$@ $@
++	ln -sf ../../xen/common/libelf/$@ $@
+ 
+ # add libelf bits to libxc
+ GUEST_SRCS-y += $(LIBELF_SRCS)
 @@ -50,11 +47,9 @@
  GUEST_LIB_OBJS := $(patsubst %.c,%.o,$(GUEST_SRCS-y))
@@ -115,5 +133,5 @@
  	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
  	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
 -	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
 -	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
Index: extrasrc/pkg-xen/trunk/debian/patches/qemu-config.dpatch
===================================================================
--- extrasrc/pkg-xen/trunk/debian/patches/qemu-config.dpatch (revision 79)
+++ extrasrc/pkg-xen/trunk/debian/patches/qemu-config.dpatch (revision 82)
@@ -9,8 +9,8 @@
 --- xen-unstable~/tools/ioemu/vl.c	2006-09-21 19:44:57.000000000 +0000
 +++ xen-unstable/tools/ioemu/vl.c	2006-09-28 06:53:45.238717978 +0000
-@@ -88,7 +88,7 @@
- 
+@@ -89,7 +89,7 @@
  #include "exec-all.h"
  
+ #include <xen/hvm/params.h>
 -#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup"
 +#define DEFAULT_NETWORK_SCRIPT "/etc/xen/scripts/qemu-ifup"
Index: extrasrc/pkg-xen/trunk/debian/patches/prefix-utils.dpatch
===================================================================
--- extrasrc/pkg-xen/trunk/debian/patches/prefix-utils.dpatch (revision 79)
+++ extrasrc/pkg-xen/trunk/debian/patches/prefix-utils.dpatch (revision 180)
@@ -80,6 +80,6 @@
  IBIN         = blktapctrl tapdisk
  QCOW_UTIL    = img2qcow qcow2raw qcow-create
--INST_DIR  = /usr/sbin
-+INST_DIR  = /usr/$(BINDIR)
+-INST_DIR     = /usr/sbin
++INST_DIR     = /usr/$(BINDIR)
  LIBAIO_DIR   = ../../libaio/src
  
@@ -127,9 +127,9 @@
  .PHONY: install
  install: $(BIN)
--	$(INSTALL_DIR) -p $(DESTDIR)/$(DAEMON_INSTALL_DIR)
+-	$(INSTALL_DIR) $(DESTDIR)/$(DAEMON_INSTALL_DIR)
 -	$(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR)
--	$(INSTALL_DIR) -p $(DESTDIR)/$(CLIENT_INSTALL_DIR)
+-	$(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
 -	$(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
-+	$(INSTALL_DIR) -p $(DESTDIR)/$(DIR)
++	$(INSTALL_DIR) $(DESTDIR)/$(DIR)
 +	$(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DIR)
 +	$(INSTALL_PROG) xenconsole $(DESTDIR)/$(DIR)
@@ -137,10 +137,10 @@
 --- xen-3.0~/tools/misc/Makefile	2007-01-01 13:31:41.000000000 +0000
 +++ xen-3.0/tools/misc/Makefile	2007-01-01 13:39:52.798490332 +0000
-@@ -12,7 +12,7 @@
- TARGETS  = xenperf xc_shadow
+@@ -14,7 +14,7 @@
+ TARGETS := $(TARGETS-y)
  
  INSTALL_BIN  = $(TARGETS) xencons
--INSTALL_SBIN = netfix xm xen-bugtool xend xenperf
-+INSTALL_BIN += netfix xm xen-bugtool xend
+-INSTALL_SBIN = netfix xm xen-bugtool xen-python-path xend xenperf
++INSTALL_BIN = netfix xm xen-bugtool xen-python-path xend xenperf
  
  .PHONY: all
@@ -158,8 +158,8 @@
  #       No sense in installing miniterm on the Xen box.
  #	$(MAKE) -C miniterm install
-@@ -42,4 +39,4 @@
+@@ -44,4 +44,4 @@
  	$(CC) -c $(CFLAGS) -o $@ $<
  
- $(TARGETS): %: %.o Makefile
+ xenperf: %: %.o Makefile
 -	$(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl
 +	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl
@@ -176,38 +176,29 @@
  .PHONY: clean
  clean:
-diff -urNad xen-3.0~/tools/pygrub/Makefile xen-3.0/tools/pygrub/Makefile
---- xen-3.0~/tools/pygrub/Makefile	2007-01-01 13:31:41.000000000 +0000
-+++ xen-3.0/tools/pygrub/Makefile	2007-01-01 13:42:31.185788620 +0000
-@@ -11,7 +11,7 @@
- .PHONY: install
- ifndef XEN_PYTHON_NATIVE_INSTALL
- install: all
--	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix=""
-+	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)" --install-lib=$(DESTDIR)/usr/$(LIBDIR)/python --install-scripts=$(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) -p $(DESTDIR)/var/run/xend/boot
- else
- install: all
 diff -urNad xen-3.0~/tools/python/Makefile xen-3.0/tools/python/Makefile
 --- xen-3.0~/tools/python/Makefile	2007-01-01 13:31:41.000000000 +0000
 +++ xen-3.0/tools/python/Makefile	2007-01-01 13:43:16.239308569 +0000
-@@ -6,15 +6,15 @@
- 
- .PHONY: build
- build:
+@@ -16,7 +16,7 @@
+ 
+ .PHONY: build buildpy
+ buildpy:
 -	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build
 +	CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py build
  
- .PHONY: install
+ build: buildpy refresh-pot refresh-po $(CATALOGS)
+ 
+@@ -57,10 +57,10 @@
  ifndef XEN_PYTHON_NATIVE_INSTALL
- install: all
--	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force
-+	CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)" --install-lib=$(DESTDIR)/usr/$(LIBDIR)/python  --force
+ install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin; print auxbin.libpath()")
+ install: install-messages install-dtd
+-	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force --install-lib="$(DESTDIR)$(LIBPATH)/python"
++	CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)" --install-lib=$(DESTDIR)/usr/$(LIBDIR)/python --force
  else
- install: all
+ install: install-messages install-dtd
 -	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force
 +	CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --root="$(DESTDIR)" --force
  endif
  
- .PHONY: test
+ install-dtd: all
 diff -urNad xen-3.0~/tools/python/setup.py xen-3.0/tools/python/setup.py
 --- xen-3.0~/tools/python/setup.py	2007-01-01 13:31:43.000000000 +0000
@@ -239,8 +230,24 @@
 @@ -32,6 +35,7 @@
  
+ scf = Extension("scf",
+                extra_compile_args = extra_compile_args,
++               extra_link_args    = extra_link_args,
+                include_dirs       = include_dirs + [ "xen/lowlevel/scf" ],
+                library_dirs       = library_dirs,
+                libraries          = libraries,
+@@ -39,6 +43,7 @@
+              
  acm = Extension("acm",
                 extra_compile_args = extra_compile_args,
 +               extra_link_args    = extra_link_args,
                 include_dirs       = include_dirs + [ "xen/lowlevel/acm" ],
+                library_dirs       = library_dirs,
+                libraries          = libraries,
+@@ -46,6 +51,7 @@
+ 
+ ptsname = Extension("ptsname",
+                extra_compile_args = extra_compile_args,
++               extra_link_args    = extra_link_args,
+                include_dirs       = include_dirs + [ "ptsname" ],
                 library_dirs       = library_dirs,
                 libraries          = libraries,
@@ -309,10 +316,10 @@
 @@ -170,13 +170,12 @@
  install: all
- 	$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
- 	$(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
--	$(INSTALL_DIR) -p $(DESTDIR)/usr/bin
--	$(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
-+	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) -p $(DESTDIR)/usr/include
+ 	$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
+ 	$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
+-	$(INSTALL_DIR) $(DESTDIR)/usr/bin
+-	$(INSTALL_DIR) $(DESTDIR)/usr/sbin
++	$(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)/usr/include
 -	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
 -	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
@@ -323,5 +330,5 @@
 +	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
 +	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
  	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
  	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
Index: extrasrc/pkg-xen/trunk/debian/patches/prefix-python.dpatch
===================================================================
--- extrasrc/pkg-xen/trunk/debian/patches/prefix-python.dpatch (revision 79)
+++ extrasrc/pkg-xen/trunk/debian/patches/prefix-python.dpatch (revision 106)
@@ -9,18 +9,16 @@
 --- xen-3.0~/tools/misc/xend	2007-01-01 13:31:41.000000000 +0000
 +++ xen-3.0/tools/misc/xend	2007-01-01 13:45:55.018551704 +0000
-@@ -38,16 +38,7 @@
+@@ -31,13 +31,8 @@
+ import time
+ import commands
  
- AUXBIN = 'xen/util/auxbin.py'
- 
--for p in ['python%s' % sys.version[:3], 'python']:
--    for l in ['/usr/lib64', '/usr/lib']:
--        d = os.path.join(l, p)
--        if os.path.exists(os.path.join(d, AUXBIN)):
--            sys.path.append(d)
--            import xen.util.auxbin
--            libpath = xen.util.auxbin.libpath()
--            sys.path = sys.path[:-1]
--            sys.path.append(libpath)
--            break
+-result = commands.getstatusoutput(os.path.join(os.path.dirname(sys.argv[0]),
+-                                               'xen-python-path'))
+-if result[0] != 0:
+-    print >>sys.stderr, result[1]
+-    sys.exit(1)
+-
+-sys.path.append(result[1])
++AUXBIN = 'xen/util/auxbin.py'
 +sys.path.append('%s/../lib/python' % sys.path[0])
  
Index: extrasrc/pkg-xen/trunk/debian/patches/pygrub-fix.dpatch
===================================================================
--- extrasrc/pkg-xen/trunk/debian/patches/pygrub-fix.dpatch (revision 179)
+++ extrasrc/pkg-xen/trunk/debian/patches/pygrub-fix.dpatch (revision 179)
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pygrub-fix by Peter Siering <ps@ctmagazin.de>
+## fixes pygrub's path to python modules as suggested by Joey Hess in #404533
+## changes python prefixes while building pygrub
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+--- xen/tools/pygrub/src/pygrub.orig	2007-05-30 09:41:38.000000000 +0000
++++ xen/tools/pygrub/src/pygrub	2007-05-30 09:43:58.000000000 +0000
+@@ -21,7 +21,7 @@
+ import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
+ import getopt
+ 
+-sys.path = [ '/usr/lib/python' ] + sys.path
++sys.path.append('%s/../lib/python' % sys.path[0])
+ 
+ import fsimage
+ import grub.GrubConf
+--- xen/tools/pygrub/setup.py.orig	2007-05-30 09:40:03.000000000 +0000
++++ xen/tools/pygrub/setup.py	2007-05-30 09:40:53.000000000 +0000
+@@ -4,11 +4,13 @@
+ import sys
+ 
+ extra_compile_args  = [ "-fno-strict-aliasing", "-Werror" ]
++extra_link_args = [ "-Wl,-rpath,/usr/%s" % os.environ['LIBDIR'] ]
+ 
+ XEN_ROOT = "../.."
+ 
+ fsimage = Extension("fsimage",
+     extra_compile_args = extra_compile_args,
++    extra_link_args = extra_link_args,
+     include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+     library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+     libraries = ["fsimage"],
+--- xen/tools/pygrub/Makefile.orig	2007-05-30 10:05:13.000000000 +0000
++++ xen/tools/pygrub/Makefile	2007-05-30 10:09:38.000000000 +0000
+@@ -6,17 +6,17 @@
+ all: build
+ .PHONY: build
+ build:
+-	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py build
++	CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py build
+ 
+ .PHONY: install
+ ifndef XEN_PYTHON_NATIVE_INSTALL
+ install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()")
+ install: all
+-	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --install-lib="$(DESTDIR)$(LIBPATH)/python"
++	CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --home="$(DESTDIR)/usr/$(LIBDIR)" --prefix="" --install-lib="$(DESTDIR)/usr/$(LIBDIR)/python" --install-scripts=$(DESTDIR)/usr/$(BINDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
+ else
+ install: all
+-	CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
++	CC="$(CC)" CFLAGS="$(CFLAGS)" LIBDIR="$(LIBDIR)" python setup.py install --root="$(DESTDIR)"
+ 	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
+ endif
+ 
Index: extrasrc/pkg-xen/trunk/debian/rules.defs
===================================================================
--- extrasrc/pkg-xen/trunk/debian/rules.defs (revision 79)
+++ extrasrc/pkg-xen/trunk/debian/rules.defs (revision 83)
@@ -1,4 +1,4 @@
-KERNELVERSION := 2.6.18-3
-MAJOR := 3.0
+KERNELVERSION := 2.6.18-4
+MAJOR := 3.1
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps