dbus: update to 1.12.2. dbus 1.12.2 (2017-11-13) ======================== The “spider pumpkin” release. Enhancements: • Log a warning if a new connection cannot be accepted due to an out-of-memory condition or failure to identify its AppArmor or SELinux context (fd.o #103592, Simon McVittie) Fixes: • Make use of $(MKDIR_P) compatible with install-sh, fixing build when a GNU-compatible `mkdir -p` is not available (fd.o #103521, ilovezfs) • When building for Windows with Autotools, avoid `echo -e`, fixing cross-compilation on non-GNU platforms like macOS (fd.o #103493, Tony Theodore) • Fix crashes in the server side of the nonce-tcp: transport under various error conditions. This transport should normally only be used on Windows, where AF_UNIX sockets are unavailable; the unix: transport is the only one recommended for production use on Unix platforms. (fd.o #103597, Simon McVittie) Internal changes: • Improve test coverage on Travis-CI (Simon McVittie) dbus 1.12.0 (2017-10-30) ======================== The “gingerbread skull” release. 1.12.x is a new stable branch, recommended for use in OS distributions. Summary of major changes between 1.10.x and 1.12.0 -------------------------------------------------- Dependencies: • Expat >= 2.1.0 is required. • GLib >= 2.40 is required if full test coverage is enabled. • [Linux] libselinux >= 2.0.86 is required if SELinux support is enabled. • [Unix] dbus now requires an <inttypes.h> that defines C99 constants such as PRId64 and PRIu64, except when building for Windows. • [Autotools] Building from git (but not from tarballs) with Autotools now requires macros from the GNU Autoconf Archive. • [CMake] Builds done using CMake now require CMake 3.0.2. Build-time configuration changes: • Expat is now found using pkg-config. See the release notes for 1.11.14. • The --disable-compiler-optimisations and --enable-compiler-coverage options no longer exist. See the release notes for 1.11.4 and 1.11.8. • [Unix] The --enable-abstract-sockets and --disable-abstract-sockets options no longer exist. See the release notes for 1.11.20. • [Unix] Flag files in /var/run/console/${username} are no longer checked for at_console by default. See the release notes for 1.11.18. • [Unix, Cygwin] Init scripts are no longer provided by upstream dbus, and packagers will now need to add these downstream (most already do). See the release notes for 1.11.18. • [Unix] The process ID file no longer has a different default location on Red Hat derivatives. See the release notes for 1.11.18. • [Unix] ${runstatedir} is now independent of ${localstatedir} with recent Autotools versions. See the release notes for 1.11.16. • [Windows] The WINDRES variable is no longer used. See the release notes for 1.11.22. Deprecations: • Eavesdropping is officially deprecated in favour of BecomeMonitor. See the release notes for spec version 0.31 (in dbus 1.11.14). • [Unix] Flag files in /var/run/console/${username} are deprecated. See the release notes for 1.11.18. New APIs: • <allow> and <deny> rules in dbus-daemon configuration can now include send_broadcast="true", send_broadcast="false", max_unix_fds="N", min_unix_fds="N" (for some integer N). See the release notes for 1.11.18. • dbus_try_get_local_machine_id() is like dbus_get_local_machine_id(), but returns a DBusError. • New APIs around DBusMessageIter to simplify cleanup. See the release notes for 1.11.16. • The message bus daemon now implements the standard Introspectable, Peer and Properties interfaces. See the release notes for dbus 1.11.14 and spec version 0.31. • DTDs for introspection XML and bus configuration are installed. • dbus can be compiled to be relocatable, making it more suitable for binary bundling with other software. On Windows, this is on by default. • [Unix] A new unix:dir=… address family resembles unix:tmpdir=… but never uses Linux abstract sockets, which is advantageous for containers. On non-Linux it is equivalent to unix:tmpdir=…. See the release notes for dbus 1.11.14 and spec version 0.31. • [Unix] New option "dbus-launch --exit-with-x11". • [Unix] Session managers can create transient .service files in $XDG_RUNTIME_DIR/dbus-1/services. See the release notes for 1.11.12. • [Unix] A sysusers.d snippet can create the messagebus user on-demand. Miscellaneous behaviour changes: • [Unix] The session bus now logs to syslog if it was started by dbus-launch. • [Unix] Internal warnings are logged to syslog if configured. • [Unix] Exceeding an anti-DoS limit is logged to syslog if configured, or to stderr.diff -r1.110 -r1.111 pkgsrc/sysutils/dbus/Makefile
(wiz)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.110 2017/10/02 13:36:34 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.111 2017/11/23 14:43:23 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= dbus-1.10.24 | 3 | DISTNAME= dbus-1.12.2 | |
4 | CATEGORIES= sysutils | 4 | CATEGORIES= sysutils | |
5 | MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ | 5 | MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ | |
6 | 6 | |||
7 | MAINTAINER= pkgsrc-users@NetBSD.org | 7 | MAINTAINER= pkgsrc-users@NetBSD.org | |
8 | HOMEPAGE= http://www.freedesktop.org/Software/dbus | 8 | HOMEPAGE= http://www.freedesktop.org/Software/dbus | |
9 | COMMENT= Message bus system | 9 | COMMENT= Message bus system | |
10 | LICENSE= gnu-gpl-v2 | 10 | LICENSE= gnu-gpl-v2 | |
11 | 11 | |||
12 | CONFLICTS+= dbus-glib<0.71 | 12 | CONFLICTS+= dbus-glib<0.71 | |
13 | CONFLICTS+= py27-dbus<0.71 | 13 | CONFLICTS+= py27-dbus<0.71 | |
14 | 14 | |||
15 | BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto | 15 | BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto | |
16 | 16 | |||
@@ -28,27 +28,26 @@ SPECIAL_PERMS+= libexec/dbus-daemon-lau | @@ -28,27 +28,26 @@ SPECIAL_PERMS+= libexec/dbus-daemon-lau | |||
28 | SMF_METHODS= dbus | 28 | SMF_METHODS= dbus | |
29 | SMF_NAME= dbus | 29 | SMF_NAME= dbus | |
30 | 30 | |||
31 | MESSAGE_SRC+= MESSAGE | 31 | MESSAGE_SRC+= MESSAGE | |
32 | 32 | |||
33 | .include "../../mk/bsd.prefs.mk" | 33 | .include "../../mk/bsd.prefs.mk" | |
34 | 34 | |||
35 | CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} | 35 | CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} | |
36 | 36 | |||
37 | # Prevent the configure script from picking up a per-user tmp | 37 | # Prevent the configure script from picking up a per-user tmp | |
38 | # directory. See the commit message on revision 1.35 | 38 | # directory. See the commit message on revision 1.35 | |
39 | CONFIGURE_ARGS+= --with-session-socket-dir=/tmp | 39 | CONFIGURE_ARGS+= --with-session-socket-dir=/tmp | |
40 | 40 | |||
41 | CONFIGURE_ARGS+= --without-init-scripts | |||
42 | CONFIGURE_ARGS+= --disable-ansi | 41 | CONFIGURE_ARGS+= --disable-ansi | |
43 | CONFIGURE_ARGS+= --disable-console-owner-file | 42 | CONFIGURE_ARGS+= --disable-console-owner-file | |
44 | CONFIGURE_ARGS+= --disable-doxygen-docs | 43 | CONFIGURE_ARGS+= --disable-doxygen-docs | |
45 | CONFIGURE_ARGS+= --enable-checks | 44 | CONFIGURE_ARGS+= --enable-checks | |
46 | CONFIGURE_ARGS+= --enable-static | 45 | CONFIGURE_ARGS+= --enable-static | |
47 | 46 | |||
48 | ### | 47 | ### | |
49 | ### XXX the spawn test hangs, and some of these tests may be bogus | 48 | ### XXX the spawn test hangs, and some of these tests may be bogus | |
50 | ### | 49 | ### | |
51 | #.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss]) | 50 | #.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss]) | |
52 | #PKG_OPTIONS.dbus+= debug | 51 | #PKG_OPTIONS.dbus+= debug | |
53 | #TEST_TARGET= check | 52 | #TEST_TARGET= check | |
54 | #.endif | 53 | #.endif | |
@@ -56,27 +55,26 @@ CONFIGURE_ARGS+= --enable-static | @@ -56,27 +55,26 @@ CONFIGURE_ARGS+= --enable-static | |||
56 | CONFIGURE_ARGS+= --with-dbus-user=${DBUS_USER} | 55 | CONFIGURE_ARGS+= --with-dbus-user=${DBUS_USER} | |
57 | CONFIGURE_ARGS+= --with-test-socket-dir=${WRKDIR:Q} | 56 | CONFIGURE_ARGS+= --with-test-socket-dir=${WRKDIR:Q} | |
58 | 57 | |||
59 | SUBST_CLASSES+= docbook | 58 | SUBST_CLASSES+= docbook | |
60 | SUBST_STAGE.docbook= pre-configure | 59 | SUBST_STAGE.docbook= pre-configure | |
61 | SUBST_FILES.docbook= doc/*.xml* | 60 | SUBST_FILES.docbook= doc/*.xml* | |
62 | SUBST_SED.docbook= -e 's,http://www.oasis-open.org/docbook/xml,${PREFIX}/share/xml/docbook,g' | 61 | SUBST_SED.docbook= -e 's,http://www.oasis-open.org/docbook/xml,${PREFIX}/share/xml/docbook,g' | |
63 | 62 | |||
64 | PTHREAD_AUTO_VARS= yes | 63 | PTHREAD_AUTO_VARS= yes | |
65 | 64 | |||
66 | .if ${OPSYS} == "Linux" | 65 | .if ${OPSYS} == "Linux" | |
67 | PLIST.linux= yes | 66 | PLIST.linux= yes | |
68 | .else | 67 | .else | |
69 | CONFIGURE_ARGS+= --disable-abstract-sockets | |||
70 | CONFIGURE_ARGS+= --disable-selinux | 68 | CONFIGURE_ARGS+= --disable-selinux | |
71 | .endif | 69 | .endif | |
72 | 70 | |||
73 | PLIST_VARS+= linux launchd | 71 | PLIST_VARS+= linux launchd | |
74 | 72 | |||
75 | DBUS_CONF_DIR= ${PKG_SYSCONFBASE}/dbus-1 | 73 | DBUS_CONF_DIR= ${PKG_SYSCONFBASE}/dbus-1 | |
76 | OWN_DIRS+= ${DBUS_CONF_DIR}/services | 74 | OWN_DIRS+= ${DBUS_CONF_DIR}/services | |
77 | OWN_DIRS+= ${DBUS_CONF_DIR}/system-services | 75 | OWN_DIRS+= ${DBUS_CONF_DIR}/system-services | |
78 | OWN_DIRS+= ${DBUS_CONF_DIR}/session.d | 76 | OWN_DIRS+= ${DBUS_CONF_DIR}/session.d | |
79 | OWN_DIRS+= ${DBUS_CONF_DIR}/system.d | 77 | OWN_DIRS+= ${DBUS_CONF_DIR}/system.d | |
80 | 78 | |||
81 | RCD_SCRIPTS= dbus | 79 | RCD_SCRIPTS= dbus | |
82 | 80 | |||
@@ -99,15 +97,16 @@ BUILDLINK_TRANSFORM+= rm:-pie | @@ -99,15 +97,16 @@ BUILDLINK_TRANSFORM+= rm:-pie | |||
99 | 97 | |||
100 | BUILDLINK_TRANSFORM.OpenBSD+= rm:-lrt | 98 | BUILDLINK_TRANSFORM.OpenBSD+= rm:-lrt | |
101 | 99 | |||
102 | .include "options.mk" | 100 | .include "options.mk" | |
103 | 101 | |||
104 | post-install: | 102 | post-install: | |
105 | ${INSTALL_DATA} ${WRKSRC}/doc/introspect.* \ | 103 | ${INSTALL_DATA} ${WRKSRC}/doc/introspect.* \ | |
106 | ${DESTDIR}${PREFIX}/share/doc/dbus/ | 104 | ${DESTDIR}${PREFIX}/share/doc/dbus/ | |
107 | ${RM} -f ${DESTDIR}${PREFIX}/etc/dbus-1/s*.conf | 105 | ${RM} -f ${DESTDIR}${PREFIX}/etc/dbus-1/s*.conf | |
108 | ${RMDIR} ${DESTDIR}${PREFIX}/etc/dbus-1 || ${TRUE} | 106 | ${RMDIR} ${DESTDIR}${PREFIX}/etc/dbus-1 || ${TRUE} | |
109 | 107 | |||
110 | .include "../../mk/pthread.buildlink3.mk" | 108 | .include "../../mk/pthread.buildlink3.mk" | |
111 | .include "../../devel/gettext-lib/buildlink3.mk" | 109 | .include "../../devel/gettext-lib/buildlink3.mk" | |
110 | BUILDLINK_ABI_DEPENDS.expat+= expat>=2.1.0 | |||
112 | .include "../../textproc/expat/buildlink3.mk" | 111 | .include "../../textproc/expat/buildlink3.mk" | |
113 | .include "../../mk/bsd.pkg.mk" | 112 | .include "../../mk/bsd.pkg.mk" |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.20 2015/08/30 15:08:00 wiz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.21 2017/11/23 14:43:23 wiz Exp $ | |
2 | ${PLIST.launchd}Library/LaunchAgents/org.freedesktop.dbus-session.plist | 2 | ${PLIST.launchd}Library/LaunchAgents/org.freedesktop.dbus-session.plist | |
3 | bin/dbus-cleanup-sockets | 3 | bin/dbus-cleanup-sockets | |
4 | bin/dbus-daemon | 4 | bin/dbus-daemon | |
5 | bin/dbus-launch | 5 | bin/dbus-launch | |
6 | bin/dbus-monitor | 6 | bin/dbus-monitor | |
7 | bin/dbus-run-session | 7 | bin/dbus-run-session | |
8 | bin/dbus-send | 8 | bin/dbus-send | |
9 | bin/dbus-test-tool | 9 | bin/dbus-test-tool | |
10 | bin/dbus-update-activation-environment | 10 | bin/dbus-update-activation-environment | |
11 | bin/dbus-uuidgen | 11 | bin/dbus-uuidgen | |
12 | include/dbus-1.0/dbus/dbus-address.h | 12 | include/dbus-1.0/dbus/dbus-address.h | |
13 | include/dbus-1.0/dbus/dbus-bus.h | 13 | include/dbus-1.0/dbus/dbus-bus.h | |
14 | include/dbus-1.0/dbus/dbus-connection.h | 14 | include/dbus-1.0/dbus/dbus-connection.h | |
@@ -16,26 +16,28 @@ include/dbus-1.0/dbus/dbus-errors.h | @@ -16,26 +16,28 @@ include/dbus-1.0/dbus/dbus-errors.h | |||
16 | include/dbus-1.0/dbus/dbus-macros.h | 16 | include/dbus-1.0/dbus/dbus-macros.h | |
17 | include/dbus-1.0/dbus/dbus-memory.h | 17 | include/dbus-1.0/dbus/dbus-memory.h | |
18 | include/dbus-1.0/dbus/dbus-message.h | 18 | include/dbus-1.0/dbus/dbus-message.h | |
19 | include/dbus-1.0/dbus/dbus-misc.h | 19 | include/dbus-1.0/dbus/dbus-misc.h | |
20 | include/dbus-1.0/dbus/dbus-pending-call.h | 20 | include/dbus-1.0/dbus/dbus-pending-call.h | |
21 | include/dbus-1.0/dbus/dbus-protocol.h | 21 | include/dbus-1.0/dbus/dbus-protocol.h | |
22 | include/dbus-1.0/dbus/dbus-server.h | 22 | include/dbus-1.0/dbus/dbus-server.h | |
23 | include/dbus-1.0/dbus/dbus-shared.h | 23 | include/dbus-1.0/dbus/dbus-shared.h | |
24 | include/dbus-1.0/dbus/dbus-signature.h | 24 | include/dbus-1.0/dbus/dbus-signature.h | |
25 | include/dbus-1.0/dbus/dbus-syntax.h | 25 | include/dbus-1.0/dbus/dbus-syntax.h | |
26 | include/dbus-1.0/dbus/dbus-threads.h | 26 | include/dbus-1.0/dbus/dbus-threads.h | |
27 | include/dbus-1.0/dbus/dbus-types.h | 27 | include/dbus-1.0/dbus/dbus-types.h | |
28 | include/dbus-1.0/dbus/dbus.h | 28 | include/dbus-1.0/dbus/dbus.h | |
29 | lib/cmake/DBus1/DBus1Config.cmake | |||
30 | lib/cmake/DBus1/DBus1ConfigVersion.cmake | |||
29 | lib/dbus-1.0/include/dbus/dbus-arch-deps.h | 31 | lib/dbus-1.0/include/dbus/dbus-arch-deps.h | |
30 | lib/libdbus-1.la | 32 | lib/libdbus-1.la | |
31 | lib/pkgconfig/dbus-1.pc | 33 | lib/pkgconfig/dbus-1.pc | |
32 | libexec/dbus-daemon-launch-helper | 34 | libexec/dbus-daemon-launch-helper | |
33 | man/man1/dbus-cleanup-sockets.1 | 35 | man/man1/dbus-cleanup-sockets.1 | |
34 | man/man1/dbus-daemon.1 | 36 | man/man1/dbus-daemon.1 | |
35 | man/man1/dbus-launch.1 | 37 | man/man1/dbus-launch.1 | |
36 | man/man1/dbus-monitor.1 | 38 | man/man1/dbus-monitor.1 | |
37 | man/man1/dbus-run-session.1 | 39 | man/man1/dbus-run-session.1 | |
38 | man/man1/dbus-send.1 | 40 | man/man1/dbus-send.1 | |
39 | man/man1/dbus-test-tool.1 | 41 | man/man1/dbus-test-tool.1 | |
40 | man/man1/dbus-update-activation-environment.1 | 42 | man/man1/dbus-update-activation-environment.1 | |
41 | man/man1/dbus-uuidgen.1 | 43 | man/man1/dbus-uuidgen.1 | |
@@ -52,13 +54,15 @@ share/doc/dbus/dbus-specification.html | @@ -52,13 +54,15 @@ share/doc/dbus/dbus-specification.html | |||
52 | share/doc/dbus/dbus-test-plan.html | 54 | share/doc/dbus/dbus-test-plan.html | |
53 | share/doc/dbus/dbus-test-tool.1.html | 55 | share/doc/dbus/dbus-test-tool.1.html | |
54 | share/doc/dbus/dbus-tutorial.html | 56 | share/doc/dbus/dbus-tutorial.html | |
55 | share/doc/dbus/dbus-update-activation-environment.1.html | 57 | share/doc/dbus/dbus-update-activation-environment.1.html | |
56 | share/doc/dbus/dbus-uuidgen.1.html | 58 | share/doc/dbus/dbus-uuidgen.1.html | |
57 | share/doc/dbus/diagram.png | 59 | share/doc/dbus/diagram.png | |
58 | share/doc/dbus/diagram.svg | 60 | share/doc/dbus/diagram.svg | |
59 | share/doc/dbus/examples/GetAllMatchRules.py | 61 | share/doc/dbus/examples/GetAllMatchRules.py | |
60 | share/doc/dbus/examples/example-session-disable-stats.conf | 62 | share/doc/dbus/examples/example-session-disable-stats.conf | |
61 | share/doc/dbus/examples/example-system-enable-stats.conf | 63 | share/doc/dbus/examples/example-system-enable-stats.conf | |
62 | share/doc/dbus/introspect.dtd | 64 | share/doc/dbus/introspect.dtd | |
63 | share/doc/dbus/introspect.xsl | 65 | share/doc/dbus/introspect.xsl | |
64 | share/doc/dbus/system-activation.txt | 66 | share/doc/dbus/system-activation.txt | |
67 | share/xml/dbus-1/busconfig.dtd | |||
68 | share/xml/dbus-1/introspect.dtd |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: distinfo,v 1.84 2017/10/02 13:36:34 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.85 2017/11/23 14:43:23 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (dbus-1.10.24.tar.gz) = 85585fdfbaf83b7183f70eb840727172206592f9 | 3 | SHA1 (dbus-1.12.2.tar.gz) = 701da5c72a721ea1c4af66bc8606ac2deb5f7159 | |
4 | RMD160 (dbus-1.10.24.tar.gz) = 156d6c4c089f244cbbdd6aeec03909276bc06f70 | 4 | RMD160 (dbus-1.12.2.tar.gz) = c032fedc852a1a6fccb11cea1f41c49df7466d8b | |
5 | SHA512 (dbus-1.10.24.tar.gz) = fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c | 5 | SHA512 (dbus-1.12.2.tar.gz) = 523698ae543a4f1d9142898351ed38827882a3ca583ca7934676af48d09219ea562ae77d734cd142e5ca0d5e74f9e8d0fdeb1019592ca3524e2b690c6283f7cd | |
6 | Size (dbus-1.10.24.tar.gz) = 1991358 bytes | 6 | Size (dbus-1.12.2.tar.gz) = 2063143 bytes | |
7 | SHA1 (patch-ak) = ebb0c291297577a9cff246e7bc71412bf6157254 | 7 | SHA1 (patch-ak) = 4535584537a22a2e42824fe45e2d75253b484147 | |
8 | SHA1 (patch-al) = c70be84ae79698cc4d83087427646bfb0500f194 | 8 | SHA1 (patch-al) = ffaa8f224c3dd6a97ffa42fe2e9ca924160fa68c | |
9 | SHA1 (patch-am) = ed334bc76911c9db9f5472c58fb762c56255c5b4 | 9 | SHA1 (patch-am) = ed334bc76911c9db9f5472c58fb762c56255c5b4 | |
10 | SHA1 (patch-configure) = 9dee6306aa07b60449a0f9f0f1ea3dccbc70dcb4 | 10 | SHA1 (patch-configure) = 9dee6306aa07b60449a0f9f0f1ea3dccbc70dcb4 | |
11 | SHA1 (patch-dbus_dbus-sysdeps-unix.c) = 3dfc60eba7ab9d5a29d2a842ce0baa1b109df716 | 11 | SHA1 (patch-dbus_dbus-sysdeps-unix.c) = 3dfc60eba7ab9d5a29d2a842ce0baa1b109df716 | |
12 | SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 9c967cdac585220a3e65443dc9642e7d4478567c | 12 | SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 1a25e53514064e452a207ad8b2a0057c11d5c190 | |
13 | SHA1 (patch-tools_dbus-print-message.c) = 96267d3cff2c5207911615735748ef81604a69ec | 13 | SHA1 (patch-tools_dbus-print-message.c) = 96267d3cff2c5207911615735748ef81604a69ec |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: patch-ak,v 1.5 2015/12/06 11:35:55 wiz Exp $ | 1 | $NetBSD: patch-ak,v 1.6 2017/11/23 14:43:23 wiz Exp $ | |
2 | 2 | |||
3 | Adapt path for pkgsrc. | 3 | Adapt path for pkgsrc. | |
4 | 4 | |||
5 | --- dbus/Makefile.in.orig 2015-08-25 15:52:09.000000000 +0000 | 5 | --- dbus/Makefile.in.orig 2017-11-13 13:36:10.000000000 +0000 | |
6 | +++ dbus/Makefile.in | 6 | +++ dbus/Makefile.in | |
7 | @@ -589,7 +589,7 @@ dbusdatadir = $(datadir)/dbus-1 | 7 | @@ -619,7 +619,7 @@ dbusdatadir = $(datadir)/dbus-1 | |
8 | AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \ | 8 | AM_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) -I$(top_builddir) \ | |
9 | $(DBUS_STATIC_BUILD_CPPFLAGS) $(SYSTEMD_CFLAGS) \ | 9 | -I$(top_srcdir) $(DBUS_STATIC_BUILD_CPPFLAGS) \ | |
10 | $(VALGRIND_CFLAGS) -DDBUS_COMPILATION \ | 10 | $(SYSTEMD_CFLAGS) $(VALGRIND_CFLAGS) -DDBUS_COMPILATION \ | |
11 | - -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ | 11 | - -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ | |
12 | + -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \ | 12 | + -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \ | |
13 | -DDBUS_SYSTEM_CONFIG_FILE=\""$(dbusdatadir)/system.conf"\" \ | 13 | -DDBUS_SYSTEM_CONFIG_FILE=\""$(dbusdatadir)/system.conf"\" \ | |
14 | -DDBUS_SESSION_CONFIG_FILE=\""$(dbusdatadir)/session.conf"\" \ | 14 | -DDBUS_SESSION_CONFIG_FILE=\""$(dbusdatadir)/session.conf"\" \ | |
15 | $(NULL) $(am__append_2) | 15 | -DDBUS_RUNSTATEDIR=\""$(runstatedir)"\" $(NULL) \ |
@@ -1,27 +1,27 @@ | @@ -1,27 +1,27 @@ | |||
1 | $NetBSD: patch-al,v 1.5 2015/12/06 11:35:55 wiz Exp $ | 1 | $NetBSD: patch-al,v 1.6 2017/11/23 14:43:23 wiz Exp $ | |
2 | 2 | |||
3 | Adapt path for pkgsrc. | 3 | Adapt path for pkgsrc. | |
4 | 4 | |||
5 | --- tools/Makefile.in.orig 2015-07-21 16:32:32.000000000 +0000 | 5 | --- tools/Makefile.in.orig 2017-11-13 13:36:10.000000000 +0000 | |
6 | +++ tools/Makefile.in | 6 | +++ tools/Makefile.in | |
7 | @@ -428,7 +428,7 @@ AM_CPPFLAGS = \ | 7 | @@ -515,7 +515,7 @@ AM_CPPFLAGS = \ | |
8 | $(DBUS_STATIC_BUILD_CPPFLAGS) \ | 8 | $(DBUS_STATIC_BUILD_CPPFLAGS) \ | |
9 | $(DBUS_X_CFLAGS) \ | 9 | $(DBUS_X_CFLAGS) \ | |
10 | -DDBUS_COMPILATION \ | 10 | -DDBUS_COMPILATION \ | |
11 | - -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ | 11 | - -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ | |
12 | + -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \ | 12 | + -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \ | |
13 | $(NULL) | 13 | $(NULL) | |
14 | 14 | |||
15 | 15 | AM_CFLAGS = \ | ||
16 | @@ -847,9 +847,9 @@ uninstall-am: uninstall-binPROGRAMS | 16 | @@ -1092,9 +1092,9 @@ uninstall-am: uninstall-binPROGRAMS unin | |
17 | .PRECIOUS: Makefile | 17 | @DBUS_WIN_TRUE@disable-uac.rc: Win32.Manifest | |
18 | 18 | @DBUS_WIN_TRUE@ echo '1 24 "$<"' > $@ | ||
19 | 19 | |||
20 | -# create the /var/lib/dbus directory for dbus-uuidgen | 20 | -# create the /var/lib/dbus directory for dbus-uuidgen | |
21 | +# create the /var/db/dbus directory for dbus-uuidgen | 21 | +# create the /var/db/dbus directory for dbus-uuidgen | |
22 | install-data-local: | 22 | install-data-local: | |
23 | - $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus | 23 | - $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus | |
24 | + $(MKDIR_P) $(DESTDIR)$(localstatedir)/db/dbus | 24 | + $(MKDIR_P) $(DESTDIR)$(localstatedir)/db/dbus | |
25 | 25 | |||
26 | installcheck-local: | 26 | installcheck-local: | |
27 | test -d $(DESTDIR)$(localstatedir)/lib/dbus | 27 | test -d $(DESTDIR)$(localstatedir)/lib/dbus |
@@ -1,32 +1,32 @@ | @@ -1,32 +1,32 @@ | |||
1 | $NetBSD: patch-dbus_dbus-sysdeps-util-unix.c,v 1.3 2014/09/13 09:47:11 richard Exp $ | 1 | $NetBSD: patch-dbus_dbus-sysdeps-util-unix.c,v 1.4 2017/11/23 14:43:23 wiz Exp $ | |
2 | 2 | |||
3 | add solaris specific console_user test | 3 | add solaris specific console_user test | |
4 | 4 | |||
5 | --- dbus/dbus-sysdeps-util-unix.c.orig 2014-01-25 12:39:25.000000000 +0000 | 5 | --- dbus/dbus-sysdeps-util-unix.c.orig 2017-10-30 12:26:18.000000000 +0000 | |
6 | +++ dbus/dbus-sysdeps-util-unix.c | 6 | +++ dbus/dbus-sysdeps-util-unix.c | |
7 | @@ -54,6 +54,10 @@ | 7 | @@ -51,6 +51,10 @@ | |
8 | #include <syslog.h> | 8 | #include <dirent.h> | |
9 | #endif | 9 | #include <sys/un.h> | |
10 | 10 | |||
11 | +#if defined(__sun) && defined(__SVR4) | 11 | +#if defined(__sun) && defined(__SVR4) | |
12 | +#include <pwd.h> | 12 | +#include <pwd.h> | |
13 | +#endif | 13 | +#endif | |
14 | + | 14 | + | |
15 | #ifdef HAVE_SYS_SYSLIMITS_H | 15 | #ifdef HAVE_SYS_SYSLIMITS_H | |
16 | #include <sys/syslimits.h> | 16 | #include <sys/syslimits.h> | |
17 | #endif | 17 | #endif | |
18 | @@ -556,8 +560,31 @@ _dbus_user_at_console (const char *usern | 18 | @@ -551,8 +555,31 @@ _dbus_user_at_console (const char *usern | |
19 | 19 | #ifdef DBUS_CONSOLE_AUTH_DIR | ||
20 | DBusString u, f; | 20 | DBusString u, f; | |
21 | dbus_bool_t result; | 21 | dbus_bool_t result; | |
22 | +#if defined(__sun) && defined(__SVR4) | 22 | +#if defined(__sun) && defined(__SVR4) | |
23 | + struct passwd *passwd_entry; | 23 | + struct passwd *passwd_entry; | |
24 | +#endif | 24 | +#endif | |
25 | 25 | |||
26 | result = FALSE; | 26 | result = FALSE; | |
27 | + | 27 | + | |
28 | +#if defined(__sun) && defined(__SVR4) | 28 | +#if defined(__sun) && defined(__SVR4) | |
29 | + passwd_entry = getpwnam (username); | 29 | + passwd_entry = getpwnam (username); | |
30 | + if (passwd_entry != NULL) | 30 | + if (passwd_entry != NULL) | |
31 | + { | 31 | + { | |
32 | + struct stat st; | 32 | + struct stat st; | |
@@ -37,21 +37,21 @@ add solaris specific console_user test | @@ -37,21 +37,21 @@ add solaris specific console_user test | |||
37 | + if (stat ("/dev/vt/console_user", &st) == 0 && st.st_uid == uid) | 37 | + if (stat ("/dev/vt/console_user", &st) == 0 && st.st_uid == uid) | |
38 | + { | 38 | + { | |
39 | + /* | 39 | + /* | |
40 | + * Owner is allowed to take over. Before we have real | 40 | + * Owner is allowed to take over. Before we have real | |
41 | + * ownership in HAL, assume it's the console owner. | 41 | + * ownership in HAL, assume it's the console owner. | |
42 | + */ | 42 | + */ | |
43 | + result = TRUE; | 43 | + result = TRUE; | |
44 | + } | 44 | + } | |
45 | + } | 45 | + } | |
46 | +#else | 46 | +#else | |
47 | if (!_dbus_string_init (&f)) | 47 | if (!_dbus_string_init (&f)) | |
48 | { | 48 | { | |
49 | _DBUS_SET_OOM (error); | 49 | _DBUS_SET_OOM (error); | |
50 | @@ -582,6 +609,7 @@ _dbus_user_at_console (const char *usern | 50 | @@ -577,6 +604,7 @@ _dbus_user_at_console (const char *usern | |
51 | 51 | |||
52 | out: | 52 | out: | |
53 | _dbus_string_free (&f); | 53 | _dbus_string_free (&f); | |
54 | +#endif | 54 | +#endif | |
55 | 55 | |||
56 | return result; | 56 | return result; | |
57 | } | 57 | #else |