diff options
-rw-r--r-- | sysutils/xentools3/Makefile | 3 | ||||
-rw-r--r-- | sysutils/xentools3/distinfo | 6 | ||||
-rw-r--r-- | sysutils/xentools3/patches/patch-ac | 4 | ||||
-rw-r--r-- | sysutils/xentools3/patches/patch-ad | 22 |
4 files changed, 17 insertions, 18 deletions
diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile index fd500410668..cd828cdd2d9 100644 --- a/sysutils/xentools3/Makefile +++ b/sysutils/xentools3/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.15 2008/08/30 16:05:30 bouyer Exp $ +# $NetBSD: Makefile,v 1.16 2008/09/16 19:39:06 bouyer Exp $ # VERSION= 3.1.4 DISTNAME= xen-${VERSION} PKGNAME= xentools3-${VERSION} +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ EXTRACT_SUFX= .tar.gz diff --git a/sysutils/xentools3/distinfo b/sysutils/xentools3/distinfo index e671fd3a1ff..e0a98e73a8c 100644 --- a/sysutils/xentools3/distinfo +++ b/sysutils/xentools3/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.10 2008/08/07 16:00:14 joerg Exp $ +$NetBSD: distinfo,v 1.11 2008/09/16 19:39:06 bouyer Exp $ SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859 Size (xen-3.1.4.tar.gz) = 6894493 bytes SHA1 (patch-aa) = dca8b8de73b9bdbb17f8245224575eb881cdf00d SHA1 (patch-ab) = dcafc8b6c4cd1e4dfc6f4ec806fd8076b3104b86 -SHA1 (patch-ac) = 4eb0f474d4e3a685788c1ce92c0b407dc3d7a855 -SHA1 (patch-ad) = ec36d712925ddf06aac7d6393ad818a51c4363f3 +SHA1 (patch-ac) = d6d895e0361194cd84da13c42e17e17efecae7dd +SHA1 (patch-ad) = 1d43550d5475538563129489e05b349337e77981 SHA1 (patch-al) = 87f2af4784a8c2266d40788fd572e282f100c7b0 SHA1 (patch-as) = 040208cc9bf1d7fecc120b5b140b8bc72f2f84cf SHA1 (patch-au) = b2357fdaff2895a5e4da4371d72ccc3041c78a83 diff --git a/sysutils/xentools3/patches/patch-ac b/sysutils/xentools3/patches/patch-ac index 8b595c5756d..68ce3f2f4bf 100644 --- a/sysutils/xentools3/patches/patch-ac +++ b/sysutils/xentools3/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $ +$NetBSD: patch-ac,v 1.2 2008/09/16 19:39:06 bouyer Exp $ --- libxc/xc_domain_save.c.orig 2007-05-27 13:35:43.000000000 +0200 +++ libxc/xc_domain_save.c 2007-05-27 13:35:53.000000000 +0200 @@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $ if ( (m2p = mmap(NULL, m2p_size, prot, - MAP_SHARED, xc_handle, 0)) == MAP_FAILED ) -+ MAP_ANON | MAP_SHARED, xc_handle, 0)) == MAP_FAILED ) ++ MAP_ANON | MAP_SHARED, -1, 0)) == MAP_FAILED ) { ERROR("failed to mmap m2p"); return NULL; diff --git a/sysutils/xentools3/patches/patch-ad b/sysutils/xentools3/patches/patch-ad index 194b691f765..c1744df4bb3 100644 --- a/sysutils/xentools3/patches/patch-ad +++ b/sysutils/xentools3/patches/patch-ad @@ -1,7 +1,5 @@ -$NetBSD: patch-ad,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $ - ---- libxc/xc_private.c.orig 2007-05-18 16:45:21.000000000 +0200 -+++ libxc/xc_private.c 2007-05-27 13:43:06.000000000 +0200 +--- libxc/xc_private.c.orig 2008-04-25 15:03:12.000000000 +0200 ++++ libxc/xc_private.c 2008-09-14 23:37:40.000000000 +0200 @@ -10,7 +10,12 @@ #include <stdarg.h> #include <pthread.h> @@ -78,7 +76,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $ } void xc_set_error(int code, const char *fmt, ...) -@@ -84,23 +119,29 @@ +@@ -84,13 +119,19 @@ errno = saved_errno; @@ -93,14 +91,14 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $ int lock_pages(void *addr, size_t len) { int e = 0; -+ void *laddr = (void *)((u_long)addr & ~0xfffUL); -+ size_t llen = (len + 0xfffUL) & ~0xfffUL; ++ size_t offset = (u_long)addr & 0xfffUL; ++ addr -= offset; ++ len += offset; ++ len = (len + 0xfffUL) & ~0xfffUL; /* round up */ #ifndef __sun__ -- e = mlock(addr, len); -+ e = mlock(laddr, llen); + e = mlock(addr, len); #endif - return (e); - } +@@ -99,8 +140,10 @@ void unlock_pages(void *addr, size_t len) { @@ -112,7 +110,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $ #endif } -@@ -466,20 +507,43 @@ +@@ -466,20 +509,43 @@ return new_mfn; } |