cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to dbus-1.14.0.

Browse Source 
Zap "daemon" class from _dbus user.
This commit is contained in:
ajacoutot 2022-03-04 07:01:46 +00:00
parent 2940ce7c30
commit ba3d73dd83
8 changed files with 92 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/dbus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.168 2022/02/26 08:39:11 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.169 2022/03/04 07:01:46 ajacoutot Exp $
# XXX merge on next major update
# https://gitlab.freedesktop.org/dbus/dbus/merge_requests/124/diffs
@ -9,14 +9,15 @@ DPB_PROPERTIES= parallel
COMMENT-main= message bus system
COMMENT-suid= DBus setuid helper for starting system services
V= 1.12.22
V= 1.14.0
DISTNAME= dbus-${V}
EXTRACT_SUFX= .tar.xz
EPOCH-main= 0
PKGNAME-main= ${DISTNAME}
PKGNAME-suid= dbus-daemon-launch-helper-${V}
SHARED_LIBS += dbus-1 11.2 # 22.14
SHARED_LIBS += dbus-1 11.3 # 35.0
CATEGORIES= x11
@ -29,7 +30,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += c execinfo expat pthread
WANTLIB-main += ${WANTLIB} ICE SM X11 xcb
WANTLIB-main += ${WANTLIB} X11 xcb
WANTLIB-suid += ${WANTLIB} dbus-1
@ -45,7 +46,7 @@ BUILD_DEPENDS= textproc/xmlto
LIB_DEPENDS-suid= ${BASE_PKGPATH},-main
AUTOCONF_VERSION= 2.69
AUTOCONF_VERSION= 2.71
CONFIGURE_STYLE= autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

4
x11/dbus/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dbus-1.12.22.tar.gz) = jSV4XHmOxPiS5vnRd/sM7riymGexGXmPnVIoVh061HQ=
SIZE (dbus-1.12.22.tar.gz) = 2108231
SHA256 (dbus-1.14.0.tar.xz) = zNfM43WW4KGVWP1mSNEnKrQ/AR2AyGNa6o/QutWK69Q=
SIZE (dbus-1.14.0.tar.xz) = 1360228

4
x11/dbus/patches/patch-bus_config-parser_c
View File

@ -1,11 +1,9 @@
$OpenBSD: patch-bus_config-parser_c,v 1.5 2017/11/01 06:27:31 ajacoutot Exp $
/lib -> /var/db
Index: bus/config-parser.c
--- bus/config-parser.c.orig
+++ bus/config-parser.c
@@ -3951,7 +3951,7 @@ static const char *test_system_service_dir_matches[] =
@@ -3954,7 +3954,7 @@ static const char *test_system_service_dir_matches[] =
"/usr/local/share/dbus-1/system-services",
"/usr/share/dbus-1/system-services",
DBUS_DATADIR"/dbus-1/system-services",

84
x11/dbus/patches/patch-configure_ac
View File

