From nobody Sat Apr 30 17:17:47 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E5D711999809; Sat, 30 Apr 2022 17:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KrGJW67JXz3H9P; Sat, 30 Apr 2022 17:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651339067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxWNxMEQEmJrnvWARR0X7SQDk0Xf4MkOZJMpcC2Bsm4=; b=OP0KqkDMBP32np//38bHvxbtYegUmZE16qYJf8+f/QwCbYHxwr8XOd7xpUUWLqKFrsMNej xzuEChbQvA8LA1SJ06+8/JFCRTxrPkmhR7wYefZcSRQBPm3kOwFmMBSXX9eXrbIS46VHTc tyocTBPSh7MwKW86iJX4o2g7ZmlLiIIkBjUFB1j0zJQlN4/+bDNEPPbwVLqPzVQOYopEPy mXdKU1GNjVL77PyAa9zBv/nuYlrBmi6nYnfC/0hq98Aeq/CFdmvbsN0Kt9Kw5bhnpHlgrB 81y2LMvJ9wEEItLVw/pECGQbmoGLBp2itOigYMtTRma+FT/K/z4Y7wB+n+qhRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B288725352; Sat, 30 Apr 2022 17:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23UHHl6i008024; Sat, 30 Apr 2022 17:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23UHHlZA008023; Sat, 30 Apr 2022 17:17:47 GMT (envelope-from git) Date: Sat, 30 Apr 2022 17:17:47 GMT Message-Id: <202204301717.23UHHlZA008023@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: f5a0f6f2041d - main - devel/dbus: revert update to 1.14.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5a0f6f2041de15a61e34f46fa71a292a47fc007 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651339067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sxWNxMEQEmJrnvWARR0X7SQDk0Xf4MkOZJMpcC2Bsm4=; b=EI6Oco21jXwm11BOHNUbEJyw+H/6kmdyXYbt8H6M7hau9e8hDnTnTWNJrWYdC2GSIl2fRO WjGb278e34eJ7Ka7gC0nhDZY26UDZydH+YTlqhA4pdvnS2O9pRCdtCn7FJstfgSaaFkGCl obuszkYXalAiJqQcZTn998FG++JYBAUJtlAaD20G2cHWVDcf7S05kaF6+oLM5xURy7rN1e Wjqo8KIvV/DyqmrwhVHfSNutP+gYRE6ksigiwVH/yl7aKttH28HdZPyp7+owQg1tRoI+cI 4bae+m9+VRmw1WNIIQH7sx88HBEIb+tVlQFfHRx7gEVJtp1pgspRGbtR28gxAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651339067; a=rsa-sha256; cv=none; b=DtIsl96FbzhUCDmRNeMuemKej1mq87dPzRZqk/qC+0i5wZylXIuoKcdcWXd9BQ3qk0EUK3 rqigaKlqePUHmGClShvhvqp09jA+YaW4yJriZZ7URm3x/PDfCLYjxwKnxF1p5yu0fJJfMe +9MyB/56CJ5Rgn8ajUHVwITuY7G8fvVlqPfY+mbhJ2uSw6JdbPIs2Mhx54YgZr5bAMhZjI tJB2yopVIIzjERHHvnHDD9SkaNFirVTf5zzV5rHht5OLXQcm/nQmVFvIYDTX1/b2uHcL9v uHB2BGVvvIcsPpsDsDBhNG9G/ZwOGTSTXhPnAiECt4dIWrmJaKkmjiNhZNKE+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=f5a0f6f2041de15a61e34f46fa71a292a47fc007 commit f5a0f6f2041de15a61e34f46fa71a292a47fc007 Author: Tobias C. Berner AuthorDate: 2022-04-30 17:15:52 +0000 Commit: Tobias C. Berner CommitDate: 2022-04-30 17:17:29 +0000 devel/dbus: revert update to 1.14.0 - Backout update to 1.14 until lockout of XFCE has been figured out. Reported by: madpilot This reverts commit 692fe38479ebe04afe9bee34f68adfb52c1be91f. --- devel/dbus/Makefile | 8 +++++--- devel/dbus/distinfo | 6 +++--- devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c | 21 +++++++++++++++++++++ devel/dbus/pkg-plist | 4 +--- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index ef5dc03fe803..d213c109671f 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -1,7 +1,8 @@ # Created by: Joe Marcus Clarke PORTNAME= dbus -DISTVERSION= 1.14.0 +DISTVERSION= 1.12.20 +PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ @@ -12,7 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libexpat.so:textproc/expat2 -USES= cpe gmake libtool localbase pkgconfig python:build shebangfix tar:xz +USES= cpe gmake libtool localbase pkgconfig python:build shebangfix CPE_VENDOR= d-bus_project CPE_PRODUCT= d-bus USE_LDCONFIG= yes @@ -42,8 +43,9 @@ OPTIONS_DEFAULT= MANPAGES X11 OPTIONS_SUB= yes X11_DESC= Support X11 Desktop Environments -MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto +MANPAGES_BUILD_DEPENDS= minixmlto:textproc/minixmlto 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 a/devel/dbus/distinfo b/devel/dbus/distinfo index 282f92349830..6326870601f0 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 = 1593757580 +SHA256 (dbus-1.12.20.tar.gz) = f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe +SIZE (dbus-1.12.20.tar.gz) = 2095511 diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c new file mode 100644 index 000000000000..d73b90e48357 --- /dev/null +++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c @@ -0,0 +1,21 @@ +--- 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 43ecf33b23cb..0e0b4868b66c 100644 --- a/devel/dbus/pkg-plist +++ b/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.32.0 +lib/libdbus-1.so.3.19.13 libdata/pkgconfig/dbus-1.pc @(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper %%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz @@ -49,9 +49,7 @@ 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