rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dbus-dfbsd: Update wip/dbus-dfbsd to 1.12.12

This commit is contained in:
David Shao 2019-02-23 20:52:26 -08:00
parent debaf92adf
commit 7272a6a33c
10 changed files with 192 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dbus-dfbsd/Makefile
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.109 2017/08/14 20:38:10 wiz Exp $
# $NetBSD: Makefile,v 1.116 2018/12/10 08:59:44 wiz Exp $
DISTNAME= dbus-1.10.22
DISTNAME= dbus-1.12.12
CATEGORIES= sysutils
MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
@ -18,10 +18,16 @@ GNU_CONFIGURE= YES
USE_TOOLS+= gmake msgfmt pkg-config
USE_LIBTOOL= YES
# USE_LANGUAGES+= c c++
PKGCONFIG_OVERRIDE= dbus-1.pc.in
BUILD_DEFS+= VARBASE PKG_SYSCONFBASE DBUS_USER DBUS_GROUP DBUS_SYSTEM_PID_FILE
# Moved to options.mk
# OWN_DIRS_PERMS+= ${VARBASE}/db/dbus ${DBUS_USER} ${DBUS_GROUP} 0755
# SPECIAL_PERMS+= libexec/dbus-daemon-launch-helper ${REAL_ROOT_USER} ${DBUS_GROUP} 4511
SMF_METHODS= dbus
SMF_NAME= dbus
@ -29,13 +35,12 @@ MESSAGE_SRC+= MESSAGE
.include "../../mk/bsd.prefs.mk"
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
# Prevent the configure script from picking up a per-user tmp
# directory. See the commit message on revision 1.35
CONFIGURE_ARGS+= --with-session-socket-dir=/tmp
CONFIGURE_ARGS+= --without-init-scripts
CONFIGURE_ARGS+= --disable-ansi
CONFIGURE_ARGS+= --disable-console-owner-file
CONFIGURE_ARGS+= --disable-doxygen-docs
@ -51,7 +56,7 @@ CONFIGURE_ARGS+= --enable-static
#.endif
CONFIGURE_ARGS+= --with-dbus-user=${DBUS_USER}
CONFIGURE_ARGS+= --with-test-socket-dir=${WRKDIR}
CONFIGURE_ARGS+= --with-test-socket-dir=${WRKDIR:Q}
CONFIGURE_ARGS+= --with-system-pid-file=${VARBASE}/run/dbus/${DBUS_SYSTEM_PID_FILE}
SUBST_CLASSES+= docbook
@ -64,13 +69,12 @@ PTHREAD_AUTO_VARS= yes
.if ${OPSYS} == "Linux"
PLIST.linux= yes
.else
CONFIGURE_ARGS+= --disable-abstract-sockets
CONFIGURE_ARGS+= --disable-selinux
CONFIGURE_ARGS+= --disable-apparmor
CONFIGURE_ARGS+= --disable-systemd
# CONFIGURE_ARGS+= --disable-apparmor
# CONFIGURE_ARGS+= --disable-systemd
.endif
PLIST_VARS+= linux launchd
PLIST_VARS+= linux
DBUS_CONF_DIR= ${PKG_SYSCONFBASE}/dbus-1
OWN_DIRS+= ${DBUS_CONF_DIR}/services
@ -94,11 +98,12 @@ FILES_SUBST+= DBUS_USER_SH=${DBUS_USER}
FILES_SUBST+= DBUS_GROUP_SH=${DBUS_GROUP}
FILES_SUBST+= DBUS_SYSTEM_PID_FILE_SH=${DBUS_SYSTEM_PID_FILE}
BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections
# Package tries to use these if gcc accepts them, but that doesn't
# mean that we universally can *run* the executables
BUILDLINK_TRANSFORM+= rm:-fPIE
BUILDLINK_TRANSFORM+= rm:-pie
# Moved to options.mk
# BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections
# # Package tries to use these if gcc accepts them, but that doesn't
# # mean that we universally can *run* the executables
# BUILDLINK_TRANSFORM+= rm:-fPIE
# BUILDLINK_TRANSFORM+= rm:-pie
BUILDLINK_TRANSFORM.OpenBSD+= rm:-lrt
@ -112,5 +117,6 @@ post-install:
.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
BUILDLINK_ABI_DEPENDS.expat+= expat>=2.1.0
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

