From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 24942158098 for ; Wed, 11 Jun 2025 18:59:09 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 10FD1340F4B for ; Wed, 11 Jun 2025 18:59:09 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id DB9FB1104D9; Wed, 11 Jun 2025 18:58:52 +0000 (UTC) Received: from mx1.riseup.net (mx1.riseup.net [198.252.153.129]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id CDBAC1108FA for ; Wed, 11 Jun 2025 17:48:09 +0000 (UTC) Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4bHY6K1vWHzDq8g for ; Wed, 11 Jun 2025 17:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1749664089; bh=suZk8AWIAOsf7Xz1XCedsv5lqTcgZ+YCn8FDFe0GkcQ=; h=Date:From:To:Subject:References:In-Reply-To:From; b=YWxVHvf8lk/bPeVYldmr0/Thtsn8Tf+8v8AzrKOMr/ybZPQIZiIOCwx/2mQiseKfP 7ZkKBynO0DkldhWapTc1DjqaRRfPmswygdDB4ip8XkDI8X5+sryuhCk/0S8Zs0Z5co l+wiqKcEWu2aGMsTicZ+cgyvXNrJQSS24yr/om5g= X-Riseup-User-ID: 397907EBC7A3B3DEE24AEB889F3A73332FD9B455B768FDCA4C1921C33FFF5DF4 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4bHY6J5rXgzJmh8 for ; Wed, 11 Jun 2025 17:48:08 +0000 (UTC) Date: Wed, 11 Jun 2025 19:48:06 +0200 From: =?iso-8859-1?Q?Ho=EBl_B=E9zier?= To: gentoo-proxy-maint@lists.gentoo.org Subject: [gentoo-proxy-maint] Re: [PATCH 1/3] sys-apps/udevil: do not install /etc/conf.d/devmon, bug #832907 Message-ID: References: <20250517203026.3385-1-hoelbezier@riseup.net> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Proxy Maintainers X-BeenThere: gentoo-proxy-maint@gentoo.org X-BeenThere: gentoo-proxy-maint@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250517203026.3385-1-hoelbezier@riseup.net> X-Archives-Salt: c05f9d7c-56bb-4d06-984d-e8f581bed59c X-Archives-Hash: 4f7d6ef733e2f7491f2454d1c4a0250d Hi, Has anyone had a bit of time to review this patch series, and should I amend it in any way? :) I’m in no rush, but I’ve been told to ping the mailing-list about a month after this was sent. Thank you ! Hoël Am Sa, Mai 17, 2025 am 10:29:44 +0200 schrieb Hoël Bézier: >Do not install the /etc/conf.d/devmon configuration file. It was only >used to set arguments to the devmon@.service systemd unit and defaulted >to no arguments. > >Closes: https://bugs.gentoo.org/832907 >Signed-off-by: Hoël Bézier >--- > .../udevil/files/udevil-0.4.4-no-conf.d.patch | 63 +++++++++++++++++++ > sys-apps/udevil/udevil-0.4.4-r5.ebuild | 3 +- > 2 files changed, 65 insertions(+), 1 deletion(-) > create mode 100644 sys-apps/udevil/files/udevil-0.4.4-no-conf.d.patch > >diff --git a/sys-apps/udevil/files/udevil-0.4.4-no-conf.d.patch b/sys-apps/udevil/files/udevil-0.4.4-no-conf.d.patch >new file mode 100644 >index 000000000000..0c99b662c4d4 >--- /dev/null >+++ b/sys-apps/udevil/files/udevil-0.4.4-no-conf.d.patch >@@ -0,0 +1,63 @@ >+diff --git a/etc/Makefile.am b/etc/Makefile.am >+index 9b6e752..a33ce8e 100644 >+--- a/etc/Makefile.am >++++ b/etc/Makefile.am >+@@ -1,5 +1,5 @@ >+ if ADD_SYSTEMD >+-EXTRA_DIST = udevil.conf devmon devmon@.service >++EXTRA_DIST = udevil.conf devmon@.service >+ else >+ EXTRA_DIST = udevil.conf >+ endif >+@@ -11,11 +11,6 @@ install-data-hook: >+ $(srcdir)/udevil.conf \ >+ $(DESTDIR)/$(sysconfdir)/udevil/udevil.conf >+ if ADD_SYSTEMD >+- test -d $(DESTDIR)/$(sysconfdir)/conf.d || mkdir -p -- \ >+- $(DESTDIR)/$(sysconfdir)/conf.d >+- test -f $(DESTDIR)/$(sysconfdir)/conf.d/devmon || $(INSTALL_DATA) \ >+- $(srcdir)/systemd/devmon \ >+- $(DESTDIR)/$(sysconfdir)/conf.d/devmon >+ test -d $(DESTDIR)/$(libdir)/systemd/system || \ >+ mkdir -p -- $(DESTDIR)/$(libdir)/systemd/system >+ $(INSTALL_DATA) $(srcdir)/systemd/devmon@.service \ >+diff --git a/etc/Makefile.in b/etc/Makefile.in >+index bf2b19b..4489e30 100644 >+--- a/etc/Makefile.in >++++ b/etc/Makefile.in >+@@ -262,7 +262,7 @@ top_build_prefix = @top_build_prefix@ >+ top_builddir = @top_builddir@ >+ top_srcdir = @top_srcdir@ >+ @ADD_SYSTEMD_FALSE@EXTRA_DIST = udevil.conf >+-@ADD_SYSTEMD_TRUE@EXTRA_DIST = udevil.conf devmon devmon@.service >++@ADD_SYSTEMD_TRUE@EXTRA_DIST = udevil.conf devmon@.service >+ all: all-am >+ >+ .SUFFIXES: >+@@ -462,11 +462,6 @@ install-data-hook: >+ test -f $(DESTDIR)/$(sysconfdir)/udevil/udevil.conf || $(INSTALL_DATA) \ >+ $(srcdir)/udevil.conf \ >+ $(DESTDIR)/$(sysconfdir)/udevil/udevil.conf >+-@ADD_SYSTEMD_TRUE@ test -d $(DESTDIR)/$(sysconfdir)/conf.d || mkdir -p -- \ >+-@ADD_SYSTEMD_TRUE@ $(DESTDIR)/$(sysconfdir)/conf.d >+-@ADD_SYSTEMD_TRUE@ test -f $(DESTDIR)/$(sysconfdir)/conf.d/devmon || $(INSTALL_DATA) \ >+-@ADD_SYSTEMD_TRUE@ $(srcdir)/systemd/devmon \ >+-@ADD_SYSTEMD_TRUE@ $(DESTDIR)/$(sysconfdir)/conf.d/devmon >+ @ADD_SYSTEMD_TRUE@ test -d $(DESTDIR)/$(libdir)/systemd/system || \ >+ @ADD_SYSTEMD_TRUE@ mkdir -p -- $(DESTDIR)/$(libdir)/systemd/system >+ @ADD_SYSTEMD_TRUE@ $(INSTALL_DATA) $(srcdir)/systemd/devmon@.service \ >+diff --git a/etc/systemd/devmon@.service b/etc/systemd/devmon@.service >+index 23ccf87..1d707ce 100644 >+--- a/etc/systemd/devmon@.service >++++ b/etc/systemd/devmon@.service >+@@ -6,8 +6,7 @@ Type=simple >+ User=%i >+ # Set DISPLAY for popup dialogs >+ Environment=DISPLAY=:0 >+-EnvironmentFile=/etc/conf.d/devmon >+-ExecStart=/usr/bin/devmon $ARGS >++ExecStart=/usr/bin/devmon >+ >+ [Install] >+ WantedBy=multi-user.target >+ >diff --git a/sys-apps/udevil/udevil-0.4.4-r5.ebuild b/sys-apps/udevil/udevil-0.4.4-r5.ebuild >index 165c04be6453..49f609e4e6d2 100644 >--- a/sys-apps/udevil/udevil-0.4.4-r5.ebuild >+++ b/sys-apps/udevil/udevil-0.4.4-r5.ebuild >@@ -1,4 +1,4 @@ >-# Copyright 1999-2024 Gentoo Authors >+# Copyright 1999-2025 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > > EAPI=8 >@@ -31,6 +31,7 @@ PATCHES=( > "${FILESDIR}"/${PN}-0.4.4-stat.patch > "${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch > "${FILESDIR}"/${PN}-0.4.4-no-libtool.patch >+ "${FILESDIR}"/${PN}-0.4.4-no-conf.d.patch > ) > > src_prepare() { >-- >2.49.0 >