[arch-commits] Commit in brltty/trunk (6 files)
David Runge
dvzrv at archlinux.org
Thu Jan 21 00:25:47 UTC 2021
Date: Thursday, January 21, 2021 @ 00:25:33
Author: dvzrv
Revision: 406502
upgpkg: brltty 6.2-2: Rebuild to add more features and upstream integration.
Add optional dracut support.
Build the polkit support and add a patch to fix its installation dir permissions.
Replace the custom sysusers.d and tmpfiles.d integration with upstream's.
Add a patch to use the correct groups in services and sysusers.d integration.
Simplify installation by using the specific install targets and not changing dirs.
Set the default scripts directory to be Arch compliant.
Thanks to Alexander Epaneshnikov for providing patches.
Added:
brltty/trunk/brltty-6.2-polkit_path_permission.patch
brltty/trunk/brltty-6.2-systemd_sysusers_groups.patch
Modified:
brltty/trunk/PKGBUILD
brltty/trunk/brltty.install
Deleted:
brltty/trunk/brltty.sysusers
brltty/trunk/brltty.tmpfiles
------------------------------------------+
PKGBUILD | 34 +++++++++++----------
brltty-6.2-polkit_path_permission.patch | 12 +++++++
brltty-6.2-systemd_sysusers_groups.patch | 46 +++++++++++++++++++++++++++++
brltty.install | 2 -
brltty.sysusers | 1
brltty.tmpfiles | 1
6 files changed, 78 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-01-20 23:39:49 UTC (rev 406501)
+++ PKGBUILD 2021-01-21 00:25:33 UTC (rev 406502)
@@ -6,7 +6,7 @@
pkgname=brltty
pkgver=6.2
-pkgrel=1
+pkgrel=2
pkgdesc="Braille display driver for Linux/Unix"
arch=('x86_64')
url="https://brltty.app"
@@ -14,10 +14,12 @@
depends=('bluez-libs' 'gcc-libs' 'glibc' 'liblouis' 'libspeechd' 'pcre'
'polkit' 'tcl')
makedepends=('alsa-lib' 'at-spi2-atk' 'at-spi2-core' 'atk' 'cython' 'dbus'
-'espeak-ng' 'expat' 'festival' 'glib2' 'gpm' 'icu' 'java-environment' 'libxaw'
-'ncurses' 'ocaml-ctypes' 'ocaml-findlib' 'speech-dispatcher' 'systemd-libs')
+'dracut' 'espeak-ng' 'expat' 'festival' 'glib2' 'gpm' 'icu' 'java-environment'
+'libxaw' 'ncurses' 'ocaml-ctypes' 'ocaml-findlib' 'speech-dispatcher'
+'systemd-libs')
optdepends=('at-spi2-core: X11/GNOME Apps accessibility'
'atk: ATK bridge for X11/GNOME accessibility'
+ 'dracut: for dracut based initramfs support'
'espeak-ng: espeak-ng driver'
'java-runtime: Java support'
'libxaw: X11 support'
@@ -33,17 +35,20 @@
options=('!emptydirs')
install=brltty.install
source=("https://brltty.app/archive/${pkgname}-${pkgver}.tar.bz2"
- "${pkgname}.tmpfiles"
- "${pkgname}.sysusers")
+ "${pkgname}-6.2-polkit_path_permission.patch"
+ "${pkgname}-6.2-systemd_sysusers_groups.patch"
+)
sha512sums=('9cf102e87c082ed4e8a88b08fe4c2c40fde7bf566ba64ba39fbc4e392d639816b4dc176c20713a6ab6aa244de1aecdb80533b21331f01726b86d85d100090a55'
- 'a530fe66983768f9dc544af01c586abc101dfa2ed76885b4f1fd78c483b59e8445f2c0dbbfb865dd1cf2874342c346bd35ce978ab246e9cdd31d2d489a14e770'
- 'cc2e2d5f33d4e11d6ff828aefc0773ccdc02127ce2f00649c1e3f8d4b39b90789f4a0e41385b344f850c38bd4a1df36d3d9d413a59144d431defdd343633f800')
+ '431e54b7b69d5f3cce820a2c6fdef60a4691a5383d449b9cd140a64aec2b38e837697797701e0622be59cdea1c5ccc4385946327b26aff63b9fdb8636c35903d'
+ '32ba91271e2247b4a330cd213ed75b591268cb99a79c2efd9ae675804faee027c6b2f782768cb2329a65fc914ca2400b2901f35ce1fc2522c6691b343799eb02')
b2sums=('6aeeeeea27f5069944bc1822087f3b58948192951d33790d61085917d875bc4041d04f5993171a7559154a5b6eee0633fce510fef040ed5b6f4b00fc9298dfd5'
- '59f50e367d2e6c6704902ebbd254232aa17c741c9a43ba27d0ebaa5fd4a86f62bc8bdd08e8e4562437dea0efa9d49845e40c022b8c4d7110675d81bf63ac4df4'
- 'e6b7453360ef92254ff1049b387c9ee45f3be0e0259c9c3670154938f61ec4142b2de330401d09e1290ed9ffe8e390ede3472dab0e2f4c69b497f9ac19795aad')
+ '6fd79113054c541740834ce7e3aefe779ee5f5c98618c0669cb6412ed09645d1037ac155c3d2c1f65087bb23567c1f4d55add8fc9c63568464d120a30cd6ee2c'
+ '036e36d558594bb06af1eb41ff5fc9ae52ccf4bad54556c3f4f81a5e2f31f574039835e5e756455527c327a73d563a3db54a9f32e3478545a2a22c2725aaeee2')
prepare() {
cd "${pkgname}-${pkgver}"
+ patch -Np1 -i ../"${pkgname}-6.2-polkit_path_permission.patch"
+ patch -Np1 -i ../"${pkgname}-6.2-systemd_sysusers_groups.patch"
./autogen
}
@@ -53,6 +58,7 @@
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/share/man \
+ --with-scripts-directory=/usr/lib/brltty \
--with-tables-directory=/usr/share/brltty \
--with-writable-directory=/run/brltty \
--enable-gpm \
@@ -66,11 +72,9 @@
'libncursesw.so' 'libsystemd.so')
cd "${pkgname}-${pkgver}"
make INSTALL_ROOT="${pkgdir}" install
- make INSTALL_ROOT="${pkgdir}" install -C Autostart/Systemd
- make INSTALL_ROOT="${pkgdir}" install -C Autostart/Udev
+ make INSTALL_ROOT="${pkgdir}" install-systemd
+ make INSTALL_ROOT="${pkgdir}" install-udev
+ make INSTALL_ROOT="${pkgdir}" install-dracut
+ make INSTALL_ROOT="${pkgdir}" install-polkit
install -vDm 644 "Documents/${pkgname}.conf" -t "${pkgdir}/etc/"
- install -vDm 644 "../${pkgname}.sysusers" \
- "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
- install -vDm 644 "../${pkgname}.tmpfiles" \
- "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
}
Added: brltty-6.2-polkit_path_permission.patch
===================================================================
--- brltty-6.2-polkit_path_permission.patch (rev 0)
+++ brltty-6.2-polkit_path_permission.patch 2021-01-21 00:25:33 UTC (rev 406502)
@@ -0,0 +1,12 @@
+diff -ruN a/Authorization/Polkit/Makefile.in b/Authorization/Polkit/Makefile.in
+--- a/Authorization/Polkit/Makefile.in 2020-12-11 23:51:58.000000000 +0100
++++ b/Authorization/Polkit/Makefile.in 2021-01-20 23:49:22.918774464 +0100
+@@ -35,7 +35,7 @@
+ $(INSTALL_DATA) $(SRC_DIR)/actions $(POLKIT_ACTIONS_DIRECTORY)/$(POLKIT_PACKAGE_NAME).$(POLKIT_ACTIONS_EXTENSION)
+
+ install-rules-directory:
+- $(INSTALL_DIRECTORY) $(POLKIT_RULES_DIRECTORY)
++ install -vdm 750 $(POLKIT_RULES_DIRECTORY)
+
+ install-rules: install-rules-directory
+ $(INSTALL_DATA) $(SRC_DIR)/rules $(POLKIT_RULES_DIRECTORY)/$(POLKIT_PACKAGE_NAME).$(POLKIT_RULES_EXTENSION)
Added: brltty-6.2-systemd_sysusers_groups.patch
===================================================================
--- brltty-6.2-systemd_sysusers_groups.patch (rev 0)
+++ brltty-6.2-systemd_sysusers_groups.patch 2021-01-21 00:25:33 UTC (rev 406502)
@@ -0,0 +1,46 @@
+diff -ruN a/Autostart/Systemd/brltty at .service.in b/Autostart/Systemd/brltty at .service.in
+--- a/Autostart/Systemd/brltty at .service.in 2020-12-11 23:51:58.000000000 +0100
++++ b/Autostart/Systemd/brltty at .service.in 2021-01-20 23:57:46.159394660 +0100
+@@ -83,8 +83,8 @@
+
+ # for serial I/O (/dev/ttyS<n>)
+ # probably only one of these should be uncommented
+-SupplementaryGroups=dialout
+-#SupplementaryGroups=uucp
++# SupplementaryGroups=dialout
++SupplementaryGroups=uucp
+
+ # for USB I/o via USBFS (/dev/bus/usb/*/*)
+ SupplementaryGroups=root
+@@ -93,7 +93,7 @@
+ SupplementaryGroups=audio
+
+ # for playing sound via the Pulse Audio daemon
+-SupplementaryGroups=pulse-access
++# SupplementaryGroups=pulse-access
+
+ # for monitoring keyboard input (/dev/input/*)
+ SupplementaryGroups=input
+diff -ruN a/Autostart/Systemd/sysusers b/Autostart/Systemd/sysusers
+--- a/Autostart/Systemd/sysusers 2020-11-29 13:35:32.000000000 +0100
++++ b/Autostart/Systemd/sysusers 2021-01-20 23:58:58.186157113 +0100
+@@ -30,8 +30,8 @@
+
+ # for serial I/O (/dev/ttyS<n>)
+ # probably only one of these should be uncommented
+-m brltty dialout
+-#m brltty uucp
++# m brltty dialout
++m brltty uucp
+
+ # for USB I/o (/dev/bus/usb/*/*)
+ m brltty root
+@@ -40,7 +40,7 @@
+ m brltty audio
+
+ # for playing sound via the Pulse Audio daemon
+-m brltty pulse-access
++# m brltty pulse-access
+
+ # for monitoring keyboard input (/dev/input/*)
+ m brltty input
Modified: brltty.install
===================================================================
--- brltty.install 2021-01-20 23:39:49 UTC (rev 406501)
+++ brltty.install 2021-01-21 00:25:33 UTC (rev 406502)
@@ -1,5 +1,5 @@
post_install () {
- [ ! -e /etc/brlapi.key ] && mcookie -v > /etc/brlapi.key
+ [ ! -e /etc/brlapi.key ] && brltty-genkey
echo "Please add your user to the brlapi group."
}
Deleted: brltty.sysusers
===================================================================
--- brltty.sysusers 2021-01-20 23:39:49 UTC (rev 406501)
+++ brltty.sysusers 2021-01-21 00:25:33 UTC (rev 406502)
@@ -1 +0,0 @@
-g brlapi -
Deleted: brltty.tmpfiles
===================================================================
--- brltty.tmpfiles 2021-01-20 23:39:49 UTC (rev 406501)
+++ brltty.tmpfiles 2021-01-21 00:25:33 UTC (rev 406502)
@@ -1 +0,0 @@
-z /etc/brlapi.key 0640 root brlapi -
More information about the arch-commits
mailing list