[Pkg-xen-changes] r467 - in trunk/xen-3/debian: . patches

[Bastian Blank]

Author: waldi
Date: Mon Oct 15 22:15:23 2007
New Revision: 467

Log:
* debian/changelog: Update version to 3.1.1-1.
* debian/patches/series: Remove tools-pygrub-CVE-2007-4993.patch.
* debian/patches/tools-lib-abiname.diff,
  debian/patches/tools-python-xen-xm-relative-path.diff: Update.
* debian/patches/tools-pygrub-CVE-2007-4993.patch: Remove.


Removed:
   trunk/xen-3/debian/patches/tools-pygrub-CVE-2007-4993.patch
Modified:
   trunk/xen-3/debian/changelog
   trunk/xen-3/debian/patches/series
   trunk/xen-3/debian/patches/tools-lib-abiname.diff
   trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff

Modified: trunk/xen-3/debian/changelog
==============================================================================
--- trunk/xen-3/debian/changelog	(original)
+++ trunk/xen-3/debian/changelog	Mon Oct 15 22:15:23 2007
@@ -1,7 +1,8 @@
-xen-3 (3.1.0-3) UNRELEASED; urgency=high
+xen-3 (3.1.1-1) UNRELEASED; urgency=low
 
-  * Don't use exec with untrusted values in pygrub. (closes: #444430)
-    See CVE-2007-4993.
+  * New upstream release:
+    - Don't use exec with untrusted values in pygrub. (closes: #444430)
+      See CVE-2007-4993.
 
  -- Bastian Blank <waldi at debian.org>  Thu, 04 Oct 2007 08:46:48 +0200
 

Modified: trunk/xen-3/debian/patches/series
==============================================================================
--- trunk/xen-3/debian/patches/series	(original)
+++ trunk/xen-3/debian/patches/series	Mon Oct 15 22:15:23 2007
@@ -15,4 +15,3 @@
 tools-xenfb-prefix.diff
 tools-misc-xend-race.diff
 doc-remove-unused.diff
-tools-pygrub-CVE-2007-4993.patch

Modified: trunk/xen-3/debian/patches/tools-lib-abiname.diff
==============================================================================
--- trunk/xen-3/debian/patches/tools-lib-abiname.diff	(original)
+++ trunk/xen-3/debian/patches/tools-lib-abiname.diff	Mon Oct 15 22:15:23 2007
@@ -10,7 +10,7 @@
  CTRL_SRCS-y       :=
  CTRL_SRCS-y       += xc_core.c
  CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
-@@ -79,10 +76,10 @@
+@@ -78,10 +75,10 @@
  GUEST_PIC_OBJS := $(patsubst %.c,%.opic,$(GUEST_SRCS-y))
  
  LIB := libxenctrl.a
@@ -23,7 +23,7 @@
  
  .PHONY: all
  all: build
-@@ -104,16 +101,10 @@
+@@ -103,16 +100,10 @@
  install: build
  	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
  	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
@@ -42,7 +42,7 @@
  	$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
  
  .PHONY: TAGS
-@@ -141,26 +132,16 @@
+@@ -140,26 +131,16 @@
  libxenctrl.a: $(CTRL_LIB_OBJS)
  	$(AR) rc $@ $^
  
@@ -85,9 +85,9 @@
  PROFILE=#-pg
  BASECFLAGS=-Werror
  # Make gcc generate dependencies.
-@@ -85,13 +82,8 @@
- talloc_test.o: talloc.c
- 	$(COMPILE.c) -o $@ $<
+@@ -49,13 +46,8 @@
+ xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
  
 -libxenstore.so: libxenstore.so.$(MAJOR)
 -	ln -sf $< $@
@@ -101,9 +101,9 @@
  
  libxenstore.a: xs.o xs_lib.o
  	$(AR) rcs libxenstore.a $^
-@@ -177,9 +169,7 @@
- 	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/$(BINDIR)
+@@ -84,9 +76,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)/usr/include
+ 	$(INSTALL_PROG) xenstore-control xenstore-ls xenstored $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
  	$(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)
@@ -137,10 +137,10 @@
 @@ -43,19 +41,15 @@
  	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
  	$(INSTALL_DIR) $(DESTDIR)/usr/include
- 	$(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
+ 	$(INSTALL_DATA) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
 -	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so.$(MAJOR)
 -	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libblktap.so
- 	$(INSTALL_PROG) blktaplib.h $(DESTDIR)/usr/include
+ 	$(INSTALL_DATA) blktaplib.h $(DESTDIR)/usr/include
  
  clean:
  	rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS

Modified: trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff
==============================================================================
--- trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff	(original)
+++ trunk/xen-3/debian/patches/tools-python-xen-xm-relative-path.diff	Mon Oct 15 22:15:23 2007
@@ -41,7 +41,7 @@
          if a in vals.__dict__ and vals.__dict__[a] is not None:
              config_image.append([a, vals.__dict__[a]])
 +    if vals.device_model:
-+        config_image.append([ 'device_model', abspath(vals.device_model, 'bin') ])
-     config_image.append(['vncpasswd', vals.vncpasswd])
- 
++        config_image.append(['device_model', abspath(vals.device_model, 'bin')])
+     if vals.vncpasswd is not None:
+         config_image.append(['vncpasswd', vals.vncpasswd])