Merge remote-tracking branch 'origin/3.6' into 3.7

This commit is contained in:
Tim Biermann 2022-03-13 13:07:13 +01:00
commit f4792c515f
21 changed files with 54 additions and 117 deletions

View File

@ -12,8 +12,8 @@ drwxr-xr-x root/root usr/lib32/dbus/
-rwsr-x--- root/messagebus usr/lib32/dbus/dbus-daemon-launch-helper
-rw-r--r-- root/root usr/lib32/libdbus-1.a
-rwxr-xr-x root/root usr/lib32/libdbus-1.la
lrwxrwxrwx root/root usr/lib32/libdbus-1.so -> libdbus-1.so.3.19.14
lrwxrwxrwx root/root usr/lib32/libdbus-1.so.3 -> libdbus-1.so.3.19.14
-rwxr-xr-x root/root usr/lib32/libdbus-1.so.3.19.14
lrwxrwxrwx root/root usr/lib32/libdbus-1.so -> libdbus-1.so.3.32.0
lrwxrwxrwx root/root usr/lib32/libdbus-1.so.3 -> libdbus-1.so.3.32.0
-rwxr-xr-x root/root usr/lib32/libdbus-1.so.3.32.0
drwxr-xr-x root/root usr/lib32/pkgconfig/
-rw-r--r-- root/root usr/lib32/pkgconfig/dbus-1.pc

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/compat-32.pub
RWSwxGo/zH7eXQBBo9PFFYNNdnE7HoBJOm3yQwxuQOWdT+KEn7H8g5tTFK1NohI+cu42g63MB+i0+cKarVaKr1vlX3w/OL2gCQ8=
SHA256 (Pkgfile) = 45656ab51c8fd572c4d639bc9bfe35257d4e3ea4d6523207607d45826bdb33ce
SHA256 (.footprint) = 2e3fc6036033dd10828ef777fdebf6c43de4a6778bdddf4d75a8c9682588b8ba
SHA256 (dbus-1.12.22.tar.gz) = 8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474
RWSwxGo/zH7eXbCIa3u4Wzl3Qvg+OF3gYH1hTHMe1mMfoFb+K7oobLHKu8mZPI4P9W3IRD5vUmz4+r5XrGRlV7WjsJR/ysmwOQY=
SHA256 (Pkgfile) = 75c1aa01de07b07b638e2991283b5e484f2fb74450336d9fb82338e38bdd455e
SHA256 (.footprint) = db07afcc0141fab1dc3788203d1d040a971175dac58920d67daecef40678fa1a
SHA256 (dbus-1.14.0.tar.xz) = ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4

View File

