diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index d213c109671f..90e84943ac4e 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -1,66 +1,65 @@ # Created by: Joe Marcus Clarke PORTNAME= dbus -DISTVERSION= 1.12.20 +DISTVERSION= 1.14.0 PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ MAINTAINER= desktop@FreeBSD.org COMMENT= Message bus system for inter-application communication LICENSE= GPLv2 LIB_DEPENDS= libexpat.so:textproc/expat2 -USES= cpe gmake libtool localbase pkgconfig python:build shebangfix +USES= cpe gmake libtool localbase pkgconfig python:build shebangfix tar:xz CPE_VENDOR= d-bus_project CPE_PRODUCT= d-bus USE_LDCONFIG= yes USE_RC_SUBR= dbus SHEBANG_FILES= tools/GetAllMatchRules.py GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-apparmor \ --disable-doxygen-docs \ --disable-selinux \ --disable-systemd \ --with-session-socket-dir=/tmp \ --with-test-socket-dir=${WRKDIR} INSTALL_TARGET= install-strip PORTSCOUT= limitw:1,even USERS= messagebus GROUPS= messagebus PLIST_SUB= GROUPS=${GROUPS} \ VERSION="1.0" OPTIONS_DEFINE= EXAMPLES MANPAGES X11 OPTIONS_DEFAULT= MANPAGES X11 OPTIONS_SUB= yes X11_DESC= Support X11 Desktop Environments -MANPAGES_BUILD_DEPENDS= minixmlto:textproc/minixmlto +MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto MANPAGES_CONFIGURE_ENABLE= xml-docs -MANPAGES_CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto X11_USES= xorg X11_USE= XORG=ice,sm,x11 X11_CONFIGURE_WITH= x post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/dbus/dbus-sysdeps-util-unix.c post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR} ${RM} -r ${STAGEDIR}${DOCSDIR} .for file in session.conf system.conf @cd ${STAGEDIR}${ETCDIR}-1/ && \ ${MV} ${file} ${file}.sample .endfor .include diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo index 6326870601f0..282f92349830 100644 --- a/devel/dbus/distinfo +++ b/devel/dbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1593757580 -SHA256 (dbus-1.12.20.tar.gz) = f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe -SIZE (dbus-1.12.20.tar.gz) = 2095511 +TIMESTAMP = 1648926703 +SHA256 (dbus-1.14.0.tar.xz) = ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4 +SIZE (dbus-1.14.0.tar.xz) = 1360228 diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure new file mode 100644 index 000000000000..4c3821046452 --- /dev/null +++ b/devel/dbus/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2022-02-28 12:24:19 UTC ++++ configure +@@ -22663,7 +22663,7 @@ if test "x$dbus_win" = xyes; then + + enable_x11_autolaunch=no + have_x11=no +-else if test "x$with_x" = xauto; then ++else if test "x$with_x" != xno; then + + pkg_failed=no + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c deleted file mode 100644 index d73b90e48357..000000000000 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c +++ /dev/null @@ -1,21 +0,0 @@ ---- dbus/dbus-sysdeps-unix.c.orig 2020-07-02 09:08:39 UTC -+++ dbus/dbus-sysdeps-unix.c -@@ -4469,6 +4469,10 @@ _dbus_socket_can_pass_unix_fd (DBusSocket fd) - void - _dbus_close_all (void) - { -+#ifdef __FreeBSD__ -+ closefrom(3); -+#else -+#error Expected to be FreeBSD with closefrom() - int maxfds, i; - - #ifdef __linux__ -@@ -4525,6 +4528,7 @@ _dbus_close_all (void) - /* close all inherited fds */ - for (i = 3; i < maxfds; i++) - close (i); -+#endif - } - - /** diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist index 0e0b4868b66c..43ecf33b23cb 100644 --- a/devel/dbus/pkg-plist +++ b/devel/dbus/pkg-plist @@ -1,60 +1,62 @@ bin/dbus-cleanup-sockets bin/dbus-daemon bin/dbus-launch bin/dbus-monitor bin/dbus-run-session bin/dbus-send bin/dbus-test-tool bin/dbus-update-activation-environment bin/dbus-uuidgen @sample etc/dbus-1/session.conf.sample @sample etc/dbus-1/system.conf.sample include/dbus-%%VERSION%%/dbus/dbus-address.h include/dbus-%%VERSION%%/dbus/dbus-bus.h include/dbus-%%VERSION%%/dbus/dbus-connection.h include/dbus-%%VERSION%%/dbus/dbus-errors.h include/dbus-%%VERSION%%/dbus/dbus-macros.h include/dbus-%%VERSION%%/dbus/dbus-memory.h include/dbus-%%VERSION%%/dbus/dbus-message.h include/dbus-%%VERSION%%/dbus/dbus-misc.h include/dbus-%%VERSION%%/dbus/dbus-pending-call.h include/dbus-%%VERSION%%/dbus/dbus-protocol.h include/dbus-%%VERSION%%/dbus/dbus-server.h include/dbus-%%VERSION%%/dbus/dbus-shared.h include/dbus-%%VERSION%%/dbus/dbus-signature.h include/dbus-%%VERSION%%/dbus/dbus-syntax.h include/dbus-%%VERSION%%/dbus/dbus-threads.h include/dbus-%%VERSION%%/dbus/dbus-types.h include/dbus-%%VERSION%%/dbus/dbus.h lib/cmake/DBus1/DBus1Config.cmake lib/cmake/DBus1/DBus1ConfigVersion.cmake lib/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h lib/libdbus-1.a lib/libdbus-1.so lib/libdbus-1.so.3 -lib/libdbus-1.so.3.19.13 +lib/libdbus-1.so.3.32.0 libdata/pkgconfig/dbus-1.pc @(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper %%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz %%MANPAGES%%man/man1/dbus-daemon.1.gz %%MANPAGES%%man/man1/dbus-launch.1.gz %%MANPAGES%%man/man1/dbus-monitor.1.gz %%MANPAGES%%man/man1/dbus-run-session.1.gz %%MANPAGES%%man/man1/dbus-send.1.gz %%MANPAGES%%man/man1/dbus-test-tool.1.gz %%MANPAGES%%man/man1/dbus-update-activation-environment.1.gz %%MANPAGES%%man/man1/dbus-uuidgen.1.gz share/dbus-1/session.conf share/dbus-1/system.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/GetAllMatchRules.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-session-disable-stats.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-enable-stats.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-hardening-without-traditional-activation.conf share/xml/dbus-1/busconfig.dtd +share/xml/dbus-1/catalog.xml share/xml/dbus-1/introspect.dtd @dir share/dbus-1/services @dir share/dbus-1/session.d @dir share/dbus-1/system-services @dir share/dbus-1/system.d @dir /var/lib/dbus @dir /var/lib @dir /var/run/dbus