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

Update to dbus-1.12.22.

Browse Source
This commit is contained in:
ajacoutot 2022-02-26 08:39:11 +00:00
parent bc5cef71a0
commit a4b7660ad3
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x11/dbus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.167 2021/09/02 19:32:39 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.168 2022/02/26 08:39:11 ajacoutot Exp $
# XXX merge on next major update
# https://gitlab.freedesktop.org/dbus/dbus/merge_requests/124/diffs
@ -9,17 +9,14 @@ DPB_PROPERTIES= parallel
COMMENT-main= message bus system
COMMENT-suid= DBus setuid helper for starting system services
REVISION-main= 1
REVISION-suid= 2
V= 1.12.20
V= 1.12.22
DISTNAME= dbus-${V}
EPOCH-main= 0
PKGNAME-main= ${DISTNAME}
PKGNAME-suid= dbus-daemon-launch-helper-${V}
SHARED_LIBS += dbus-1 11.2 # 22.13
SHARED_LIBS += dbus-1 11.2 # 22.14
CATEGORIES= x11

4
x11/dbus/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dbus-1.12.20.tar.gz) = 93YgFA7LTNxn83+0RPimvqcLW2Rh8S8cvizsYPp95f4=
SIZE (dbus-1.12.20.tar.gz) = 2095511
SHA256 (dbus-1.12.22.tar.gz) = jSV4XHmOxPiS5vnRd/sM7riymGexGXmPnVIoVh061HQ=
SIZE (dbus-1.12.22.tar.gz) = 2108231

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

@ -1,4 +1,4 @@
$OpenBSD: patch-dbus_dbus-sysdeps-util-unix_c,v 1.17 2019/05/18 19:02:05 ajacoutot Exp $
$OpenBSD: patch-dbus_dbus-sysdeps-util-unix_c,v 1.18 2022/02/26 08:39:11 ajacoutot Exp $
XXX push upstream
@ -16,7 +16,7 @@ Index: dbus/dbus-sysdeps-util-unix.c
#ifndef O_BINARY
#define O_BINARY 0
#endif
@@ -1131,7 +1135,13 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1138,7 +1142,13 @@ _dbus_command_for_pid (unsigned long pid,
/* This is all Linux-specific for now */
DBusString path;
DBusString cmdline;
@ -30,7 +30,7 @@ Index: dbus/dbus-sysdeps-util-unix.c
if (!_dbus_string_init (&path))
{
@@ -1146,6 +1156,7 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1153,6 +1163,7 @@ _dbus_command_for_pid (unsigned long pid,
return FALSE;
}
@ -38,7 +38,7 @@ Index: dbus/dbus-sysdeps-util-unix.c
if (!_dbus_string_append_printf (&path, "/proc/%ld/cmdline", pid))
goto oom;
@@ -1173,6 +1184,37 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1180,6 +1191,37 @@ _dbus_command_for_pid (unsigned long pid,
if (!_dbus_close (fd, error))
goto fail;
@ -76,7 +76,7 @@ Index: dbus/dbus-sysdeps-util-unix.c
string_squash_nonprintable (&cmdline);
@@ -1181,12 +1223,18 @@ _dbus_command_for_pid (unsigned long pid,
@@ -1188,12 +1230,18 @@ _dbus_command_for_pid (unsigned long pid,
_dbus_string_free (&cmdline);
_dbus_string_free (&path);