From patchwork Wed Mar 29 14:35:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 6749 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PmpxZ66fFz3x2l for ; Wed, 29 Mar 2023 14:35:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PmpxY2TqRz2xR; Wed, 29 Mar 2023 14:35:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PmpxY1Zslz30FC; Wed, 29 Mar 2023 14:35:29 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PmpxX4NGxz2xYV for ; Wed, 29 Mar 2023 14:35:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PmpxW6CBXzRT; Wed, 29 Mar 2023 14:35:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680100528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=OYK/KpCtmF0Q48PjKuueGyL72OgU3AezvD4mCG8/IUs=; b=6XNr1EjPj4/MskDzZ95SwDWC7LhCF+fbiB/Y1X61CJgnlhzLzJsX9uEYP7M1XIeuvY1N3x UaSSgZNBM9aN8vDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680100528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=OYK/KpCtmF0Q48PjKuueGyL72OgU3AezvD4mCG8/IUs=; b=JH5FafkJNufWXctOFd97IquEqwVv18eXcm37aNo8IPO6HYrflL0I+1wA8UrJN+1rQWJ+hi b7GGFD02ZNp2PM0tFvWv0OhhFuwy4SrMJC0NI8VyS1q+B6RypVCiWsssvpOGuBO7Galsmq za5vtd+tKCXuOzZuBaWEY8SFIzO77w4uqhAzRlWPIjgkgAg9KC8KZ0wwQiO8RvMZZV4Rfo 9rY/srscUkunBrwa1Y4tEKUhV+j36KcxLr9kt6wCZnEQXEN2GHTFoB6REOIIXgvvG6zwr8 cnbY+oYzVoIf1Yq4QQxJUEOIUwdSmhoafzCFgEBfG9gOkVuhnxC1O1g0J6glbQ== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/2] dbus-broker: Do not longer create user/group Date: Wed, 29 Mar 2023 16:35:21 +0200 Message-Id: <20230329143522.2559935-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" The dbus user and group will be created by the dbus-common packge which is a dependency of dbus-brocker. So no need for trying to doubble create them. --- dbus-broker/dbus-broker.nm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dbus-broker/dbus-broker.nm b/dbus-broker/dbus-broker.nm index a65a1e0d6..5a33f4ad7 100644 --- a/dbus-broker/dbus-broker.nm +++ b/dbus-broker/dbus-broker.nm @@ -5,7 +5,7 @@ name = dbus-broker version = 32 -release = 1 +release = 2 maintainer = Stefan Schantl groups = System/Daemons @@ -58,16 +58,6 @@ packages dbus-common end - prerequires += shadow-utils - - script prein - getent group dbus >/dev/null || groupadd -r dbus - getent passwd dbus >/dev/null || \ - useradd -r -g dbus -d / -s /sbin/nologin \ - -c "User for dbus service" dbus - exit 0 - end - # Just search for new unit files that were just installed. script postin systemctl daemon-reload >/dev/null 2>&1 || : From patchwork Wed Mar 29 14:35:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 6750 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Pmpxc0gLrz3x2l for ; Wed, 29 Mar 2023 14:35:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PmpxZ2wp9z2wv; Wed, 29 Mar 2023 14:35:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PmpxZ2PWrz2yxl; Wed, 29 Mar 2023 14:35:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PmpxY0mkVz2y9s for ; Wed, 29 Mar 2023 14:35:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PmpxX5jDkztF; Wed, 29 Mar 2023 14:35:28 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1680100529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ndWieMeQy+ADmGd2My47yUCdZhryn7LY33XfZlB7mdw=; b=RiCjJSnQS7oFHhpVIFnup5Me/fZwonVKAxi1qP8f+mVUTsNDMZEsuIVFpGBU4DNRqNSSJd ixkxUlhZ+SpJGDAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1680100529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ndWieMeQy+ADmGd2My47yUCdZhryn7LY33XfZlB7mdw=; b=FDPjTbrp6HP3ewtBrO8wmMT5ovcaLzw/d/fLQX+FsYItTXfrbtdmMKMu8M2i282i3YPQBu qCQ2tyH8DKYRIP/TeTALkoi6liuaCTsR1Qs8XLnrtMUjqKlQqlG13T8dTv/itUPnHj3MR8 /N1uf8Q2tIsy9OiYWjCazTa6ezXzj38FRUbnVPF/IBBW/RwYyiQERcpOI0UjIWDC9JkHot i7hkn4GkO63DEgrtEOi4L93rue2Lhl9y2FxTFPwzvWvW4EAatK9JFP7hI2qiLCk6VrdGhi q2hdJPYBe0xSDr1d0jhNAMDJdnUw76mzNXNQ2bqkYJXKoiftT9O9GptSkJrg+Q== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 2/2] dbus: Ship our own sysusers file Date: Wed, 29 Mar 2023 16:35:22 +0200 Message-Id: <20230329143522.2559935-2-stefan.schantl@ipfire.org> In-Reply-To: <20230329143522.2559935-1-stefan.schantl@ipfire.org> References: <20230329143522.2559935-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" The one from the project is very limited, so we have to replace it by our own written. Signed-off-by: Stefan Schantl --- dbus/dbus.nm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dbus/dbus.nm b/dbus/dbus.nm index d6daa5270..6761df82c 100644 --- a/dbus/dbus.nm +++ b/dbus/dbus.nm @@ -7,7 +7,7 @@ name = dbus ver_major = 1 ver_minor = 15 ver_plevel = 2 -release = 1 +release = 2 version = %{ver_major}.%{ver_minor}.%{ver_plevel} dbus_ver = %{ver_major}.%{ver_minor}.%{ver_plevel} @@ -68,6 +68,9 @@ build rm -rvf %{BUILDROOT}/%{unitdir}/multi-user.target.wants rm -rvf %{BUILDROOT}/usr/lib/tmpfiles.d + # Remove project's own sysusers file - we have or own one. + rm -rvf %{BUILDROOT}%{sysusersdir}/%{name}.conf + # Remove daemon related folders in /var rm -rvf %{BUILDROOT}/%{localstatedir} end