@ -4,9 +4,9 @@
# Depends on: dbus expat-32
name=dbus-32
version=1.12.22
version=1.14.0
release=1
source=(https://${name%-*}.freedesktop.org/releases/${name%-*}/${name%-*}-$version.tar.gz)
source=(https://dbus.freedesktop.org/releases/dbus/dbus-$version.tar.xz)
build() {
cd ${name%-*}-$version

View File

@ -4,14 +4,14 @@ drwxr-xr-x root/root usr/lib32/cmake/
drwxr-xr-x root/root usr/lib32/cmake/harfbuzz/
-rw-r--r-- root/root usr/lib32/cmake/harfbuzz/harfbuzz-config.cmake
lrwxrwxrwx root/root usr/lib32/libharfbuzz-gobject.so -> libharfbuzz-gobject.so.0
lrwxrwxrwx root/root usr/lib32/libharfbuzz-gobject.so.0 -> libharfbuzz-gobject.so.0.40000.0
-rwxr-xr-x root/root usr/lib32/libharfbuzz-gobject.so.0.40000.0
lrwxrwxrwx root/root usr/lib32/libharfbuzz-gobject.so.0 -> libharfbuzz-gobject.so.0.40001.0
-rwxr-xr-x root/root usr/lib32/libharfbuzz-gobject.so.0.40001.0
lrwxrwxrwx root/root usr/lib32/libharfbuzz-subset.so -> libharfbuzz-subset.so.0
lrwxrwxrwx root/root usr/lib32/libharfbuzz-subset.so.0 -> libharfbuzz-subset.so.0.40000.0
-rwxr-xr-x root/root usr/lib32/libharfbuzz-subset.so.0.40000.0
lrwxrwxrwx root/root usr/lib32/libharfbuzz-subset.so.0 -> libharfbuzz-subset.so.0.40001.0
-rwxr-xr-x root/root usr/lib32/libharfbuzz-subset.so.0.40001.0
lrwxrwxrwx root/root usr/lib32/libharfbuzz.so -> libharfbuzz.so.0
lrwxrwxrwx root/root usr/lib32/libharfbuzz.so.0 -> libharfbuzz.so.0.40000.0
-rwxr-xr-x root/root usr/lib32/libharfbuzz.so.0.40000.0
lrwxrwxrwx root/root usr/lib32/libharfbuzz.so.0 -> libharfbuzz.so.0.40001.0
-rwxr-xr-x root/root usr/lib32/libharfbuzz.so.0.40001.0
drwxr-xr-x root/root usr/lib32/pkgconfig/
-rw-r--r-- root/root usr/lib32/pkgconfig/harfbuzz-gobject.pc
-rw-r--r-- root/root usr/lib32/pkgconfig/harfbuzz-subset.pc

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/compat-32.pub
RWSwxGo/zH7eXTIkp6F19MyXae0tzXjEgYoKAd3MYoc/SmSarEyXzOBlBcFhxKtdk8XTtGlLiLYCo5BFrFZE77Iw1Njt/MysGgM=
SHA256 (Pkgfile) = 2d81601b301d117e37124d04057d97347aff736d95fbf431e18f4dc518f50a59
SHA256 (.footprint) = 926c3bd0bed402146a141cba8b782074e934c6246743825cee97141f63c7e183
SHA256 (harfbuzz-4.0.0.tar.xz) = ab61d4e3fc0c30072e98b46aa7727fc3eed36a85d2b6b9274cec7eaadea97cb7
RWSwxGo/zH7eXSR1HUHesMZgGmPUinVVGOw6NbP4e5jEjlPChSxFBryI0aCHW5LaI5H4ubZRh2mVD0MJOf3ua67H38JqF7212wI=
SHA256 (Pkgfile) = 72a06531cbc3f9417acac1ec3925d8c6192fb8888f84f29310e1a0feca713653
SHA256 (.footprint) = b91c3995f1a25a53ebfa14f3bf78c0e5ad508b99a105fc6466eea3209e4f2d8a
SHA256 (harfbuzz-4.0.1.tar.xz) = 98f68777272db6cd7a3d5152bac75083cd52a26176d87bc04c8b3929d33bce49

View File

@ -5,7 +5,7 @@
# Optional: icu-32
name=harfbuzz-32
version=4.0.0
version=4.0.1
release=1
source=(https://github.com/harfbuzz/harfbuzz/releases/download/$version/${name%-*}-$version.tar.xz)

View File

@ -1,9 +1,9 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib32/
drwxr-xr-x root/root usr/lib32/NetworkManager/
drwxr-xr-x root/root usr/lib32/NetworkManager/1.36.0/
-rwxr-xr-x root/root usr/lib32/NetworkManager/1.36.0/libnm-device-plugin-adsl.so
-rwxr-xr-x root/root usr/lib32/NetworkManager/1.36.0/libnm-device-plugin-wifi.so
drwxr-xr-x root/root usr/lib32/NetworkManager/1.36.2/
-rwxr-xr-x root/root usr/lib32/NetworkManager/1.36.2/libnm-device-plugin-adsl.so
-rwxr-xr-x root/root usr/lib32/NetworkManager/1.36.2/libnm-device-plugin-wifi.so
lrwxrwxrwx root/root usr/lib32/libnm.so -> libnm.so.0
lrwxrwxrwx root/root usr/lib32/libnm.so.0 -> libnm.so.0.1.0
-rwxr-xr-x root/root usr/lib32/libnm.so.0.1.0

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/compat-32.pub
RWSwxGo/zH7eXWP92ddMe6IHVV1/iKXY1nd1z24QSpa/f2qRiM5IRa/m/3UMQHbRhnRyt4WM2Y1NHE51OprwJ3lpGfWF+Z8Hows=
SHA256 (Pkgfile) = 061355b3a6d44d5f3c0b3f9bcbdcff05df1388e411f97d2097b442d326884540
SHA256 (.footprint) = 3056691c1bd170997641bdbc08d4a2b658e0a01bb592dee874d649602a2aace5
SHA256 (NetworkManager-1.36.0.tar.xz) = faa389c9e9ca78243cfab4a8bed6db132f82e5b5e66bb9d44af93379d1348398
RWSwxGo/zH7eXZz66+HBdGwP94nV9tAHAU4UbLl3K6GHISXlUGQC0x+QUHsZACzatw7/Eo0qIJhliR5GLGMacrWJX4nnRYQlVQw=
SHA256 (Pkgfile) = 8340b3f916b5725bcd0d5ceadb4f1a3dad1b2cd51421eef50689dd2153628a84
SHA256 (.footprint) = 4c424bfdc604f0f7f7f7be419fab0f48719c6c6d56c34c75f1f2c9e3d970c058
SHA256 (NetworkManager-1.36.2.tar.xz) = ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab

View File

@ -4,7 +4,7 @@
# Depends on: curl-32 dbus-glib-32 jansson-32 libndp-32 libpsl-32 networkmanager nss-32
name=libnm-32
version=1.36.0
version=1.36.2
release=1
source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz)

View File

@ -1,18 +0,0 @@
https://github.com/libunwind/libunwind/issues/264
From a716a18c0c2a089c55d83b067071a4cfc47e8a35 Mon Sep 17 00:00:00 2001
From: kasperk81 <83082615+kasperk81@users.noreply.github.com>
Date: Wed, 30 Jun 2021 23:23:22 +0000
Subject: [PATCH] Fix -mx32 compilation error
--- a/src/x86_64/Gos-linux.c
+++ b/src/x86_64/Gos-linux.c
@@ -149,7 +149,7 @@ x86_64_sigreturn (unw_cursor_t *cursor)
__asm__ __volatile__ ("mov %0, %%rsp;"
"mov %1, %%rax;"
"syscall"
- :: "r"(sc), "i"(SYS_rt_sigreturn)
+ :: "r"((uint64_t)sc), "i"(SYS_rt_sigreturn)
: "memory");
abort();
}

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/compat-32.pub
RWSwxGo/zH7eXdWLOSgJWCO2rYYlgKXewPqNNUiPRcLK7VjZe7fhhyNNjakr37hJe8ETsDvFvHnMsVc8Sq1cYkiTrgYNBymQpAA=
SHA256 (Pkgfile) = 82550f0c90408540ad2143d96c17f4023c8408869392e27f5d7967419fd6cb49
RWSwxGo/zH7eXUUHKCRRV+AlNnY5NbJkFHUhlAHU/5IZRDRUt+3dhWYQQJX5AdfKuc/H9yRGNiDOKXo+FyhfYlnCMPm6HSxUpgg=
SHA256 (Pkgfile) = 05af126b9e0cdf1517128906416093f4b0672469c136f9d114e585b5049ed8d0
SHA256 (.footprint) = c9b675106249f30659d3698bd809c677e1721f4ff13bcc0777416eb5008d0f2f
SHA256 (libvdpau-1.4.tar.bz2) = 4258824c5a4555ef31de0a7d82b3caf19e75a16a13949f1edafc5f6fb2d33f30
SHA256 (libvdpau-1.5.tar.bz2) = a5d50a42b8c288febc07151ab643ac8de06a18446965c7241f89b4e810821913

View File

@ -4,7 +4,7 @@
# Depends on: libvdpau xorg-libxext-32
name=libvdpau-32
version=1.4
version=1.5
release=1
source=(https://gitlab.freedesktop.org/vdpau/${name%-*}/-/archive/$version//${name%-*}-$version.tar.bz2)

View File

@ -1,17 +1,11 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib32/
drwxr-xr-x root/root usr/lib32/dri/
-rwxr-xr-x root/root usr/lib32/dri/i830_dri.so
-rwxr-xr-x root/root usr/lib32/dri/i915_dri.so
-rwxr-xr-x root/root usr/lib32/dri/i965_dri.so
-rwxr-xr-x root/root usr/lib32/dri/iris_dri.so
-rwxr-xr-x root/root usr/lib32/dri/kms_swrast_dri.so
-rwxr-xr-x root/root usr/lib32/dri/nouveau_dri.so
-rwxr-xr-x root/root usr/lib32/dri/nouveau_vieux_dri.so
-rwxr-xr-x root/root usr/lib32/dri/r200_dri.so
-rwxr-xr-x root/root usr/lib32/dri/r300_dri.so
-rwxr-xr-x root/root usr/lib32/dri/r600_dri.so
-rwxr-xr-x root/root usr/lib32/dri/radeon_dri.so
-rwxr-xr-x root/root usr/lib32/dri/radeonsi_dri.so
-rwxr-xr-x root/root usr/lib32/dri/swrast_dri.so
-rwxr-xr-x root/root usr/lib32/dri/virtio_gpu_dri.so

View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/compat-32.pub
RWSwxGo/zH7eXcfGOxb2+bQyTKjaajwsPB7A63lqStqXAH7J3MoAFogVGC7Ah66nS4tlCEAl9o7eezePvZJqYMXYf1xuEExOxwM=
SHA256 (Pkgfile) = 4ca2e4d0966ac517c66a6c668a5e00532ef1f1a7ce48f90141d5f8ca1c5c4cee
SHA256 (.footprint) = f8989438162b8081cc5783bf7f99d6f4cf4c0525d77fcda2ace54f1143888ca5
SHA256 (mesa-21.3.7.tar.xz) = b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d
RWSwxGo/zH7eXc4gT4fayHPUc0XqoBPIstnZWmQeZ4tjDKQs+sfv306MVYyy/3Fw+C6dulXzr6HJND705CN4kmFte50uvg+MzA0=
SHA256 (Pkgfile) = 45628dab40023296868ca97b4a084cc1ba8bd3e2714146fdca0e273dac110907
SHA256 (.footprint) = 8bb6f1be7ffa3b4a2c400d7e99ec4e36274c61dda8545553b25fc36fd8327584
SHA256 (mesa-22.0.0.tar.xz) = e6c41928b5b9917485bd67cec22d15e62cad7a358bf4c711a647979987601250
SHA256 (x86-linux-gnu) = 448877bbe3efe8bdfe6282c8e730fe8a8b6bf3c07f659e71b7292aceca22d8bd
SHA256 (x86-linux-gnu-ccache) = 7b435803071fa5d72668eeae1a15c4e4dfca7847349de6f4ede0282b85faaac8

View File

@ -5,7 +5,7 @@
# Optional: libva libvdpau-32 wayland-protocols
name=mesa-32
version=21.3.7
version=22.0.0
release=1
source=(https://archive.mesa3d.org/mesa-$version.tar.xz
x86-linux-gnu x86-linux-gnu-ccache)

View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/compat-32.pub
RWSwxGo/zH7eXenQDhz3YubQyHxquiHCPQAj9LZWWPKxWxkmcD2n7OK2FLi3t/lxNfOZpOrRykcgENdmtJMzC78z7XNUvN7qew0=
SHA256 (Pkgfile) = 70afb4fe16e9906c6a038a8fde5d301bb868f4e2cb41cf86ed21fac88bab587a
RWSwxGo/zH7eXX2T0GhoOMqa3kbPKK06jyyzZRsYJYMjw2qn/8+bqx41zuatl9QhtDU/FS7QbAZdnLT7HP5EmSk/Gy1dHq0NvQg=
SHA256 (Pkgfile) = 3f149d42c5d2aec86a57cace54c18b37cc4e94b2d209e8981864d7cf4e2f5036
SHA256 (.footprint) = f34e187b232cf3455f234fceface88dedc8d7fee1b901bb211e329223fa63f72
SHA256 (nss-3.75.tar.gz) = fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582
SHA256 (nss-3.76.tar.gz) = 1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630
SHA256 (nss-config.in) = 08dbc1202186308e86125b5c5e7e2d0e1bd1bd5ed65eab011b9af210f656aff5
SHA256 (nss.pc.in) = 135fbde6866e422b7a436e18d5b8e0defbb67dde6b8e1dc9e84de14b5c645626

View File

@ -4,7 +4,7 @@
# Depends on: nspr-32 nss sqlite3-32 zlib-32
name=nss-32
version=3.75
version=3.76
release=1
source=(https://ftp.mozilla.org/pub/security/${name%-*}/releases/NSS_${version//./_}_RTM/src/${name%-*}-$version.tar.gz
nss-config.in nss.pc.in)

View File

@ -1,39 +0,0 @@
--- Makefile.kbuild.orig 2012-11-16 21:37:14.691678587 -0600
+++ Makefile.kbuild 2012-11-16 21:37:39.731679795 -0600
@@ -223,10 +223,10 @@
.PHONY: suser-sanity-check rmmod-sanity-check build-sanity-checks
suser-sanity-check:
- @if ! $(CONFTEST) suser_sanity_check; then exit 1; fi
+ #@if ! $(CONFTEST) suser_sanity_check; then exit 1; fi
rmmod-sanity-check:
- @if ! $(CONFTEST) rmmod_sanity_check; then exit 1; fi
+ #@if ! $(CONFTEST) rmmod_sanity_check; then exit 1; fi
build-sanity-checks:
@if ! $(CONFTEST) cc_version_check full_output; then exit 1; fi
@@ -256,9 +256,9 @@
#
module-install: suser-sanity-check module
- @mkdir -p $(MODULE_ROOT)/video; \
- install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
- PATH="$(PATH):/bin:/sbin" depmod -a
+ #@mkdir -p $(MODULE_ROOT)/video; \
+ #install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
+ #PATH="$(PATH):/bin:/sbin" depmod -a
#
# This target builds, then installs, then creates device nodes and inserts
@@ -266,8 +266,8 @@
#
package-install: module-install rmmod-sanity-check
- @PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
- echo "$(MODULE_OBJECT) installed successfully.";
+ #@PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
+ #echo "$(MODULE_OBJECT) installed successfully.";
#
# Build an object file suitable for further processing by the installer

View File

@ -1,17 +1,17 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib32/
lrwxrwxrwx root/root usr/lib32/libpango-1.0.so -> libpango-1.0.so.0
lrwxrwxrwx root/root usr/lib32/libpango-1.0.so.0 -> libpango-1.0.so.0.5000.4
-rwxr-xr-x root/root usr/lib32/libpango-1.0.so.0.5000.4
lrwxrwxrwx root/root usr/lib32/libpango-1.0.so.0 -> libpango-1.0.so.0.5000.5
-rwxr-xr-x root/root usr/lib32/libpango-1.0.so.0.5000.5
lrwxrwxrwx root/root usr/lib32/libpangocairo-1.0.so -> libpangocairo-1.0.so.0
lrwxrwxrwx root/root usr/lib32/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.5000.4
-rwxr-xr-x root/root usr/lib32/libpangocairo-1.0.so.0.5000.4
lrwxrwxrwx root/root usr/lib32/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.5000.5
-rwxr-xr-x root/root usr/lib32/libpangocairo-1.0.so.0.5000.5
lrwxrwxrwx root/root usr/lib32/libpangoft2-1.0.so -> libpangoft2-1.0.so.0
lrwxrwxrwx root/root usr/lib32/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.5000.4
-rwxr-xr-x root/root usr/lib32/libpangoft2-1.0.so.0.5000.4
lrwxrwxrwx root/root usr/lib32/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.5000.5
-rwxr-xr-x root/root usr/lib32/libpangoft2-1.0.so.0.5000.5
lrwxrwxrwx root/root usr/lib32/libpangoxft-1.0.so -> libpangoxft-1.0.so.0
lrwxrwxrwx root/root usr/lib32/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.5000.4
-rwxr-xr-x root/root usr/lib32/libpangoxft-1.0.so.0.5000.4
lrwxrwxrwx root/root usr/lib32/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.5000.5
-rwxr-xr-x root/root usr/lib32/libpangoxft-1.0.so.0.5000.5
drwxr-xr-x root/root usr/lib32/pkgconfig/
-rw-r--r-- root/root usr/lib32/pkgconfig/pango.pc
-rw-r--r-- root/root usr/lib32/pkgconfig/pangocairo.pc

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/compat-32.pub
RWSwxGo/zH7eXbDp4f4w0yILoSSd/vsh218S5I8xbd49QK3CEL5VtolqtFVbIp6d7hLgheXsM85ViAamivVOPinsMrL8LC30eAs=
SHA256 (Pkgfile) = dc646cdcd36634b0c59d73973f9723569291dfd9371ce5d2493d24226907011a
SHA256 (.footprint) = c15ef6ce97347ee670ae6190ebb9a20193fda1376492e9d136cff9366020cf0c
SHA256 (pango-1.50.4.tar.xz) = f4ad63e87dc2b145300542a4fb004d07a9f91b34152fae0ddbe50ecdd851c162
RWSwxGo/zH7eXXs0HGe/S5/XUuPT4jgyygHNjmfEAwIdmEt4z7J+fbPMSILgFYWJJIJX7JUBC/7l4JNHGIkNE0TYjzR9fls3qwQ=
SHA256 (Pkgfile) = 32abac45eca9f721d7707c66e3dab4b380515030f8c764cfca5de9eecba5a5cb
SHA256 (.footprint) = bda5b38f10b8e9c9a596eb042d93046ca5b29e3e41b03cba08543a281a32bf1e
SHA256 (pango-1.50.5.tar.xz) = 6d136872da6207fe88c5cd2c95c36bcaf4ed29402b854663a86cd7efe99b0cf5

View File

@ -4,7 +4,7 @@
# Depends on: fribidi-32 harfbuzz-32 pango xorg-libsm-32 xorg-libxft-32
name=pango-32
version=1.50.4
version=1.50.5
release=1
source=(https://download.gnome.org/sources/pango/${version:0:4}/${name%-*}-$version.tar.xz)