6
dbus-dfbsd/PLIST
View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.20 2015/08/30 15:08:00 wiz Exp $
@comment $NetBSD: PLIST,v 1.21 2017/11/23 14:43:23 wiz Exp $
${PLIST.launchd}Library/LaunchAgents/org.freedesktop.dbus-session.plist
bin/dbus-cleanup-sockets
bin/dbus-daemon
@ -26,6 +26,8 @@ include/dbus-1.0/dbus/dbus-syntax.h
include/dbus-1.0/dbus/dbus-threads.h
include/dbus-1.0/dbus/dbus-types.h
include/dbus-1.0/dbus/dbus.h
lib/cmake/DBus1/DBus1Config.cmake
lib/cmake/DBus1/DBus1ConfigVersion.cmake
lib/dbus-1.0/include/dbus/dbus-arch-deps.h
lib/libdbus-1.la
lib/pkgconfig/dbus-1.pc
@ -62,3 +64,5 @@ share/doc/dbus/examples/example-system-enable-stats.conf
share/doc/dbus/introspect.dtd
share/doc/dbus/introspect.xsl
share/doc/dbus/system-activation.txt
share/xml/dbus-1/busconfig.dtd
share/xml/dbus-1/introspect.dtd

2
dbus-dfbsd/buildlink3.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.16 2014/01/29 13:01:53 ryoon Exp $
# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:31 rillig Exp $
BUILDLINK_TREE+= dbus

17
dbus-dfbsd/distinfo
View File

@ -1,13 +1,14 @@
$NetBSD: distinfo,v 1.83 2017/08/14 20:38:10 wiz Exp $
$NetBSD: distinfo,v 1.90 2018/12/10 08:59:44 wiz Exp $
SHA1 (dbus-1.10.22.tar.gz) = 9d4e93475fb95498cc105af68c88eb51f3062e6d
RMD160 (dbus-1.10.22.tar.gz) = 64615bd0f1947166dbe64ee1de92af1b6fd3256c
SHA512 (dbus-1.10.22.tar.gz) = c5c0040717ecef66b788c5bcda94463c079502b5004639b3c1e93bb92b4de5d9be8b3fe43e18843f1d9e50411f742ba8a869375b57d479882f8aee46b613c545
Size (dbus-1.10.22.tar.gz) = 1989350 bytes
SHA1 (patch-ak) = ebb0c291297577a9cff246e7bc71412bf6157254
SHA1 (patch-al) = c70be84ae79698cc4d83087427646bfb0500f194
SHA1 (dbus-1.12.12.tar.gz) = ff61dc5bb7e3b4dd86444f4a72fb54378edc54fa
RMD160 (dbus-1.12.12.tar.gz) = d0c32565de9690671ee78cb030be6fa688aa96b6
SHA512 (dbus-1.12.12.tar.gz) = 51af4e86ab7d36e1c9a861164e7cd7aa1605fdd82f90aed8728b34c45a87864a00671de9db00d88ea6f96be97459c7eb53d2517ea9d9687ae9ebf81c58c3a80f
Size (dbus-1.12.12.tar.gz) = 2077301 bytes
SHA1 (patch-ak) = 4535584537a22a2e42824fe45e2d75253b484147
SHA1 (patch-al) = ffaa8f224c3dd6a97ffa42fe2e9ca924160fa68c
SHA1 (patch-am) = ed334bc76911c9db9f5472c58fb762c56255c5b4
SHA1 (patch-configure) = 9dee6306aa07b60449a0f9f0f1ea3dccbc70dcb4
SHA1 (patch-dbus_dbus-connection.c) = 39101ce8dd4b4b5aa34b501d112904b69ba3cc33
SHA1 (patch-dbus_dbus-sysdeps-unix.c) = 3dfc60eba7ab9d5a29d2a842ce0baa1b109df716
SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 9c967cdac585220a3e65443dc9642e7d4478567c
SHA1 (patch-dbus_dbus-sysdeps-util-unix.c) = 0caef42e108e1f7e5fa6a27be66ba9eea55052bb
SHA1 (patch-tools_dbus-print-message.c) = 96267d3cff2c5207911615735748ef81604a69ec

0
dbus-dfbsd/files/smf/dbus.sh Normal file → Executable file
View File

26
dbus-dfbsd/options.mk
View File

