changeset 1318:1a6e1b476561

network/dbus: switch to 1.12.20 version
author David Demelier <markand@malikania.fr>
date Sun, 21 Nov 2021 10:00:19 +0100
parents 1c1831f4c3a9
children 0336225300e5
files Docs/uids.md network/dbus/dbus network/dbus/dbus.sh network/dbus/dbus.sha1
diffstat 4 files changed, 15 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/Docs/uids.md	Sat Nov 20 21:03:57 2021 +0100
+++ b/Docs/uids.md	Sun Nov 21 10:00:19 2021 +0100
@@ -22,3 +22,4 @@
 | avahi-autoipd (108) | avahi-autoipd (108) | dns/avahi            |
 | irccd (109)         | irccd (109)         | irc/irccd            |
 | postgresql (110)    | postgresql (110)    | databases/postgresql |
+| _dbus (111)         | _dbus (111)         | network/dbus         |
--- a/network/dbus/dbus	Sat Nov 20 21:03:57 2021 +0100
+++ b/network/dbus/dbus	Sun Nov 21 10:00:19 2021 +0100
@@ -1,6 +1,6 @@
 #!/bin/busybox sh
 #
-# /etc/rc.d/dbus -- run control script for dbus
+# /etc/vinit.d/dbus -- run control script for dbus
 #
 # Copyright (c) 2019 David Demelier <markand@malikania.fr>
 #
--- a/network/dbus/dbus.sh	Sat Nov 20 21:03:57 2021 +0100
+++ b/network/dbus/dbus.sh	Sun Nov 21 10:00:19 2021 +0100
@@ -16,16 +16,19 @@
 #
 
 PKGNAME=dbus
-PKGVERSION=1.13.8
+PKGVERSION=1.12.20
 PKGREVISION=1
-PKGLICENSE="GPL-2.0-only+ CUSTOM"
+PKGLICENSE="GPL-2.0-or-later"
 PKGSUMMARY="desktop bus"
-PKGDOWNLOAD="https://dbus.freedesktop.org/releases/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz"
-PKGUIDS="messagebus:100"
-PKGGIDS="messagebus:100"
+PKGWWW="https://www.freedesktop.org/wiki/Software/dbus"
+PKGDOWNLOAD="https://dbus.freedesktop.org/releases/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
+PKGUIDS="_dbus:111"
+PKGGIDS="_dbus:111"
 PKGDEPENDS="expat"
 PKGOPTIONS="SELINUX X"
-PKGPROTECT="etc/rc.d/dbus"
+PKGPROTECT="etc/dbus-1/session.conf
+            etc/dbus-1/system.conf
+            etc/vinit.d/dbus"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -53,7 +56,7 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	tar -xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
@@ -67,6 +70,7 @@
 		--host=$CHOST \
 		--prefix= \
 		--with-system-pid-file=/var/run/dbus.pid \
+		--with-dbus-user=_dbus \
 		--disable-systemd \
 		--enable-shared \
 		$with_selinux \
@@ -74,7 +78,7 @@
 	make
 	make install DESTDIR=$DESTDIR
 	find $DESTDIR -type f -name "*.la" -delete
-	install -Dm0644 ../dbus $DESTDIR/etc/rc.d/dbus
+	install -Dm0644 ../dbus $DESTDIR/etc/vinit.d/dbus
 
 	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
--- a/network/dbus/dbus.sha1	Sat Nov 20 21:03:57 2021 +0100
+++ b/network/dbus/dbus.sha1	Sun Nov 21 10:00:19 2021 +0100
@@ -1,1 +1,1 @@
-6e9a99e0140f71800c1ed6283af80c26f7e3f39b  dbus-1.13.8.tar.xz
+f7fe130511aeeac40270af38d6892ed63392c7f6  dbus-1.12.20.tar.gz