diff options
| -rw-r--r-- | main/bluez/APKBUILD | 22 | ||||
| -rw-r--r-- | main/bluez/test-mesh-crypto.patch | 14 |
2 files changed, 25 insertions, 11 deletions
diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD index c872477da42..9dc35feb914 100644 --- a/main/bluez/APKBUILD +++ b/main/bluez/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leo <thinkabit.ukim@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bluez -pkgver=5.55 -pkgrel=2 +pkgver=5.56 +pkgrel=0 pkgdesc="Tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch="all" @@ -16,7 +16,6 @@ subpackages=" $pkgname-dev $pkgname-doc $pkgname-libs - $pkgname-bccmd $pkgname-btmgmt $pkgname-btmon $pkgname-cups @@ -38,6 +37,7 @@ source="https://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz disable-lock-test.patch fix-endianness.patch musl.patch + test-mesh-crypto.patch " case "$CARCH" in @@ -49,6 +49,11 @@ esac # 5.54-r0: # - CVE-2020-0556 +prepare() { + default_prepare + autoreconf -vif +} + build() { ./configure \ --build=$CBUILD \ @@ -85,12 +90,6 @@ package() { install -Dm755 test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent } -bccmd() { - pkgdesc="Bluez utility for the CSR BCCMD interface" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/bccmd "$subpkgdir"/usr/bin/ -} - btmgmt() { pkgdesc="Bluez tool for the Bluetooth Management API" install -Dm755 "$builddir"/tools/btmgmt "$subpkgdir"/usr/bin/btmgmt @@ -155,7 +154,7 @@ zshcomp() { amove usr/share/zsh/site-functions } -sha512sums="9423cb60d15a6f068838497a1eaea9f5a32d70c07191c313ba821a6919d6e0c436ada4f547cc5f2db5eacc0123429ad54851f57df2554f61fa293743ec14a033 bluez-5.55.tar.xz +sha512sums="b320ee9d49a516f5cecb5fbc410ba42e9127f44ebcfb95647f68bd5d300147d0eaf633f8e8d0678631a2184ea3afae7b01b5f228157328874fa2a87832ed0ae1 bluez-5.56.tar.xz fc43c78ed248ea412529eed5ae8bb47bacca9bf5b3b10de121ddd4e792c85893561a88be4aa2c6318106e5d2146a721445152d44fa60ca257ca0b4eb87318c1e bluetooth.initd 8d7b7c8938a2316ce0a855e9bdf1ef8fcdf33d23f4011df828270a088b88b140a19c432e83fef15355d0829e3c86be05b63e7718fef88563254ea239b8dc12ac rfcomm.initd a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd @@ -165,4 +164,5 @@ d5fd1c962bd846eaa6fff879bab85f753eb367d514f82d133b5d3242e1da989af5eddd942c60a87d 42ac04044a8c66e07487598b3a75ef52efc32999ebce4e7c63f6198e2f603f4a1442e74600e43a0938cb4f52d4db0298aa99050b18144b84990cda71748e9de5 004-Move-the-43xx-firmware-into-lib-firmware.patch 04c4889372c8e790bb338dde7ffa76dc32fcf7370025c71b9184fcf17fd01ade4a6613d84d648303af3bbc54043ad489f29fc0cd4679ec8c9029dcb846d7e026 disable-lock-test.patch 118d55183860f395fc4bdc93efffb13902ebf7388cad722b9061cd2860d404333e500af521741c3d92c0f8a161f6810348fbeb6682e49c372383f417aed8c76a fix-endianness.patch -641e425333d269833eed624edec0e29cba04bb0ff6570f6afda178a164fc2bb77456fa88957fe49f36000d3601ac00bb7ba089400977c1577e9c226e74baa3d6 musl.patch" +641e425333d269833eed624edec0e29cba04bb0ff6570f6afda178a164fc2bb77456fa88957fe49f36000d3601ac00bb7ba089400977c1577e9c226e74baa3d6 musl.patch +9c57bb1abf1b4927441a2a25c3c2599b0da82850e6b945d09e824e25be7c7efa99e54999cf5b799a1093303202badf08833cc4ccb36203901dfa516031ea8eb0 test-mesh-crypto.patch" diff --git a/main/bluez/test-mesh-crypto.patch b/main/bluez/test-mesh-crypto.patch new file mode 100644 index 00000000000..90fc2933117 --- /dev/null +++ b/main/bluez/test-mesh-crypto.patch @@ -0,0 +1,14 @@ +Requires kernel option that might not be enabled on the builder +https://bugzilla.kernel.org/show_bug.cgi?id=206815 +diff --git a/Makefile.am b/Makefile.am +index ff0df21..a384c31 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -539,7 +539,6 @@ unit_test_midi_LDADD = src/libshared-glib.la \ + endif + + if MESH +-unit_tests += unit/test-mesh-crypto + unit_test_mesh_crypto_CPPFLAGS = $(ell_cflags) + unit_test_mesh_crypto_SOURCES = unit/test-mesh-crypto.c \ + mesh/crypto.h ell/internal ell/ell.h |