@ -1,14 +1,78 @@
$OpenBSD: patch-configure_ac,v 1.9 2018/08/05 19:12:05 ajacoutot Exp $
From fdbb32bd1f3c972d3d5fd3998930749206a1095a Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 1 Mar 2022 15:56:30 +0100
Subject: [PATCH] build: Treat --with-x[=yes] the same as --with-x=auto
From 5f2577aea3c5291dbb97e77c7384924851b30102 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 1 Mar 2022 16:01:29 +0100
Subject: [PATCH] Move DBUS_X_* definitions into PKG_CHECK_MODULES block
From 5dad12f34c54e2359adfe8e7f122681df1d24bcb Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 1 Mar 2022 16:05:52 +0100
Subject: [PATCH] Emit an error when --with-x was given but no X11 libs were found
From e03554eb0bf2731e39c06191403f7544df9bb307 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 1 Mar 2022 16:08:06 +0100
Subject: [PATCH] Add have_x11=no if --without-x was given to make later checks happy
From 62361f47f9da2346a9ff9a8c4b4bd4a288dc44d5 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 1 Mar 2022 16:11:05 +0100
Subject: [PATCH] Convert "if" calls to AS_IF macro for the block that handles X11
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -567,7 +567,7 @@ fi
AC_LANG_PUSH(C)
AC_CACHE_CHECK([whether va_lists can be copied by value],
dbus_cv_va_val_copy,
- [AC_RUN_IFELSE([AC_LANG_PROGRAM(
+ [AC_RUN_IFELSE([AC_LANG_SOURCE(
[[
#include <stdarg.h>
#include <stdlib.h>
@@ -1108,31 +1108,32 @@ AC_ARG_ENABLE([x11-autolaunch],
AS_HELP_STRING([--enable-x11-autolaunch], [build with X11 auto-launch support]),
[], [enable_x11_autolaunch=auto])
-if test "x$dbus_win" = xyes; then
- if test "x$enable_x11_autolaunch" = xyes; then
+AS_IF([test "x$dbus_win" = xyes], [
+ AS_IF([test "x$enable_x11_autolaunch" = xyes], [
AC_MSG_ERROR([X11 auto-launch is not supported on Windows])
- fi
+ ])
enable_x11_autolaunch=no
have_x11=no
-else if test "x$with_x" = xauto; then
+], [test "x$with_x" != xno], [
PKG_CHECK_MODULES([X], [x11],
- [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])],
- [ have_x11=no ])
-
- if test "x$have_x11" = xno; then
- AC_MSG_WARN([Couldn't found X11, tried with pkg-config.])
- else
- have_x11=yes
- DBUS_X_LIBS="$X_LIBS"
- DBUS_X_CFLAGS="$X_CFLAGS"
- fi
-else
+ [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library])
+ have_x11=yes
+ DBUS_X_LIBS="$X_LIBS"
+ DBUS_X_CFLAGS="$X_CFLAGS"
+ ], [
+ AS_IF([test "x$with_x" = xyes],
+ [AC_MSG_ERROR([Couldn't find X11, tried with pkg-config.])],
+ [AC_MSG_WARN([Couldn't find X11, tried with pkg-config.])]
+ )
+ have_x11=no
+ ])
+], [
+ have_x11=no
AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [
AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible])
])
-fi
-fi
+])
if test "x$enable_x11_autolaunch,$have_x11" = xyes,no; then
AC_MSG_ERROR([X11 auto-launch requires X headers/libraries])

12
x11/dbus/patches/patch-dbus_dbus-sysdeps-util-unix_c
View File

@ -1,11 +1,9 @@
$OpenBSD: patch-dbus_dbus-sysdeps-util-unix_c,v 1.18 2022/02/26 08:39:11 ajacoutot Exp $
XXX push upstream
Index: dbus/dbus-sysdeps-util-unix.c
--- dbus/dbus-sysdeps-util-unix.c.orig
+++ dbus/dbus-sysdeps-util-unix.c
@@ -59,6 +59,10 @@
@@ -64,6 +64,10 @@
#include <systemd/sd-daemon.h>
#endif
@ -16,7 +14,7 @@ Index: dbus/dbus-sysdeps-util-unix.c
#ifndef O_BINARY
#define O_BINARY 0
#endif
@@ -1138,7 +1142,13 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1161,7 +1165,13 @@ _dbus_command_for_pid (unsigned long pid,
/* This is all Linux-specific for now */
DBusString path;
DBusString cmdline;
@ -30,7 +28,7 @@ Index: dbus/dbus-sysdeps-util-unix.c
if (!_dbus_string_init (&path))
{
@@ -1153,6 +1163,7 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1176,6 +1186,7 @@ _dbus_command_for_pid (unsigned long pid,
return FALSE;
}
@ -38,7 +36,7 @@ Index: dbus/dbus-sysdeps-util-unix.c
if (!_dbus_string_append_printf (&path, "/proc/%ld/cmdline", pid))
goto oom;
@@ -1180,6 +1191,37 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1203,6 +1214,37 @@ _dbus_command_for_pid (unsigned long pid,
if (!_dbus_close (fd, error))
goto fail;
@ -76,7 +74,7 @@ Index: dbus/dbus-sysdeps-util-unix.c
string_squash_nonprintable (&cmdline);
@@ -1188,12 +1230,18 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1211,12 +1253,18 @@ _dbus_command_for_pid (unsigned long pid,
_dbus_string_free (&cmdline);
_dbus_string_free (&path);

4
x11/dbus/patches/patch-doc_dbus-specification_xml
View File

@ -1,11 +1,9 @@
$OpenBSD: patch-doc_dbus-specification_xml,v 1.5 2017/11/01 06:27:31 ajacoutot Exp $
/lib -> /var/db
Index: doc/dbus-specification.xml
--- doc/dbus-specification.xml.orig
+++ doc/dbus-specification.xml
@@ -5266,7 +5266,7 @@
@@ -5743,7 +5743,7 @@
for .service files in
<literal>/usr/local/share/dbus-1/system-services</literal>,
<literal>/usr/share/dbus-1/system-services</literal> and

5
x11/dbus/pkg/PLIST-main
View File

@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.10 2021/09/02 19:32:39 ajacoutot Exp $
@pkgpath x11/dbus
@newgroup _dbus:572
@newuser _dbus:572:_dbus:daemon:dbus user:/nonexistent:/sbin/nologin
@newuser _dbus:572:_dbus::dbus user:/nonexistent:/sbin/nologin
@extra ${SYSCONFDIR}/machine-id
@rcscript ${RCDIR}/messagebus
@bin bin/dbus-cleanup-sockets
@ -80,6 +79,7 @@ share/doc/dbus/examples/
share/doc/dbus/examples/GetAllMatchRules.py
share/doc/dbus/examples/example-session-disable-stats.conf
share/doc/dbus/examples/example-system-enable-stats.conf
share/doc/dbus/examples/example-system-hardening-without-traditional-activation.conf
share/doc/dbus/system-activation.txt
share/doc/pkg-readmes/${PKGSTEM}
share/examples/dbus/
@ -93,5 +93,6 @@ share/examples/dbus/dbus-1/system.conf
share/xml/
share/xml/dbus-1/
share/xml/dbus-1/busconfig.dtd
share/xml/dbus-1/catalog.xml
share/xml/dbus-1/introspect.dtd
@exec ${PREFIX}/bin/dbus-uuidgen --ensure=${SYSCONFDIR}/machine-id

1
x11/dbus/pkg/PLIST-suid
View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST-suid,v 1.4 2021/09/02 19:32:39 ajacoutot Exp $
@conflict dbus-<1.8.16p0v0
@mode 4750
@group _dbus