Attachment #232905 for bug #263014




# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>

PORTNAME=	dbus
DISTVERSION=	1.14.0
PORTREVISION=	5
CATEGORIES=	devel gnome
MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/



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

OPTIONS_SUB=		yes
X11_DESC=		Support X11 Desktop Environments

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

Lines 1-3 Link Here

(-)b/devel/dbus/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1593757580	1	TIMESTAMP = 1648926703
2	SHA256 (dbus-1.12.20.tar.gz) = f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe	2	SHA256 (dbus-1.14.0.tar.xz) = ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
3	SIZE (dbus-1.12.20.tar.gz) = 2095511	3	SIZE (dbus-1.14.0.tar.xz) = 1360228




--- 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
 }
 
 /**




lib/libdbus-1.a
lib/libdbus-1.so
lib/libdbus-1.so.3
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

%%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
- 

Return to bug 263014

Lines 1-8 Link Here

(-)b/devel/dbus/Makefile (-5 / +3 lines)
1	# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>	1	# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
2		2
3	PORTNAME= dbus	3	PORTNAME= dbus
4	DISTVERSION= 1.12.20	4	DISTVERSION= 1.14.0
5	PORTREVISION= 5
6	CATEGORIES= devel gnome	5	CATEGORIES= devel gnome
7	MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/	6	MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/
8		7
Lines 13-19 LICENSE= GPLv2 Link Here
13		12
14	LIB_DEPENDS= libexpat.so:textproc/expat2	13	LIB_DEPENDS= libexpat.so:textproc/expat2
15		14
16	USES= cpe gmake libtool localbase pkgconfig python:build shebangfix	15	USES= cpe gmake libtool localbase pkgconfig python:build shebangfix tar:xz
17	CPE_VENDOR= d-bus_project	16	CPE_VENDOR= d-bus_project
18	CPE_PRODUCT= d-bus	17	CPE_PRODUCT= d-bus
19	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
Lines 43-51 OPTIONS_DEFAULT= MANPAGES X11 Link Here
43	OPTIONS_SUB= yes	42	OPTIONS_SUB= yes
44	X11_DESC= Support X11 Desktop Environments	43	X11_DESC= Support X11 Desktop Environments
45		44
46	MANPAGES_BUILD_DEPENDS= minixmlto:textproc/minixmlto	45	MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto
47	MANPAGES_CONFIGURE_ENABLE= xml-docs	46	MANPAGES_CONFIGURE_ENABLE= xml-docs
48	MANPAGES_CONFIGURE_ENV= XMLTO=${LOCALBASE}/bin/minixmlto
49	X11_USES= xorg	47	X11_USES= xorg
50	X11_USE= XORG=ice,sm,x11	48	X11_USE= XORG=ice,sm,x11
51	X11_CONFIGURE_WITH= x	49	X11_CONFIGURE_WITH= x

Removed Link Here

(-)a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c (-21 lines)
1	--- dbus/dbus-sysdeps-unix.c.orig 2020-07-02 09:08:39 UTC
2	+++ dbus/dbus-sysdeps-unix.c
3	@@ -4469,6 +4469,10 @@ _dbus_socket_can_pass_unix_fd (DBusSocket fd)
4	void
5	_dbus_close_all (void)
6	{
7	+#ifdef __FreeBSD__
8	+ closefrom(3);
9	+#else
10	+#error Expected to be FreeBSD with closefrom()
11	int maxfds, i;
12
13	#ifdef __linux__
14	@@ -4525,6 +4528,7 @@ _dbus_close_all (void)
15	/* close all inherited fds */
16	for (i = 3; i < maxfds; i++)
17	close (i);
18	+#endif
19	}
20
21	/**

Lines 32-38 lib/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h Link Here

(-)b/devel/dbus/pkg-plist (-2 / +3 lines)
32	lib/libdbus-1.a	32	lib/libdbus-1.a
33	lib/libdbus-1.so	33	lib/libdbus-1.so
34	lib/libdbus-1.so.3	34	lib/libdbus-1.so.3
35	lib/libdbus-1.so.3.19.13	35	lib/libdbus-1.so.3.32.0
36	libdata/pkgconfig/dbus-1.pc	36	libdata/pkgconfig/dbus-1.pc
37	@(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper	37	@(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper
38	%%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz	38	%%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz
Lines 49-55 share/dbus-1/system.conf Link Here
49	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GetAllMatchRules.py	49	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GetAllMatchRules.py
50	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-session-disable-stats.conf	50	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-session-disable-stats.conf
51	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-enable-stats.conf	51	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-enable-stats.conf
		52	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-hardening-without-traditional-activation.conf
52	share/xml/dbus-1/busconfig.dtd	53	share/xml/dbus-1/busconfig.dtd
		54	share/xml/dbus-1/catalog.xml
53	share/xml/dbus-1/introspect.dtd	55	share/xml/dbus-1/introspect.dtd
54	@dir share/dbus-1/services	56	@dir share/dbus-1/services
55	@dir share/dbus-1/session.d	57	@dir share/dbus-1/session.d
56	-