From patchwork Wed Apr 21 17:37:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Bj=C3=B8rn_Mork?= X-Patchwork-Id: 1468780 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=LZm751UT; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=mork.no header.i=@mork.no header.a=rsa-sha256 header.s=b header.b=OnJyjtFM; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FQSVw2J67z9sV5 for ; Thu, 22 Apr 2021 03:40:07 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=CfHK9GnzIEYLHPYwW/xNLByHLJmXrO33OGT8UPNYtmE=; b=LZm751UTp9LyOWbNZqxMqezqeR MczPH9SJK0Vgf6vPsvP3/Umng69EkXGhPAmAIUQ+oFAu+B6wrUmy60TD1rbT/8MuqKlmUp2wMviVa 7e7CLp2DJC0pDCchZIduo0B5Vb58xn3+sbnDMEg72ur6D41Ya9JT7NlU+aHcnIfKDPUiv2j/CvhBq G+3AE5Br97s0HJdWSG8puEjbS7V/TYs/BNucTwaEhzenRZv4yI6v3P9+x7P7ixAjppz7oTdp+MqGf T8A5vcQzZfDjb4XSO2sZ3e4AKiYmUdGWUbusKRigy8DEFfyEeQZwMTDRzkISOb5MeJnPRx3+wA+VE OnVxhvng==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZGn0-00EtE6-E3; Wed, 21 Apr 2021 17:37:26 +0000 Received: from canardo.mork.no ([2001:4641::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZGmt-00EtDV-8N for openwrt-devel@lists.openwrt.org; Wed, 21 Apr 2021 17:37:21 +0000 Received: from canardo.mork.no (ip6-localhost [IPv6:0:0:0:0:0:0:0:1]) by canardo.mork.no (8.15.2/8.15.2) with ESMTPS id 13LHbD1R015685 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=OK); Wed, 21 Apr 2021 19:37:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mork.no; s=b; t=1619026634; bh=5ZtJc7j+zjxDN1+DpYLHswJujQsDMpMe+EqJWQjdIpQ=; h=From:To:Cc:Subject:Date:Message-Id:From; b=OnJyjtFM2HHYsbIHuVmS99cqmv7zWU+BbcrbhsrDDsdmu8Dr6+ocP/SaFreUudrMv KpoPAVBX3rTTPKaYX+37ftCTiuYdP+JqpewqRk8mIisMuK8wPCs/525wzP8HkSsqSi gtOa9owu2cybO6xi19Y/c+aUMI3hoXSDL9JyVBao= Received: (from bjorn@localhost) by canardo.mork.no (8.15.2/8.15.2/Submit) id 13LHbDuE015684; Wed, 21 Apr 2021 19:37:13 +0200 From: =?utf-8?q?Bj=C3=B8rn_Mork?= To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?q?Bj=C3=B8rn_Mork?= , Rosen Penev Subject: [PATCH] Revert "dbus: update to 1.13.18" Date: Wed, 21 Apr 2021 19:37:09 +0200 Message-Id: <20210421173709.15637-1-bjorn@mork.no> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on canardo.mork.no X-Virus-Scanned: clamav-milter 0.102.4 at canardo X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210421_183719_789195_85FDDA39 X-CRM114-Status: UNSURE ( 9.27 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: Spam detection software, running on the system "desiato.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This reverts commit 0fb5d3ed2cb31a0a6076d36fb7a668cfe5328c92. root@finn:/# /etc/init.d/dbus start dbus[2537]: Failed to start message bus: Failed to open "/dbus-1/system.conf": No such file or directory Content analysis details: (-2.5 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [2001:4641:0:0:0:0:0:1 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This reverts commit 0fb5d3ed2cb31a0a6076d36fb7a668cfe5328c92. root@finn:/# /etc/init.d/dbus start dbus[2537]: Failed to start message bus: Failed to open "/dbus-1/system.conf": No such file or directory I guess simple run testing still is too much to expect when doing arbitrary changes packaging? Just commit the broken package and let someone else clean up the mess. Is that your idea of contributing? FWIW, the version update was fine. So if the commit hadn't been such a squashed mess, then both changes didn't have to be reverted. But I'm not going clean that up. I am not your mother. The repeated lack of run testing major changes really makes me wonder what it takes to get commit rights around here. Not much, from the looks of it. Cc: Rosen Penev Signed-off-by: Bjørn Mork --- utils/dbus/Makefile | 55 ++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 94bfa2e94f1c..0ebeb7a3be80 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -8,25 +8,27 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dbus -PKG_VERSION:=1.13.18 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.13.12 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus -PKG_HASH:=8078f5c25e34ab907ce06905d969dc8ef0ccbec367e1e1707c7ecf8460f4254e +PKG_HASH:=7588649b56dd257c6a5f85a8c45aa2dfdf9e99f4de3983710f452081ca43eca6 PKG_MAINTAINER:= PKG_LICENSE:=AFL-2.1 PKG_CPE_ID:=cpe:/a:freedesktop:dbus +PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk -include ../../devel/ninja/ninja-cmake.mk define Package/dbus/Default SECTION:=utils CATEGORY:=Utilities TITLE:=Simple interprocess messaging system - URL:=https://dbus.freedesktop.org/ + URL:=http://dbus.freedesktop.org/ endef define Package/dbus/Default/description @@ -71,19 +73,32 @@ $(call Package/dbus/Default/description) This package contains D-Bus utilities. endef -CMAKE_OPTIONS += \ - -DDBUS_BUILD_TESTS=OFF \ - -DDBUS_LINUX=ON \ - -DDBUS_DISABLE_ASSERT=ON \ - -DBUS_ENABLE_STATS=OFF \ - -DDBUS_ENABLE_CONTAINERS=OFF \ - -DENABLE_SYSTEMD=OFF \ - -DDBUS_BUS_ENABLE_SYSTEMD=OFF \ - -DHAVE_SYSTEMD=OFF \ - -DDBUS_WITH_GLIB=OFF \ - -DDBUS_ENABLE_VERBOSE_MODE=OFF \ - -DDBUS_DISABLE_CHECKS=ON \ - -DDBUS_BUILD_X11=OFF \ +CONFIGURE_ARGS += \ + --disable-maintainer-mode \ + --disable-developer \ + --enable-debug=no \ + --enable-shared \ + --disable-static \ + --disable-verbose-mode \ + --disable-asserts \ + --disable-xml-docs \ + --disable-doxygen-docs \ + --disable-ducktype-docs \ + --disable-selinux \ + --disable-apparmor \ + --disable-libaudit \ + --enable-inotify \ + --disable-kqueue \ + --disable-console-owner-file \ + --disable-systemd \ + --disable-tests \ + --disable-code-coverage \ + --disable-x11-autolaunch \ + --with-session-socket-dir=/tmp \ + --with-system-socket=/var/run/dbus/system_bus_socket \ + --with-system-pid-file=/var/run/dbus.pid \ + --with-dbus-user=root \ + --without-x define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include @@ -93,7 +108,7 @@ define Build/InstallDev $(PKG_INSTALL_DIR)/usr/lib/dbus-1.0/include/dbus/*.h \ $(1)/usr/lib/dbus-1.0/include/dbus/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.so* \ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libdbus-1.{so*,la} \ $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/dbus-1.0 $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig @@ -114,7 +129,7 @@ define Package/dbus/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-uuidgen $(1)/usr/bin/ $(INSTALL_BIN) ./files/dbus-launch $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/dbus-daemon-launch-helper $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/dbus-daemon-launch-helper $(1)/usr/lib/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dbus.init $(1)/etc/init.d/dbus $(INSTALL_DIR) $(1)/usr/share/dbus-1