diff options
| -rw-r--r-- | sysutils/xentools20/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/xentools20/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/xentools20/files/xend.sh | 8 | ||||
| -rw-r--r-- | sysutils/xentools20/patches/patch-af | 9 | ||||
| -rw-r--r-- | sysutils/xentools20/patches/patch-as | 22 |
5 files changed, 37 insertions, 14 deletions
diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile index 5766eb131ca..08fee641b26 100644 --- a/sysutils/xentools20/Makefile +++ b/sysutils/xentools20/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4.2.1 2005/03/28 05:55:03 snj Exp $ +# $NetBSD: Makefile,v 1.4.2.2 2005/05/31 11:13:04 salo Exp $ # DISTNAME= xen-2.0.3-src PKGNAME= xentools20-2.0.3 -PKGREVISION= 3 +PKGREVISION= 5 CATEGORIES= sysutils MASTER_SITES= http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/ EXTRACT_SUFX= .tgz @@ -13,7 +13,7 @@ MAINTAINER= bouyer@NetBSD.org HOMEPAGE= http://www.netbsd.org/Ports/xen/ COMMENT= Userland Tools for Xen -DEPENDS+= ${PYPKGPREFIX}-twisted*:../../net/py-twisted +DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted USE_PKGINSTALL= yes @@ -51,6 +51,7 @@ SUBST_SED.paths= -e "s|/usr/sbin|${PREFIX}/sbin|g" SUBST_MESSAGE.paths= "Fixing hardcoded paths." RCD_SCRIPTS= xend +FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN} pre-build: ${MKDIR} ${WRKSRC}/libxc/xen/NetBSD diff --git a/sysutils/xentools20/distinfo b/sysutils/xentools20/distinfo index 1cae3386a36..00f7fc4cc44 100644 --- a/sysutils/xentools20/distinfo +++ b/sysutils/xentools20/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/03/10 19:43:25 bouyer Exp $ +$NetBSD: distinfo,v 1.3.2.1 2005/05/31 11:13:04 salo Exp $ SHA1 (xen-2.0.3-src.tgz) = eb71d43abd014c87062f5b93932947b71e32be54 RMD160 (xen-2.0.3-src.tgz) = 13cd844dbdeccbb9a97ee0d49f5b187a5f2590e7 @@ -8,7 +8,7 @@ SHA1 (patch-ab) = 876bcc0723ff7e12e096ca1bff749f8a2ff23b16 SHA1 (patch-ac) = a07e37a56a6d0cb8cd51b24e82a48a7bef91d233 SHA1 (patch-ad) = cab8686b928aaf33e0a4c4ffec4190aa48955398 SHA1 (patch-ae) = b5a6521b14dd24cb52713bd83ec91422ef63161e -SHA1 (patch-af) = 127963c910391a1d36af85c5ac2ecc6f8a5daaf5 +SHA1 (patch-af) = 5467e64fbd49d6ca35718d42864ed7b44fe76df3 SHA1 (patch-ag) = 06d0c5a5dc85bdf0245f4ee00ba49fc98f9ee39e SHA1 (patch-ah) = 5be50f707fa8ba2a7ace2a7828522bb1d97d214b SHA1 (patch-ai) = 2cee0445d036f5618b7dac256a1a4ce5b32356d7 @@ -21,3 +21,4 @@ SHA1 (patch-ao) = 2f3fb89cf3209e19d3f5e2e13017981f7c98b8b3 SHA1 (patch-ap) = da9d70ec8c61e8524b0b268113d178ec1d0d176c SHA1 (patch-aq) = 96ac4caaa268069ee02962a917f85753515747be SHA1 (patch-ar) = 4f4b47a47698720042fe8c30a7ac74304295740d +SHA1 (patch-as) = 333da168af43dae9a4e8695409cbd006e7fcf097 diff --git a/sysutils/xentools20/files/xend.sh b/sysutils/xentools20/files/xend.sh index 86ddc462b2d..418ae4f3264 100644 --- a/sysutils/xentools20/files/xend.sh +++ b/sysutils/xentools20/files/xend.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: xend.sh,v 1.1 2005/03/17 23:53:56 bouyer Exp $ +# $NetBSD: xend.sh,v 1.1.2.1 2005/05/31 11:13:04 salo Exp $ # # PROVIDE: xend # REQUIRE: disks network @@ -13,10 +13,8 @@ fi name="xend" rcvar=$name command="@PREFIX@/sbin/xend" -ctl_command="@PREFIX@/sbin/xend" -start_cmd="echo starting ${command} && ${command} start" -stop_cmd="echo stopping ${command} && ${command} stop" -restart_cmd="echo restarting ${command} && ${command} restart" +command_interpreter="@RCD_INTERPRETER@" +start_cmd="echo starting ${name}. && ${command} start" load_rc_config $name run_rc_command "$1" diff --git a/sysutils/xentools20/patches/patch-af b/sysutils/xentools20/patches/patch-af index 0cf8b8a2a9b..cb8c0edb278 100644 --- a/sysutils/xentools20/patches/patch-af +++ b/sysutils/xentools20/patches/patch-af @@ -1,12 +1,13 @@ -$NetBSD: patch-af,v 1.1.1.1 2005/03/07 15:59:08 bouyer Exp $ +$NetBSD: patch-af,v 1.1.1.1.2.1 2005/05/31 11:13:04 salo Exp $ ---- xfrd/select.c.orig 2005-01-22 01:28:18.000000000 +0100 -+++ xfrd/select.c 2005-01-22 01:29:02.000000000 +0100 -@@ -1,6 +1,7 @@ +--- xfrd/select.c.orig 2005-01-12 13:22:21.000000000 +0100 ++++ xfrd/select.c 2005-05-23 20:01:54.000000000 +0200 +@@ -1,6 +1,8 @@ #include <stdlib.h> #include <errno.h> #include <unistd.h> +#include <string.h> ++#include <sys/select.h> #include "select.h" diff --git a/sysutils/xentools20/patches/patch-as b/sysutils/xentools20/patches/patch-as new file mode 100644 index 00000000000..893a2704142 --- /dev/null +++ b/sysutils/xentools20/patches/patch-as @@ -0,0 +1,22 @@ +$NetBSD: patch-as,v 1.1.2.2 2005/05/31 11:13:04 salo Exp $ + +--- libxc/xc_private.c.orig 2005-01-12 13:22:19.000000000 +0100 ++++ libxc/xc_private.c 2005-05-23 23:37:15.000000000 +0200 +@@ -11,7 +11,7 @@ + { + privcmd_mmapbatch_t ioctlx; + void *addr; +- addr = mmap(NULL, num*PAGE_SIZE, prot, MAP_SHARED, xc_handle, 0); ++ addr = mmap(NULL, num*PAGE_SIZE, prot, MAP_ANON | MAP_SHARED, -1, 0); + if ( addr != NULL ) + { + ioctlx.num=num; +@@ -38,7 +38,7 @@ + privcmd_mmap_t ioctlx; + privcmd_mmap_entry_t entry; + void *addr; +- addr = mmap(NULL, size, prot, MAP_SHARED, xc_handle, 0); ++ addr = mmap(NULL, size, prot, MAP_ANON | MAP_SHARED, -1, 0); + if ( addr != NULL ) + { + ioctlx.num=1; |