From d77a1260a2dc01009548f1ed225235b1d767d591 Mon Sep 17 00:00:00 2001 From: Tyler Swagar Date: May 16 2022 18:22:23 +0000 Subject: [PATCH 1/6] updpkg: nonsystemd/elogind 246.10-1 --- diff --git a/nonsystemd/elogind/PKGBUILD b/nonsystemd/elogind/PKGBUILD index cf3e8cf..ee13812 100644 --- a/nonsystemd/elogind/PKGBUILD +++ b/nonsystemd/elogind/PKGBUILD @@ -6,6 +6,7 @@ # This package comes from Artix # Parabola changes: # - elogind and libelogind: do not provide {lib,}elogind=$pkgver, it's ridiculous +# - elogind: do not provide systemd-tools, openrc will conflict it # - libelogind: make libsystemd.so a copy of libelogind.so instead of linking it, # so in that way it will provide the correct version according to the # architecture (libsystemd.so=0-64 or libsystemd.so=0-32) @@ -14,20 +15,20 @@ pkgbase=elogind pkgname=('elogind' 'libelogind') pkgver=246.10 -pkgrel=2 +pkgrel=1 pkgdesc="The systemd project's logind, extracted to a standalone package" -arch=('x86_64') -arch+=('i686' 'armv7h') +arch=('x86_64' 'i686' 'armv7h') url="https://github.com/elogind/elogind" license=('GPL' 'LGPL2.1') -makedepends=('acl' 'intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit' 'dbus' - 'libseccomp' 'meson' 'kexec-tools' 'openrc' 'libcap') +conflicts=('systemd-libsystemd') +makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit' 'dbus' + 'libseccomp' 'meson' 'kexec-tools' 'openrc') options=('!libtool') source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz" - #'elogind.confd' 'elogind.initd' - 'elogind.sv.initd') + 'elogind.confd' 'elogind.initd') sha256sums=('c490dc158c8f5bca8d00ecfcc7ad5af24d1c7b9e59990a0b3b1323996221a922' - 'b4097e85f81f37d8529eb57563813e94b7c7afb9931d892907d805093187761b') + '344db76bf8aadfba4363c63aacd93c945a647bd5e425d756cbfd9cb4453afc66' + '2fc375b3aa61cb63b16c55840acaa69d26b16a01d393ee129d77c804efdac278') build() { local meson_options=( @@ -38,7 +39,6 @@ build() { -Ddefault-hierarchy=hybrid -Dcgroup-controller=openrc -Ddefault-kill-user-processes=false - -Dman=true ) arch-meson "$pkgbase-${pkgver}" build "${meson_options[@]}" @@ -52,46 +52,44 @@ check(){ package_elogind() { pkgdesc="The systemd project's logind, extracted to a standalone package" - provides=("systemd=${pkgver}" 'logind') - depends=('acl' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev') + provides=("systemd=${pkgver}") + depends=('pam' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev') optdepends=('polkit: polkit support') backup=('etc/elogind/logind.conf') provides+=("${pkgname}-openrc") - conflicts=('systemd-udev' "${pkgname}-openrc") + conflicts+=('systemd-udev' "${pkgname}-openrc") replaces=("${pkgname}-openrc") DESTDIR="$pkgdir" meson install -C build - ln -sfv libelogind.pc "${pkgdir}"/usr/lib/pkgconfig/libsystemd.pc + ln -sfv libelogind.pc ${pkgdir}/usr/lib/pkgconfig/libsystemd.pc - install -dm755 "${srcdir}"/_libelogind - mv -v "${pkgdir}"/usr/lib/libelogind*.so* "${srcdir}"/_libelogind + install -dm755 ${srcdir}/_libelogind + mv -v ${pkgdir}/usr/lib/libelogind*.so* ${srcdir}/_libelogind - install -d "${pkgdir}"/{etc,usr/lib}/elogind/{logind,sleep}.conf.d + # Init scripts + install -Dm755 ${srcdir}/elogind.initd ${pkgdir}/etc/init.d/elogind + install -Dm755 ${srcdir}/elogind.confd ${pkgdir}/etc/conf.d/elogind - # Init script - #install -Dm755 "${srcdir}"/elogind.initd "${pkgdir}"/etc/init.d/elogind - #install -Dm755 "${srcdir}"/elogind.confd "${pkgdir}"/etc/conf.d/elogind - install -Dm755 "${srcdir}"/elogind.sv.initd "${pkgdir}"/etc/init.d/elogind - - install -d "${pkgdir}"/etc/runlevels/boot - ln -sf /etc/init.d/elogind "${pkgdir}"/etc/runlevels/boot/elogind + install -d "${pkgdir}/etc/runlevels/boot" + ln -sf "/etc/init.d/elogind" "${pkgdir}/etc/runlevels/boot/elogind" } package_libelogind(){ pkgdesc="elogind client libraries" - provides=('libelogind.so' 'liblogind') - provides+=("libsystemd=${pkgver}" "systemd-libs=${pkgver}" + groups=('base-devel') + provides=('libelogind.so' + "libsystemd=${pkgver}" "systemd-libs=${pkgver}" 'libsystemd.so') - conflicts=('libsystemd.so') + conflicts+=('libsystemd.so') depends=('libcap' 'libudev') - cd "${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} - install -dm755 "${pkgdir}"/usr/lib - mv "${srcdir}"/_libelogind/libelogind*.so* "${pkgdir}"/usr/lib + install -dm755 ${pkgdir}/usr/lib + mv ${srcdir}/_libelogind/libelogind*.so* ${pkgdir}/usr/lib - install -m755 "${pkgdir}"/usr/lib/libelogind.so "${pkgdir}"/usr/lib/libsystemd.so - ln -sfv libsystemd.so "${pkgdir}"/usr/lib/libsystemd.so.0 + install -m755 ${pkgdir}/usr/lib/libelogind.so ${pkgdir}/usr/lib/libsystemd.so + ln -sfv libsystemd.so ${pkgdir}/usr/lib/libsystemd.so.0 } From 6704c83f90a33993a46c8ae8809d74905fccf5e7 Mon Sep 17 00:00:00 2001 From: Tyler Swagar Date: May 16 2022 18:22:23 +0000 Subject: [PATCH 2/6] updpkg: nonsystemd/openrc 0.43.3-1 --- diff --git a/nonsystemd/openrc/PKGBUILD b/nonsystemd/openrc/PKGBUILD index 7de97f7..eb0b0d2 100644 --- a/nonsystemd/openrc/PKGBUILD +++ b/nonsystemd/openrc/PKGBUILD @@ -9,42 +9,28 @@ pkgbase=openrc pkgname=('openrc' 'openrc-bash-completions' 'openrc-zsh-completions' 'openrc-init' 'openrc-sysvinit' 'openrc-net') -pkgver=0.42.1 -pkgrel=7 +pkgver=0.43.3 +pkgrel=1 pkgdesc="Gentoo's universal init system" arch=('x86_64' 'i686' 'armv7h') url="https://github.com/OpenRC/openrc" license=('BSD2') source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz" - "revert.patch::${url}/commit/1801561c2d36c330df7fd02c7508f503a61ff5ba.patch" "${pkgbase}.logrotate" 'openrc-hook' '30-openrc-upgrade.hook' '30-sysctl.hook' 'sysctl.conf' '30-binfmt.hook' - 'kmod-static-nodes.initd' - gcc-10-fix.patch::${url}/commit/375ef42393f3dc6edbaa2cb70c79b2366072db38.patch - supervise-daemon-fix.patch::${url}/commit/6deda13754f1b60245945e953cce8d97e40e86fc.patch - openrc-shutdown-fix.patch::${url}/commit/fd852865e06a74ecf8b77ff534fa8053e020160f.patch - posix-compliant-grep.patch::${url}/commit/a7e7fd2b37a7666f26c2d4de9386b2d04f583b41.patch - binfmt-fix.patch::${url}/commit/eb610859519292c6164c4ba601d22e642c306beb.patch - cgroup2-verify.patch::${url}/commit/87cfad3d6cd619c6090e8209092448ae68279b0c.patch) -sha256sums=('91a01ca6d930a0688fb91338209985de57cac7aa2d37feddacb78fd3d95308e2' - '5211012d0e1bdfc1a32113cee5a2eec3a2be4b3549f88216cdecbadd6ca46d81' + 'kmod-static-nodes.initd') +sha256sums=('968e81743a1de7a2348590b3b3286d6af5baf96da28fa1e6364e24f8203fc3b6' '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c' '7de1e65f48ba31fc015cfb77be167b41aabdf0f20cb6617ecf3f4c3ca434c9e8' 'a3fda2186e023ae60c0e0d3806ffeb95effe675acea03cdfd0bf30e8f1c188d4' '28ec075d30096bd54499e994f76f8526460474f1e4c33607045c1a71b0684263' '860d5b9ae60e13633bd94023c222fa1ef918a02db3ce2e3255cdd6bb9eef047e' '28aa413fd78bca98bb23294eeb3f49149825a2c2f97a7ee10039385f5e8e50e9' - '3ecbe7761b92a123a5a3d395ec3d9e090b0dfba7910a5987b4a2298c20a7e571' - 'addb1bf115b811fba3d120f5c68535ec07f32a55e570b661f1e5575f74327bac' - '654dada5ffe56d6ae10d0ea4f9cb62c8c6c39a5398cd02561419a8bbf3f686b7' - '5576a8b6c9fbe79ede027ed053f922da60d1cbe818803677f5aa5532f98ffac4' - '46f6e809aabb629212a739af7f5177930e9c4a7f2adfdfc59911d778d3716ec9' - '7e5d7dc888327ef99637fa7207ac9470d72cc37198ddd7ba2cdf72d10a1c7031' - '41c6598da76bcdcdc8d9349f559bc6b587a6f6dec55bf7c79669af2b28af43e1') + '3ecbe7761b92a123a5a3d395ec3d9e090b0dfba7910a5987b4a2298c20a7e571') _args=( BRANDING='Parabola GNU/Linux-libre' @@ -64,15 +50,6 @@ _args=( prepare(){ cd "${srcdir}/${pkgbase}-${pkgver}" sed -i 's:0444:0644:' mk/sys.mk - patch -Np 1 -i ../gcc-10-fix.patch - patch -Np 1 -i ../supervise-daemon-fix.patch - patch -Np 1 -i ../openrc-shutdown-fix.patch - patch -Np 1 -i ../posix-compliant-grep.patch - patch -Np 1 -i ../binfmt-fix.patch - patch -Np 1 -i ../cgroup2-verify.patch - - # make bootmisc work with sysvinit too - patch -RNp1 -i ../revert.patch } check(){ From 86f9ebd92f56f5989492d4eb512432c456581fbf Mon Sep 17 00:00:00 2001 From: Tyler Swagar Date: May 16 2022 18:22:23 +0000 Subject: [PATCH 3/6] updpkg: nonsystemd/networkmanager 1.30.4-3.nonsystemd1 --- diff --git a/nonsystemd/networkmanager/PKGBUILD b/nonsystemd/networkmanager/PKGBUILD index dc667e6..72d9a3e 100644 --- a/nonsystemd/networkmanager/PKGBUILD +++ b/nonsystemd/networkmanager/PKGBUILD @@ -7,29 +7,27 @@ # Contributor (Arch): Valentine Sinitsyn pkgbase=networkmanager -pkgname=(networkmanager libnm nm-cloud-setup) -pkgver=1.32.2 -pkgrel=1 +pkgname=(networkmanager libnm) +pkgver=1.30.4 +pkgrel=3 pkgrel+=.nonsystemd1 pkgdesc="Network connection manager and user applications" url="https://wiki.gnome.org/Projects/NetworkManager" -arch=(x86_64) -arch+=(i686 armv7h) -license=(GPL2) +arch=(x86_64 i686 armv7h) +license=(GPL2 LGPL2.1) _pppver=2.4.9 -makedepends=(intltool dhclient dhcpcd iptables-nft gobject-introspection gtk-doc - "ppp=$_pppver" modemmanager iproute2 nss polkit wpa_supplicant curl - logind libmm-glib libnewt libndp libteam nftables vala perl-yaml - python-gobject git vala jansson bluez-libs glib2-docs iwd dnsmasq - openresolv libpsl audit meson) +makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager + iproute2 nss polkit wpa_supplicant curl elogind libmm-glib + libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs + glib2-docs dhcpcd iwd dnsmasq openresolv libpsl audit meson) checkdepends=(libx11 python-dbus) -_commit=bf1b09702ed442a3efe426c8ceba4ef1e6bb1902 # tags/1.20.6^0 +_commit=a3e45da9f984d58e3b76d6ca064033541d819eca # tags/1.30.4^0 source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit" NetworkManager.{confd,initd} 10-openrc-status) sha256sums=('SKIP' '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd' - 'eaf7d210540ed9f4c6b4ba81ddbb30a2aa5ce8b528057f7d64ce3478981f88e4' - 'd32a21c0683cf7a09370b35b7e3d3b3f28f5d4d242ecde2c866cfb400b94bcbe') + '861445d46e8863dca26a91018da3dd9fee6a64467a93e7512774dfd88914539d' + '1535237db113a76261d6f1ce0b24a55e956934b0c1c59e9fd624f621961327b6') pkgver() { cd NetworkManager @@ -38,53 +36,44 @@ pkgver() { prepare() { cd NetworkManager + + # https://bugs.archlinux.org/task/70710 + git cherry-pick -n 8acad5a20cc61081438294efc634c0e245452e35 } build() { local meson_args=( - # system paths -D dbus_conf_dir=/usr/share/dbus-1/system.d - - # platform -D dist_version="$pkgver-$pkgrel" -D session_tracking_consolekit=false -D suspend_resume=elogind -D modify_system=true -D polkit_agent=true -D selinux=false - -D systemdsystemunitdir=no - -D session_tracking=elogind - -D systemd_journal=false - - # features -D iwd=true -D pppd_plugin_dir=/usr/lib/pppd/$_pppver -D teamdctl=true - -D nm_cloud_setup=true -D bluez5_dun=true -D ebpf=true - - # configuration plugins -D config_plugins_default=keyfile - - # handlers for resolv.conf - -D netconfig=no - -D config_dns_rc_manager_default=symlink - - # miscellaneous -D vapi=true -D docs=true -D more_asserts=no -D more_logging=false -D qt=false + -D systemdsystemunitdir=no + -D session_tracking=elogind + -D systemd_journal=false ) arch-meson NetworkManager build "${meson_args[@]}" - meson compile -C build + ninja -C build } check() { - meson test -C build --print-errorlogs + # iproute2 bug + # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/be76d8b624fab99cbd76092ff511e6adc305279c + meson test -C build --print-errorlogs || : } _pick() { @@ -99,77 +88,58 @@ _pick() { package_networkmanager() { depends=(libnm iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl - bluez-libs libpsl audit mobile-broadband-provider-info elogind) + bluez-libs libpsl audit elogind) optdepends=('dnsmasq: connection sharing' - 'nftables: connection sharing' - 'iptables: connection sharing' 'bluez: Bluetooth support' 'ppp: dialup connection support' 'modemmanager: cellular network support' - 'iwd: wpa_supplicant alternative' - 'dhclient: alternative DHCP client' - 'dhcpcd: alternative DHCP client' - 'openresolv: alternative resolv.conf manager' - 'firewalld: firewall support') + 'iwd: wpa_supplicant alternative') provides=($pkgname-{elogind,openrc}) replaces=($pkgname-{elogind,openrc}) backup=(etc/NetworkManager/NetworkManager.conf) + groups=(gnome) - meson install -C build --destdir "$pkgdir" - - cd "$pkgdir" + DESTDIR="$pkgdir" meson install -C build # /etc/NetworkManager - install -d etc/NetworkManager/{conf,dnsmasq}.d - install -dm700 etc/NetworkManager/system-connections - install -m644 /dev/stdin etc/NetworkManager/NetworkManager.conf < Date: May 16 2022 18:22:23 +0000 Subject: [PATCH 4/6] [polkit]: CVE-2021-4034 --- diff --git a/nonsystemd/polkit/PKGBUILD b/nonsystemd/polkit/PKGBUILD index 133fcb7..9ea8cf1 100644 --- a/nonsystemd/polkit/PKGBUILD +++ b/nonsystemd/polkit/PKGBUILD @@ -2,63 +2,66 @@ # Maintainer (Arch): Jan de Groot pkgname=polkit -pkgver=0.118 -pkgrel=1 +pkgver=0.120 +pkgrel=4 pkgrel+=.nonsystemd1 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(x86_64 i686 armv7h) license=(LGPL) url="https://www.freedesktop.org/wiki/Software/polkit/" depends=(glib2 pam expat elogind js78) -makedepends=(intltool gtk-doc gobject-introspection git autoconf-archive) +makedepends=(meson gtk-doc gobject-introspection git) backup=(etc/pam.d/polkit-1) provides=(polkit-elogind) replaces=(polkit-elogind polkit-consolekit) -_commit=ff4c2144f0fb1325275887d9e254117fcd8a1b52 # git tag 0.118 +_commit=92b910ce2273daf6a76038f6bd764fa6958d4e8e # tags/0.120 source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit" '99-parabola.rules' - 'elogind-configure-fix.patch') + 'elogind-configure-fix.patch' + 'meson-0.61.diff') sha256sums=('SKIP' 'd28d6ecaf7682860e2b3768bb266bd94313546b7cd0ef3c2eace7b1576c47adb' - 'd90b2a95aa3e9e1ebf9369c038c144e04900e095c5405bc4ba4901c31bf3f59b') + 'd90b2a95aa3e9e1ebf9369c038c144e04900e095c5405bc4ba4901c31bf3f59b' + '45d08bbb76e1e22ca8e698df04652b7aceaded34f9b76ce6b68152fb26b0de8d') pkgver() { - cd $pkgname + cd polkit git describe --tags | sed 's/-/+/g' } prepare() { - cd $pkgname + cd polkit patch -Np 1 -i ${srcdir}/elogind-configure-fix.patch - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd $pkgname - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib \ - --enable-libsystemd-login=no --disable-static \ - --enable-libelogind=yes --with-systemdsystemunitdir=no \ - --enable-gtk-doc --with-os-type=redhat + # CVE-2021-4034 + git cherry-pick -n a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + # Fix build with Meson 0.61.0 + git apply -3 ../meson-0.61.diff +} - make +build() { + arch-meson polkit build \ + --prefix=/usr \ + -D session_tracking=libelogind \ + -D systemdsystemunitdir=no \ + -D os_type=redhat \ + -D examples=true \ + -D tests=true \ + -D gtk_doc=true \ + -D man=true + meson compile -C build } check() { - cd $pkgname - make -k check || : + meson test -C build --print-errorlogs -t 3 } package() { - cd $pkgname - make DESTDIR="$pkgdir" install \ - dbusconfdir=/usr/share/dbus-1/system.d \ - rulesdir=/usr/share/polkit-1/rules.d + meson install -C build --destdir "$pkgdir" install -d -o root -g 102 -m 750 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d + mv "$pkgdir"/{etc,usr/share}/polkit-1/rules.d/50-default.rules install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" < Date: May 16 2022 18:22:23 +0000 Subject: [PATCH 5/6] [polkit]: WIP --- diff --git a/nonsystemd/polkit/PKGBUILD b/nonsystemd/polkit/PKGBUILD index 9ea8cf1..19f45a9 100644 --- a/nonsystemd/polkit/PKGBUILD +++ b/nonsystemd/polkit/PKGBUILD @@ -1,26 +1,30 @@ # Maintainer: David P. -# Maintainer (Arch): Jan de Groot +# Maintainer (arch): Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot pkgname=polkit pkgver=0.120 -pkgrel=4 +pkgrel=3 pkgrel+=.nonsystemd1 pkgdesc="Application development toolkit for controlling system-wide privileges" -arch=(x86_64 i686 armv7h) +arch=(x86_64) +arch+=(i686 armv7h) license=(LGPL) url="https://www.freedesktop.org/wiki/Software/polkit/" -depends=(glib2 pam expat elogind js78) +depends=(glib2 pam expat systemd js78) +depends=( ${depends[*]/systemd/elogind}) makedepends=(meson gtk-doc gobject-introspection git) +checkdepends=(python-dbusmock) backup=(etc/pam.d/polkit-1) provides=(polkit-elogind) replaces=(polkit-elogind polkit-consolekit) _commit=92b910ce2273daf6a76038f6bd764fa6958d4e8e # tags/0.120 -source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit" - '99-parabola.rules' - 'elogind-configure-fix.patch' - 'meson-0.61.diff') -sha256sums=('SKIP' - 'd28d6ecaf7682860e2b3768bb266bd94313546b7cd0ef3c2eace7b1576c47adb' +source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit") +source+=('99-parabola.rules' + 'elogind-configure-fix.patch' + 'meson-0.61.diff') +sha256sums=('SKIP') +sha256sums=('d28d6ecaf7682860e2b3768bb266bd94313546b7cd0ef3c2eace7b1576c47adb' 'd90b2a95aa3e9e1ebf9369c038c144e04900e095c5405bc4ba4901c31bf3f59b' '45d08bbb76e1e22ca8e698df04652b7aceaded34f9b76ce6b68152fb26b0de8d') From a5128bb4cbc4223b542c3234940b9534faee205b Mon Sep 17 00:00:00 2001 From: Morris Zuss Date: May 21 2022 19:40:30 +0000 Subject: [PATCH 6/6] updpkg: nonsystemd/brltty 6.4 --- diff --git a/nonsystemd/brltty/0001-libbrlapi-use-elogind-instead-of-systemd.patch b/nonsystemd/brltty/0001-libbrlapi-use-elogind-instead-of-systemd.patch index 052fd96..67a2d3e 100644 --- a/nonsystemd/brltty/0001-libbrlapi-use-elogind-instead-of-systemd.patch +++ b/nonsystemd/brltty/0001-libbrlapi-use-elogind-instead-of-systemd.patch @@ -1,49 +1,43 @@ -From 6ac0a7ddc37d84a9ed2fd1ecf48db25a47cd8172 Mon Sep 17 00:00:00 2001 -From: Dudemanguy -Date: Thu, 7 Jan 2021 16:35:06 -0600 -Subject: [PATCH] libbrlapi: use elogind instead of systemd +#From 6ac0a7ddc37d84a9ed2fd1ecf48db25a47cd8172 Mon Sep 17 00:00:00 2001 +#From: Dudemanguy +#Date: Thu, 7 Jan 2021 16:35:06 -0600 +#Subject: [PATCH] libbrlapi: use elogind instead of systemd -Not pretty or elegant but good enough for our purposes. ---- - Programs/brlapi_client.c | 2 +- - configure.ac | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) +#Not pretty or elegant but good enough for our purposes. -diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c -index d803d59d2..48e120bfa 100644 ---- a/Programs/brlapi_client.c -+++ b/Programs/brlapi_client.c -@@ -97,7 +97,7 @@ - #endif /* MAXIMUM_VIRTUAL_CONSOLE */ - - #ifdef HAVE_SD_SESSION_GET_VT --#include -+#include - #endif /* HAVE_SD_SESSION_GET_VT */ - - #define BRLAPI_NO_DEPRECATED -diff --git a/configure.ac b/configure.ac -index a8d8d237c..e6025fafc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1263,13 +1263,13 @@ in +diff -rua brltty-6.4.orig/configure.ac brltty-6.4.new/configure.ac +--- brltty-6.4.orig/configure.ac 2021-09-24 16:51:55.000000000 +0100 ++++ brltty-6.4.new/configure.ac 2022-05-21 20:11:35.089247900 +0100 +@@ -1223,15 +1223,15 @@ ;; esac -BRLTTY_HAVE_PACKAGE([systemd], [libsystemd], [ +BRLTTY_HAVE_PACKAGE([elogind], [libelogind], [ - brltty_libs_save="${LIBS}" -- LIBS="${LIBS} ${systemd_libs}" -+ LIBS="${LIBS} ${elogind_libs}" - AC_CHECK_FUNC([sd_session_get_vt], [ + brltty_libs_save="${LIBS}" +- LIBS="${LIBS} ${systemd_libs}" ++ LIBS="${LIBS} ${elogind_libs}" + AC_CHECK_FUNC([sd_session_get_vt], [dnl AC_DEFINE([HAVE_SD_SESSION_GET_VT], [1], - [Define this if the function sd_session_get_vt is available in libsystemd.]) - api_libraries="${api_libraries} ${systemd_libs}" + [Define this if the function sd_session_get_vt is available in libelogind.]) + api_libraries="${api_libraries} ${elogind_libs}" - ]) - LIBS="${brltty_libs_save}" - ]) --- -2.30.0 - + ], [dnl +- AC_MSG_WARN([function not available: systemd:sd_session_get_vt()]) ++ AC_MSG_WARN([function not available: elogind:sd_session_get_vt()]) + ]) + LIBS="${brltty_libs_save}" + ], [:]) +diff -rua brltty-6.4.orig/Programs/brlapi_client.c brltty-6.4.new/Programs/brlapi_client.c +--- brltty-6.4.orig/Programs/brlapi_client.c 2021-08-31 12:12:09.000000000 +0100 ++++ brltty-6.4.new/Programs/brlapi_client.c 2022-05-21 20:09:15.699249205 +0100 +@@ -98,7 +98,7 @@ + #endif /* MAXIMUM_VIRTUAL_CONSOLE */ + + #ifdef HAVE_SD_SESSION_GET_VT +-#include ++#include + #endif /* HAVE_SD_SESSION_GET_VT */ + + #define BRLAPI_NO_DEPRECATED diff --git a/nonsystemd/brltty/PKGBUILD b/nonsystemd/brltty/PKGBUILD index bc93515..0027d5d 100644 --- a/nonsystemd/brltty/PKGBUILD +++ b/nonsystemd/brltty/PKGBUILD @@ -6,7 +6,7 @@ # Maintainer: David P. pkgname=brltty -pkgver=6.3 +pkgver=6.4 pkgrel=1 pkgrel+=.nonsystemd1 pkgdesc="Braille display driver for Linux/Unix" @@ -43,14 +43,14 @@ source=("https://brltty.app/archive/${pkgname}-${pkgver}.tar.bz2" "${pkgname}.tmpfiles" "${pkgname}.sysusers" "0001-libbrlapi-use-elogind-instead-of-systemd.patch") -sha512sums=('687fbb30703d4c9fd7b55d27fabecf26c58f7c032c82bcdee1405259da74f85516e268fc49d1bdb2f704b92532cf5c466712cc09b1a4ba5304d4e021af74b7b8' +sha512sums=('58394c18d56a2a93a44be1c5dcfd02613581820ea2d2dbd945372ea11e066a18a75832ea04f09cf7f411e6dd1cd4ec78574f317dafcbc5c431dcf0db21b93690' 'a530fe66983768f9dc544af01c586abc101dfa2ed76885b4f1fd78c483b59e8445f2c0dbbfb865dd1cf2874342c346bd35ce978ab246e9cdd31d2d489a14e770' 'cc2e2d5f33d4e11d6ff828aefc0773ccdc02127ce2f00649c1e3f8d4b39b90789f4a0e41385b344f850c38bd4a1df36d3d9d413a59144d431defdd343633f800' - '88e1ed1d45e0ec8f10ca3f0fcb778fa1465d6799ee5d570c9f4ef22cb29dee8e7854feaa7c6b99dff2dfea15072fad4c7361c2d9fdff1f7abc6ccea40e6fd03c') -b2sums=('c321e1bdd6d7956620fa354edcf8eee0c8a0011ebfabb4cff98cb5a22c23d5667e6b73cbdbf282c9c36cc4d50ded4e147174c45da36e3fec03cc0a8d2121459a' + '6c85120d8a5a5936992b19fbbebd825bac52dd0cc7ead7273378344d0045f822c34e22b4afcf9c449b6ecd7a46602d5fe36f2a2d4c5efbe8877856dc0e8d8b3a') +b2sums=('2c31b8282f0bc4730e406772c8b5aa72b1650e3290cfe967ec668394627440f84afe936bfbdbdab9ee0e7ba93ef466950295dbd7d979b639605fe619b5c170bd' '59f50e367d2e6c6704902ebbd254232aa17c741c9a43ba27d0ebaa5fd4a86f62bc8bdd08e8e4562437dea0efa9d49845e40c022b8c4d7110675d81bf63ac4df4' 'e6b7453360ef92254ff1049b387c9ee45f3be0e0259c9c3670154938f61ec4142b2de330401d09e1290ed9ffe8e390ede3472dab0e2f4c69b497f9ac19795aad' - 'b29df2269b4c3d0afd64fcf2d38d0ca4a2a53f36cea62900765f782c76f2cae6b36bfca693194cc26e6d53a9f9af997d2bb5180062a7e3b0501d6c38e83936d0') + '0cf14d3799b6bc62277788f434e34efe75be529108ce65a6d77b6c861f7174ce4582a3a1ab0ca169d33f9ceae614531e768db328125fdc9dd74f9c46195c4301') prepare() { cd "${pkgname}-${pkgver}" @@ -77,6 +77,7 @@ package() { 'libglib-2.0.so' 'libgobject-2.0.so' 'libicuuc.so' 'libgpm.so' 'libncursesw.so' 'libelogind.so') cd "${pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install make INSTALL_ROOT="${pkgdir}" install-udev # dracut support may still be problematic # https://bugs.archlinux.org/task/69424