From nobody Sun Feb 12 19:11:01 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PFHBG1DZSz3qbNm; Sun, 12 Feb 2023 19:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PFHBG0nyfz3tcs; Sun, 12 Feb 2023 19:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676229062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9QDNuJUlaQYi4M/8XA8RUIzXsFLeUl5i8FScKrg3BQ=; b=rLYicrYPwUH1yGH/PuuiYCAlSsyNI3EA30EXprUg4TjLQRHfepcOTaLzfy9Gl8J6iPBBub amh0/PgvXohYyaTypi2Ji1thouj0w2nEIsiUZShhdhtCpQfprI0o3zfyAqv8TZx2/mmQjd U/T11OGIQWYFTv2Cj8BKgqxs0G64FcRpUtSln+k/MuJMivKyAGSLmipLjDpR2+av8OrL4B gPlX3p85j51/J/J/m3y9lEKTEUcxf+FHiWn/PDHMyvBWbQDci2YrttZmBHTomHC8INb+OU BiJ4tlu0Wwjn8I3+UMEyZWNSRMQMz1FxtS5vEKn/VTNhwHsAZI0irrn6px/GGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676229062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9QDNuJUlaQYi4M/8XA8RUIzXsFLeUl5i8FScKrg3BQ=; b=l6lo/swwBMgj7MtfjRFgues5IX7O7LG5JX9so7C7yyUscrNQS9dbK4kNSWtWsg7IOiJaiB BeJGAb15QzEzNUeu/yBy8wuSBUJ3Arcf/3MczRBR8wlyGFBE86sD+NkseLTu+kTqjpDNqR /b/RYO2/I+7egl+qou1FzikBfUPM//9B0yT0sIdvRQZwAllMo5c3oLTLdPfhu5UFDBzntc 4vcyTG2mz0szGeVNMN0aY9wqjwFAUjIcUT8w8OtoNwJzk9CubB2/Gunvjotf9GHC3AvhZa wp6PiM0E6IBPAEBlPCwz5q/IOPt8saVCtZk02iTilndGnnhacW3fNhJBBjY65g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676229062; a=rsa-sha256; cv=none; b=kBsGaiMhRQCN3E6XsB9qLDSyOBPcVEOWL3bfOftVKf9xKrbk9hlh+9ZCaj/AObvrkEDyXy m1HvpnZwQIjB0HSUGJPFmJNQGmPbfTiOPA+9PxL8WkyDsSyUdTuDr/5bqgglWsiY5ZykB4 JTPs3VEVIUGFJXwWZPcaQFfv2a1X++yN8zi8uY90DCFJUAh5cEYAN1/nmIXSrOn3ZA6RFn JT3CzodXcS380Nq9Nskv2vZz/Dpdzyph9VenFWCI15Y1R5l3fVKzyah9FptrMsQh37JwQi Z430A4n4aKV6+SZiyHnXuFxySbVltwhAKaM4MKDrqZ5mcxgGNQTU32urt0IhWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PFHBF6zLVzqMR; Sun, 12 Feb 2023 19:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31CJB1b2036344; Sun, 12 Feb 2023 19:11:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31CJB1Dw036343; Sun, 12 Feb 2023 19:11:01 GMT (envelope-from git) Date: Sun, 12 Feb 2023 19:11:01 GMT Message-Id: <202302121911.31CJB1Dw036343@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: a86dcedb5670 - main - sysutils/xen-guest-tools: update to 4.16.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a86dcedb567066afe92bc223cf3a8794e5bcdcee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=a86dcedb567066afe92bc223cf3a8794e5bcdcee commit a86dcedb567066afe92bc223cf3a8794e5bcdcee Author: Dirk Meyer AuthorDate: 2023-02-12 19:10:42 +0000 Commit: Dirk Meyer CommitDate: 2023-02-12 19:10:42 +0000 sysutils/xen-guest-tools: update to 4.16.1 --- sysutils/xen-guest-tools/Makefile | 11 ++++--- sysutils/xen-guest-tools/distinfo | 6 ++-- .../xen-guest-tools/files/patch-libxl_create.c | 38 ---------------------- .../xen-guest-tools/files/patch-tools-Makefile | 14 ++++---- 4 files changed, 16 insertions(+), 53 deletions(-) diff --git a/sysutils/xen-guest-tools/Makefile b/sysutils/xen-guest-tools/Makefile index df649668fdb3..f396858c417c 100644 --- a/sysutils/xen-guest-tools/Makefile +++ b/sysutils/xen-guest-tools/Makefile @@ -1,5 +1,6 @@ PORTNAME= xen-guest-tools -PORTVERSION= 4.14.0 +#PORTVERSION= 4.14.0 +PORTVERSION= 4.16.1 PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= https://downloads.xenproject.org/release/xen/${PORTVERSION}/ @@ -52,8 +53,8 @@ PLIST_FILES= bin/xen-detect \ bin/xenstore-rm \ bin/xenstore-watch \ bin/xenstore-write \ - lib/libxenstore.so.3.0 \ - lib/libxentoolcore.so.1 + lib/libxenstore.so.4.0 \ + lib/libxentoolcore.so.1.0 post-patch: ${REINPLACE_CMD} -e 's;=xen tools stubdom docs;=tools;' \ @@ -66,8 +67,8 @@ do-install: ${WRKSRC}/tools/xenstore/xenstore \ ${WRKSRC}/tools/xenstore/xenstore-control \ ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_LIB} ${WRKSRC}/tools/xenstore/libxenstore.so.3.0 \ - ${WRKSRC}/tools/libs/toolcore/libxentoolcore.so.1 \ + ${INSTALL_LIB} ${WRKSRC}/tools/libs/store/libxenstore.so.4.0 \ + ${WRKSRC}/tools/libs/toolcore/libxentoolcore.so.1.0 \ ${STAGEDIR}${PREFIX}/lib/ cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-chmod cd ${STAGEDIR}${PREFIX}/bin/ && ${LN} -f xenstore xenstore-control diff --git a/sysutils/xen-guest-tools/distinfo b/sysutils/xen-guest-tools/distinfo index f050fb2e58fd..2b8d6e09b994 100644 --- a/sysutils/xen-guest-tools/distinfo +++ b/sysutils/xen-guest-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1595603681 -SHA256 (xen-4.14.0.tar.gz) = 06839f68ea7620669dbe8b67861213223cc2a7d02ced61b56e5249c50e87f035 -SIZE (xen-4.14.0.tar.gz) = 39950576 +TIMESTAMP = 1655136459 +SHA256 (xen-4.16.1.tar.gz) = cb9fc345f9b1cd724cbb6b7724674db70175183cb9015ec991843f0375e7428a +SIZE (xen-4.16.1.tar.gz) = 44964667 diff --git a/sysutils/xen-guest-tools/files/patch-libxl_create.c b/sysutils/xen-guest-tools/files/patch-libxl_create.c deleted file mode 100644 index 40bdecc19574..000000000000 --- a/sysutils/xen-guest-tools/files/patch-libxl_create.c +++ /dev/null @@ -1,38 +0,0 @@ ---- tools/libxl/libxl_create.c.orig 2019-12-17 14:23:09 UTC -+++ tools/libxl/libxl_create.c -@@ -459,7 +459,7 @@ int libxl__domain_build(libxl__gc *gc, - vments[2] = "image/ostype"; - vments[3] = "hvm"; - vments[4] = "start_time"; -- vments[5] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[5] = GCSPRINTF("%lu.%02d", (unsigned long)start_time.tv_sec,(int)start_time.tv_usec/10000); - - localents = libxl__calloc(gc, 13, sizeof(char *)); - i = 0; -@@ -498,7 +498,7 @@ int libxl__domain_build(libxl__gc *gc, - vments[i++] = "image/kernel"; - vments[i++] = (char *) state->pv_kernel.path; - vments[i++] = "start_time"; -- vments[i++] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[i++] = GCSPRINTF("%lu.%02d", (unsigned long)start_time.tv_sec,(int)start_time.tv_usec/10000); - if (state->pv_ramdisk.path) { - vments[i++] = "image/ramdisk"; - vments[i++] = (char *) state->pv_ramdisk.path; -@@ -1342,7 +1342,7 @@ static void domcreate_stream_done(libxl__egc *egc, - vments[2] = "image/ostype"; - vments[3] = "hvm"; - vments[4] = "start_time"; -- vments[5] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[5] = GCSPRINTF("%lu.%02d", (unsigned long)start_time.tv_sec,(int)start_time.tv_usec/10000); - break; - case LIBXL_DOMAIN_TYPE_PV: - vments = libxl__calloc(gc, 11, sizeof(char *)); -@@ -1352,7 +1352,7 @@ static void domcreate_stream_done(libxl__egc *egc, - vments[i++] = "image/kernel"; - vments[i++] = (char *) state->pv_kernel.path; - vments[i++] = "start_time"; -- vments[i++] = GCSPRINTF("%lu.%02d", start_time.tv_sec,(int)start_time.tv_usec/10000); -+ vments[i++] = GCSPRINTF("%lu.%02d", (unsigned long)start_time.tv_sec,(int)start_time.tv_usec/10000); - if (state->pv_ramdisk.path) { - vments[i++] = "image/ramdisk"; - vments[i++] = (char *) state->pv_ramdisk.path; diff --git a/sysutils/xen-guest-tools/files/patch-tools-Makefile b/sysutils/xen-guest-tools/files/patch-tools-Makefile index 65025e9c1b8a..d397204e9992 100644 --- a/sysutils/xen-guest-tools/files/patch-tools-Makefile +++ b/sysutils/xen-guest-tools/files/patch-tools-Makefile @@ -1,12 +1,12 @@ ---- tools/Makefile.orig 2019-12-17 14:23:09 UTC +--- tools/Makefile.orig 2022-04-12 12:21:23 UTC +++ tools/Makefile -@@ -50,6 +50,9 @@ endif - ifeq ($(CONFIG_RUMP),y) - SUBDIRS-y := libs libxc xenstore +@@ -51,6 +51,9 @@ CROSS_SYS_ROOT ?= /usr/$(CROSS_COMPILE:-=)/sys-root + export CROSS_SYS_ROOT # exported for check/funcs.sh + export CROSS_BIN_PATH # exported for cross-install.sh endif +ifeq ($(FREEBSD_PORT),y) -+SUBDIRS-y := libs libxc xenstore misc ++SUBDIRS-y := libs xenstore misc +endif - # For the sake of linking, set the sys-root - ifneq ($(CROSS_COMPILE),) + .PHONY: build all + build all: subdirs-all