upg bluez libssh qt5-base vulkan-headers
This commit is contained in:
parent
923ad78bdc
commit
04f6e63f08
|
|
@ -8,21 +8,23 @@
|
|||
pkgbase=bluez
|
||||
pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
|
||||
pkgver=5.71
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
url="http://www.bluez.org/"
|
||||
# options=('debug') ### uncomment this to have the debug pkgs produced
|
||||
makedepends=('glibc' 'dbus' 'libical' 'alsa-lib' 'json-c' 'ell' 'python-docutils')
|
||||
source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
|
||||
bluetooth.modprobe)
|
||||
bluetooth.modprobe
|
||||
fix-bluez-5.71-autoconnection.diff)
|
||||
|
||||
#https://gitlab.archlinux.org/archlinux/packaging/packages/bluez/-/issues/2
|
||||
|
||||
# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
|
||||
|
||||
prepare() {
|
||||
# Temporary patch to fix CVE-2023-45866. See https://gitlab.archlinux.org/archlinux/packaging/packages/bluez/-/issues/2
|
||||
cd $pkgname-$pkgver
|
||||
# patch -Np1 <${srcdir}/CVE-2023-45866.patch
|
||||
# fix autoconnection - https://github.com/bluez/bluez/issues/686
|
||||
# https://github.com/tedd-an/bluez-upstream-test/pull/484
|
||||
patch -Np1 -i ../fix-bluez-5.71-autoconnection.diff
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -186,12 +188,13 @@ validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <mar
|
|||
|
||||
sha256sums=(b828d418c93ced1f55b616fb5482cf01537440bfb34fbda1a564f3ece94735d8 # bluez-5.71.tar.xz
|
||||
fde2d20b9ed8d929f8623a0d91d55ab034b3810adb0ae7f592f28ead1852c8db # bluez-5.71.tar.sign
|
||||
46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4) # bluetooth.modprobe
|
||||
46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4 # bluetooth.modprobe
|
||||
7b19092fa09f8b04314cda3e9d14e69ef79bd85bc4f19ca2e15c35ebbb486e48) # fix-bluez-5.71-autoconnection.diff
|
||||
|
||||
## 3f4a75503e7f582ba05455f244383fbe21b5667546e3e886b319d5bf6b6c0f5e bluez-5.71-02-x86_64.pkg.tar.lz
|
||||
## d296953272d8e820a35e2e4499d42a858e2dfc78ce3dc1a57f1fd4b6001b63cf bluez-cups-5.71-02-x86_64.pkg.tar.lz
|
||||
## 7a82f635c1e63cff8dd84570b604b22d7e2099ebb144cbbd8dba3ce124cca751 bluez-hid2hci-5.71-02-x86_64.pkg.tar.lz
|
||||
## f284abf9db55f528fa232ad8fe901ba917fa6c592c644bca985c37e6f82b8dd3 bluez-libs-5.71-02-x86_64.pkg.tar.lz
|
||||
## c1d73097db8fbc077591542b01f3164877cd6f579f538a5d4b18e47da504fca2 bluez-plugins-5.71-02-x86_64.pkg.tar.lz
|
||||
## 9c0920a1ca14db4a903eb49382b076eea0319a53a41ea06af30b8761d6c2ab83 bluez-utils-5.71-02-x86_64.pkg.tar.lz
|
||||
|
||||
## 16e21244791c35ed75794c929b9ec07b67d6eb2adbb9c8ce621d353c34fdef3e bluez-5.71-01-x86_64.pkg.tar.lz
|
||||
## df936e22dd9a602090a770d44947301ce322d1a09af368bf425ff585d9710764 bluez-cups-5.71-01-x86_64.pkg.tar.lz
|
||||
## 6d462a3257291387a99386fda98bd7e0a93f516a1fb3262baf618e1e8dd1f2b8 bluez-hid2hci-5.71-01-x86_64.pkg.tar.lz
|
||||
## b337ae08e6dc274ba1eb5c03cd5433d63678864cac53622b81ae9afabd6262be bluez-libs-5.71-01-x86_64.pkg.tar.lz
|
||||
## 585d6de3b385d18b8159de63e599e87cf6ccbd1e6ec947bcb23df3e9feefef98 bluez-plugins-5.71-01-x86_64.pkg.tar.lz
|
||||
## 37d1a09909423adc12b8e42a1386a6255c7b5212c703daa8a5499994e32b1514 bluez-utils-5.71-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -7,19 +7,28 @@
|
|||
pkgbase=bluez
|
||||
pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
|
||||
pkgver=5.71
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
url="http://www.bluez.org/"
|
||||
arch=('x86_64')
|
||||
license=('GPL2')
|
||||
makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'json-c' 'ell' 'python-docutils')
|
||||
source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
|
||||
bluetooth.modprobe)
|
||||
bluetooth.modprobe
|
||||
fix-bluez-5.71-autoconnection.diff)
|
||||
# see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
|
||||
sha256sums=('b828d418c93ced1f55b616fb5482cf01537440bfb34fbda1a564f3ece94735d8'
|
||||
'SKIP'
|
||||
'46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
|
||||
'46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
|
||||
'7b19092fa09f8b04314cda3e9d14e69ef79bd85bc4f19ca2e15c35ebbb486e48')
|
||||
validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel@holtmann.org>
|
||||
|
||||
prepare() {
|
||||
cd "${pkgname}"-${pkgver}
|
||||
# fix autoconnection - https://github.com/bluez/bluez/issues/686
|
||||
# https://github.com/tedd-an/bluez-upstream-test/pull/484
|
||||
patch -Np1 -i ../fix-bluez-5.71-autoconnection.diff
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${pkgname}"-${pkgver}
|
||||
./configure \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
From 0fb7ed8e5ac95c3deb4e10c9dcf1bacf74243646 Mon Sep 17 00:00:00 2001
|
||||
From: Xiao Yao <xiaoyao@rock-chips.com>
|
||||
Date: Sun, 17 Dec 2023 21:50:12 +0800
|
||||
Subject: [PATCH] adapter: Fix link key address type for old kernels
|
||||
|
||||
Fixes: https://github.com/bluez/bluez/issues/686
|
||||
|
||||
Signed-off-by: Xiao Yao <xiaoyao@rock-chips.com>
|
||||
---
|
||||
src/adapter.c | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/adapter.c b/src/adapter.c
|
||||
index ee70b00d2..b4628a411 100644
|
||||
--- a/src/adapter.c
|
||||
+++ b/src/adapter.c
|
||||
@@ -4347,7 +4347,17 @@ static void load_link_keys(struct btd_adapter *adapter, GSList *keys,
|
||||
struct link_key_info *info = l->data;
|
||||
|
||||
bacpy(&key->addr.bdaddr, &info->bdaddr);
|
||||
- key->addr.type = info->bdaddr_type;
|
||||
+
|
||||
+ /*
|
||||
+ * According to the Bluetooth specification, the address
|
||||
+ * type of the link key is not fixed. However, the
|
||||
+ * load_link_keys function in the old kernel code requires
|
||||
+ * that the address type must be BREDR. Since the address
|
||||
+ * type is not actually used by the link key, to maintain
|
||||
+ * compatibility with older kernel versions, the addr.type
|
||||
+ * of the link key is set to BDADDR_BREDR.
|
||||
+ */
|
||||
+ key->addr.type = BDADDR_BREDR;
|
||||
key->type = info->type;
|
||||
memcpy(key->val, info->key, 16);
|
||||
key->pin_len = info->pin_len;
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
#pkgbase=libssh
|
||||
#pkgname=(libssh libssh-docs)
|
||||
pkgname=libssh
|
||||
pkgver=0.10.5
|
||||
pkgver=0.10.6
|
||||
pkgrel=01
|
||||
pkgdesc='Library for accessing ssh client services through C libraries'
|
||||
url='https://www.libssh.org/'
|
||||
|
|
@ -54,8 +54,8 @@ license=(LGPL)
|
|||
|
||||
validpgpkeys=(8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D) # Andreas Schneider <asn@cryptomilk.org>
|
||||
|
||||
sha256sums=(b60e2ff7f367b9eee2b5634d3a63303ddfede0e6a18dfca88c44a8770e7e4234 # libssh-0.10.4.tar.xz
|
||||
cc5427ac9480b30f87f7c3c2dca1830c1e7fe3c18503da2c07d4110150916c66) # libssh-0.10.5.tar.xz.asc
|
||||
sha256sums=(1861d498f5b6f1741b6abc73e608478491edcf9c9d4b6630eef6e74596de9dc1 # libssh-0.10.6.tar.xz
|
||||
140420406d7796548b0beaf736e73864c32291787cf2bd3983fdbc41741494ae) # libssh-0.10.6.tar.xz.asc
|
||||
|
||||
## 5a5cbdcfbdbffefd09771867f99a0028e8297b489bab90cba180b33652606827 libssh-0.10.5-01-x86_64.pkg.tar.lz
|
||||
## 5efa3d0469bd5ad48d653917bec68c31d513ef4d4679000169a3e42d48a61587 libssh-0.10.6-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -5,18 +5,25 @@
|
|||
# Contributor: sergeantspoon <sergeantspoon@archlinux.us>
|
||||
|
||||
pkgbase=libssh
|
||||
pkgname=(libssh libssh-docs)
|
||||
pkgver=0.10.5
|
||||
pkgname=(libssh
|
||||
libssh-docs)
|
||||
pkgver=0.10.6
|
||||
pkgrel=1
|
||||
pkgdesc='Library for accessing ssh client services through C libraries'
|
||||
url='https://www.libssh.org/'
|
||||
license=(LGPL)
|
||||
arch=(x86_64)
|
||||
depends=(zlib openssl)
|
||||
makedepends=(cmake cmocka doxygen python openssh)
|
||||
depends=(glibc
|
||||
openssl
|
||||
zlib)
|
||||
makedepends=(cmake
|
||||
cmocka
|
||||
doxygen
|
||||
openssh
|
||||
python)
|
||||
provides=(libssh.so)
|
||||
source=("https://www.libssh.org/files/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.asc})
|
||||
sha256sums=('b60e2ff7f367b9eee2b5634d3a63303ddfede0e6a18dfca88c44a8770e7e4234'
|
||||
sha256sums=('1861d498f5b6f1741b6abc73e608478491edcf9c9d4b6630eef6e74596de9dc1'
|
||||
'SKIP')
|
||||
validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn@cryptomilk.org>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
pkgbase=qt5-base
|
||||
pkgname=(qt5-base qt5-xcb-private-headers)
|
||||
_basever=5.15.11
|
||||
pkgver=5.15.11+kde+r147
|
||||
_commit=56faf7249c3857f80f6483c5070e7408c2d53961
|
||||
pkgrel=02
|
||||
pkgver=5.15.11+kde+r148
|
||||
_commit=2ddd05e762c1ce382db0bdacfe2bd754ad173815
|
||||
pkgrel=01
|
||||
url='https://www.qt.io'
|
||||
pkgdesc='A cross-platform application and UI framework w/o systemd'
|
||||
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig' 'xdg-utils'
|
||||
|
|
@ -129,7 +129,6 @@ sha256sums=(SKIP
|
|||
5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qmake-cflags.patch
|
||||
4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch
|
||||
|
||||
## 520d1760b88724bb8b6caced8b374c02bebbd5cbde0eb41c1974314859ee8c23 qt5-base-5.15.11+kde+r147-02-x86_64.pkg.tar.lz
|
||||
## 4cb6f4db288b43dd0609bd07cb9c11a4c1872805f33e5737545595cb798e2e30 qt5-xcb-private-headers-5.15.11+kde+r147-02-x86_64.pkg.tar.lz
|
||||
|
||||
## 865746b039c1933a5db101dce417ceff421a9283ffa6a1a08996a698b2dfce96 qt5-base-5.15.11+kde+r148-01-x86_64.pkg.tar.lz
|
||||
## 59b28efa7227072fa720ba31ca3c5f23a7c0fee9ee1325414124cc53592a75c5 qt5-xcb-private-headers-5.15.11+kde+r148-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
pkgbase=qt5-base
|
||||
pkgname=(qt5-base qt5-xcb-private-headers)
|
||||
_basever=5.15.11
|
||||
pkgver=5.15.11+kde+r147
|
||||
pkgrel=2
|
||||
_commit=56faf7249c3857f80f6483c5070e7408c2d53961
|
||||
pkgver=5.15.11+kde+r148
|
||||
pkgrel=1
|
||||
_commit=2ddd05e762c1ce382db0bdacfe2bd754ad173815
|
||||
arch=('x86_64')
|
||||
url='https://www.qt.io'
|
||||
license=('GPL3' 'LGPL3' 'FDL' 'custom')
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ gtk3
|
|||
libpulse
|
||||
cups
|
||||
freetds
|
||||
vulkan-headers
|
||||
git
|
||||
graphite
|
||||
vulkan-headers
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=vulkan-headers
|
||||
_pkgname=Vulkan-Headers
|
||||
pkgver=1.3.269
|
||||
pkgver=1.3.273
|
||||
pkgrel=01
|
||||
epoch=1
|
||||
pkgdesc="Vulkan header files"
|
||||
|
|
@ -39,6 +39,7 @@ arch=(x86_64)
|
|||
|
||||
license=('APACHE')
|
||||
|
||||
sha256sums=(1637f36a023bd148315f66efb7974861adf22cd1f6d690bdf00ee15ce91d5367) # vulkan-headers-1.3.264.tar.gz
|
||||
sha256sums=(b46c77265a0b0f235a3df755742bab273fe2083ddd52b2134e8f4c7ad3154a43) # vulkan-headers-1.3.273.tar.gz
|
||||
|
||||
## 788a253fdffd28637ccd27ff2fa15be9ed955aae5333929e329830bd6d11b18c vulkan-headers-1_1.3.269-01-x86_64.pkg.tar.lz
|
||||
## dda9d2bc569e5bbda181852593f12a257d48653cb807fda465c636b66974ba17 vulkan-headers-1_1.3.273-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
pkgname=vulkan-headers
|
||||
_pkgname=Vulkan-Headers
|
||||
pkgver=1.3.269
|
||||
pkgver=1.3.273
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="Vulkan header files"
|
||||
|
|
@ -13,7 +13,7 @@ makedepends=(cmake git)
|
|||
provides=("vulkan-hpp=${pkgver}")
|
||||
groups=(vulkan-devel)
|
||||
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Headers/archive/v${pkgver}.tar.gz")
|
||||
sha256sums=('1637f36a023bd148315f66efb7974861adf22cd1f6d690bdf00ee15ce91d5367')
|
||||
sha256sums=('b46c77265a0b0f235a3df755742bab273fe2083ddd52b2134e8f4c7ad3154a43')
|
||||
|
||||
build() {
|
||||
cd Vulkan-Headers*
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
real 0m8.285s
|
||||
user 0m7.864s
|
||||
sys 0m0.578s
|
||||
real 0m14.901s
|
||||
user 0m9.392s
|
||||
sys 0m1.440s
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue