Received: by mail.netbsd.org (Postfix, from userid 605) id D11FE84DEC; Tue, 13 Mar 2018 15:15:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 38FAF84DE7 for ; Tue, 13 Mar 2018 15:15:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id QRBG6VHFgBhG for ; Tue, 13 Mar 2018 15:15:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6AAAB84D21 for ; Tue, 13 Mar 2018 15:15:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 63614FB40; Tue, 13 Mar 2018 15:15:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1520954101204150" MIME-Version: 1.0 Date: Tue, 13 Mar 2018 15:15:01 +0000 From: "Manuel Bouyer" Subject: CVS commit: pkgsrc/sysutils/xentools48 To: pkgsrc-changes@NetBSD.org Reply-To: bouyer@netbsd.org X-Mailer: log_accum Message-Id: <20180313151501.63614FB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1520954101204150 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bouyer Date: Tue Mar 13 15:15:01 UTC 2018 Modified Files: pkgsrc/sysutils/xentools48: Makefile distinfo Added Files: pkgsrc/sysutils/xentools48/patches: patch-m4_paths.m4 patch-tools_libxl_libxl_dom.c patch-tools_xenstore_xs_lib.c Log Message: Move /var/lib/xenstored to /var/run, so that it is automatically cleared on reboot. From Greg A. Woods in PR pkg/53095 Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/xentools48/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/xentools48/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/xentools48/patches/patch-m4_paths.m4 \ pkgsrc/sysutils/xentools48/patches/patch-tools_libxl_libxl_dom.c \ pkgsrc/sysutils/xentools48/patches/patch-tools_xenstore_xs_lib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1520954101204150 Content-Disposition: inline Content-Length: 5686 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/xentools48/Makefile diff -u pkgsrc/sysutils/xentools48/Makefile:1.17 pkgsrc/sysutils/xentools48/Makefile:1.18 --- pkgsrc/sysutils/xentools48/Makefile:1.17 Sat Jan 27 17:37:51 2018 +++ pkgsrc/sysutils/xentools48/Makefile Tue Mar 13 15:15:01 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2018/01/27 17:37:51 abs Exp $ +# $NetBSD: Makefile,v 1.18 2018/03/13 15:15:01 bouyer Exp $ # VERSION= 4.8.3 VERSION_IPXE= 827dd1bfee67daa683935ce65316f7e0f057fe1c @@ -19,7 +19,7 @@ PKGNAME= xentools48-${VERSION} CATEGORIES= sysutils MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ -PKGREVISION= 1 +PKGREVISION= 2 DISTFILES= ${DISTNAME}.tar.gz @@ -187,7 +187,6 @@ CONF_FILES+= ${EGDIR}/xl.conf ${PKG_SYS CONF_FILES+= ${EGDIR}/oxenstored.conf ${PKG_SYSCONFDIR}/oxenstored.conf OWN_DIRS= ${PKG_SYSCONFDIR}/scripts ${VARBASE}/log/xen -OWN_DIRS+= ${VARBASE}/lib/xen .for s in ${XEND_SCRIPTS} CONF_FILES_PERMS+= ${EGDIR}/scripts/${s} ${PKG_SYSCONFDIR}/scripts/${s} \ Index: pkgsrc/sysutils/xentools48/distinfo diff -u pkgsrc/sysutils/xentools48/distinfo:1.9 pkgsrc/sysutils/xentools48/distinfo:1.10 --- pkgsrc/sysutils/xentools48/distinfo:1.9 Sat Jan 27 17:37:51 2018 +++ pkgsrc/sysutils/xentools48/distinfo Tue Mar 13 15:15:01 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2018/01/27 17:37:51 abs Exp $ +$NetBSD: distinfo,v 1.10 2018/03/13 15:15:01 bouyer Exp $ SHA1 (xen48/gmp-4.3.2.tar.bz2) = c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c RMD160 (xen48/gmp-4.3.2.tar.bz2) = a8f3f41501ece290c348aeb4444bbea40bc53e71 @@ -61,6 +61,7 @@ SHA1 (patch-extras_mini-os_include_fcntl SHA1 (patch-extras_mini-os_include_time.h) = ab3b0794bf892ce6a036aa889c6852d65b508596 SHA1 (patch-extras_mini-os_lib_sys.c) = 9dd4bcab9deed5132d0fe88a0fe0d33b3fc7d09c SHA1 (patch-extras_mini-os_lock.c) = e28753793dee483c1ffad8ea8ed2706353046b50 +SHA1 (patch-m4_paths.m4) = 19250964fd808cad30a2aca3de011650a2788251 SHA1 (patch-stubdom_Makefile) = 6c52ae9af4003fdc199980b6725265fde5a06545 SHA1 (patch-stubdom_newlib.patch) = e937cd046db217e45b1de76bd0950f514666bc12 SHA1 (patch-stubdom_vtpmmgr_marshal.h) = 63bb39894e3c6b81b699966ddfa19cb779e916fc @@ -90,6 +91,7 @@ SHA1 (patch-tools_libs_foreignmemory_net SHA1 (patch-tools_libs_foreignmemory_private.h) = ed97af7fef60ba8752625b19f4e7027a5bc7ac54 SHA1 (patch-tools_libxl_Makefile) = 6ae383af726e2525c74f5d58b1a8893e55694217 SHA1 (patch-tools_libxl_libxl__create.c) = 8d4984705fff4a3907cc2a436115c400ef732141 +SHA1 (patch-tools_libxl_libxl_dom.c) = 0c4a96523d13de65aaa71ef705c3579ee8d641f3 SHA1 (patch-tools_libxl_libxl_event.c) = 8147122d03102eccc45c48a7d6ca1aa5d6286040 SHA1 (patch-tools_libxl_libxl_internal.h) = 613edc0fa055b23f5dc2a2448456d3d6005337fe SHA1 (patch-tools_libxl_libxl_uuid.c) = 1eb8c027dbeb7e67df7475ee6e4d87220140c65b @@ -120,4 +122,5 @@ SHA1 (patch-tools_qemu-xen_qemu-doc.texi SHA1 (patch-tools_qemu-xen_xen-hvm.c) = 8faeba31a6f6452d50437a4564b32eb0f8965333 SHA1 (patch-tools_xenpaging_xenpaging.c) = 0a154b97f1f452a5f80f7c9a835a1f216f12f7e1 SHA1 (patch-tools_xenstore_xc.c) = cf49b65cba064667e13bb041d1f0099c76ab6a40 +SHA1 (patch-tools_xenstore_xs_lib.c) = e3a8f6e3b149c3ab0f4ec8dcfa455983f94e6c16 SHA1 (patch-tools_xentrace_xentrace.c) = f964c7555f454358a39f28a2e75db8ee100a4243 Added files: Index: pkgsrc/sysutils/xentools48/patches/patch-m4_paths.m4 diff -u /dev/null pkgsrc/sysutils/xentools48/patches/patch-m4_paths.m4:1.1 --- /dev/null Tue Mar 13 15:15:01 2018 +++ pkgsrc/sysutils/xentools48/patches/patch-m4_paths.m4 Tue Mar 13 15:15:01 2018 @@ -0,0 +1,16 @@ +$NetBSD: patch-m4_paths.m4,v 1.1 2018/03/13 15:15:01 bouyer Exp $ + +--- m4/paths.m4.orig ++++ m4/paths.m4 +@@ -135,8 +135,9 @@ XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts + AC_SUBST(XEN_SCRIPT_DIR) + + case "$host_os" in +-*freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +-*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;; ++*freebsd*) XEN_LOCK_DIR=$rundir_path ;; ++*netbsd*) XEN_LOCK_DIR=$rundir_path ;; ++*openbsd*) XEN_LOCK_DIR=$rundir_path ;; + *) XEN_LOCK_DIR=$localstatedir/lock ;; + esac + AC_SUBST(XEN_LOCK_DIR) Index: pkgsrc/sysutils/xentools48/patches/patch-tools_libxl_libxl_dom.c diff -u /dev/null pkgsrc/sysutils/xentools48/patches/patch-tools_libxl_libxl_dom.c:1.1 --- /dev/null Tue Mar 13 15:15:01 2018 +++ pkgsrc/sysutils/xentools48/patches/patch-tools_libxl_libxl_dom.c Tue Mar 13 15:15:01 2018 @@ -0,0 +1,13 @@ +$NetBSD: patch-tools_libxl_libxl_dom.c,v 1.1 2018/03/13 15:15:01 bouyer Exp $ + +--- tools/libxl/libxl_dom.c.orig ++++ tools/libxl/libxl_dom.c +@@ -1361,7 +1361,7 @@ const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, + goto out; + } + uuid_string = GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(info.uuid)); +- path = GCSPRINTF(XEN_LIB_DIR "/userdata-%s.%u.%s.%s", ++ path = GCSPRINTF(XEN_RUN_DIR "/userdata-%s.%u.%s.%s", + wh, domid, uuid_string, userdata_userid); + + out: Index: pkgsrc/sysutils/xentools48/patches/patch-tools_xenstore_xs_lib.c diff -u /dev/null pkgsrc/sysutils/xentools48/patches/patch-tools_xenstore_xs_lib.c:1.1 --- /dev/null Tue Mar 13 15:15:01 2018 +++ pkgsrc/sysutils/xentools48/patches/patch-tools_xenstore_xs_lib.c Tue Mar 13 15:15:01 2018 @@ -0,0 +1,13 @@ +$NetBSD: patch-tools_xenstore_xs_lib.c,v 1.1 2018/03/13 15:15:01 bouyer Exp $ + +--- tools/xenstore/xs_lib.c.orig ++++ tools/xenstore/xs_lib.c +@@ -52,7 +52,7 @@ static const char *xs_daemon_path(void) + const char *xs_daemon_tdb(void) + { + static char buf[PATH_MAX]; +- snprintf(buf, sizeof(buf), "%s/tdb", xs_daemon_rootdir()); ++ snprintf(buf, sizeof(buf), "%s/tdb", xs_daemon_rundir()); + return buf; + } + --_----------=_1520954101204150--