parent
cd652c0ff0
commit
716e35ae29
Binary file not shown.
Binary file not shown.
@ -0,0 +1,8 @@
|
|||||||
|
# Copyright 2021 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
inherit acct-group
|
||||||
|
|
||||||
|
ACCT_GROUP_ID=297
|
||||||
@ -1,5 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
<pkgmetadata>
|
<pkgmetadata>
|
||||||
<!-- maintainer-needed -->
|
<maintainer type="person">
|
||||||
|
<email>zmedico@gentoo.org</email>
|
||||||
|
</maintainer>
|
||||||
</pkgmetadata>
|
</pkgmetadata>
|
||||||
Binary file not shown.
@ -0,0 +1,14 @@
|
|||||||
|
# Copyright 2021 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
inherit acct-user
|
||||||
|
|
||||||
|
DESCRIPTION="A user for www-servers/caddy"
|
||||||
|
|
||||||
|
ACCT_USER_HOME=/var/lib/http
|
||||||
|
ACCT_USER_GROUPS=( "http" )
|
||||||
|
ACCT_USER_ID="297"
|
||||||
|
|
||||||
|
acct-user_add_deps
|
||||||
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
<pkgmetadata>
|
<pkgmetadata>
|
||||||
<maintainer type="project">
|
<maintainer type="person">
|
||||||
<email>haskell@gentoo.org</email>
|
<email>zmedico@gentoo.org</email>
|
||||||
<name>Gentoo Haskell</name>
|
<name>Zac Medico</name>
|
||||||
</maintainer>
|
</maintainer>
|
||||||
</pkgmetadata>
|
</pkgmetadata>
|
||||||
Binary file not shown.
@ -1 +1 @@
|
|||||||
DIST exo-1.27.0.tar.gz 5345040 BLAKE2B 294ec2a0540259bbe0296e2866f62fd472bf20c7abac8a2660eef23b819b7191d0d1f7ef8b8937382a621a13a1ab3a9bb7af7834cf9fa0b6e1b278596c1cd6a7 SHA512 c03d0c60537e81743941401ae24b39ba036e4bced935fc00ff6b6f78c9db0a4bec67a96ab77ff62a5d94be4ddc04cfe05bc3ffe377c766a775f74315e1cd5111
|
DIST exo-1.27.1.tar.gz 5344908 BLAKE2B 2672cd1e0e4ac59585c0ab376d130fc650db4a9ce8ac3ad7e28b3f22ebdabd4b6d61a477a2b1b8f4da098ef6ed296f6c9a8dae6cc734843c1d4dccb6cd2fbcc2 SHA512 e6d74968ad5677bef4b6c5b698281d1b27949214e3c1f87cbce15e622cfc800b4b0e958c6ea75f9a7eb1f8f3211f0e13bc6819dcc5e95cf996936b956c276619
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,41 @@
|
|||||||
|
From f136702d2adc8643ea12f1b6e3bf97925f1b33f0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kwon-Young Choi <kwon-young.choi@hotmail.fr>
|
||||||
|
Date: Fri, 19 Mar 2021 17:10:31 +0100
|
||||||
|
Subject: [PATCH] BackingFile property should be use with StorageVolume instead
|
||||||
|
of StorageAccess
|
||||||
|
|
||||||
|
BUG: 434617
|
||||||
|
|
||||||
|
When mounting an iso with `udisksctl`, first a loop device is created
|
||||||
|
`/dev/loop0` then a second device `/dev/loop0p1` is used to mount it on
|
||||||
|
a filesystem location.
|
||||||
|
|
||||||
|
Querying for StorageAccess devices sometimes only returns the `/dev/loop0p1`
|
||||||
|
device without the `/dev/loop0` device and the BackingFile property does not
|
||||||
|
work on `/dev/loop0p1`.
|
||||||
|
|
||||||
|
Solution: query for StorageVolume instead which returns all loop devices:
|
||||||
|
`/dev/loop0` and `/dev/loop1`.
|
||||||
|
|
||||||
|
Warning: Because StorageVolume returns more devices, the function
|
||||||
|
`getDeviceFromBackingFile` could be a little bit slower.
|
||||||
|
---
|
||||||
|
mountiso/mountisoaction.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/mountiso/mountisoaction.cpp b/mountiso/mountisoaction.cpp
|
||||||
|
index e5575ae..d198a89 100644
|
||||||
|
--- a/mountiso/mountisoaction.cpp
|
||||||
|
+++ b/mountiso/mountisoaction.cpp
|
||||||
|
@@ -78,7 +78,7 @@ MountIsoAction::MountIsoAction(QObject *parent, const QVariantList &)
|
||||||
|
const Solid::Device getDeviceFromBackingFile(const QString &backingFile)
|
||||||
|
{
|
||||||
|
const QList<Solid::Device> blockDevices =
|
||||||
|
- Solid::Device::listFromQuery("[ IS StorageAccess AND IS GenericInterface ]");
|
||||||
|
+ Solid::Device::listFromQuery("[ IS StorageVolume AND IS GenericInterface ]");
|
||||||
|
|
||||||
|
for (const Solid::Device &device : blockDevices) {
|
||||||
|
auto genericDevice = device.as<Solid::GenericInterface>();
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
inherit autotools eutils flag-o-matic
|
|
||||||
|
|
||||||
DESCRIPTION="Xbox xdvdfs ISO extraction utility"
|
|
||||||
HOMEPAGE="https://sourceforge.net/projects/xbiso/"
|
|
||||||
SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
|
|
||||||
epatch "${FILESDIR}/${P}-libs.patch"
|
|
||||||
mv configure.in configure.ac || die #426262
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
# for this package, interix behaves the same as BSD
|
|
||||||
[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
|
|
||||||
|
|
||||||
econf --disable-ftp
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
dobin xbiso
|
|
||||||
dodoc CHANGELOG README
|
|
||||||
}
|
|
||||||
Binary file not shown.
@ -0,0 +1 @@
|
|||||||
|
DIST 453B65310595562855471199CA68BE8010084C9C.asc 3155 BLAKE2B 7126ccc1af0350ab179c137915bfb1ab7da715219a7f037a08f79d3e503d4fa424a01cf83cd57866c8fb22957e1b736d7c32e68035189b182b09ac9be696eda6 SHA512 49861840e534d1b1ed7d9ba16d825b5f861e05d82119adea8e3bf16355c6c3ed5cdab39c828f9e33f644ff9b806735ca2e70ddaa7c9e92aead87019515118006
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
# Copyright 1999-2021 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
DESCRIPTION="OpenPGP keys used by libvirt"
|
||||||
|
HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
|
||||||
|
SRC_URI="https://libvirt.org/sources/gpg_key.asc -> 453B65310595562855471199CA68BE8010084C9C.asc"
|
||||||
|
|
||||||
|
LICENSE="public-domain"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||||
|
|
||||||
|
S=${WORKDIR}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
local files=( ${A} )
|
||||||
|
insinto /usr/share/openpgp-keys
|
||||||
|
newins - libvirt.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +1,6 @@
|
|||||||
DIST libvirt-6.8.0.tar.xz 8412092 BLAKE2B c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2 SHA512 9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9
|
|
||||||
DIST libvirt-7.0.0.tar.xz 8567648 BLAKE2B 0c0b360c371a14b6d82dc6bef4b228bf7a4a17db1a8425d1354128b0705365a04440217ed0862761b2a8eaf81d81494177d777e734a9045bbc87fc613b56eb05 SHA512 dd6db5ec4971cf4c6059795fd81d5a3a889b10740e34c3c92271eda1c683c99df2c8f923398065d8a7c4f987a20eb1da617d5297ba8ea5a31f154412af50c343
|
DIST libvirt-7.0.0.tar.xz 8567648 BLAKE2B 0c0b360c371a14b6d82dc6bef4b228bf7a4a17db1a8425d1354128b0705365a04440217ed0862761b2a8eaf81d81494177d777e734a9045bbc87fc613b56eb05 SHA512 dd6db5ec4971cf4c6059795fd81d5a3a889b10740e34c3c92271eda1c683c99df2c8f923398065d8a7c4f987a20eb1da617d5297ba8ea5a31f154412af50c343
|
||||||
|
DIST libvirt-7.0.0.tar.xz.asc 833 BLAKE2B 7cc16442f39de660caa38801b12994ca312b250d6c3e5bbef38613702a03cd31cb9b7eaa792af4f8c1b737d67e62f18baa02b481e7fa4d6ec8fc9a07a44db4de SHA512 fb0b6240dbb4e827456f6c573bb3466f19282383bcee5bae8ece923260eca6d252f64b1adfac9a26fdac2a57bb9390aa4c0071e54d16d3e294230b3562764f18
|
||||||
DIST libvirt-7.1.0.tar.xz 8645944 BLAKE2B 97a76091616b427fc64a6a3caf5d9b04d7b9aed7ff7a6d70536ca2eb95d902f0f5ed4b5e56fbdfc6c40f443fb68f4850cff0545256826e575e78fea97158e8f7 SHA512 475b212e920bf8587db4a551126d9eb417d4e18a72550f94feb1aec94821fbac8c84d67ffd59cfe4f8289b6b10ae5f6b579ee170c0d72cb0493ec7ec52183cd6
|
DIST libvirt-7.1.0.tar.xz 8645944 BLAKE2B 97a76091616b427fc64a6a3caf5d9b04d7b9aed7ff7a6d70536ca2eb95d902f0f5ed4b5e56fbdfc6c40f443fb68f4850cff0545256826e575e78fea97158e8f7 SHA512 475b212e920bf8587db4a551126d9eb417d4e18a72550f94feb1aec94821fbac8c84d67ffd59cfe4f8289b6b10ae5f6b579ee170c0d72cb0493ec7ec52183cd6
|
||||||
|
DIST libvirt-7.1.0.tar.xz.asc 833 BLAKE2B 2610cff98967260a5005840e1b03cff16790da82d9a51f14d6b34453db3ba89aa34915bba69d57b333f50d17e2492c77e85ee4e6282b8fe5f4cd0f7ace638334 SHA512 6c92c91bc7f23b32deee3442008b44d6469a9cabf2ed39459afcbfce9b3f2b1b655514a068c4bcdc8909ba02a0a4762e8f845ae4dba8da18719acf45614ca6da
|
||||||
|
DIST libvirt-7.2.0.tar.xz 8661052 BLAKE2B eae6b4e7422690dd780e1647e2a39dfdff0562f3e63bce9ca5ee34540dec3755269efaad459d1b516b56fdeb1503cc966ffa60378aaa18210b972b739716fe34 SHA512 f6bb26ca7cb5a8d342f1f39afd051ed76b71414e1b934557cf50784da17e4f2fb3301c2ace3b593fcdeb6a18ad559a007ad594111c2c348b9157d3a59d475928
|
||||||
|
DIST libvirt-7.2.0.tar.xz.asc 833 BLAKE2B c389d80ef4f7627230b88446ef77daab1bf34e49e20cfb5c5418500fdf388af23aeb2458551548cb732c868f87f35a5c28acff8c01faebe985a6953953a69149 SHA512 526955a9f9d294635e63a4ed20c3e478fb4b5f3a63150a59ff30d84ad16a286ddb4c6508d0317c56df63a0d22a099085697df344fe2b15bce07acf9f05cda331
|
||||||
|
|||||||
@ -1,24 +0,0 @@
|
|||||||
https://bugs.gentoo.org/753761
|
|
||||||
|
|
||||||
diff --git a/src/util/virgdbus.c b/src/util/virgdbus.c
|
|
||||||
index 4360a6a..4ad1a5c 100644
|
|
||||||
--- a/src/util/virgdbus.c
|
|
||||||
+++ b/src/util/virgdbus.c
|
|
||||||
@@ -54,11 +54,15 @@ virGDBusBusInit(GBusType type, GError **error)
|
|
||||||
if (sharedBus) {
|
|
||||||
return g_bus_get_sync(type, NULL, error);
|
|
||||||
} else {
|
|
||||||
+ GDBusConnectionFlags dbusFlags =
|
|
||||||
+ G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
|
|
||||||
+ G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION;
|
|
||||||
+
|
|
||||||
address = g_dbus_address_get_for_bus_sync(type, NULL, error);
|
|
||||||
- if (error)
|
|
||||||
+ if (*error)
|
|
||||||
return NULL;
|
|
||||||
return g_dbus_connection_new_for_address_sync(address,
|
|
||||||
- G_DBUS_CONNECTION_FLAGS_NONE,
|
|
||||||
+ dbusFlags,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
error);
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
From c8be9ccc36a32cc756d05b2c0838c43a57be15f7 Mon Sep 17 00:00:00 2001
|
|
||||||
Message-Id: <c8be9ccc36a32cc756d05b2c0838c43a57be15f7.1607284606.git.mprivozn@redhat.com>
|
|
||||||
From: Pavel Hrdina <phrdina@redhat.com>
|
|
||||||
Date: Thu, 8 Oct 2020 13:09:45 +0200
|
|
||||||
Subject: [PATCH] meson: properly handle libpcap if it's explicitly disabled
|
|
||||||
|
|
||||||
If libpcap is detected using pkg-config it would ignore the libpcap
|
|
||||||
option.
|
|
||||||
|
|
||||||
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
||||||
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
||||||
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
||||||
---
|
|
||||||
meson.build | 25 +++++++++++++++----------
|
|
||||||
1 file changed, 15 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index e5a8316668..ec252ddf39 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -1101,17 +1101,22 @@ if libparted_dep.found()
|
|
||||||
endif
|
|
||||||
|
|
||||||
libpcap_version = '1.5.0'
|
|
||||||
-libpcap_dep = dependency('libpcap', version: '>=' + libpcap_version, required: false)
|
|
||||||
-if not libpcap_dep.found()
|
|
||||||
- pcap_config_prog = find_program('pcap-config', required: get_option('libpcap'))
|
|
||||||
- if pcap_config_prog.found()
|
|
||||||
- pcap_args = run_command(pcap_config_prog, '--cflags').stdout().strip().split()
|
|
||||||
- pcap_libs = run_command(pcap_config_prog, '--libs').stdout().strip().split()
|
|
||||||
- libpcap_dep = declare_dependency(
|
|
||||||
- compile_args: pcap_args,
|
|
||||||
- link_args: pcap_libs,
|
|
||||||
- )
|
|
||||||
+if not get_option('libpcap').disabled()
|
|
||||||
+ libpcap_dep = dependency('libpcap', version: '>=' + libpcap_version, required: false)
|
|
||||||
+
|
|
||||||
+ if not libpcap_dep.found()
|
|
||||||
+ pcap_config_prog = find_program('pcap-config', required: get_option('libpcap'))
|
|
||||||
+ if pcap_config_prog.found()
|
|
||||||
+ pcap_args = run_command(pcap_config_prog, '--cflags').stdout().strip().split()
|
|
||||||
+ pcap_libs = run_command(pcap_config_prog, '--libs').stdout().strip().split()
|
|
||||||
+ libpcap_dep = declare_dependency(
|
|
||||||
+ compile_args: pcap_args,
|
|
||||||
+ link_args: pcap_libs,
|
|
||||||
+ )
|
|
||||||
+ endif
|
|
||||||
endif
|
|
||||||
+else
|
|
||||||
+ libpcap_dep = dependency('', required: false)
|
|
||||||
endif
|
|
||||||
if libpcap_dep.found()
|
|
||||||
conf.set('WITH_LIBPCAP', 1)
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
||||||
@ -1,2 +1,2 @@
|
|||||||
DIST spice-vdagent-0.19.0.tar.bz2 151356 BLAKE2B b7a99a7205d955b27edfe483746e3f267a6e0b7885c4b8146ba42d99b581cf4e1748b503a37a3d6b66623ef2515b42756f2e6a5a4775d56def7aa396bd0dfb4f SHA512 f5056dfe66df3ee8205549be22bbc8c17d2196c8448eda97f01659ff30c34d9929f330767d7fafec557dc5f7fb9b65eaf85973193b38df774042de9b72d6e60d
|
DIST spice-vdagent-0.19.0.tar.bz2 151356 BLAKE2B b7a99a7205d955b27edfe483746e3f267a6e0b7885c4b8146ba42d99b581cf4e1748b503a37a3d6b66623ef2515b42756f2e6a5a4775d56def7aa396bd0dfb4f SHA512 f5056dfe66df3ee8205549be22bbc8c17d2196c8448eda97f01659ff30c34d9929f330767d7fafec557dc5f7fb9b65eaf85973193b38df774042de9b72d6e60d
|
||||||
DIST spice-vdagent-0.20.0.tar.bz2 152510 BLAKE2B b00caadab385f4208bd18b78a006831953f99387e55fd86226efffdf537426627f02bb46708173b700eecd21f598a0db94f454c5252b0f4bfb93c30b39d69d16 SHA512 a6288e056645c071834f9ce5800669cb64e0f86a5efeb8eec61ac1e11f1fd56f7da8ea19b28a94c88741d794a0290fac9bcf74d45bcef271c2c5abfb2573a8e1
|
DIST spice-vdagent-0.21.0.tar.bz2 164103 BLAKE2B 298122b334f880ffb8d77d3a7d822b70debce56d62bc3004bbac37445f10236a47706d23501ee3f82520c45b65deec12c9578cf4a8b9ac138df8b1c0b8cdb784 SHA512 1ff1a89e75301b1c2c89f26ba4bce8d4df29bbff6387ade128ce847ca30162a2bc731c70c10a8d129518e64bbca6b8271fd11ff3e340899182a65a5295051bff
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
# Copyright 1999-2020 Gentoo Authors
|
# Copyright 1999-2021 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
diff --git a/common/quic.c b/common/quic.c
|
||||||
|
index bc753ca5064a0326906b4aa8c18d8745747feb5c..681531677fbd6c3bca5e482c77bb709d4465ef8e 100644
|
||||||
|
--- a/subprojects/spice-common/common/quic.c
|
||||||
|
+++ b/subprojects/spice-common/common/quic.c
|
||||||
|
@@ -56,6 +56,9 @@ typedef uint8_t BYTE;
|
||||||
|
#define MINwminext 1
|
||||||
|
#define MAXwminext 100000000
|
||||||
|
|
||||||
|
+/* Maximum image size in pixels, mainly to avoid possible integer overflows */
|
||||||
|
+#define SPICE_MAX_IMAGE_SIZE (512 * 1024 * 1024 - 1)
|
||||||
|
+
|
||||||
|
typedef struct QuicFamily {
|
||||||
|
unsigned int nGRcodewords[MAXNUMCODES]; /* indexed by code number, contains number of
|
||||||
|
unmodified GR codewords in the code */
|
||||||
|
@@ -1165,6 +1168,16 @@ int quic_decode_begin(QuicContext *quic, uint32_t *io_ptr, unsigned int num_io_w
|
||||||
|
height = encoder->io_word;
|
||||||
|
decode_eat32bits(encoder);
|
||||||
|
|
||||||
|
+ if (width <= 0 || height <= 0) {
|
||||||
|
+ encoder->usr->warn(encoder->usr, "invalid size\n");
|
||||||
|
+ return QUIC_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* avoid too big images */
|
||||||
|
+ if ((uint64_t) width * height > SPICE_MAX_IMAGE_SIZE) {
|
||||||
|
+ encoder->usr->error(encoder->usr, "image too large\n");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
quic_image_params(encoder, type, &channels, &bpc);
|
||||||
|
|
||||||
|
if (!encoder_reset_channels(encoder, channels, width, bpc)) {
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/common/quic.c b/common/quic.c
|
||||||
|
index e2dee0fd68741512911d5d050053ad073cf29457..bc753ca5064a0326906b4aa8c18d8745747feb5c 100644
|
||||||
|
--- a/subprojects/spice-common/common/quic.c
|
||||||
|
+++ b/subprojects/spice-common/common/quic.c
|
||||||
|
@@ -1136,7 +1136,7 @@ int quic_decode_begin(QuicContext *quic, uint32_t *io_ptr, unsigned int num_io_w
|
||||||
|
int channels;
|
||||||
|
int bpc;
|
||||||
|
|
||||||
|
- if (!encoder_reset(encoder, io_ptr, io_ptr_end)) {
|
||||||
|
+ if (!num_io_words || !encoder_reset(encoder, io_ptr, io_ptr_end)) {
|
||||||
|
return QUIC_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
diff --git a/common/quic_family_tmpl.c b/common/quic_family_tmpl.c
|
||||||
|
index 8a5f7d2c9be3f6b1bd82993703749268bab243b4..6cc051b36889f773fe5401e204db6245d99e27df 100644
|
||||||
|
--- a/subprojects/spice-common/common/quic_family_tmpl.c
|
||||||
|
+++ b/subprojects/spice-common/common/quic_family_tmpl.c
|
||||||
|
@@ -103,7 +103,12 @@ static s_bucket *FNAME(find_bucket)(Channel *channel, const unsigned int val)
|
||||||
|
{
|
||||||
|
spice_extra_assert(val < (0x1U << BPC));
|
||||||
|
|
||||||
|
- return channel->_buckets_ptrs[val];
|
||||||
|
+ /* The and (&) here is to avoid buffer overflows in case of garbage or malicious
|
||||||
|
+ * attempts. Is much faster then using comparisons and save us from such situations.
|
||||||
|
+ * Note that on normal build the check above won't be compiled as this code path
|
||||||
|
+ * is pretty hot and would cause speed regressions.
|
||||||
|
+ */
|
||||||
|
+ return channel->_buckets_ptrs[val & ((1U << BPC) - 1)];
|
||||||
|
}
|
||||||
|
|
||||||
|
#undef FNAME
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
diff --git a/common/quic_tmpl.c b/common/quic_tmpl.c
|
||||||
|
index ecd6f3f187c753a89b7dbb0657edc3ae82ffaaff..ebae992d642a657a7505b3ca0e8145310805f32f 100644
|
||||||
|
--- a/subprojects/spice-common/common/quic_tmpl.c
|
||||||
|
+++ b/subprojects/spice-common/common/quic_tmpl.c
|
||||||
|
@@ -563,7 +563,11 @@ static void FNAME_DECL(uncompress_row_seg)(const PIXEL * const prev_row,
|
||||||
|
do_run:
|
||||||
|
state->waitcnt = stopidx - i;
|
||||||
|
run_index = i;
|
||||||
|
- run_end = i + decode_state_run(encoder, state);
|
||||||
|
+ run_end = decode_state_run(encoder, state);
|
||||||
|
+ if (run_end < 0 || run_end > (end - i)) {
|
||||||
|
+ encoder->usr->error(encoder->usr, "wrong RLE\n");
|
||||||
|
+ }
|
||||||
|
+ run_end += i;
|
||||||
|
|
||||||
|
for (; i < run_end; i++) {
|
||||||
|
UNCOMPRESS_PIX_START(&cur_row[i]);
|
||||||
@ -0,0 +1,104 @@
|
|||||||
|
# Copyright 1999-2021 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python3_{7,8} )
|
||||||
|
inherit autotools python-any-r1 readme.gentoo-r1 xdg-utils
|
||||||
|
|
||||||
|
DESCRIPTION="SPICE server"
|
||||||
|
HOMEPAGE="https://www.spice-space.org/"
|
||||||
|
SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2"
|
||||||
|
|
||||||
|
LICENSE="LGPL-2.1"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
|
||||||
|
IUSE="libressl lz4 sasl smartcard static-libs gstreamer test"
|
||||||
|
|
||||||
|
# the libspice-server only uses the headers of libcacard
|
||||||
|
RDEPEND="
|
||||||
|
dev-lang/orc[static-libs(+)?]
|
||||||
|
>=dev-libs/glib-2.22:2[static-libs(+)?]
|
||||||
|
media-libs/opus[static-libs(+)?]
|
||||||
|
sys-libs/zlib[static-libs(+)?]
|
||||||
|
virtual/jpeg:0=[static-libs(+)?]
|
||||||
|
>=x11-libs/pixman-0.17.7[static-libs(+)?]
|
||||||
|
!libressl? ( dev-libs/openssl:0=[static-libs(+)?] )
|
||||||
|
libressl? ( dev-libs/libressl:0=[static-libs(+)?] )
|
||||||
|
lz4? ( app-arch/lz4:0=[static-libs(+)?] )
|
||||||
|
smartcard? ( >=app-emulation/libcacard-0.1.2 )
|
||||||
|
sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
|
||||||
|
gstreamer? (
|
||||||
|
media-libs/gstreamer:1.0
|
||||||
|
media-libs/gst-plugins-base:1.0
|
||||||
|
)"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
>=app-emulation/spice-protocol-0.14.0
|
||||||
|
smartcard? ( app-emulation/qemu[smartcard] )"
|
||||||
|
BDEPEND="${PYTHON_DEPS}
|
||||||
|
virtual/pkgconfig
|
||||||
|
$(python_gen_any_dep '
|
||||||
|
>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
|
||||||
|
dev-python/six[${PYTHON_USEDEP}]
|
||||||
|
')"
|
||||||
|
|
||||||
|
python_check_deps() {
|
||||||
|
has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
|
||||||
|
has_version -b "dev-python/six[${PYTHON_USEDEP}]"
|
||||||
|
}
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${P}-CVE-2020-14355-762e0aba.patch
|
||||||
|
"${FILESDIR}"/${P}-CVE-2020-14355-404d7478.patch
|
||||||
|
"${FILESDIR}"/${P}-CVE-2020-14355-ef1b6ff7.patch
|
||||||
|
"${FILESDIR}"/${P}-CVE-2020-14355-b24fe6b6.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
pkg_setup() {
|
||||||
|
[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
|
||||||
|
}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
|
||||||
|
eautoreconf
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
# Prevent sandbox violations, bug #586560
|
||||||
|
# https://bugzilla.gnome.org/show_bug.cgi?id=744134
|
||||||
|
# https://bugzilla.gnome.org/show_bug.cgi?id=744135
|
||||||
|
addpredict /dev
|
||||||
|
|
||||||
|
xdg_environment_reset
|
||||||
|
|
||||||
|
local myconf="
|
||||||
|
$(use_enable static-libs static)
|
||||||
|
$(use_enable lz4)
|
||||||
|
$(use_with sasl)
|
||||||
|
$(use_enable smartcard)
|
||||||
|
$(use_enable test tests)
|
||||||
|
--enable-gstreamer=$(usex gstreamer "1.0" "no")
|
||||||
|
--disable-celt051
|
||||||
|
"
|
||||||
|
econf ${myconf}
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
# Prevent sandbox violations, bug #586560
|
||||||
|
# https://bugzilla.gnome.org/show_bug.cgi?id=744134
|
||||||
|
# https://bugzilla.gnome.org/show_bug.cgi?id=744135
|
||||||
|
addpredict /dev
|
||||||
|
|
||||||
|
default
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
default
|
||||||
|
use static-libs || find "${D}" -name '*.la' -type f -delete || die
|
||||||
|
readme.gentoo_create_doc
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
readme.gentoo_print_elog
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue