[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/files/

[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/files/

[Yixun Lan]

commit:     fd188189e73a495848c35d885dfb24ba6587ec94
Author:     Tomas Mozes <tmozes <AT> sygic <DOT> com>
AuthorDate: Mon Oct 16 12:33:13 2017 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 07:24:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd188189

app-emulation/xen-tools: fix bashism

Closes: https://github.com/gentoo/gentoo/pull/5962
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-emulation/xen-tools/files/xenstored.initd-r1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/xen-tools/files/xenstored.initd-r1 b/app-emulation/xen-tools/files/xenstored.initd-r1
index 262535d6809..88d3ad7ba89 100644
--- a/app-emulation/xen-tools/files/xenstored.initd-r1
+++ b/app-emulation/xen-tools/files/xenstored.initd-r1
@@ -24,7 +24,7 @@ start() {
 		$XENSTORED_OPTS
 	until xenstore-exists / || $((15 < ++i))
 	do
-		echo -n .
+		printf "."
 		sleep 1
 	done
 	einfo "Setting domain0 name record"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/files/

[Yixun Lan]

commit:     57e910ccaa98ba21cfc65419508e3695828f5b28
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 13:38:22 2017 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 13:42:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e910cc

app-emulation/xen-tools: version bump, fix OVMF err

Fix OVMF build fail with gcc-7.2

Gentoo-Bug: 640162
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-emulation/xen-tools/files/xencommons.initd    | 2 +-
 app-emulation/xen-tools/files/xenconsoled.initd   | 2 +-
 app-emulation/xen-tools/files/xendomains.initd-r2 | 2 +-
 app-emulation/xen-tools/files/xenqemudev.initd    | 2 +-
 app-emulation/xen-tools/files/xenstored.initd     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-emulation/xen-tools/files/xencommons.initd b/app-emulation/xen-tools/files/xencommons.initd
index d1fbb181c3a..a7c1efed9ab 100644
--- a/app-emulation/xen-tools/files/xencommons.initd
+++ b/app-emulation/xen-tools/files/xencommons.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {

diff --git a/app-emulation/xen-tools/files/xenconsoled.initd b/app-emulation/xen-tools/files/xenconsoled.initd
index d31737af7fc..094871cd047 100644
--- a/app-emulation/xen-tools/files/xenconsoled.initd
+++ b/app-emulation/xen-tools/files/xenconsoled.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {

diff --git a/app-emulation/xen-tools/files/xendomains.initd-r2 b/app-emulation/xen-tools/files/xendomains.initd-r2
index c1a70815c26..0926498ceac 100644
--- a/app-emulation/xen-tools/files/xendomains.initd-r2
+++ b/app-emulation/xen-tools/files/xendomains.initd-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="status"

diff --git a/app-emulation/xen-tools/files/xenqemudev.initd b/app-emulation/xen-tools/files/xenqemudev.initd
index 90da3ac6865..9dcbb3f2244 100644
--- a/app-emulation/xen-tools/files/xenqemudev.initd
+++ b/app-emulation/xen-tools/files/xenqemudev.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {

diff --git a/app-emulation/xen-tools/files/xenstored.initd b/app-emulation/xen-tools/files/xenstored.initd
index d92616b5cb9..1b7eec92658 100644
--- a/app-emulation/xen-tools/files/xenstored.initd
+++ b/app-emulation/xen-tools/files/xenstored.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {

[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/files/

[Thomas Deutschmann]

commit:     197560bea9c1229339a3bf7feaa682031df7bead
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Mar 14 06:04:52 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 22:49:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197560be

app-emulation/xen-tools: drop unused patches definition

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11361
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-emulation/xen-tools/files/gentoo-patches.conf | 79 -----------------------
 1 file changed, 79 deletions(-)

diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index a099e2134f4..234abc9b2ad 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -1,76 +1,17 @@
-# Drop .config, fixes to gcc-4.6
-_gx001=" xen-4-fix_dotconfig-gcc.patch"
-_gx020=" xen-4.3-fix_dotconfig-gcc.patch"
-
-# Fix texi2html build error with new texi2html, qemu.doc.html
-_gx002=" xen-tools-4-docfix.patch"
-_gx003=" xen-tools-4-qemu-xen-doc.patch"
-
-_gx004=" xen-tools-4.2-pod-utf8-chars.patch"
-_gx005=" xen-tools-4.2-pod-docs.patch"
-_gx006=" xen-tools-4.2-pod-xl.patch"
-
-# Fix network broadcast on bridged networks
-_gx007=" xen-tools-3.4.0-network-bridge-broadcast.patch"
-
 # Bug 496708
-_gx008=" xen-tools-4-unbundle-ipxe.patch"
 _gx045=" xen-tools-4.10.1-unbundle-ipxe.patch"
-#use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
-
-# Fix bridge by idella4, bug #362575
-_gx009=" xen-tools-4.1.1-bridge.patch"
-
-# Conditional patch, fix in ebuild
-# Don't build ipxe with pie on hardened, Bug #360805
-#if gcc-specs-pie; then
-#	epatch "${FILESDIR}"/ipxe-nopie.patch
-#fi
-
-# Prevent double stripping of files at install
-_gx010=" xen-4.2.0-nostrip.patch"
-_gx024+=" xen-4.4-nostrip.patch"
-
-# fix jobserver in Makefile
-_gx011=" xen-4.2.0-jserver.patch"
-_gx021=" xen-4.3-jserver.patch"
-
-# add missing header, Bug #467200
-_gx012=" xen-4-ulong.patch"
-_gx013=" xen-tools-4.2-xen_disk_leak.patch"
-
-# Set dom0-min-mem to kb; Bug #472982
-_gx014=" xen-4.2-configsxp.patch"
-
-# Bug 463840
-_gx015=" xen-tools-4.2.2-install.patch"
-_gx016=" xen-tools-4.2.2-rt-link.patch"
 
 # Bug 379537
 _gx017=" fix-gold-ld.patch"
 
-# Bug 510976
-_gx018=" xen-tools-4.2.4-udev-rules.patch"
-
-# bundled seabios
-_gx019=" xen-tools-4-anti-seabios-download.patch"
-_gx032=" xen-tools-4.5-anti-seabios-download.patch"
-
 # Bug 477676
-_gx022=" xen-tools-4.3-ar-cc.patch"
 _gx038=" xen-tools-4.8-ar-cc.patch"
 
 # Prevent file collision with qemu package Bug 478064
-_gx023=" qemu-bridge.patch"
-_gx025=" xen-4.4-qemu-bridge.patch"
-_gx031=" xen-4.5-qemu-bridge.patch"
-_gx039=" xen-4.8-qemu-bridge.patch"
 _gx043=" xen-4.10-qemu-bridge.patch"
 _gx051=" xen-4.12-qemu-bridge.patch"
 #mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
 
-_gx026=" xen-tools-4.4-api-fix.patch"
-
 # Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302
 _gx027=" xen-tools-4-qemu-fix-po-collision.patch"
 
@@ -80,33 +21,13 @@ _gx028=" xen-tools-4.4.1-tinfo.patch"
 # Don't download ovmf, use pre-released
 _gx029=" xen-tools-4-anti-ovmf-download.patch"
 
-# fix build err while using gcc-4.5.x, c99
-_gx033=" xen-tools-4.4.2-gcc99.patch"
-_gx034=" xen-tools-4.5.0-gcc99.patch"
-
-_gx035=" xen-tools-4.2-pod-docs-r1.patch"
-# disable stackcheck for hardened system, bug 569810
-_gx036=" xen-tools-4.6-no-stackcheck.patch"
-
 # increase stack to fix xenqemu err
 # https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg03961.html
 _gx037=" xen-tools-4.6-increase-stack-size.patch"
 
-
-#Fix issues with zero-length records in migration v2"
-#https://xenbits.xen.org/gitweb/?p=people/andrewcoop/xen.git;a=shortlog;h=refs/heads/tools-fix-zero-length-records
-_gx040=" 0001-docs-Clarify-the-expected-behaviour-of-zero-length-r.patch
-	0003-tools-libxc-Avoid-generating-inappropriate-zero-leng.patch
-	0004-tools-python-Adjust-migration-v2-library-to-warn-abo.patch"
-
-_gx041=" 0002-tools-libxc-Tolerate-zero-length-records-in-migratio.patch"
-
 #Fix missing makedev(), major(), minor()
 _gx042=" xen-tools-4.8.2-makedev.patch"
 
-# Fix building with glibc 2.27, bug #648182
-_gx044=" xen-tools-4.9-glibc-memfd.patch"
-
 # Disable failing shim
 _gx046=" xen-tools-4.10.1-shim.patch"
 _gx050=" xen-tools-4.12.0-shim.patch"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/files/

[Yixun Lan]

commit:     ed41053f52d70d87b08ddf0caecbe51f3a786c12
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Mon May 25 16:13:26 2020 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue May 26 00:45:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed41053f

app-emulation/xen-tools: fix patchset mapping

Closes: https://github.com/gentoo/gentoo/pull/15963
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 app-emulation/xen-tools/files/gentoo-patches.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 6ecfcb2a4bc..a5dea9bc4b4 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -71,7 +71,7 @@ ${_gx060}
 "
 
 # xen-tools-4.13.1 patches set
-_gpv_xen_tools_4130_0="
+_gpv_xen_tools_4131_0="
 ${_gx038}
 ${_gx027}
 ${_gx028} ${_gx029}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/files/

[Joonas Niilola]

commit:     563224174f24ba54ab6a0d822aef42ff37b05471
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Wed Sep 22 06:46:35 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 07:21:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56322417

app-emulation/xen-tools: fix building with gcc-11

The patch is not needed any more. Tested with gcc-10 and gcc-11.

Closes: https://bugs.gentoo.org/814173
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22363
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/xen-tools/files/gentoo-patches.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 220c8b6ba7f..3651d99a68a 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -76,7 +76,6 @@ _gpv_xen_tools_4143_0="
 	xen-tools-4.14-ar-cc.patch
 	xen-tools-4.14-qemu-bridge.patch
 	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.15.0-gcc11.patch
 	xen-tools-4.4.1-tinfo.patch
 	xen-tools-4.6-increase-stack-size.patch
 	xen-tools-4-anti-ovmf-download.patch

[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/files/

[Joonas Niilola]

commit:     cb9316c500e660407677b987a4a36f333d86b464
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jul 15 18:26:17 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 07:39:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb9316c5

app-emulation/xen-tools: remove unused patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26424
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-emulation/xen-tools/files/gentoo-patches.conf  |  87 ------------------
 ...-tools-4.15.0-fix-xenstat-python-bindings.patch |  18 ----
 .../files/xen-tools-4.15.1-edk2-python3.9.patch    |  26 ------
 .../files/xen-tools-4.15.1-ocaml-4.12.patch        | 101 ---------------------
 4 files changed, 232 deletions(-)

diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
deleted file mode 100644
index d6fce26a06c0..000000000000
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ /dev/null
@@ -1,87 +0,0 @@
-# Bug 496708
-_gx045=" xen-tools-4.10.1-unbundle-ipxe.patch"
-_gx054=" xen-tools-4.12.0-unbundle-ipxe.patch"
-
-# Bug 379537
-_gx017=" fix-gold-ld.patch"
-
-# Bug 477676
-_gx038=" xen-tools-4.8-ar-cc.patch"
-_gx039=" xen-tools-4.14-ar-cc.patch"
-
-# Prevent file collision with qemu package Bug 478064
-_gx043=" xen-4.10-qemu-bridge.patch"
-_gx051=" xen-4.12-qemu-bridge.patch"
-_gx052=" xen-tools-4.14-qemu-bridge.patch"
-#mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-# Fix po file collision with app-emulation/qemu, while USE=qemu is enabled, Bug 508302
-_gx027=" xen-tools-4-qemu-fix-po-collision.patch"
-
-# Fix build failure with ncurses[tinfo], bug 526526
-_gx028=" xen-tools-4.4.1-tinfo.patch"
-
-# Don't download ovmf, use pre-released
-_gx029=" xen-tools-4-anti-ovmf-download.patch"
-
-# increase stack to fix xenqemu err
-# https://lists.gnu.org/archive/html/qemu-devel/2016-09/msg03961.html
-_gx037=" xen-tools-4.6-increase-stack-size.patch"
-
-#Fix missing makedev(), major(), minor()
-_gx042=" xen-tools-4.8.2-makedev.patch"
-
-# Disable failing shim
-_gx046=" xen-tools-4.10.1-shim.patch"
-_gx050=" xen-tools-4.12.0-shim.patch"
-
-# Fix building with gcc 8, bug #657388
-_gx048=" xen-tools-4.11.1-gcc8.patch"
-_gx053=" xen-tools-4.12.0-gcc8.patch"
-
-# Fix building with gcc 9, bug #689082
-_gx055=" xen-tools-4.11.2-gcc9.patch"
-
-# Fix pdf document generation, bug #650396
-_gx049=" xen-tools-4.10.1-pdfdoc.patch"
-
-# Add xenstat python-binding, Gento Bug #711066
-_gx056=" xen-tools-4.12.2-libxenstat-makefile.patch"
-
-# Fix building with gcc 10, bug #722930
-_gx060=" xen-tools-4.13.0-gcc10.patch"
-
-# xen-tools-4.15.1 patches set
-_gpv_xen_tools_4151_0="
-	xen-tools-4.14-ar-cc.patch
-	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.15.0-libxenstat-makefile.patch
-	xen-tools-4.15.0-qemu-bridge.patch
-	xen-tools-4.15.0-unbundle-ipxe.patch
-	xen-tools-4.4.1-tinfo.patch
-	xen-tools-4-anti-ovmf-download.patch
-	xen-tools-4-qemu-fix-po-collision.patch
-"
-
-# xen-tools-4.15.2 patches set
-_gpv_xen_tools_4152_0="
-	xen-tools-4.14-ar-cc.patch
-	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.15.0-libxenstat-makefile.patch
-	xen-tools-4.15.0-qemu-bridge.patch
-	xen-tools-4.15.0-unbundle-ipxe.patch
-	xen-tools-4.4.1-tinfo.patch
-	xen-tools-4-anti-ovmf-download.patch
-	xen-tools-4-qemu-fix-po-collision.patch
-"
-
-# xen-tools-4.16.0 patches set
-_gpv_xen_tools_4160_0="
-	xen-tools-4.14-ar-cc.patch
-	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.15.0-unbundle-ipxe.patch
-	xen-tools-4.16.0-qemu-bridge.patch
-	xen-tools-4.16.0-xenstat.patch
-	xen-tools-4.4.1-tinfo.patch
-	xen-tools-4-anti-ovmf-download.patch
-"

diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch b/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch
deleted file mode 100644
index 3547b7346eed..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-4.15.0-fix-xenstat-python-bindings.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/tools/libs/stat/Makefile  2021-07-01 19:32:50.696318503 +0200
-+++ b/tools/libs/stat/Makefile  2021-07-01 00:16:15.102473301 +0200
-@@ -51,12 +51,13 @@
- .PHONY: uninstall-bindings
- uninstall-bindings: uninstall-perl-bindings uninstall-python-bindings
- 
--$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) include/xenstat.h
-+$(BINDINGS): $(SHLIB) $(SHLIB_LINKS) ../../include/xenstat.h
- 
--SWIG_FLAGS=-module xenstat -Iinclude -I.
-+SWIG_FLAGS=-module xenstat -Iinclude -I. -I../../include/
- 
- # Python bindings
- PYTHON_FLAGS=`$(PYTHON) -c 'import distutils.sysconfig; print("-I" + distutils.sysconfig.get_python_inc(True) + " " + distutils.sysconfig.get_config_var("BLDLIBRARY"))'`
-+PYTHON_FLAGS+=-Wno-error=missing-prototypes -fPIC -lxenstat
- $(PYMOD): $(PYSRC)
- $(PYSRC): bindings/swig/xenstat.i
-        swig -python $(SWIG_FLAGS) -outdir $(@D) -o $(PYSRC) $<

diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch b/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch
deleted file mode 100644
index a1f8d155434e..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-4.15.1-edk2-python3.9.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
-index ad556710802e..4be7957138a5 100755
---- a/BaseTools/Source/Python/Common/Misc.py
-+++ b/BaseTools/Source/Python/Common/Misc.py
-@@ -1635,7 +1635,7 @@ def __init__(self, PeFile):
-         ByteArray = array.array('B')
-         ByteArray.fromfile(PeObject, 4)
-         # PE signature should be 'PE\0\0'
--        if ByteArray.tostring() != b'PE\0\0':
-+        if ByteArray.tolist() != [ord('P'), ord('E'), 0, 0]:
-             self.ErrorInfo = self.FileName + ' has no valid PE signature PE00'
-             return
- 
-diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
-index b2895f7e5c63..883c2356e0ca 100644
---- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
-+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
-@@ -152,7 +152,7 @@ def encode(self, input, errors='strict'):
- 
- TheUcs2Codec = Ucs2Codec()
- def Ucs2Search(name):
--    if name == 'ucs-2':
-+    if name in ['ucs-2', 'ucs_2']:
-         return codecs.CodecInfo(
-             name=name,
-             encode=TheUcs2Codec.encode,

diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.1-ocaml-4.12.patch b/app-emulation/xen-tools/files/xen-tools-4.15.1-ocaml-4.12.patch
deleted file mode 100644
index b06a7f195bfa..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-4.15.1-ocaml-4.12.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 2d1a35f1e6c2113a6322fdb758a198608c90e4bd Mon Sep 17 00:00:00 2001
-From: Costin Lupu <costin.lupu@cs.pub.ro>
-Date: Tue, 8 Jun 2021 15:35:29 +0300
-Subject: [PATCH] tools/ocaml: Fix redefinition errors
-
-If PAGE_SIZE is already defined in the system (e.g. in /usr/include/limits.h
-header) then gcc will trigger a redefinition error because of -Werror. This
-patch replaces usage of PAGE_* macros with XC_PAGE_* macros in order to avoid
-confusion between control domain page granularity (PAGE_* definitions) and
-guest domain page granularity (which is what we are dealing with here).
-
-Same issue applies for redefinitions of Val_none and Some_val macros which
-can be already define in the OCaml system headers (e.g.
-/usr/lib/ocaml/caml/mlvalues.h).
-
-Signed-off-by: Costin Lupu <costin.lupu@cs.pub.ro>
-Reviewed-by: Julien Grall <jgrall@amazon.com>
-Acked-by: Ian Jackson <iwj@xenproject.org>
-Tested-by: Dario Faggioli <dfaggioli@suse.com>
----
- tools/ocaml/libs/xc/xenctrl_stubs.c            | 10 ++++------
- tools/ocaml/libs/xentoollog/xentoollog_stubs.c |  4 ++++
- tools/ocaml/libs/xl/xenlight_stubs.c           |  4 ++++
- 3 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c
-index 6e4bc567f5..a6756c4a8c 100644
---- a/tools/ocaml/libs/xc/xenctrl_stubs.c
-+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
-@@ -37,14 +37,12 @@
- 
- #include "mmap_stubs.h"
- 
--#define PAGE_SHIFT		12
--#define PAGE_SIZE               (1UL << PAGE_SHIFT)
--#define PAGE_MASK               (~(PAGE_SIZE-1))
--
- #define _H(__h) ((xc_interface *)(__h))
- #define _D(__d) ((uint32_t)Int_val(__d))
- 
-+#ifndef Val_none
- #define Val_none (Val_int(0))
-+#endif
- 
- #define string_of_option_array(array, index) \
- 	((Field(array, index) == Val_none) ? NULL : String_val(Field(Field(array, index), 0)))
-@@ -819,7 +817,7 @@ CAMLprim value stub_xc_domain_memory_increase_reservation(value xch,
- 	CAMLparam3(xch, domid, mem_kb);
- 	int retval;
- 
--	unsigned long nr_extents = ((unsigned long)(Int64_val(mem_kb))) >> (PAGE_SHIFT - 10);
-+	unsigned long nr_extents = ((unsigned long)(Int64_val(mem_kb))) >> (XC_PAGE_SHIFT - 10);
- 
- 	uint32_t c_domid = _D(domid);
- 	caml_enter_blocking_section();
-@@ -925,7 +923,7 @@ CAMLprim value stub_pages_to_kib(value pages)
- {
- 	CAMLparam1(pages);
- 
--	CAMLreturn(caml_copy_int64(Int64_val(pages) << (PAGE_SHIFT - 10)));
-+	CAMLreturn(caml_copy_int64(Int64_val(pages) << (XC_PAGE_SHIFT - 10)));
- }
- 
- 
-diff --git a/tools/ocaml/libs/xentoollog/xentoollog_stubs.c b/tools/ocaml/libs/xentoollog/xentoollog_stubs.c
-index bf64b211c2..e4306a0c2f 100644
---- a/tools/ocaml/libs/xentoollog/xentoollog_stubs.c
-+++ b/tools/ocaml/libs/xentoollog/xentoollog_stubs.c
-@@ -53,8 +53,12 @@ static char * dup_String_val(value s)
- #include "_xtl_levels.inc"
- 
- /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */
-+#ifndef Val_none
- #define Val_none Val_int(0)
-+#endif
-+#ifndef Some_val
- #define Some_val(v) Field(v,0)
-+#endif
- 
- static value Val_some(value v)
- {
-diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c
-index 352a00134d..45b8af61c7 100644
---- a/tools/ocaml/libs/xl/xenlight_stubs.c
-+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
-@@ -227,8 +227,12 @@ static value Val_string_list(libxl_string_list *c_val)
- }
- 
- /* Option type support as per http://www.linux-nantes.org/~fmonnier/ocaml/ocaml-wrapping-c.php */
-+#ifndef Val_none
- #define Val_none Val_int(0)
-+#endif
-+#ifndef Some_val
- #define Some_val(v) Field(v,0)
-+#endif
- 
- static value Val_some(value v)
- {
--- 
-2.30.2
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/files/

[Arthur Zamarin]

commit:     0379de10b58289ee39468326e515384f9293234c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Sep  5 09:16:01 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep  9 18:02:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0379de10

app-emulation/xen-tools: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../files/xen-tools-4.15.1-brotli-gcc11.patch      | 33 ----------------------
 1 file changed, 33 deletions(-)

diff --git a/app-emulation/xen-tools/files/xen-tools-4.15.1-brotli-gcc11.patch b/app-emulation/xen-tools/files/xen-tools-4.15.1-brotli-gcc11.patch
deleted file mode 100644
index c30cb328460d..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-4.15.1-brotli-gcc11.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/c/dec/decode.c b/c/dec/decode.c
-index ae5a3d3f..7eee9688 100644
---- a/c/dec/decode.c
-+++ b/c/dec/decode.c
-@@ -2033,8 +2033,10 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands(
- }
- 
- BrotliDecoderResult BrotliDecoderDecompress(
--    size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size,
--    uint8_t* decoded_buffer) {
-+    size_t encoded_size,
-+    const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)],
-+    size_t* decoded_size,
-+    uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) {
-   BrotliDecoderState s;
-   BrotliDecoderResult result;
-   size_t total_out = 0;
-diff --git a/c/enc/encode.c b/c/enc/encode.c
-index 8d90937b..0c49c641 100644
---- a/c/enc/encode.c
-+++ b/c/enc/encode.c
-@@ -1470,8 +1470,9 @@ static size_t MakeUncompressedStream(
- 
- BROTLI_BOOL BrotliEncoderCompress(
-     int quality, int lgwin, BrotliEncoderMode mode, size_t input_size,
--    const uint8_t* input_buffer, size_t* encoded_size,
--    uint8_t* encoded_buffer) {
-+    const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)],
-+    size_t* encoded_size,
-+    uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) {
-   BrotliEncoderState* s;
-   size_t out_size = *encoded_size;
-   const uint8_t* input_start = input_buffer;

[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/files/

[Conrad Kostecki]

commit:     32cae7e89ad90d8796f88d508079823933c0465e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Sep 13 12:18:08 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 18:42:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32cae7e8

app-emulation/xen-tools: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32752
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ....m4-tools-configure-add-linux-headers-for.patch | 39 ----------------------
 1 file changed, 39 deletions(-)

diff --git a/app-emulation/xen-tools/files/xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch b/app-emulation/xen-tools/files/xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch
deleted file mode 100644
index 02d1f0ff8b1f..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 873d4759aa7b0581bf34e8a7ebfcbeca789ed6e1 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Tue, 16 May 2023 09:56:48 +0200
-Subject: [PATCH] m4/ptyfuncs.m4 tools/configure: add linux headers for pty
- functions
-
-To avoid implicit function declarations, which will cause an error on
-modern compilers. See https://wiki.gentoo.org/wiki/Modern_C_porting
-
-Downstream Gentoo bug: https://bugs.gentoo.org/904449
-
-Signed-off-by: Florian Schmaus <flo@geekplace.eu>
---- a/m4/ptyfuncs.m4
-+++ b/m4/ptyfuncs.m4
-@@ -19,6 +19,9 @@ AC_DEFUN([AX_CHECK_PTYFUNCS], [
-             AC_LINK_IFELSE([AC_LANG_SOURCE([
- #ifdef INCLUDE_LIBUTIL_H
- #include INCLUDE_LIBUTIL_H
-+#else
-+#include <pty.h>
-+#include <utmp.h>
- #endif
- int main(void) {
-   openpty(0,0,0,0,0);
---- a/tools/configure
-+++ b/tools/configure
-@@ -9002,6 +9002,9 @@ See \`config.log' for more details" "$LINENO" 5; }
- 
- #ifdef INCLUDE_LIBUTIL_H
- #include INCLUDE_LIBUTIL_H
-+#else
-+#include <pty.h>
-+#include <utmp.h>
- #endif
- int main(void) {
-   openpty(0,0,0,0,0);
--- 
-2.39.3
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/files/

[Sam James]

commit:     dd27404faf24c9b0575a2a107d6286386c4c53aa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 29 00:22:13 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 29 00:22:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd27404f

app-emulation/xen-tools: update init.d for nfsmount removal

Bug: https://bugs.gentoo.org/925459
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/xen-tools/files/xenstored.initd-r1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/xen-tools/files/xenstored.initd-r1 b/app-emulation/xen-tools/files/xenstored.initd-r1
index 88d3ad7ba890..0c420851937e 100644
--- a/app-emulation/xen-tools/files/xenstored.initd-r1
+++ b/app-emulation/xen-tools/files/xenstored.initd-r1
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
-	before xendomains xend sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
+	before xendomains xend sshd ntp-client ntpd nfs rsyncd portmap dhcp
 	need xencommons
 }