diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index d023a099f270..dd8ef09fa988 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -1,65 +1,68 @@ PORTNAME= dbus -DISTVERSION= 1.14.0 +DISTVERSION= 1.14.4 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 WWW= https://www.freedesktop.org/Software/dbus LICENSE= GPLv2 LIB_DEPENDS= libexpat.so:textproc/expat2 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 +_LIBVERSION= 3.32.1 + PLIST_SUB= GROUPS=${GROUPS} \ - VERSION="1.0" + VERSION="1.0" \ + LIBVERSION=${_LIBVERSION} 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_CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto MANPAGES_CONFIGURE_ENABLE= xml-docs 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 282f92349830..3edcb34016f1 100644 --- a/devel/dbus/distinfo +++ b/devel/dbus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648926703 -SHA256 (dbus-1.14.0.tar.xz) = ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4 -SIZE (dbus-1.14.0.tar.xz) = 1360228 +TIMESTAMP = 1665090472 +SHA256 (dbus-1.14.4.tar.xz) = 7c0f9b8e5ec0ff2479383e62c0084a3a29af99edf1514e9f659b81b30d4e353e +SIZE (dbus-1.14.4.tar.xz) = 1368196 diff --git a/devel/dbus/files/patch-cmake_ConfigureChecks.cmake b/devel/dbus/files/patch-cmake_ConfigureChecks.cmake index 984ee5ad0738..41503ee27792 100644 --- a/devel/dbus/files/patch-cmake_ConfigureChecks.cmake +++ b/devel/dbus/files/patch-cmake_ConfigureChecks.cmake @@ -1,10 +1,10 @@ ---- cmake/ConfigureChecks.cmake.orig 2018-02-23 10:25:17 UTC +--- cmake/ConfigureChecks.cmake.orig 2022-09-14 12:12:21 UTC +++ cmake/ConfigureChecks.cmake -@@ -47,6 +47,7 @@ check_symbol_exists(getpwnam_r "errno.h pwd.h" HA +@@ -51,6 +51,7 @@ check_symbol_exists(clearenv "stdlib.h" HA check_symbol_exists(setenv "stdlib.h" HAVE_SETENV) # dbus-sysdeps.c check_symbol_exists(unsetenv "stdlib.h" HAVE_UNSETENV) # dbus-sysdeps.c check_symbol_exists(clearenv "stdlib.h" HAVE_CLEARENV) # dbus-sysdeps.c +check_symbol_exists(closefrom "unistd.h" HAVE_CLOSEFROM) # dbus-sysdeps-unix.c check_symbol_exists(writev "sys/uio.h" HAVE_WRITEV) # dbus-sysdeps.c, dbus-sysdeps-win.c check_symbol_exists(setrlimit "sys/resource.h" HAVE_SETRLIMIT) # dbus-sysdeps.c, dbus-sysdeps-win.c, test/test-segfault.c check_symbol_exists(socketpair "sys/socket.h" HAVE_SOCKETPAIR) # dbus-sysdeps.c diff --git a/devel/dbus/files/patch-cmake_config.h.cmake b/devel/dbus/files/patch-cmake_config.h.cmake index 9cb0e65dfbe8..c3dc5e5b989a 100644 --- a/devel/dbus/files/patch-cmake_config.h.cmake +++ b/devel/dbus/files/patch-cmake_config.h.cmake @@ -1,12 +1,12 @@ ---- cmake/config.h.cmake.orig 2018-02-23 10:25:17 UTC +--- cmake/config.h.cmake.orig 2022-09-14 12:12:21 UTC +++ cmake/config.h.cmake -@@ -181,6 +181,9 @@ +@@ -198,6 +198,9 @@ /* Define to 1 if you have clearenv */ #cmakedefine HAVE_CLEARENV 1 +/* Define to 1 if you have closefrom */ +#cmakedefine HAVE_CLOSEFROM 1 + /* Define to 1 if you have writev */ #cmakedefine HAVE_WRITEV 1 diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure deleted file mode 100644 index 4c3821046452..000000000000 --- a/devel/dbus/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c index e2e0c41ecbb1..88462759c72c 100644 --- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c @@ -1,46 +1,46 @@ ---- dbus/dbus-sysdeps-util-unix.c.orig 2019-06-09 12:08:49 UTC +--- dbus/dbus-sysdeps-util-unix.c.orig 2022-09-14 12:12:21 UTC +++ dbus/dbus-sysdeps-util-unix.c -@@ -42,6 +42,7 @@ - #include +@@ -44,6 +44,7 @@ #include #include + #include +#include #include #ifdef HAVE_SYS_RESOURCE_H #include -@@ -1367,7 +1368,7 @@ out: +@@ -1394,7 +1395,7 @@ out: * On UNIX this should be the standard xdg freedesktop.org data directories: * * XDG_DATA_HOME=${XDG_DATA_HOME-$HOME/.local/share} - * XDG_DATA_DIRS=${XDG_DATA_DIRS-/usr/local/share:/usr/share} + * XDG_DATA_DIRS=${XDG_DATA_DIRS-%%LOCALBASE%%/share:/usr/share} * * and * -@@ -1424,7 +1425,7 @@ _dbus_get_standard_session_servicedirs (DBusList **dir +@@ -1451,7 +1452,7 @@ _dbus_get_standard_session_servicedirs (DBusList **dir } else { - if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:")) + if (!_dbus_string_append (&servicedir_path, "%%LOCALBASE%%/share:/usr/share:")) goto oom; } -@@ -1457,7 +1458,7 @@ _dbus_get_standard_session_servicedirs (DBusList **dir +@@ -1484,7 +1485,7 @@ _dbus_get_standard_session_servicedirs (DBusList **dir * * On UNIX this should be the standard xdg freedesktop.org data directories: * - * XDG_DATA_DIRS=${XDG_DATA_DIRS-/usr/local/share:/usr/share} + * XDG_DATA_DIRS=${XDG_DATA_DIRS-%%LOCALBASE%%/share:/usr/share} * * and * -@@ -1482,7 +1483,7 @@ _dbus_get_standard_system_servicedirs (DBusList **dirs +@@ -1509,7 +1510,7 @@ _dbus_get_standard_system_servicedirs (DBusList **dirs * be available. */ static const char standard_search_path[] = - "/usr/local/share:" + "%%LOCALBASE%%/share:" "/usr/share:" DBUS_DATADIR ":" "/lib"; diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist index 43ecf33b23cb..18ba55d4ff48 100644 --- a/devel/dbus/pkg-plist +++ b/devel/dbus/pkg-plist @@ -1,62 +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.32.0 +lib/libdbus-1.so.%%LIBVERSION%% 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