[Pkg-xen-changes] r588 - in trunk/xen-unstable/debian: . patches templates

Bastian Blank waldi at alioth.debian.org
Sat Jun 28 10:41:38 UTC 2008 

Author: waldi
Date: Sat Jun 28 10:41:38 2008
New Revision: 588

Log:
Merge xen-3 changes.


Added:
   trunk/xen-unstable/debian/patches/tools-blktap-crypto.patch
Modified:
   trunk/xen-unstable/debian/patches/series
   trunk/xen-unstable/debian/rules.real
   trunk/xen-unstable/debian/templates/control.hypervisor.in
   trunk/xen-unstable/debian/templates/control.source.in
   trunk/xen-unstable/debian/templates/control.utils.in
   trunk/xen-unstable/debian/templates/xen-utils.lintian-overrides.in

Modified: trunk/xen-unstable/debian/patches/series
==============================================================================
--- trunk/xen-unstable/debian/patches/series	(original)
+++ trunk/xen-unstable/debian/patches/series	Sat Jun 28 10:41:38 2008
@@ -10,3 +10,4 @@
 tools-pygrub-prefix.diff
 tools-libfsimage-prefix.diff
 tools-misc-xend-race.diff
+tools-blktap-crypto.patch

Added: trunk/xen-unstable/debian/patches/tools-blktap-crypto.patch
==============================================================================
--- (empty file)
+++ trunk/xen-unstable/debian/patches/tools-blktap-crypto.patch	Sat Jun 28 10:41:38 2008
@@ -0,0 +1,59 @@
+diff -r 3da148fb7d9b tools/blktap/drivers/Makefile
+--- a/tools/blktap/drivers/Makefile	Thu Jun 19 11:09:10 2008 +0100
++++ b/tools/blktap/drivers/Makefile	Sat Jun 28 12:13:49 2008 +0200
+@@ -18,7 +18,7 @@ DEPS      = .*.d
+ DEPS      = .*.d
+ 
+ LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -L../lib -lblktap
+-LDFLAGS_img := $(LIBAIO_DIR)/libaio.a -lcrypto -lpthread -lz
++LDFLAGS_img := $(LIBAIO_DIR)/libaio.a -lgcrypt -lpthread -lz
+ 
+ BLK-OBJS-y  := block-aio.o
+ BLK-OBJS-y  += block-sync.o
+diff -r 3da148fb7d9b tools/blktap/drivers/block-qcow.c
+--- a/tools/blktap/drivers/block-qcow.c	Thu Jun 19 11:09:10 2008 +0100
++++ b/tools/blktap/drivers/block-qcow.c	Sat Jun 28 12:13:49 2008 +0200
+@@ -33,7 +33,7 @@
+ #include <zlib.h>
+ #include <inttypes.h>
+ #include <libaio.h>
+-#include <openssl/md5.h>
++#include <gcrypt.h>
+ #include "bswap.h"
+ #include "aes.h"
+ #include "tapdisk.h"
+@@ -149,31 +149,22 @@ static uint32_t gen_cksum(char *ptr, int
+ static uint32_t gen_cksum(char *ptr, int len)
+ {
+ 	int i;
+-	unsigned char *md;
+-	uint32_t ret;
++	uint32_t md[4];
+ 
+-	md = malloc(MD5_DIGEST_LENGTH);
+-
+-	if(!md) return 0;
+-	
+ 	/* Convert L1 table to big endian */
+ 	for(i = 0; i < len / sizeof(uint64_t); i++) {
+ 		cpu_to_be64s(&((uint64_t*) ptr)[i]);
+ 	}
+ 
+ 	/* Generate checksum */
+-	if (MD5((unsigned char *)ptr, len, md) != md)
+-		ret = 0;
+-	else
+-		memcpy(&ret, md, sizeof(uint32_t));
++	gcry_md_hash_buffer(GCRY_MD_MD5, md, ptr, len);
+ 
+ 	/* Convert L1 table back to native endianess */
+ 	for(i = 0; i < len / sizeof(uint64_t); i++) {
+ 		be64_to_cpus(&((uint64_t*) ptr)[i]);
+ 	}
+ 
+-	free(md);
+-	return ret;
++	return md[0];
+ }
+ 
+ static int get_filesize(char *filename, uint64_t *size, struct stat *st)

Modified: trunk/xen-unstable/debian/rules.real
==============================================================================
--- trunk/xen-unstable/debian/rules.real	(original)
+++ trunk/xen-unstable/debian/rules.real	Sat Jun 28 10:41:38 2008
@@ -35,14 +35,14 @@
 $(STAMPS_DIR)/setup-docs: DIR=$(BUILD_DIR)/build-docs
 $(STAMPS_DIR)/setup-docs: $(STAMPS_DIR)/source
 	@rm -rf $(DIR)
-	cp -a $(SOURCE_DIR) $(DIR)
+	cp -al $(SOURCE_DIR) $(DIR)
 	touch $@
 
 $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source
 $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): DIR=$(BUILD_DIR)/build-hypervisor_$(ARCH)_$(FLAVOUR)
 $(STAMPS_DIR)/setup-hypervisor_$(ARCH)_$(FLAVOUR): $(STAMPS_DIR)/source
 	@rm -rf $(DIR)
-	cp -a $(SOURCE_DIR) $(DIR)
+	cp -al $(SOURCE_DIR) $(DIR)
 	echo "XEN_EXTRAVERSION := $(EXTRAVERSION)$(ABINAME)" > $(DIR)/xen/xen-version
 	touch $@
 