@ -1,11 +1,16 @@
# $NetBSD: options.mk,v 1.11 2017/03/14 15:34:56 wiz Exp $
# $NetBSD: options.mk,v 1.12 2018/08/16 08:57:09 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dbus
PKG_SUPPORTED_OPTIONS+= debug x11 enable-in-rcvar nonroot
PKG_SUPPORTED_OPTIONS+= debug x11
PKG_SUGGESTED_OPTIONS= x11
PKG_SUPPORTED_OPTIONS+= enable-in-rcvar
PKG_SUPPORTED_OPTIONS+= nonroot
PKG_SUPPORTED_OPTIONS+= strict-dfbsd
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
PKG_SUGGESTED_OPTIONS+= enable-in-rcvar
PKG_SUGGESTED_OPTIONS+= strict-dfbsd
.endif
.if (${OPSYS} == "NetBSD" || \
@ -17,6 +22,7 @@ PKG_SUPPORTED_OPTIONS+= kqueue
PKG_SUGGESTED_OPTIONS+= kqueue
.endif
PLIST_VARS+= launchd
# We may want to make it SUGGESTED once we have a framework for
# launchd support. See PR/49591.
PKG_SUPPORTED_OPTIONS.Darwin+= launchd
@ -32,7 +38,7 @@ CONFIGURE_ARGS+= --disable-verbose-mode
.endif
.if !empty(PKG_OPTIONS:Mkqueue)
CONFIGURE_ARGS+= --enable-kqueue
CONFIGURE_ARGS+= --enable-kqueue
.else
CONFIGURE_ARGS+= --disable-kqueue
.endif
@ -74,3 +80,17 @@ FILES_SUBST+= DBUS_VAR_RUN_GROUP_SH=${REAL_ROOT_GROUP}
.endif
FILES_SUBST+= DBUS_RCVAR=${DBUS_RCVAR}
.if !empty(PKG_OPTIONS:Mstrict-dfbsd)
.else
BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections
# Package tries to use these if gcc accepts them, but that doesn't
# mean that we universally can *run* the executables
BUILDLINK_TRANSFORM+= rm:-fPIE
BUILDLINK_TRANSFORM+= rm:-pie
# From OpenBSD ports
# gives no chance of picking up devel/libexecinfo
CONFIGURE_ENV += ac_cv_header_execinfo_h=no
CONFIGURE_ENV += ac_cv_func_backtrace=no
.endif

14
dbus-dfbsd/patches/patch-ak
View File

@ -1,15 +1,15 @@
$NetBSD: patch-ak,v 1.5 2015/12/06 11:35:55 wiz Exp $
$NetBSD: patch-ak,v 1.6 2017/11/23 14:43:23 wiz Exp $
Adapt path for pkgsrc.
--- dbus/Makefile.in.orig 2015-08-25 15:52:09.000000000 +0000
--- dbus/Makefile.in.orig 2017-11-13 13:36:10.000000000 +0000
+++ dbus/Makefile.in
@@ -589,7 +589,7 @@ dbusdatadir = $(datadir)/dbus-1
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
$(DBUS_STATIC_BUILD_CPPFLAGS) $(SYSTEMD_CFLAGS) \
$(VALGRIND_CFLAGS) -DDBUS_COMPILATION \
@@ -619,7 +619,7 @@ dbusdatadir = $(datadir)/dbus-1
AM_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) -I$(top_builddir) \
-I$(top_srcdir) $(DBUS_STATIC_BUILD_CPPFLAGS) \
$(SYSTEMD_CFLAGS) $(VALGRIND_CFLAGS) -DDBUS_COMPILATION \
- -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
+ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \
-DDBUS_SYSTEM_CONFIG_FILE=\""$(dbusdatadir)/system.conf"\" \
-DDBUS_SESSION_CONFIG_FILE=\""$(dbusdatadir)/session.conf"\" \
$(NULL) $(am__append_2)
-DDBUS_RUNSTATEDIR=\""$(runstatedir)"\" $(NULL) \

14
dbus-dfbsd/patches/patch-al
View File

@ -1,10 +1,10 @@
$NetBSD: patch-al,v 1.5 2015/12/06 11:35:55 wiz Exp $
$NetBSD: patch-al,v 1.6 2017/11/23 14:43:23 wiz Exp $
Adapt path for pkgsrc.
--- tools/Makefile.in.orig 2015-07-21 16:32:32.000000000 +0000
--- tools/Makefile.in.orig 2017-11-13 13:36:10.000000000 +0000
+++ tools/Makefile.in
@@ -428,7 +428,7 @@ AM_CPPFLAGS = \
@@ -515,7 +515,7 @@ AM_CPPFLAGS = \
$(DBUS_STATIC_BUILD_CPPFLAGS) \
$(DBUS_X_CFLAGS) \
-DDBUS_COMPILATION \
@ -12,10 +12,10 @@ Adapt path for pkgsrc.
+ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/db/dbus/machine-id"\" \
$(NULL)
@@ -847,9 +847,9 @@ uninstall-am: uninstall-binPROGRAMS
.PRECIOUS: Makefile
AM_CFLAGS = \
@@ -1092,9 +1092,9 @@ uninstall-am: uninstall-binPROGRAMS unin
@DBUS_WIN_TRUE@disable-uac.rc: Win32.Manifest
@DBUS_WIN_TRUE@ echo '1 24 "$<"' > $@
-# create the /var/lib/dbus directory for dbus-uuidgen
+# create the /var/db/dbus directory for dbus-uuidgen

95
dbus-dfbsd/patches/patch-dbus_dbus-connection.c Normal file
View File

@ -0,0 +1,95 @@
$NetBSD$
From FreeBSD ports devel/dbus.
Added Mon May 10 21:19:08 2010 UTC
Presenting GNOME 2.30.1 for FreeBSD.
--- dbus/dbus-connection.c.orig 2018-02-08 14:07:21.000000000 +0000
+++ dbus/dbus-connection.c
@@ -2385,7 +2385,11 @@ _dbus_connection_block_pending_call (DBu
DBusConnection *connection;
dbus_uint32_t client_serial;
DBusTimeout *timeout;
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+ int timeout_milliseconds, elapsed_milliseconds, remain_milliseconds;
+#else
int timeout_milliseconds, elapsed_milliseconds;
+#endif
_dbus_assert (pending != NULL);
@@ -2467,6 +2471,12 @@ _dbus_connection_block_pending_call (DBu
elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 +
(tv_usec - start_tv_usec) / 1000;
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+ if (timeout_milliseconds != -1)
+ remain_milliseconds = timeout_milliseconds - elapsed_milliseconds;
+ else
+ remain_milliseconds = -1;
+#endif
if (!_dbus_connection_get_is_connected_unlocked (connection))
{
DBusMessage *error_msg;
@@ -2494,7 +2504,11 @@ _dbus_connection_block_pending_call (DBu
*/
_dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+ _dbus_memory_pause_based_on_timeout (remain_milliseconds);
+#else
_dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
+#endif
}
else
{
@@ -2503,7 +2517,11 @@ _dbus_connection_block_pending_call (DBu
pending,
DBUS_ITERATION_DO_READING |
DBUS_ITERATION_BLOCK,
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+ remain_milliseconds);
+#else
timeout_milliseconds - elapsed_milliseconds);
+#endif
}
goto recheck_status;
@@ -2512,7 +2530,11 @@ _dbus_connection_block_pending_call (DBu
_dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
else if (elapsed_milliseconds < timeout_milliseconds)
{
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+ _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", remain_milliseconds);
+#else
_dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds - elapsed_milliseconds);
+#endif
if (status == DBUS_DISPATCH_NEED_MEMORY)
{
@@ -2522,7 +2544,11 @@ _dbus_connection_block_pending_call (DBu
*/
_dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+ _dbus_memory_pause_based_on_timeout (remain_milliseconds);
+#else
_dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
+#endif
}
else
{
@@ -2531,7 +2557,11 @@ _dbus_connection_block_pending_call (DBu
pending,
DBUS_ITERATION_DO_READING |
DBUS_ITERATION_BLOCK,
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+ remain_milliseconds);
+#else
timeout_milliseconds - elapsed_milliseconds);
+#endif
}
goto recheck_status;

34
dbus-dfbsd/patches/patch-dbus_dbus-sysdeps-util-unix.c
View File

@ -1,12 +1,28 @@
$NetBSD: patch-dbus_dbus-sysdeps-util-unix.c,v 1.3 2014/09/13 09:47:11 richard Exp $
$NetBSD: patch-dbus_dbus-sysdeps-util-unix.c,v 1.4 2017/11/23 14:43:23 wiz Exp $
add solaris specific console_user test
--- dbus/dbus-sysdeps-util-unix.c.orig 2014-01-25 12:39:25.000000000 +0000
From FreeBSD ports devel/dbus.
Added Mon May 10 21:19:08 2010 UTC
Presenting GNOME 2.30.1 for FreeBSD.
--- dbus/dbus-sysdeps-util-unix.c.orig 2017-10-30 12:26:18.000000000 +0000
+++ dbus/dbus-sysdeps-util-unix.c
@@ -54,6 +54,10 @@
#include <syslog.h>
#endif
@@ -42,6 +42,9 @@
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+#include <syslog.h>
+#endif
#include <sys/stat.h>
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
@@ -51,6 +54,10 @@
#include <dirent.h>
#include <sys/un.h>
+#if defined(__sun) && defined(__SVR4)
+#include <pwd.h>
@ -15,8 +31,8 @@ add solaris specific console_user test
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
@@ -556,8 +560,31 @@ _dbus_user_at_console (const char *usern
@@ -551,8 +558,31 @@ _dbus_user_at_console (const char *usern
#ifdef DBUS_CONSOLE_AUTH_DIR
DBusString u, f;
dbus_bool_t result;
+#if defined(__sun) && defined(__SVR4)
@ -47,11 +63,11 @@ add solaris specific console_user test
if (!_dbus_string_init (&f))
{
_DBUS_SET_OOM (error);
@@ -582,6 +609,7 @@ _dbus_user_at_console (const char *usern
@@ -577,6 +607,7 @@ _dbus_user_at_console (const char *usern
out:
_dbus_string_free (&f);
+#endif
return result;
}
#else