Attachment 233629 Details for Bug 263014 – v2

[patch] v2

dbus.diff (text/plain), 3.62 KB, created by Guido Falsi on 2022-05-01 12:49:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2022-05-01 12:49:45 UTC

Size: 3.62 KB

patch

obsolete

>diff --git devel/dbus/Makefile devel/dbus/Makefile
>index d213c109671f..90e84943ac4e 100644
>--- devel/dbus/Makefile
>+++ devel/dbus/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
> 
> PORTNAME=	dbus
>-DISTVERSION=	1.12.20
>+DISTVERSION=	1.14.0
> PORTEPOCH=	1
> CATEGORIES=	devel gnome
> MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
>@@ -13,7 +13,7 @@ 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
>@@ -43,9 +43,8 @@ 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
>diff --git devel/dbus/distinfo devel/dbus/distinfo
>index 6326870601f0..282f92349830 100644
>--- devel/dbus/distinfo
>+++ 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 devel/dbus/files/patch-configure devel/dbus/files/patch-configure
>new file mode 100644
>index 000000000000..4c3821046452
>--- /dev/null
>+++ 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 devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
>deleted file mode 100644
>index d73b90e48357..000000000000
>--- 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 devel/dbus/pkg-plist devel/dbus/pkg-plist
>index 0e0b4868b66c..43ecf33b23cb 100644
>--- devel/dbus/pkg-plist
>+++ devel/dbus/pkg-plist
>@@ -32,7 +32,7 @@ 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
>@@ -49,7 +49,9 @@ 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

Actions: View | Diff

Attachments on bug 263014: 232905 | 233629