From cd666f393bbe617e4f9e3253e3b6c3de62019ead Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 9 Mar 2024 23:28:09 +0100 Subject: [PATCH] bluez: 5.72 -> 5.73 --- bluez/.footprint | 19 +++--- bluez/.signature | 9 ++- bluez/Pkgfile | 12 ++-- .../bluez-5.72-obexd_without_systemd-1.patch | 63 ------------------- 4 files changed, 21 insertions(+), 82 deletions(-) delete mode 100644 bluez/bluez-5.72-obexd_without_systemd-1.patch diff --git a/bluez/.footprint b/bluez/.footprint index 5402d9493..695a7f229 100644 --- a/bluez/.footprint +++ b/bluez/.footprint @@ -1,6 +1,8 @@ drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/bluetooth/ +dr-xr-xr-x root/root etc/bluetooth/ +-rw-r--r-- root/root etc/bluetooth/input.conf -rw-r--r-- root/root etc/bluetooth/main.conf +-rw-r--r-- root/root etc/bluetooth/network.conf drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/bluetoothd drwxr-xr-x root/root lib/ @@ -36,16 +38,19 @@ drwxr-xr-x root/root usr/include/bluetooth/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/bluetooth/ -rwxr-xr-x root/root usr/lib/bluetooth/bluetoothd +drwxr-xr-x root/root usr/lib/cups/ +drwxr-xr-x root/root usr/lib/cups/backend/ +-rwxr-xr-x root/root usr/lib/cups/backend/bluetooth -rwxr-xr-x root/root usr/lib/libbluetooth.la -lrwxrwxrwx root/root usr/lib/libbluetooth.so -> libbluetooth.so.3.19.12 -lrwxrwxrwx root/root usr/lib/libbluetooth.so.3 -> libbluetooth.so.3.19.12 --rwxr-xr-x root/root usr/lib/libbluetooth.so.3.19.12 +lrwxrwxrwx root/root usr/lib/libbluetooth.so -> libbluetooth.so.3.19.13 +lrwxrwxrwx root/root usr/lib/libbluetooth.so.3 -> libbluetooth.so.3.19.13 +-rwxr-xr-x root/root usr/lib/libbluetooth.so.3.19.13 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/bluez.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/dbus-1/ drwxr-xr-x root/root usr/share/dbus-1/system.d/ -rw-r--r-- root/root usr/share/dbus-1/system.d/bluetooth.conf -drwxr-xr-x root/root usr/share/zsh/ -drwxr-xr-x root/root usr/share/zsh/site-functions/ --rw-r--r-- root/root usr/share/zsh/site-functions/_bluetoothctl +drwxr-xr-x root/root var/ +drwxr-xr-x root/root var/lib/ +drwx------ root/root var/lib/bluetooth/ diff --git a/bluez/.signature b/bluez/.signature index 37f014cf2..e6cdbb323 100644 --- a/bluez/.signature +++ b/bluez/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31RUo5FSzKmwoSw2UcTHUs1fYTtTgLnEROpwF1uwfVkeymuv9PiprrJs+zb6Qq5479T8CiueRyU3N/Y2dWWECgQ= -SHA256 (Pkgfile) = 4ec8fc2535f33ed80f75c7219c27c84ae819a308ed3b21880d430287e1111055 -SHA256 (.footprint) = 79d2df97507a2bb0d5c4c2a7d36eac2d60214acaf1099fdcc11180d9e2550f0a -SHA256 (bluez-5.72.tar.xz) = 499d7fa345a996c1bb650f5c6749e1d929111fa6ece0be0e98687fee6124536e +RWSagIOpLGJF30ZJOD6HTeKhZMqBr3FmTU3JEP30ZOV1eBg1ze0Jov2YVECXwcJ2YKLTrT7cjR7YQfjrwBpVdmAtjiNZy9979g8= +SHA256 (Pkgfile) = 48ebdb4e74f6162e4d57dc31cf7425ccb2a24831c760194e918a4019d8916b2c +SHA256 (.footprint) = f1d240c32833d52bd8ff762a4d64d474ef32c50f3724e5537e7d7195273a99c5 +SHA256 (bluez-5.73.tar.xz) = 257e9075ce05c70d48c5defd254e78c418416f7584b45f9dddc884ff88e3fc53 SHA256 (bluetoothd.service) = ab562292d8e226cc1ec809002c39fa99a7813a4157fabbbbe4fd77fc095ab83b -SHA256 (bluez-5.72-obexd_without_systemd-1.patch) = 6d97c8cfd7d8ce42a7edfe67dac5f0d4551d290b815226024c55afe8201538d2 diff --git a/bluez/Pkgfile b/bluez/Pkgfile index 3ef4429a5..a73a072f2 100644 --- a/bluez/Pkgfile +++ b/bluez/Pkgfile @@ -5,19 +5,16 @@ # Optional: alsa-lib cups docutils json-c libical name=bluez -version=5.72 -release=2 +version=5.73 +release=1 source=(https://mirrors.edge.kernel.org/pub/linux/bluetooth/bluez-$version.tar.xz - bluetoothd.service - bluez-5.72-obexd_without_systemd-1.patch) + bluetoothd.service) build() { cd bluez-$version - patch -Np1 -i $SRC/bluez-5.72-obexd_without_systemd-1.patch - prt-get isinst alsa-lib && PKGMK_BLUEZ+=' --enable-midi' - prt-get isinst cups && PKGMK_BLUEZ+=' --enable-cups' || PKGMK_BLUEZ+=' --disable-cups' + #prt-get isinst cups || PKGMK_BLUEZ+=' --disable-cups' prt-get isinst docutils || PKGMK_BLUEZ+=' --disable-manpages' prt-get isinst json-c && PKGMK_BLUEZ+=' --enable-mesh' prt-get isinst libical && PKGMK_BLUEZ+=' --enable-obex' || PKGMK_BLUEZ+=' --disable-obex' @@ -33,6 +30,7 @@ build() { make DESTDIR=$PKG install prt-get isinst libical && install -D -m 0755 tools/obexctl $PKG/usr/lib/bluetooth/obexctl + prt-get isinst zsh || rm -rf $PKG/usr/share/zsh install -D -m 0644 src/main.conf $PKG/etc/bluetooth/main.conf install -D -m 0755 $SRC/bluetoothd.service $PKG/etc/rc.d/bluetoothd diff --git a/bluez/bluez-5.72-obexd_without_systemd-1.patch b/bluez/bluez-5.72-obexd_without_systemd-1.patch deleted file mode 100644 index f4e9d59aa..000000000 --- a/bluez/bluez-5.72-obexd_without_systemd-1.patch +++ /dev/null @@ -1,63 +0,0 @@ -Submitted By: Armin K. -Date: 2013-04-29 -Initial Package Version: 5.17 -Upstream Status: unknown -Origin: Arch Linux (Giovanni Campagna) -Description: Allow using obexd without systemd in the user session - -Not all sessions run systemd --user (actually, the majority -doesn't), so the dbus daemon must be able to spawn obexd -directly, and to do so it needs the full path of the daemon. - -Updated for bluez-5.60 on 2021-08-17 ---- - Makefile.obexd | 4 ++-- - obexd/src/org.bluez.obex.service | 4 ---- - obexd/src/org.bluez.obex.service.in | 4 ++++ - 3 files changed, 6 insertions(+), 6 deletions(-) - delete mode 100644 obexd/src/org.bluez.obex.service - create mode 100644 obexd/src/org.bluez.obex.service.in - -diff --git a/Makefile.obexd b/Makefile.obexd -index 3760867..142e7c3 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -2,12 +2,12 @@ - if SYSTEMD - systemduserunitdir = $(SYSTEMD_USERUNITDIR) - systemduserunit_DATA = obexd/src/obex.service -+endif - - dbussessionbusdir = $(DBUS_SESSIONBUSDIR) - dbussessionbus_DATA = obexd/src/org.bluez.obex.service --endif - --EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service -+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in - - obex_plugindir = $(libdir)/obex/plugins - -diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service -deleted file mode 100644 -index a538088..0000000 ---- a/obexd/src/org.bluez.obex.service -+++ /dev/null -@@ -1,4 +0,0 @@ --[D-BUS Service] --Name=org.bluez.obex --Exec=/bin/false --SystemdService=dbus-org.bluez.obex.service -diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in -new file mode 100644 -index 0000000..9c815f2 ---- /dev/null -+++ b/obexd/src/org.bluez.obex.service.in -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@libexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service --- -1.8.3.1 - -