From: "Hoël Bézier" <hoelbezier@riseup.net>
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
Date: Wed, 11 Jun 2025 19:48:06 +0200 [thread overview]
Message-ID: <aEnBVtBMMzfE9dGw@sparta> (raw)
In-Reply-To: <20250517203026.3385-1-hoelbezier@riseup.net>
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 <hoelbezier@riseup.net>
>---
> .../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
>
next prev parent reply other threads:[~2025-06-11 18:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-17 20:29 [gentoo-proxy-maint] [PATCH 1/3] sys-apps/udevil: do not install /etc/conf.d/devmon, bug #832907 Hoël Bézier
2025-05-17 20:29 ` [gentoo-proxy-maint] [PATCH 2/3] sys-apps/udevil: include sys/stat.h where needed, bug #945124 Hoël Bézier
2025-05-17 20:29 ` [gentoo-proxy-maint] [PATCH 3/3] sys-apps/udevil: remove invalid exfat mount options Hoël Bézier
2025-05-17 20:32 ` [gentoo-proxy-maint] [PATCH 1/3] sys-apps/udevil: do not install /etc/conf.d/devmon, bug #832907 Hoël Bézier
2025-06-11 17:48 ` Hoël Bézier [this message]
2025-06-12 12:25 ` [gentoo-proxy-maint] " Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aEnBVtBMMzfE9dGw@sparta \
--to=hoelbezier@riseup.net \
--cc=gentoo-proxy-maint@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox