upg dbus-broker qt5-base

moved and rebuilt librist python-truststosre
This commit is contained in:
joborun linux 2024-01-06 01:29:44 +02:00
parent 0564ce8ce7
commit 4cb3993040
19 changed files with 421 additions and 18 deletions

View File

@ -0,0 +1,60 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Fri, 8 Dec 2023 21:28:52 +0100
Subject: [PATCH] units: Enable statically
---
src/units/system/dbus-broker.service.in | 3 ---
src/units/system/meson.build | 5 +++++
src/units/user/dbus-broker.service.in | 3 ---
src/units/user/meson.build | 5 +++++
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/units/system/dbus-broker.service.in b/src/units/system/dbus-broker.service.in
index cc5ae3617ea5..2f07a1e7ce77 100644
--- a/src/units/system/dbus-broker.service.in
+++ b/src/units/system/dbus-broker.service.in
@@ -17,6 +17,3 @@ PrivateTmp=true
PrivateDevices=true
ExecStart=@bindir@/dbus-broker-launch --scope system --audit
ExecReload=@bindir@/busctl call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig
-
-[Install]
-Alias=dbus.service
diff --git a/src/units/system/meson.build b/src/units/system/meson.build
index a946b4673130..97f1d46fc5e2 100644
--- a/src/units/system/meson.build
+++ b/src/units/system/meson.build
@@ -8,3 +8,8 @@ configure_file(
configuration: conf,
install_dir: conf.get('systemunitdir'),
)
+
+install_symlink('dbus.service',
+ pointing_to: 'dbus-broker.service',
+ install_dir: conf.get('systemunitdir'),
+)
diff --git a/src/units/user/dbus-broker.service.in b/src/units/user/dbus-broker.service.in
index 15de0d5b611d..ffcf632e9bbd 100644
--- a/src/units/user/dbus-broker.service.in
+++ b/src/units/user/dbus-broker.service.in
@@ -13,6 +13,3 @@ Sockets=dbus.socket
ExecStart=@bindir@/dbus-broker-launch --scope user
ExecReload=@bindir@/busctl --user call org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus ReloadConfig
Slice=session.slice
-
-[Install]
-Alias=dbus.service
diff --git a/src/units/user/meson.build b/src/units/user/meson.build
index 876ff9817bae..b45aee31f205 100644
--- a/src/units/user/meson.build
+++ b/src/units/user/meson.build
@@ -8,3 +8,8 @@ configure_file(
configuration: conf,
install_dir: conf.get('userunitdir'),
)
+
+install_symlink('dbus.service',
+ pointing_to: 'dbus-broker.service',
+ install_dir: conf.get('userunitdir'),
+)

View File

@ -1,22 +1,28 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=dbus-broker
# pkgbase=dbus-broker
#pkgname=(dbus-broker dbus-broker-units)
pkgver=35
pkgrel=01
pkgrel=02
pkgdesc="Linux D-Bus Message Broker w/o systemd"
url="https://github.com/bus1/dbus-broker/wiki"
depends=(expat audit libcap-ng)
makedepends=(meson python-docutils)
#options=(debug) ### uncomment this line to have debug pkg produced
source=(https://github.com/bus1/dbus-broker/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc})
# patch is for systemd sockets and services
# 0001-units-Enable-statically.patch)
prepare() {
cd $pkgname-$pkgver
# patch is for systemd sockets and services
# patch -Np1 -i ../0001-units-Enable-statically.patch
}
build() {
@ -38,15 +44,31 @@ check() {
## when run in a pseudo environment like docker it may pass but not in a protected chroot
## so run makepkg --nocheck
#_pick() {
# local p="$1" f d; shift
# for f; do
# d="$srcdir/$p/${f#$pkgdir/}"
# mkdir -p "$(dirname "$d")"
# mv "$f" "$d"
# rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
# done
#}
package() {
depends+=(
libaudit.so
libcap-ng.so
libexpat.so)
depends+=(libaudit.so libcap-ng.so libexpat.so)
meson install -C build --destdir "$pkgdir"
}
#package_dbus-broker-units() {
# pkgdesc+=" - Service units"
# depends=(dbus-broker)
# provides=(dbus-units)
# conflicts=(dbus-daemon-units)
#
# mv unit/* "$pkgdir"
#}
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
@ -57,6 +79,6 @@ license=("Apache-2.0")
sha256sums=(d50daa31ff33f48693194596ea2aeb1a925183b59cdc82a550774e5c43982252 # dbus-broker-35.tar.xz
00d52c28ce46ad4d53a1c131f3c2755f5494d141405ce234241d50f457418c4f) # dbus-broker-35.tar.xz.asc
# a37cedf7fef8f513f4a79c9893c677ff68dd5184b3918a57c3ec0b0383ea6cb5) # 0001-units-Enable-statically.patch
## b19f6291e27f849c929deff07861b7ddef45a156c9ea032c6c0fdd3ff5bc8c99 dbus-broker-35-01-x86_64.pkg.tar.lz

View File

@ -4,9 +4,10 @@
pkgbase=dbus-broker
pkgname=(
dbus-broker
dbus-broker-units
)
pkgver=35
pkgrel=1
pkgrel=2
pkgdesc="Linux D-Bus Message Broker"
url="https://github.com/bus1/dbus-broker/wiki"
arch=(x86_64)
@ -24,19 +25,23 @@ makedepends=(
)
source=(
https://github.com/bus1/dbus-broker/releases/download/v$pkgver/$pkgbase-$pkgver.tar.xz{,.asc}
0001-units-Enable-statically.patch
)
b2sums=('2c270197d76ec157bf2fd8eb561b49cea2739d656fac8129c4ecdd0bbd5804f8e4e427414cb5f209eef4c22cf9559fc409170476d8df0e1d252c0b5aa2288e01'
'SKIP')
'SKIP'
'c6ad58146a76dbb62548029cf84403ccba355a9ce74b8e081a27a6e3bf4535809741f0621b8a1396cbcb5be55434a90c169829c9b443952477e838c1036b84af')
validpgpkeys=(
BE5FBC8C9C1C9F60A4F0AEAE7A4F3A09EBDEFF26 # David Herrmann <dh.herrmann@gmail.com>
)
# https://github.com/bus1/dbus-broker/releases
sha256sums=('d50daa31ff33f48693194596ea2aeb1a925183b59cdc82a550774e5c43982252'
'SKIP')
'SKIP'
'a37cedf7fef8f513f4a79c9893c677ff68dd5184b3918a57c3ec0b0383ea6cb5')
prepare() {
cd $pkgbase-$pkgver
patch -Np1 -i ../0001-units-Enable-statically.patch
}
build() {
@ -55,6 +60,16 @@ check() {
meson test -C build --print-errorlogs
}
_pick() {
local p="$1" f d; shift
for f; do
d="$srcdir/$p/${f#$pkgdir/}"
mkdir -p "$(dirname "$d")"
mv "$f" "$d"
rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
done
}
package_dbus-broker() {
depends+=(
libaudit.so
@ -64,6 +79,17 @@ package_dbus-broker() {
)
meson install -C build --destdir "$pkgdir"
_pick unit "$pkgdir"/usr/lib/systemd/{system,user}/dbus.service
}
package_dbus-broker-units() {
pkgdesc+=" - Service units"
depends=(dbus-broker)
provides=(dbus-units)
conflicts=(dbus-daemon-units)
mv unit/* "$pkgdir"
}
# vim:set sw=2 sts=-1 et:

View File

@ -0,0 +1,12 @@
--- a/test/rist/meson.build
+++ b/test/rist/meson.build
@@ -27,9 +27,6 @@ test('Simple profile unicast', test_send_receive, args: ['0', 'rist://@127.0.0.1
test('Simple profile unicast packet loss 10%', test_send_receive, args: ['0', 'rist://@127.0.0.1:2234', 'rist://127.0.0.1:2234', '10'],suite: ['simple', 'unicast'])
test('Simple profile unicast packet loss 25%', test_send_receive, args: ['0', 'rist://@127.0.0.1:3234', 'rist://127.0.0.1:3234', '25'],suite: ['simple', 'unicast'])
#Multicast
-test('Simple profile multicast', test_send_receive, args: ['0', 'rist://@239.0.0.1:1234?rtt-max=10&rtt-min=1', 'rist://239.0.0.1:1234?rtt-max=10&rtt-min=1', '0'],suite: ['simple', 'multicast'])
-test('Simple profile multicast packet loss 10%', test_send_receive, args: ['0', 'rist://@239.0.0.2:2234?rtt-max=10&rtt-min=1', 'rist://239.0.0.2:2234?rtt-max=10&rtt-min=1', '10'],suite: ['simple', 'multicast'])
-test('Simple profile multicast packet loss 25%', test_send_receive, args: ['0', 'rist://@239.0.0.3:3234?rtt-max=10&rtt-min=1', 'rist://239.0.0.3:3234?rtt-max=10&rtt-min=1', '25'],suite: ['simple', 'multicast'])
###Main profile tests:
#Sender connecting to receiver

54
librist/PKGBUILD Normal file
View File

@ -0,0 +1,54 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=librist
pkgver=0.2.10.r0.g1e80550
pkgrel=02
pkgdesc='A library that can be used to add the RIST protocol to applications (git version)'
url='https://code.videolan.org/rist/librist/'
depends=('cjson' 'mbedtls')
makedepends=('git' 'meson' 'cmake' 'cmocka' 'lz4')
provides=('librist')
conflicts=('librist-git')
tag=1e805500dc14a507598cebdd49557c32e514899f # tags/v0.2.10
source=("git+https://code.videolan.org/rist/librist.git#commit=$tag"
'010-librist-disable-multicast-tests.patch')
pkgver() {
git -C librist describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/\.\(RC\|rc\)/rc/'
}
prepare() {
patch -d librist -Np1 -i "${srcdir}/010-librist-disable-multicast-tests.patch"
}
build() {
arch-meson build librist
meson compile -C build
}
#check() {
# meson test -C build
#}
package() {
meson install -C build --destdir "$pkgdir"
# install -D -m644 librist/COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
install -D -m644 "${pkgname}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=('BSD')
sha256sums=(SKIP # librist.git
0b8363a832a0e20ee756936efde714acaa3dfa74cffa1ef8283f3373663d0e35) # 010-librist-disable-multicast-tests.patch
## 986ce84acb7995bd8da61340ad4fb459f0933ba4c30da6ee158f5e6a72555f8f librist-0.2.10.r0.g1e80550-02-x86_64.pkg.tar.lz

33
librist/PKGBUILD-arch Normal file
View File

@ -0,0 +1,33 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=librist
pkgver=0.2.10
pkgrel=1
pkgdesc='A library that can be used to add the RIST protocol to applications'
arch=('x86_64')
url='https://code.videolan.org/rist/librist/'
license=('BSD')
depends=('cjson' 'mbedtls')
makedepends=('meson' 'cmake' 'cmocka' 'lz4')
source=("https://code.videolan.org/rist/librist/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.bz2"
'010-librist-disable-multicast-tests.patch')
sha256sums=('c4a2c1bf62310fa1621b1a66140aa6fda8498a80fa5cc73d32335aa57015f7f5'
'0b8363a832a0e20ee756936efde714acaa3dfa74cffa1ef8283f3373663d0e35')
prepare() {
patch -d "${pkgname}-v${pkgver}" -Np1 -i "${srcdir}/010-librist-disable-multicast-tests.patch"
}
build() {
arch-meson build "${pkgname}-v${pkgver}"
meson compile -C build
}
check() {
meson test -C build
}
package() {
meson install -C build --destdir "$pkgdir"
install -D -m644 "${pkgname}-v${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}

39
librist/PKGBUILD-aur Normal file
View File

@ -0,0 +1,39 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=librist-git
pkgver=0.2.9.r0.g8fc343a
pkgrel=1
pkgdesc='A library that can be used to add the RIST protocol to applications (git version)'
arch=('x86_64')
url='https://code.videolan.org/rist/librist/'
license=('BSD')
depends=('cjson' 'mbedtls')
makedepends=('git' 'meson' 'cmake' 'cmocka' 'lz4')
provides=('librist')
conflicts=('librist')
source=('git+https://code.videolan.org/rist/librist.git'
'010-librist-disable-multicast-tests.patch')
sha256sums=('SKIP'
'0b8363a832a0e20ee756936efde714acaa3dfa74cffa1ef8283f3373663d0e35')
prepare() {
patch -d librist -Np1 -i "${srcdir}/010-librist-disable-multicast-tests.patch"
}
pkgver() {
git -C librist describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/\.\(RC\|rc\)/rc/'
}
build() {
arch-meson build librist
meson compile -C build
}
check() {
meson test -C build
}
package() {
meson install -C build --destdir "$pkgdir"
install -D -m644 librist/COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
}

52
librist/PKGBUILD.old Normal file
View File

@ -0,0 +1,52 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=librist
pkgver=0.2.8rc1.r0.g32dcfa1
pkgrel=02
pkgdesc='A library that can be used to add the RIST protocol to applications (git version)'
url='https://code.videolan.org/rist/librist/'
depends=('cjson' 'mbedtls')
makedepends=('git' 'meson' 'cmake' 'cmocka' 'lz4' 'libmicrohttpd')
provides=('librist')
conflicts=('librist-git')
source=("git+https://code.videolan.org/rist/$pkgname.git"
"010-$pkgname-disable-multicast-tests.patch")
pkgver() {
git -C $pkgname describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/\.\(RC\|rc\)/rc/'
}
prepare() {
patch -d $pkgname -Np1 -i "${srcdir}/010-$pkgname-disable-multicast-tests.patch"
}
build() {
arch-meson build $pkgname
ninja -v -C build
}
check() {
ninja -v -C build test
}
package() {
DESTDIR="$pkgdir" ninja -v -C build install
install -D -m644 $pkgname/COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
}
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=('BSD')
sha256sums=(SKIP
a9dc0c1a3690fea576252e687123ec2d7dfaec7c1a8b0e02c8518bdcb8e9b954) # 010-librist-disable-multicast-tests.patch
## 24a148bfa730c6e0648711b6e3e7353673c53b57c9a70230eb8158a10161573a librist-0.2.8rc1.r0.g32dcfa1-02-x86_64.pkg.tar.lz

1
librist/clean Normal file
View File

@ -0,0 +1 @@
rm -rf {src,pkg,librist,librist*.tar.bz2}

9
librist/deps Normal file
View File

@ -0,0 +1,9 @@
git
cjson
mbedtls
meson
cmake
cmocka
libmicrohttpd

5
librist/deps-fixed Normal file
View File

@ -0,0 +1,5 @@
cjson
mbedtls
meson
cmake
cmocka

6
librist/time Normal file
View File

@ -0,0 +1,6 @@
real 0m26.305s
user 0m17.118s
sys 0m8.561s

View File

@ -0,0 +1,42 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
_pkgname=truststore
pkgname=python-$_pkgname
pkgver=0.8.0
pkgrel=03
pkgdesc='Python library for native system certificate stores (i.e. "trust stores")'
url='https://github.com/sethmlarson/truststore'
makedepends=(python-build python-installer python-wheel python-flit)
depends=('python')
source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz")
prepare() {
cd "$_pkgname-$pkgver"
}
build() {
cd "$_pkgname-$pkgver"
python -m build --wheel --no-isolation
}
package() {
cd "$_pkgname-$pkgver"
python -m installer --destdir="$pkgdir" dist/*.whl
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=('custom:MIT')
sha256sums=(c862292f8d136bfcf2a7827a1fd1c1b27944a982741205fb466005673b570df8) # python-truststore-0.8.0.tar.gz
## b56ded44496dd8d3d8d7d9debc7cd489ae210ec455cad838aaafcf87663d52f7 python-truststore-0.8.0-03-x86_64.pkg.tar.lz

View File

@ -0,0 +1,29 @@
# Maintainer: Stephan Springer <buzo+arch@Lini.de>
_pkgname=truststore
pkgname=python-$_pkgname
pkgver=0.8.0
pkgrel=1
pkgdesc='Python library for native system certificate stores (i.e. "trust stores")'
arch=('any')
url='https://github.com/sethmlarson/truststore'
license=('custom:MIT')
makedepends=(python-build python-installer python-wheel python-flit)
depends=('python')
source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz")
sha256sums=('c862292f8d136bfcf2a7827a1fd1c1b27944a982741205fb466005673b570df8')
prepare() {
cd "$_pkgname-$pkgver"
}
build() {
cd "$_pkgname-$pkgver"
python -m build --wheel --no-isolation
}
package() {
cd "$_pkgname-$pkgver"
python -m installer --destdir="$pkgdir" dist/*.whl
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}

1
python-truststore/clean Normal file
View File

@ -0,0 +1 @@
rm -rf {src,pkg,python-trus*.tar.gz}

6
python-truststore/deps Normal file
View File

@ -0,0 +1,6 @@
python
python-build
python-installer
python-wheel
python-flit

6
python-truststore/time Normal file
View File

@ -0,0 +1,6 @@
real 0m2.901s
user 0m1.734s
sys 0m0.593s

View File

@ -7,9 +7,9 @@
pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
_basever=5.15.11
pkgver=5.15.11+kde+r148
_commit=2ddd05e762c1ce382db0bdacfe2bd754ad173815
_basever=5.15.12
pkgver=5.15.12+kde+r147
_commit=8907dedc858cc344d770a2e826d6acc516429540
pkgrel=01
url='https://www.qt.io'
pkgdesc='A cross-platform application and UI framework w/o systemd'
@ -129,6 +129,6 @@ sha256sums=(SKIP
5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qmake-cflags.patch
4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch
## 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
## 9430c995cb1494aa05880c64302cb4e3c4c81afabf9ed6672ad4ed62f0df2678 qt5-base-5.15.12+kde+r147-01-x86_64.pkg.tar.lz
## 2f71596f4c4fb3789d995f2c3f20859b148fce086fe7013474c1ef6abb772bbd qt5-xcb-private-headers-5.15.12+kde+r147-01-x86_64.pkg.tar.lz

View File

@ -3,10 +3,10 @@
pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
_basever=5.15.11
pkgver=5.15.11+kde+r148
_basever=5.15.12
pkgver=5.15.12+kde+r147
pkgrel=1
_commit=2ddd05e762c1ce382db0bdacfe2bd754ad173815
_commit=8907dedc858cc344d770a2e826d6acc516429540
arch=('x86_64')
url='https://www.qt.io'
license=('GPL3' 'LGPL3' 'FDL' 'custom')