upg dbus libnl

This commit is contained in:
joborun linux 2023-01-30 00:58:02 +02:00
parent 3a61edfe4a
commit b214d5e144
6 changed files with 58 additions and 34 deletions

View File

@ -8,7 +8,7 @@
pkgbase=dbus
pkgname=(dbus) # dbus-docs)
pkgver=1.14.4
pkgrel=01
pkgrel=02
pkgdesc="Freedesktop.org message bus system"
url="https://wiki.freedesktop.org/www/Software/dbus/"
arch=(x86_64)
@ -16,13 +16,15 @@ depends=(expat audit)
makedepends=(xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive automake)
#options=(debug) ## uncomment this to have the dbus-debug pkg produced
source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"
no-fatal-warnings.diff dbus.tmpfiles)
no-fatal-warnings.patch
dbus.sysusers
dbus.tmpfiles)
prepare() {
cd dbus
cd $pkgbase
# Allow us to enable checks without them being fatal
patch -Np1 -i ../no-fatal-warnings.diff
patch -Np2 -i ../no-fatal-warnings.patch
NOCONFIGURE=1 ./autogen.sh
}
@ -71,8 +73,10 @@ package_dbus() {
# # We have a pre-assigned uid (81)
# echo 'u dbus 81 "System Message Bus"' |
# install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
install -D -m0644 "$srcdir"/dbus.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dbus.conf
# install -D -m0644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
install -D -m0644 "$srcdir/dbus.sysusers" "$pkgdir/usr/lib/sysusers.d/dbus.conf"
install -D -m0644 "$srcdir/dbus.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/dbus.conf"
# install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
# Split docs
@ -102,6 +106,7 @@ license=(GPL custom)
validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>
sha256sums=(SKIP
6958eeec07557b92a28419eb1702331ee2f0a6fd17285e37dfb6130b9fa4cf6e # no-fatal-warnings.diff
cfe4b308c8d681f7a43984a8fe42179339d8b048c519e5edcc30074abe9451bc # no-fatal-warnings.patch
# 6958eeec07557b92a28419eb1702331ee2f0a6fd17285e37dfb6130b9fa4cf6e # no-fatal-warnings.diff
9bc34a20595df8869d43a8d9af74cbded999c9a004ec12ff8ce07d58d81018d8 # dbus.sysusers
965cef20cce35819e89c65f06a931a38bea2119b0ae9c259b5d7f9cfc3edd6d7) # dbus.tmpfiles

View File

@ -8,8 +8,8 @@
# DESCRIPTION ]
pkgbase=dbus
pkgver=1.12.20
pkgrel=2
pkgver=1.14.4
pkgrel=3
pkgdesc="Freedesktop.org message bus system"
url='https://wiki.freedesktop.org/www/Software/dbus/'
@ -23,18 +23,19 @@ target="$pkgbase-$pkgver"
source=(
"git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#${track}=${target}"
dbus.tmpfiles
no-fatal-warnings.diff
dbus.sysusers
no-fatal-warnings.patch
)
#----------------------
# BUILD CONFIGURATION ]
makedepends=(
'xmlto'
'docbook-xsl'
'python'
'yelp-tools'
'doxygen'
'xmlto'
'docbook-xsl'
'python'
'yelp-tools'
'doxygen'
'git'
'autoconf-archive'
)
@ -58,7 +59,7 @@ install=dbus.install
prepare() {
## Allow us to enable checks without them being fatal
patch -d "$pkgbase" -p1 -i ../no-fatal-warnings.diff
patch -d "$pkgbase" -Np2 -i ../no-fatal-warnings.patch
cd $pkgbase
NOCONFIGURE=1 ./autogen.sh
@ -72,7 +73,7 @@ _flags=(
--sysconfdir=/etc
--localstatedir=/var
--libexecdir=/usr/lib/dbus-1.0
runstatedir=/run
--runstatedir=/run
--with-system-pid-file=/run/dbus/pid
--with-system-socket=/run/dbus/system_bus_socket
--with-dbus-session-bus-listen-address=unix:runtime=yes
@ -106,7 +107,7 @@ build() {
# CHECK ]
check() {
make -C "$pkgbase" check
make -C "$pkgbase" -j1 check
}
#----------
@ -126,30 +127,31 @@ package_dbus(){
replaces=(
'libdbus'
)
DESTDIR="$pkgdir" make -C dbus install
rm -r "$pkgdir"/{etc,var}
## systemd-sysusers
#install -D -m0644 "$srcdir/dbus.sysusers" "$pkgdir/usr/lib/sysusers.d/dbus.conf"
install -D -m0644 "$srcdir/dbus.sysusers" "$pkgdir/usr/lib/sysusers.d/dbus.conf"
## systemd-tmpfiles
install -D -m0644 "$srcdir"/dbus.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dbus.conf
install -Dt "$pkgdir"/usr/share/licenses/"$pkgname" -m644 dbus/COPYING
install -D -m0644 "$srcdir/dbus.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/dbus.conf"
## Split docs
mv "$pkgdir"/usr/share/doc "$srcdir"
mkdir -p doc/usr/share
mv {"$pkgdir",doc}/usr/share/doc
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
}
package_dbus-docs(){
pkgdesc+=" (documentation)"
depends=()
mv doc/* "$pkgdir"
install -Dt "$pkgdir"/usr/share/licenses/"$pkgname" -m644 dbus/COPYING
mv doc "$pkgdir"/usr/share
}
#--------------------

1
dbus/dbus.sysusers Normal file
View File

@ -0,0 +1 @@
u dbus 81 "System Message Bus"

View File

@ -0,0 +1,12 @@
diff --unified --recursive --text --color a/dbus/dbus/dbus-internals.c b/dbus/dbus/dbus-internals.c
--- a/dbus/dbus/dbus-internals.c 2022-03-23 00:11:22.509486261 +0000
+++ b/dbus/dbus/dbus-internals.c 2022-03-23 00:14:47.786521327 +0000
@@ -193,7 +193,7 @@
* threads, the worst that will happen is that warnings get their default
* fatal/non-fatal nature. */
static dbus_bool_t fatal_warnings = FALSE;
-static dbus_bool_t fatal_warnings_on_check_failed = TRUE;
+static dbus_bool_t fatal_warnings_on_check_failed = FALSE;
static void
init_warnings(void)

View File

@ -7,11 +7,11 @@
pkgname=libnl
pkgver=3.7.0
pkgrel=01
pkgrel=02
pkgdesc='Library for applications dealing with netlink sockets'
arch=(x86_64)
url='https://github.com/thom311/libnl/'
depends=(glibc)
depends=('glibc' 'gcc-libs')
#options=('debug') # uncomment this to produce the debug package for libnl
makedepends=(bison)
backup=(etc/libnl/classid
@ -45,3 +45,8 @@ validpgpkeys=('49EA7C670E0850E7419514F629C2366E4DFC5728') # Thomas Haller
sha256sums=(9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939 # libnl-3.7.0.tar.gz
abdf098b3a7802a1e77086e5f92835ad25a2da6a59a05d6a5a086d66a323bffc) # libnl-3.7.0.tar.gz.sig
# 20d92eaddcfde543045155667a04dc2fcf69ef23ee7c6294d32380da37101502 libnl-3.7.0-02-x86_64.pkg.tar.xz

View File

@ -3,13 +3,12 @@
pkgname=libnl
pkgver=3.7.0
pkgrel=1
pkgrel=2
pkgdesc='Library for applications dealing with netlink sockets'
arch=('x86_64')
url='https://github.com/thom311/libnl/'
license=('GPL')
depends=('glibc')
options=('debug')
depends=('glibc' 'gcc-libs')
backup=('etc/libnl/classid'
'etc/libnl/pktloc')
validpgpkeys=('49EA7C670E0850E7419514F629C2366E4DFC5728') # Thomas Haller