@@ -50,7 +50,7 @@
 $(STAMPS_DIR)/setup-utils_$(ARCH): DIR=$(BUILD_DIR)/build-utils_$(ARCH)
 $(STAMPS_DIR)/setup-utils_$(ARCH): $(STAMPS_DIR)/source
 	@rm -rf $(DIR)
-	cp -a $(SOURCE_DIR) $(DIR)
+	cp -al $(SOURCE_DIR) $(DIR)
 	touch $@
 
 $(STAMPS_DIR)/build-docs: DIR=$(BUILD_DIR)/build-docs

Modified: trunk/xen-unstable/debian/templates/control.hypervisor.in
==============================================================================
--- trunk/xen-unstable/debian/templates/control.hypervisor.in	(original)
+++ trunk/xen-unstable/debian/templates/control.hypervisor.in	Sat Jun 28 10:41:38 2008
@@ -1,5 +1,6 @@
 Package: xen-hypervisor- at version@@abiname@@localversion@
-Recommends: xen-utils-unstable at abiname@
+Recommends: xen-utils- at version@@abiname@
+Suggests: xen-docs- at version@
 Description: The Xen Hypervisor on @class@
  The hypervisor is the "core" for XEN itself. It gets booted by the boot loader
  and controls cpu and memory, sharing them between your administrative domain

Modified: trunk/xen-unstable/debian/templates/control.source.in
==============================================================================
--- trunk/xen-unstable/debian/templates/control.source.in	(original)
+++ trunk/xen-unstable/debian/templates/control.source.in	Sat Jun 28 10:41:38 2008
@@ -2,7 +2,18 @@
 Priority: extra
 Maintainer: Debian Xen Team <pkg-xen-devel at lists.alioth.debian.org>
 Uploaders: Julien Danjou <acid at debian.org>, Jeremy T. Bouse <jbouse at debian.org>, Guido Trotter <ultrotter at debian.org>, Bastian Blank <waldi at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3), libsdl1.2-dev, bcc, lsb-release, python-central (>= 0.5), quilt, zlib1g-dev, libjpeg-dev, libncurses5-dev, libssl-dev, libvncserver-dev, gcc-multilib [amd64]
+Build-Depends:
+ debhelper (>= 5.0.37.2), lsb-release, quilt,
+ python-dev (>= 2.3), python-central (>= 0.5),
+ bcc,
+ gcc-multilib [amd64],
+ e2fslibs-dev,
+ libgnutls-dev, pkg-config,
+ libjpeg-dev,
+ libncurses5-dev,
+ libsdl1.2-dev,
+ libvncserver-dev,
+ zlib1g-dev
 Build-Depends-Indep: graphviz, gs-common, texlive-fonts-recommended, texlive-latex-recommended
 Standards-Version: 3.7.2.0
 XS-Python-Version: current

Modified: trunk/xen-unstable/debian/templates/control.utils.in
==============================================================================
--- trunk/xen-unstable/debian/templates/control.utils.in	(original)
+++ trunk/xen-unstable/debian/templates/control.utils.in	Sat Jun 28 10:41:38 2008
@@ -1,5 +1,5 @@
 Package: xen-utils- at version@@abiname@
-Depends: ${shlibs:Depends}, ${python:Depends}, xen-utils-common (>= 3.0+hg11624-2), iproute, udev (>> 0.060)
+Depends: ${shlibs:Depends}, ${python:Depends}, xen-utils-common (>> 3.2.0), iproute, udev (>> 0.060)
 Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor- at version@@abiname@
 XB-Python-Version: ${python:Versions}
 Description: XEN administrative tools

Modified: trunk/xen-unstable/debian/templates/xen-utils.lintian-overrides.in
==============================================================================
--- trunk/xen-unstable/debian/templates/xen-utils.lintian-overrides.in	(original)
+++ trunk/xen-unstable/debian/templates/xen-utils.lintian-overrides.in	Sat Jun 28 10:41:38 2008
@@ -27,7 +27,7 @@
 binary-or-shlib-defines-rpath ./usr/lib/xen- at version@@abiname@/bin/xentrace ${ORIGIN}/../lib
 binary-or-shlib-defines-rpath ./usr/lib/xen- at version@@abiname@/bin/xentrace_setmask ${ORIGIN}/../lib
 binary-or-shlib-defines-rpath ./usr/lib/xen- at version@@abiname@/bin/xentrace_setsize ${ORIGIN}/../lib
-binary-or-shlib-defines-rpath ./usr/lib/xen- at version@@abiname@/lib/fs/ext2fs/fsimage.so ${ORIGIN}/../..
+binary-or-shlib-defines-rpath ./usr/lib/xen- at version@@abiname@/lib/fs/ext2fs-lib/fsimage.so ${ORIGIN}/../..
 binary-or-shlib-defines-rpath ./usr/lib/xen- at version@@abiname@/lib/fs/fat/fsimage.so ${ORIGIN}/../..
 binary-or-shlib-defines-rpath ./usr/lib/xen- at version@@abiname@/lib/fs/iso9660/fsimage.so ${ORIGIN}/../..
 binary-or-shlib-defines-rpath ./usr/lib/xen- at version@@abiname@/lib/fs/reiserfs/fsimage.so ${ORIGIN}/../..

More information about the Pkg-xen-changes mailing list